MES-WEB-LayUI.git

			@@ -53,16 +53,12 @@
			</div>
			</div>
			<div class="layui-inline">
			<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="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<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;">
			@@ -76,12 +72,33 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<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="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æå±æ§</label>
			<div class="layui-input-block">
			<select name="HMaterClsID" id="HMaterClsID" lay-verify="HMaterClsID">
			<option value="0" selected>å¨é¨</option>
			<option value="1">å¤è´</option>
			<option value="2">èªå¶</option>
			<option value="3">å§å¤</option>
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">å¯¼åº</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">åè®¾ç½®</button>
			</div>


			<!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			@@ -152,6 +169,14 @@

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

			//#endregion è¾å¥æ¡åè½¦çå¬
			//$('input[type="text"]').on('keydown', function (event) {
			// if (event.keyCode == 13) {
			// $("#btnSearch").click();
			// }
			//});
			//#endregion

			//#region äº§åç¼ç
			form.on('submit(btnHMATERIALID)', function (data) {
			btnHMATERIALID();
			@@ -188,21 +213,61 @@
			var HWorkShopID = obj.data.éæ±è½¦é´ID;
			var HBEGINDATE = $("#HBEGINDATE").val();//æ¬ ææ¥æ
			var HENDDATE = $("#HENDDATE").val();//è³
			layer.open({
			type: 2
			, skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			, area: ['90%', '90%']
			, title: 'ä¸å±ç¼ºææåµ'
			, shift: 2//å¼¹åºå¨ç»
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../çäº§ç®¡ç/æ¬ æè¿ç®/JIT_MaterialLevelShorAnalysisDetailReport.html?type=2&HOrgID=' + HOrgID + "&HMaterID=" + HMaterID + "&HWorkShopID=" + HWorkShopID + "&HBEGINDATE=" + HBEGINDATE + "&HENDDATE=" + HENDDATE, 'yes']
			})
			window.open('../../çäº§ç®¡ç/æ¬ æè¿ç®/JIT_MaterialLevelShorAnalysisDetailReport.html?type=2&HOrgID=' + HOrgID + "&HMaterID=" + HMaterID + "&HWorkShopID=" + HWorkShopID + "&HBEGINDATE=" + HBEGINDATE + "&HENDDATE=" + HENDDATE);
			//layer.open({
			// type: 2
			// , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡
			// , area: ['90%', '90%']
			// , title: 'ä¸å±ç¼ºææåµ'
			// , shift: 2//å¼¹åºå¨ç»
			// , shade: 0.6 //é®ç½©éæåº¦
			// //, maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../çäº§ç®¡ç/æ¬ æè¿ç®/JIT_MaterialLevelShorAnalysisDetailReport.html?type=2&HOrgID=' + HOrgID + "&HMaterID=" + HMaterID + "&HWorkShopID=" + HWorkShopID + "&HBEGINDATE=" + HBEGINDATE + "&HENDDATE=" + HENDDATE, 'yes']
			//})
			})
			//#endregion

			//#endregion

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

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

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else if (HInitTimeCycle==45) {
			//$('#HBeginDate').prop('disabled', true);
			//$('#HEndDate').prop('disabled', true);

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

			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			}
			else if (HInitTimeCycle == 60) {
			//$('#HBeginDate').prop('disabled', true);
			//$('#HEndDate').prop('disabled', true);

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

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

			//#endregion

			@@ -241,10 +306,21 @@

			}
			})

			//åå§åæ¥æ
			$("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//æ¬ ææ¥æ
			$("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//è³
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle == 30) {
			$("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//æ¬ ææ¥æ
			$("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//è³
			} else if (HInitTimeCycle == 45) {
			$("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 15), "yyyy-MM-dd"));//æ¬ ææ¥æ
			$("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//è³
			}
			else if (HInitTimeCycle == 60) {
			$("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 30), "yyyy-MM-dd"));//æ¬ ææ¥æ
			$("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//è³
			}
			//çäº§ç»ç»å è½½
			Organ();
			//è½¦é´
			@@ -336,6 +412,14 @@
			, cols: [columns]
			, done: function (res, curr, count) {
			soulTable.render(this);
			for (var i in res.data) {
			var item = res.data[i];

			if (item["æªå¹éè®¢åæ°é"] > 0) {
			$("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
			}

			}
			}
			};
			}
			@@ -368,11 +452,12 @@
			function get_Dept() {
			//è·åè½¦é´å
			var HDeptID = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			var sql = "exec h_p_Gy_GetHDeptListISWorkShop " + sessionStorage["OrganizationID"]
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			data: { "sWhere": sql},
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			@@ -427,14 +512,39 @@
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'æ¯å¦å¹éå°è®¢å') {
			col.push({ field: 'æ¯å¦å¹éå°è®¢å', title: 'æ¯å¦å¹éå°è®¢å', sort: true, filter: true, templet: function (d) { return d.æ¯å¦å¹éå°è®¢å ? 'å¦' : 'æ¯'; } });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
			} else if (data[i].name == 'æªå¹éè®¢åæ°é') {
			col.push({
			field: 'æªå¹éè®¢åæ°é', title: 'æªå¹éè®¢åæ°é', sort: true, filter: true, templet: function (d) {
			return d.æªå¹éè®¢åæ°é > 0 ? '<span style="color: black;">' + d.æªå¹éè®¢åæ°é + '</span>' : d.æªå¹éè®¢åæ°é;
			} });
			}
			else if (data[i].name == 'æ¯å¦å¹éå°è¦æè®¡åä¿¡æ¯') {
			col.push({ field: 'æ¯å¦å¹éå°è¦æè®¡åä¿¡æ¯', title: 'æ¯å¦å¹éå°è¦æè®¡åä¿¡æ¯', sort: true, filter: true, templet: function (d) { return d.æ¯å¦å¹éå°è¦æè®¡åä¿¡æ¯ ? 'å¦' : 'æ¯'; } });
			else if (data[i].name == 'æªå¹éè¦æè®¡åä¿¡æ¯æ°é') {
			col.push({
			field: 'æªå¹éè¦æè®¡åä¿¡æ¯æ°é', title: 'æªå¹éè¦æè®¡åä¿¡æ¯æ°é', sort: true, filter: true, templet: function (d) {
			return d.æªå¹éè¦æè®¡åä¿¡æ¯æ°é > 0 ? '<span style="color: black;">' + d.æªå¹éè¦æè®¡åä¿¡æ¯æ°é + '</span>' : d.æªå¹éè¦æè®¡åä¿¡æ¯æ°é;
			}
			});
			} else if (isValidDate(data[i].name)) {
			col.push({ field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true })
			col.push({
			field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true, templet: function (d) {
			//è·åå½åä»å¤©æå¤©åå¤©ä¸å¤©çæ¥æåç¬¦ä¸²
			const dates = [];
			const today = new Date();
			for (let i = 0; i < 3; i++) {
			const date = new Date(today);
			date.setDate(today.getDate() + i);
			const dateStr = date.toISOString().slice(0, 10);
			dates.push(`${dateStr}`);
			}
			// å¦æè¡æ¥æå¨å½åæ¥æä¸å¤©åï¼ååå®¹æ çº¢
			if ((this.field == dates[0] \|\| this.field == dates[1] \|\| this.field == dates[2]) && d[this.field] != null) {
			return '<span style="color:Orange">' + (d[this.field] == null ? 0 : d[this.field]) + '</span>';
			} else {
			return d[this.field] == null ? 0 : d[this.field]
			}
			}
			})
			}
			else {
			switch (data[i].Type) {
			@@ -443,7 +553,7 @@
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, width: 200 });
			}
			}
			}
			@@ -511,8 +621,10 @@
			var HBEGINDATE = $("#HBEGINDATE").val();//æ¬ ææ¥æ
			var HENDDATE = $("#HENDDATE").val();//è³
			var HMATERIALID = $("#HMATERIALID").val();//ç©æ/äº§å
			var HMATERIALNAME = $("#HMATERIALNAME").val();//ç©æåç§°
			var HWorkShopID = $("#HWorkShopID").val();//ç©æ/äº§å
			var HWorkShopID2 = $("#HWorkShopID2").val();//ç©æ/äº§åéæ±è½¦é´
			var HMaterClsID = $("#HMaterClsID").val();//ç©æå±æ§
			if (HBEGINDATE > HENDDATE) {
			return layer.msg("å¼å§æ¥æä¸è½å°äºç»ææ¥æ!");
			}
			@@ -526,11 +638,18 @@
			if (HWorkShopID2 != 0) {
			sWhere += " and T1.HWorkShopID= " + HWorkShopID2 + " ";
			}
			if (HMaterClsID != 0) {
			sWhere += " and T1.HMaterClsID=" + HMaterClsID + " ";
			}
			//if (HBEGINDATE != null && HENDDATE != null) {
			// sWhere += " and HDate between ''" + HBEGINDATE + "'' and ''" + HENDDATE + "'' ";
			//}
			if (HMATERIALID!=0) {
			sWhere += " and T1.HMaterID= " + HMATERIALID+" ";
			if (HMATERIALID != 0) {
			sWhere += " and T1.HMaterID= " + HMATERIALID + " ";
			} else {
			if (HMATERIALNAME != "") {
			sWhere += " and (T2.HName like ''%" + HMATERIALNAME + "%'' or T2.HNumber like ''%" + HMATERIALNAME + "%'') ";
			}
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -546,6 +665,7 @@
			$("#HMATERIALNAME").val("");
			$("#HWorkShopID").val("0");
			$("#HWorkShopID2").val("0");
			$("#HMaterClsID").val("0");
			form.render('select');
			sWhere = "";
			}
			@@ -576,6 +696,24 @@
			})
			}

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [30, 45, 60];
			var titleList = ["è¿ä¸æ", "è¿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

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