MES-WEB-LayUI.git

			@@ -52,7 +52,13 @@
			</select>
			</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;">
			@@ -92,7 +98,7 @@
			<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">
			@@ -224,6 +230,26 @@

			//#endregion

			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle !=0) {
			//$('#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() + HInitTimeCycle), "yyyy-MM-dd"));//è³

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

			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			@@ -261,10 +287,14 @@

			}
			})

			//åå§åæ¥æ
			$("#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"));//è³
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle !=0) {
			$("#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"));//è³
			}
			//çäº§ç»ç»å è½½
			Organ();
			//è½¦é´
			@@ -356,6 +386,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;" });
			}

			}
			}
			};
			}
			@@ -452,17 +490,35 @@
			} else if (data[i].name == 'æªå¹éè®¢åæ°é') {
			col.push({
			field: 'æªå¹éè®¢åæ°é', title: 'æªå¹éè®¢åæ°é', sort: true, filter: true, templet: function (d) {
			return d.æªå¹éè®¢åæ°é > 0 ? '<span style="color: red;">' + d.æªå¹éè®¢åæ°é + '</span>' : 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.æªå¹éè¦æè®¡åä¿¡æ¯æ°é > 0 ? '<span style="color: red;">' + d.æªå¹éè¦æè®¡åä¿¡æ¯æ°é + '</span>' : 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) {
			@@ -525,6 +581,12 @@
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			if (itemobj === 'è§æ ¼åå·') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			if (itemobj === 'ç©æåç§°') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			}
			});
			@@ -614,6 +676,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("60");
			}
			//#endregion

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