From f16c444ad4d0478fa73c7005d7e94b551963769b Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 13 十一月 2023 14:48:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

---
 src/views/reportForm/inventoryReport/index.vue |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index ec39be9..9198a5c 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -34,7 +34,7 @@
           <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">
             {{ item.name }}
           </el-checkbox>
-          </el-checkbox-group>
+        </el-checkbox-group>
       </div>
       <div class="list-view">
         <div class="table">
@@ -52,8 +52,7 @@
                     <i class="el-icon-refresh-left"></i>
                     <span>鍘嗗彶</span>
                   </span>
-                  <span @click="handleAddGoods(scope.row)" class="margin_left_5px;" style="cursor:pointer;"
-                  >
+                  <span @click="handleAddGoods(scope.row)" class="margin_left_5px;" style="cursor: pointer">
                     <i class="el-icon-refresh"></i>
                     <span>琛ヨ揣</span>
                   </span>
@@ -149,7 +148,7 @@
       pageSizes: [15, 30],
       oldRadioBtn: "",
       metaTitle: this.$route.meta.title,
-      searchStr: this.$route.params.name ?? ''
+      searchStr: this.$route.params.name ?? ""
     }
   },
   created() {
@@ -221,7 +220,7 @@
           prop: "cost",
           default: false,
           isShowColumn: showcol.includes("鍗曚綅鎴愭湰"),
-          textAlign:"right"
+          textAlign: "right"
         },
         {
           label: "鎬讳环鍊�",
@@ -229,7 +228,7 @@
           default: false,
           isShowColumn: showcol.includes("鎬讳环鍊�"),
           unit: "锟�",
-          textAlign:"right"
+          textAlign: "right"
         },
         {
           label: "鍦ㄥ簱",
@@ -237,7 +236,7 @@
           default: true,
           isShowColumn: true,
           unit: "",
-          textAlign:"right"
+          textAlign: "right"
         },
         {
           label: "鍙敤搴撳瓨",
@@ -245,7 +244,7 @@
           default: true,
           isShowColumn: true,
           unit: "",
-          textAlign:"right"
+          textAlign: "right"
         },
         {
           label: "鍏ュ簱",
@@ -253,7 +252,7 @@
           default: false,
           isShowColumn: showcol.includes("鍏ュ簱"),
           unit: "",
-          textAlign:"right"
+          textAlign: "right"
         },
         {
           label: "鍑哄簱",
@@ -261,7 +260,7 @@
           isShowColumn: showcol.includes("鍑哄簱"),
           default: false,
           unit: "",
-          textAlign:"right"
+          textAlign: "right"
         },
         {
           label: "棰勬祴",
@@ -285,11 +284,7 @@
     },
     getList(val) {
       this.searchStr = val
-      this.getInventoryData({
-        page: 1,
-        pageSize: this.pagerOptions.pageSize,
-        keyWord: val
-      })
+      this.getData()
     },
     // 琛岀偣鍑�
     tableRowClick(row) {
@@ -313,10 +308,10 @@
       this.$router.push({
         name: "inboundOutboundDetail",
         params: {
-          keyWord:row.productType,
-          produceId:row.produceId,
-          unit:row.unit,
-          productName:row.productName,
+          keyWord: row.productType,
+          produceId: row.produceId,
+          unit: row.unit,
+          productName: row.productName,
           name: "鎶ヨ〃"
         }
       })
@@ -327,19 +322,19 @@
       this.$router.push({
         name: "orderPoint",
         params: {
-          productId:row.produceId,
+          productId: row.produceId
         }
       })
     },
     // 浣嶇疆
     handleLocation(row) {
       this.$router.push({
-        name:"locationReport",
-        params:{
+        name: "locationReport",
+        params: {
           // keyWord:row.row.productName,
-          wareHouseCode:this.warehouseListName,
-          productId:row.row.produceId,
-          name:"搴撳瓨鎶ヨ〃"
+          wareHouseCode: this.warehouseListName,
+          productId: row.row.produceId,
+          name: "搴撳瓨鎶ヨ〃"
         }
       })
     },
@@ -422,7 +417,7 @@
   .con_left {
     width: 200px;
     .el-checkbox-group {
-      width:100%;
+      width: 100%;
       display: flex;
       flex-direction: column;
     }
@@ -448,5 +443,4 @@
     white-space: pre-wrap !important;
   }
 }
-
 </style>

--
Gitblit v1.8.0