MES-WEB-LayUI.git

			@@ -1,5 +1,6 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>å¨å·æ¡£æ¡</title>
			@@ -21,8 +22,10 @@
			.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
			background: #aef0f7;
			}

			/* ç¡®ä¿bodyå¯æ»å¨ */
			html, body {
			html,
			body {
			height: 100%;
			overflow: auto;
			}
			@@ -41,9 +44,9 @@
			::-webkit-scrollbar-track {
			background: #f5f5f5;
			}

			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -61,31 +64,37 @@
			<div class="layui-inline">
			<label class="layui-form-label">æ¨¡å·ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
			<input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
			id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¨¡å·åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
			<input type="text" class="layui-input ForFilteringSchemes" name="HName"
			id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> *
			</label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 300px;">
			<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
			id="HFilterScheme_Now"></div>
			</div>

			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			@@ -93,19 +102,25 @@
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName" id="ColName" lay-filter="ColName"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator" id="Comparator" lay-filter="Comparator"
			style="width:190px;" class="ForFilteringSchemes">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="<=">
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -113,26 +128,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName1" id="ColName1" lay-filter="ColName1"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
			style="width:190px;" class="ForFilteringSchemes">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="<=">
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -140,26 +162,33 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
			<select name="ColName2" id="ColName2" lay-filter="ColName2"
			style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
			style="width:190px;" class="ForFilteringSchemes">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="<=">
			<= </option>
			<option value="<">
			< </option>
			<option value="<>">
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -167,18 +196,20 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			<input type="text" class="layui-input ForFilteringSchemes" value=""
			name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div class="layui-col-xs2 layui-inline" id="TreeTableOuter"
			style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box"></div>
			</div>
			<div class="layui-col-xs9 layui-inline" style="padding-left: 5px; width: 82%">
			<div>
			<div id="mainTableOuter">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page"></div>
			</div>
			@@ -286,6 +317,8 @@
			})
			}
			});



			//#region é¡µé¢æé®ç¹æ£äºä»¶è§¦å
			table.on('toolbar(mainTable)', function (obj) {
			@@ -414,11 +447,17 @@
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//æ¥è¯¢
			get_FastQuery();

			//æ¥è¯¢å¨å·åç±»
			get_Display_Tree();


			get_DefaultModule();

			var mainTableHeight = $("#mainTableOuter").height()
			$("#TreeTableOuter").css("overflow", "auto")
			$("#TreeTableOuter").css("height", mainTableHeight+"px")

			}

			//#region å¯¼åºExecel
			@@ -428,8 +467,7 @@
			//#endregion

			//åå§åè¡¨æ ¼
			function set_InitGrid()
			{
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -452,7 +490,8 @@
			, {
			field: 'æ¨¡å·ç¼å·', title: 'å¨å·ç¼å·', sort: true, event: 'æ¨¡å·ç¼å·', templet: function (d) {
			return '<span style="color: blue;">' + d.æ¨¡å·ç¼å· + '</span>'
			}, style: 'cursor: pointer;' }
			}, style: 'cursor: pointer;'
			}
			, { field: 'æ¨¡å·åç§°', title: 'å¨å·åç§°', sort: true }
			, { field: 'æ¨¡å·åå·', title: 'å¨å·åå·', sort: true }
			, { field: 'æ¨¡å·åç±»', title: 'å¨å·åç±»', sort: true }
			@@ -634,6 +673,7 @@
			laypage.render(optionPage);
			option.data = [];
			table.render(option);

			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			@@ -809,8 +849,7 @@
			}

			//ä¿®æ¹
			function set_ShowBill()
			{
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			@@ -1559,4 +1598,5 @@
			</script>

			</body>

			</html>

	WebTM/views/IpadIndex.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html	106 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -87,7 +87,7 @@
			function () {
			TSLoad();
			},
			10000, // é´é3åé
			180000, // é´é3åé
			'interval' // å¾ªç¯ç±»å
			);

			@@ -881,6 +881,10 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if(!dataCol[i]){
			continue;
			}

			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {