MES-WEB-LayUI.git

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

			@@ -726,6 +727,9 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶ä¿åæé®ç¦ç¨

			$("#HFirstCheckEmp").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæ£éªåID
			$("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæ£éªå
			//è·åæå¤§åæ®å·
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -741,6 +745,9 @@
			});
			}
			else if (OperationType == 2) {
			$("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
			$("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);

			if (HICMOEntryID < 0 \|\| HICMOEntryID == "") {
			layer.alert("çäº§ä»»å¡åååç éè¯¯ï¼æ æ³å·¥åºæ£ï¼", { icon: 5 });
			$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶æ°å¢æé®ç¦ç¨
			@@ -796,25 +803,32 @@
			type: "GET",
			data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
			success: function (result) {
			var data = result.data[0];
			if (result.count == 1) {
			$("#HProcExchBillNo").val(data.HProcExchBillNo);
			$("#HProcExchInterID").val(data.HProcExchInterID);
			$("#HProcExchEntryID").val(data.HProcExchEntryID);
			$("#HProcExchQty").val(data.HProcExchQty);
			$("#HICMOBillNo").val(data.HICMOBillNo);
			$("#HICMOInterID").val(data.HICMOInterID);
			$("#HICMOQty").val(data.HICMOQty);
			$("#HSourceName").val(data.HSourceName);
			$("#HSourceID").val(data.HSourceID);
			$("#HMaterID").val(data.HMaterID);
			$("#HMainSourceBillNo").val("");
			$("#HMainSourceBillType").val(data.HBillType);
			$("#HMainSourceInterID").val(data.HInterID);
			$("#HICMOEntryID").val(HICMOEntryID);
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			if (result.code == 1) {
			var data = result.data[0];
			if (result.count == 1) {
			$("#HProcExchBillNo").val(data.HProcExchBillNo);
			$("#HProcExchInterID").val(data.HProcExchInterID);
			$("#HProcExchEntryID").val(data.HProcExchEntryID);
			$("#HProcExchQty").val(data.HProcExchQty);
			$("#HICMOBillNo").val(data.HICMOBillNo);
			$("#HICMOInterID").val(data.HICMOInterID);
			$("#HICMOQty").val(data.HICMOQty);
			$("#HSourceName").val(data.HSourceName);
			$("#HSourceID").val(data.HSourceID);
			$("#HMaterID").val(data.HMaterID);
			$("#HMainSourceBillNo").val("");
			$("#HMainSourceBillType").val(data.HBillType);
			$("#HMainSourceInterID").val(data.HInterID);
			$("#HICMOEntryID").val(HICMOEntryID);
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			}

			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			@@ -1214,7 +1228,7 @@
			return;
			}

			if (sSubTable[i].HSampleSchemeID == '') {
			if (sSubTable[i].HSampleSchemeID == '' \|\| sSubTable[i].HSampleSchemeID == null) {
			sSubTable[i].HSampleSchemeID = 0
			}
			if (sSubTable[i].HSampleQty == '' \|\| sSubTable[i].HSampleQty == null) {
			@@ -1365,7 +1379,7 @@
			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].ç»è®º,
			"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,
			"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
			@@ -1375,14 +1389,13 @@

			}
			)
			console.log(data[i].ç®æ å¼);
			SummaryIndex.push(i.toString());
			}

			option.data = rowdata;
			table.render(option);
			for (let j = 0; j < data.length; j++) {
			$("#HResult" + (j + 1)).val(data[j].ç»è®º)
			$("#HResult" + (j + 1)).val(data[j].ç»è®º == "åæ ¼" ? 1 : 2)
			}
			for (let j = 0; j < data.length; j++) {
			$("#HAnalysisMethod" + (j + 1)).val(data[j].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[j].åææ¹æ³ == "å®éåæ" ? 2 : 3))
			@@ -1668,7 +1681,6 @@
			$("#HRejectQty").val(checkStatus.data[0].æç»æ°);
			$("#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].æ½æ ·ç±»å;
			@@ -1750,7 +1762,7 @@
			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++) {
			@@ -2310,21 +2322,15 @@

			//è·åååæ ¼æ£éªå¼æ°æ®
			var table_value = table.cache['ValueTable'];

			//set_SaveValue(dataindex + 1);
			//if (isHavingCount == false) {
			// //å·æ°æ£éªå¼è¡¨æ ¼
			// option_Value.data = [{
			// "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
			// }];
			// table.render(option_Value);
			//}


			if (OperationType == 3) {
			set_SaveValue(Number(nowindex) + Number(1));
			} else {
			set_SaveValue(dataindex + 1);
			}

			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if (isHavingCount == false && OperationType != 3) {
			var row_value = [];
			for (let i = 0; i < SampleNum[nowindex]; i++) {
			@@ -2335,11 +2341,7 @@
			//å·æ°æ£éªå¼è¡¨æ ¼
			option_Value.data = row_value;
			table.render(option_Value);
			console.log(option_Value.data);
			}

			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if (isFristClick != true) {
			//if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
			//console.log('aaa');
			@@ -2741,7 +2743,6 @@

			//#regionãèµå¼ä¸åæ¾ã
			function Assignment(nowindex, dataindex) {
			console.log(JSON.stringify(option.data));
			if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
			var dataobj = {
			HEntryID: $("#HEntryID").val(), //è¡å·
			@@ -3360,49 +3361,49 @@

			//æ£éªå¼ä¿å
			function set_SaveValue(dataindex) {
			if (OperationType == 3) {
			EchoValue();
			}
			//if (OperationType == 3) {
			// EchoValue();
			//}

			for (let i = 0; i < table.cache['ValueTable'].length; i++) {
			if (table.cache['ValueTable'][i].HInSpectValueB == "" \|\| table.cache['ValueTable'][i].HInSpectValueB == null) {
			table.cache['ValueTable'][i].HInSpectValueB = 0
			}
			if (table.cache['ValueTable'][i].HInSpectValueT == "" \|\| table.cache['ValueTable'][i].HInSpectValueT == null) {
			table.cache['ValueTable'][i].HInSpectValueT = 0
			}
			if (table.cache['ValueTable'][i].HInSpectValue == "" \|\| table.cache['ValueTable'][i].HInSpectValue == null) {
			table.cache['ValueTable'][i].HInSpectValue = 0
			}
			}
			var sValueTable = JSON.stringify(table.cache['ValueTable']);
			var HInterID = $("#HInterID").val();
			var HEntryID = dataindex;
			//for (let i = 0; i < table.cache['ValueTable'].length; i++) {
			// if (table.cache['ValueTable'][i].HInSpectValueB == "" \|\| table.cache['ValueTable'][i].HInSpectValueB == null) {
			// table.cache['ValueTable'][i].HInSpectValueB = 0
			// }
			// if (table.cache['ValueTable'][i].HInSpectValueT == "" \|\| table.cache['ValueTable'][i].HInSpectValueT == null) {
			// table.cache['ValueTable'][i].HInSpectValueT = 0
			// }
			// if (table.cache['ValueTable'][i].HInSpectValue == "" \|\| table.cache['ValueTable'][i].HInSpectValue == null) {
			// table.cache['ValueTable'][i].HInSpectValue = 0
			// }
			//}
			//var sValueTable = JSON.stringify(table.cache['ValueTable']);
			//var HInterID = $("#HInterID").val();
			//var HEntryID = dataindex;

			var msg = sValueTable + ";" + HInterID + ";" + HEntryID
			//var msg = sValueTable + ";" + HInterID + ";" + HEntryID

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
			async: true,
			data: { "msg": msg },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			layer.close(index);
			//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®
			}
			else {
			layer.close(index);
			layer.msg("æ£éªå¼ä¿åéè¯¯ï¼" + data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("æ£éªå¼ä¿åéè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			//var index = layer.load();
			//$.ajax({
			// type: "POST",
			// url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
			// async: true,
			// data: { "msg": msg },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) {
			// layer.close(index);
			// //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®
			// }
			// else {
			// layer.close(index);
			// layer.msg("æ£éªå¼ä¿åéè¯¯ï¼" + data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// },
			// error: function (err) {
			// layer.close(index);
			// layer.msg("æ£éªå¼ä¿åéè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			//});
			}

			//#regionãéèæ£æµå¼åæ®µã