From b0a7148f1830eb544af588e49a36163ee5820c7c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 七月 2025 10:10:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/orderProgress.vue |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/admin/src/components/business/orderProgress.vue b/admin/src/components/business/orderProgress.vue
new file mode 100644
index 0000000..06de68c
--- /dev/null
+++ b/admin/src/components/business/orderProgress.vue
@@ -0,0 +1,57 @@
+<template>
+    <GlobalWindow
+        :title="title"
+        width="50%"
+        :withFooter="false"
+        :visible.sync="visible"
+        :confirm-working="isWorking"
+    >
+        <el-timeline reverse>
+            <el-timeline-item v-for="(item, index) in list" :key="index" :hide-timestamp="true">
+                <div style="display: flex; flex-direction: column;">
+                    <span class="a">{{item.title}}</span>
+                    <span class="b">{{item.creatorName}} {{item.companyName || '骞冲彴鐞嗚禂鍛�'}} {{item.createDate }}</span>
+                    <span class="c" v-if="index >0 && item.content">璇存槑锛歿{item.content}}</span>
+                </div>
+            </el-timeline-item>
+        </el-timeline>
+    </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+  name: 'orderProgress',
+  extends: BaseOpera,
+  components: { GlobalWindow },
+  data () {
+    return {
+      list: []
+    }
+  },
+  methods: {
+    open (title, target) {
+      this.title = title
+      this.list = target
+      this.visible = true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+    .a {
+        color: rgba(16,16,16,1);
+        font-size: 14px;
+    }
+    .b {
+        color: rgba(154,154,154,1);
+        font-size: 14px;
+        margin: 10px 0;
+    }
+    .c {
+        color: rgba(16,16,16,1);
+        font-size: 14px;
+    }
+</style>

--
Gitblit v1.9.3