From 0bb231490d19e16c27e373274bcb6e4feb6b400b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 四月 2025 17:24:30 +0800
Subject: [PATCH] art: 设备管理-周保-列表，详情修改

---
 src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue |   97 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
index 39ccbf6..7c91771 100644
--- a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
@@ -106,6 +106,7 @@
 
     <!-- 琛ㄥ崟鍖哄煙 -->
     <eamWeekMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"></eamWeekMaintenanceOrder-modal>
+    <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal"></week-maintenance-approval-modal>
   </a-card>
 </template>
 
@@ -115,13 +116,15 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
 import { deleteAction, getAction } from '@api/manage'
+import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
 
 export default {
   name: 'EamWeekMaintenanceOrderList',
   mixins: [JeecgListMixin],
   components: {
     LxSearchEquipmentSelect,
-    EamWeekMaintenanceOrderModal
+    EamWeekMaintenanceOrderModal,
+    WeekMaintenanceApprovalModal
   },
   data() {
     return {
@@ -134,6 +137,7 @@
           key: 'rowIndex',
           width: 60,
           align: 'center',
+          fixed: 'left',
           customRender: function(t, r, index) {
             return parseInt(index) + 1
           }
@@ -141,78 +145,132 @@
         {
           title: '宸ュ崟鍙�',
           align: 'center',
-          dataIndex: 'orderNum'
+          dataIndex: 'orderNum',
+          fixed: 'left',
+          width: 60,
         },
         {
           title: '璁惧缂栧彿',
           align: 'center',
-          dataIndex: 'equipmentCode'
+          dataIndex: 'equipmentCode',
+          fixed: 'left',
+          width: 60,
         },
         {
           title: '璁惧鍚嶇О',
           align: 'center',
-          dataIndex: 'equipmentName'
+          dataIndex: 'equipmentName',
+          fixed: 'left',
+          width: 60,
         },
         {
           title: '鏍囧噯鍚嶇О',
           align: 'center',
-          dataIndex: 'standardId_dictText'
+          dataIndex: 'standardId_dictText',
+          width: 100,
         },
         {
           title: '璁″垝淇濆吇鏃ユ湡',
           align: 'center',
-          dataIndex: 'maintenanceDate'
+          dataIndex: 'maintenanceDate',
+          width: 60,
         },
         {
           title: '瀹為檯寮�濮嬫椂闂�',
           align: 'center',
-          dataIndex: 'actualStartTime'
+          dataIndex: 'actualStartTime',
+          width: 60,
         },
         {
           title: '瀹為檯缁撴潫鏃堕棿',
           align: 'center',
-          dataIndex: 'actualEndTime'
+          dataIndex: 'actualEndTime',
+          width: 60,
         },
         {
           title: '淇濆吇浜�',
           align: 'center',
-          dataIndex: 'operator_dictText'
+          dataIndex: 'operator_dictText',
+          width: 60,
         },
         {
           title: '淇濆吇鐘舵��',
           align: 'center',
-          dataIndex: 'maintenanceStatus_dictText'
+          dataIndex: 'maintenanceStatus_dictText',
+          width: 60,
         },
         {
           title: '鍒涘缓鏂瑰紡',
           align: 'center',
-          dataIndex: 'creationMethod_dictText'
+          dataIndex: 'creationMethod_dictText',
+          width: 60,
         },
         {
           title: '纭浜�',
           align: 'center',
-          dataIndex: 'confirmUser_dictText'
+          dataIndex: 'confirmUser_dictText',
+          width: 60,
         },
         {
           title: '纭鏃堕棿',
           align: 'center',
-          dataIndex: 'confirmTime'
+          dataIndex: 'confirmTime',
+          width: 60,
         },
         {
-          title: '淇濆吇鍥剧墖',
+          title: '纭鎰忚',
           align: 'center',
-          dataIndex: 'imageFiles'
+          dataIndex: 'confirmComment',
+          width: 60,
+        },
+        {
+          title: '鍒濋獙鏀朵汉',
+          align: 'center',
+          dataIndex: 'initialAcceptanceUser_dictText',
+          width: 60,
+        },
+        {
+          title: '鍒濋獙鏀舵椂闂�',
+          align: 'center',
+          dataIndex: 'initialAcceptanceTime',
+          width: 60,
+        },
+        {
+          title: '鍒濋獙鏀舵剰瑙�',
+          align: 'center',
+          dataIndex: 'initialAcceptanceComment',
+          width: 60,
+        },
+        {
+          title: '缁堥獙鏀朵汉',
+          align: 'center',
+          dataIndex: 'finalAcceptanceUser_dictText',
+          width: 60,
+        },
+        {
+          title: '缁堥獙鏀舵椂闂�',
+          align: 'center',
+          dataIndex: 'finalAcceptanceTime',
+          width: 60,
+        },
+        {
+          title: '缁堥獙鏀舵剰瑙�',
+          align: 'center',
+          dataIndex: 'finalAcceptanceComment',
+          width: 60,
         },
         {
           title: '澶囨敞',
           align: 'center',
           dataIndex: 'remark',
-          editable: true,
+          width: 60,
         },
         {
           title: '鎿嶄綔',
           dataIndex: 'action',
           align: 'center',
+          fixed: 'right',
+          width: 100,
           scopedSlots: { customRender: 'action' }
         }
       ],
@@ -309,7 +367,7 @@
         this.$message.error("璇疯缃畊rl.collect灞炴��!")
         return
       }
-      var that = this;
+      let that = this;
       getAction(that.url.collect, {id: id}).then((res) => {
         if (res.success) {
           //閲嶆柊璁＄畻鍒嗛〉闂
@@ -332,6 +390,11 @@
     //鎵归噺棰嗗彇
     handlerBatchCollect(){
 
+    },
+    handleDetail(record) {
+      this.$refs.weekMaintenanceApprovalModal.recordDetail(record)
+      this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏';
+      this.$refs.weekMaintenanceApprovalModal.disableSubmit = true
     }
   }
 }

--
Gitblit v1.9.3