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

---
 applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/auditRecord.vue |   67 +++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 28 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 1966e5b..0136cc5 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
@@ -1,14 +1,25 @@
 <template>
   <div class="audit-record-container">
-    <div class="label">审批记录</div>
-    <el-steps direction="vertical" :active="displayedSteps.length">
-      <el-step v-for="step in displayedSteps" :key="step.status" :title="step.title" :description="`${step.person || ''}\n${step.time || ''}`" />
-    </el-steps>
+    <el-timeline class="gd-timeline">
+      <el-timeline-item
+        v-for="(step, index) in displayedSteps"
+        :key="step.status"
+        :icon="Check"
+        :type="index === displayedSteps.length - 1 ? 'success' : 'info'"
+        :timestamp="step.time"
+      >
+        <div class="item-content">
+          <div class="flowName">{{ step.title }}</div>
+          <div >{{ step.person }}</div>
+        </div>
+      </el-timeline-item>
+    </el-timeline>
   </div>
 </template>
 
 <script setup>
 import { ref, watch } from 'vue'
+import { Check } from '@element-plus/icons-vue'
 import { gdSupplyDemandAuditListApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
 
 const props = defineProps({
@@ -89,32 +100,32 @@
 
 <style scoped lang="scss">
 .audit-record-container {
-	height: 95%;
-  .label {
-    font-weight: 500;
-    margin-bottom: 8px;
-    color: #333;
+width:100%;
+	// height: 95%;
+ 
+}
+
+/* 时间线样式 */
+:deep(.gd-timeline) {
+ padding-left: 90px;
+}
+
+:deep(.el-timeline-item) {
+  padding-bottom: 20px;
+  .item-content {
+ 	position: relative;
+			.flowName {
+				width: 80px;
+				position: absolute;
+				left: -120px;
+				top: 0px;
+			}
   }
 }
 
-/* 步骤条样式 */
-:deep(.el-steps) {
-  align-items: flex-start;
-}
-
-:deep(.el-step) {
-  // margin-bottom: 20px;
-}
-
-:deep(.el-step__title) {
-  font-size: 14px;
-  font-weight: 500;
-}
-
-:deep(.el-step__description) {
-  font-size: 13px;
-  color: #666;
-  white-space: pre-wrap;
-  line-height: 1.4;
+:deep(.el-timeline-item__timestamp) {
+  font-size: 12px;
+  color: #999;
+  margin-top: 2px;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.9.3