MES-WEB-LayUI.git

			@@ -73,7 +73,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è®¢åè·è¸ªå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -82,8 +82,8 @@
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">äº§ååç§°</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
			</div>
			@@ -116,12 +116,9 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">åä½</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
			</button>
			<label class="layui-form-label" style="width: 85px;">åä½</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HUnitID" id="HUnitID" value="0">
			</div>
			</div>
			@@ -535,11 +532,11 @@
			, element = layui.element;

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}
			//if (sessionStorage.login != "login") {
			// layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			// icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			// }, function () { window.location.href = "../../user/login.html"; });
			//}

			var params = getUrlVars();
			//è·ååæ°
			@@ -891,6 +888,21 @@



			//éæ©äº§åå¼¹çª
			form.on('submit(btnSearchMater)', function () {//äº§å
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'ç©æ'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, resize: false
			, cancel: function (index, layero) {
			}
			})
			});

			//éæ©ä¸è¯åå
			form.on('submit(HBadReasonID-BT)', function () {//éæ©ä»åº
			@@ -1006,7 +1018,7 @@
			//è·åæç»è¡
			window.GetICMOBillDetail = function (hmainid) { //è¿åè´£ä»»äºº
			$.ajax({
			url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
			url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
			type: "GET",
			data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
			success: function (result) {
			@@ -1035,38 +1047,51 @@

			//è¿åçäº§ä»»å¡å
			function GetICMOBillValue(obj) {
			$.ajax({
			url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
			type: "GET",
			data: { "hmainid": obj[0].hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			var data = result.data[result.data.length-1];
			$("#HICMOInterID").val(data.hmainid);
			$("#HICMOBillNo").val(data.çäº§è®¢åå·);
			$("#HICMOEntryID").val(data.HEntryID);
			$("#HOrderProcNO").val(data.è®¢åè·è¸ªå·);
			$("#HMaterID").val(data.hmaterid);
			$("#HMaterName").val(data.ç©æåç§°);
			$("#HMaterID2").val(data.hmaterid);
			$("#HMaterName2").val(data.ç©æåç§°);
			$("#HMaterNumber").val(data.ç©æä»£ç );
			$("#HMaterNumber2").val(data.ç©æä»£ç );
			$("#HModel").val(data.è§æ ¼åå·);
			$("#HBatchNo").val(data.æ¹å·);
			$("#HUnitID").val(data.hunitid);
			$("#HUnitName").val(data.è®¡éåä½åç§°);
			$("#HUnitNumber").val(data.è®¡éåä½ä»£ç );
			$("#HPlanQty").val(data.è®¡åçäº§æ°é);
			$("#HQty").val(data.æµè½¬å¡æ°é);
			$("#HprocExQty").val(data.æµè½¬å¡æ°é);
			$("#HPlanBeginDate").val(data.è®¡åå¼å·¥æ¥æ);
			$("#HPlanEndDate").val(data.è®¡åå®å·¥æ¥æ);
			$("#HWorkShopID").val(data.hdeptid);
			$("#HWorkShopName").val(data.çäº§è½¦é´åç§°);
			$("#HProdMaterCode").val(data.äº§åCODE);
			$("#HSeOrderBillNo").val(data.éå®è®¢åå·);
			$("#HCusShortName").val(data.å®¢æ·ç®ç§°);
			$("#HCusNeedMaterial").val(data.å®¢æ·è¦æ±æææå);
			$("#HPlanSendGoodsDate").val(data.é¢è®¡åºè´§æ¥æ);
			$("#HProdMaterName").val(data.äº§ååç§°);
			$("#HCusName").val(data.å®¢æ·åç§°);
			$("#HWorkRemark").val(data.çäº§å¤æ³¨);
			$("#HImportNote").val(data.éè¦æç¤º);
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			}
			})
			//txtHBillNo.Text = sBillNo;
			$("#HICMOInterID").val(obj[0].hmainid);
			$("#HICMOBillNo").val(obj[0].çäº§è®¢åå·);
			$("#HICMOEntryID").val(obj[0].HEntryID);
			$("#HOrderProcNO").val(obj[0].è®¢åè·è¸ªå·);
			$("#HMaterID").val(obj[0].hmaterid);
			$("#HMaterName").val(obj[0].ç©æåç§°);
			$("#HMaterID2").val(obj[0].hmaterid);
			$("#HMaterName2").val(obj[0].ç©æåç§°);
			$("#HMaterNumber").val(obj[0].ç©æä»£ç );
			$("#HMaterNumber2").val(obj[0].ç©æä»£ç );
			$("#HModel").val(obj[0].è§æ ¼åå·);
			$("#HBatchNo").val(obj[0].æ¹å·);
			$("#HUnitID").val(obj[0].hunitid);
			$("#HUnitName").val(obj[0].è®¡éåä½åç§°);
			$("#HUnitNumber").val(obj[0].è®¡éåä½ä»£ç );
			$("#HPlanQty").val(obj[0].è®¡åçäº§æ°é);
			$("#HQty").val(obj[0].æµè½¬å¡æ°é);
			$("#HprocExQty").val(obj[0].æµè½¬å¡æ°é);
			$("#HPlanBeginDate").val(obj[0].è®¡åå¼å·¥æ¥æ);
			$("#HPlanEndDate").val(obj[0].è®¡åå®å·¥æ¥æ);
			$("#HWorkShopID").val(obj[0].hdeptid);
			$("#HWorkShopName").val(obj[0].çäº§è½¦é´åç§°);
			$("#HProdMaterCode").val(obj[0].äº§åCODE);
			$("#HSeOrderBillNo").val(obj[0].éå®è®¢åå·);
			$("#HCusShortName").val(obj[0].å®¢æ·ç®ç§°);
			$("#HCusNeedMaterial").val(obj[0].å®¢æ·è¦æ±æææå);
			$("#HPlanSendGoodsDate").val(obj[0].é¢è®¡åºè´§æ¥æ);
			$("#HProdMaterName").val(obj[0].äº§ååç§°);
			$("#HCusName").val(obj[0].å®¢æ·åç§°);
			$("#HWorkRemark").val(obj[0].çäº§å¤æ³¨);
			$("#HImportNote").val(obj[0].éè¦æç¤º);
			GetICMOBillDetail(obj[0].hmainid);
			}
			function GetHReasonValue(obj) //è¿åä¸è¯åå
			@@ -1075,6 +1100,13 @@
			ReasonID = obj[0].HItemID;
			}

			//è¿åäº§å
			function GetHMaterNameValue(obj) {
			$("#HMaterName2").val(obj[0].HName);
			$("#HMaterID2").val(obj[0].HItemID);
			$("#HMaterNumber2").val(obj[0].HNumber);
			$("#HMaterHModel2").val(obj[0].HModel);
			}
			function GetHKeeperValue(obj) { //è¿åè´£ä»»äºº
			EmpName = obj[0].HName;
			// $("#HEmpName").val(obj[0].HName);