MES-WEB-LayUI.git

			@@ -1,4 +1,4 @@
			ï»¿<!DOCTYPE html>
			ï»¿ <!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			@@ -13,7 +13,8 @@
			<script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
			<script src="../../../layuiadmin/pubcustom.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			@@ -55,12 +56,12 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">
			<div class="layui-row" style="margin-top:10px;margin-left:4%;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
			<input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -77,6 +78,12 @@
			<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="HModel" id="HModel">
			</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="HBenchmarkValue" id="HBenchmarkValue">
			</div>
			</div>
			</div>
			@@ -97,10 +104,10 @@
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<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; display: none;">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">éç½®</button>
			</div>
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			@@ -135,7 +142,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-row" style=" margin-top: 10px; ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -163,7 +170,7 @@
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-row" style=" margin-top: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -196,14 +203,14 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page" style="position:relative;bottom:0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excelå¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢åè·¯çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>å¯ç¨é»è®¤</button>
			@@ -216,16 +223,16 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>æ¤å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>åå³é(è®¾ç½®æ¶é´)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>
			<!--<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="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>æ¹æ¹å°æ¶äº§è½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>äº§çº¿äº§è½</button>
			</div>
			@@ -257,11 +264,13 @@
			var sWhere = "";
			var option = [];
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var HBillType = 3301;
			var size = 50;
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "Gy_RoutingBillList";
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var HBillType = 3301;
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "HMaterID", "HUnitID", "HOrgID", "hsubid", "HProcID", "HSupID", "HCenterID", "HMainCenterID", "HMainProcID", "HCenterID_S", "HProcID_S", "HItemID", "HPRDORGID", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWhID", "HWHName", "HBillSubType", "HQCSchemeID_Fst", "HQCSchemeID_Proc","HQCSchemeID_Patrol"];

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

			@@ -370,20 +379,31 @@
			//åå³é
			case 'set_CancelCloseBill': set_CloseBill(2);
			break;
			//åå³éè®¾ç½®æ¶é´
			case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
			break;
			//ä½åºæé® ï¼1:ä½åºã2:åä½åºï¼
			case 'btn-Drop':set_DropBill(1);
			break;
			//åä½åºæé®
			case 'btn-DeDrop':set_DropBill(2);
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//å¯¼å¥
			case 'set_Excel': set_Excel();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			get_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			//ä¿åæ¹æ¡
			case 'btn_SaveScheme': set_SaveScheme();
			@@ -433,6 +453,7 @@
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			@@ -490,13 +511,18 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();

			Organ();
			//æ¥è¯¢
			//get_FastQuery(1);

			//è·åé¡¹ç®å·
			Get_HProject();

			//æ¥è¯¢
			get_FastQuery(1);

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			$("#HBenchmarkValue").val(localStorage["HBenchmarkValue"])
			}
			//#endregion

			@@ -505,6 +531,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-150'
			, title: 'å·¥èºè·¯çº¿'
			, page: false
			, limit: 50
			, done: function (res, curr, count) {
			@@ -818,7 +845,7 @@
			else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·'});
			} else {
			switch (data[i].Type) {
			//int
			@@ -871,8 +898,15 @@


			option.data = result;
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			table.render(option);

			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);

			layer.close(ajaxLoad);
			DisPlay_HideColumn();

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			@@ -971,7 +1005,7 @@
			com2 = "not like''%" + ColContent2 + "%''";
			break;
			default:
			com2 = "" + Comparator + "''" + ColContent + "''";
			com2 = "" + Comparator2 + "''" + ColContent2 + "''";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			@@ -993,12 +1027,12 @@
			if (HProID != 0 && HProID != "undefined" && HProID != null) {
			sWhere += " and HMainProcID = " + HProID;
			}
			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			else {
			HOrgID = $("#HOrgID").val();//ç»ç»
			}
			//if (number == 1) {
			// HOrgID = sessionStorage["OrganizationID"];
			//}
			//else {
			// HOrgID = $("#HOrgID").val();//ç»ç»
			//}

			if (HOrderProcNO) {
			sWhere += " and åæ®ç±»å like ''%" + HOrderProcNO + "%''";
			@@ -1016,9 +1050,9 @@
			if (WorkCenter) {
			sWhere += " and åæ®å· like ''%" + WorkCenter + "%''";
			}
			if (HOrgID) {
			sWhere += " and HOrgID = ''" + HOrgID + "''";
			}
			//if (HOrgID) {
			// sWhere += " and HOrgID = ''" + HOrgID + "''";
			//}
			if (number == 2) {
			if (HProject != '0') {
			sWhere += " and é¡¹ç®å· like ''%" + HProject + "%''";
			@@ -1026,6 +1060,9 @@
			}

			sWhere += " and å·¥åºä»£ç != ''9999'' and HBillSubType<>''SUB''"

			sWhere += getOrgIDByUser();//ç¨æ·å³èç»ç»æ¥è¯¢è¿æ»¤

			//å¤ææé
			if (PermissionJudge() == true) {
			get_DisplayPage(sWhere);
			@@ -1041,6 +1078,7 @@
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/page',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			@@ -1059,7 +1097,7 @@
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·', style:"color:blue; cursor: pointer;" });
			} else {
			switch (data[i].Type) {
			//int
			@@ -1097,16 +1135,22 @@
			}
			}
			option.data = result;
			laypage.render(optionPage);

			debugger

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			laypage.render(optionPage);
			debugger

			layer.close(ajaxLoad);
			ins = table.render(option);
			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);

			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			layer.close(ajaxLoad);

			} else {
			//option.data = [[]]
			//table.render(option);
			@@ -1132,7 +1176,7 @@
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			get_FastQuery(2);
			}
			})
			}
			@@ -1149,7 +1193,7 @@
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			get_FastQuery(2);
			}
			})
			}
			@@ -1161,8 +1205,6 @@
			if (checkStatus.data.length === 1) {
			var linterid = data[0].HItemID;
			//var linteridSub = data[0].hsubid;

			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -1171,7 +1213,7 @@
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			get_FastQuery(2);
			}
			})
			} else {
			@@ -1203,7 +1245,7 @@
			//å³éå½åframe
			layer.close(wait);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			get_FastQuery(2);
			});
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			@@ -1250,6 +1292,31 @@
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region æ ¹æ®ç¨æ·è·åç¨æ·å³èç»ç»çè¿æ»¤æ¡ä»¶
			function getOrgIDByUser() {
			var res = "";
			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //æ¹æ³æå¨é¡µé¢åæ¹æ³å ä¼ å ç»ç»å¿é¡»æ¯åè¡¨å¤´é¨æ¥è¯¢çç»ç» ä¸è½ä½¿ç¨ç¨æ·é»è®¤
			data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
			success: function (result) {
			if (result.count == 1) {
			if (result.data[0].sWhere == "1") {
			res = " and HOrgID = ''" + $("#HOrgID").val() + "''";
			} else {
			res = result.data[0].sWhere;
			}
			}
			}, error: function (err) {
			res = " and 1 = 0";
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion

			@@ -1314,7 +1381,7 @@
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			get_FastQuery(2);
			}
			})
			} else {
			@@ -1324,8 +1391,8 @@

			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_DisplayPage(sWhere);

			get_FastQuery(2);
			}

			//å¯ç¨é»è®¤
			@@ -1333,7 +1400,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length == 1) {
			if (data.length == 1 && data[0].ç¶æ!="å³é") {
			layer.confirm("ç¡®è®¤è¦å¯ç¨è¯¥å·¥èºè·¯çº¿ä¸ºç©æé»è®¤å·¥èºè·¯çº¿å?", function (index) {
			var wait = layer.load();
			var HInterID = data[0].hmainid;
			@@ -1357,7 +1424,7 @@
			});
			})
			} else {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			layer.msg("è¯·éæ©ä¸æ¡æªå³éçæ°æ®!");
			}
			}

			@@ -1365,7 +1432,7 @@
			function set_closeOtherRoute() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1 && checkStatus.data[0]["å®¡æ ¸äºº"]=="") {
			if (checkStatus.data.length === 1 && data[0].ç¶æ != "å³é") {
			var hmainid = data[0].hmainid.toString();
			var HName = data[0]["å·¥èºåç§°"].toString();
			var HMaterID = data[0]["HMaterID"].toString();
			@@ -1523,6 +1590,14 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(wait);
			}
			, end: function () {
			////ä¿®æ¹ä¸ºååå·æ°çé¢
			//if (get_needClose_Bar == 0) {
			$("#btnSearch").trigger('click');
			//} else if (get_needClose_Bar == 1) {
			// $("#get_needClose").trigger('click');
			//}
			}
			});
			})
			}
			@@ -1531,7 +1606,138 @@
			}
			}

			//å³é [1 å³éã2 åå³é]
			function set_CloseBillSetDate(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var HInterID = data[0].hmainid;
			if (data.length == 1) {
			// å¼¹åºå±
			layer.open({
			type: 1,
			title: 'è®¾ç½®æ¶é´èå´',
			area: ['500px', '300px'],
			content: `
			<div class="layui-form" style="padding: 20px;">
			<div class="layui-form-item">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="startTime" placeholder="è¯·éæ©å¼å§æ¶é´">
			</div>
			</div>
			<div class="layui-form-item">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="endTime" placeholder="è¯·éæ©ç»ææ¶é´">
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-input-block" style="margin-left: 0; text-align: center;">
			<button class="layui-btn" id="confirmTime">ç¡®å®</button>
			<button class="layui-btn layui-btn-primary" id="cancelTime">åæ¶</button>
			</div>
			</div>
			</div> `,
			success: function (layero, index) {
			$("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
			// è·åå½åæ¥æ
			const currentDate = new Date();
			// åå»ºæ°æ¥æå¯¹è±¡ï¼é¿åä¿®æ¹åæ¥æï¼
			const after30Days = new Date(currentDate);
			// è®¾ç½®æ¥æä¸ºå½åæ¥æ + 30å¤©
			after30Days.setDate(currentDate.getDate() + 30);
			$("#endTime").val(Format(after30Days, "yyyy-MM-dd"));
			// ç¡®å®æé®ç¹å»äºä»¶
			$('#confirmTime').on('click', function () {
			var startTime = $('#startTime').val();
			var endTime = $('#endTime').val();

			if (!startTime) {
			layer.msg('è¯·éæ©å¼å§æ¶é´', { icon: 2 });
			return;
			}

			if (!endTime) {
			layer.msg('è¯·éæ©ç»ææ¶é´', { icon: 2 });
			return;
			}

			if (new Date(endTime) < new Date(startTime)) {
			layer.msg('ç»ææ¶é´ä¸è½æ©äºå¼å§æ¶é´', { icon: 2 });
			return;
			}
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
			type: "GET",
			data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
			success: function (result) {
			if (result.count == 1) {
			// è¿éå¯ä»¥å¤çè·åå°çæ¶é´èå´
			layer.msg('æ¶é´èå´å·²è®¾ç½®ï¼' + startTime + ' è³ ' + endTime, { icon: 1 });
			// å³éå¼¹å±
			layer.close(index);
			$("#btnSearch").trigger('click');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			// å³éå¼¹å±
			layer.close(index);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// å³éå¼¹å±
			layer.close(index);
			}
			});

			});

			// åæ¶æé®ç¹å»äºä»¶
			$('#cancelTime').on('click', function () {
			layer.close(index);
			});
			},
			})
			}
			else {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			}
			}

			//#region åä½åº/ä½åºæ°æ® [1 ä½åºã2 åä½åº]
			function set_DropBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Gy_RoutingBill/DeleteGy_RoutingBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
			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);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			@@ -1553,11 +1759,21 @@
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			if (itemobj === 'ç©æä»£ç ') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			if (itemobj === 'ç©æåç§°') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			if (itemobj === 'è§æ ¼åå·') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			}
			});
			if (result.count == 1) {
			table.exportFile(ins.config.id, data, "xls");
			table.exportFile('mainTable', data, "xls");
			layer.close(wait);
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			@@ -1570,6 +1786,22 @@
			});
			}
			//#endregion

			//å¯¼å¥
			function set_Excel() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿åè¡¨-å¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBillimport.html'
			, end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery();
			}
			})
			}

			//#region è·åå¯¼åºæ°æ®
			function getExportData() {
			@@ -1654,7 +1886,7 @@
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			@@ -1974,41 +2206,45 @@
			}
			//#endregion

			$("#HBenchmarkValue").on("input", function (e) {
			localStorage["HBenchmarkValue"] = e.delegateTarget.value;//åºåå¼ï¼ç¨äºæ·»åº·è®¡ç®çº¦å½ç³»æ°ï¼åºåå¼/å°æ¶äº§è½
			});

			//#endregion
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			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 è¿è¡ç¼ç
			////éèåè®¾ç½®
			//function get_HideColumn() {
			// var colName = "";
			// var contentUrl = "";
			// for (var i = 1; i < option.cols[0].length; i++) {
			// colName += option.cols[0][i]["field"] + ",";
			// }
			// 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_New.html?HModName=' + HModName + '&colName=' + colName;
			// contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.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);//å³éå¼¹çª
			}
			})
			}
			// 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() {
			@@ -2108,104 +2344,104 @@
			//}

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

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			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 (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			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";
			}
			}
			}
			}
			ins=table.render(option);
			} else {
			ins=table.render(option);
			}
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			// var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			// var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			// var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			// newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			// dataCol = data1.data[0].HGridString.split(',');
			// //åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			// if (dataCol.length == option.cols[0].length - 1) {
			// //éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			// for (var j = 0; j < option.cols[0].length - 1; j++) {
			// for (var i = 0; i < option.cols[0].length - 1; i++) {
			// var dataCols = dataCol[j].split('\|');
			// //éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			// if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			// //éèå
			// 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 (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			// option.cols[0][i + 1]["hide"] = false;
			// }
			// //ç»è®¡å
			// if (dataCols[6] == 1) {
			// option.cols[0][i + 1]["totalRow"] = true;
			// }
			// //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			// 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;
			// }
			// //è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			// if (dataCols[4] != null && dataCols[4] != "") {
			// option.cols[0][i + 1]["title"] = dataCols[4];
			// }
			// newCols[0].push(option.cols[0][i + 1]);
			// }
			// }
			// }
			// //éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			// if (dataCol.length == newCols[0].length - 1) {
			// option.cols = newCols;
			// //åæ¶å»ç»å
			// 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";
			// }
			// }
			// }
			// }
			// ins=table.render(option);
			// } else {
			// ins=table.render(option);
			// }
			// var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			// Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			// }, error: function () {
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// })
			//}
			//#endregion


			@@ -2280,7 +2516,7 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			//get_FastQuery()
			form.render("select");
			}
			}, error: function () {