MES-WEB-LayUI.git

			@@ -18,6 +18,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/common.js"></script>
			<style type="text/css">
			.layui-form-item .layui-inline {
			margin-right: 0;
			@@ -453,6 +454,7 @@
			var refSav = ""; //æäº¤ç±»å
			var total = 0; // æå®æ¡ä»¶çæ°æ®æå æ¡
			var current = 0; //å½åçæ°æ®ç¬¬å æ¡æ°æ®
			var isOpenBox = "0"; //æ¯å¦æå¼å¼¹æ¡å°å®ç¯é¡µé¢
			var sWhere = ""; // çéæ¡ä»¶
			//è·åé¡µé¢è·³è½¬åæ° //åæ®ç¼è¾ç¶æï¼ 1.æ æºåæ°å¢Â Â 2.ææºåæ°å¢Â Â 3.ç¼è¾Â 4.æµè§Â 5.åæ´
			var params = get_UrlVars();
			@@ -490,8 +492,7 @@
			var HBillType = "3919";
			var HMaker = sessionStorage["HUserName"]
			var HStockOrgID = sessionStorage["OrganizationID"] //ç»ç»ID
			var option = {};

			var option = {};
			//#endregion

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -554,9 +555,11 @@
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#btn_PrevPage").addClass("layui-btn-disabled").attr('disabled', true)
			$("#btn_NextPage").addClass("layui-btn-disabled").attr('disabled', true)
			}
			else if (OperationType == 2) { //å¤å¶

			$("#HInterID").val(HInterID);
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(HInterID);
			//æä»¶éæ©åå§å
			@@ -567,19 +570,24 @@
			$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(HMaker);
			$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#HChecker").val('')
			$("#HCloseMan").val('')
			$("#HUpDater").val('')
			$("#HDeleteMan").val('')
			$("#HCheckDate").val(Pub_Format(Date.now(), "yyyy-MM-dd hh:mm:ss"))
			$("#HCloseDate").val(Pub_Format(Date.now(), "yyyy-MM-dd hh:mm:ss"))
			$("#HUpDateDate").val(Pub_Format(Date.now(), "yyyy-MM-dd hh:mm:ss"))
			$("#HDeleteDate").val(Pub_Format(Date.now(), "yyyy-MM-dd hh:mm:ss"))
			$('#btn-save').removeClass('layui-btn-disabled').attr('disabled', false)
			$('#HInterID').val(0)
			get_billWithProcAndSource()
			OperationType = 1;
			}
			else if (OperationType == 3) { //ç¼è¾
			$("#HInterID").val(HInterID);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(HInterID);

			get_billWithProcAndSource()
			//æä»¶éæ©åå§å
			PicUpload();
			getFile();
			@@ -599,6 +607,7 @@
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»

			//å·¥åºæµè½¬å¡é¡µé¢ä¸æ¨
			if (HInterID == "") { //æ¥å·¥å°ä¸æ¨
			set_ProcessBill(HSourceInterID, HSourceEntryID);
			@@ -728,8 +737,7 @@
			//è¡æ°æ® ä¸æå¤éæ¡ æ¾ç¤º
			checkRefresh();
			layer.close(ajaxLoad);
			sWhere = " and HProcID = " + data.HProcID + " and HSourceID = " + data.HSourceID
			GetBillLocation(HInterID, sWhere);

			} else {
			layer.close(ajaxLoad);
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			@@ -757,7 +765,12 @@
			data: { "HInterID": HInterID, "HMaker": HMaker, "sWhere": sWhere },
			success: function (data1) {
			total = data1.count;
			current = data1.data[0].current;
			if (data1.data.length > 0) {
			current = data1.data[0].current;
			}
			else {
			current = 0
			}
			pageJudgement();
			layer.close(ajaxLoad);
			},
			@@ -891,6 +904,7 @@
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html?openType=2', 'yes']
			// , content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -903,11 +917,27 @@
			$("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
			$("#HProcID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å³éå¼¹çª å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç

			}
			, btn2: function (index, layero) { }
			, end: function () {
			get_billWithProcAndSource()
			}
			})
			}
			//#endregion

			function get_billWithProcAndSource() {
			let interID = isEmpty($('#HInterID').val()) == true ? 0 : $('#HInterID').val()
			let HProcID = $('#HProcID').val()
			let HSourceID = $('#HSourceID').val()
			debugger
			if (isEmpty(HProcID, true, true) == false) {
			// å·¥åºæ¯å¿å¡«é¡¹
			sWhere = " and HProcID = " + HProcID + " and HSourceID = " + HSourceID
			GetBillLocation(interID, sWhere);
			}
			}

			//#region éæ©ç¹æ£äºº
			function get_checkEmp() {
			@@ -963,6 +993,9 @@
			layer.close(index); //å³éå¼¹çª å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function () {
			get_billWithProcAndSource()
			}
			})
			}
			//#endregion
			@@ -1640,7 +1673,7 @@
			maxmin: true, //å¼å¯æå¤§åæå°åæé®
			area: ['90%', '80%'],
			content: '../è®¾å¤å·¥èºåæ°è®¢åç¹æ£è¡¨/SB_EquipICMOTechParamBillEdit_HistoryRecord.html?linterid=' + HInterID
			+ '&HProcID='+ HProcID + '&HSourceID='+ HSourceID
			+ '&HProcID=' + HProcID + '&HSourceID=' + HSourceID
			});
			})

			@@ -1682,10 +1715,10 @@
			"HProcID": data.HProcID,
			"HProcName": data.å·¥åºåç§°,
			"HProcNo": data.å·¥åºå·,
			"HGroupID": data.HGroupID == undefined ? 0 : data.HGroupID,
			"HGroupName": data.çç»,
			"HDeptID": data.HDeptID == undefined ? 0 : data.HDeptID,
			"HDeptName": data.å å·¥è½¦é´,
			//"HGroupID": data.HGroupID == undefined ? 0 : data.HGroupID,
			//"HGroupName": data.çç»,
			//"HDeptID": data.HDeptID == undefined ? 0 : data.HDeptID,
			//"HDeptName": data.å å·¥è½¦é´,

			"HSourceID": data.HSourceID,
			"HSourceName": data.çäº§èµæº,
			@@ -1803,8 +1836,37 @@
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(1); //å®¡æ ¸
			get_billWithProcAndSource() // éæ°è·åä½ç½®
			}
			if (isOpenBox=="1") {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim',
			title: 'å¼å¸¸åé¦å',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../../çäº§ç®¡ç/å¼å¸¸åé¦å/Sc_Add_MESExecptFeedBackBillList.html?OperationType=4&linterid=&HSouceBillType=',
			end: function () {

			},
			success: function (dom, index) {
			var data = [];
			data.push({
			"HICMOBillNo": $("#HICMOBillNo").val(),//å·¥åå·
			"HSourceName": $("#HSourceName").val(), //è®¾å¤
			"HType": "å·¥èºåå ", //å¼å¸¸ç±»å
			"HSourceBillNo": HSourceBillNo //æµè½¬å¡å·
			});

			// éè¿ç´¢å¼è·åå°å½å iframe å¼¹åºå±
			var iframe = window['layui-layer-iframe' + index];
			// è°ç¨ iframe å¼¹åºå±åçæ¹æ³
			iframe.edit(data);
			},
			});
			}
			layer.close(index);
			layer.close(index);
			}
			else {
			@@ -2098,20 +2160,34 @@
			}
			//#endregion
			function pageJudgement() {
			if (total == 1) {
			if (total == 1 && current == 0) { // ç¹æ®æåµ: ä»æä¸æ¡æ°æ®ï¼ä½æ¯å¤äºæ°å¢ç¶æï¼éè¦å¯ç¨ä¸ä¸é¡µæé®
			current = total + 1
			$('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
			$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
			return
			}
			if (total <= 1) { // è¯¥çäº§èµæºåå·¥åºä¸æ²¡ææ°æ® æèä»æä¸æ¡æ°æ®
			$('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
			$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
			return
			}
			if (total == current) {
			if (total == current) { // è¾¾å°ä¸é
			$('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
			$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
			} else if (current == 1) {
			} else if (current == 1) { // è¾¾å°ä¸é
			$('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
			$('#btn_NextPage').removeClass("layui-btn-disabled").attr("disabled", false);
			} else {
			} else if (current == 0) { // å±äºè¯¥çäº§èµæºåå·¥åºä¸çæ°å¢
			current = total + 1
			$('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
			$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
			} else if (current < total) {
			$('#btn_PrevPage').removeClass("layui-btn-disabled").attr("disabled", false);
			$('#btn_NextPage').removeClass("layui-btn-disabled").attr("disabled", false);
			}
			else {
			$('#btn_PrevPage').addClass("layui-btn-disabled").attr("disabled", true);
			$('#btn_NextPage').addClass("layui-btn-disabled").attr("disabled", true);
			}
			}
			});
			@@ -2207,6 +2283,9 @@
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å·¥èºåæ°å¼ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HResult == "NG") {
			isOpenBox = "1";
			}
			}
			}
			else {