MES-WEB-LayUI.git

			@@ -53,10 +53,12 @@
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 10px; ">
			<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >é¢è§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button>
			<!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >é¢è§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">ä¿®æ¹</button>-->

			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			@@ -83,7 +85,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å·¥èºè·¯çº¿åç§°</label>
			<label class="layui-form-label" style="width: 85px;">å·¥èºè·¯çº¿åç§°<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
			</div>
			@@ -115,7 +117,7 @@
			<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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" readonly>
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -256,19 +258,25 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width: 56%;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="hidden" class="layui-input" name="HMaker" id="HMaker" lay-verify="HMaker" value="">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style=" width: 500px;">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 70px;">
			<div class="layui-input-block" style="margin-left: 96px;">
			<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="æ¯å¦é»è®¤å·¥èº">
			<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
			<!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="æ¯å¦å¯ç¨" lay-skin="primary" lay-filter="checkboxHUseFlag">
			<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
			<input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 185px;">
			<input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="è½¬å·¥åº" >
			<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo" >
			</div>
			</div>

			@@ -282,13 +290,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hmakers" id="hmakers" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hchecker" id="hchecker" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -302,13 +310,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hmakedate" id="hmakedate" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hcheckdate" id="hcheckdate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -328,13 +336,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hupdater" id="hupdater" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hdeleteman" id="hdeleteman" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -348,13 +356,13 @@
			<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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hupdatedate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
			</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="" id="" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -368,6 +376,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -398,14 +407,14 @@
			<!--å¤éæ¡ ä¸éæµè½¬å·¥åº-->
			<script type="text/html" id="HNextProcFlag">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HNextProcFlag" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			<input type="checkbox" name="HNextProcFlag" disabled="disabled" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			<!--å¤éæ¡ æµè½¬å·¥åº-->
			<script type="text/html" id="HFlowProc">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HFlowProc" lay-filter="HFlowProc" id="HFlowProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			<input type="checkbox" name="HFlowProc" disabled="disabled" lay-filter="HFlowProc" id="HFlowProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			@@ -446,63 +455,23 @@

			//åå§è¡¨æ ¼æ°æ®
			var rowdata = [{
			"HProcNo": "", "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			"HProcNo": "10", "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": ""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 1, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
			, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			, "HProcWorkNum": ""
			, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
			, "HWHID": 0, "HWHName": ""
			}];

			var HModName = "Sc_MouldDotCheckBillList";
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½

			//å¶åäºº
			$("#HMaker").val(sessionStorage["HUserName"]);
			//ç»ç»
			Organ();

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			// layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			// icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			// }, function () { window.location.href = "../../user/login.html"; });
			//}

			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			//var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å«

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//linteridSub = -1;
			OperationType = 1;
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3301' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}

			var option = {
			elem: '#mainTable'
			@@ -517,7 +486,7 @@
			, { field: 'HProcID_S', title: 'å·¥æ®µ', edit: 'text' }
			, { field: 'HProcType', title: 'å·¥åºç±»å', templet: '#HProcType' }//éæ©
			, { field: 'HCenterID_SName', title: 'äº§çº¿ä¸å¿', edit: 'text', event: "CheckHCenterID_S" }//f7
			, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			//, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			, { field: 'HWorkQty_S', title: 'äº§çº¿äº§è½', edit: 'text' }
			, { field: 'HSubStdEmpQty_S', title: 'äº§çº¿äººæ°', edit: 'text' }
			, { field: 'HMouldNo', title: 'æ¨¡å·ç¼å·', edit: 'text' }
			@@ -528,11 +497,11 @@
			, { field: 'HMyWorkDays', title: 'çäº§å¨æ', edit: 'text' }
			, { field: 'HMyFixWorkDays', title: 'åºå®çäº§å¤©æ°', edit: 'text' }
			, { field: 'å·¥åº', title: 'å·¥åº', edit: 'text', event: "CheckHProcID" }//f7
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			// , { field: 'HProcID', title: 'å·¥åºID', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ' }//ä¸å¡«
			, { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			// , { field: 'HCenterID', title: 'å·¥ä½ä¸å¿id', hide: true }//, hide: true
			, { field: 'å·¥ä½ä¸å¿', title: 'å·¥ä½ä¸å¿', edit: 'text', event: "CheckHCenterID" }//f7
			, { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			// , { field: 'HSupID', title: 'ä¾åºåID', hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			, { field: 'ä¾åºå', title: 'ä¾åºå', edit: 'text', width: 110, event: "CheckHSupID" }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			@@ -540,7 +509,7 @@
			, { field: 'HUnitTime', title: 'è¿è¡æ¶é´', edit: 'text' }
			, { field: 'HWorkQty', title: 'å å·¥æ°é', edit: 'text' }//é»è®¤
			, { field: 'HPassRate', title: 'è¯ç', edit: 'text' }//é»è®¤
			, { field: 'HOverRate', title: 'è¶é¢æ¯ä¾', edit: 'text' }
			// , { field: 'HOverRate', title: 'è¶é¢æ¯ä¾', edit: 'text' }
			, { field: 'HReadyTime', title: 'åå¤æ¶é´', edit: 'text' }
			, { field: 'HQueueTime', title: 'æéæ¶é´', edit: 'text' }
			, { field: 'HMoveTime', title: 'è½¬ç§»æ¶é´', edit: 'text' }
			@@ -564,6 +533,12 @@
			, { field: 'HPicNum', title: 'å¾çº¸ç¼å·', edit: 'text' }
			, { field: 'HProcCheckNote', title: 'æ¬å·¥åºç¡®è®¤è®°å½', edit: 'text' }
			, { field: 'HProcWorkNum', title: 'ç¨åºå·', edit: 'text' }
			//, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
			, { field: 'HBadWHName', title: 'ä¸è¯åä»', edit: 'text', event: "HBadWHID" }//f7
			// , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
			, { field: 'HWasterWHName', title: 'æ¥åºåä»', edit: 'text', event: "HWasterWHID" }//f7
			// , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
			, { field: 'HWHName', title: 'è¯åä»', edit: 'text', event: "HWHID" }//f7
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			//, done: function (res, curr, count) {
			@@ -588,6 +563,71 @@
			//åå§å è½½è¡¨æ ¼
			option.data = rowdata;
			table.render(option);
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();

			//å¶åäºº
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#hmakers").val(sessionStorage["HUserName"]);
			$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
			//ç»ç»
			Organ();

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			// layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			// icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			// }, function () { window.location.href = "../../user/login.html"; });
			//}

			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			//var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å«

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//linteridSub = -1;
			OperationType = 1;
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3301' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			});
			}
			else if (OperationType == 2) {
			//ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			RoadBillMain(linterid);
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			async: false,
			data: { "HBillType": '3301' },
			success: function (d) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").attr("readOnly", false);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}
			//è®¾ç½®è½¬å·¥åº
			get_xt();



			//#endregion

			@@ -623,10 +663,21 @@
			get_checkRoutingGroup();
			});



			//æ¯å¦é»è®¤å·¥èº
			form.on('checkbox(checkboxHStandard)', function (data) {
			$("#HStandard").val(data.elem.checked);
			});

			//æ¯å¦è½¬å·¥åº
			form.on('checkbox(checkboxIsProNo)', function (data) {

			if (data.elem.checked) {
			$("#IsProNo").val("1");
			}
			else {
			$("#IsProNo").val("0");
			}
			});

			//#region å¤éæ¡
			@@ -708,25 +759,26 @@
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HProcNo": "", "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			"HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": ""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			, "ä¾åºåä»£ç ": "", "ä¾åºå": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
			, "HWorkQty": 1, "HPassRate": 0, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
			, "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
			, "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
			, "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
			, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
			, "HProcWorkNum": ""
			, "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
			, "HWHID": 0, "HWHName": ""
			};
			switch (obj.event) {
			case 'btn-AddLine':
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);

			for (var i = 1; i <= option.data.length; i++) {
			@@ -796,6 +848,10 @@
			form.render('checkbox');
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});

			@@ -806,6 +862,22 @@

			});

			//è¡åé¼ æ ç¦»å¼äºä»¶
			table.on('edit(mainTable)', function (obj) {
			if (obj.field == "HProcNo") {
			var num = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (obj.value == option.data[i]["HProcNo"]) {
			num += 1;
			}
			if (num > 1) {
			layer.msg("æµæ°´å·:" + obj.value + "éå¤!");
			return false;
			}
			}
			}
			})

			$('#HName').on('keydown', function (event) {//å·¥èºè·¯çº¿åç§°
			if (event.keyCode == 118) {
			layer.msg("å·¥èºè·¯çº¿åç§°F7æé®")
			@@ -815,7 +887,16 @@
			//ä¿åæäº¤
			form.on('submit(btnSave)', function (data) {//æäº¤
			if (AllowLoadData(data)) {
			set_AddNew(data);
			set_AddNew(data);
			}
			});

			//éåº
			form.on('submit(btnEdit)', function (data) {
			if (params[1] != null) {
			Pub_Close(1);
			} else if (params[1] == null) {
			Pub_Close(2);
			}
			});

			@@ -930,7 +1011,7 @@
			//window.close();//å³éå½åé¡µ
			})



			form.on('submit(Saver)', function (data) { //ä¿å
			//debugger;
			var sMainStr = JSON.stringify(data.field);
			@@ -1025,6 +1106,11 @@
			$("#HMaterName").val(checkStatus.data[0].HName);//ç©æåç§°
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);//ç©æä»£ç
			$("#HMaterModel").val(checkStatus.data[0].HModel);//è§æ ¼åå·
			$("#HUnitID").val(checkStatus.data[0].HUnitID);//è®¡éåä½id
			$("#HUnitName").val(checkStatus.data[0].HUnitName);//è®¡éåä½åç§°
			if ($("#HName").val() == "") {
			$("#HName").val(checkStatus.data[0].HName);
			}

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1183,13 +1269,37 @@
			if (rowIndex === '0') {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			obj.del();
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option);
			var oldData = table.cache["mainTable"];
			oldData.splice(obj.tr.data('index'), 1)
			option.data = oldData;//å°æ°æ®ç»å®å°dataä¸
			table.render(option);
			layer.close(index);
			}
			});
			}
			}

			//è·å è½¬å·¥åº ç³»ç»åæ°
			function get_xt() {
			$.ajax({
			type: "get",
			url: GetWEBURL() + '/LEMS/MES_XT_List',
			async: false,
			data: { "sWhere": "" },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			if (result.data == "true") {
			$("#IsProNo").val("1");
			$("input[name='checkboxIsProNo']").prop("checked", true);
			form.render("checkbox");
			} else {
			$("#IsProNo").val("0");
			$("input[name='checkboxIsProNo']").prop("checked", false);
			}
			}
			layer.closeAll("loading");
			}
			})
			}

			//è¡åå é¤å¿«æ·é®
			@@ -1228,7 +1338,7 @@
			}
			//å·¥åº
			if (obj.event == "CheckHProcID") {
			//æå¼äººåè¡¨ å°çªä½
			// å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1237,7 +1347,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_ProcList.html", "yes"]
			, content: ["../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1247,11 +1357,36 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			var HCenterID = 0;
			var HCenterNUmber = "";
			var HCenterName = "";
			//æ¥è¯¢å·¥ä½ä¸å¿çæ°æ®
			$.ajax({
			type: "get",
			url: GetWEBURL() + '/Gy_WorkCenter/list',
			async: false,
			data: { "sWhere": " and å·¥ä½ä¸å¿ä»£ç ='" + checkStatus.data[0].å·¥åºä»£ç + "' ", user: sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			if (result.data.length > 0) {
			HCenterID = result.data[0]["HItemID"];
			HCenterNUmber = result.data[0]["å·¥ä½ä¸å¿ä»£ç "];
			HCenterName = result.data[0]["å·¥ä½ä¸å¿åç§°"];
			}
			}
			layer.closeAll("loading");
			}
			})

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"å·¥åº": checkStatus.data[0].å·¥åº
			"å·¥åº": checkStatus.data[0].å·¥åºåç§°
			, "HProcID": checkStatus.data[0].HItemID
			, "å·¥ä½ä¸å¿": HCenterName
			, "HCenterID": HCenterID
			, "å·¥ä½ä¸å¿ä»£ç ": HCenterNUmber
			})

			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1298,7 +1433,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_SupplierList.html", "yes"]
			, content: ["../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1310,14 +1445,107 @@
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"ä¾åºå": checkStatus.data[0].HName
			"ä¾åºå": checkStatus.data[0].ä¾åºååç§°
			, "HSupID": checkStatus.data[0].HItemID
			, "ä¾åºåä»£ç ": checkStatus.data[0].HNumber
			, "ä¾åºåä»£ç ": checkStatus.data[0].ä¾åºåä»£ç
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//ä¸è¯åä»
			if (obj.event == "HBadWHID") {
			//æå¼äººåè¡¨ å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ä»åºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HBadWHID": checkStatus.data[0].HItemID
			, "HBadWHName": checkStatus.data[0].ä»åºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//è¯åä»
			if (obj.event == "HWHID") {
			//æå¼äººåè¡¨ å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ä»åºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWHID": checkStatus.data[0].HItemID
			, "HWHName": checkStatus.data[0].ä»åºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¥åºåä»
			if (obj.event == "HWasterWHID") {
			//æå¼äººåè¡¨ å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ä»åºåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWasterWHID": checkStatus.data[0].HItemID
			, "HWasterWHName": checkStatus.data[0].ä»åºåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			obj.event = "";
			return false;
			}
			@@ -1332,6 +1560,7 @@
			$.ajax({
			url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (d) {

			@@ -1342,15 +1571,18 @@
			if (IsHStopflag == 1) {
			$("input[name='checkboxHStandard']").prop("checked", true);
			}
			else {
			$("input[name='checkboxHStandard']").prop("checked", false);
			}
			//ä¸»è¡¨
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": d.data[0].åæ®å·
			, "HInterID": d.data[0].hmainid
			, "HDate": Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")
			"HBillNo": OperationType == 2 ? "" : d.data[0].åæ®å·
			, "HInterID": OperationType == 2 ? 0 : d.data[0].hmainid
			, "HDate": Format(new Date(d.data[0].æ¥æ), "yyyy-MM-dd")
			, "HName": d.data[0].å·¥èºåç§°
			, "HMaterNumber": d.data[0].ç©æä»£ç
			, "HMaterName": d.data[0].ç©æåç§°
			, "HMaterID": d.data[0].HMaterID
			, "HMaterNumber": OperationType == 2 ? "" : d.data[0].ç©æä»£ç
			, "HMaterName": OperationType == 2 ? "" : d.data[0].ç©æåç§°
			, "HMaterID": OperationType == 2 ? "" : d.data[0].HMaterID
			, "HUnitName": d.data[0].è®¡éåä½
			, "HUnitID": d.data[0].hunitid
			, "HMainTimeUnit": d.data[0].è¿è¡æ¶é´åä½
			@@ -1368,16 +1600,25 @@
			, "HDelSourceRate": d.data[0].åèµæºåé
			, "HRemark": d.data[0].è¡¨å¤´å¤æ³¨
			, "HStandard": d.data[0].é»è®¤å·¥èº == 1 ? true : false
			, "HMaterModel": d.data[0].è§æ ¼åå·
			, "HMaterModel": OperationType == 2 ? 0 : d.data[0].è§æ ¼åå·
			, "HPicNumVer": d.data[0].å¾å·çæ¬
			, "HPicNumAssemble": d.data[0].æ»è£å¾å·
			, "HMaterTexture": d.data[0].æè´¨
			, "HProductNum": d.data[0].æåç¼å·
			, "HVerNum": d.data[0].çæ¬
			, "HOrgID": d.data[0].HOrgID
			//å¶ä»ä¿¡æ¯
			, "hmakers": d.data[0].å¶åäºº
			, "hmakedate": d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")
			, "hchecker": d.data[0].å®¡æ ¸äºº
			, "hcheckdate": d.data[0].å®¡æ ¸æ¥æ == null ? "" : Format(new Date(d.data[0].å®¡æ ¸æ¥æ), "yyyy-MM-dd")
			, "hupdater": d.data[0].ä¿®æ¹äºº
			, "hupdatedate": d.data[0].ä¿®æ¹æ¥æ == null ? "" : Format(new Date(d.data[0].ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "hdeleteman": d.data[0].ä½åºäºº
			, "hdeletedate": d.data[0].ä½åºæ¥æ == null ? "" : Format(new Date(d.data[0].ä½åºæ¥æ), "yyyy-MM-dd")
			});

			//åè¡¨ èµå¼
			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < d.data.length; i++) {
			rowdata.push(
			@@ -1392,7 +1633,8 @@
			, "HFixPrice": d.data[i].çäº§å®é¢, "HProcPrice": d.data[i].å å·¥åä»·, "HBadPrice": d.data[i].ä¸åæ ¼åä»·, "HWasterPrice": d.data[i].æ¥åºåä»·, "HStdFlag": d.data[i].æ åå®é¢
			, "HBeginDayQty": d.data[i].å¼å·¥ä½éå¤©æ°, "HBeginFixQty": d.data[i].å¼å·¥ä½éåºæ°, "HFixWorkDays": d.data[i].ä¸éåºå®å¤©æ°, "HTrunWorkDays": d.data[i].ä¸éå¾ªç¯å¨æ, "HReadyTimes": d.data[i].æ¬éåå¤æ¶é´
			, "HICMOReadyTimes": d.data[i].æ¢ååå¤æ¶é´, "HAutoTrunFlag": d.data[i].èªå¨ç§»è½¬, "HTechnologyParameter": d.data[i].å·¥èºåæ°, "HPicNum": d.data[i].å¾çº¸ç¼å·, "HProcCheckNote": d.data[i].æ¬å·¥åºç¡®è®¤è®°å½
			, "HProcWorkNum": d.data[i].ç¨åºå·
			, "HProcWorkNum": d.data[i].ç¨åºå·, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
			, "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName
			}
			)
			}
			@@ -1422,6 +1664,7 @@
			}
			})
			}

			//ä¿åHMaker
			function set_AddNew(data) {

			@@ -1449,14 +1692,7 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			//layer.confirm(data.Message, {
			// icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			// btn2: function () {
			// //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			// //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			// parent.location.href = "../../../views/index.html"
			// }//å³é
			//}, function () { window.location.reload(); });//æ°å¢
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			layer.close(index);
			layer.msg("æäº¤æå");
			}
			@@ -1479,43 +1715,225 @@
			//éç©ºéªè¯
			function AllowLoadData(data) {

			if ($("#HMaterNumber").val() == "") {
			layer.msg("äº§åä»£ç æ²¡æéæ©");
			if ($("#HBillNo").val() == "") {
			layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			return false;
			}
			//if ($("#HUnitName").val() == "") {
			// layer.msg("è®¡éåä½æ²¡æéæ©");
			// return false;
			//}

			if ($("#HName").val() == "") {
			layer.msg("å·¥èºè·¯çº¿åç§°ä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HMaterNumber").val() == "") {
			layer.msg("äº§åä»£ç æ²¡æéæ©!");
			return false;
			}
			if ($("#HUnitName").val() == "") {
			layer.msg("è®¡éåä½æ²¡æéæ©");
			return false;
			}
			//if ($("#HMainProcIDName").val() == "") {
			// layer.msg("å·¥åºæ²¡æéæ©");
			// return false;
			//}
			if ($("#HMainCenterIDName").val() == "") {
			layer.msg("å·¥ä½ä¸å¿æ²¡æéæ©");
			return false;
			}
			if ($("#HGroupIDName").val() == "") {
			layer.msg("çäº§çç»æ²¡æéæ©");
			return false;

			//if ($("#HMainCenterIDName").val() == "") {
			// layer.msg("å·¥ä½ä¸å¿æ²¡æéæ©");
			// return false;
			//}
			//if ($("#HGroupIDName").val() == "") {
			// layer.msg("çäº§çç»æ²¡æéæ©");
			// return false;
			//}
			var num = [];
			for (var i = 0; i < option.data.length; i++) {

			if (option.data[i] != "") {
			//æµæ°´å·
			if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
			num.push(option.data[i]["HProcNo"]);
			} else {
			layer.msg("ç¬¬" + (i + 1) + "è¡,æµæ°´å·:" + option.data[i]["HProcNo"] + "éå¤!");
			return false;
			}
			//æµæ°´å·ä¸ä¸ºç©º
			if (option.data[i]["HProcNo"] == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:æµæ°´å·ä¸è½ä¸ºç©º!");
			return false;
			}
			//å·¥åºä¸ä¸ºç©º
			if (option.data[i]["HProcID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥åºä¸è½ä¸ºç©º!");
			return false;
			}
			//å¤åæ è®°
			if (option.data[i]["HSupFlag"]) {
			if (option.data[i]["HSupID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¾åºåä¸è½ä¸ºç©º!");
			return false;
			}
			} else {
			if (option.data[i]["HCenterID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥ä½ä¸å¿ä¸è½ä¸ºç©º!");
			return false;
			}
			}

			//è¯ç å¤§äº0 å°äºçäº100
			if (parseInt(option.data[i]["HPassRate"]) <= 0) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:è¯çå¿é¡»å¤§äº0!");
			return false;
			}
			if (parseInt(option.data[i]["HPassRate"]) > 100) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:è¯çå¿é¡»å°äºçäº100!");
			return false;
			}


			//ä»åºéå¤
			if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {

			if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¸è¯åä»åæ¥åºåä»éå¤!");
			return false;
			}
			}
			if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
			if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¸è¯åä»åè¯åä»éå¤!");
			return false;
			}
			}
			if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
			if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:æ¥åºåä»åè¯åä»éå¤!");
			return false;
			}
			}
			}
			}

			return true;
			//if ($("#HBillNo").val() == '') {
			// layer.msg("éè¯¯çåæ®å·", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if ($("#HInterID").val() == '') {
			// layer.msg("éè¯¯çåç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}
			//if (typeof (sSubStr) == "undefined") {
			// layer.msg("æ²¡æç©ææç»è®°å½", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return false;
			//}

			}

			//éèåè®¾ç½®
			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"] },
			async: false,
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			for (var i = 0; i < option.cols[0].length - 2; 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 });
			}
			})
			}
			//#endregion

			});