From ff1f734e5f37cdd004f6c8bf88a2917737e1ff08 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 11 九月 2025 11:10:56 +0800
Subject: [PATCH] 故障报修列表超期标记红色

---
 src/views/flowable/workflow/FlowTodo.vue |   54 +++++++++++++++++++-----------------------------------
 1 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 456249b..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,
@@ -351,13 +345,6 @@
     StandardizedProcessHandle,
     GuideCardBatchHandle,
     AssignEquipmentFileStreamHandle
-  },
-  props: {
-    // 娣诲姞榛樿鍒嗙被灞炴��
-    defaultCategories: {
-      type: Array,
-      default: () => []
-    }
   },
   data() {
     return {
@@ -378,7 +365,7 @@
           title: '娴佺▼鍒嗙被',
           align: 'center',
           dataIndex: 'category_dictText',
-          width: 100
+          width: 200
         },
         {
           title: '娴佺▼鍚嶇О',
@@ -404,13 +391,13 @@
           title: '鍓嶉┍鑺傜偣',
           align: 'center',
           dataIndex: 'preNode',
-          width: 200
+          width: 250
         },
         {
           title: '褰撳墠鑺傜偣',
           align: 'center',
           dataIndex: 'name',
-          width: 200
+          width: 250
         },
         {
           title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
@@ -472,7 +459,6 @@
       if (arg === 1) {
         this.ipagination.current = 1
       }
-      this.queryParam.categoryList = this.defaultCategories;
       var params = this.getQueryParams()//鏌ヨ鏉′欢
       if (!params) {
         return false
@@ -524,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)
@@ -677,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