MES-WEB-LayUI.git

			@@ -48,6 +48,13 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è®¡åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
			@@ -102,88 +109,88 @@
			</div>
			</div>
			<!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
			<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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
			<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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
			<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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
			<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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
			<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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>-->
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
			<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="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>-->

			</div>
			</div>
			@@ -242,6 +249,26 @@
			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//#region æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			//$('#HDate').prop('disabled', true);
			//$('#HDate1').prop('disabled', true);

			$("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//æ¬ ææ¥æ
			$("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//è³

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			//$('#HDate').prop('disabled', false);
			//$('#HDate1').prop('disabled', false);
			}
			});
			//#endregion

			//#region äº§åç¼ç
			form.on('submit(btnHMATERIALID)', function (data) {
			@@ -416,9 +443,13 @@

			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//åå§åæ¥æ
			$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æææ¥æ
			$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//è³
			$("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//è³
			//çäº§ç»ç»å è½½
			Organ();
			//åå§åè¡¨æ ¼
			@@ -438,15 +469,16 @@
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 1000
			, limits: [50, 500,1000, 5000, 20000]
			, limit: 50
			, limits: [50, 500,1000, 5000]
			//, loading: false
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°', width: 120, sort: true, filter: true }
			, { field: 'çäº§è½¦é´åç§°', title: 'çäº§è½¦é´åç§°', sort: true, filter: true }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°', width: 100, sort: true, filter: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', sort: true, filter: true }
			, { field: 'å®¢æ·è®¢åå·', title: 'å®¢æ·è®¢åå·', sort: true, filter: true }
			, { field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', sort: true, filter: true }
			, { field: 'FCOLUMN9', title: 'çµå/åç/åºæ¿', sort: true, filter: true }
			, { field: 'è®¢åäº¤æ', title: 'è®¢åäº¤æ', templet: "<div>{{d.è®¢åäº¤æ ==null ?'':layui.util.toDateString(d.è®¢åäº¤æ, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
			@@ -457,7 +489,10 @@
			, { field: 'æ¥è®¡åæ°é', title: 'æ¥è®¡åæ°é', sort: true, totalRow: true, filter: true }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', sort: true, filter: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true, filter: true }
			, { field: 'ç©æè§æ ¼åå·', title: 'ç©æè§æ ¼åå·', sort: true, filter: true }
			, { field: 'ç©æè§æ ¼åå·', title: 'ç©æè§æ ¼åå·', sort: true, filter: true }
			, { field: 'åä½ç¨é', title: 'åä½ç¨é', sort: true, filter: true }
			, { field: 'ä¾è´§è½¦é´ä»£ç ', title: 'ä¾è´§è½¦é´ä»£ç ', sort: true, filter: true }
			, { field: 'ä¾è´§è½¦é´', title: 'ä¾è´§è½¦é´', sort: true, filter: true }
			, { field: 'ç©æå±æ§', title: 'ç©æå±æ§', sort: true, filter: true }
			, { field: 'è®¡ååææ°é', title: 'è®¡ååææ°é', sort: true, totalRow: true, filter: true }
			, { field: 'é½å¥æ°é', title: 'é½å¥æ°é', sort: true, totalRow: true, filter: true }
			@@ -503,7 +538,7 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
			type: "GET",
			data: { "sWhere": sWhere },//, "user": sessionStorage["HUserName"]
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },//, "user": sessionStorage["HUserName"]
			success: function (result) {
			if (result.count == 1) {
			option.data = result.data;
			@@ -638,17 +673,10 @@
			$.ajax({
			url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
			type: "GET",
			data: { "sWhere": JSON.stringify(sWhere) },//, "user": sessionStorage["HUserName"]
			data: { "sWhere": JSON.stringify(sWhere), "user": sessionStorage["HUserName"] },//, "user": sessionStorage["HUserName"]
			success: function (result) {
			if (result.count == 1) {
			data = result.data;

			option.data = data;

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			ins = table.render(option);

			data.forEach((item) => {
			for (let itemobj in item) {
			@@ -657,11 +685,12 @@
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, data, "xls");
			table.exportFile('mainTable', data, "xls");

			layer.close(ajaxLoad);
			} else {
			@@ -816,7 +845,7 @@
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æææ¥æ
			$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//è³
			$("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//è³
			$("#HMaterAtt").val("");
			form.render('select');
			sWhere = "";
			@@ -915,6 +944,24 @@
			form.render('select');
			}

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [7,30, 45, 60];
			var titleList = ["è¿7å¤©","è¿ä¸æ", "è¿45å¤©", "è¿60å¤©"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
			}

			$("#HInitTimeCycle").empty();
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
			form.render('select');

			$("#HInitTimeCycle").val("30");
			}
			//#endregion

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