MES-WEB-LayUI.git

			@@ -211,8 +211,8 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¤æç»è®º</label>
			<div class="layui-input-block">
			<input type="radio" name="HLastResult" id="HLastResult" value="true" title="åæ ¼" checked>
			<input type="radio" name="HLastResult" id="HLastResult" value="false" title="ä¸åæ ¼">
			<input type="radio" name="HLastResult" id="HLastResult" value="true" title="åæ ¼" >
			<input type="radio" name="HLastResult" id="HLastResult" value="false" title="ä¸åæ ¼" checked>
			</div>
			</div>
			<div class="layui-inline" id="hidediv1">
			@@ -223,6 +223,13 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<input type="hidden" name="HProcID" id="HProcID" value="0">
			</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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
			</div>
			</div>
			</div>
			@@ -411,7 +418,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">
			@@ -1008,8 +1015,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": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
			"HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
			};

			switch (obj.event) {
			@@ -1498,8 +1505,8 @@
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HSampleSchemeID": data.HSampleSchemeID
			, "HSampleSchemeName": data.æ½æ ·æ¹æ¡åç§°
			, "HSampleQty": data.æ ·æ¬é
			, "HSampleQty2": data.æ ·æ¬é
			, "HSampleQty": data.æ ·æ¬é == '' ? 0 : data.æ ·æ¬é
			, "HSampleQty2": data.æ ·æ¬é == '' ? 0 : data.æ ·æ¬é
			, "HSampleDamageQty": data.æ ·æ¬ç ´åæ°
			, "HSamplingType": data.æ½æ ·ç±»å
			, "HAcceptQty": data.åè®¸æ°
			@@ -1517,6 +1524,10 @@
			, "HShiftsName": data.çæ¬¡åç§°
			, "HErrTreatment": data.å¼å¸¸ä¸´æ¶å¤çæ¹æ¡
			, "HBatchNo": data.æ¹å·
			, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
			, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
			, "HProcID": data.HProcID
			, "HProcName": data.HProcName
			});
			$("input[name=HLastResult][value=true]").prop("checked", data.å¤å®ç»è®º === "åæ ¼");
			$("input[name=HLastResult][value=false]").prop("checked", data.å¤å®ç»è®º === "ä¸åæ ¼");
			@@ -1853,9 +1864,9 @@
			//åè¡¨ èµå¼
			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]["é»è®¤ç»è®º"],
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": 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"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].ä¸éå¼, "HDownLimit": + data[i].ä¸éå¼, "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].æ½æ ·ç±»å
			}
			@@ -2046,6 +2057,7 @@
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2085,6 +2097,7 @@
			$("#HProcID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2235,7 +2248,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": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
			"HStrictness": "", "HSampleUnRightQty": "0", "HAQL": "", "HSamplingType": ""
			}];
			option = {
			@@ -2259,7 +2272,7 @@
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			, { field: 'HQCNote', title: 'æ£éªè®°å½', edit: 'text' }
			, { field: 'HInspectVal', title: 'æ£éªå¼' }
			, { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text' }
			, { field: 'HUpLimit', title: 'ä¸éå¼' }
			, { field: 'HDownLimit', title: 'ä¸éå¼' }
			, { field: 'HMax', title: 'æå¤§å¼', edit: 'text', totalRow: true }
			@@ -2398,10 +2411,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');
			}
			@@ -2681,16 +2694,16 @@
			$("#HSampleQty2").val("")
			$("#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("0")
			$("#HInspectResultToSee").val("")
			$("#HInspectResultToSee2").val("")
			$("#HSampleUnRightQty").val("")
			$("#HSampleUnRightQty").val("0")
			$("#HUnitID").val("0")
			$("#HUnitName").val("")
			$("#HInspectValB").val("0")
			@@ -2842,8 +2855,8 @@
			$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
			$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
			$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
			$("#HSampleQty").val(maindata[nowindex].HSampleQty);
			$("#HSampleQty2").val(maindata[nowindex].HSampleQty);
			$("#HSampleQty").val(maindata[nowindex].HSampleQty == '' ? 0 : maindata[nowindex].HSampleQty);
			$("#HSampleQty2").val(maindata[nowindex].HSampleQty == '' ? 0 : maindata[nowindex].HSampleQty);
			$("#HAcceptQty").val(maindata[nowindex].HAcceptQty);
			$("#HInspectionLevel").val(maindata[nowindex].HInspectionLevel);
			$("#HRejectQty").val(maindata[nowindex].HRejectQty);
			@@ -2852,7 +2865,7 @@
			$("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
			$("#HAQL").val(maindata[nowindex].HAQL);
			$("#HSamplingType").val(maindata[nowindex].HSamplingType);
			$("#HSampleQty").val(maindata[nowindex].HSampleQty);
			$("#HSampleQty").val(maindata[nowindex].HSampleQty == '' ? 0 : maindata[nowindex].HSampleQty);
			$("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
			$("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
			$("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
			@@ -3305,6 +3318,33 @@
			})
			}

			//åæ ·åæ¥è¯¢
			function get_QC_TakeSampleCheckBillList() {
			var HProcID = $("#HProcID").val();
			var HProcExchInterID = $("#HProcExchInterID").val();
			var sWhere = "";

			if (HProcID == "0" \|\| HProcID == "") {
			return layer.msg("è¯·éæ©å·¥åº!");
			}
			sWhere = " and å·¥åºæµè½¬å¡ä¸»åç ='" + HProcExchInterID + "' and HProcID=" + HProcID;
			$.ajax({
			url: GetWEBURL() + "/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillMainList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			$("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
			$("#HTakeSampleCheckBillNo").val(result.data[0]["åæ®å·"]);
			}
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			})
			}


			//è·åä¸åæ ¼æ°æ»æ°
			function addUnRightQty() {