MES-WEB-LayUI.git

			@@ -667,6 +667,7 @@
			, laydate = layui.laydate
			, element = layui.element;
			//å¬ç¨åé
			debugger;
			var rowdata = [];
			var option = [];

			@@ -681,6 +682,7 @@
			var isFristClick = true; //æ¯å¦é¦æ¬¡ç¹å»è¡
			var isHavingCount = false; //æ£éªå¼è¡¨æ ¼æ¯å¦ææ°æ®
			var UnRightQty_isFied = 0; //ç¨äºå¤ææ¯å¦åæ ¼//æ£éªå¼è¡¨æ ¼ä¸åæ ¼æ°éæ±æ»
			var editIndex = 0;//ç¼è¾ä¸æ

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			@@ -1471,9 +1473,11 @@
			var rowdata = [];
			for (var i = 0; i < data.length; i++) {
			rowdata.push(


			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨åç§°, "HQCStd": data[i].æ£éªæ å,
			"HUnit": data[i].æ£éªåä½, "HQCNote": data[i].æ£éªè®°å½, "HResult": data[i].ç»è®º,
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": data[i].æ£éªæ å,
			"HUnit": data[i].åä½åç§°, "HQCNote": data[i].æ£éªè®°å½, "HResult": data[i].ç»è®º,
			"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,
			"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
			@@ -1805,33 +1809,45 @@

			//#regionãéæ£éªæ¹æ¡è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯ã
			function get_CheckItem() {
			var HBatchQty = $("#HProcExchQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty},
			success: function (result) {
			if (result.code == 1) {
			var rowdata = [];
			var data = result.data;
			rowdata_Value = [];
			for (var i = 0; i < result.data.length; i++) {
			//åè¡¨ èµå¼
			rowdata.push({
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			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].æ½æ ·ç±»å
			});
			//æ£éªé¡¹ç®
			for (let j = 1; j <= data[i].æ ·æ¬é; j++) {
			rowdata_Value.push({
			"HSEQ": j, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
			});
			}
			}

			//æ£éªé¡¹ç®
			option.data = rowdata;
			table.render(option);

			//æ£éªå¼
			option_Value.data = rowdata_Value;
			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;

			@@ -2384,6 +2400,7 @@

			//è·åå½åç¹å»è¡ä¸æ
			var nowindex = $(obj.tr).attr("data-index");
			editIndex = Number(nowindex) + Number(1);
			LastIndex = nowindex;

			$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
			@@ -2400,8 +2417,12 @@
			//è·åååæ ¼æ£éªå¼æ°æ®
			var table_value = table.cache['ValueTable'];

			set_SaveValue(dataindex + 1);
			if (isHavingCount == false) {
			if (OperationType == 3) {
			set_SaveValue(Number(nowindex) + Number(1));
			} else {
			set_SaveValue(dataindex + 1);
			}
			if (isHavingCount == false && OperationType != 3) {
			//å·æ°æ£éªå¼è¡¨æ ¼
			option_Value.data = [{
			"HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
			@@ -2806,7 +2827,7 @@

			//#regionãèµå¼ä¸åæ¾ã
			function Assignment(nowindex, dataindex) {
			if (SummaryIndex.indexOf(nowindex) == -1) {
			if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
			var dataobj = {
			HEntryID: $("#HEntryID").val(), //è¡å·
			HStatus: $("#HStatus").val(), //ç¶æ
			@@ -3013,43 +3034,45 @@
			HDownOffSet: $("#HDownOffSet").val(), //ä¸åå·®
			};
			}
			if (option.data[0].HSampleSchemeID == 0) {
			//èµå¼ï¼å¨åæ°æ®
			maindata[dataindex].HStatus = dataobj.HStatus;
			maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
			maindata[dataindex].HUnitID = dataobj.HUnitID;
			maindata[dataindex].HInspectVal = dataobj.HInspectVal;
			maindata[dataindex].HTargetVal = dataobj.HTargetVal;
			maindata[dataindex].HUpLimit = dataobj.HUpLimit;
			maindata[dataindex].HDownLimit = dataobj.HDownLimit;
			maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
			maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
			maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
			maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
			maindata[dataindex].HUnit = dataobj.HUnit;
			maindata[dataindex].HSampleQty = dataobj.HSampleQty;
			maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
			maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
			maindata[dataindex].HRejectQty = dataobj.HRejectQty;
			maindata[dataindex].HStrictness = dataobj.HStrictness;
			maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
			maindata[dataindex].HAQL = dataobj.HAQL;
			maindata[dataindex].HSamplingType = dataobj.HSamplingType;

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

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


			//åæ¾
			$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
			@@ -3097,45 +3120,51 @@
			$("#HInspectResultToSee2").css("background-color", "#F0D6E3");//æ¹åæ£éªç»æè¾å¥æ¡èæ¯é¢è²
			}

			var HInterID = $("#HInterID").val();
			var HEntryID = $("#HEntryID").val();
			isHavingCount = false;
			//åæ¾æ£éªå¼
			$.ajax({
			url: GetWEBURL() + "/QC_ValueTable/getValueList",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			isHavingCount = true

			var data = result.data;

			var rowdata = [];
			for (var i = 0; i < result.data.length; i++) {
			//åè¡¨ èµå¼
			rowdata.push({
			"HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
			});
			}

			option_Value.data = rowdata;
			table.render(option_Value);
			for (var i = 0; i < result.data.length; i++) {
			$('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
			}

			IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //éèæ£æµå¼åæ®µ
			form.render('select');
			} else {
			//layer.msg(result.code + result.Message, { icon: 5 });
			}
			}
			})
			EchoValue();
			}
			}
			//#endregion

			//åæ¾æ£éªå¼
			function EchoValue() {
			var HInterID = $("#HInterID").val();
			var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val();
			isHavingCount = false;
			//åæ¾æ£éªå¼
			$.ajax({
			url: GetWEBURL() + "/QC_ValueTable/getValueList",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			isHavingCount = true

			var data = result.data;

			var rowdata = [];
			for (var i = 0; i < result.data.length; i++) {
			//åè¡¨ èµå¼
			rowdata.push({
			"HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
			});
			}

			option_Value.data = rowdata;
			table.render(option_Value);
			for (var i = 0; i < result.data.length; i++) {
			$('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
			}

			IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //éèæ£æµå¼åæ®µ
			form.render('select');
			} else {
			//layer.msg(result.code + result.Message, { icon: 5 });
			}
			}
			})
			}

			//è·åä¸åæ ¼æ°æ»æ°
			function addUnRightQty() {
			@@ -3383,6 +3412,9 @@
			table.cache['ValueTable'][i].HInSpectValue = 0
			}
			}
			if (OperationType == 3) {
			EchoValue();
			}
			var sValueTable = JSON.stringify(table.cache['ValueTable']);
			var HInterID = $("#HInterID").val();
			var HEntryID = dataindex;