From 89ed9f5e5624b5b1383192ffafcb31f1a7d527d5 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 19 十月 2023 11:31:10 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style

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

diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 6b5f827..965c592 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -86,7 +86,7 @@
 import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"
 
 export default {
-  name: "InboundOutboundDetail",
+  name: "inventoryReport",
   props: {},
   components: { AddOverviewDialog },
   mixins: [pageMixin],
@@ -277,7 +277,7 @@
     getList(val) {
       this.searchStr = val
       this.getInventoryData({
-        page: this.pagerOptions.currPage,
+        page: 1,
         pageSize: this.pagerOptions.pageSize,
         keyWord: val
       })
@@ -304,7 +304,10 @@
       this.$router.push({
         name: "inboundOutboundDetail",
         params: {
-          id: row.produceId,
+          keyWord:row.productType,
+          produceId:row.produceId,
+          unit:row.unit,
+          productName:row.productName,
           name: "鎶ヨ〃"
         }
       })
@@ -315,8 +318,15 @@
       console.log(row)
     },
     // 浣嶇疆
-    handleLocation() {
-      this.$router.push("/reportForm/locationReport")
+    handleLocation(row) {
+      console.log(row,"rowwww")
+      this.$router.push({
+        name:"locationReport",
+        params:{
+          keyWord:row.row.productName,
+          name:"搴撳瓨鎶ヨ〃"
+        }
+      })
     },
     // 棰勬祴
     handleForecast() {},

--
Gitblit v1.8.0