From ffe01cb9dac3782f6f5f766a60491c12f5e42f19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 09:58:59 +0800
Subject: [PATCH] art: 设备管理-点检工单-确认意见

---
 src/views/eam/maintenance/EamInspectionOrderList.vue |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 3bf317a..286c387 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -134,7 +134,8 @@
     </div>
 
     <eam-inspection-order-modal ref="modalForm" @ok="modalFormOk"></eam-inspection-order-modal>
-    <EamInspectionOrderModalXq ref="modalFormXq" @ok="modalFormOk"></EamInspectionOrderModalXq>
+
+    <inspection-order-handle ref="modalFormXq" :selectShenpiData="selectInspectionOrderXqData"/>
   </a-card>
 </template>
 
@@ -144,17 +145,17 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import EamInspectionOrderModal from './modules/EamInspectionOrderModal'
-  import EamInspectionOrderModalXq from './modules/EamInspectionOrderModalXq.vue'
   import { deleteAction, getAction } from '@api/manage'
+  import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle'
   import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
 
   export default {
     name: 'EamInspectionOrderList',
     mixins: [JeecgListMixin, mixinDevice],
     components: {
-      LxSearchEquipmentSelect,
+      InspectionOrderHandle,
       EamInspectionOrderModal,
-      EamInspectionOrderModalXq
+      LxSearchEquipmentSelect,
     },
     props: {
       isDisplayOperation: {
@@ -243,11 +244,16 @@
             title: '纭鏃堕棿',
             align: 'center',
             dataIndex: 'confirmTime',
+          },
+          {
+            title: '纭鎰忚',
+            align: 'center',
+            dataIndex: 'confirmComment',
           }
         ],
         url: {
           list: '/eam/eamInspectionOrder/list',
-          cancelInspectionOrder: "/eam/eamInspectionOrder/cancelInspectionOrder",
+          cancelInspectionOrder: '/eam/eamInspectionOrder/cancelInspectionOrder',
           deleteBatch: '/eam/eamInspectionOrder/deleteBatch',
           exportXlsUrl: '/eam/eamInspectionOrder/exportXls',
           importExcelUrl: 'eam/eamInspectionOrder/importExcel',
@@ -255,7 +261,8 @@
           cancelOrReceive: 'eam/eamInspectionOrder/cancelOrReceive'
         },
         dictOptions: {},
-        superFieldList: []
+        superFieldList: [],
+        selectInspectionOrderXqData: {}
       }
     },
     created() {
@@ -283,9 +290,12 @@
       },
       //璇︽儏
       handleDetail: function(record) {
-        this.$refs.modalFormXq.edit(record)
+        this.selectInspectionOrderXqData = Object.assign({}, record)
+        this.$refs.modalFormXq.visible = true
         this.$refs.modalFormXq.title = '璇︽儏'
         this.$refs.modalFormXq.disableSubmit = true
+        this.$refs.modalFormXq.getAllApproveData(record)
+        this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
       },
       handleInspection(id) {
         if (!this.url.receiveInspectionOrder) {
@@ -309,27 +319,27 @@
           }
         })
       },
-      handleOrReceive(id){
+      handleOrReceive(id) {
         if (!this.url.cancelInspectionOrder) {
-          this.$message.error("璇疯缃畊rl.cancelInspectionOrder!")
+          this.$message.error('璇疯缃畊rl.cancelInspectionOrder!')
           return
         }
-        var that = this;
+        var that = this
         getAction(that.url.cancelInspectionOrder, { id: id }).then((res) => {
           if (res.success) {
             that.$notification.success({
               message: '娑堟伅',
               description: res.message
-            });
-            that.loadData();
+            })
+            that.loadData()
           } else {
             // that.$message.warning(res.message);
             that.$notification.warning({
               message: '娑堟伅',
               description: res.message
-            });
+            })
           }
-        });
+        })
       },
       batchZf(type) {
         if (this.selectedRowKeys.length <= 0) {

--
Gitblit v1.9.3