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 @@
-
审批人:{{ node.name }}
+
审批人:{{ getNodeRecord(node).approverName }}
审批结果:{{ getNodeRecord(node).approveResult === '1' ? '通过' : '驳回' }}
审批意见:{{ getNodeRecord(node).approveOpinion }}
审批时间:{{ getNodeRecord(node).approveTime }}
- 状态:待审批 +
待审批人:{{ getApproverNames(node) }}
+
状态:待审批
- 状态:等待上一节点审批 +
待审批人:{{ getApproverNames(node) }}
+
状态:等待上一节点审批
@@ -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