MES-WEB-LayUI.git

			@@ -10,12 +10,13 @@
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<!--å¼ç¨layui jsæä»¶-->
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<style type="text/css">
			.layui-form-label {
			width: 85px;
			@@ -115,21 +116,21 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®æ¥æ:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-inline">
			<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" type="hidden" value="0"/>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è®¡éåä½:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" disabled autocomplete="off">
			<input id="HUnitID" name="HUnitID" type="hidden" />
			<input id="HUnitID" name="HUnitID" type="hidden" value="0" />
			</div>
			</div>
			</div>
			@@ -137,7 +138,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">äº§åç¼ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="0" style="float:left;width:150px;" disabled>
			<input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;" disabled>
			<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>
			@@ -160,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,14 +172,18 @@
			<div class="layui-inline">
			<label class="layui-form-label">å·¥åºæµè½¬å¡å·</label>
			<div class="layui-input-inline">
			<input type="text" name="HProcExchBillNo" id="HProcExchBillNo" class="layui-input" value="0" disabled>
			<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" class="layui-input" value="0" style="float:left;width:150px;" disabled>
			<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" class="layui-input" value="0" style="float:left;width:150px;" disabled>
			<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
			<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" class="layui-input" value="0">
			<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" class="layui-input" value="0">
			<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="0">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="0">
			<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" autocomplete="off" disabled>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProcExch" id="btnSearchProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>

			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æµè½¬å¡æ°é:</label>
			@@ -209,21 +214,21 @@
			<label class="layui-form-label">ä»»å¡åå·:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" disabled 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 class="layui-inline">
			<label class="layui-form-label">ä»»å¡åæ°é:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HICMOQty" lay-verify="HICMOQty" id="HICMOQty" disabled autocomplete="off">
			<input class="layui-input" name="HICMOQty" lay-verify="HICMOQty" id="HICMOQty" value="0" disabled autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<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>
			@@ -233,7 +238,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>
			@@ -245,7 +250,7 @@
			<label class="layui-form-label">çäº§çæ¬¡</label>
			<div class="layui-input-inline">
			<input type="text" name="HShiftsName" id="HShiftsName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HShiftsID" id="HShiftsID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HShiftsList" id="HShiftsList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -264,13 +269,18 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥åºåå®¹</label>
			<div class="layui-input-inline" style="width:300px;height:15px">
			<textarea placeholder="è¯·è¾å¥æ¥åºåå®¹" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
			<label class="layui-form-label">éæµç±»å:</label>
			<div class="layui-input-inline">
			<select name="TestType" lay-filter="TestType" id="TestType">
			<option value="é¦æ£">é¦æ£</option>
			<option value="å·¡æ£">å·¡æ£</option>
			<option value="æªæ£">æªæ£</option>
			<option value="å®éª">å®éª</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">äº§ååé1:</label>
			<div class="layui-input-inline">
			@@ -287,6 +297,12 @@
			<label class="layui-form-label">äº§ååé3:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éæµåå®¹</label>
			<div class="layui-input-inline" style="width:300px;height:15px">
			<textarea placeholder="è¯·è¾å¥éæµåå®¹" class="layui-textarea" name="HBadNote" id="HBadNote" value=""></textarea>
			</div>
			</div>
			</div>
			@@ -334,19 +350,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="date" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="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="date" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="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="date" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			</div>
			</div>
			@@ -368,13 +384,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="date" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="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="date" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
			</div>
			</div>
			</div>
			@@ -432,73 +448,56 @@
			, laydate = layui.laydate
			, element = layui.element;
			//#endregion

			//åå§åè¡¨åæä»¶
			set_InitFrom();

			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			var HOrgIDBar1 = 0;
			var HCenterID = "";
			$("#HInspectOrgID").prop("disabled", true);
			$("#HSourceOrgID").prop("disabled", true);
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			$("#HCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HCheckEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HCheckEmpName").val(sessionStorage["HUserName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_AddFNew();
			get_HWorkShift();
			}
			else if (OperationType == 2) {//ææºå
			$("#HCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HCheckEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HCheckEmpName").val(sessionStorage["HUserName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_AddNew();
			}
			else if (OperationType == 3) {//ç¼è¾

			set_EditFromGrid();
			}
			else if (OperationType == 4) {//å¤å¶
			$("#HCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HCheckEmpName").val(sessionStorage["HUserName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			set_EditFromGrid();
			set_AddFNew();
			get_HWorkShift();

			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}



			//åå§åæä»¶
			function set_InitFrom() {
			//æ¥ææ¶é´éæ©å¨
			laydate.render({
			elem: '#HBeginDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HEndDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HMakeDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HUpDateDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HCheckDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HCloseDate'
			, type: 'datetime'
			});
			laydate.render({
			elem: '#HDeleteDate'
			, type: 'datetime'
			});
			}

			//#region åå§åç»ç»
			HSourceOrgan();
			@@ -508,16 +507,21 @@
			//æ æºåæ°å¢
			function set_AddFNew() {
			//å æºåç±»ååºå(å¯ä»¥åä¸åçæ¹æ³)

			refSav = "Add";
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //åæ®æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd")); //å¶åæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //å¶åäºº
			createBillNo();
			}

			//ææºåæ°å¢
			function set_AddNew() {
			createBillNo
			refSav = "Add";
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //å¼å·¥æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //å¶åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //åæ®æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd")); //å¶åæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //å¶åäºº

			//å æºåç±»ååºå(å¯ä»¥åä¸åçæ¹æ³)
			@@ -526,11 +530,13 @@
			$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);

			$('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);

			$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶æµè½¬å¡å·æé®ç¦ç¨
			$.ajax(
			{
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetQC_TakeSampleCheckBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			async: false,
			data: {
			"HSourceInterID": HSourceInterID,
			"HSourceEntryID": HSourceEntryID,
			@@ -567,6 +573,9 @@
			$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //çäº§è®¢å
			$("#HICMOQty").val(LoadData[0].HICMOPlanQty); //çäº§è®¢åæ°é
			HCenterID = LoadData[0].HCenterID == null ? sessionStorage["HWorkCenterID"] : LoadData[0].HCenterID;//å·¥ä½ä¸å¿id
			//è·åçæ¬¡
			get_HWorkShift()
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			@@ -603,8 +612,8 @@
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInterID": data[0]["hmainid"]
			, "HBillNo": data[0]["åæ®å·"]
			"HInterID": OperationType == 4 ? "" : data[0]["hmainid"]
			, "HBillNo": OperationType ==4 ? "" : data[0]["åæ®å·"]
			, "HDate": formatDate(data[0]["æ¥æ"])
			, "HDeptID": data[0]["HDeptID"] //é¨é¨ID
			, "HDeptName": data[0]["é¨é¨"] //é¨é¨åç§°
			@@ -626,6 +635,7 @@
			, "HProdWeight1": data[0]["äº§ååé1"] //äº§ååé1
			, "HProdWeight2": data[0]["äº§ååé2"] //äº§ååé2
			, "HProdWeight3": data[0]["äº§ååé3"] //äº§ååé3
			, "TestType": data[0]["éæµç±»å"] //éæµç±»å
			, "HGroupID": data[0]["HGroupID"] //çç»ID
			, "HGroupName": data[0]["çäº§çç»"] //çç»åç§°
			, "HShiftsID": data[0]["HShiftsID"] //çæ¬¡ID
			@@ -668,29 +678,20 @@
			}


			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("0");
			$("#HBillNo").val("");

			//#region çæåæ®å·
			function createBillNo() {
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '7521' },
			success: function (d) {
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HInterID").val(0);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			});
			$("#HInspectOrgID").prop("disabled", true);
			$("#HSourceOrgID").prop("disabled", true);
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			$("#HInspectOrgID").prop("disabled", true);
			$("#HSourceOrgID").prop("disabled", true);
			}

			//#endregion

			//ä¿åæäº¤
			form.on('submit(Saver)', function (data) {
			@@ -749,7 +750,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -789,7 +790,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html?Htype=&openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -903,7 +904,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html?type=HShifts', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_WorkShiftList.html?type=HWorkShifts', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -914,7 +915,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HShiftsName").val(checkStatus.data[0].çæ¬¡åç§°);
			$("#HShiftsID").val(checkStatus.data[0].HItemID);
			$("#HShiftsID").val(checkStatus.data[0].HInterID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -941,7 +942,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -953,6 +954,67 @@
			}
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});

			//è¡¨å¤´ä¿¡æ¯å·¥åºæµè½¬å¡å¼¹çª
			form.on('submit(btnSearchProcExch)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å·¥åºæµè½¬å¡åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBillList_Source.html?openType=1', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HProcID").val(checkStatus.data[0].HProcID); //å½åå·¥åºID
			$("#HProcName").val(checkStatus.data[0].å·¥åº); //å½åå·¥åº
			$("#HMaterID").val(checkStatus.data[0].HMaterID); //äº§åID
			$("#HMaterCode").val(checkStatus.data[0].äº§åä»£ç ); //äº§åä»£ç
			$("#HMaterName").val(checkStatus.data[0].äº§å); //äº§ååç§°
			$("#HMaterSpec").val(checkStatus.data[0].è§æ ¼åå·); //äº§åè§æ ¼
			$("#HUnitID").val(checkStatus.data[0].HUnitID); //è®¡éåä½id
			$("#HUnitName").val(checkStatus.data[0].åä½); //è®¡éåä½
			$("#HSourceID").val(checkStatus.data[0].HSourceID); //çäº§èµæºID
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæº); //çäº§èµæº
			$("#HMainSourceBillNo").val(checkStatus.data[0].åæ®å·); //æºååå·
			$("#HMainSourceInterID").val(checkStatus.data[0].hmainid); //æºåä¸»åç
			$("#HMainSourceEntryID").val(checkStatus.data[0].hsubid); //æºåååç
			$("#HMainSourceBillType").val(3772); //æºåç±»å
			$("#HProcExchBillNo").val(checkStatus.data[0].åæ®å·); //æµè½¬å¡å·
			$("#HProcExchInterID").val(checkStatus.data[0].hmainid); //æµè½¬å¡ä¸»åç (åå¼HInterID)
			$("#HProcExchEntryID").val(checkStatus.data[0].hsubid); //æµè½¬å¡ååç (æºåè¡å·)
			$("#HBatchNo").val(checkStatus.data[0].HBatchNo); //æµè½¬å¡æ¹æ¬¡
			$("#HProcExchQty").val(checkStatus.data[0].æµè½¬å¡æ°é); //æµè½¬å¡æ°é
			$("#HDeptID").val(checkStatus.data[0].HWorkShopID); //è½¦é´ID
			$("#HDeptName").val(checkStatus.data[0].çäº§è½¦é´); //è½¦é´
			$("#HICMOInterID").val(checkStatus.data[0].HICMOInterID); //çäº§è®¢åID
			$("#HICMOEntryID").val(checkStatus.data[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(checkStatus.data[0].ä»»å¡åå·); //çäº§è®¢å
			$("#HICMOQty").val(checkStatus.data[0].ä»»å¡åæ°é); //çäº§è®¢åæ°é
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -1070,6 +1132,32 @@
			}
			//#endregion

			//è·åçæ¬¡
			function get_HWorkShift() {
			var HDeptID = $("#HDeptID").val();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: {
			"HDeptID": HDeptID,
			"HCenterID": HCenterID
			},
			success: function (data) {
			if (data.count == 1)// è¯´æéªè¯æåäºï¼
			{
			var LoadData = data.data;
			$("#HShiftsID").val(LoadData[0].HInterID); //å½åå·¥åºID
			$("#HShiftsName").val(LoadData[0].çæ¬¡); //å½åå·¥åº
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 });
			}
			});
			}

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});
			@@ -1130,8 +1218,18 @@
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}
			function GetGyMaterial(obj) { //ç©æ
			$("#HMaterName").val(obj.ç©æåç§°);
			$("#HMaterCode").val(obj.ç©æä»£ç );
			$("#HMaterSpec").val(obj.è§æ ¼åå·);
			$("#HMaterID").val(obj.HItemID);
			}

			function GetHDeptNameValue(obj) { //é¨é¨
			$("#HDeptName").val(obj[0].é¨é¨åç§°);
			$("#HDeptID").val(obj[0].HItemID);
			}
			//æä½å
			function GetHEmpValue(obj) {
			$("#HCheckEmpName").val(obj[0].èååç§°);
			@@ -1143,9 +1241,44 @@
			$("#HGroupID").val(obj[0].HItemID);
			}
			//çæ¬¡
			function GetHShiftsValue(obj) {
			function GetHWorkShiftsValue(obj) {
			$("#HShiftsName").val(obj[0].çæ¬¡åç§°);
			$("#HShiftsID").val(obj[0].HItemID);
			$("#HShiftsID").val(obj[0].HInterID);
			}

			//çäº§èµæº
			function GetGySource(obj) {
			$("#HSourceName").val(obj[0].çäº§èµæºåç§°);
			$("#HSourceID").val(obj[0].HInterID);
			}

			//å·¥åºæµè½¬å¡
			function GetProcessExchangeBillValue(obj) {
			$("#HProcID").val(obj[0].HProcID); //å½åå·¥åºID
			$("#HProcName").val(obj[0].å·¥åº); //å½åå·¥åº
			$("#HMaterID").val(obj[0].HMaterID); //äº§åID
			$("#HMaterCode").val(obj[0].äº§åä»£ç ); //äº§åä»£ç
			$("#HMaterName").val(obj[0].äº§å); //äº§ååç§°
			$("#HMaterSpec").val(obj[0].è§æ ¼åå·); //äº§åè§æ ¼
			$("#HUnitID").val(obj[0].HUnitID); //è®¡éåä½id
			$("#HUnitName").val(obj[0].åä½); //è®¡éåä½
			$("#HSourceID").val(obj[0].HSourceID); //çäº§èµæºID
			$("#HSourceName").val(obj[0].çäº§èµæº); //çäº§èµæº
			$("#HMainSourceBillNo").val(obj[0].åæ®å·); //æºååå·
			$("#HMainSourceInterID").val(obj[0].hmainid); //æºåä¸»åç
			$("#HMainSourceEntryID").val(obj[0].hsubid); //æºåååç
			$("#HMainSourceBillType").val(3772); //æºåç±»å
			$("#HProcExchBillNo").val(obj[0].åæ®å·); //æµè½¬å¡å·
			$("#HProcExchInterID").val(obj[0].hmainid); //æµè½¬å¡ä¸»åç (åå¼HInterID)
			$("#HProcExchEntryID").val(obj[0].hsubid); //æµè½¬å¡ååç (æºåè¡å·)
			$("#HBatchNo").val(obj[0].HBatchNo); //æµè½¬å¡æ¹æ¬¡
			$("#HProcExchQty").val(obj[0].æµè½¬å¡æ°é); //æµè½¬å¡æ°é
			$("#HDeptID").val(obj[0].HWorkShopID); //è½¦é´ID
			$("#HDeptName").val(obj[0].çäº§è½¦é´); //è½¦é´
			$("#HICMOInterID").val(obj[0].HICMOInterID); //çäº§è®¢åID
			$("#HICMOEntryID").val(obj[0].HICMOEntryID); //çäº§è®¢ååID
			$("#HICMOBillNo").val(obj[0].ä»»å¡åå·); //çäº§è®¢å
			$("#HICMOQty").val(obj[0].ä»»å¡åæ°é); //çäº§è®¢åæ°é
			}

			function GetSwipeCardStart(obj) {