From 0055477982f5317e992fdfe785b066116fc833b0 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 19 Sep 2023 16:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/uploadManage/uploadLog.vue   | 17 ++++++-------
 src/views/inout/uploadManage/uploadOrder.vue | 25 +++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/views/inout/uploadManage/uploadLog.vue b/src/views/inout/uploadManage/uploadLog.vue
index 63229a0c..1885df08 100644
--- a/src/views/inout/uploadManage/uploadLog.vue
+++ b/src/views/inout/uploadManage/uploadLog.vue
@@ -92,7 +92,7 @@
         <el-table-column label="提交时间" prop="submitTime" width="200"></el-table-column>
         <el-table-column label="提交状态" prop="exportStatus" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.status)">{{
                 statusMap[scope.row.status]
               }}
             </el-tag>
@@ -164,7 +164,7 @@ export default {
         page: 1,
         limit: 20
       },
-      actDateRange:[],
+      actDateRange: [],
       loading: false,
       list: [],
       total: 0,
@@ -172,7 +172,8 @@ export default {
         0: "未提交",
         1: "正在提交",
         2: "提交成功",
-        3: "提交失败"
+        3: "提交失败",
+        4: "单据异常"
       },
       pickerOptions: {
         disabledDate(time) {
@@ -197,7 +198,7 @@ export default {
         page: 1,
         limit: 20
       }
-      this.actDateRange=[];
+      this.actDateRange = [];
       this.onSubmit();
     },
     onSubmit() {
@@ -246,16 +247,16 @@ export default {
         this.$message.info("已取消删除");
       })
     },
-  },
-  filters: {
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        2: "success",
+        4: "warning",
+        3: "danger",
       };
       return statusMap[status];
     },
   },
+  filters: {},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/inout/uploadManage/uploadOrder.vue b/src/views/inout/uploadManage/uploadOrder.vue
index 9f6c971a..3e99ff2b 100644
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@@ -99,9 +99,9 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="150"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
-        <el-table-column label="往来单位" prop="fromName" width="220">
+        <el-table-column label="往来单位" prop="fromName" width="180">
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
                          sortable="custom"
@@ -146,7 +146,7 @@
         </el-table-column>
         <el-table-column label="提交状态" prop="exportStatus" width="100">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
+            <el-tag :type="statusFilterType(scope.row.exportStatus)">{{
                 exportStatusMap[scope.row.exportStatus]
               }}
             </el-tag>
@@ -160,7 +160,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -220,6 +220,11 @@
             prop="coName"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="DI/物资编码"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="规格型号"
             prop="spec"
@@ -470,6 +475,7 @@ export default {
         2: "提交失败"
       },
       checkDateStatus: {
+        null:"未确认",
         1: '已确认',
         0: '未确认'
       },
@@ -706,15 +712,18 @@ export default {
       }
       return statusMap[status]
     },
-  },
-  filters: {
     statusFilterType(status) {
       const statusMap = {
-        false: "success",
-        true: "warning",
+        null: "",
+        1: "success",
+        0: "warning",
+        2: "danger"
       };
       return statusMap[status];
     },
+  },
+  filters: {
+
   },
   mounted() {
     document.body.ondrop = function (event) {