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/FlowCompleted.vue |   37 +++++++++++--------------------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index 5c172da..0038b4a 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -144,11 +144,6 @@
       :selectShenpiData="selectLossBoundOrderData"
       @searchReset="searchReset"
     ></loss-bound-handle>
-
-    <equipment-lean-out-approval-modal
-      ref='equipmentLeanOutApprovalModelRef'
-      @searchReset='searchReset'
-    />
     <equipment-seal-up-approval-modal
       ref='equipmentSealUpApprovalModelRef'
       @searchReset='searchReset'
@@ -166,8 +161,8 @@
       @searchReset='searchReset'
       :selectSparePartApplyData='selectSparePartApplyData'
     ></spare-part-apply-handle>
-    <equipment-return-approval-modal
-      ref='equipmentReturnApprovalModelRef'
+    <equipment-lean-out-and-return-approval-modal
+      ref='EquipmentLeanOutAndReturnApprovalModalRef'
       @searchReset='searchReset'
     />
     <inbound-order-handle-xq
@@ -207,12 +202,11 @@
 import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
 import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
 import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
-import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
 import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
 import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
 import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
 import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
-import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
+import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
 import GuideCardBatchXq from '@views/flowable/workflow/guideCardBatch/GuideCardBatchXq.vue'
 import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
 import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
@@ -231,12 +225,11 @@
     InspectionOrderHandle,
     JDictSelectTag,
     OutBoundOrderHandle,
-    EquipmentLeanOutApprovalModal,
     EquipmentSealUpApprovalModal,
     EquipmentTransferApprovalModal,
     EquipmentScrapApprovalModal,
     SparePartApplyHandle,
-    EquipmentReturnApprovalModal,
+    EquipmentLeanOutAndReturnApprovalModal,
     SecondMaintenanceApprovalModal,
     ThirdMaintenanceApprovalModal,
     InboundOrderHandleXq,
@@ -373,9 +366,6 @@
         case 'equipment_unseal':
           this.handleEquipmentUnSeal(item)
           break
-        case 'equipment_lean_out':
-          this.handleEquipmentLeanOut(item)
-          break
         case 'equipment_transfer':
           this.handleEquipmentTransfer(item)
           break
@@ -385,8 +375,9 @@
         case 'spare_part_apply':
           this.handleSparePartApplyApproval(item)
           break
+        case 'equipment_lean_out':
         case 'equipment_return':
-          this.handleEquipmentReturn(item)
+          this.handleEquipmentLeanOutAndReturn(item)
           break
         case 'toolInStorageApproval':
           this.handleToolInStorage(item)
@@ -411,11 +402,11 @@
       return result
     },
 
-    handleEquipmentReturn(item) {
-      this.$refs.equipmentReturnApprovalModelRef.visible = true
-      this.$refs.equipmentReturnApprovalModelRef.title = item.name
-      this.$refs.equipmentReturnApprovalModelRef.handleDetail(item)
-      this.$refs.equipmentReturnApprovalModelRef.disableSubmit = true
+    handleEquipmentLeanOutAndReturn(item) {
+      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.visible = true
+      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.title = item.name
+      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.handleDetail(item)
+      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.disableSubmit = true
     },
     handleToolInStorage(item) {
       console.log('item----->', item)
@@ -545,12 +536,6 @@
       this.$refs.lossBoundHandle.clearTableSource()
       this.$refs.lossBoundHandle.getAllApproveData(item)
 
-    },
-    handleEquipmentLeanOut(item) {
-      this.$refs.equipmentLeanOutApprovalModelRef.visible = false
-      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
-      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
-      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
     },
     handleEquipmentSealUp(item) {
       this.$refs.equipmentSealUpApprovalModelRef.visible = true

--
Gitblit v1.9.3