MES-WEB-LayUI.git

			@@ -752,7 +752,7 @@
			//å·¥åºè¿ç«æ¥æ¶ååè¡¨é¦æ£
			else if (HSouceBillType == 3790) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation();
			LoadingInformation_StationInBill();
			}
			//å·¥åºå§å¤æ¥æ¶ååè¡¨é¦æ£
			else if (HSouceBillType == 3793) {
			@@ -779,12 +779,12 @@
			set_InitGrid();

			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			function LoadingInformation() {
			function LoadingInformation_StationInBill() {
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_StationInBill/get_Display',
			url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
			type: "GET",
			data: { "sWhere": "and HInterID = " + linterid, "user": sessionStorage["HUserName"] },
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			if (result.count == 1) {
			@@ -803,6 +803,10 @@
			$("#HMainSourceBillType").val(data.HBillType);
			$("#HMainSourceInterID").val(data.HInterID);
			$("#HICMOEntryID").val(data.HICMOEntryID);
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			@@ -976,6 +980,31 @@
			//éåºæé®
			form.on('submit(btn-Exit)', function (data) {
			get_Exit();

			sWhere = " and hmainid = " + $("#HInterID").val();
			$.ajax({
			url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 0) {
			$.ajax({
			url: GetWEBURL() + "/DeltetQC_FirstPieceCheck",
			type: "GET",
			async: false,
			data: { "HInterID": $("#HInterID").val(), "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			return;
			} else {
			layer.msg("å é¤æ£éªå¼å¤±è´¥ï¼" + result.Message, { icon: 5 });
			}
			}
			})
			}
			}
			})
			});

			//æ°å¢æé®
			@@ -1278,7 +1307,7 @@
			});

			//ä¿å
			function set_SaveBill(data) {
			function set_SaveBill(data) {
			//èµå¼æåä¸ä¸ªéä¸è¡çæ°æ®ç»option.data
			Assignment(LastIndex, LastIndex);
			//ä¿åæåä¸æ¬¡ç¹å»è¡çæ£éªå¼
			@@ -1394,8 +1423,8 @@
			, "HProcExchEntryID": data.HProcExchEntryID
			, "HFirstCheckEmp": data.HFirstCheckEmp
			, "HFirstCheckEmpName": data.è´¨æ£ååç§°
			//, "HQCSchemeID": data.æ£éªæ¹æ¡ID
			//, "HQCSchemeName": data.æ£éªæ¹æ¡åç§°
			, "HQCSchemeID": data.æ£éªæ¹æ¡ID
			, "HQCSchemeName": data.æ£éªæ¹æ¡åç§°
			//, "HQCSchemeID": data.HManagerID
			//, "HPSStyleID": data.HPSStyleID
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			@@ -1443,29 +1472,38 @@
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": "0", "æ£éªä»ªå¨": "","HQCStd": 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].åææ¹æ³, "HKeyInspect": data[i].éç¹æ£æ¥ == 0 ? false : true, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
			"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			"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
			}
			)
			console.log(rowdata[i].HSampleQty);
			SummaryIndex.push(i.toString());
			}

			option.data = rowdata;
			console.log(rowdata);
			table.render(option);
			for (let j = 0; j < data.length; j++) {
			$("#HResult" + (j + 1)).val(data[j].ç»è®º)
			}
			for (let j = 0; j < data.length; j++) {
			$("#HAnalysisMethod" + (j + 1)).val(data[j].åææ¹æ³)
			$("#HAnalysisMethod" + (j + 1)).val(data[j].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[j].åææ¹æ³ == "å®éåæ" ? 2 : 3))
			}
			for (var i = 1; i <= data.length; i++) {
			$('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].éç¹æ£æ¥ == 0 ? false : true) + "']").attr("selected", true);
			$('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].éç¹æ£æ¥ == "å¦" ? false : true) + "']").attr("selected", true);
			}
			form.render('select');

			//é»è®¤éä¸æåä¸è¡
			$("tr[data-index = " + (option.data.length - 1) + "] .layui-form-checkbox").dblclick();
			//$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
			$("tr[data-index = " + (option.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });

			layer.close(ajaxLoad);
			} else {
			@@ -1770,42 +1808,44 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			data: { "CheckProjectID": $("#HQCSchemeID").val() },
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
			success: function (result) {
			var rowdata = [];
			var data = result.data;
			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": ""
			});
			}
			if (result.code == 1) {
			var rowdata = [];
			var data = result.data;
			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": ""
			});
			}

			option.data = rowdata;
			table.render(option);
			option.data = rowdata;
			table.render(option);

			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');
			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');

			option_Check = result.data;
			option_Check = result.data;

			$("[name='HEntryID']").attr("value", result.data.length);
			$("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
			$("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].æ£éªé¡¹ç®);
			//é»è®¤éä¸æåä¸è¡
			$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
			//$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
			$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
			$("[name='HEntryID']").attr("value", result.data.length);
			$("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
			$("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].æ£éªé¡¹ç®);
			//é»è®¤éä¸æåä¸è¡
			$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
			//$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
			$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });

			trindex = result.data.length - 1;
			$("#HEntryID").val() - 1
			trindex = result.data.length - 1;
			$("#HEntryID").val() - 1
			}
			}
			})
			}
			@@ -2069,7 +2109,7 @@
			, { field: 'HDownLimit', title: 'ä¸éå¼', edit: 'text', hide: true }
			, { field: 'HUpOffSet', title: 'ä¸åå·®', edit: 'text', hide: true }
			, { field: 'HDownOffSet', title: 'ä¸åå·®', edit: 'text', hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 85 }
			]]
			, done: function (res, curr, count) {
			option.data = res.data;
			@@ -2181,7 +2221,7 @@
			}
			}
			if (HQty > 0) {
			document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //å é¤éæ©å±æ§
			$("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //æ·»å éæ©å±æ§
			} else {
			document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //å é¤éæ©å±æ§
			@@ -2889,45 +2929,91 @@
			//è·åææ¬æ¡å¼
			var maindata = table.cache['mainTable'];

			var dataobj = {
			HEntryID: $("#HEntryID").val(), //è¡å·
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: $("#HSampleSchemeID").val(), //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: $("#HSampleSchemeName").val(), //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			HUnitID: $("#HUnitID").val(), //åä½ID
			HUnit: $("#HUnit").val(), //åä½
			HInspectVal: $("#HInspectVal").val(), //æ£éªå¼
			HTargetVal: $("#HTargetVal").val(), //ç®æ å¼
			HUpLimit: $("#HUpLimit").val(), //ä¸éå¼
			HDownLimit: $("#HDownLimit").val(), //ä¸éå¼
			HUpOffSet: $("#HUpOffSet").val(), //ä¸åå·®
			HDownOffSet: $("#HDownOffSet").val(), //ä¸åå·®
			HSampleDamageQty: $("#HSampleDamageQty").val(), //æ ·æ¬ç ´åæ°
			HSampleQty: $("#HSampleQty").val(), //æ ·æ¬é
			HAcceptQty: $("#HAcceptQty").val(), //åè®¸æ°
			HInspectionLevel: $("#HInspectionLevel").val(), //æ£éªæ°´å¹³
			HRejectQty: $("#HRejectQty").val(), //æç»æ°
			HStrictness: $("#HStrictness").val(), //ä¸¥æ ¼åº¦
			HSampleUnRightQty: $("#HSampleUnRightQty").val(), //æ ·æ¬ä¸åæ ¼æ°
			HAQL: $("#HAQL").val(), //AQL
			HSamplingType: $("#HSamplingType").val(),
			if (OperationType == 3) {
			$("[name='HEntryID']").val(Number(nowindex) + Number(1));
			$("[name='HQCCheckItemName']").val(option.data[nowindex].æ£éªé¡¹ç®);

			HSampleQty: $("#HSampleQty").val(), //æ ·æ¬é
			HInspectResultToSee: $("#HInspectResultToSee").val(), //æ£éªç»æ
			HInspectResultToSee2: $("#HInspectResultToSee2").val(), //æ£éªç»æ2
			HSampleUnRightQty: $("#HSampleUnRightQty").val(), //æ ·æ¬ä¸åæ ¼æ°
			HUnitID: $("#HUnitID").val(), //åä½ID
			HUnitName: $("#HUnitName").val(), //åä½
			HInspectValB: $("#HInspectValB").val(), //æ£éªå¼ID
			HInspectVal: $("#HInspectVal").val(), //æ£éªå¼
			HTargetValB: $("#HTargetValB").val(), //ç®æ å¼ID
			HTargetVal: $("#HTargetVal").val(), //ç®æ å¼
			HUpLimit: $("#HUpLimit").val(), //ä¸éå¼
			HDownLimit: $("#HDownLimit").val(), //ä¸éå¼
			HUpOffSet: $("#HUpOffSet").val(), //ä¸åå·®
			HDownOffSet: $("#HDownOffSet").val(), //ä¸åå·®
			};
			var dataobj = {
			HEntryID: $("#HEntryID").val(), //è¡å·
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			HUnitID: option.data[nowindex].HUnitID, //åä½ID
			HUnit: option.data[nowindex].HUnit,//åä½
			HInspectVal: option.data[nowindex].HInspectVal, //æ£éªå¼
			HTargetVal: option.data[nowindex].HTargetVal, //ç®æ å¼
			HUpLimit: option.data[nowindex].HUpLimit, //ä¸éå¼
			HDownLimit: option.data[nowindex].HDownLimit, //ä¸éå¼
			HUpOffSet: option.data[nowindex].HUpOffSet, //ä¸åå·®
			HDownOffSet: option.data[nowindex].HDownOffSet, //ä¸åå·®
			HSampleDamageQty: option.data[nowindex].HSampleDamageQty, //æ ·æ¬ç ´åæ°
			HSampleQty: option.data[nowindex].HSampleQty, //æ ·æ¬é
			HAcceptQty: option.data[nowindex].HAcceptQty,//åè®¸æ°
			HInspectionLevel: option.data[nowindex].HInspectionLevel, //æ£éªæ°´å¹³
			HRejectQty: option.data[nowindex].HRejectQty, //æç»æ°
			HStrictness: option.data[nowindex].HStrictness, //ä¸¥æ ¼åº¦
			HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty, //æ ·æ¬ä¸åæ ¼æ°
			HAQL: option.data[nowindex].HAQL, //AQL
			HSamplingType: option.data[nowindex].HSamplingType,

			HSampleQty: option.data[nowindex].HSampleQty, //æ ·æ¬é
			HInspectResultToSee: '', //æ£éªç»æ
			HInspectResultToSee2: '', //æ£éªç»æ2
			HSampleUnRightQty: option.data[nowindex].HSampleUnRightQty,//æ ·æ¬ä¸åæ ¼æ°
			HUnitID: option.data[nowindex].HUnitID, //åä½ID
			HUnitName: option.data[nowindex].HUnit, //åä½
			HInspectValB: option.data[nowindex].HInspectValB,//æ£éªå¼ID
			HInspectVal: option.data[nowindex].HInspectVal, //æ£éªå¼
			HTargetValB: option.data[nowindex].HTargetValB, //ç®æ å¼ID
			HTargetVal: option.data[nowindex].HTargetVal,//ç®æ å¼
			HUpLimit: option.data[nowindex].HUpLimit, //ä¸éå¼
			HDownLimit: option.data[nowindex].HDownLimit, //ä¸éå¼
			HUpOffSet: option.data[nowindex].HUpOffSet, //ä¸åå·®
			HDownOffSet: option.data[nowindex].HDownOffSet, //ä¸åå·®
			};
			} else {
			var dataobj = {
			HEntryID: $("#HEntryID").val(), //è¡å·
			HStatus: $("#HStatus").val(), //ç¶æ
			HSampleSchemeID: $("#HSampleSchemeID").val(), //æ½æ ·æ¹æ¡ID
			HSampleSchemeName: $("#HSampleSchemeName").val(), //æ½æ ·æ¹æ¡
			//xxx: $("#xxx").val(),
			HUnitID: $("#HUnitID").val(), //åä½ID
			HUnit: $("#HUnit").val(), //åä½
			HInspectVal: $("#HInspectVal").val(), //æ£éªå¼
			HTargetVal: $("#HTargetVal").val(), //ç®æ å¼
			HUpLimit: $("#HUpLimit").val(), //ä¸éå¼
			HDownLimit: $("#HDownLimit").val(), //ä¸éå¼
			HUpOffSet: $("#HUpOffSet").val(), //ä¸åå·®
			HDownOffSet: $("#HDownOffSet").val(), //ä¸åå·®
			HSampleDamageQty: $("#HSampleDamageQty").val(), //æ ·æ¬ç ´åæ°
			HSampleQty: $("#HSampleQty").val(), //æ ·æ¬é
			HAcceptQty: $("#HAcceptQty").val(), //åè®¸æ°
			HInspectionLevel: $("#HInspectionLevel").val(), //æ£éªæ°´å¹³
			HRejectQty: $("#HRejectQty").val(), //æç»æ°
			HStrictness: $("#HStrictness").val(), //ä¸¥æ ¼åº¦
			HSampleUnRightQty: $("#HSampleUnRightQty").val(), //æ ·æ¬ä¸åæ ¼æ°
			HAQL: $("#HAQL").val(), //AQL
			HSamplingType: $("#HSamplingType").val(),

			HSampleQty: $("#HSampleQty").val(), //æ ·æ¬é
			HInspectResultToSee: $("#HInspectResultToSee").val(), //æ£éªç»æ
			HInspectResultToSee2: $("#HInspectResultToSee2").val(), //æ£éªç»æ2
			HSampleUnRightQty: $("#HSampleUnRightQty").val(), //æ ·æ¬ä¸åæ ¼æ°
			HUnitID: $("#HUnitID").val(), //åä½ID
			HUnitName: $("#HUnitName").val(), //åä½
			HInspectValB: $("#HInspectValB").val(), //æ£éªå¼ID
			HInspectVal: $("#HInspectVal").val(), //æ£éªå¼
			HTargetValB: $("#HTargetValB").val(), //ç®æ å¼ID
			HTargetVal: $("#HTargetVal").val(), //ç®æ å¼
			HUpLimit: $("#HUpLimit").val(), //ä¸éå¼
			HDownLimit: $("#HDownLimit").val(), //ä¸éå¼
			HUpOffSet: $("#HUpOffSet").val(), //ä¸åå·®
			HDownOffSet: $("#HDownOffSet").val(), //ä¸åå·®
			};
			}

			//èµå¼ï¼å¨åæ°æ®
			maindata[dataindex].HStatus = dataobj.HStatus;
			maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;