提交

components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -124,21 +124,31 @@
 			console.log(res)
 			if (res.code == 200) {
 				//过滤出工序交集store.dayworkInfo.processSequence
-				// console.log(filteredData[0])
 				let filteredData = store.dayworkInfo.processSequence.filter((item1) =>
 					res.data.some((item2) => item2.processCode === item1.processCode)
 				);
+				console.log(filteredData)
+				/* 20240409 修改
 				for (let i = 0; i < filteredData.length; i++) {
+					// console.log(processList.value)
 					processList.value[i] = {
 						text: filteredData[i].processAlias,
 						value: filteredData[i].technologicalProcessDetailId,
 						processId: filterData[i].id
 						// value: filteredData[i].id
 					}
+					// console.log(processList.value)
 				}
+				*/
+			    processList.value = filteredData.map(v => ({
+					text: v.processAlias,
+					value: v.technologicalProcessDetailId,
+					processId: v.id
+			    }))
 				console.log(processList.value)
 				selectedProcess.value = filteredData[0].technologicalProcessDetailId;
 				// selectedProcess.value = filteredData[0].processId
+				// console.log(selectedProcess.value)
 				isDefaultItem(firstItem.value);
 			} 
 		})
@@ -272,7 +282,7 @@
 				processId: selectedProcess.value,
 				*/
 				technologicalProcessDetailId: selectedProcess.value,
-				processId: processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processId : null,
+				processId: store.dayworkInfo.processSequence.findIndex(v => v.technologicalProcessDetailId === selectedProcess.value) >= 0 ? store.dayworkInfo.processSequence. value.find(v => v.technologicalProcessDetailId === selectedProcess.value).processId : null,
 				equipmentDetailId: selectedEquipment.value.commonId,
 				equipmentDetailCode: selectedEquipment.value.commonCode,
 				startTime: timestampToTime(new Date()),
@@ -287,7 +297,7 @@
 				processId: selectedProcess.value,
 				*/
 				technologicalProcessDetailId: selectedProcess.value,
-				processId: processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processId : null,
+				processId: store.dayworkInfo.processSequence.findIndex(v => v.technologicalProcessDetailId === selectedProcess.value) >= 0 ? store.dayworkInfo.processSequence. value.find(v => v.technologicalProcessDetailId === selectedProcess.value).processId : null,
 				equipmentDetailId: selectedEquipment.value.commonId,
 				equipmentDetailCode: selectedEquipment.value.commonCode,
 				collaborationList: selectedUserList.value

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -197,6 +197,7 @@
 	}
 
 	function handleConfirm() {
+		console.log(dayworkInfo.value)
 		curDayworkItem.value.id = null;
 		curDayworkItem.value.status = curDayworkItem.value.turnoverType == '1' ? '7' : '4';
 		curDayworkItem.value.startTime = timestampToTime(new Date());

pages/addNewBatch/index.vue

@@ -241,14 +241,24 @@
 				let filteredData = store.planDetails.processSequence.filter((item1) =>
 					res.data.some((item2) => item2.processCode === item1.processCode)
 				);
-				for (let i = 0; i < filteredData.length; i++) {
-					processList.value[i] = {
-						text: filteredData[i].processAlias,
-						value: filteredData[i].id
-					}
-				}
-				selectedProcess.value = filteredData[0].id;
-				dayWork.value.processId = selectedProcess.value;
+				// for (let i = 0; i < filteredData.length; i++) {
+				// 	processList.value[i] = {
+				// 		text: filteredData[i].processAlias,
+				// 		// value: filteredData[i].id,
+				// 		value: filteredData[i].technologicalProcessDetailId,
+				// 		processId: filterData[i].id
+						
+				// 	}
+				// }
+				processList.value = filteredData.map(v => ({
+					text: v.processAlias,
+					value: v.technologicalProcessDetailId,
+					processId: v.id
+			    }))
+				console.log(processList.value)
+				selectedProcess.value = filteredData[0].technologicalProcessDetailId;
+				dayWork.value.processId = filteredData[0].id;
+				dayWork.value.technologicalProcessDetailId = selectedProcess.value
 			}
 		})
 	}
@@ -362,7 +372,8 @@
 	}
 
 	function handleProcessChange() {
-		dayWork.value.processId = selectedProcess.value;
+		dayWork.value.technologicalProcessDetailId = selectedProcess.value;
+		dayWork.value.processId = processList.value.findIndex(v => v.value === selectedProcess.value) >= 0 ? processList.value.find(v => v.value === selectedProcess.value).processId : null
 	}
 
 	// function handleScanCode() {