MES-WEB-LayUI.git

			@@ -772,6 +772,10 @@
			//var HSouceBillType = 3722;
			////var HICMOEntryID = 100027;
			//var HICMOEntryID = "";

			//åå§åè¡¨æ ¼
			set_InitGrid();

			//å¤ææ¯å¦æ°å¢
			if (OperationType == 1) {
			$("#HInterID").val("");
			@@ -827,14 +831,20 @@
			if (HSouceBillType == 3722 \|\| HSouceBillType == 4610) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation2();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			} else if (HSouceBillType == 3791) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_StationOutBill();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºæµè½¬å¡åè¡¨å·¥åºæ£
			else if (HSouceBillType == 3772) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ProcExchange();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			else {
			layer.alert("æºåç±»åæ æï¼", { icon: 5 });
			@@ -847,9 +857,7 @@
			}

			$("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//ç¦ç¨æ£éªé¡¹ç®æ¾å¤§é

			//åå§åè¡¨æ ¼
			set_InitGrid();


			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			function LoadingInformation2() {
			@@ -857,6 +865,7 @@
			$.ajax({
			url: GetWEBURL() + "/QC_ProcessCheckBill/get_ICMOBillStatus_Tmp",
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
			success: function (result) {
			if (result.code == 1) {
			@@ -901,6 +910,7 @@
			$.ajax({
			url: GetWEBURL() + '/QC_ProcessCheckBill/get_StationOutBill',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -942,6 +952,7 @@
			$.ajax({
			url: GetWEBURL() + '/CheckBill/get_ProcessExchangeBill',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -986,7 +997,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨ä»£ç ": "","æ£éªä»ªå¨": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			@@ -1182,6 +1193,7 @@

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			æ£éªä»ªå¨ä»£ç : checkStatus.data[0].æ£éªä»ªå¨ä»£ç ,
			æ£éªä»ªå¨: checkStatus.data[0].æ£éªä»ªå¨åç§°
			, HInspectInstruMentID: checkStatus.data[0].HItemID
			});
			@@ -1304,6 +1316,49 @@
			break;
			}
			});


			table.on('edit(mainTable)', function (obj) {
			var cell = $(this);
			var rowIndex = cell.closest('tr').data('index'); // è·åå½åè¡æ°æ®ç´¢å¼
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			, data = obj.data //å¾å°æå¨è¡ææé®å¼
			, field = obj.field; //å¾å°åæ®µ
			var HInspectVal = $("#HInspectVal").val(); //æ£éªå¼
			//var HTargetVal = $("#HTargetVal").val(); //ç®æ å¼
			//var HComparator = $("#HComparator").val(); //æ¯è¾ç¬¦
			var HEntryID = rowIndex;
			var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //åææ¹æ³
			var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //ä¸éå¼
			var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //ä¸éå¼
			switch (field) {
			case "HInspectVal": //æ£éªå¼
			value = isNaN(value) ? 0 : parseFloat(value);

			if (HAnalysisMethod == "2") {
			if (value <= HUpLimit && value >= HDownLimit) {
			obj.update({
			"HResult": "1"
			});

			$('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);

			} else {
			obj.update({
			"HResult": "2"
			});

			$('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
			}
			form.render('select');
			LastResult();
			}
			break;
			}
			});


			//ä¿åæé®
			form.on('submit(btnSave)', function (data) {
			@@ -1492,14 +1547,14 @@

			$("input[name=HCheckerResult][value=true]").prop("checked", data.å¤å®ç»è®º === "åæ ¼");
			$("input[name=HCheckerResult][value=false]").prop("checked", data.å¤å®ç»è®º === "ä¸åæ ¼");
			form.render();
			form.render("radio");
			data = result.data;
			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": data[i].æ£éªæ å,
			"HQCCheckItemID": data[i].HQCCheckItemID, "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i].æ£éªé¡¹ç®åç§°, "HInspectInstruMentID": data[i].HInspectInstruMentID, "æ£éªä»ªå¨ä»£ç ": data[i].æ£éªä»ªå¨ä»£ç ,"æ£éªä»ªå¨": data[i].æ£éªä»ªå¨, "HQCStd": 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,
			@@ -1882,7 +1937,7 @@
			});
			//#endregion

			window.get_CheckItem = function() {
			function get_CheckItem() {
			var HBatchQty = $("#HProcExchQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			@@ -1904,7 +1959,7 @@
			//"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
			//}
			{
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨": data[i]["æ£éªä»ªå¨"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["åä½åç§°"], "HQCNote": "", "HAnalysisMethod": data[i]["åææ¹æ³"], "HResult": data[i]["é»è®¤ç»è®º"],
			"HQCCheckItemID": data[i]["HQCCheckItemID"], "æ£éªé¡¹ç®ä»£ç ": data[i].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": data[i]["æ£éªé¡¹ç®"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "æ£éªä»ªå¨ä»£ç ": data[i]["æ£éªä»ªå¨ä»£ç "], "æ£éªä»ªå¨": data[i]["æ£éªä»ªå¨"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["åä½åç§°"], "HQCNote": "", "HAnalysisMethod": data[i]["åææ¹æ³"], "HResult": data[i]["é»è®¤ç»è®º"],
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["éç¹æ£æ¥"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].ä¸éå¼, "HDownLimit": + data[i].ä¸éå¼, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
			"HSampleSchemeName": data[i].æ½æ ·æ¹æ¡åç§°, "HSampleQty": data[i].æ ·æ¬é, "HAcceptQty": data[i].åè®¸æ°, "HInspectionLevel": data[i].æ£éªæ°´å¹³, "HRejectQty": data[i].æç»æ°,
			@@ -2094,6 +2149,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2134,6 +2190,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2171,6 +2228,7 @@
			}
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			GetCheckItemID();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -2199,7 +2257,7 @@
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§è¡¨æ ¼æ°æ®
			rowdata = [{
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HQCCheckItemID": "", "æ£éªé¡¹ç®": "", "HInspectInstruMentID": 0, "æ£éªä»ªå¨ä»£ç ": "","æ£éªä»ªå¨": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
			"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
			"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
			"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
			@@ -2219,6 +2277,11 @@
			, { field: 'æ£éªé¡¹ç®ä»£ç ', title: 'æ£éªé¡¹ç®ä»£ç ' }
			, { field: 'æ£éªé¡¹ç®', title: 'æ£éªé¡¹ç®', edit: 'text', event: 'HQCCheckItemID' }
			, { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
			, {
			field: 'æ£éªä»ªå¨ä»£ç ', title: 'æ£éªä»ªå¨ä»£ç ', totalRow: true, templet: function (d) {
			return '<span style="color: blue;" lay-event="æ£éªä»ªå¨ä»£ç ">' + d.æ£éªä»ªå¨ä»£ç + '</span>';
			}, style: 'cursor: pointer;'
			}
			, { field: 'æ£éªä»ªå¨', title: 'æ£éªä»ªå¨', edit: 'text', event: 'HInspectInstruMentID' }
			, { field: 'HResult', title: 'ç»è®º', templet: '#HResult' }
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			@@ -2538,7 +2601,9 @@
			}

			//èµå¼ä¸åæ¾
			Assignment(nowindex, dataindex);
			if ($("#HSampleSchemeID").val() != "0") {
			Assignment(nowindex, dataindex);
			}
			if (isHavingCount == false && OperationType != 3) {
			var row_value = [];
			for (let i = 0; i < SampleNum[nowindex]; i++) {
			@@ -3786,6 +3851,28 @@
			}
			//#endregion

			//èªå¨å¸¦åºæ£éªé¡¹ç®
			function GetCheckItemID() {
			var HName = $("#HMaterName").val();
			var HProName = $("#HProcName").val();
			if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemID",
			type: "GET",
			async: false,
			data: { "HName": HName, "HProName": HProName },
			success: function (result) {
			if (result.code == 1) {
			$("#HQCSchemeID").val(result.data[0].hmainid);
			$("#HQCSchemeName").val(result.data[0].æ£éªæ¹æ¡åç§°);
			get_CheckItem();
			} else {
			layer.msg(result.code + result.Message, { icon: 5 });
			}
			}
			})
			}
			}
			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

			@@ -3819,6 +3906,7 @@
			$("#HMaterNumber").val(obj[0].ç©æä»£ç );
			$("#HMaterName").val(obj[0].ç©æåç§°);
			$("#HMaterID").val(obj[0].HItemID);
			GetCheckItemID();
			}

			function GetHEmpValue(obj) { //è´¨æ£å