From b08d6dd897626cfbcf4b2471cee47abe357725d4 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 25 一月 2024 18:31:42 +0800
Subject: [PATCH] wms 产品模块 进货,出货2个区别开,进货跳转到入库明细表,出货跳转到出库明细表

---
 src/views/reportForm/inboundOutboundDetail/index.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index f75ab04..fe60a74 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -130,11 +130,11 @@
         },
         {
           label: "涓氬姟绫诲瀷",
-          prop: "baseOperationType",
+          prop: "operationTypeName",
           isShowColumn: true,
           default: true,
-          conversion: true,
-          getStatus: this.getBaseOperationTypeList
+          // conversion: true,
+          // getStatus: this.getBaseOperationTypeList
         },
         {
           label: "浠�",
@@ -211,15 +211,17 @@
           page: this.pagerOptions.currPage,
           pageSize: this.pagerOptions.pageSize
         }).then((res) => {
-          if (res.code === 200) {
+          if (res.code === 200&&res.data) {
             res.data.map((item)=>{
                 let dateObject = new Date(item.date);  
                 let formattedDateString = dateObject.toISOString().split('T')[0];  
                 item.date=formattedDateString
             })
-            this.tableList.tableInfomation = res.data
-            this.pagerOptions.totalCount = res.total
+            this.tableList.tableInfomation = res.data||[]
+          }else{
+            this.tableList.tableInfomation = res.data||[]
           }
+          this.pagerOptions.totalCount = res.total
         })
       } else {
         await getHistory({
@@ -228,7 +230,7 @@
           page: this.pagerOptions.currPage,
           pageSize: this.pagerOptions.pageSize
         }).then((res) => {
-          if (res.code === 200) {
+          if (res.code === 200&&res.data) {
             res.data.map((item)=>{
                 if(item.status===""){
                   item.status=4
@@ -237,9 +239,11 @@
                 let formattedDateString = dateObject.toISOString().split('T')[0];  
                 item.date=formattedDateString
             })
-            this.tableList.tableInfomation = res.data?res.data:[]
-            this.pagerOptions.totalCount = res.total
+            this.tableList.tableInfomation = res.data||[]
+          }else{
+            this.tableList.tableInfomation = res.data||[]
           }
+          this.pagerOptions.totalCount = res.total
         })
       }
     },

--
Gitblit v1.8.0