MES-WEB-LayUI.git

			@@ -43,6 +43,7 @@
			</select>
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">ä¸è¾¾æ¥æ</label>
			<div class="layui-input-block">
			@@ -68,13 +69,9 @@
			<div class="layui-row" style="margin-top:10px;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-inline">
			<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			<label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
			</div>
			</div>
			<div class="layui-inline">
			@@ -84,23 +81,16 @@
			</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" name="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin: 10px 0 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">çç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¯ä¸ID</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			@@ -112,6 +102,98 @@
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è®¢åç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
			<select name="HSTATUS" lay-verify="HSTATUS" id="HSTATUS">
			<option value="0">å¨é¨</option>
			<option value="4" selected="selected">å¼å·¥</option>
			<option value="6">ç»æ¡</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin: 10px 0 10px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" 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" 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>
			@@ -220,10 +302,10 @@
			});
			});

			//ç©æ
			form.on('submit(btnHMaterID)', function (data) {//éæ©ä»ä½
			get_btnHMaterID();
			});
			////ç©æ
			//form.on('submit(btnHMaterID)', function (data) {
			// get_btnHMaterID();
			//});

			//#endregion

			@@ -231,8 +313,9 @@

			//åå§åçé¢
			function set_ClearBill() {
			get_Dept();
			//åå§åæ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			//åå§åè¡¨æ ¼
			set_InitGrid();
			@@ -257,8 +340,8 @@
			, { field: 'çäº§è®¢åå·', title: 'æ¹å·', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'å¼å·¥æ¥æ', title: 'ä¸è¾¾æ¥æ', width: 160, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è¦æ±å®å·¥', title: 'è¦æ±å®å·¥', width: 160, templet: "<div>{{d.è¦æ±å®å·¥ ==null ?'':layui.util.toDateString(d.è¦æ±å®å·¥, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å¼å·¥æ¥æ', title: 'ä¸è¾¾æ¥æ', width: 160, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'è¦æ±å®å·¥', title: 'è¦æ±å®å·¥', width: 160, templet: "<div>{{d.è¦æ±å®å·¥ ==null ?'':layui.util.toDateString(d.è¦æ±å®å·¥, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 200 }
			, { field: 'æ´æ¹', title: 'æ´æ¹', width: 160, totalRow: true }
			, { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160, totalRow: true}
			@@ -317,6 +400,10 @@
			// }
			// }
			//}

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			table.render(option);
			layer.close(wait);
			} else {
			@@ -330,19 +417,129 @@
			});
			}

			//çäº§è½¦é´
			function get_Dept() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			if (sessionStorage["OrganizationID"] == 100014) {
			HDeptName += '<option style="color:blue;" value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
			HDeptName += '<option style="color:blue;" value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592371" >å°è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592374" >å°è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="1743766" >å¡è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1743767" >å¡è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
			} else {
			for (var i = 0; i < data.length; i++) {
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			}
			}

			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//æµè½¬å¡å·
			var HICMOBillNo = $("#HICMOBillNo").val(); //æ¹å·
			var HWorkShopID = $("#HWorkShopID").val();//çç»
			var HWorkShopID = $("#HDeptName").val();//è½¦é´
			var F_BSV_WYID = $("#F_BSV_WYID").val();//å¯ä¸ID
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HState = $("#HState").val();//ç¶æ
			var HSTATUS = $("#HSTATUS").val();//çäº§è®¢åç¶æ
			var HOrgID = sessionStorage["OrganizationID"];
			var checkWRuku = $("input[name='checkWRuku']").prop("checked");//å¤éæ¡

			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();
			var sWhere1 = "";
			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;
			}
			sWhere1 += " 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;
			}
			com1 = " 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;
			}
			com2 = " and (" + ColName2 + " " + com2 + ")";
			}
			sWhere1 += sWhere1 + com1 + com2;
			if (checkWRuku) {
			checkWRuku = 1;
			} else {
			@@ -360,6 +557,8 @@
			, HBillNo: HBillNo
			, IsTrue: checkWRuku
			, HState: HState
			, HSTATUS: HSTATUS
			, sWhere1: sWhere1
			}

			get_Display(JSON.stringify(sWhere));
			@@ -368,14 +567,24 @@
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#HICMOBillNo").val("");
			$("#HProcExchBillNo").val("");
			$("#HName").val("");
			$("#HBillNo").val("");
			$("#HMaterNumber").val("");
			$("#F_BSV_WYID").val("");
			$("#HState").val("0")
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("input[name='checkWRuku']").prop("checked", false);
			form.render()
			sWhere = "";
			@@ -402,7 +611,6 @@
			}
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HModel").val(checkStatus.data[0].HModel);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			@@ -513,6 +721,22 @@
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			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
			});