提交

components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -130,11 +130,12 @@
 				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
 					}
 				}
 				console.log(processList.value)
-				selectedProcess.value = filteredData[0].id;
+				selectedProcess.value = filteredData[0].technologicalProcessDetailId;
 				isDefaultItem(firstItem.value);
 			} 
 		})
@@ -264,7 +265,11 @@
 		if (firstItem.value) {
 			sendReqParam.value = {
 				...firstItem.value,
+				/* 20240408 前版本
 				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,
 				equipmentDetailId: selectedEquipment.value.commonId,
 				equipmentDetailCode: selectedEquipment.value.commonCode,
 				startTime: timestampToTime(new Date()),
@@ -275,7 +280,11 @@
 			emit('handleAddDayWorkItem', sendReqParam.value);
 		} else {
 			emit('handleAddDayWorkItem', {
+				/* 20240408 前版本
 				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,
 				equipmentDetailId: selectedEquipment.value.commonId,
 				equipmentDetailCode: selectedEquipment.value.commonCode,
 				collaborationList: selectedUserList.value

components/dialog-selectInviteUser/dialog-selectInviteUser.vue

@@ -157,6 +157,7 @@
 							inviteUser.commonName = selectedUserList.value[i].nickName
 							inviteUser.protemDayworkId = store.dayworkInfo.id
 							inviteUser.protemProcessId = itemList.value[0].processId
+							inviteUser.technologicalProcessDetailId = item.value[0].technologicalProcessDetailId
 							inviteUserList.push(inviteUser)
 						}
 						console.log(inviteUserList)