From b1137eec45438c70709a49dfed178931a13dd2c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 26 Dec 2022 11:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AA=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BB=93=E5=BA=93=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvProducts.vue         | 31 ++++++-------
 src/views/inventory/InvStatistics.vue       | 43 +++++++----------
 src/views/warehouse/stockOrderInvSearch.vue | 51 ++++++++-------------
 3 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index fa8c97d..ce2efa9 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -49,21 +49,21 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+<!--                                   @change="invChange"-->
+<!--                                   size="mini">-->
+<!--                            <el-option-->
+<!--                                v-for="item in storageList"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.code">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange"
-                                   size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    :disabled="invWarehouseDisabled"
                                    size="mini">
                             <el-option
@@ -367,7 +367,7 @@ export default {
             if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
                 this.invWarehouseDisabled = false;
                 let query = {
-                    pcode: this.filterQuery.invStorageCode
+                    filter: 3,
                 };
                 filterSubByInv(query)
                     .then((response) => {
@@ -407,7 +407,6 @@ export default {
         };
     },
     created() {
-        this.getStorage();
         this.findMethod();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 4848c7a..4e48650 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -49,20 +49,20 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+<!--                                   @change="invChange" size="mini">-->
+<!--                            <el-option-->
+<!--                                v-for="item in storageList"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.code">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange" size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -320,21 +320,10 @@ export default {
                 }
             }
         },
-        getStorage() {
-            this.storageList = [];
-            filterUplLocInv()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-        invChange() {
-            // this.$set(this.filterQuery, "entrustUser", "");
-            this.filterQuery.invWarehouseCode = "";
+        getSubInvList() {
             this.subInvList = [];
             let query = {
-                pcode: this.filterQuery.invStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -367,7 +356,7 @@ export default {
         this.loading = true;
         this.getList();
         this.findStorageCode();
-        this.getStorage();
+        this.getSubInvList();
     },
 };
 </script>
diff --git a/src/views/warehouse/stockOrderInvSearch.vue b/src/views/warehouse/stockOrderInvSearch.vue
index d8fcee0..77af4b5 100644
--- a/src/views/warehouse/stockOrderInvSearch.vue
+++ b/src/views/warehouse/stockOrderInvSearch.vue
@@ -26,21 +26,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="query.locStorageCode"-->
+<!--                                   @change="invChange"-->
+<!--                                   placeholder="请选择当前仓库" clearable="true" size="mini">-->
+<!--                            <el-option-->
+<!--                                v-for="item in storageList"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.code">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange"
                         >
@@ -825,25 +825,10 @@ export default {
                 }
             }
         },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList.length > 0) {
-                        this.getSubInvList();
-                        this.getList();
-                    }
-                })
-                .catch(() => {
-                });
-        },
-
         invChange() {
-            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
-                pcode: this.query.locStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -855,11 +840,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
+
                 })
                 .catch(() => {
                 });
@@ -936,7 +923,7 @@ export default {
         }
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();