MES-WEB-LayUI.git

			@@ -121,6 +121,22 @@
			<input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly value="0">
			</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="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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" style="width: 85px;">äº§ååç§°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
			</div>
			</div>
			<div class="layui-inline" id="hidediv2">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">æµè½¬å¡å·</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			@@ -139,23 +155,22 @@
			</div>
			</div>
			</div>


			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">äº§åä»£ç </label>
			<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="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
			<input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HProcID" id="HProcID" value="0">
			<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>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§ååç§°</label>
			<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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
			<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 class="layui-inline">
			@@ -194,21 +209,10 @@
			<input type="radio" name="HLastResult" value="false" title="ä¸åæ ¼">
			</div>
			</div>
			<div class="layui-inline" style="margin-left:20px;">
			<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>
			<input type="hidden" name="HProcID" id="HProcID" value="0">
			<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>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ ·å</label>
			<div class="layui-inline" style="width: 45%;">
			<label class="layui-form-label" style="width: 85px;">SNç è®°å½</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">
			<input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>
			</div>
			@@ -304,11 +308,11 @@
			</div>
			</div>
			<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
			<div class="layui-tab layui-tab-card">
			<div class="layui-tab layui-tab-card" lay-filter="bottomTable">
			<ul class="layui-tab-title">
			<li class="layui-this">æ£éªé¡¹ç®</li>
			<li>æ½æ ·æ£éª</li>
			<li>æ£æµå¼</li>
			<li lay-id="1" class="layui-this">æ£éªé¡¹ç®</li>
			<li lay-id="2">æ½æ ·æ£éª</li>
			<li lay-id="3">æ£æµå¼</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			@@ -1102,7 +1106,8 @@
			"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": ""
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "",
			"HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
			};

			switch (obj.event) {
			@@ -1441,6 +1446,147 @@
			}
			});
			}
			if (obj.event === 'HQualityStdName') //
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'è´¨éæ ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_QualityStd.html?openType=2', '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('è¯·éæ©æ°æ®');
			}
			obj.update({
			HQualityStdID: checkStatus.data[0].HItemID,
			HQualityStdName: checkStatus.data[0].è´¨éæ ååç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			if (OptionData[0].ç¦ç¨æ è®° != 'æ¯' \|\| OptionData[0].å®¡æ ¸äºº != "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HQualityStdID": OptionData[0].HItemID
			, "HQualityStdName": OptionData[0].è´¨éæ ååç§°
			})
			} else {
			layer.msg("è¯¥è´¨éæ åå·²ç¦ç¨æªå®¡æ ¸ï¼è¯·éæ°éæ©!");
			}
			},
			success: function (layero, index) {

			}
			});
			}
			if (obj.event === 'HInspectMethodName') //
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ£éªæ¹æ³åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectMethod.html?openType=2', '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('è¯·éæ©æ°æ®');
			}
			obj.update({
			HInspectMethodID: checkStatus.data[0].HItemID,
			HInspectMethodName: checkStatus.data[0].æ£éªæ¹æ³åç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			if (OptionData[0].ç¦ç¨æ è®° != 'æ¯' \|\| OptionData[0].å®¡æ ¸äºº != "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HInspectMethodID": OptionData[0].HItemID
			, "HInspectMethodName": OptionData[0].æ£éªæ¹æ³åç§°
			})
			} else {
			layer.msg("è¯¥æ£éªæ¹æ³å·²ç¦ç¨æªå®¡æ ¸ï¼è¯·éæ°éæ©!");
			}
			},
			success: function (layero, index) {

			}
			});
			}
			if (obj.event === 'HInspectBasisName') //
			{
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ£éªä¾æ®åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectBasis.html?openType=2', '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('è¯·éæ©æ°æ®');
			}
			obj.update({
			HInspectBasisID: checkStatus.data[0].HItemID,
			HInspectBasisName: checkStatus.data[0].æ£éªä¾æ®åç§°,
			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			if (OptionData[0].ç¦ç¨æ è®° != 'æ¯' \|\| OptionData[0].å®¡æ ¸äºº != "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HInspectBasisID": OptionData[0].HItemID
			, "HInspectBasisName": OptionData[0].æ£éªä¾æ®åç§°
			})
			} else {
			layer.msg("è¯¥æ£éªä»ªå¨å·²ç¦ç¨æªå®¡æ ¸ï¼è¯·éæ°éæ©!");
			}
			},
			success: function (layero, index) {

			}
			});
			}


			obj.event = "";
			@@ -1759,6 +1905,7 @@
			, "HLastResult": data.å¤å®ç»è®º == "åæ ¼" ? "true" : "false"
			, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
			, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
			, "HRemarkSN": data.HRemarkSN
			});
			data = result.data;
			//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
			@@ -1773,8 +1920,8 @@
			"HAnalysisMethod": data[i].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[i].åææ¹æ³ == "å®éåæ" ? 2 : 3), "HKeyInspect": data[i].éç¹æ£æ¥ == "å¦" ? false : true,
			"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
			"HInspectVal": data[i].æ£æµå¼, "HTargetVal": data[i].ç®æ å¼, "HUpLimit": data[i].ä¸éå¼, "HDownLimit": data[i].ä¸éå¼, "HUpOffSet": data[i].ä¸åå·®, "HDownOffSet": data[i].ä¸åå·®, "HSampleDamageQty": data[i].æ ·æ¬ç ´åæ°,
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HSampleDamageQty": data[i].æ ·æ¬ç ´åæ°, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": 0, "HRejectQty": data[i].æç»æ°,
			"HStrictness": 0, "HSampleUnRightQty": data[i].æ ·æ¬ä¸åæ ¼æ°, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].æ½æ ·ç±»å, "HStrictness": data[i].ä¸¥æ ¼åº¦
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HSampleDamageQty": data[i].æ ·æ¬ç ´åæ°, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": 0, "HRejectQty": data[i].æç»æ°,
			"HStrictness": 0, "HSampleUnRightQty": data[i].æ ·æ¬ä¸åæ ¼æ°, "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å, "HStrictness": data[i].ä¸¥æ ¼åº¦, "HCompareSymbol": data[i].æ¯è¾ç¬¦, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].è´¨éæ å, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].æ£éªæ¹æ³, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].æ£éªä¾æ®,"HCompareSymbol":data[i].æ¯è¾ç¬¦

			}
			)
			@@ -2161,9 +2308,9 @@
			{
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨ä»£ç ": data[i]["æ£éªä»ªå¨ä»£ç "], "æ£éªä»ªå¨": 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"],
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].ä¸éå¼, "HDownLimit": + data[i].ä¸éå¼, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HInspectVal": '', "HTargetVal": data[i].ç®æ å¼, "HUpLimit": data[i].ä¸éå¼, "HDownLimit": data[i].ä¸éå¼, "HCompareSymbol": data[i].æ¯è¾ç¬¦, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ°,
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].è´¨éæ å, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].æ£éªæ¹æ³, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].æ£éªä¾æ®
			}
			);
			//SampleNum.push(5);
			@@ -2226,11 +2373,13 @@
			//æ¾ç¤ºæåä¸è¡çæ£æµå¼é¡µç¾ä¸çç®æ å¼ãä¸éå¼ãä¸éå¼
			$("#HTargetVal").val(data[data.length - 1].ç®æ å¼);
			$("#HUpLimit").val(data[data.length - 1].ä¸éå¼);
			$("#HDownLimit").val(data[data.length - 1].ä¸éå¼);
			$("#HDownLimit").val(data[data.length - 1].ä¸éå¼);
			//æ¯è¾ç¬¦
			$("#HComparator").val(data[data.length - 1].æ¯è¾ç¬¦);


			if ($("#HEntryID").val() - 1 >= 0) {
			option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
			option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
			option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].æ½æ ·æ¹æ¡åç§°;
			option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].æ½æ ·ç±»å;
			option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].æ£éªæ°´å¹³;
			@@ -2242,6 +2391,7 @@
			option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].æç»æ°;
			option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HCompareSymbol = data[data.length - 1].æ¯è¾ç¬¦;
			}

			rowdata_Value = [];
			@@ -2624,7 +2774,7 @@
			"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": ""
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
			}];
			option = {
			elem: '#mainTable'
			@@ -2648,6 +2798,12 @@
			, { field: 'æ£éªä»ªå¨', title: 'æ£éªä»ªå¨', edit: 'text', event: 'HInspectInstruMentID' }
			, { field: 'HResult', title: 'ç»è®º', templet: '#HResult', event: 'HResult' }
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			, { field: 'HQualityStdID', title: 'è´¨éæ åID', edit: 'text', hide: true }
			, { field: 'HQualityStdName', title: 'è´¨éæ å', edit: 'text', event: 'HQualityStdName' }
			, { field: 'HInspectMethodID', title: 'æ£éªæ¹æ³ID', edit: 'text', hide: true }
			, { field: 'HInspectMethodName', title: 'æ£éªæ¹æ³', edit: 'text', event: 'HInspectMethodName' }
			, { field: 'HInspectBasisID', title: 'æ£éªä¾æ®ID', edit: 'text', hide: true }
			, { field: 'HInspectBasisName', title: 'æ£éªä¾æ®', edit: 'text', event: 'HInspectBasisName' }
			, { field: 'HKeyInspect', title: 'éç¹æ£æ¥', templet: '#HKeyInspect', unresize: false }
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			@@ -2656,6 +2812,7 @@
			, { field: 'HTargetVal', title: 'ç®æ å¼' }
			, { field: 'HUpLimit', title: 'ä¸éå¼' }
			, { field: 'HDownLimit', title: 'ä¸éå¼' }
			, { field: 'HCompareSymbol', title: 'æ¯è¾ç¬¦'}
			, { field: 'HMax', title: 'æå¤§å¼', edit: 'text', totalRow: true }
			, { field: 'HMin', title: 'æå°å¼', edit: 'text', totalRow: true }
			, { field: 'HAvg', title: 'å¹³åå¼', edit: 'text', totalRow: true }
			@@ -2671,7 +2828,6 @@
			, { field: 'HSampleUnRightQty', title: 'æ ·æ¬ä¸åæ ¼æ°', edit: 'text', hide: true }
			, { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
			, { field: 'HStatus', title: 'ç¶æ', edit: 'text', hide: true }
			, { field: 'xxx', title: 'æ¯è¾ç¬¦', edit: 'text', hide: true }
			, { field: 'HUnitID', title: 'åä½ID', edit: 'text', hide: true }
			, { field: 'HUnit', title: 'åä½', edit: 'text', hide: true }
			, { field: 'HTargetVal', title: 'ç®æ å¼', edit: 'text', hide: true }
			@@ -2905,6 +3061,7 @@

			var HEntryID = $("#HEntryID").val() - 1;//æ°ç»ä¸æ
			var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //åææ¹æ³
			option.data[HEntryID].HCompareSymbol = selectValue;
			//å¤å®å¦ææ¯å®éåæ
			if (HAnalysisMethod == 2) {
			if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
			@@ -2969,6 +3126,7 @@
			$("#HTargetVal").val(option_Check[nowindex].ç®æ å¼);
			$("#HUpLimit").val(option_Check[nowindex].ä¸éå¼);
			$("#HDownLimit").val(option_Check[nowindex].ä¸éå¼);
			$("#HComparator").val(option_Check[nowindex].æ¯è¾ç¬¦)
			}


			@@ -3013,6 +3171,8 @@
			isFristClick = false;
			}

			//èªå¨è·³è½¬å°æ£æµå¼é¡µç¾
			element.tabChange('bottomTable', '3'); //è·³è½¬é¡µç¾
			});
			//#endregion

			@@ -3411,7 +3571,7 @@
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: $("#HSampleSchemeID").val(), //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: $("#HSampleSchemeName").val(), //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			//HCompareSymbol: $("#HCompareSymbol").val(),
			HUnitID: $("#HUnitID").val(), //åä½ID
			HUnit: $("#HUnit").val(), //åä½
			HInspectVal: $("#HInspectVal").val(), //æ£éªå¼
			@@ -3489,7 +3649,7 @@

			$("#HSampleSchemeID").val(0);
			$("#HSampleSchemeName").val("");
			//xxx: $("#xxx").val();
			//HCompareSymbol: $("#HCompareSymbol").val();
			$("#HUnitID").val(0);
			$("#HUnit").val("");
			$("#HInspectVal").val("");
			@@ -3537,7 +3697,7 @@
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			//HCompareSymbol: $("#HCompareSymbol").val(),
			HUnitID: option.data[nowindex].HUnitID, //åä½ID
			HUnit: option.data[nowindex].HUnit,//åä½
			HInspectVal: option.data[nowindex].HInspectVal, //æ£éªå¼
			@@ -3577,7 +3737,7 @@
			// HStatus: $("#HStatus").val(), //ç¶æ
			// HSampleSchemeID: $("#HSampleSchemeID").val(), //æ½æ ·æ¹æ¡ID
			// HSampleSchemeName: $("#HSampleSchemeName").val(), //æ½æ ·æ¹æ¡
			// //xxx: $("#xxx").val(),
			// //HCompareSymbol: $("#HCompareSymbol").val(),
			// HUnitID: $("#HUnitID").val(), //åä½ID
			// HUnit: $("#HUnit").val(), //åä½
			// HInspectVal: $("#HInspectVal").val(), //æ£éªå¼
			@@ -3617,7 +3777,7 @@
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			//HCompareSymbol: $("#HCompareSymbol").val(),
			HUnitID: option.data[nowindex].HUnitID, //åä½ID
			HUnit: option.data[nowindex].HUnit,//åä½
			HInspectVal: option.data[nowindex].HInspectVal, //æ£éªå¼
			@@ -3695,13 +3855,14 @@
			//åæ¾
			$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
			$("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
			//xxx: $("#xxx").val();
			//HCompareSymbol: $("#HCompareSymbol").val();
			$("#HUnitID").val(maindata[nowindex].HUnitID);
			$("#HUnit").val(maindata[nowindex].HUnit);
			$("#HInspectVal").val(maindata[nowindex].HInspectVal);
			$("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].ç®æ å¼ : "") : maindata[nowindex].HTargetVal );
			$("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].ä¸éå¼ : "") : maindata[nowindex].HUpLimit );
			$("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].ä¸éå¼ : "") : maindata[nowindex].HDownLimit );
			$("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].ä¸éå¼ : "") : maindata[nowindex].HDownLimit);
			$("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].æ¯è¾ç¬¦ : "=") : maindata[nowindex].HCompareSymbol);
			$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
			$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
			$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
			@@ -3776,7 +3937,32 @@
			}

			IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //éèæ£æµå¼åæ®µ
			form.render('select');

			//å¾ªç¯æ£éªå¼è¡¨æ ¼æ°æ®ï¼è·åä¸åæ ¼æ°é
			var HValueTable = table.cache["ValueTable"];
			var UnRightQty = 0;//æ£éªå¼è¡¨æ ¼ä¸åæ ¼æ°éæ±æ»
			for (let i = 0; i < HValueTable.length; i++) {
			if (HValueTable[i].HInSpectResult == 2) {
			UnRightQty++;
			}
			}
			var HAcceptQty = $("#HAcceptQty").val();//åè®¸æ°
			//var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val() - 1;
			if (UnRightQty > HAcceptQty) {
			$("#HResult" + (Number(HEntryID) )).val(2); //ä¸åæ ¼
			$("#HInspectResultToSee").val('ä¸åæ ¼');
			$("#HInspectResultToSee2").val('ä¸åæ ¼');
			$("#HInspectResultToSee").css("background-color", "#F0D6E3");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			} else {
			$("#HResult" + (Number(HEntryID) )).val(1); //åæ ¼
			$("#HInspectResultToSee").val('åæ ¼');
			$("#HInspectResultToSee2").val('åæ ¼');
			$("#HInspectResultToSee").css("background-color", "#CEE3F2");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			}

			form.render('select');
			} else {
			option_Value.data = [{
			"HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
			@@ -4619,6 +4805,19 @@
			function GetInspectInstruMentValue(obj) {
			OptionData = obj;
			}
			//è´¨éæ å
			function GetQualityStdValue(obj) {
			OptionData = obj;
			}
			//æ£éªæ¹æ³
			function GetInspectMethodValue(obj) {
			OptionData = obj;
			}

			//æ£éªä¾æ®
			function GetInspectBasisValue(obj) {
			OptionData = obj;
			}
			</script>
			</body>
			</html>