MES-WEB-LayUI.git

			@@ -770,7 +770,7 @@
			LoadingInformation2();
			} else if (HSouceBillType == 3791) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation();
			LoadingInformation_StationOutBill();
			} else {
			layer.alert("æºåç±»åæ æï¼", { icon: 5 });
			}
			@@ -822,12 +822,12 @@
			}

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

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

			//æ°å¢æé®
			@@ -1545,44 +1574,44 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			data: { "CheckProjectID": $("#HQCSchemeID").val() },
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val()},
			success: function (result) {
			//option.data = result.data;
			//table.render(option);
			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
			}
			}
			})
			}
			@@ -1845,7 +1874,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;