MES-WEB-LayUI.git

			@@ -23,7 +23,7 @@
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-collapse" hidden>
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			<div class="layui-inline">
			@@ -179,7 +179,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>å¯ç¨é»è®¤</button>
			@@ -187,7 +187,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>æ¥çå®¡æ¹è¿åº¦</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -421,9 +421,9 @@
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			/{ type: 'checkbox', fixed: 'left' }/
			/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 165 }
			{ field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 165 }
			, { field: 'å·¥èºåç§°', title: 'å·¥èºåç§°', width: 170, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160, sort: true }
			@@ -700,7 +700,7 @@
			//ä»å«çé¡µé¢æå¼ä¼ å¥Hmateridå¼ï¼è®¾ç½®ç©æè¿æ»¤
			sWhere += " and HMaterID = " + HMaterID;
			//ä»å«çé¡µé¢æå¼è®¾ç½®å³é
			sWhere += " and hmainid!=" + HInterID + " and å·¥èºåç§° = ''" + HName.toString() + "''" + "and å®¡æ ¸äºº!=''''";
			sWhere += " and hmainid!=" + HInterID + " and å·¥èºåç§° = ''" + HName.toString() + "''" + "and ç¶æ=''å®¡æ ¸''";
			} else {
			//ä¸æ¯ä»å«çé¡µé¢æå¼
			var HMaterID2 = $("#HMaterID").val();
			@@ -765,7 +765,7 @@
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡', hide: true });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			@@ -1036,7 +1036,7 @@
			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_DisplayPage(sWhere);
			get_FastQuery();
			}

			//å¯ç¨é»è®¤