MES-WEB-LayUI.git

			@@ -273,19 +273,19 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¶åæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			<input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¿®æ¹æ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			<input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¡æ ¸æ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			<input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
			</div>
			</div>
			</div>
			@@ -307,13 +307,13 @@
			<div class="layui-inline">
			<label class="layui-form-label">å³éæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			<input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½åºæ¥æ:</label>
			<div class="layui-input-inline">
			<input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			<input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
			</div>
			</div>
			</div>
			@@ -1060,7 +1060,7 @@
			, { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', style: 'background-color: #f9f9f9;' }
			, { field: 'HProcExchInterID', title: 'å·¥åºæµè½¬å¡åç ', hide: true }
			, { field: 'HProcExchEntryID', title: 'å·¥åºæµè½¬å¡ååç ', hide: true }
			, { field: 'HProcExchBillNo', title: 'å·¥åºæµè½¬å¡å·', templet: "#HProcExchInterID" }
			, { field: 'HProcExchBillNo', title: 'å·¥åºæµè½¬å¡å·', templet: "#HProcExchInterID", style: 'background-color: #f9f9f9;' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HSourceInterID', title: 'æºååç ', hide: true }
			, { field: 'HSourceEntryID', title: 'æºåååç ', hide: true }
			@@ -1132,6 +1132,7 @@
			if (obj.event == "HRelationBillNo") {
			var HProcID = $("#HProcID").val();
			var HSourceID = $("#HSourceID").val();
			var HMaterID = $("#HMaterID").val();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1140,7 +1141,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../../views/Baseset/åºç¡èµæ/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID + '&HMaterID=' + HMaterID, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1243,6 +1244,91 @@
			, btn2: function (index, layero) { }
			, end: function () {

			}
			})
			}
			obj.event = "";
			return false;
			}
			if (event.key == "F6") {
			if (obj.event == "HRelationBillNo") {
			var HProcID = $("#HProcID").val();
			var HSourceID = $("#HSourceID").val();
			var HMaterID = $("#HMaterID").val();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "å¯äº§è®¡åå" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../../views/Baseset/åºç¡èµæ/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			if ($("#HSourceName").val() == checkStatus.data[0].çäº§èµæº && $("#HProcName").val() == checkStatus.data[0].å·¥åº) {
			obj.update({
			"HProcExchInterID": checkStatus.data[0].hmainid
			, "HProcExchEntryID": checkStatus.data[0].hsubid
			, "HProcExchBillNo": checkStatus.data[0].åæ®å·
			, "HRelationBillInterID": checkStatus.data[0].hmainid
			, "HRelationBillEntryID": checkStatus.data[0].hsubid
			, "HRelationBillNo": checkStatus.data[0].åæ®å·
			, "HICMOInterID": checkStatus.data[0].hicmointerid
			, "HICMOEntryID": checkStatus.data[0].HICMOEntryID
			, "HICMOBillNo": checkStatus.data[0].çäº§è®¢åå·
			, "HMaterID": checkStatus.data[0].HMaterID
			, "HMaterName": checkStatus.data[0].äº§å
			, "HProcID": checkStatus.data[0].HProcID
			, "HProcName": checkStatus.data[0].å·¥åº
			, "HSourceInterID": checkStatus.data[0].hmainid
			, "HSourceEntryID": checkStatus.data[0].hsubid
			, "HSourceBillNo": checkStatus.data[0].åæ®å·
			, "HSourceBillType": 3772

			})
			}
			else {
			return layer.msg("éæ©å¯äº§è®¡ååççäº§èµæºä¸å·¥åº,è·å½åçäº§èµæºä¸å·¥åºä¸å¹é");
			}

			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if ($("#HSourceName").val() == OptionData[0].çäº§èµæº && $("#HProcName").val() == OptionData[0].å·¥åº) {
			obj.update({
			"HProcExchInterID": OptionData[0].hmainid
			, "HProcExchEntryID": OptionData[0].hsubid
			, "HProcExchBillNo": OptionData[0].åæ®å·
			, "HRelationBillInterID": OptionData[0].hmainid
			, "HRelationBillEntryID": OptionData[0].hsubid
			, "HRelationBillNo": OptionData[0].åæ®å·
			, "HICMOInterID": OptionData[0].hicmointerid
			, "HICMOEntryID": OptionData[0].HICMOEntryID
			, "HICMOBillNo": OptionData[0].çäº§è®¢åå·
			, "HMaterID": OptionData[0].HMaterID
			, "HMaterName": OptionData[0].äº§å
			, "HProcID": OptionData[0].HProcID
			, "HProcName": OptionData[0].å·¥åº
			, "HSourceInterID": OptionData[0].hmainid
			, "HSourceEntryID": OptionData[0].hsubid
			, "HSourceBillNo": OptionData[0].åæ®å·
			, "HSourceBillType": 3772

			})
			} else {
			return layer.msg("éæ©å¯äº§è®¡ååççäº§èµæºä¸å·¥åº,è·å½åçäº§èµæºä¸å·¥åºä¸å¹é");
			}

			OptionData = [];
			}
			})
			}
			@@ -1472,8 +1558,8 @@

			//çäº§çæ¬¡
			function GetHWorkShiftsValue(obj) {
			$("#HWorkShiftID").val(obj[0].HInterID); //å½åå·¥åºID
			$("#HWorkShiftName").val(obj[0].çæ¬¡åç§°); //å½åå·¥åº
			$("#HWorkShiftID").val(obj[0].HInterID); //å½åçæ¬¡
			$("#HWorkShiftName").val(obj[0].çæ¬¡åç§°); //å½åçæ¬¡åç§°
			}

			function GetSwipeCardStart(obj) {