MES-WEB-LayUI.git

			@@ -76,8 +76,6 @@
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->


			<div class="layui-colla-content">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			@@ -103,11 +101,11 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			@@ -196,7 +194,7 @@
			, util = layui.util
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var option = []; var columns = [];
			var Name = "MouldProdInHouseCellWidth";
			//#endregion

			@@ -298,7 +296,6 @@
			});
			//#endregion


			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			@@ -308,87 +305,103 @@
			//å è½½ä¸å¡å
			get_HEmpName();
			}

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val("2022-03-14");
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			, { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			, { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			, { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			, { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120}
			, { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
			, { field: 'HSSID', title: 'HSSID', hide: true }
			, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
			, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
			, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'HCurID', title: 'HCurID', hide: true }
			, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100}
			, { field: 'å¸å«', title: 'å¸å«', width: 100}
			, { field: 'æ±ç', title: 'æ±ç', width: 100}
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100}
			, { field: 'é¨é¨', title: 'é¨é¨', width: 100}
			, { field: 'HManagerID', title: 'HManagerID', hide: true }
			, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100}
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
			, { field: 'HEmpID', title: 'HEmpID', hide: true }
			, { field: 'æè¦', title: 'æè¦', width: 100}
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'åä»·', title: 'åä»·', width: 100}
			, { field: 'éé¢', title: 'éé¢', width: 100}
			, { field: 'ç¨ç', title: 'ç¨ç', width: 100}
			, { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
			, { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 100}
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

			];
			//columns = [
			// { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			// ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			// , { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			// , { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			// , { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			// , { field: 'HBillType', title: 'HBillType', hide: true }
			// , { field: 'HSupID', title: 'HSupID', hide: true }
			// , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			// , { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			// , { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			// , { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			// , { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			// , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			// , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			// , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			// , { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
			// , { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			// , { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			// , { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			// , { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			// , { field: 'HUnitID', title: 'HUnitID', hide: true }
			// , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			// , { field: 'HUnitID', title: 'HUnitID', hide: true }
			// , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			// , { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			// , { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			// , { field: 'æ°é', title: 'æ°é', width: 100 }
			// , { field: 'æºååå·', title: 'æºååå·', width: 100 }
			// , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			// , { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			// , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			// , { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			// , { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			// , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			// , { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120}
			// , { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
			// , { field: 'HSSID', title: 'HSSID', hide: true }
			// , { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
			// , { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
			// , { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'HCurID', title: 'HCurID', hide: true }
			// , { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100}
			// , { field: 'å¸å«', title: 'å¸å«', width: 100}
			// , { field: 'æ±ç', title: 'æ±ç', width: 100}
			// , { field: 'HDeptID', title: 'HDeptID', hide: true }
			// , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100}
			// , { field: 'é¨é¨', title: 'é¨é¨', width: 100}
			// , { field: 'HManagerID', title: 'HManagerID', hide: true }
			// , { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100}
			// , { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
			// , { field: 'HEmpID', title: 'HEmpID', hide: true }
			// , { field: 'æè¦', title: 'æè¦', width: 100}
			// , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
			// , { field: 'hsubid', title: 'hsubid', hide: true }
			// , { field: 'HMaterID', title: 'HMaterID', hide: true }
			// , { field: 'åä»·', title: 'åä»·', width: 100}
			// , { field: 'éé¢', title: 'éé¢', width: 100}
			// , { field: 'ç¨ç', title: 'ç¨ç', width: 100}
			// , { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
			// , { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
			// , { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
			// , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
			// , { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
			// , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
			// , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
			// , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'å³éäºº', title: 'å³éäºº', width: 100}
			// , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
			// , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }
			//];
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/list2',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			columns = data1.data;
			columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -414,6 +427,7 @@
			// });
			//}
			}

			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			@@ -536,7 +550,7 @@
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
			, resize: false
			})
			@@ -1005,8 +1019,8 @@

			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·