MES-WEB-LayUI.git

			@@ -30,13 +30,22 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<label class="layui-form-label">åéç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" lay-filter="HStatus" style="width:190px;">
			<option value="-1" selected="selected">å¨é¨</option>
			<option value="1">æªåé</option>
			<option value="2">å·²åé</option>
			<option value="3">å·²åå¸</option>
			<option value="" selected="selected">å¨é¨</option>
			<option value="æªåé">æªåé</option>
			<option value="å·²åé">å·²åé</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åå¸ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
			<option value="" selected="selected">å¨é¨</option>
			<option value="æªåå¸">æªåå¸</option>
			<option value="å·²åå¸">å·²åå¸</option>
			</select>
			</div>
			</div>
			@@ -57,11 +66,22 @@
			<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">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>


			<div class="layui-colla-content">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno" id="HBillno" style="width:190px;">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -70,6 +90,19 @@
			<input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
			<option value="">å¨é¨</option>
			<option value="æç¾é">æç¾é</option>
			<option value="å¾å·§ä¹">å¾å·§ä¹</option>
			<option value="æ¶æä»">æ¶æä»</option>
			<option value="æ±æ¬§é³">æ±æ¬§é³</option>
			<option value="ææ°çº¢">ææ°çº¢</option>
			</select>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ååç¶æ</label>
			<div class="layui-input-block">
			@@ -80,10 +113,16 @@
			</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 class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HMaterShortNumber" id="HMaterShortNumber" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -93,9 +132,43 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ§ç©æç¼ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber" 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="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">
			<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>
			<div class="layui-inline">
			<label class="layui-form-label">å®æç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFinishStatus" lay-filter="HFinishStatus">
			<option value="" selected>å¨é¨</option>
			<option value="æªå®æ" selected>æªå®æ</option>
			<option value="å·²å®æ">å·²å®æ</option>
			</select>
			</div>
			</div>
			</div>
			@@ -104,9 +177,9 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fp"><i class="layui-icon layui-icon-tips"></i>åé</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-fb"><i class="layui-icon layui-icon-tips"></i>åå¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>æ¤é</button>
			@@ -114,6 +187,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			@@ -142,13 +216,14 @@
			var sWhere = "";
			var option = [];
			var Name = "MouldProdInHouseCellWidth";
			var HModName = "Cg_POOrderBillList";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid","HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
			"HFeedback", "HPriority", "HUserID"];
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			set_ClearBill();
			//#endregion

			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			@@ -188,9 +263,16 @@
			break;
			case 'btn-back': set_Back();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			};
			});

			//éæ°åæ¥æé®
			form.on('submit(btnResCnz)', function (data) {
			set_ResCnz();
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			@@ -243,35 +325,64 @@


			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			//å è½½ä¸å¡å
			//get_HEmpName();
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBeginDate").val("2022-03-14");
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			//, { field: 'HBillType', title: 'HBillType', hide: true }
			//, { field: 'HSupID', title: 'HSupID', hide: true }
			//, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { 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: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 130 }
			, { field: 'æ§ç©æç¼ç ', title: 'æ§ç©æç¼ç ', width: 130 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			, { field: 'æ°é', title: 'è®¢åæ°é', width: 100 }
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			/* å®çæ°å¢åæ®µ begin */
			, { field: 'å¯æå°æ¡ç æ°é', title: 'å¯æå°æ¡ç æ°é', width: 120 }
			/* å®çæ°å¢åæ®µ end */
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'å¯åè´§æ°é', width: 120 }
			/* å®çæ°å¢åæ®µ begin */
			, { field: 'éææ°é', title: 'éææ°é', width: 120 }
			, { field: 'å®æ¶æ°é', title: 'å®æ¶æ°é', width: 120 }
			, { field: 'å¥åºæ°é', title: 'å¥åºæ°é', width: 120 }
			, { field: 'å©ä½å¥åºæ°é', title: 'å©ä½å¥åºæ°é', width: 120 }
			, { field: 'å©ä½æ¶ææ°é', title: 'å©ä½æ¶ææ°é', width: 120 }
			/* å®çæ°å¢åæ®µ end */
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			//, { field: 'HUnitID', title: 'HUnitID', hide: true } éå¤
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120}
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 100 }
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			//, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			//, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			//, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			, { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			, { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			@@ -322,10 +433,10 @@
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 10
			, limit: 500
			, height: 'full-50'
			, cols: [columns]
			, limits: [50, 500, 1000, 5000]
			, limits: [500, 5000, 20000]
			, done: function (res, curr, count) {

			}
			@@ -343,34 +454,63 @@
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var wait = layer.load();//é®ç½©
			if (sWhere == "") {
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			}
			sWhere += " and ä¸å¡ç¶æ = 'æªåé' and ä¾åºåååç¶æ ='æªç¡®è®¤' ";
			}
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],},
			data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			DataList = data1.data;
			option.data = data1.data;
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 550
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}
			table.render(option);
			layer.close(wait);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(wait);
			layer.alert(data1.Message, { icon: 5 });
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			@@ -385,7 +525,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
			content: './Cg_POOrderBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			@@ -405,12 +545,12 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾å¨å·éè´å¥åºå'
			, title: 'ç¼è¾éè´è®¢å'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldProdInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
			, content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
			, resize: false,
			end: function () {
			get_FastQuery(table, option);
			@@ -434,8 +574,8 @@
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MouldProdInBill/set_DeleteBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -488,7 +628,17 @@
			function get_PrintReport() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {

			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®æå°ï¼');
			}
			else {

			var hmainid = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']
			@@ -496,12 +646,9 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOOrderBill', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			}
			}

			@@ -936,32 +1083,30 @@

			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//ç¶æ
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HEmpName = $("#HEmpName").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterShortNumber = $("#HMaterShortNumber").val();
			var HMaterName = $("#HMaterName").val();
			var HXTStatus = $("select[name='HXTStatus']").val();
			var HXTFKStatus = $("#HXTFKStatus").val();

			//var HXTFKStatus = $("#HXTFKStatus").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ
			var HFinishStatus = $("select[name='HFinishStatus']").val(); //å®æç¶æ
			var HOldMaterNumber = $("#HOldMaterNumber").val();//æ§ç©æç¼ç

			if (HOldMaterNumber) {
			sWhere += " and æ§ç©æç¼ç like '%" + HOldMaterNumber + "%'";
			}
			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨
			sWhere += "";
			break;
			case '1': //æªåé
			sWhere += " and ä¸å¡ç¶æ='æªåé'";
			break;
			case '2': //å·²å®¡æ ¸
			sWhere += " and ä¸å¡ç¶æ='å·²åé'";
			break;
			case '3': //å·²å³é
			sWhere += " and ä¸å¡ç¶æ='å·²åå¸'";
			default:

			}
			sWhere += " and åéç¶æ like '%" + HStatus + "%'";
			}
			if (HStatus2) {
			sWhere += " and åå¸ç¶æ like '%" + HStatus2 + "%'";
			}
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			@@ -971,6 +1116,9 @@
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HMaterShortNumber) {
			sWhere += " and ç©æç¼ç like '%" + HMaterShortNumber + "%'";
			}
			if (HMaterNumber) {
			sWhere += " and ç©æä»£ç like '%" + HMaterNumber + "%'";
			@@ -985,10 +1133,24 @@
			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 + "%'";

			}
			if (HFinishStatus) {
			sWhere += " and å®æç¶æ like '%" + HFinishStatus + "%'";

			}
			//æ·»å æ¥è¯¢æ¡ä»¶ï¼æ ¹æ®å½åç»å½ç¨æ·å³èèåè¿åæ°æ®
			//sWhere += " and HUserID =" + sessionStorage["Czybm"]
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -1003,15 +1165,185 @@
			$("#HEmpName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HSupName").val("");
			$("select[name='HFeedback']").val("");
			sWhere = "";
			get_Display(sWhere);
			}
			//éæ°åæ¥æé®
			function set_ResCnz() {
			var HBillno2 = $('#HBillno2').val();
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/Cg_POOrderBillViewApi',
			type: "GET",
			data: { "BillNo": HBillno2,"BillType":1102 },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#endregion
			//å·æ°
			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");
			}
			})
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HBillType", "HSupID", "ä¸å¡ç¶æ", "HUnitID", "ä¾åºåä»£ç ", "ä¸å¡åä»£ç ", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid","HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if(dataCol[i]){
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			</script>