MES-WEB-LayUI.git

			@@ -51,7 +51,89 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">

			<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-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>
			</div>
			</div>
			@@ -128,6 +210,11 @@
			});
			//#endregion

			//åå»è¡¨æ ¼äºä»¶
			table.on('rowDouble(mainTable)', function (obj) {
			btnrowDouble(obj.data);
			})

			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			@@ -144,6 +231,7 @@
			//å¿«éè¿æ»¤
			get_FastQuery(1);
			DisPlay_HideColumn();
			ColFilter();
			}
			//#endregion

			@@ -151,13 +239,13 @@
			function set_InitGrid() {
			var columns = [];

			columns.push({ type: 'checkbox', fixed: 'left' });
			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: true});
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true});
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true});
			columns.push({ field: 'HMaterModel', title: 'ç©æè§æ ¼', sort: true});
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true});
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true});
			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: true });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true });
			columns.push({ field: 'HMaterModel', title: 'ç©æè§æ ¼', sort: true });
			columns.push({ field: 'å¨éæ°é', title: 'å¨éæ°é', totalRow: true });
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true});
			//è·åä¸¤ä¸ªææä¹é´çç¸å·®
			var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
			var time2 = Date.parse(new Date($("#HENDDATE").val()));//ç»ææ¶é´
			@@ -173,7 +261,7 @@

			var k = 0;//æ¶éå¾ªç¯æ¬¡æ°
			for (var j = 0; j <= (Days - k); j++) {
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
			//è·¨å¹´çè¯ ä¼ä»ä¸æä¸å·å¼å§
			if (MM == 12 && (HBEGINDATE + j) == 31) {
			yyyy += 1;
			@@ -196,6 +284,7 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, loading: false
			@@ -211,7 +300,7 @@
			if (NumCount > parseFloat(item[dateNowTime])) {
			NumCount -= parseFloat(item[dateNowTime]);
			} else {
			var num = 6;//å³æ¶åºåä¸æ¥ææ¨ç ä»å³æ¶åºåå¼å§ç®
			var num = 7;//å³æ¶åºåä¸æ¥ææ¨ç ä»å³æ¶åºåå¼å§ç®
			tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
			rq = tr.children()[num + 1 + i];
			rq.style.color = '#f66161';//ç¶ååè²
			@@ -227,6 +316,21 @@
			}
			//#endregion

			//åå»è·³è½¬é½å¥åææç»è¡¨
			function btnrowDouble(obj) {

			var HMaterID = obj["ç©æID"];

			layer.open({
			type: 2 //ç±»å
			, skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, area: ['90%', '90%']//å¤§å°
			, title: 'é½å¥ç©æåææç»è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/é½å¥åæ/JIT_CompleteMaterlDetailList.html?OperationType=1&HMaterID=' + HMaterID, 'yes']
			})
			}

			//è·åç»ç»
			function Organ() {
			@@ -291,7 +395,80 @@
			//var HSUPPLIERID = $("#HSUPPLIERID").val();//ä¾åºå
			//var HXQD = $("#HXQD").val();//éæ±åå·
			//var HPURORDERNO = $("#HPURORDERNO").val();//éè´è®¢åå·
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HBEGINDATE > HENDDATE) {
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			}
			@@ -323,6 +500,15 @@
			//$("#HSUPPLIERNAME").val("");
			//$("#HXQD").val("");//éæ±åå·
			//$("#HPURORDERNO").val("");//éè´è®¢åå·
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');
			sWhere = "";
			}
			@@ -482,6 +668,23 @@
			}
			})
			}
			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);

			form.render('select');
			}

			//#endregion
			//ä»¥ä¸æ¯layuiæ¨¡å