MES-WEB-LayUI.git

			@@ -483,26 +483,26 @@
			, { field: 'HQCCheckItemID', title: 'æ£éªé¡¹ç®ID', edit: 'text', hide: true }
			, { field: 'HQCCheckItemName', title: 'æ£éªé¡¹ç®åç§°', edit: 'text', width: 230 }
			/////////////
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			, { field: 'HAnalysisMethod', title: 'åææ¹æ³', width: 185, templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
			, { field: 'HInspectMethodID', title: 'æ£éªæ¹æ³ID', edit: 'text', hide: true }
			, { field: 'HInspectMethodName', title: 'æ£éªæ¹æ³', edit: 'text', event: 'HInspectMethodName'}
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text', event: "", width: 125, hide: true }
			, { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text', width: 125, hide: true }
			, { field: 'HUpLimit', title: 'ä¸éå¼', edit: 'text', width: 125, hide: true }
			, { field: 'HDownLimit', title: 'ä¸éå¼', edit: 'text', width: 125, hide: true }
			, { field: 'HTargetVal', title: 'ç®æ å¼', edit: 'text' }
			, { field: 'HInspectMethodName', title: 'æ£éªæ¹æ³', width: 185, edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'}
			, { field: 'HQCStd', title: 'æ£éªæ å', edit: 'text', event: "", width: 125 }
			/* , { field: 'HInspectVal', title: 'æ£éªå¼', edit: 'text', width: 125 }*/
			, { field: 'HUpLimit', title: 'ä¸éå¼', edit: 'text', width: 125}
			, { field: 'HDownLimit', title: 'ä¸éå¼', edit: 'text', width: 125 }

			, { field: 'HQCNote1', title: '08:00--10:00', width: 125, templet: '#HQCNote1' }

			, { field: 'HTargetVal', title: 'æ£éªå¼1', edit: 'text', width: 185, }
			, { field: 'HQCNote2', title: '10:00--12:00', width: 125, templet: '#HQCNote2' }

			, { field: 'HTargetVal2', title: 'æ£éªå¼2', edit: 'text', width: 185, }
			, { field: 'HQCNote3', title: '12:00--14:00', width: 125, templet: '#HQCNote3' }

			, { field: 'HTargetVal3', title: 'æ£éªå¼3', edit: 'text', width: 185, }
			, { field: 'HQCNote4', title: '14:00--16:00', width: 125, templet: '#HQCNote4' }

			, { field: 'HTargetVal4', title: 'æ£éªå¼4', edit: 'text', width: 185, }
			, { field: 'HQCNote5', title: '16:00--18:00', width: 125, templet: '#HQCNote5' }

			, { field: 'HTargetVal5', title: 'æ£éªå¼5', edit: 'text', width: 185, }
			, { field: 'HQCNote6', title: '18:00--19:30', width: 125, templet: '#HQCNote6' }

			, { field: 'HTargetVal6', title: 'æ£éªå¼6', edit: 'text', width: 185, }
			, { field: 'HQCNote7', title: 'æ£éªè®°å½7', edit: 'text', hide: true }

			, { field: 'HQCNote8', title: 'æ£éªè®°å½8', edit: 'text', hide: true }
			@@ -579,7 +579,7 @@

			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{
			"HAnalysisMethod": 1, "HUpLimit": "", "HDownLimit": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HTargetVal": "",
			"HAnalysisMethod": 1, "HUpLimit": "", "HDownLimit": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HTargetVal": "", "HTargetVal2": "", "HTargetVal3": "", "HTargetVal4": "", "HTargetVal5": "", "HTargetVal6": "",
			"æ£éªé¡¹ç®åç±»": "", "HQCCheckItemID": 0, "HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " "
			, "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
			, "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
			@@ -636,7 +636,7 @@
			break;
			}
			rowdata.push({
			"HAnalysisMethod": data[i].åææ¹æ³, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].HInspectMethodName, "HUpLimit": data[i].ä¸éå¼, "HDownLimit": data[i].ä¸éå¼, "HTargetVal": data[i].ç®æ å¼,
			"HAnalysisMethod": data[i].åææ¹æ³, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].HInspectMethodName, "HUpLimit": data[i].ä¸éå¼, "HDownLimit": data[i].ä¸éå¼, "HTargetVal": data[i].ç®æ å¼, "HTargetVal2": data[i].ç®æ å¼2, "HTargetVal3": data[i].ç®æ å¼3, "HTargetVal4": data[i].ç®æ å¼4, "HTargetVal5": data[i].ç®æ å¼5, "HTargetVal6": data[i].ç®æ å¼6,
			"æ£éªé¡¹ç®åç±»": data[i].æ£éªé¡¹ç®åç±», "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].æ£éªé¡¹ç®åç§°,
			"HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
			"HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
			@@ -1499,9 +1499,19 @@
			var rowdata = [];
			var data = result.data;
			for (var i = 0; i < result.data.length; i++) {
			var analysisMethodValue = data[i].HAnalysisMethod;
			var analysisMethodText = "";
			if (analysisMethodValue == "1" \|\| analysisMethodValue == 1) {
			analysisMethodText = "å®æ§åæ";
			} else if (analysisMethodValue == "2" \|\| analysisMethodValue == 2) {
			analysisMethodText = "å®éåæ";
			} else if (analysisMethodValue == "3" \|\| analysisMethodValue == 3) {
			analysisMethodText = "å¶ä»åæ";
			}
			//åè¡¨ èµå¼
			rowdata.push({
			"HAnalysisMethod": data[i].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[i].åææ¹æ³ == "å®éåæ" ? 2 : 3),
			//"HAnalysisMethod": data[i].HAnalysisMethod == "å®æ§åæ" ? 1 : (data[i].HAnalysisMethod == "å®éåæ" ? 2 : 3),
			"HAnalysisMethod": analysisMethodValue ,
			"æ£éªé¡¹ç®åç±»": data[i]["æ£éªé¡¹ç®åç±»"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["æ£éªé¡¹ç®"],
			"HQCStd": "",
			"HQCNote1": "",
			@@ -1530,10 +1540,19 @@
			}
			option.data = rowdata;
			table.render(option);
			for (let j = 0; j < data.length; j++) {
			$("#HAnalysisMethod" + (j + 1)).val(data[j].åææ¹æ³ == "å®æ§åæ" ? 1 : (data[j].åææ¹æ³ == "å®éåæ" ? 2 : 3))
			}
			form.render('select');
			setTimeout(function () {
			var tableData = table.cache['mainTable'];
			if (tableData) {
			for (var i = 0; i < tableData.length; i++) {
			var selectElem = $('#HAnalysisMethod' + (i + 1));
			if (selectElem.length) {
			// è®¾ç½®ä¸ææ¡çéä¸å¼
			selectElem.val(tableData[i].HAnalysisMethod \|\| '');
			}
			}
			form.render('select');
			}
			}, 200);
			}
			}
			})