From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/flowable/workflow/FlowTodo.vue |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 9a452fc..ac34499 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,
@@ -432,9 +438,9 @@
       selectStocktakingBoundOrderData: {},
       selectInboundOrderData: {},
       selectSparePartApplyData: {},
-      selectGuideCardData:{},
-      selectEquipmentAssignProductData:{},
-      selectEquipmentSealUpData:{},
+      selectGuideCardData: {},
+      selectEquipmentAssignProductData: {},
+      selectEquipmentSealUpData: {},
       //涓氬姟淇℃伅ID
       dataId: undefined
     }
@@ -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
@@ -529,6 +538,9 @@
           break
         case 'equipment_seal_up':
           this.handleEquipmentSealUp(item)
+          break
+        case 'equipment_unseal':
+          this.handleEquipmentUnSeal(item)
           break
         case 'toolInStorageApproval':
           this.handleToolInStorage(item)
@@ -580,7 +592,7 @@
       } else if (categorySet.has('WEEK_MAINTENANCE')) {
         this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
         this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
-      }else if (categorySet.has('ggApproval')){
+      } else if (categorySet.has('ggApproval')) {
         let ids = ''
         for (let a = 0; a < this.selectedRowKeys.length; a++) {
           ids += this.selectedRowKeys[a] + ','
@@ -622,7 +634,7 @@
       this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
     },
     //DNC-瀹氬瀷瀹℃壒椤甸潰
-    handStandardizedDetial(item){
+    handStandardizedDetial(item) {
       this.selectDispatchFileXqData = item
       this.$refs.StandardizedProcessHandle.clearTableSource()
       this.$refs.StandardizedProcessHandle.getAllApproveData(item)
@@ -662,6 +674,12 @@
       this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
       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) {
@@ -710,6 +728,13 @@
       this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
       this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
     },
+
+    handleEquipmentUnSeal(item) {
+      this.$refs.equipmentSealUpApprovalModelRef.visible = true
+      this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+      this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+      this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
+    },
     handleToolInStorage(item) {
       if (item && item.dataId) {
         this.selectInboundOrderData = Object.assign({}, item)
@@ -732,6 +757,7 @@
     },
     handleSparePartApplyApproval(item) {
       if (item && item.dataId) {
+        debugger
         this.selectSparePartApplyData = Object.assign({}, item)
         this.$refs.sparePartApplyModal.auditVisible = true
         this.$refs.sparePartApplyModal.clearTableSource()
@@ -746,7 +772,7 @@
       this.$refs.guideCardBatchHandle.getAllApproveData(item)
     },
     //DNC-璁惧缁撴瀯鏍戞寚娲句骇鍝佺粨鏋勬爲
-    handleEquipmentAssignProductApproval(item){
+    handleEquipmentAssignProductApproval(item) {
       console.log('item----->', item)
       this.selectEquipmentSealUpData = item
       this.$refs.assignEquipmentFileStreamHandle.clearTableSource()

--
Gitblit v1.9.3