From 93dda3d2ed5d6f592f768b3fe58f4182ebb5746b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 10 九月 2025 18:43:38 +0800
Subject: [PATCH] 设备归还功能调整
---
src/views/flowable/workflow/FlowTodo.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 263059d..5cb6bc9 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -242,6 +242,10 @@
ref='equipmentLeanOutApprovalModelRef'
@searchReset='searchReset'
/>
+ <equipment-return-approval-modal
+ ref='equipmentReturnApprovalModelRef'
+ @searchReset='searchReset'
+ />
<second-maintenance-approval-modal
ref='secondMaintenanceApprovalModal'
@@ -307,6 +311,7 @@
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 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'
@@ -334,6 +339,7 @@
RepairOrderApprovalModal,
InspectionOrderHandle,
EquipmentLeanOutApprovalModal,
+ EquipmentReturnApprovalModal,
SecondMaintenanceApprovalModal,
ThirdMaintenanceApprovalModal,
OutBoundOrderHandle,
@@ -365,7 +371,7 @@
title: '娴佺▼鍒嗙被',
align: 'center',
dataIndex: 'category_dictText',
- width: 100
+ width: 200
},
{
title: '娴佺▼鍚嶇О',
@@ -391,13 +397,13 @@
title: '鍓嶉┍鑺傜偣',
align: 'center',
dataIndex: 'preNode',
- width: 200
+ width: 250
},
{
title: '褰撳墠鑺傜偣',
align: 'center',
dataIndex: 'name',
- width: 200
+ width: 250
},
{
title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
@@ -512,6 +518,9 @@
case 'equipment_lean_out':
this.handleEquipmentLeanOut(item)
break
+ case 'equipment_return':
+ this.handleEquipmentReturn(item)
+ break
case 'second_maintenance':
this.handleSecondMaintenance(item)
break
@@ -521,7 +530,7 @@
case 'toolOutStorageApproval':
this.handleToolOutStorageApproval(item)
break
- case 'toolsStocktakingBound':
+ case 'toolsStocktakingBoundApproval':
this.handleToolStocktakingApproval(item)
break
case 'toolsLossApproval':
@@ -666,6 +675,12 @@
this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
this.$refs.equipmentLeanOutApprovalModelRef.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