MES-WEB-LayUI.git

			@@ -59,10 +59,10 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content">
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>-->
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			@@ -71,8 +71,9 @@
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
			<div class="layui-input-block" style="width:190px;">
			<select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			@@ -85,12 +86,12 @@
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			@@ -107,6 +108,24 @@
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¾åºå</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSupName" id="HSupName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">ä¾åºååé¦ç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFeedback" lay-filter="HFeedback">
			<option value="" selected>å¨é¨</option>
			<option value="æ¥æ¶">æ¥æ¶</option>
			<option value="å¤æ">å¤æ</option>
			<option value="çäº§">çäº§</option>
			<option value="åè´§">åè´§</option>
			</select>
			</div>
			</div>

			@@ -163,6 +182,8 @@
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			//å è½½ä¸å¡å
			get_HEmpName();
			//#endregion

			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			@@ -271,9 +292,9 @@
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 100 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 130 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 130 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 120 }
			, { field: 'æ°é', title: 'è®¢åæ°é', width: 100}
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120}
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			@@ -281,7 +302,7 @@
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 100 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			@@ -960,8 +981,10 @@
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			var HXTStatus = $("select[name='HXTStatus']").val();
			var HXTFKStatus = $("#HXTFKStatus").val();
			//var HXTFKStatus = $("#HXTFKStatus").val();
			var HMaterShortNumber = $("#HMaterShortNumber").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ

			if (HStatus) {
			switch (HStatus) {
			@@ -1005,8 +1028,16 @@
			sWhere += " and ä¾åºåååç¶æ like '%" + HXTStatus + "%'";

			}
			if (HXTFKStatus) {
			sWhere += " and åé¦ç¶æ like '%" + HXTFKStatus + "%'";
			//if (HXTFKStatus) {
			// sWhere += " and åé¦ç¶æ like '%" + HXTFKStatus + "%'";

			//}
			if (HSupName) {
			sWhere += " and ä¾åºå like '%" + HSupName + "%'";

			}
			if (HFeedback) {
			sWhere += " and åé¦ç¶æ like '%" + HFeedback + "%'";

			}
			var index = layer.load(0);
			@@ -1023,6 +1054,8 @@
			$("#HEmpName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HSupName").val("");//ä¾åºå
			$("select[name='HFeedback']").val(""); //ä¾åºååé¦ç¶æ
			sWhere = "";
			get_Display(sWhere);
			}
			@@ -1031,7 +1064,26 @@
			function set_Refresh() {
			$("#btnSearch").click();
			}

			//è·åä¸å¡åæ°æ®
			function get_HEmpName() {
			var HEmpName = '<option value="">å¨é¨</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetEmployeeList_Json",
			data: { "Employee": '', "HGroupID": 0 },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HEmpName += '<option value="' + data[i].HName + '">' + data[i].HName + '</option>';
			}
			$("#HEmpName").append(HEmpName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>