MES-WEB-LayUI.git

			@@ -150,9 +150,13 @@
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			<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="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
			<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="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<input type="hidden" name="HProcID" id="HProcID" value="0">
			</div>
			</div>
			</div>
			@@ -352,13 +356,13 @@
			<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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<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="HSampleDamageQty" id="HSampleDamageQty" style="">
			<input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" value="0" style="">
			</div>
			</div>
			</div>
			@@ -401,7 +405,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="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<!--<div class="layui-inline">
			@@ -733,7 +737,7 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶æ°å¢æé®ç¦ç¨
			$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶çäº§èµæºæé®ç¦ç¨
			//$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶çäº§èµæºæé®ç¦ç¨
			$('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶ä»»å¡åå·æé®ç¦ç¨
			$('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶äº§ååç æé®ç¦ç¨
			$('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶æµè½¬å¡å·æé®ç¦ç¨
			@@ -996,8 +1000,8 @@
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": "0", "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
			"HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
			};

			switch (obj.event) {
			@@ -1035,6 +1039,45 @@
			}
			});
			//#endregion

			//è¡¨å¤´ä¿¡æ¯å·¥åº
			form.on('submit(btnHProc)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å·¥åºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', '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('è¯·éæ©æ°æ®');
			}
			$("#HProcName").val(checkStatus.data[0].å·¥åºåç§°);
			$("#HProcID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});

			//éåºæé®
			form.on('submit(btn-Exit)', function (data) {
			@@ -1484,19 +1527,19 @@
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HSampleSchemeID": data.HSampleSchemeID
			, "HSampleSchemeID": data.HSampleSchemeID == '' ? 0 : data.HSampleSchemeID
			, "HSampleSchemeName": data.æ½æ ·æ¹æ¡åç§°
			, "HSampleQty": data.æ ·æ¬é
			, "HSampleQty2": data.æ ·æ¬é
			, "HSampleDamageQty": data.æ ·æ¬ç ´åæ°
			, "HSampleDamageQty": data.æ ·æ¬ç ´åæ° == '' ? 0 : data.HSampleDamageQty
			, "HSamplingType": data.æ½æ ·ç±»å
			, "HAcceptQty": data.åè®¸æ°
			, "HInspectResultToSee2":data.æ£éªç»æ
			, "HInspectionLevel": data.æ£éªæ°´å¹³
			, "HRejectQty": data.æç»æ°
			, "HRejectQty": data.æç»æ° == '' ? 0 : data.æç»æ°
			, "HStrictness": data.ä¸¥æ ¼åº¦
			, "HSampleUnRightQty": data.æ ·æ¬ä¸åæ ¼æ°
			, "HSampleUnRightQty2": data.æ ·æ¬ä¸åæ ¼æ°
			, "HSampleUnRightQty": data.æ ·æ¬ä¸åæ ¼æ° == '' ? 0 : data.æ ·æ¬ä¸åæ ¼æ°
			, "HSampleUnRightQty2": data.æ ·æ¬ä¸åæ ¼æ° == '' ? 0 : data.æ ·æ¬ä¸åæ ¼æ°
			, "HAQL": data.AQL
			, "HEntryID": data.hsubid
			, "HQCCheckItemName": data.æ£éªé¡¹ç®åç§°
			@@ -1504,6 +1547,8 @@
			, "HShiftsID": data.HShiftsID
			, "HShiftsName": data.çæ¬¡åç§°
			, "HErrTreatment": data.å¼å¸¸ä¸´æ¶å¤çæ¹æ¡
			, "HProcID": data.HProcID
			, "HProcName": data.HProcName
			});
			$("input[name=HLastResult][value=true]").prop("checked", data.å¤å®ç»è®º === "åæ ¼");
			$("input[name=HLastResult][value=false]").prop("checked", data.å¤å®ç»è®º === "ä¸åæ ¼");
			@@ -1841,7 +1886,7 @@
			rowdata.push(
			{
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨": data[i]["æ£éªä»ªå¨"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["åä½åç§°"], "HQCNote": "", "HAnalysisMethod": data[i]["åææ¹æ³"], "HResult": data[i]["é»è®¤ç»è®º"],
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["éç¹æ£æ¥"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["éç¹æ£æ¥"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HAcceptQty": data[i].åè®¸æ° == null ? 0 : data[i].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ° == null ? 0 : data[i].æç»æ°,
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å
			@@ -2031,6 +2076,7 @@
			}
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			get_ICMOBillStatusList();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -2181,7 +2227,7 @@
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": "0", "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
			"HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
			}];
			option = {
			@@ -2343,10 +2389,10 @@
			}
			if (HQty > 0) {
			document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //æ·»å éæ©å±æ§
			} else {
			document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //æ·»å éæ©å±æ§
			}
			form.render('radio');
			}
			@@ -2621,21 +2667,21 @@
			$("#HDownLimit").val(0);
			$("#HUpOffSet").val(0);
			$("#HDownOffSet").val(0);
			$("#HSampleDamageQty").val("")
			$("#HSampleQty").val("")
			$("#HSampleQty2").val("")
			$("#HSampleDamageQty").val("0")
			$("#HSampleQty").val("0")
			$("#HSampleQty2").val("0")
			$("#HAcceptQty").val("0")
			$("#HInspectionLevel").val("")
			$("#HRejectQty").val("")
			$("#HRejectQty").val("0")
			$("#HStrictness").val("")
			$("#HSampleUnRightQty").val("")
			$("#HSampleUnRightQty2").val("")
			$("#HSampleUnRightQty").val("0")
			$("#HSampleUnRightQty2").val("0")
			$("#HAQL").val("")
			$("#HSamplingType").val("")
			$("#HSampleQty").val("")
			$("#HSampleQty").val("0")
			$("#HInspectResultToSee").val("")
			$("#HInspectResultToSee2").val("")
			$("#HSampleUnRightQty").val("")
			$("#HSampleUnRightQty").val("0")
			$("#HUnitID").val("0")
			$("#HUnitName").val("")
			$("#HInspectValB").val("0")
			@@ -3535,6 +3581,45 @@
			}
			//#endregion

			//æ ¹æ®çäº§èµæºæè å·¥åº æ¥è¯¢çäº§å·¥åä¿¡æ¯
			function get_ICMOBillStatusList() {
			var sWhere = "";
			var HProcID = $("#HProcID").val();
			var HSourceID = $("#HSourceID").val();
			var HProcExchInterID = $("#HProcExchInterID").val();

			if (HProcID != "0") {
			sWhere += " and HProcID=" + HProcID;
			}
			if (HSourceID != "0") {
			sWhere += " and HSourceID=" + HSourceID
			}

			sWhere += " and HSourceInterID=" + HProcExchInterID;

			$.ajax({
			url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			$("#HProcID").val(result.data[0]["HProcID"]);
			$("#HProcName").val(result.data[0]["å·¥åº"]);
			$("#HSourceID").val(result.data[0]["HSourceID"]);
			$("#HSourceName").val(result.data[0]["çäº§èµæº"]);

			} else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			})
			}


			//#region ãéèæ£æµå¼åæ®µã
			function IsHide(HAnalysisMethod_Value) {
			if (HAnalysisMethod_Value == 1) { //å¦æéä¸ãå®æ§åæãï¼åéèå®éãå¶ä»åæ