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 |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index b7f5122..fe60a74 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -23,14 +23,18 @@
         <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
       </div>
     </div>
-    <!-- 缂栬緫 -->
-    <AddOverviewDialog v-if="editConfig.visible" :edit-common-config="editConfig" :add-name="this.$route.params.name" />
+    <!-- 鏌ョ湅/缂栬緫 -->
+    <AddOverviewDialog 
+      v-if="editConfig.visible" 
+      :edit-common-config="editConfig" 
+      :add-name="this.$route.params.name"
+    />
   </div>
 </template>
 
 <script>
 import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getHistory } from "@/api/reportForm/inventoryRwport"
+import { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
 // import { getProductOperatonList } from "@/api/product/product"
 
 import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
@@ -126,11 +130,11 @@
         },
         {
           label: "涓氬姟绫诲瀷",
-          prop: "baseOperationType",
+          prop: "operationTypeName",
           isShowColumn: true,
           default: true,
-          conversion: true,
-          getStatus: this.getBaseOperationTypeList
+          // conversion: true,
+          // getStatus: this.getBaseOperationTypeList
         },
         {
           label: "浠�",
@@ -207,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({
@@ -224,15 +230,20 @@
           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
+                }
                 let dateObject = new Date(item.date);  
                 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
         })
       }
     },
@@ -242,10 +253,12 @@
       this.getData()
     },
     // 琛岀偣鍑�
-    tableRowClick(row) {
+    async tableRowClick(row) {
+      await getOperationInfo(row.operationId).then((res)=>{
+        this.editConfig.infomation = { ...res.data }
+      })
       this.editConfig.visible = true
       this.editConfig.title = "鏌ョ湅"
-      this.editConfig.infomation = { ...row }
     },
     // 鏂板缓
     addBtnClick() {
@@ -254,7 +267,7 @@
     },
     // 鐘舵��
     getStatus(val) {
-      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
+      return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : val===4?"瀹屾垚":val===5?"宸插彇娑�":" "
     }
   }
 }

--
Gitblit v1.8.0