From ae760880186edef869f91e3ee97dee5788aab464 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 19 十月 2023 17:53:53 +0800
Subject: [PATCH] bug修复(5316 5317)

---
 src/views/reportForm/inventoryReport/index.vue |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 6b5f827..dc8e4fa 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],
@@ -217,42 +217,48 @@
           label: "鍗曚綅鎴愭湰",
           prop: "cost",
           default: false,
-          isShowColumn: showcol.includes("鍗曚綅鎴愭湰")
+          isShowColumn: showcol.includes("鍗曚綅鎴愭湰"),
+          textAlign:"left"
         },
         {
           label: "鎬讳环鍊�",
           prop: "value",
           default: false,
           isShowColumn: showcol.includes("鎬讳环鍊�"),
-          unit: "锟�"
+          unit: "锟�",
+          textAlign:"left"
         },
         {
           label: "鍦ㄥ簱",
           prop: "amount",
           default: true,
           isShowColumn: true,
-          unit: ""
+          unit: "",
+          textAlign:"left"
         },
         {
           label: "鍙敤搴撳瓨",
           prop: "availableNumber",
           default: true,
           isShowColumn: true,
-          unit: ""
+          unit: "",
+          textAlign:"left"
         },
         {
           label: "鍏ュ簱",
           prop: "in",
           default: false,
           isShowColumn: showcol.includes("鍏ュ簱"),
-          unit: ""
+          unit: "",
+          textAlign:"left"
         },
         {
           label: "鍑哄簱",
           prop: "out",
           isShowColumn: showcol.includes("鍑哄簱"),
           default: false,
-          unit: ""
+          unit: "",
+          textAlign:"left"
         },
         {
           label: "棰勬祴",
@@ -277,7 +283,7 @@
     getList(val) {
       this.searchStr = val
       this.getInventoryData({
-        page: this.pagerOptions.currPage,
+        page: 1,
         pageSize: this.pagerOptions.pageSize,
         keyWord: val
       })
@@ -304,7 +310,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 +324,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() {},
@@ -409,4 +425,5 @@
     flex: 1;
   }
 }
+
 </style>

--
Gitblit v1.8.0