MES-WEB-LayUI.git

			@@ -77,6 +77,7 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">å¤çº§å®¡æ ¸</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">å¤çº§åå®¡æ ¸</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">é©³å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_WithdrawCheck_Flow" id="set_WithdrawCheck_Flow">æ¤å</button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			@@ -647,7 +648,7 @@
			, { field: 'HQCSchemeID_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡ID', hide: true }//f7
			, { field: 'HQCSchemeNumber_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125 }
			, { field: 'HQCSchemeName_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡åç§°', width: 125 }//f7

			, { field: 'HWorkQty', title: 'å å·¥æ°é', edit: 'text', width: 125}
			//, { field: 'HPassRate', title: 'è¯ç', edit: 'text' }//é»è®¤
			//, { field: 'HProcID_S', title: 'å·¥æ®µ', edit: 'text' }
			////, { field: 'HCenterID_S', title: 'äº§çº¿ä¸å¿id', hide: true }//hide: true
			@@ -681,7 +682,8 @@
			//, { field: 'HAutoTrunFlag', title: 'èªå¨ç§»è½¬', templet: "#HAutoTrunFlag" }//chenbox
			//, { field: 'HProcCheckNote', title: 'æ¬å·¥åºç¡®è®¤è®°å½', edit: 'text' }
			//, { field: 'HProcWorkNum', title: 'ç¨åºå·', edit: 'text' }
			//, { field: 'HWorkTimes_S', title: 'äº§ååä»¶å·¥æ¶', edit: 'text' }
			/* , { field: 'HWorkTimes_S', title: 'äº§ååä»¶å·¥æ¶', edit: 'text' }*/
			, { field: 'HWorkTimes_S', title: 'åä»¶çäº§èæ', edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			//, done: function (res, curr, count) {
			@@ -793,6 +795,7 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
			}
			});
			}
			@@ -1012,7 +1015,10 @@
			form.on('submit(set_RejectCheck_Flow)', function (data) {
			set_RejectCheck_Flow();
			});

			//æ¤å
			form.on('submit(set_WithdrawCheck_Flow)', function (data) {
			set_WithdrawCheck_Flow();
			});
			//å¤å¶
			form.on('submit(set_Copy)', function (data) {
			set_Copy();
			@@ -1183,7 +1189,7 @@

			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": ""
			"HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "ä¸»å·¥åº", "HCenterID_S": 0, "HCenterID_SName": "","å·¥åºä»£ç ":""
			, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
			, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "å·¥åº": "","å·¥æ®µ":""
			, "HProcID": 0, "å·¥ä½ä¸å¿ä»£ç ": "", "HCenterID": 0, "å·¥ä½ä¸å¿": "", "HSupID": 0
			@@ -1372,12 +1378,12 @@
			//ä¿åæäº¤
			form.on('submit(btnSave)', function (data) {//æäº¤
			const procNos = table.cache["mainTable"].map(item => item.HProcNo);
			if (isSortedAscending(procNos)) {
			if (isSortedAscending(procNos) && haveHProcNO9999()) {
			if (AllowLoadData(data)) {
			set_AddNew(data);
			}
			} else {
			layer.msg('è¯·æ³¨ææµæ°´å·æ¬¡åº');
			layer.msg('è¯·æ³¨ææµæ°´å·æ¬¡åºæèæ¯å¦æè½¬å·¥åº');
			}
			});
			// å½æ°ï¼å¤ææ°ç»æ¯å¦ä»å°å°å¤§æåº
			@@ -1386,6 +1392,18 @@
			if (arr[i] > arr[i + 1]) {
			return false;
			}
			}
			return true;
			}
			//å¤å¶æ¶ä¿è¯è½¬å·¥åºåå¨
			function haveHProcNO9999() {
			if (OperationType == 2 \|\| OperationType == 3) {
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HProcNo"] == 9999 && option.data[i]["å·¥åºä»£ç "] == 9999) {
			return true
			}
			}
			return false;
			}
			return true;
			}
			@@ -1974,6 +1992,39 @@
			}
			//#endregion

			//#region æ¤å
			function set_WithdrawCheck_Flow() {
			var InterID = $("#HInterID").val();
			if (InterID != 0) {
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/WithdrawCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			});
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©å¨å®¡æ¹æµçåæ®é©³åï¼');
			}
			}
			//#endregion

			//#region å¤å¶
			function set_Copy() {
			//å¶åäºº
			@@ -1981,6 +2032,7 @@
			$("#hmakers").val(sessionStorage["HUserName"]);
			$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
			//è®¾ç½®hinterid
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -2907,7 +2959,9 @@
			//å·æ°æµæ°´å·
			function btn_Refresh(data) {
			for (var i = 0; i < option.data.length; i++) {
			option.data[i]["HProcNo"] = (i + 1) * 10;
			if (option.data[i]["HProcNo"] != 9999) {
			option.data[i]["HProcNo"] = (i + 1) * 10;
			}
			}
			table.render(option);
			}
			@@ -2930,8 +2984,10 @@
			if (i >= dataCol.length) {
			continue;
			}

			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}

			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;