MES-WEB-LayUI.git

			@@ -12,6 +12,27 @@
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<style>
			.loader {
			border: 8px solid #f3f3f3; /* Light grey */
			border-top: 8px solid #3498db; /* Blue */
			border-radius: 50%;
			width: 50px;
			height: 50px;
			animation: spin 2s linear infinite;
			}

			@keyframes spin {
			0% {
			transform: rotate(0deg);
			}

			100% {
			transform: rotate(360deg);
			}
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -21,17 +42,22 @@
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="padding: 10px; ">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excelå¯¼å¥</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="btnLock" id="btnLock">éå®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Excel_DayImport" id="Excel_DayImport">æ¥è®¡åæ»å¨å¯¼å¥</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">æ·»å è®¢å</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="btnReady" id="btnReady">åå¤</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">å·¥èºè·¯çº¿</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">éå®å·¥å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">è§£éå·¥å</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">éå®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockRequest" id="btnLock">éå®ç³è¯·</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">è§£éç³è¯·</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">éå®å·¥å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">è§£éå·¥å</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">æ¬ æè¿ç®</button>-->
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">å·¥èºè·¯çº¿</button>-->
			</div>
			<div class="layui-collapse resizable-container">
			<div class="layui-colla-item">
			@@ -40,23 +66,6 @@
			<span>æ´å¤</span>
			</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="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ææç±»å</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HTLType" id="HTLType" lay-verify="HTLType">
			<option value="ç¼ºæ" selected="selected">ç¼ºæ</option>
			<option value="çäº§ç¨ææ¸å">çäº§ç¨ææ¸å</option>
			<!--<option value="éè´è®¢å">éè´è®¢å</option> ææ¶æ²¡æ-->
			</select>
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">çäº§è½¦é´</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			@@ -67,24 +76,23 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">æ¥è¯¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¼å·¥æªæ¢æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<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" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;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>
			<label class="layui-form-label">æäº§å¤©æ°</label>
			<div class="layui-input-block">
			<select name="HArrangeProductDayQty" id="HArrangeProductDayQty" class="ForFilteringSchemes" lay-filter="HArrangeProductDayQty" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			@@ -93,18 +101,20 @@
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åå·</label>
			<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="HICMOBillNo" id="HICMOBillNo">
			<input type="text" class="layui-input" name="HLockedDay" id="HLockedDay" value="3">
			</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="HMaterName" id="HMaterName">
			<label class="layui-form-label" style="width: 85px;">ææç±»å</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HTLType" id="HTLType" lay-verify="HTLType">
			<option value="ç¼ºæ" selected="selected">ç¼ºæ</option>
			<option value="çäº§ç¨ææ¸å">çäº§ç¨ææ¸å</option>
			<!--<option value="éè´è®¢å">éè´è®¢å</option> ææ¶æ²¡æ-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			@@ -117,17 +127,23 @@
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
			<!--<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">éå®å¤©æ°</label>
			<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="HLockedDay" id="HLockedDay" value="3">
			<input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 75px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<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">
			<input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 75px;">
			</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="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -136,20 +152,34 @@
			<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
			</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="HICMOBillNo" id="HICMOBillNo">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<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" lay-verify="hmaternumber" name="hmaternumber" id="hmaternumber" value="" style="width: 60%;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>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æäº§æ¥æ</label>
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HMastersDate" name="HMastersDate" id="HMastersDate" style="padding-left: 75px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</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="HMaterModel" id="HMaterModel">
			</div>
			</div>
			</div>
			@@ -207,7 +237,6 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -234,7 +263,7 @@
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>-->
			</div>
			</div>
			</div>
			@@ -246,7 +275,7 @@
			<ul class="layui-tab-title">
			<li class="layui-this">çäº§è®¢å</li>
			<li>ç¼ºæåæ</li>
			</ul>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="layui-inline">
			@@ -261,12 +290,12 @@
			<input type="date" class="layui-input" id="HEndDate" style="width:120px;">
			</div>
			</div>
			<div class="layui-inline">
			<!--<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="HDeptName_ICMO" id="HDeptName_ICMO">
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			@@ -282,7 +311,7 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">æ¥è¯¢</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">éç½®</button>
			<!--å¾æè®¢å-->
			<table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
			<table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
			</div>
			<div class="layui-tab-item">
			<table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
			@@ -292,7 +321,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>æ¹éå¡«å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><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_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
			@@ -361,14 +390,22 @@
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = [];
			var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID", "HSourceID"];
			var params = get_UrlVars();
			var HType = "";
			var HWorkShopID = 0;
			if (params[params[0]] != undefined) {
			HType = params[params[0]]; //ä»åæ°ä¸è·å
			HWorkShopID = params[params[1]]; //ä»åæ°ä¸è·å
			set_HWorkShop();
			}
			//#endregion

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

			//åå§åæäº§æ¶é´
			setSelect_HArrangeProductDayQty();

			//åå§åçé¢
			$(document).ready(function () {
			set_InitGrid();
			});
			set_ClearBill();

			//#endregion
			@@ -517,7 +554,8 @@
			data[0][Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')] = "";

			//è·¨å¹´çè¯ ä¼ä»ä¸æä¸å·å¼å§
			if (MM == 12 && (HBEGINDATE + j) == 31) {
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			if (MM == 12 && (HBEGINDATE + j) == HArrangeProductDayQty) {
			yyyy += 1;
			MM = 1;
			SumMonth = new Date(yyyy, MM, 0).getDate();
			@@ -543,7 +581,7 @@
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			get_HideColumnNoPageForPlan(HModName,option, get_FastQuery);
			break;
			//å é¤è¡
			case 'set_DeleteBill':
			@@ -572,7 +610,7 @@
			//éæä½å·¥
			case 'set_Emp':
			set_Emp(data);
			break;
			break;
			//æ¥çå·¥èºè·¯çº¿
			case 'set_Routing':
			set_Routing();
			@@ -627,6 +665,11 @@
			btnExcelImport();
			});

			//æ¥è®¡åæ»å¨å¯¼å¥
			form.on('submit(Excel_DayImport)', function () {
			btnExcel_DayImport();
			});

			//ä¿å
			form.on('submit(btnSave)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			@@ -644,7 +687,7 @@
			}
			}
			if (HYxjQty > 0) {
			layer.confirm('å½åæäº§é¡µé¢åå¨ä¼åçº§ä¸º0ççäº§è®¢åï¼æ¯å¦ç»§ç»è¿è¡æäº§ï¼', {
			layer.confirm('å½åæäº§é¡µé¢åå¨ä¼åçº§ä¸º0ççäº§è®¢åï¼æ¯å¦ç»§ç»è¿è¡ä¿åï¼', {
			title: "æä½æç¤º",
			icon: 0,
			btn: ['ç¡®è®¤', 'åæ¶']
			@@ -693,44 +736,89 @@

			//é½å¥åæ
			form.on('submit(btnCompleteSetAnalysis)', function (data) {
			get_btnCompleteSetAnalysis();
			if (set_ModCheck("Sc_WorkBillSortBill_qtfx") == true) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnCompleteSetAnalysis();
			layer.close(index);
			}
			})
			}
			})

			//ææè¿ç®
			form.on('submit(btnTLYS)', function (data) {
			get_btnTLYS();
			if (set_ModCheck("Sc_WorkBillSortBill_tlys") == true) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnTLYS();
			layer.close(index);
			}
			})
			}

			})

			//æ¬ æè¿ç®
			form.on('submit(btn_Calculate)', function (data) {
			if (set_ModCheck("Sc_WorkBillSortBill_qlys") == true) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			set_Calculate();
			layer.close(index);
			}
			})
			}

			});
			//çäº§è®¢åéå
			form.on('submit(btnICMOBill)', function (data) {
			get_btnICMOBill();
			})
			//æ·»å çäº§è®¢å
			form.on('submit(btnAddICMO)', function (data) {
			get_btnAddICMO();
			})

			//åå¤
			form.on('submit(btnReady)', function (data) {
			get_btnReady();
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnReady();
			layer.close(index);
			}
			})
			})

			//æäº§
			form.on('submit(btnProPC)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			var index = layer.open({
			type: 1, // page å±ç±»å
			area: ['20%', '20%'],
			shade: 0.6, // é®ç½©éæåº¦
			shadeClose: false, // ç¹å»é®ç½©åºåï¼ä¸å³éå¼¹å±
			maxmin: false, // ä¸åè®¸å¨å±æå°å
			anim: 0, // 0-6 çå¨ç»å½¢å¼ï¼-1 ä¸å¼å¯
			content: '<div style="padding: 12px;">æ£å¨è¿ç®,è¯·èå¿çå¾!!!</div>'
			});
			setTimeout(function () {
			get_btnProPC(HWorkShopID);
			layer.close(index);
			}, 1000)
			}
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æäº§åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index1, layero) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			var index = layer.open({
			type: 1, // page å±ç±»å
			area: ['20%', '20%'],
			shade: 0.6, // é®ç½©éæåº¦
			shadeClose: false, // ç¹å»é®ç½©åºåï¼ä¸å³éå¼¹å±
			maxmin: false, // ä¸åè®¸å¨å±æå°å
			anim: 0, // 0-6 çå¨ç»å½¢å¼ï¼-1 ä¸å¼å¯
			content: '<div style="padding: 12px;">æ£å¨è¿ç®,è¯·èå¿çå¾!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
			});
			setTimeout(function () {
			get_btnProPC(HWorkShopID);
			layer.close(index);
			layer.close(index1);
			}, 1000)
			}
			}
			})
			})

			//å·¥èºè·¯çº¿ç¼è¾
			@@ -767,38 +855,207 @@

			//éå®
			form.on('submit(btnLock)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			get_btnLock(HWorkShopID);
			if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnLock(HWorkShopID);
			layer.close(index);
			}
			})
			}
			}


			})

			//è§£é
			form.on('submit(btnUnlock)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnUnlock(HWorkShopID);
			layer.close(index);
			}
			})
			}
			}

			})

			//éå®ç³è¯·
			form.on('submit(btnLockRequest)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val(); //çäº§è½¦é´åç
			var HWorkShopIDName = encodeURIComponent($("#HWorkShopIDName").val()); //çäº§è½¦é´
			var HLockedDay = $("#HLockedDay").val(); //éå®å¤©æ°
			var HEmpName = encodeURIComponent(sessionStorage["HUserName"]); //ç³è¯·äºº
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			get_btnUnlock(HWorkShopID);
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnLockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName);
			layer.close(index);
			}
			})

			}

			})

			//è§£éç³è¯·
			form.on('submit(btnUnlockRequest)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val(); //çäº§è½¦é´åç
			var HWorkShopIDName = encodeURIComponent($("#HWorkShopIDName").val()); //çäº§è½¦é´
			var HLockedDay = $("#HLockedDay").val(); //éå®å¤©æ°
			var HEmpName = encodeURIComponent(sessionStorage["HUserName"]); //ç³è¯·äºº
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnUnlockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName);
			layer.close(index);
			}
			})
			}
			})

			//éå®å·¥å
			form.on('submit(btnLockOrder)', function (data) {
			get_btnLockOrder();
			if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnLockOrder();
			}
			})
			}

			})

			//è§£éå·¥å
			form.on('submit(btnUnlockOrder)', function (data) {
			get_btnUnlockOrder();
			if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			get_btnUnlockOrder();
			layer.close(index);
			}
			})
			}

			})

			//#region ä¸æåè¡¨çå¬-æäº§æ¶é´
			form.on('select(HArrangeProductDayQty)', function (data) {
			var ajaxLoad = layer.load();

			get_WriteConfigFile();

			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			layer.close(ajaxLoad);
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else if (table.cache["mainTable"].length == 0) {
			layer.close(ajaxLoad);
			return layer.msg("æ æ°æ®,æ æ³ä¿å!");
			} else {
			var HYxjQty = 0;
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["ä¼åçº§"]) == 0) {
			HYxjQty++
			}
			}
			}
			if (HYxjQty > 0) {
			layer.confirm('å½åæäº§é¡µé¢åå¨ä¼åçº§ä¸º0ççäº§è®¢åï¼æ¯å¦ç»§ç»è¿è¡ä¿åï¼', {
			title: "æä½æç¤º",
			icon: 0,
			btn: ['ç¡®è®¤', 'åæ¶']
			}, function (index, layero) {
			//ç¡®è®¤
			set_AddNew();
			}, function (index) {
			//åæ¶
			layer.close(ajaxLoad);
			return
			});
			} else {
			set_AddNew();
			}
			}

			//åå§åè¡¨æ ¼
			set_InitGrid();
			get_FastQuery(1);
			//éèå¾éåæ®µ
			get_Display2(sWhere_ICMO);

			layer.close(ajaxLoad);
			});
			//#endregion
			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			//æéå¤å®
			function set_ModCheck(ModRightNameCheck) {
			var Permission = false;
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			Permission = true;
			} else {
			layer.alert("å½åæ¨¡åæ²¡ææ¥è¯¢æé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return Permission;
			}

			function set_HWorkShop() {
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Gy_Department/list',
			type: "GET",
			async: false,
			data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
			success: function (data1) {
			if (data1.count == 1) {
			$("#HWorkShopID").val(HWorkShopID);
			$("#HWorkShopIDName").val(data1.data[0].é¨é¨åç§°);
			$("#btnHWorkShopID").addClass('layui-btn-disabled');
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#region åå§åçé¢
			function set_ClearBill() {
			@@ -815,10 +1072,309 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			get_FastQuery(1);
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			get_Display2(sWhere_ICMO);
			get_FastQuery_ICMO();
			}
			//#region åå§åä¸æåè¡¨ æäº§æ¶é´
			function setSelect_HArrangeProductDayQty() {

			var date = new Date();
			var year = date.getFullYear();
			var month = date.getMonth() + 1; // æä»½ä»0å¼å§è®¡ç®ï¼éè¦å 1
			var lastDay = new Date(year, month, 0).getDate(); //å½ææåä¸å¤©
			var thisDay = new Date().getDay(); //å½å¤©æ¯æ¬æç¬¬å å¤©

			var valueList = [7, lastDay - thisDay+1,31,40,50];
			var titleList = ["7å¤©", "æ¬æ","31å¤©","40å¤©","50å¤©"];

			var HArrangeProductDayQty_ArrayList = '';
			for (var i = 0; i < valueList.length; i++) {
			HArrangeProductDayQty_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
			}

			$("#HArrangeProductDayQty").empty();
			$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
			form.render('select');

			$("#HArrangeProductDayQty").val("40");
			}
			//#endregion

			//#region èªå®ä¹éæ©æäº§å¤©æ°-åå§åè·ååæ°æ®
			function setInit_columnsData() {
			var columns = [];
			var myDate = new Date();
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({
			field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 31 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 31 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 32 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 32 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 33 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 33 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'));
			}
			})//0




			columns.push({
			field: Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 34 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 34 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 35 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 35 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({
			field: Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 36 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 36 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({
			field: Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 37 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 37 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({
			field: Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 38 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 38 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({
			field: Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 39 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 39 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({
			field: Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 40 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 40 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({
			field: Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 41 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 41 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 42 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 42 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 43 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 43 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 44 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 44 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 45 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 45 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 46 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 46 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 47 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 47 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 48 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 48 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 49 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 49 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 50 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 50 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'));
			}
			})//0


			return columns;
			}
			//#endregion
			//#endregion

			//è·åç»ç»
			@@ -849,205 +1405,55 @@
			var myDate = new Date();
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·', sort: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, sort: true });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true });
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true });
			columns.push({ type: 'checkbox', fixed: 'left'});
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·'});
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true});
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;'});
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150 });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150 });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });

			columns.push({
			field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({
			field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
			}
			})//0
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			var dateColumns = setInit_columnsData();
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			for (var i = 0; i < HArrangeProductDayQty; i++) {
			columns.push(dateColumns[i]);//0
			}

			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
			columns.push({ field: 'T31', title: 'T31', width: 70 });//0
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150, sort: true });
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150, sort: true });
			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150, sort: true });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true });
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150 });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150 });
			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150 });
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150 });
			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150 });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150 });
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150 });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150 });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150 });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 });
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150, sort: true });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150, sort: true });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150, sort: true });
			columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150, sort: true });
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150, sort: true });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150 });//0
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150 });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150 });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150 });
			columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150 });
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150 });
			columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150 });//0
			columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
			columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
			@@ -1059,9 +1465,9 @@
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'éå®å·¥å', title: 'éå®å·¥å', width: 150, sort: true, filter: true });//0
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text' });
			columns.push({ field: 'éå®å·¥å', title: 'éå®å·¥å', width: 150, filter: true });//0
			//columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			option = {
			elem: '#mainTable'
			@@ -1071,6 +1477,45 @@
			, cellMinWidth: 90
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, even: true
			, rowDrag: {/trigger: 'row',/
			done: function (obj) {
			// å®ææ¶ï¼æ¾å¼æ¶ï¼è§¦å
			// å¦ææå¨ååæå¨åæ ååï¼åä¸ä¼è§¦åæ¤æ¹æ³
			console.log(obj.row) // å½åè¡æ°æ®
			console.log(obj.cache) // æ¹å¨åå¨è¡¨æ°æ®
			console.log(obj.oldIndex) // åæ¥çæ°æ®ç´¢å¼
			console.log(obj.newIndex) // æ¹å¨åæ°æ®ç´¢å¼

			console.log(table.cache["mainTable"]) // æ¹å¨åæ°æ®ç´¢å¼


			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;

			table.reload('mainTable', {
			data: option.data
			});

			//table.render(option);
			//option.data = table.cache["mainTable"];
			}
			}
			, sort: function (obj) { // æåºäºä»¶
			// è·åå½åæåºçåæ®µåæåºç±»å
			var field = obj.field;
			var type = obj.type;
			data.sort(function (a, b) {
			return type === 'asc' ? (a[field] - b[field]) : (b[field] - a[field]);
			});
			// éæ°æ¸²æè¡¨æ ¼
			table.reload('test', {
			data: data
			});
			}
			, done: function (res, page, count) {
			soulTable.render(this);
			$('.layui-table thead').on('click', 'th', function () {
			@@ -1082,7 +1527,7 @@
			, HBEGINDATE: field
			, HENDDATE: field
			}
			get_Display_3(JSON.stringify(sWhere));
			//get_Display_3(JSON.stringify(sWhere));
			});
			//res.data.forEach(function (item, index) {
			// if (data1.data.DataColor != undefined) {
			@@ -1143,6 +1588,8 @@
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			//åè®¾ç½®
			DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
			ins = table.render(option);
			var HinterID_S = [];
			for (var i = 0; i < data1.data.length; i++) {
			@@ -1179,7 +1626,8 @@
			data: { "sWhere": HinterID_S.toString(),"num":1 },
			success: function (data1) {
			if (data1.count == 1) {
			for (var i = 0; i < 31; i++) {
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			for (var i = 0; i < HArrangeProductDayQty; i++) {
			option.cols[0][22 + i]["edit"] = "text";
			option.cols[0][22 + i]["style"] = "";
			var TableDate = option.cols[0][22 + i].field;
			@@ -1191,7 +1639,7 @@
			if (data1.data[0]["DayNum"] > 0) {
			//è·åè¢«éå®çåæ°
			var tableNum = 0;
			for (var i = 0; i < 31; i++) {
			for (var i = 0; i < HArrangeProductDayQty; i++) {
			if (option.cols[0][22 + i]["edit"] == "") {
			tableNum += 1;
			} else {
			@@ -1269,9 +1717,10 @@
			}

			//è·åæ¥æä¸æ
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			var _numData3 = [];
			for (var i = 0; i < _numData2.length; i++) {
			for (var j = 22; j < 53; j++) {
			for (var j = 22; j < 22 + HArrangeProductDayQty; j++) {
			if (option.cols[0][j]["field"] == _numData2[i]) {
			_numData3[i] = j;
			break;
			@@ -1354,6 +1803,22 @@
			})
			}

			//æ¥è®¡åæ»å¨å¯¼å¥
			function btnExcel_DayImport() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'æ¥è®¡åæ»å¨å¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å®å·¥æäº§/JIT_DayPlanPlatForm_DayImport.html?OperationType=1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			}

			//ç©æåè¡¨
			function btnHMaterID() {
			layer.open({
			@@ -1414,8 +1879,11 @@
			var data = localStorage.getItem("JIT_DayPlanPlatForm_HWorkShop");
			if (data != null) {
			var data2 = JSON.parse(data);
			$("#HWorkShopID").val(data2["HWorkShopID"]);
			$("#HWorkShopIDName").val(data2["HWorkShopIDName"]);
			if (HType == "") {
			$("#HWorkShopID").val(data2["HWorkShopID"]);
			$("#HWorkShopIDName").val(data2["HWorkShopIDName"]);
			}
			$("#HArrangeProductDayQty").val(data2["HArrangeProductDayQty"]);
			form.render('select');
			}
			}
			@@ -1427,6 +1895,7 @@
			var data = {
			HWorkShopID: $("#HWorkShopID").val()
			, HWorkShopIDName: $("#HWorkShopIDName").val()
			, HArrangeProductDayQty: $("#HArrangeProductDayQty").val()
			}
			//æ¬å°åå¨
			localStorage.setItem("JIT_DayPlanPlatForm_HWorkShop", JSON.stringify(data));
			@@ -1447,96 +1916,98 @@
			if (number == 1) {
			HProdORGID = sessionStorage["OrganizationID"];//çäº§è®¢åç»ç»
			}
			var HPlanBeginDate = $("#HPlanBeginDate").val();//å¼å·¥èµ·å§æ¥æ
			var HPlanEndDate = $("#HPlanEndDate").val();//å¼å·¥æªæ¢æ¥æ
			var HMastersDate = $("#HMastersDate").val();//æäº§æ¥æ
			var HSeOrderBillNo = $("#HSeOrderBillNo").val();//éå®è®¢åå·
			var HMaterID = $("#HMaterID").val();//ç©æç¼ç id
			var HICMOBillNo = $("#HICMOBillNo").val();//çäº§è®¢åå·
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();
			//var HPlanBeginDate = $("#HPlanBeginDate").val();//å¼å·¥èµ·å§æ¥æ
			//var HPlanEndDate = $("#HPlanEndDate").val();//å¼å·¥æªæ¢æ¥æ
			//var HMastersDate = $("#HMastersDate").val();//æäº§æ¥æ
			//var HSeOrderBillNo = $("#HSeOrderBillNo").val();//éå®è®¢åå·
			//var HMaterID = $("#HMaterID").val();//ç©æç¼ç id
			//var HICMOBillNo = $("#HICMOBillNo").val();//çäº§è®¢åå·
			//var ColName = $("#ColName").val();//å¤éæ¡
			//var Comparator = $("#Comparator").val()
			//var ColContent = $("#ColContent").val();
			//var ColName1 = $("#ColName1").val();//å¤éæ¡
			//var Comparator1 = $("#Comparator1").val()
			//var ColContent1 = $("#ColContent1").val();
			//var ColName2 = $("#ColName2").val();//å¤éæ¡
			//var Comparator2 = $("#Comparator2").val()
			//var ColContent2 = $("#ColContent2").val();
			var sWheres = "";

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like''%" + ColContent + "%''";
			break;
			case "8":
			com = "like''%" + ColContent + "''";
			break;
			case "9":
			com = "like''" + ColContent + "%''";
			break;
			case "10":
			com = "not like''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWheres += " and [" + ColName + "] " + com;
			}
			//if (ColName != 0 && Comparator != 0) {
			// var com = "";
			// switch (Comparator) {
			// case "7":
			// com = "like''%" + ColContent + "%''";
			// break;
			// case "8":
			// com = "like''%" + ColContent + "''";
			// break;
			// case "9":
			// com = "like''" + ColContent + "%''";
			// break;
			// case "10":
			// com = "not like''%" + ColContent + "%''";
			// break;
			// default:
			// com = "" + Comparator + "''" + ColContent + "''";
			// break;
			// }
			// sWheres += " and [" + ColName + "] " + com;
			//}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			//if (ColName1 != 0 && Comparator1 != 0) {
			// var com1 = "";
			// switch (Comparator1) {
			// case "7":
			// com1 = "like'%" + ColContent1 + "%'";
			// break;
			// case "8":
			// com1 = "like'%" + ColContent1 + "'";
			// break;
			// case "9":
			// com1 = "like'" + ColContent1 + "%'";
			// break;
			// case "10":
			// com1 = "not like'%" + ColContent1 + "%'";
			// break;
			// default:
			// com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			// break;
			// }
			// sWhere += " and " + ColName1 + " " + com1;
			//}
			//if (ColName2 != 0 && Comparator2 != 0) {
			// var com2 = "";
			// switch (Comparator2) {
			// case "7":
			// com2 = "like'%" + ColContent2 + "%'";
			// break;
			// case "8":
			// com2 = "like'%" + ColContent2 + "'";
			// break;
			// case "9":
			// com2 = "like'" + ColContent2 + "%'";
			// break;
			// case "10":
			// com2 = "not like'%" + ColContent2 + "%'";
			// break;
			// default:
			// com2 = "" + Comparator + "'" + ColContent + "'";
			// break;
			// }
			// sWhere += " and " + ColName2 + " " + com2;
			//}


			sWhere = {
			HPlanBeginDate: HPlanBeginDate
			HPlanBeginDate: '1900-01-01' //HPlanBeginDate
			, HProdORGID: HProdORGID
			, HSeOrderBillNo: HSeOrderBillNo
			, HPlanEndDate: HPlanEndDate
			, HMaterID: HMaterID
			, HICMOBillNo: HICMOBillNo
			, HSeOrderBillNo: '' //HSeOrderBillNo
			, HPlanEndDate: '2500-01-01' //HPlanEndDate
			, HMaterID: 0 //HMaterID
			, HICMOBillNo: '' //HICMOBillNo
			, HWorkShopID: HWorkShopID
			, HMastersDate: HMastersDate
			, HMastersDate: '' //HMastersDate
			, sWheres: sWheres
			}
			get_Display(JSON.stringify(sWhere));
			@@ -1548,7 +2019,7 @@
			function get_FastQuery_ICMO(number) {
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HDeptName_ICMO = $("#HDeptName_ICMO").val();//çäº§è½¦é´
			var HDeptName_ICMO = $("#HWorkShopIDName").val();//çäº§è½¦é´
			var HMaterName_ICMO = $("#HMaterName_ICMO").val();//ç©æåç§°
			var HICMOBillNo_ICMO = $("#HICMOBillNo_ICMO").val(); //çäº§è®¢å

			@@ -1559,7 +2030,7 @@
			sWhere_ICMO += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HDeptName_ICMO) {
			sWhere_ICMO += " and çäº§è½¦é´ like '%" + HDeptName_ICMO + "%'";
			sWhere_ICMO += " and çäº§è½¦é´ = '" + HDeptName_ICMO + "'";
			}
			if (HMaterName_ICMO) {
			sWhere_ICMO += " and concat(äº§åä»£ç ,äº§ååç§°,è§æ ¼åå·) like '%" + HMaterName_ICMO + "%'";
			@@ -1567,7 +2038,7 @@
			if (HICMOBillNo_ICMO) {
			sWhere_ICMO += " and åæ®å· like '%" + HICMOBillNo_ICMO + "%'";
			}

			sWhere_ICMO += " and ç¶æ like '%å¼å·¥%'";
			get_Display2(sWhere_ICMO);
			sWhere_ICMO = ""//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -1626,7 +2097,7 @@
			//$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å·¥èµ·å§æ¥æ
			//$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//å¼å·¥æªæ¢æ¥æ

			$("#HDeptName_ICMO").val("");//çäº§è½¦é´
			//$("#HDeptName_ICMO").val("");//çäº§è½¦é´
			$("#HMaterName_ICMO").val("");//ç©æåç§°
			$("#HICMOBillNo_ICMO").val(""); //çäº§è®¢å

			@@ -1696,6 +2167,43 @@
			}
			});
			}
			//æ¬ æè¿ç®
			function set_Calculate() {
			if ($("#HWorkShopID").val() == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			}
			var ajaxLoad = layer.load();
			//æ¬ æè¿ç®
			var sql = "exec h_p_JIT_MaterialLevelShorAnalysisReportList " + $("#HWorkShopID").val() + ",'" + sessionStorage["HMaker"] + "'," + sessionStorage["OrganizationID"];
			var startTime = new Date().getTime();
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
			type: "GET",
			async: false,
			data: { "sWhere": sql },
			success: function (data1) {
			// è®¡ç®è¯·æ±è±è´¹çæ¶é´
			var endTime = new Date().getTime();
			var executionTime = endTime - startTime; // æ¯«ç§
			var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // è½¬æ¢ä¸ºç§å¹¶ä¿çä¸¤ä½å°æ°
			if (data1.count == 1) {
			layer.msg(data1.data[0]["HRemark"]);
			// åæ ·ä½¿ç¨setTimeoutå»¶è¿æ¾ç¤ºæ§è¡æ¶é´ï¼å¨éè¯¯å¤çä¸ä¹è®¡ç®æ¶é´ï¼
			setTimeout(function () {
			layer.msg("æ§è¡æ¶é´: " + executionTimeInSeconds + " ç§");
			layer.close(ajaxLoad);
			}, 1000);
			layer.close(ajaxLoad);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			});
			}

			//çäº§è®¢åéå
			function get_btnICMOBill() {
			@@ -1706,7 +2214,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§è®¢ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html?HDeptID=' + HDeptID, 'yes']
			, content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.html?Type=2&HDeptID=' + HDeptID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1732,10 +2240,81 @@
			})
			}

			function get_btnAddICMO() {
			var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept',
			type: "GET",
			data: { "HDeptID": HDeptID },
			success: function (data1) {
			if (data1.count == 1) {
			var dataPush = [];
			var tableBak = table.cache["mainTable"]; //è·åä¹åç¼è¾è¿çè¡¨æ ¼æ°æ®
			buttonArr = [];//æ¸ç©ºæ°ç»
			for (var i = 0; i < tableBak.length; i++) {
			dataPush.push(tableBak[i]); //å°ä¹åçæ°æ®åå¨
			}

			for (var i = 0; i < dataPush.length; i++) {
			if (dataPush[i]["åæ®å·"] == "") {
			for (var j = 0; j < data1.data.length; j++) {
			if (data1.data[j]["æºåä¸»åç "] == dataPush[i]["æºåä¸»åç "] && data1.data[j]["æºåååç "] == dataPush[i]["æºåååç "]) {
			layer.close(ajaxLoad);
			return layer.alert("çäº§æç»è¡éå¤,éå¤ççäº§è®¢åå·:" + dataPush[i]["çäº§è®¢åå·"] + ",æç»è¡å·:" + dataPush[i]["çäº§è®¢åæç»è¡å·"], { icon: 5 });

			}
			}
			}
			}
			//åå¨æ°æ®
			for (var i = 0; i < data1.data.length; i++) {
			dataPush.push(data1.data[i]);
			}
			option.data = dataPush;
			table.render(option);

			//è·åä¸æ¹æäº§åè¡¨æ°æ®,ç¨äºå¯¹æ¯ä¸æ¹çäº§è®¢ååè¡¨ï¼å°ä¸æ¹çäº§è®¢ååè¡¨ç¸åçæ°æ®ä¸æ¾ç¤º
			//var compareList = [];
			//for (var i = 0; i < option.data.length; i++) {
			// var temp = option.data[i]["æºåä¸»åç "] + "\|" + option.data[i]["æºåååç "];
			// compareList.push(temp);
			//}

			////åé¤ä¸æ¹æäº§åè¡¨ä¸å·²ç»å å¥ççäº§è®¢å
			//var tables = [];
			//for (var i = 0; i < option2.data.length; i++) {
			// var temp = option2.data[i]["hmainid"] + "\|" + option2.data[i]["HEntryID"];
			// if ($.inArray(temp, compareList) == -1) {
			// tables.push(option2.data[i]);
			// }
			//}
			//option2.data = tables;

			////éæ°æ¸²æåè¡¨2
			//table.render(option2);

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


			//åå¤
			function get_btnReady() {
			var data = table.cache["mainTable"];
			var HICOMNum = [];
			var HTotalDataList = [[]];

			var index = 0;
			var countEveryGroup = 50;
			for (var i = 0; i < data.length; i++) {
			if (isNaN(data[i]["HICMOInterID"])) {
			return layer.msg("è¯·åè¿è¡ä¿å!!")
			@@ -1743,86 +2322,101 @@
			if (isNaN(data[i]["HSourceID"])) {
			return layer.msg("éæ©çäº§èµæº!!")
			}
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);

			if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
			HTotalDataList.push([]);
			}
			HTotalDataList[(index / countEveryGroup).toFixed(0) * 1].push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
			index++;
			}

			$('#HProgressBar').html(`
			<div class="layui-progress" lay-filter="demo-filter-progress">
			<div class="layui-progress-bar" lay-percent="40%"></div>
			</div>
			`);
			// æ¸²æè¿åº¦æ¡ç»ä»¶
			element.render('progress', 'demo-filter-progress');
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
			type: "GET",
			data: { "SWhere": HICOMNum.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			for (var i = 0; i < data1.data.length; i++) {
			for (var j = 0; j < option.data.length; j++) {
			if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
			option.data[j]["å°æ¶äº§è½"] = data1.data[i]["å°æ¶äº§è½"];
			option.data[j]["çäº§å¨æ"] = data1.data[i]["çäº§å¨æ"];
			option.data[j]["å¼å·¥ä½é"] = data1.data[i]["å¼å·¥ä½é"];
			option.data[j]["æè¿å¼å·¥æ¥æ"] = data1.data[i]["æè¿å¼å·¥æ¥æ"];
			option.data[j]["æè¿å®å·¥æ¥æ"] = data1.data[i]["æè¿å®å·¥æ¥æ"];
			option.data[j]["è®¢åéæ±æ°é"] = data1.data[i]["è®¢åéæ±æ°é"];
			option.data[j]["è®¢åäº¤è´§æ"] = data1.data[i]["è®¢åäº¤è´§æ"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["è®¢åäº¤è´§æ"];
			break;
			}
			}
			}
			var msg = "";
			for (var t = 0; t < HTotalDataList.length; t++) {
			$('#HProgressBar').html('');
			var str = '<div class="layui-progress" lay-filter="demo-filter-progress"> <div class="layui-progress-bar" lay-percent="' + (t / HTotalDataList.length)*100 + '%"></div></div>';
			$('#HProgressBar').html(str);
			// æ¸²æè¿åº¦æ¡ç»ä»¶
			element.render('progress', 'demo-filter-progress');

			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//è®¾ç½®ä»»å¡åä¼åæåºï¼å¹¶è®¾ç½®ä¼å(æè¿å®å·¥æ¥æ+è®¢åäº¤è´§æ) å°è£
			if (option.data[j]["æè¿å®å·¥æ¥æ"] > option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["æè¿å®å·¥æ¥æ"] == option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {
			if (option.data[j]["è®¢åäº¤è´§æ"] > option.data[j + 1]["è®¢åäº¤è´§æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¢åäº¤è´§æ"] == option.data[j + 1]["è®¢åäº¤è´§æ"]) {
			if (option.data[j]["è®¢åéæ±æ°"] < option.data[j + 1]["è®¢åéæ±æ°"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			}
			HICOMNum = HTotalDataList[t];
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
			async: false,
			type: "GET",
			data: { "SWhere": HICOMNum.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			for (var i = 0; i < data1.data.length; i++) {
			for (var j = 0; j < option.data.length; j++) {
			if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
			option.data[j]["å°æ¶äº§è½"] = data1.data[i]["å°æ¶äº§è½"];
			option.data[j]["çäº§å¨æ"] = data1.data[i]["çäº§å¨æ"];
			option.data[j]["å¼å·¥ä½é"] = data1.data[i]["å¼å·¥ä½é"];
			option.data[j]["æè¿å¼å·¥æ¥æ"] = data1.data[i]["æè¿å¼å·¥æ¥æ"];
			option.data[j]["æè¿å®å·¥æ¥æ"] = data1.data[i]["æè¿å®å·¥æ¥æ"];
			option.data[j]["è®¢åéæ±æ°é"] = data1.data[i]["è®¢åéæ±æ°é"];
			option.data[j]["è®¢åäº¤è´§æ"] = data1.data[i]["è®¢åäº¤è´§æ"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["è®¢åäº¤è´§æ"];
			break;
			}
			}
			}
			}
			$('#HProgressBar').html('')

			table.render(option);
			set_Priority();
			data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			if (parseFloat(data[i]["å°æ¶äº§è½"]) == 0 \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == null \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == undefined) {
			return layer.alert("ç¬¬" + (i + 1) + 'è¡ï¼å°æ¶äº§è½æªè®¾ç½®ï¼è¯·æ ¸å¯¹æ°æ®ã' + '</br>' + '1.ç©ææªæ·»å å·¥èºè·¯çº¿' + '</br>' + '2.å·¥èºè·¯çº¿ä¸æªè®¾ç½®å°æ¶äº§è½' + '</br>' + '3.çäº§èµæºæªè®¾ç½®åçå·¥æ¶' + '</br>' + '4.çäº§èµæºä¸ç»å®å·¥ä½ä¸å¿ä¸å·¥èºè·¯çº¿ä¸è®¾ç½®çå·¥ä½ä¸å¿ä¸ä¸è´');
			}
			}
			//for (var i = 0; i < option.data.length - 1; i++) {
			// for (var j = 0; j < option.data.length - i - 1; j++) {
			// var tables = [];
			// //è®¾ç½®ä»»å¡åä¼åæåºï¼å¹¶è®¾ç½®ä¼å(æè¿å®å·¥æ¥æ+è®¢åäº¤è´§æ) å°è£
			// if (option.data[j]["æè¿å®å·¥æ¥æ"] > option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {

			} else {
			//layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			// tables.push(option.data[j + 1]);
			// option.data[j + 1] = option.data[j];
			// option.data[j] = tables[0];

			// } else if (option.data[j]["æè¿å®å·¥æ¥æ"] == option.data[j + 1]["æè¿å®å·¥æ¥æ"]) {
			// if (option.data[j]["è®¢åäº¤è´§æ"] > option.data[j + 1]["è®¢åäº¤è´§æ"]) {

			// tables.push(option.data[j + 1]);
			// option.data[j + 1] = option.data[j];
			// option.data[j] = tables[0];

			// } else if (option.data[j]["è®¢åäº¤è´§æ"] == option.data[j + 1]["è®¢åäº¤è´§æ"]) {
			// if (option.data[j]["è®¢åéæ±æ°"] < option.data[j + 1]["è®¢åéæ±æ°"]) {

			// tables.push(option.data[j + 1]);
			// option.data[j + 1] = option.data[j];
			// option.data[j] = tables[0];

			// }
			// }
			// }
			// }
			//}

			} else {
			//layer.close(ajaxLoad);
			//layer.alert(data1.code + data1.Message, { icon: 5 });

			msg += data1.Message;
			}
			}, error: function (e) {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			return;
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			});
			}

			table.render(option);
			set_Priority();
			data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			if (parseFloat(data[i]["å°æ¶äº§è½"]) == 0 \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == null \|\| parseFloat(data[i]["å°æ¶äº§è½"]) == undefined) {
			msg += "ç¬¬" + (i + 1) + 'è¡ï¼å°æ¶äº§è½æªè®¾ç½®ï¼è¯·æ ¸å¯¹æ°æ®ã' + '</br>' + '1.ç©ææªæ·»å å·¥èºè·¯çº¿' + '</br>' + '2.å·¥èºè·¯çº¿ä¸æªè®¾ç½®å°æ¶äº§è½' + '</br>' + '3.çäº§èµæºæªè®¾ç½®åçå·¥æ¶' + '</br>' + '4.çäº§èµæºä¸ç»å®å·¥ä½ä¸å¿ä¸å·¥èºè·¯çº¿ä¸è®¾ç½®çå·¥ä½ä¸å¿ä¸ä¸è´';
			}
			});
			}

			if (msg != "") {
			layer.alert(msg, { icon: 5 });
			}
			$('#HProgressBar').html('')
			}

			//å·¥èºè·¯çº¿ç¼è¾
			@@ -1903,6 +2497,11 @@
			var HJDLen = 0;
			var HReportQty = 0;

			if (set_ModCheck("Sc_WorkBillSortBill_Edit") == false) {
			return layer.msg("æ æäº§æé!!!")
			}


			//å¦æéå®è®¡åï¼åä¸éè¦åæç¨
			//æ¥è¯¢æ¬è½¦é´æ¯å¦æéå®è®¡åçæ°æ®
			var HinterID_S = [];
			@@ -1950,8 +2549,9 @@
			get_HFData(0, 0);

			//åå§åè¡¨æ ¼æ°æ®
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			for (var i = 0; i < option.data.length; i++) {
			for (var j = (22 + HPlanDay); j < 53; j++) {
			for (var j = (22 + HPlanDay); j < (22 + HArrangeProductDayQty); j++) {
			if (option.data[i][option.cols[0][j].field] != null) {
			option.data[i][option.cols[0][j].field] = "";
			}
			@@ -2343,7 +2943,8 @@
			else {
			for (var i = 0; i < ds.length; i++) {
			//æ¾å°å¯¹åºçå
			for (var j = 22; j < 53; j++) {
			var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
			for (var j = 22 + HPlanDay; j < 22 + HArrangeProductDayQty; j++) {
			if (sLeftQty > 0) {
			if (ds[i]["æ¥æ"] == grd.cols[0][j].field) {
			//å¦ææ¶é´è¢« ä¸éä½éå ç¨ å è·³è¿
			@@ -2645,51 +3246,64 @@

			//ä¼åçº§
			function set_Priority() {
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;
			table.render(option);
			layer.confirm('ä½ ç¡®å®è¦æ§è¡ä¼åçº§æä½åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;
			table.render(option);
			layer.close(index);
			}
			})
			}

			//åå¤æåº
			function set_ReadyAsc() {
			if (option.data.length != 0) {
			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//æç§è®¡åç»ææ¥æ çäº§è®¢åå· çäº§è®¢åæç»è¡å·çé¡ºåºå»æ
			if (option.data[j]["è®¡åç»ææ¥æ"] > option.data[j + 1]["è®¡åç»ææ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¡åç»ææ¥æ"] == option.data[j + 1]["è®¡åç»ææ¥æ"]) {
			if (option.data[j]["çäº§è®¢åå·"] > option.data[j + 1]["çäº§è®¢åå·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["çäº§è®¢åå·"] == option.data[j + 1]["çäº§è®¢åå·"]) {
			if (option.data[j]["çäº§è®¢åæç»è¡å·"] > option.data[j + 1]["çäº§è®¢åæç»è¡å·"]) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æåºæä½åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function (index, layero) {
			if (option.data.length != 0) {
			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//æç§è®¡åç»ææ¥æ çäº§è®¢åå· çäº§è®¢åæç»è¡å·çé¡ºåºå»æ
			if (option.data[j]["è®¡åç»ææ¥æ"] > option.data[j + 1]["è®¡åç»ææ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¡åç»ææ¥æ"] == option.data[j + 1]["è®¡åç»ææ¥æ"]) {
			if (option.data[j]["çäº§è®¢åå·"] > option.data[j + 1]["çäº§è®¢åå·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["çäº§è®¢åå·"] == option.data[j + 1]["çäº§è®¢åå·"]) {
			if (option.data[j]["çäº§è®¢åæç»è¡å·"] > option.data[j + 1]["çäº§è®¢åæç»è¡å·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			}
			}
			}
			}
			}
			table.render(option);
			}
			else {
			return layer.msg("æ æ°æ®!")
			}
			layer.close(index);
			}
			table.render(option);
			}
			else {
			return layer.msg("æ æ°æ®!")
			}
			})

			}

			//éäº§çº¿
			@@ -2746,7 +3360,7 @@
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}


			//éæä½å·¥
			function set_Emp(data) {
			if (data != 0) {
			@@ -2852,7 +3466,7 @@
			var sSubStr = "["+JSON.stringify(num)+"]";
			var sMainSub = sSubStr + "&å" + sessionStorage["HUserName"];

			var index = layer.load();
			//var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
			@@ -2861,16 +3475,16 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			layer.msg("ä¿åæå");
			layer.close(index);
			//layer.msg("ä¿åæå");
			//layer.close(index);
			}
			else {
			layer.close(index);
			//layer.close(index);
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			//layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			@@ -3064,6 +3678,65 @@
			}
			}

			//éå®ç³è¯·
			function get_btnLockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName) {
			var data = table.cache["mainTable"];

			if (data.length == 0) {
			return layer.msg("æ æ°æ®,æ æ³è¿è¡éå®!")
			} else {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'æäº§éå®ç³è¯·å'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/å®å·¥æäº§/JIT_LockRequestBill.html?HOperationType=4&HLockDays=' + HLockedDay + '& HEmpName=' + HEmpName + '& HDeptID=' + HWorkShopID + '&HDeptName=' + HWorkShopIDName + "'", 'yes']
			//, btn: ['ç¡®å®', 'åæ¶']
			//, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			// var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			// var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			// if (checkStatus.data.length === 0) {
			// return layer.msg('è¯·éæ©æ°æ®');
			// }
			// $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			// $("#HDeptID").val(checkStatus.data[0].HItemID);
			// layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			//}
			//, btn2: function (index, layero) { }
			})
			}
			}

			//è§£éç³è¯·
			function get_btnUnlockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName) {
			var data = table.cache["mainTable"];
			if (data.length == 0) {
			return layer.msg("æ æ°æ®,æ æ³è¿è¡è§£é!")
			} else {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'æäº§è§£éç³è¯·å'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/å®å·¥æäº§/JIT_UnLockRequestBill.html?HOperationType=4&HEmpName=' + HEmpName + '& HDeptID=' + HWorkShopID + '&HDeptName=' + HWorkShopIDName + "'", 'yes']
			//, btn: ['ç¡®å®', 'åæ¶']
			//, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			// var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			// var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			// if (checkStatus.data.length === 0) {
			// return layer.msg('è¯·éæ©æ°æ®');
			// }
			// $("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			// $("#HDeptID").val(checkStatus.data[0].HItemID);
			// layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			//}
			//, btn2: function (index, layero) { }
			})
			}
			}

			//éå®å·¥å
			function get_btnLockOrder() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -3232,6 +3905,7 @@
			var ajaxLoad = layer.load();
			if (checkStatus.data.length != 1) {
			layer.alert("è¯·éæ©ä¸æ¡æ°æ®!");
			layer.close(ajaxLoad);
			} else {
			var TabData = checkStatus.data;
			var HMaterID = TabData[0].HMaterID;
			@@ -3268,7 +3942,7 @@
			, content: '../../è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=3&linterid=' + HRoutingInterID + '&HSouceBillType=4610&IsHavingPermissions=' + data1.IsHavingPermissions
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			//location.reload();
			}
			})
			}
			@@ -3287,7 +3961,7 @@
			, content: '../../è®¡åç®¡ç/å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=' + HRoutingInterID + '&HSouceBillType=4610&HMaterID='+ HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			//location.reload();
			}
			})
			});
			@@ -3392,137 +4066,6 @@
			else {
			layer.msg('è¯·éæ©æ°æ®ï¼');
			}
			}

			//éèåè®¾ç½®
			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;

			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) {
			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			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";
			}
			}
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			function get_HideColumn_ICMO() {