MES-WEB-LayUI.git

			@@ -11,6 +11,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -29,7 +30,7 @@
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -58,7 +59,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -82,7 +83,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -116,7 +117,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -129,6 +130,7 @@
			, util = layui.util
			, tree = layui.tree
			, util = layui.util
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var HMainICMOEntryID = -1;//ä¸»çäº§è®¢åååç
			@@ -141,7 +143,7 @@
			//#region åå§åçé¢

			var params = getUrlVars();
			var OperationType = params[params[0]];
			var OperationType = params[params[0]];

			//å¤ææ¯å¦æåæ°ä¼ é
			if (!isNaN(OperationType)) {
			@@ -151,7 +153,7 @@
			}

			set_ClearBill();



			//#endregion

			@@ -218,39 +220,47 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HinterId', title: 'HinterId', hide: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·' }
			, { field: 'æ¥è®¡åå·¥åå·', title: 'æ¥è®¡åå·¥åå·' }
			, { field: 'æ¥è®¡åè®¢åååç ', title: 'æ¥è®¡åè®¢åååç ', hide: true }
			, { field: 'æ¥è®¡åè®¢åä¸»åç ', title: 'æ¥è®¡åè®¢åä¸»åç ', hide: true }
			, { field: 'ä¸»çäº§è®¢åååç ', title: 'ä¸»çäº§è®¢åååç ', hide: true }
			, { field: 'ä¸»çäº§è®¢åä¸»åç ', title: 'ä¸»çäº§è®¢åä¸»åç ', hide: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ =='' ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç©æID', title: 'ç©æID', hide: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ' }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é' }
			, { field: 'é½å¥ç¶æ', title: 'é½å¥ç¶æ' }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é' }
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é' }
			, { field: 'é¢æå ç¨æ°é', title: 'é¢æå ç¨æ°é' }
			, { field: 'å¯ç¨æ°é', title: 'å¯ç¨æ°é' }
			, { field: 'å ç¨æ°é', title: 'å ç¨æ°é' }
			, { field: 'åä½ç¨é', title: 'åä½ç¨é' }
			, { field: 'é½å¥åæè®¡ç®æ¶é´', title: 'é½å¥åæè®¡ç®æ¶é´' }
			, { field: 'çäº§è½¦é´ID', title: 'çäº§è½¦é´ID', hide: true }
			, { field: 'çäº§è½¦é´ç¼ç ', title: 'çäº§è½¦é´ç¼ç ' }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°' }
			, { field: 'ä»åºID', title: 'ä»åºID', hide: true }
			, { field: 'ä»åºç¼ç ', title: 'ä»åºç¼ç ' }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 120}
			, { field: 'æ¹å·', title: 'æ¹å·' ,width:120}
			, { field: 'HinterId', title: 'HinterId', hide: true, sort: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true }
			, { field: 'æ¥è®¡åå·¥åå·', title: 'æ¥è®¡åå·¥åå·', sort: true }
			, { field: 'æ¥è®¡åè®¢åååç ', title: 'æ¥è®¡åè®¢åååç ', hide: true, sort: true }
			, { field: 'æ¥è®¡åè®¢åä¸»åç ', title: 'æ¥è®¡åè®¢åä¸»åç ', hide: true, sort: true }
			, { field: 'ä¸»çäº§è®¢åååç ', title: 'ä¸»çäº§è®¢åååç ', hide: true, sort: true }
			, { field: 'ä¸»çäº§è®¢åä¸»åç ', title: 'ä¸»çäº§è®¢åä¸»åç ', hide: true, sort: true }
			, { field: 'æ¥è®¡åæ¥æ', title: 'æ¥è®¡åæ¥æ', templet: "<div>{{d.æ¥è®¡åæ¥æ =='' ?'':layui.util.toDateString(d.æ¥è®¡åæ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'ç©æID', title: 'ç©æID', hide: true, sort: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº', sort: true }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', sort: true, totalRow: true }
			, { field: 'é½å¥ç¶æ', title: 'é½å¥ç¶æ', sort: true }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é', sort: true, totalRow: true }
			, { field: 'ç¼ºææ°é', title: 'ç¼ºææ°é', sort: true, totalRow: true }
			, { field: 'éè´å¨é', title: 'éè´å¨é', totalRow: true }
			, { field: 'çäº§æªå¥åº', title: 'çäº§æªå¥åº', totalRow: true }
			, { field: 'é¢æå ç¨æ°é', title: 'é¢æå ç¨æ°é', sort: true, totalRow: true }
			, { field: 'å¯ç¨æ°é', title: 'å¯ç¨æ°é', sort: true, totalRow: true }
			, { field: 'å ç¨æ°é', title: 'å ç¨æ°é', sort: true, totalRow: true}
			, { field: 'åä½ç¨é', title: 'åä½ç¨é', sort: true, totalRow: true }
			, { field: 'é½å¥åæè®¡ç®æ¶é´', title: 'é½å¥åæè®¡ç®æ¶é´', sort: true }
			, { field: 'çäº§è½¦é´ID', title: 'çäº§è½¦é´ID', hide: true, sort: true }
			, { field: 'çäº§è½¦é´ç¼ç ', title: 'çäº§è½¦é´ç¼ç ', sort: true }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true }
			, { field: 'ä»åºID', title: 'ä»åºID', hide: true, sort: true }
			, { field: 'ä»åºç¼ç ', title: 'ä»åºç¼ç ', sort: true }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 120, sort: true }
			, { field: 'ä»ä½ID', title: 'ä»ä½ID', hide: true, sort: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 120, sort: true }
			]]
			, done: function (res, curr, count) {
			soulTable.render(this);
			for (var i in res.data) {
			var item = res.data[i];

			@@ -296,15 +306,23 @@
			function get_FastQuery() {
			var HMaterID = $("#HMaterID").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			var HMaterModel = $("#HMaterModel").val();
			var HComplete = $("#HComplete").val();
			var HPlanDate = $("#HPlanDate").val();
			var HICMOBillNo = $("#HICMOBillNo").val();


			if (HMaterID!="0") {
			sWhere += " and ç©æID = '" + HMaterID + "'";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æç¼ç = '" + HMaterNumber + "'";
			sWhere += " and ç©æç¼ç like '%" + HMaterNumber + "%'";
			}
			if (HMaterName) {
			sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
			}
			if (HMaterModel) {
			sWhere += " and è§æ ¼åå· like '%" + HMaterModel + "%'";
			}
			if (HComplete) {
			sWhere += " and é½å¥ç¶æ = '" + HComplete + "'";
			@@ -361,6 +379,9 @@

			}




			//éèåè®¾ç½®
			function get_HideColumn(value) {
			var colName = "";