From dd882d827e101e85cf1806284d1e3e76d3466ecb Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 11 七月 2025 20:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index fc1b94d..39c7c2b 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -98,7 +98,7 @@
               </a-menu-item>
 
               <a-menu-item>
-                <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleOrReceive(record.id)">
+                <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleAbolish(record.id)">
                   <a>浣滃簾</a>
                 </a-popconfirm>
               </a-menu-item>
@@ -219,7 +219,7 @@
             dataIndex: 'operateTime'
           },
           {
-            title: '绠$悊鍛樼‘璁�',
+            title: '缁翠慨宸�',
             align: 'center',
             dataIndex: 'confirmUser_dictText'
           },
@@ -269,8 +269,6 @@
       }
     },
     methods: {
-      initDictConfig() {
-      },
       //璇︽儏
       handleDetail: function(record) {
         this.selectInspectionOrderXqData = Object.assign({}, record)
@@ -280,6 +278,7 @@
         this.$refs.modalFormXq.getAllApproveData(record)
         this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
       },
+
       handleInspection(id) {
         var that = this
         this.loading = true
@@ -301,11 +300,8 @@
             }
           })
       },
-      handleOrReceive(id) {
-        if (!this.url.cancelInspectionOrder) {
-          this.$message.error('璇疯缃畊rl.cancelInspectionOrder!')
-          return
-        }
+
+      handleAbolish(id) {
         var that = this
         getAction(that.url.cancelInspectionOrder, { id: id }).then((res) => {
           if (res.success) {

--
Gitblit v1.9.3