From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token

---
 src/views/reportForm/inventoryReport/index.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 8446864..eaef51d 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -331,7 +331,9 @@
       this.$router.push({
         name:"locationReport",
         params:{
-          keyWord:row.row.productName,
+          // keyWord:row.row.productName,
+          wareHouseCode:this.warehouseListName,
+          productId:row.row.produceId,
           name:"搴撳瓨鎶ヨ〃"
         }
       })
@@ -397,8 +399,8 @@
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       }).then((res) => {
-        if (res.data.code === 200) {
-          this.warehouseList = res.data.data
+        if (res.code === 200) {
+          this.warehouseList = res.data
         }
       })
     }

--
Gitblit v1.8.0