MES-WEB-LayUI.git

			@@ -38,7 +38,7 @@
			<div class="layui-form-item layui-inline">
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
			</div>
			</div>
			</div>
			@@ -46,7 +46,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">-</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
			</div>
			</div>
			</div>
			@@ -55,39 +55,35 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			</div>



			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<!--å¶ä»æ¡ä»¶-->
			<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="HMaterNumber" id="HMaterNumber">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
			</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="HBillNo" id="HBillNo">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
			</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="HProductName" id="HProductName">
			<input type="text" class="layui-input ForFilteringSchemes" name="HProductName" id="HProductName">
			</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="HProductModel" id="HProductModel">
			<input type="text" class="layui-input ForFilteringSchemes" name="HProductModel" id="HProductModel">
			</div>
			</div>
			</div>
			@@ -115,7 +111,64 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>

			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<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>
			@@ -156,16 +209,6 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var HModName = "sc_ICOMReport";

			var titleData = ["HCusID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var detailBar = 0; //ç¨äºæ±æ»æ¥è¡¨æ¥çæç»æ¥è¡¨ï¼å½ä¸º0æ¶æ¾ç¤ºæç»æ±æ»æ¥è¡¨å¯¹åºæç»æ¥è¡¨ã

			var ins; //ç¨äºå¯¼åºexcel


			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -181,7 +224,16 @@

			//#endregion

			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var HModName = "sc_ICOMReport";

			var titleData = ["HCusID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var detailBar = 0; //ç¨äºæ±æ»æ¥è¡¨æ¥çæç»æ¥è¡¨ï¼å½ä¸º0æ¶æ¾ç¤ºæç»æ±æ»æ¥è¡¨å¯¹åºæç»æ¥è¡¨ã

			var ins; //ç¨äºå¯¼åºexcel
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -200,7 +252,7 @@
			get_Export();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			case 'btn-exit': Pub_Close(2);
			break;
			//å³éè®¢å
			case 'btn-Close': btn_Close(obj);
			@@ -221,6 +273,7 @@
			break;
			};
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			@@ -263,13 +316,11 @@
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));

			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			DisPlay_HideColumn();
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			//å è½½æ°æ®å°ç½æ ¼
			//get_FastQuery();
			DisPlay_HideColumn();

			}

			//åææ¾ç¤ºä¸ææ¡
			@@ -283,6 +334,14 @@
			$("#ColName").empty();
			$("#ColName").append(Organization);
			form.render('select');

			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');


			}


			@@ -355,32 +414,34 @@
			}
			})
			}



			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HMaterNumber = $("#HMaterNumber").val();//äº§åä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			var HProductModel = $("#HProductModel").val();//äº§åè§æ ¼
			var HProductModel = $("#HProductModel").val();//è§æ ¼åå·


			sWhere = " and æ¥æ between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";

			if (HMaterNumber != "") {
			sWhere += " and ç©æä»£ç =''" + HMaterNumber + "'' ";
			sWhere += " and ç©æä»£ç like ''%" + HMaterNumber + "%'' ";
			}

			if (HBillNo != "") {
			sWhere += " and çäº§è®¢åå·=''" + HBillNo + "'' ";
			sWhere += " and åæ®å· like ''%" + HBillNo + "%'' ";
			}

			if (HProductName != "") {
			sWhere += " and ç©æåç§°=''" + HProductName + "'' ";
			sWhere += " and ç©æåç§° like ''%" + HProductName + "%'' ";
			}

			if (HProductModel != "") {
			sWhere += " and è§æ ¼åå·=''" + HProductModel + "'' ";
			sWhere += " and è§æ ¼åå· like ''%" + HProductModel + "%'' ";
			}

			//ä»»æåæ®µæ¡ä»¶è¿æ»¤ æ¡ä»¶æå
			@@ -388,6 +449,13 @@
			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();


			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			@@ -408,10 +476,52 @@
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			}
			com = " and (" + ColName + " " + com + ")";
			sWhere += " and " + ColName + " " + com;
			}
			sWhere += 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 = "" + Comparator2 + "''" + ColContent2 + "''";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}


			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			sWhere += getSWhereByHUser();

			@@ -422,7 +532,7 @@

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//åå§åæ¶é´
			//åå§åæ¶é´set_InitGrid
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
			$("#HMaterNumber").val("");
			@@ -432,6 +542,14 @@
			$("#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');
			ColFilter();
			sWhere = "";
			}
			@@ -464,7 +582,7 @@
			});
			}
			})


			}

			function btn_AddHRemark() {
			@@ -474,7 +592,7 @@
			} else {
			layer.prompt({ title: 'æ·»å å¤æ³¨', formType: 2 }, function (text, index) {

			var sMainSub = checkStatus.data[0]["çäº§è®¢åå·"]+ ";"+text + ";" + sessionStorage["HUserName"];
			var sMainSub = checkStatus.data[0]["çäº§è®¢åå·"] + ";" + text + ";" + sessionStorage["HUserName"];
			$.ajax({
			url: GetWEBURL() + "/LEMS/sc_ICOMReportAddHRemark",
			type: "POST",
			@@ -496,7 +614,7 @@
			});
			}
			})


			});
			}
			}
			@@ -522,6 +640,7 @@
			});
			}
			//#endregion


			//éèåè®¾ç½®
			function get_HideColumn() {
			@@ -646,7 +765,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'å®¢æ·è®¢åæç»æ¥è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è½¦é´ç®¡ç/æ¥è¡¨åæ/Sc_ICOMProBarCodeReport.html?OperationType=1&HICMOBillNo=' + HICMOBillNo , 'yes']
			, content: ['../../è½¦é´ç®¡ç/æ¥è¡¨åæ/Sc_ICOMProBarCodeReport.html?OperationType=1&HICMOBillNo=' + HICMOBillNo, 'yes']
			})
			}

			@@ -677,6 +796,8 @@
			}
			//#endregion



			//#region ãè¿æ»¤æ¹æ¡ã

			//è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
			@@ -687,11 +808,6 @@
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {
			sWhere += " and 1=0 ";
			get_FastQuery();
			ColFilter();


			//å½åç¨æ·è®¾ç½®æé»è®¤çè¿æ»¤æ¹æ¡
			var data = data1.data;
			//å½åéæ©çè¿æ»¤æ¹æ¡
			@@ -712,15 +828,18 @@
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}
			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			//æ¥è¯¢

			get_FastQuery();

			form.render("select");
			} else {
			//å½åç¨æ·æ²¡æè®¾ç½®é»è®¤çè¿æ»¤æ¹æ¡
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			//æ¥è¯¢
			get_FastQuery();
			form.render("select");
			}
			}, error: function () {
			@@ -889,10 +1008,9 @@
			}

			//#endregion

			//#endregion
			});


			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡
			{
			@@ -931,7 +1049,6 @@
			});
			}
			//#endregion

			</script>
			</body>
			</html>