From 5b74ee432c8d52ea3b5cca7d4d3c4563076174c7 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 19 Jul 2022 09:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrderRecedLog.vue  |  4 ++--
 src/views/business/stockOrderUploadLog.vue | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/business/stockOrderRecedLog.vue b/src/views/business/stockOrderRecedLog.vue
index 2a328fa..daae609 100644
--- a/src/views/business/stockOrderRecedLog.vue
+++ b/src/views/business/stockOrderRecedLog.vue
@@ -135,7 +135,7 @@ export default {
                 thirdBillNo: null,
                 submitTime: null,
                 status: null,
-                fromType: 1,
+                fromType: 2,
                 page: 1,
                 limit: 20,
             },
@@ -160,7 +160,7 @@ export default {
     methods: {
         onReset() {
             this.filterQuery = {
-                fromType: 1,
+                fromType: 2,
                 genKey: null,
                 status: null,
                 page: 1,
diff --git a/src/views/business/stockOrderUploadLog.vue b/src/views/business/stockOrderUploadLog.vue
index 15cfc19..7ef0b41 100644
--- a/src/views/business/stockOrderUploadLog.vue
+++ b/src/views/business/stockOrderUploadLog.vue
@@ -75,8 +75,13 @@
                     show-overflow-tooltip
                 >
                     <template slot-scope="scope">
-                        <span>{{ getStatusInfo(scope.row.status) }}</span>
+                        <el-tag :type="(scope.row.status ) | statusFilterType">{{
+                                statusMap[scope.row.status]
+                            }}
+                        </el-tag>
                     </template>
+
+
                 </el-table-column>
                 <el-table-column
                     label="结果信息"
@@ -141,6 +146,8 @@ export default {
             list: [],
             total: 0,
             statusMap: {
+                0: "未提交",
+                1: "正在提交",
                 2: "提交成功",
                 3: "提交失败"
             },
@@ -224,7 +231,15 @@ export default {
             this.getList();
         },
     },
-
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                2: "success",
+                3: "danger",
+            };
+            return statusMap[status];
+        },
+    },
     mounted() {
     },
     created() {