From ad58a283d7a2c5573880b30d8044906e659564cd Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 30 Aug 2022 14:52:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=9C=AA=E6=B7=BB=E5=8A=A0=E5=88=86=E5=BA=93=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/DialogInvProduct.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index 0aad9db..0c061b4 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -115,6 +115,7 @@ export default {
                 supId: null,
                 unitFk: null,
                 invStorageCode: null,
+                invWarehouseCode: null
             },
             list: [],
             codeDetailVisible: false,
@@ -320,6 +321,7 @@ export default {
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
+        this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
         this.filterQuery = Object.assign(this.filterQuery, query);
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
         if (!isBlank(this.invQueryData.corpId)) {

From 269a2edb111dd5df313adb0d425813f45eb4d1d1 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 30 Aug 2022 20:12:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9C=AA?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=A1=B5=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thrsys/ThrOrdedrReceiveAdd.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
index b43dcd1..4169367 100644
--- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue
+++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue
@@ -52,7 +52,7 @@
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="search">查询</el-button>
                             <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
                                 新增订单
                             </el-button>
@@ -228,7 +228,10 @@ export default {
             this.actDateRange = [];
             this.getList();
         },
-
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
         getList() {
             if (this.filterQuery.thirdSysFk == null) {
                 this.$message.warning("请先选择第三方系统！")