MES-WEB-LayUI.git

			@@ -711,6 +711,8 @@
			debugger;
			var rowdata = [];
			var option = [];
			var HDeptID = "";//é¨é¨id è·åçæ¬¡
			var HCenterID = "";//å·¥ä½ä¸å¿id è·åçæ¬¡

			var rowdata_Value = [];
			var option_Value = [];
			@@ -727,7 +729,7 @@
			var SampleNum = [];//æ ·æ¬æ°é

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "7504";
			var HModuleType = "7505";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			@@ -749,6 +751,10 @@
			//var linterid = 11880;
			//var HSouceBillType = 3722;
			//var HICMOEntryID = 100027;

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

			//#region å¤ææ¯å¦æ°å¢
			if (OperationType == 1) {
			$("#HInterID").val("");
			@@ -756,6 +762,8 @@

			$("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæ£éªåID
			$("#HFirstCheckEmpName").val(sessionStorage["HCheckEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæ£éªå
			HDeptID = sessionStorage["HDeptID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID

			//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ææºåæ¶ä¿åæé®ç¦ç¨
			//è·åæå¤§åæ®å·
			@@ -771,6 +779,8 @@
			$("#HMaker").val(sessionStorage["HUserName"]);
			}
			});
			//è·åçæ¬¡
			get_HWorkShift();
			}
			else if (OperationType == 2) {
			$("#HInterID").val("");
			@@ -783,6 +793,8 @@

			$("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
			$("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
			HDeptID = sessionStorage["HDeptID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºé¨é¨ID
			HCenterID = sessionStorage["HWorkCenterID"]; //æ ¹æ®ç»å½ç¨æ·å¸¦åºå·¥ä½ä¸å¿ID
			//è·åæå¤§åæ®å·
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -800,30 +812,42 @@
			if (HSouceBillType == 3722 \|\| HSouceBillType == 4610) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation2();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºè¿ç«æ¥æ¶ååè¡¨é¦æ£
			else if (HSouceBillType == 3790) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_StationInBill();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºå§å¤æ¥æ¶ååè¡¨é¦æ£
			else if (HSouceBillType == 3793) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation3();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//çäº§è®¢ååè¡¨é¦æ£
			else if (HSouceBillType == 3710) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ICMO();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			//å·¥åºæµè½¬å¡åè¡¨é¦æ£
			else if (HSouceBillType == 3772) {
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯
			LoadingInformation_ProcExchange();
			//èªå¨å¸¦åºæ£éªæ¹æ¡
			GetCheckItemID();
			}
			else {
			layer.alert("æºåç±»åæ æï¼", { icon: 5 });
			}
			//è·åçæ¬¡
			get_HWorkShift();
			}
			else if (OperationType == 3) {
			RoadBillMain(linterid);
			@@ -833,8 +857,7 @@

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

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

			//#region æ ¹æ®æºåè·åä¿¡æ¯
			//æ ¹æ®æºåidè·åæºåä¿¡æ¯(è¿ç«æ¥æ¶å)
			function LoadingInformation_StationInBill() {
			@@ -842,6 +865,7 @@
			$.ajax({
			url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -885,6 +909,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];
			@@ -906,8 +931,11 @@
			$("#HICMOEntryID").val(data.HICMOEntryID == null ? 0 : data.HICMOEntryID);//
			$("#HQCSchemeName").val(data.æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID").val(data.æ£éªæ¹æ¡ID);
			$("#HProcID").val(data.HProcID);//
			$("#HProcName").val(data.å½åå·¥åº);//
			$("#HBatchNo").val(data.æ¹å·);
			HDeptID = data.HWorkShopID == null ? sessionStorage["HDeptID"] : data.HWorkShopID;//å·¥ä½ä¸å¿id
			HCenterID = data.HCenterID == null ? sessionStorage["HWorkCenterID"] : data.HCenterID;//å·¥ä½ä¸å¿id
			//è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯
			get_CheckItem();
			} else {
			@@ -930,6 +958,7 @@
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
			type: "GET",
			async: false,
			data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var data = result.data[0];
			@@ -966,6 +995,7 @@
			$.ajax({
			url: GetWEBURL() + "/QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp",
			type: "GET",
			async:false,
			data: { "HInterID": linterid, "HEntryID": HICMOEntryID, "HBillType": HSouceBillType },
			success: function (result) {
			var data = result.data[0];
			@@ -1006,6 +1036,7 @@
			$.ajax({
			url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
			type: "GET",
			async: false,
			data: { "sWhere": "and HInterID = " + linterid },
			success: function (result) {
			var data = result.data[0];
			@@ -1961,11 +1992,12 @@
			//#endregion

			//#regionãéæ£éªæ¹æ¡è·åè¡¨ä½æ£éªé¡¹ç®ä¿¡æ¯ã
			window.get_CheckItem = function () {
			function get_CheckItem() {
			var HBatchQty = $("#HProcExchQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			async: false,
			data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
			success: function (result) {
			if (result.code == 1) {
			@@ -2022,6 +2054,71 @@
			}
			})
			}

			//ç¨äºåå»æ£éªæ¹æ¡ä½¿ç¨
			window.get_CheckItem1 = function () {
			var HBatchQty = $("#HProcExchQty").val();
			$.ajax({
			url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
			type: "GET",
			async: false,
			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].æ£éªé¡¹ç®ä»£ç , "æ£éªé¡¹ç®": 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].æç»æ°,
			"HStrictness": data[i].ä¸¥æ ¼åº¦, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].æ½æ ·ç±»å
			}
			);
			SampleNum.push(5);
			}

			//æ£éªé¡¹ç®
			for (let j = 1; j <= 5; 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');

			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" });

			trindex = result.data.length - 1;
			$("#HEntryID").val() - 1
			}
			}
			})
			}

			//#endregion

			//#region ãè¡¨å¤´æ¾å¤§éã
			@@ -2168,6 +2265,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2208,6 +2306,7 @@
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			get_ICMOBillStatusList();
			get_QC_TakeSampleCheckBillList();
			GetCheckItemID();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -2234,7 +2333,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_ShiftsList.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -2245,7 +2344,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HShiftsName").val(checkStatus.data[0].çæ¬¡åç§°);
			$("#HShiftsID").val(checkStatus.data[0].HItemID);
			$("#HShiftsID").val(checkStatus.data[0].HInterID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -2286,6 +2385,7 @@
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			GetCheckItemID();
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -2697,7 +2797,7 @@
			//#endregion


			//#regionãææ¬æ¡çå¬ï¼åæ ç§»å¼æ¶è§¦åã
			//#region ãææ¬æ¡çå¬ï¼åæ ç§»å¼æ¶è§¦åã

			//[ å¤å®æ£éªæ¯å¦åæ ¼ ]çå¬ææ¬æ¡ç¼è¾--æ£éªå¼
			$("#HInspectVal").blur(function () {
			@@ -2822,7 +2922,7 @@

			//#endregion

			//#regionãå¤ææ¯å¦åæ ¼æ¹æ³ã
			//#region ãå¤ææ¯å¦åæ ¼æ¹æ³ã
			function Qualified(HComparator, HEntryID, HAnalysisMethod) {
			var HInspectVal = $("#HInspectVal").val(); //æ£éªå¼
			var HTargetVal = $("#HTargetVal").val(); //ç®æ å¼
			@@ -2833,7 +2933,7 @@
			var HStatus = $("#HStatus").val() //ç¶æ
			var HAcceptQty = $("#HAcceptQty").val();//åè®¸æ°

			//#regionãå®æ§åææ¹æ³ã
			//#region ãå®æ§åææ¹æ³ã
			if (HAnalysisMethod == 1) {
			//ç¶æä¸ºåæ ¼
			if (HStatus == 1) {
			@@ -2868,7 +2968,7 @@
			}
			}
			//#endregion
			//#regionãå®éåææ¹æ³ã
			//#region ãå®éåææ¹æ³ã
			else if (HAnalysisMethod == 2) {
			//ç¶æä¸ºåæ ¼
			if (HStatus == 1) {
			@@ -3027,7 +3127,7 @@
			}
			}
			//#endregion
			//#regionãå¶ä»åææ¹æ³ã
			//#region ãå¶ä»åææ¹æ³ã
			else if (HAnalysisMethod == 3) {
			//ç¶æä¸ºåæ ¼
			if (HStatus == 1) {
			@@ -3063,6 +3163,7 @@
			}
			//#endregion


			form.render('select');
			//è·åè¡¨ä½ç»è®ºæ°æ®èµå¼ç»æ£éªç»æ
			var HEntryID = $('#HEntryID').val();
			@@ -3082,7 +3183,7 @@
			};
			//#endregion

			//#regionãèµå¼ä¸åæ¾ã
			//#region ãèµå¼ä¸åæ¾ã
			function Assignment(nowindex, dataindex) {
			if (SummaryIndex.indexOf(nowindex) == -1 && option.data[0].HSampleSchemeID == 0) {
			var dataobj = {
			@@ -3924,6 +4025,8 @@

			//#region ãåºå¼ä»£ç (æ¯è«å°å·²å¯ç¨)ã
			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 //å¾å°ä¿®æ¹åçå¼
			@@ -3932,7 +4035,7 @@
			var HInspectVal = $("#HInspectVal").val(); //æ£éªå¼
			var HTargetVal = $("#HTargetVal").val(); //ç®æ å¼
			var HComparator = $("#HComparator").val(); //æ¯è¾ç¬¦
			var HEntryID = $("#HEntryID").val()-1;
			var HEntryID = rowIndex;
			var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //åææ¹æ³
			var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //ä¸éå¼
			var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //ä¸éå¼
			@@ -3996,6 +4099,54 @@
			}
			//#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 });
			}
			}
			})
			}
			}

			//è·åçæ¬¡
			function get_HWorkShift() {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: {
			"HDeptID": HDeptID,
			"HCenterID": HCenterID
			},
			success: function (data) {
			if (data.count == 1)// è¯´æéªè¯æåäºï¼
			{
			var LoadData = data.data;
			$("#HShiftsID").val(LoadData[0].HInterID); //å½åå·¥åºID
			$("#HShiftsName").val(LoadData[0].çæ¬¡); //å½åå·¥åº
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 });
			}
			});
			}
			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

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

			function GetHEmpValue(obj) { //è´¨æ£å
			@@ -4031,9 +4183,13 @@
			function GetCheckProjectValue(obj) { //è´¨æ£æ¹æ¡
			$("#HQCSchemeID").val(obj[0].hmainid);
			$("#HQCSchemeName").val(obj[0].æ£éªæ¹æ¡åç§°);
			get_CheckItem();
			get_CheckItem1();
			}

			//çæ¬¡
			function GetHWorkShiftsValue(obj) {
			$("#HShiftsName").val(obj[0].çæ¬¡åç§°);
			$("#HShiftsID").val(obj[0].HInterID);
			}
			</script>
			</body>
			</html>