MES-WEB-LayUI.git

			@@ -32,25 +32,37 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HICMOBillNo" id="HICMOBillNo">
			<input type="text" class="layui-input ForFilteringSchemes" name="HICMOBillNo" id="HICMOBillNo" onfocus="this.select();">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">SNç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_SN" id="HBarcode_SN">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_SN" id="HBarcode_SN" onfocus="this.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="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZB" id="HBarcode_ZB">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZB" id="HBarcode_ZB" onfocus="this.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="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZX" id="HBarcode_ZX">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZX" id="HBarcode_ZX" onfocus="this.select();">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:110px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:110px;">
			</div>
			</div>

			@@ -185,7 +197,7 @@
			var titleData = ["hmainid","hsubid","HProdOrgID"];

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "";
			var HModuleType = "Cj_ProcessItemStationPlatform_UnbindList";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
			//#endregion
			@@ -306,16 +318,48 @@
			});
			//#endregion

			//å·¥åå·åè½¦æ¹æ³
			$('#HICMOBillNo').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery(2);
			}
			});

			//SNç åè½¦æ¹æ³
			$('#HBarcode_SN').on('keydown', function (event) {
			if (event.keyCode == 13) {
			//get_FastQuery(2);
			$('#HBarcode_SN').val($('#HBarcode_SN').val() + ',')
			//console.log($('#HBarcode_SN').val());
			}
			});

			//æ æ¿ç åè½¦æ¹æ³
			$('#HBarcode_ZB').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery(2);
			}
			});

			//ä¸ç®±ç åè½¦æ¹æ³
			$('#HBarcode_ZX').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery(2);
			}
			});

			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

			//#region åå§åçé¢
			function set_ClearBill() {
			$("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_FastQuery(1);
			//get_FastQuery(1);
			}
			//#endregion

			@@ -425,6 +469,8 @@
			var HBarcode_SN = $("#HBarcode_SN").val(); //SNå·
			var HBarcode_ZB = $("#HBarcode_ZB").val(); //æ æ¿ç
			var HBarcode_ZX = $("#HBarcode_ZX").val(); //ä¸ç®±ç
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ

			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			@@ -500,16 +546,33 @@
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HICMOBillNo) {
			sWhere += " and çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
			sWhere += " and å·¥åç¼å· like '%" + HICMOBillNo + "%'";
			}

			//if (HBarcode_SN) {
			// sWhere += " and DSN like '%" + HBarcode_SN + "%'";
			//}
			if (HBarcode_SN) {
			sWhere += " and DSN like '%" + HBarcode_SN + "%'";
			HBarcode_SN = HBarcode_SN.substring(0, HBarcode_SN.length - 1)
			HBarcode_SN = HBarcode_SN.replace(/ï¼/g, ',')
			.split(',')
			.map(item => `'${item.trim()}'`)
			.join(',');

			console.log("å¤çç»æ:", HBarcode_SN);
			sWhere += " and DSN in (" + HBarcode_SN + ")";
			}
			if (HBarcode_ZB) {
			sWhere += " and æ æ¿ç like '%" + HBarcode_ZB + "%'";
			sWhere += "and æ æ¿ç like '%" + HBarcode_ZB + "%'";
			}
			if (HBarcode_ZX) {
			sWhere += " and ä¸ç®±ç like '%" + HBarcode_ZX + "%'";
			sWhere += "and ä¸ç®±ç like '%" + HBarcode_ZX + "%'";
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),çäº§æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),çäº§æ¥æ, 23) <= '" + HDate1 + "'";
			}

			get_Display(sWhere);
			@@ -523,6 +586,8 @@
			$("#HBarcode_SN").val("");
			$("#HBarcode_ZB").val("");
			$("#HBarcode_ZX").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -533,7 +598,8 @@
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');


			get_FastQuery("")
			sWhere = "";
			}
			//#endregion
			@@ -549,7 +615,7 @@
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceALL(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});