MES-WEB-LayUI.git

			@@ -812,7 +812,7 @@
			$("#HMainSourceBillType").val(data.HBillType);
			$("#HMainSourceInterID").val(data.HInterID);
			$("#HICMOEntryID").val(data.HICMOEntryID);
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			$("#HProcName").val(data.å½åå·¥åº);
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			@@ -1317,7 +1317,7 @@
			});

			//ä¿å
			function set_SaveBill(data) {
			function set_SaveBill(data) {
			//èµå¼æåä¸ä¸ªéä¸è¡çæ°æ®ç»option.data
			Assignment(LastIndex, LastIndex);
			//ä¿åæåä¸æ¬¡ç¹å»è¡çæ£éªå¼
			@@ -1367,7 +1367,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sSubValue = JSON.stringify(table.cache['ValueTable']);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;

			var index = layer.load();
			$.ajax({
			@@ -1788,6 +1788,19 @@
			$("#HUpLimit").val(checkStatus.data[0].ä¸éå¼);
			$("#HDownLimit").val(checkStatus.data[0].ä¸éå¼);

			option.data[$("#HEntryID").val() - 1].HSampleSchemeID = checkStatus.data[0].hmainid;
			option.data[$("#HEntryID").val() - 1].HSampleSchemeName = checkStatus.data[0].æ½æ ·æ¹æ¡åç§°;
			option.data[$("#HEntryID").val() - 1].HSamplingType = checkStatus.data[0].æ½æ ·ç±»å;
			option.data[$("#HEntryID").val() - 1].HInspectionLevel = checkStatus.data[0].æ£éªæ°´å¹³;
			option.data[$("#HEntryID").val() - 1].HStrictness = checkStatus.data[0].ä¸¥æ ¼åº¦;
			option.data[$("#HEntryID").val() - 1].HAQL = checkStatus.data[0].AQL;
			option.data[$("#HEntryID").val() - 1].HSampleQty = checkStatus.data[0].æ ·æ¬é;
			option.data[$("#HEntryID").val() - 1].HSampleQty2 = checkStatus.data[0].æ ·æ¬é;
			option.data[$("#HEntryID").val() - 1].HAcceptQty = checkStatus.data[0].åè®¸æ°;
			option.data[$("#HEntryID").val() - 1].HRejectQty = checkStatus.data[0].æç»æ°;
			option.data[$("#HEntryID").val() - 1].HUpLimit = checkStatus.data[0].ä¸éå¼;
			option.data[$("#HEntryID").val() - 1].HDownLimit = checkStatus.data[0].ä¸éå¼;

			rowdata_Value = [];
			for (let i = 1; i <= checkStatus.data[0].æ ·æ¬é; i++) {
			rowdata_Value.push({
			@@ -1819,7 +1832,7 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty},
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
			success: function (result) {
			if (result.code == 1) {
			var rowdata = [];
			@@ -1828,19 +1841,19 @@
			for (var i = 0; i < result.data.length; i++) {
			//åè¡¨ èµå¼
			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]["HResult"],
			"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": "",
			"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].æ½æ ·ç±»å
			{
			"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]["HResult"],
			"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": "",
			"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].æ½æ ·ç±»å
			}
			);
			);
			SampleNum.push(data[i].æ ·æ¬é);
			}


			//æ£éªé¡¹ç®
			for (let j = 1; j <= data[data.length-1].æ ·æ¬é; j++) {
			for (let j = 1; j <= data[data.length - 1].æ ·æ¬é; j++) {
			rowdata_Value.push({
			"HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
			});
			@@ -1850,14 +1863,14 @@
			table.render(option);
			//æ£éªå¼
			option_Value.data = rowdata_Value;
			console.log(JSON.stringify(option_Value.data));
			//console.log(JSON.stringify(option_Value.data));
			table.render(option_Value);
			//================================================
			for (var i = 1; i <= result.data.length; i++) {
			$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
			$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
			}
			form.render('select');
			form.render('select');

			option_Check = result.data;

			@@ -1871,7 +1884,7 @@

			trindex = result.data.length - 1;
			$("#HEntryID").val() - 1
			}
			}
			}
			})
			}
			@@ -2432,6 +2445,8 @@
			} else {
			set_SaveValue(dataindex + 1);
			}
			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if (isHavingCount == false && OperationType != 3) {
			var row_value = [];
			for (let i = 0; i < SampleNum[nowindex]; i++) {
			@@ -2443,8 +2458,6 @@
			option_Value.data = row_value;
			table.render(option_Value);
			}
			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if (isFristClick != true) {
			//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
			//console.log('aaa');
			@@ -2455,7 +2468,7 @@
			} else {
			isFristClick = false;
			}


			});
			//#endregion

			@@ -3014,7 +3027,7 @@
			HUpOffSet: option.data[nowindex].HUpOffSet, //ä¸åå·®
			HDownOffSet: option.data[nowindex].HDownOffSet, //ä¸åå·®
			};
			} else {
			} else {
			//var dataobj = {
			// HEntryID: $("#HEntryID").val(), //è¡å·
			// HStatus: $("#HStatus").val(), //ç¶æ
			@@ -3096,44 +3109,44 @@
			};
			}
			//if (option.data[0].HSampleSchemeID == 0) {
			//èµå¼ï¼å¨åæ°æ®
			maindata[nowindex].HStatus = dataobj.HStatus;
			maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
			maindata[nowindex].HUnitID = dataobj.HUnitID;
			maindata[nowindex].HInspectVal = dataobj.HInspectVal;
			maindata[nowindex].HTargetVal = dataobj.HTargetVal;
			maindata[nowindex].HUpLimit = dataobj.HUpLimit;
			maindata[nowindex].HDownLimit = dataobj.HDownLimit;
			maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
			maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
			maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
			maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
			maindata[nowindex].HUnit = dataobj.HUnit;
			maindata[nowindex].HSampleQty = dataobj.HSampleQty;
			maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
			maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
			maindata[nowindex].HRejectQty = dataobj.HRejectQty;
			maindata[nowindex].HStrictness = dataobj.HStrictness;
			maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
			maindata[nowindex].HAQL = dataobj.HAQL;
			maindata[nowindex].HSamplingType = dataobj.HSamplingType;

			maindata[nowindex].HSampleQty = dataobj.HSampleQty;
			maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
			maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
			maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
			maindata[nowindex].HUnitID = dataobj.HUnitID;
			maindata[nowindex].HUnitName = dataobj.HUnitName;
			maindata[nowindex].HInspectValB = dataobj.HInspectValB;
			maindata[nowindex].HInspectVal = dataobj.HInspectVal;
			maindata[nowindex].HTargetValB = dataobj.HTargetValB;
			maindata[nowindex].HTargetVal = dataobj.HTargetVal;
			maindata[nowindex].HUpLimit = dataobj.HUpLimit;
			maindata[nowindex].HDownLimit = dataobj.HDownLimit;
			maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
			maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
			//èµå¼ï¼å¨åæ°æ®
			maindata[nowindex].HStatus = dataobj.HStatus;
			maindata[nowindex].HSampleSchemeID = dataobj.HSampleSchemeID;
			maindata[nowindex].HUnitID = dataobj.HUnitID;
			maindata[nowindex].HInspectVal = dataobj.HInspectVal;
			maindata[nowindex].HTargetVal = dataobj.HTargetVal;
			maindata[nowindex].HUpLimit = dataobj.HUpLimit;
			maindata[nowindex].HDownLimit = dataobj.HDownLimit;
			maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
			maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
			maindata[nowindex].HSampleDamageQty = dataobj.HSampleDamageQty;
			maindata[nowindex].HSampleSchemeName = dataobj.HSampleSchemeName;
			maindata[nowindex].HUnit = dataobj.HUnit;
			maindata[nowindex].HSampleQty = dataobj.HSampleQty;
			maindata[nowindex].HAcceptQty = dataobj.HAcceptQty;
			maindata[nowindex].HInspectionLevel = dataobj.HInspectionLevel;
			maindata[nowindex].HRejectQty = dataobj.HRejectQty;
			maindata[nowindex].HStrictness = dataobj.HStrictness;
			maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
			maindata[nowindex].HAQL = dataobj.HAQL;
			maindata[nowindex].HSamplingType = dataobj.HSamplingType;

			maindata[nowindex].HSampleQty = dataobj.HSampleQty;
			maindata[nowindex].HInspectResultToSee = dataobj.HInspectResultToSee;
			maindata[nowindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
			maindata[nowindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
			maindata[nowindex].HUnitID = dataobj.HUnitID;
			maindata[nowindex].HUnitName = dataobj.HUnitName;
			maindata[nowindex].HInspectValB = dataobj.HInspectValB;
			maindata[nowindex].HInspectVal = dataobj.HInspectVal;
			maindata[nowindex].HTargetValB = dataobj.HTargetValB;
			maindata[nowindex].HTargetVal = dataobj.HTargetVal;
			maindata[nowindex].HUpLimit = dataobj.HUpLimit;
			maindata[nowindex].HDownLimit = dataobj.HDownLimit;
			maindata[nowindex].HUpOffSet = dataobj.HUpOffSet;
			maindata[nowindex].HDownOffSet = dataobj.HDownOffSet;
			//}



			//åæ¾
			$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
			@@ -3182,7 +3195,7 @@
			}

			//åæ¾æ£éªå¼
			EchoValue();
			EchoValue();
			}
			}
			//#endregion