MES-WEB-LayUI.git

			@@ -13,6 +13,26 @@
			<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">
			@@ -22,6 +42,7 @@
			<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="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>
			@@ -33,9 +54,9 @@
			<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="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">
			@@ -644,6 +665,11 @@
			btnExcelImport();
			});

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

			//ä¿å
			form.on('submit(btnSave)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			@@ -783,7 +809,7 @@
			shadeClose: false, // ç¹å»é®ç½©åºåï¼ä¸å³éå¼¹å±
			maxmin: false, // ä¸åè®¸å¨å±æå°å
			anim: 0, // 0-6 çå¨ç»å½¢å¼ï¼-1 ä¸å¼å¯
			content: '<div style="padding: 12px;">æ£å¨è¿ç®,è¯·èå¿çå¾!!!</div>'
			content: '<div style="padding: 12px;">æ£å¨è¿ç®,è¯·èå¿çå¾!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
			});
			setTimeout(function () {
			get_btnProPC(HWorkShopID);
			@@ -1057,8 +1083,8 @@
			var lastDay = new Date(year, month, 0).getDate(); //å½ææåä¸å¤©
			var thisDay = new Date().getDay(); //å½å¤©æ¯æ¬æç¬¬å å¤©

			var valueList = [7, lastDay - thisDay+1,31,50];
			var titleList = ["7å¤©", "æ¬æ","31å¤©","50å¤©"];
			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++) {
			@@ -1069,7 +1095,7 @@
			$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
			form.render('select');

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

			@@ -1463,7 +1489,19 @@

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

			option.data = 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) { // æåºäºä»¶
			@@ -1758,6 +1796,22 @@
			, title: 'Excelå¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../çäº§è®¡åå¹³å°/JIT_DayPlanPlatFormImport.html?OperationType=1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			}

			//æ¥è®¡åæ»å¨å¯¼å¥
			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();
			@@ -2443,6 +2497,11 @@
			var HJDLen = 0;
			var HReportQty = 0;

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


			//å¦æéå®è®¡åï¼åä¸éè¦åæç¨
			//æ¥è¯¢æ¬è½¦é´æ¯å¦æéå®è®¡åçæ°æ®
			var HinterID_S = [];