From 387be30f02584ec0c27781f3e23322a6ee1ec779 Mon Sep 17 00:00:00 2001
From: wx-jincw <jin.chenwei@iwhalecloud.com>
Date: Tue, 24 Mar 2026 22:34:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/pm/maintenance/order/index.vue        | 11 +++++------
 .../supply_chain/repair/components/DispatchRecord.vue |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/admin/src/views/pm/maintenance/order/index.vue b/admin/src/views/pm/maintenance/order/index.vue
index c7e75ce..8723038 100644
--- a/admin/src/views/pm/maintenance/order/index.vue
+++ b/admin/src/views/pm/maintenance/order/index.vue
@@ -148,8 +148,8 @@
         label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '修改' }}</el-button>
-          <el-button v-if="scope.row.status !== '99'" type="text" size="small" @click="completeOrder(scope.row.id)">{{ '办结' }}</el-button>
-          <el-button v-if="scope.row.status === '99'" type="text" size="small" @click="revokeOrder(scope.row.id)">{{ '撤销' }}</el-button>
+          <el-button v-hasPermi="['autogencode:pmmaintenanceorder:update']" v-if="scope.row.status !== '99'" type="text" size="small" @click="completeOrder(scope.row.id)">{{ '办结' }}</el-button>
+          <el-button v-hasPermi="['autogencode:pmmaintenanceorder:update']" v-if="scope.row.status === '99'" type="text" size="small" @click="revokeOrder(scope.row.id)">{{ '重新处理' }}</el-button>
           <el-button v-hasPermi="['autogencode:pmmaintenanceorder:delete']" type="text" size="small" @click="deleteHandle(scope.row.id)" style="color: #f56c6c;">删除</el-button>
         </template>
       </el-table-column>
@@ -378,7 +378,7 @@ import DictTag from '@/components/DictTag'
       },
       // 撤销办结订单
       revokeOrder (id) {
-        this.$confirm('确定要撤销该订单吗？', '提示', {
+        this.$confirm('确定要重新处理报修单吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -389,13 +389,12 @@ import DictTag from '@/components/DictTag'
             status: '0', // 0是待处理状态
             remark: ''
           }).then(res => {
-            this.$message.success('撤销成功')
+            this.$message.success('操作成功')
             this.getDataList()
           }).catch(() => {
-            this.$message.error('撤销失败')
+            this.$message.error('操作失败')
           })
         }).catch(() => {
-          this.$message.info('已取消撤销')
         })
       },
     }
diff --git a/app/pages/supply_chain/repair/components/DispatchRecord.vue b/app/pages/supply_chain/repair/components/DispatchRecord.vue
index 47d635a..5cdba9c 100644
--- a/app/pages/supply_chain/repair/components/DispatchRecord.vue
+++ b/app/pages/supply_chain/repair/components/DispatchRecord.vue
@@ -49,7 +49,7 @@
             </view>
             <view class="row">
               <text class="label">业主确认</text>
-              <text class="value">{{ item.ownerConfirm === '1' ? '是' : '否' }}</text>
+              <text class="value">{{ item.ownerConfirm || '否' }}</text>
             </view>
           </view>
         </view>