From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue
index fe24617..1966e5b 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue
@@ -45,7 +45,7 @@
     steps.push({
       status: '0',
       title: '需求申请',
-      person: sortedRecords.find(r => r.auditStatus === '0')?.createUser || '',
+      person: sortedRecords.find(r => r.auditStatus === '0')?.userName || '',
       time: sortedRecords.find(r => r.auditStatus === '0')?.createTime || ''
     })
     
@@ -55,7 +55,7 @@
       steps.push({
         status: '1',
         title: '审核通过',
-        person: approvedRecord.createUser || '',
+        person: approvedRecord.userName || '',
         time: approvedRecord.createTime || ''
       })
     }
@@ -66,7 +66,7 @@
       steps.push({
         status: '2',
         title: '拒绝申请',
-        person: rejectedRecord.createUser || '',
+        person: rejectedRecord.userName || '',
         time: rejectedRecord.createTime || ''
       })
       // 查找拒绝原因
@@ -89,6 +89,7 @@
 
 <style scoped lang="scss">
 .audit-record-container {
+	height: 95%;
   .label {
     font-weight: 500;
     margin-bottom: 8px;

--
Gitblit v1.9.3