From 5257ec80ecb2c3d04d112b9c38fadb4e2b991f7d Mon Sep 17 00:00:00 2001
From: czc <czc15706259078@163.com>
Date: Tue, 25 Jul 2023 15:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=A5=E5=BF=97=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oms/aftersale/index.vue | 29 ++++++++++++-----------------
 src/views/oms/order/index.vue     | 29 ++++++++++++-----------------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 3814590..75cb20a 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -103,23 +103,18 @@
       </div>
     </el-dialog>
     <!--  日志  -->
-    <el-dialog :title="logObj.title" :visible.sync="logObj.open" width="1000px" append-to-body>
-      <el-table v-loading="logObj.loading" :data="logObj.logList">
-        <el-table-column label="最新状态" prop="orderStatus">
-          <template v-slot="scope">
-            <div>{{getLogEvent(scope.row.orderStatus)}}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" prop="note"/>
-        <el-table-column label="操作人" prop="operateMan"/>
-        <el-table-column label="时间" prop="createTime" width="180">
-          <template v-slot="scope">
-            <div>
-              {{ parseTime(scope.row.createTime, '')}}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+    <el-dialog :title="logObj.title" :visible.sync="logObj.open" width="500px" append-to-body>
+      <el-timeline>
+        <el-timeline-item v-for="item in logObj.logList" placement="top" :timestamp="parseTime(item.createTime, '')">
+          <el-card>
+            <h4>{{ getLogEvent(item.orderStatus) }}</h4>
+            <br>
+            <h4>操作人：{{ item.operateMan }}</h4>
+            <br>
+            <h4>备注：{{ item.note }}</h4>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 559b001..47cbfc1 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -212,23 +212,18 @@
       </div>
     </el-dialog>
     <!--  日志  -->
-    <el-dialog :title="logObj.title" :visible.sync="logObj.open" width="1000px" append-to-body>
-      <el-table v-loading="logObj.loading" :data="logObj.logList">
-        <el-table-column label="最新状态" prop="orderStatus">
-          <template v-slot="scope">
-            <div>{{getLogEvent(scope.row.orderStatus)}}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" prop="note"/>
-        <el-table-column label="操作人" prop="operateMan"/>
-        <el-table-column label="时间" prop="createTime" width="180">
-          <template v-slot="scope">
-            <div>
-              {{ parseTime(scope.row.createTime, '')}}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+    <el-dialog :title="logObj.title" :visible.sync="logObj.open" width="500px" append-to-body>
+      <el-timeline>
+        <el-timeline-item v-for="item in logObj.logList" placement="top" :timestamp="parseTime(item.createTime, '')">
+          <el-card>
+            <h4>{{ getLogEvent(item.orderStatus) }}</h4>
+            <br>
+            <h4>操作人：{{ item.operateMan }}</h4>
+            <br>
+            <h4>备注：{{ item.note }}</h4>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
     </el-dialog>
   </div>
 </template>