From 8905bdd0a74c4bd6cabc206c36a299341488041e Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 11 九月 2025 11:00:26 +0800
Subject: [PATCH] 合并设备借出与归还流程，增加借出归还列表详情功能
---
src/views/flowable/workflow/FlowTodo.vue | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 5cb6bc9..e952e41 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -238,12 +238,8 @@
:taskList='selectionRows'
@searchReset='searchReset'
/>
- <equipment-lean-out-approval-modal
- ref='equipmentLeanOutApprovalModelRef'
- @searchReset='searchReset'
- />
- <equipment-return-approval-modal
- ref='equipmentReturnApprovalModelRef'
+ <equipment-lean-out-and-return-approval-modal
+ ref='equipmentLeanOutAndReturnModalRef'
@searchReset='searchReset'
/>
@@ -310,8 +306,7 @@
import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
-import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
-import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
+import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
@@ -338,8 +333,7 @@
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
InspectionOrderHandle,
- EquipmentLeanOutApprovalModal,
- EquipmentReturnApprovalModal,
+ EquipmentLeanOutAndReturnApprovalModal,
SecondMaintenanceApprovalModal,
ThirdMaintenanceApprovalModal,
OutBoundOrderHandle,
@@ -516,10 +510,8 @@
this.handleRepairOrder(item)
break
case 'equipment_lean_out':
- this.handleEquipmentLeanOut(item)
- break
case 'equipment_return':
- this.handleEquipmentReturn(item)
+ this.handleEquipmentLeanOutAndReturn(item)
break
case 'second_maintenance':
this.handleSecondMaintenance(item)
@@ -669,18 +661,18 @@
this.$refs.repairOrderApprovalModal.getAllApproveData(record)
this.$refs.repairOrderApprovalModal.getBasicInformation(record)
},
- handleEquipmentLeanOut(item) {
- this.$refs.equipmentLeanOutApprovalModelRef.visible = true
- this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
- this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
- this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false
+
+ /**
+ * 璁惧鍊熷嚭涓庡綊杩�
+ * @param item
+ */
+ handleEquipmentLeanOutAndReturn(item) {
+ this.$refs.equipmentLeanOutAndReturnModalRef.visible = true
+ this.$refs.equipmentLeanOutAndReturnModalRef.title = item.name
+ this.$refs.equipmentLeanOutAndReturnModalRef.handleDetail(item)
+ this.$refs.equipmentLeanOutAndReturnModalRef.disableSubmit = false
},
- handleEquipmentReturn(item) {
- this.$refs.equipmentReturnApprovalModelRef.visible = true
- this.$refs.equipmentReturnApprovalModelRef.title = item.name
- this.$refs.equipmentReturnApprovalModelRef.handleDetail(item)
- this.$refs.equipmentReturnApprovalModelRef.disableSubmit = false
- },
+
handleSecondMaintenance(item) {
if (item && item.dataId) {
this.selectSecondMaintenanceData = Object.assign({}, item)
--
Gitblit v1.9.3