MES-WEB-LayUI.git

			@@ -214,8 +214,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" value="true" title="åæ ¼" >
			<input type="radio" name="HLastResult" value="false" title="ä¸åæ ¼" checked>
			</div>
			</div>
			<div class="layui-inline" id="hidediv1" style="margin-left:20px;">
			@@ -226,6 +226,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>
			@@ -979,7 +986,6 @@
			$("#HICMOEntryID").val(data.HICMOEntryID);
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);

			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			@@ -1268,7 +1274,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectInstruMentList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_InspectInstruMent.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1521,6 +1527,8 @@
			, "HICMOEntryID": data.HICMOEntryID
			, "HMaterID": data.HMaterID
			, "HMaterName": data.ç©æåç§°
			, "HProcID": data.HProcID
			, "HProcName": data.HProcName
			, "HProcExchQty": data.HProcExchQty
			, "HProcExchBillNo": data.HProcExchBillNo
			, "HProcExchInterID": data.HProcExchInterID
			@@ -1573,6 +1581,8 @@
			, "HErrTreatment": data.å¼å¸¸ä¸´æ¶å¤çæ¹æ¡
			, "HBatchNo": data.æ¹å·
			, "HLastResult": data.å¤å®ç»è®º == "åæ ¼" ? "true" : "false"
			, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
			, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
			});
			data = result.data;
			//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
			@@ -1581,7 +1591,7 @@
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": data[i].æ£éªæ å,
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨åç§°, "HQCStd": data[i].æ£éªæ å,
			"HUnit": data[i].åä½åç§°, "HQCNote": data[i].æ£éªè®°å½, "HResult": data[i].ç»è®º == "åæ ¼" ? 1 : 2,
			"HMax": data[i].æå¤§å¼, "HMin": data[i].æå°å¼, "HAvg": data[i].å¹³åå¼, "HRemark": data[i].è¡¨ä½å¤æ³¨,
			"HAnalysisMethod": data[i].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[i].åææ¹æ³ == "å®éåæ" ? 2 : 3), "HKeyInspect": data[i].éç¹æ£æ¥ == "å¦" ? false : true,
			@@ -1944,7 +1954,7 @@
			{
			"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"], "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].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ°,
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å
			}
			@@ -2133,6 +2143,7 @@
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2172,6 +2183,7 @@
			$("#HProcID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2305,7 +2317,7 @@
			, { field: 'HKeyInspect', title: 'éç¹æ£æ¥', templet: '#HKeyInspect', unresize: false }
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text' }
			, { field: 'HUnit', title: 'åä½', edit: 'text' }
			, { field: 'HInspectVal', title: 'æ£éªå¼' }
			, { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text'}
			, { field: 'HQCNote', title: 'æ£éªè®°å½', edit: 'text' }
			, { field: 'HUpLimit', title: 'ä¸éå¼' }
			, { field: 'HDownLimit', title: 'ä¸éå¼' }
			@@ -2413,7 +2425,7 @@

			//éæ©çselectå¯¹è±¡å¼ï¼
			var selectValue = data.value;
			if (selectValue == 1) {
			if (selectValue == "1") {
			selectValue = "åæ ¼"
			$("#HInspectResultToSee").css("background-color", "#CEE3F2");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			@@ -2444,12 +2456,12 @@
			}
			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');
			form.render("radio");
			}

			////è¡éæ©å¤çï¼æ£éªç»æï¼-- å¤ä»½
			@@ -3742,6 +3754,35 @@
			})
			}

			//åæ ·åæ¥è¯¢
			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) {
			if (result.data.length > 0) {
			$("#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: "æ¸©é¦¨æç¤º" });
			}
			})
			}


			//#regionãéèæ£æµå¼åæ®µã
			function IsHide(HAnalysisMethod_Value) {