From 08be1c904c5a88256eb4a3173d5db384231f1aa3 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 5 Jan 2026 19:42:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/components/ApproveDialog.vue | 17 ++++++++++++++---
 .../repairAudit/repairApprovalDetail.vue        |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/business/components/ApproveDialog.vue b/src/views/business/components/ApproveDialog.vue
index 531f8737..ef5c0780 100644
--- a/src/views/business/components/ApproveDialog.vue
+++ b/src/views/business/components/ApproveDialog.vue
@@ -19,17 +19,19 @@
                 </el-tag>
               </div>
               <div class="node-info">
-                <div>审批人：{{ node.name }}</div>
                 <div v-if="getNodeRecord(node)">
+                  <div>审批人：{{ getNodeRecord(node).approverName }}</div>
                   <div>审批结果：{{ getNodeRecord(node).approveResult === '1' ? '通过' : '驳回' }}</div>
                   <div>审批意见：{{ getNodeRecord(node).approveOpinion }}</div>
                   <div>审批时间：{{ getNodeRecord(node).approveTime }}</div>
                 </div>
                 <div v-else-if="node.nodeOrder === approvalInstance.currentNodeOrder">
-                  状态：待审批
+                  <div>待审批人：{{ getApproverNames(node) }}</div>
+                  <div>状态：待审批</div>
                 </div>
                 <div v-else>
-                  状态：等待上一节点审批
+                  <div>待审批人：{{ getApproverNames(node) }}</div>
+                  <div>状态：等待上一节点审批</div>
                 </div>
               </div>
             </div>
@@ -83,6 +85,15 @@ export default {
       }
       return '未开始'
     },
+    // 获取待审批人名称
+    getApproverNames(node) {
+      if (!node.approverIds) {
+        return '未配置'
+      }
+      // approverIds 是逗号分隔的ID字符串，这里直接显示
+      // 如果需要显示用户名，需要从后端获取用户信息
+      return node.approverIds
+    },
     async getInfo(id, type) {
       try {
         this.loading = true
diff --git a/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue b/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
index a45ad0f1..6039412a 100644
--- a/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
+++ b/src/views/equipmentRepair/repairAudit/repairApprovalDetail.vue
@@ -254,7 +254,7 @@ export default {
       console.log('开始检查审批权限')
       console.log('审批实例状态:', this.approvalInstance.status)
 
-      if (this.approvalInstance.status !== '0') {
+      if (this.approvalInstance.status !== '0' && this.approvalInstance.status !== '1') {
         this.canApprove = false
         console.log('状态不是待审批，canApprove:', this.canApprove)
         return