MES-WEB-LayUI.git

			@@ -88,7 +88,7 @@
			<div class="layui-btn-group">
			<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			<button type="button" id="Exit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			</div>

			</div>
			@@ -122,7 +122,7 @@
			<label class="layui-form-label">å½åå·¥åº:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
			<input id="HProcID" name="HProcID" type="hidden" />
			<input id="HProcID" name="HProcID" value="0" type="hidden" />
			</div>
			</div>
			</div>
			@@ -131,7 +131,7 @@
			<label class="layui-form-label">äº§åä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -161,7 +161,7 @@
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-inline">
			<input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -171,7 +171,7 @@
			<label class="layui-form-label">æä½å:</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -192,8 +192,8 @@
			<label class="layui-form-label">æºååå·</label>
			<div class="layui-input-inline">
			<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="0">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -202,15 +202,15 @@
			<div class="layui-inline" style="display:none">
			<label class="layui-form-label">æºåè¡å·:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off" disabled>
			<input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è®¢å:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
			<input id="HICMOInterID" name="HICMOInterID" type="hidden" />
			<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
			<input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
			<input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
			</div>
			</div>
			</div>
			@@ -219,7 +219,7 @@
			<label class="layui-form-label">çäº§çç»:</label>
			<div class="layui-input-inline">
			<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -229,7 +229,7 @@
			<label class="layui-form-label">è½¦é´:</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -239,13 +239,21 @@
			<label class="layui-form-label">çäº§çæ¬¡:</label>
			<div class="layui-input-inline">
			<input type="text" name="HWorkShiftName" id="HWorkShiftName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWorkShiftID" id="HWorkShiftID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWorkShiftID" id="HWorkShiftID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkShiftList" id="HWorkShiftLists" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¼å·¥äººæ°:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPeopleSum" lay-verify="HPeopleSum" id="HPeopleSum" value="0" autocomplete="off">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-tab-item">
			@@ -273,19 +281,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 +315,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>
			@@ -601,6 +609,7 @@
			, "HICMOInterID": data.HICMOInterID //çäº§è®¢åä¸»ID
			, "HICMOEntryID": data.HICMOEntryID //çäº§è®¢ååID
			, "HICMOBillNo": data.HICMOBillNo //çäº§è®¢å
			, "HPeopleSum": data.å¼å·¥äººæ° //å¼å·¥äººæ°
			, "HRemark": data.å¤æ³¨ //å¤æ³¨
			, "HMaker": data.å¶åäºº //å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ //å¶åæ¥æ
			@@ -1060,7 +1069,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 }
			@@ -1130,6 +1139,9 @@
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (obj.event == "HRelationBillNo") {
			var HProcID = $("#HProcID").val();
			var HSourceID = $("#HSourceID").val();
			var HMaterID = $("#HMaterID").val();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1138,7 +1150,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../../views/Baseset/åºç¡èµæ/Sc_ProcessExchangeBillListView.html', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID + '&HMaterID=' + HMaterID, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1148,7 +1160,7 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			if ($("#HMaterName").val() == checkStatus.data[0].äº§å && $("#HProcName").val() == checkStatus.data[0].å·¥åº) {
			if ($("#HSourceName").val() == checkStatus.data[0].çäº§èµæº && $("#HProcName").val() == checkStatus.data[0].å·¥åº) {
			obj.update({
			"HProcExchInterID": checkStatus.data[0].hmainid
			, "HProcExchEntryID": checkStatus.data[0].hsubid
			@@ -1171,14 +1183,14 @@
			})
			}
			else {
			return layer.msg("éæ©å¯äº§è®¡ååçç©æä¸å·¥åº,è·å½åå·¥åä¸å¹é");
			return layer.msg("éæ©å¯äº§è®¡ååççäº§èµæºä¸å·¥åº,è·å½åçäº§èµæºä¸å·¥åºä¸å¹é");
			}

			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if ($("#HMaterName").val() == OptionData[0].äº§å && $("#HProcName").val() == OptionData[0].å·¥åº) {
			if ($("#HSourceName").val() == OptionData[0].çäº§èµæº && $("#HProcName").val() == OptionData[0].å·¥åº) {
			obj.update({
			"HProcExchInterID": OptionData[0].hmainid
			, "HProcExchEntryID": OptionData[0].hsubid
			@@ -1200,7 +1212,7 @@

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

			OptionData = [];
			@@ -1247,6 +1259,91 @@
			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 = [];
			}
			})
			}
			obj.event = "";
			return false;
			}
			})
			}
			//#endregion
			@@ -1285,6 +1382,10 @@
			}
			if ($("#HDeptID").val() == '' \|\| $("#HDeptID").val() == null) {
			layer.msg("è½¦é´ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HPeopleSum").val() == '' \|\| $("#HPeopleSum").val() == null \|\| $("#HPeopleSum").val() == 0) {
			layer.msg("å¼å·¥äººæ°ä¸è½ä¸º0ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (OperationType == "2") {
			@@ -1430,12 +1531,12 @@
			if (data.count == 1)// è¯´æéªè¯æåäºï¼
			{
			var LoadData = data.data;
			$("#HWorkShiftID").val(LoadData[0].HInterID); //å½åå·¥åºID
			$("#HWorkShiftID").val(LoadData[0].HInterID); //å½åå·¥åºID
			$("#HWorkShiftName").val(LoadData[0].çæ¬¡); //å½åå·¥åº
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			//else {
			// layer.alert(data.Message, { icon: 5 });
			//}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 });
			@@ -1470,8 +1571,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) {