MES-WEB-LayUI.git

			@@ -15,6 +15,7 @@
			<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/PageTitle.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<style type="text/css">
			.layui-form-label {
			@@ -109,7 +110,7 @@
			<div class="layui-input-inline">
			<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style="background-color: #f7f4f4; ">
			<input id="HInterID" name="HInterID" type="hidden" />
			<input id="HEntryID" name="HEntryID" type="hidden" />
			<input id="HEntryID" name="HEntryID" value="0" type="hidden" />
			</div>
			</div>
			<div class="layui-inline">
			@@ -259,6 +260,14 @@
			<label class="layui-form-label">å¬ä¿æ¬¡æ°:</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0" disabled>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" name="HSourceBillNo" lay-verify="HSourceBillNo" id="HSourceBillNo" disabled autocomplete="off" type="hidden">
			<input id="HSourceInterID" name="HSourceInterID" value="0" type="hidden" />
			<input id="HSourceEntryID" name="HSourceEntryID" value="0" type="hidden" />
			<input id="HSourceBillType" name="HSourceBillType" value="0" type="hidden" />
			</div>
			</div>
			</div>
			@@ -417,9 +426,19 @@
			set_AddFNew();
			}
			else if (OperationType == 2) {//ææºå
			/set_AddNew();/
			var datajson;
			var str = window.location.search; //è·åé¾æ¥ä¸ä¼ éçåæ°
			var arr = str.substring(str.lastIndexOf("=") + 1);
			datajson = $.parseJSON(decodeURI(arr));
			$("#HSourceInterID").val(datajson.HRelationInterID);
			$("#HSourceEntryID").val(datajson.HRelationEntryID);
			$("#HSourceBillNo").val(datajson.HRelationBillNo);
			$("#HSourceBillType").val(datajson.HRelationBillType);
			set_EditFromGrid();
			get_Display(sWhere);
			}
			else if (OperationType == 3) {//ç¼è¾/åå¤ï¼è¿éæ¯åå¤

			set_EditFromGrid();
			get_Display(sWhere);
			}
			@@ -493,55 +512,6 @@
			$("#HDeptName").val(sessionStorage["HDept"]); //é¨é¨
			}


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

			// $.ajax(
			// {
			// type: "GET",
			// url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// async: true,
			// data: {
			// "HSourceInterID": HMainSourceInterID,
			// "HSourceEntryID": HMainSourceEntryID,
			// "HSourceBillNo": HMainSourceBillNo,
			// "HSourceBillType": HBillType
			// },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1)// è¯´æéªè¯æåäºï¼
			// {
			// var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
			// $("#HMaterName").val(LoadData[0].HMaterName); //äº§ååç§°
			// $("#HMaterModel").val(LoadData[0].HModel); //äº§åè§æ ¼
			// $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //æºååå·ï¼ææ¶åå¼è®¢åç¼å·ï¼
			// $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //æºåä¸»åç (åå¼HInterID)
			// $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
			// $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //æºåç±»å
			// $("#HQty").val(LoadData[0].HDatePlanQty); //è®¡åæ°é
			// Qty = LoadData[0].HDatePlanQty;
			// }
			// else {
			// layer.alert(data.Message, { icon: 5 });

			// }
			// },
			// error: function (err) {
			// layer.alert(err, { icon: 5 });
			// }
			// });
			//}
			//#endregion

			//ç¼è¾
			function set_EditFromGrid() {
			refSav = "Update";
			@@ -558,7 +528,7 @@
			var data = result.data[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInterID": data.HInterID
			, "HEntryID": data.HEntryID
			/* , "HEntryID": data.HEntryID*/
			, "HBillNo": data.HBillNo
			, "HDate": formatDate(data.HDate)
			, "HContext": data.HContext
			@@ -577,6 +547,10 @@
			, "HRelationEntryID": data.HRelationEntryID //å³èååID
			, "HRelationBillNo": data.HRelationBillNo //å³èååå·
			, "HRelationBillType": data.HRelationBillType //å³èåç±»å
			//, "HSourceInterID": data.HSourceInterID //æºåID
			//, "HSourceEntryID": data.HSourceEntryID //æºååID
			//, "HSourceBillNo": data.HSourceBillNo //æºååå·
			//, "HSourceBillType": data.HSourceBillType //æºåç±»å
			, "HMaker": data.HMaker //å¶åäºº
			, "HMakeDate": data.HMakeDate //å¶åæ¥æ
			, "HUpDater": sessionStorage["HUserName"] //ä¿®æ¹äºº