From 0e16c65c33ac7e326a44d041eb0b6175441752a0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 8 Jan 2023 10:12:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thrsys/ThrInvWarehouse.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index a7ecdc8..4f918f5 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -382,6 +382,7 @@ export default {
         handleCurrentChange(val) {
             this.query.page = val;
             this.getList();
+            this.query.page=null;
         },
 
         handInvCurrentChange(row) {

From 1f3a5a194e8443598be852073d290dc8e62763f5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 8 Jan 2023 15:29:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/thrsys/ThrProductsCheck.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/thrsys/ThrProductsCheck.vue b/src/views/thrsys/ThrProductsCheck.vue
index b20124f..e8c009f 100644
--- a/src/views/thrsys/ThrProductsCheck.vue
+++ b/src/views/thrsys/ThrProductsCheck.vue
@@ -173,7 +173,7 @@
                 </el-form-item>
 
                 <el-form-item>
-                    <el-button @click="checkVisible = false">取消</el-button>
+                    <el-button @click="checkVisible1">取消</el-button>
                     <el-button type="primary" @click="checkPass(2)">通过</el-button>
                     <el-button type="primary" @click="checkPass(3)">不通过</el-button>
                 </el-form-item>
@@ -257,6 +257,11 @@ export default {
             this.filterQuery.page = 1;
             this.getList();
         },
+        checkVisible1(){
+            this.checkVisible = false;
+            this.remark=''
+        },
+
         getList() {
             if (this.filterQuery.thirdSys == null) {
                 this.$message.warning("请先选择第三方系统！")

From 179c45c11bf29ba660e9863a8131b2ac6e7874bf Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 8 Jan 2023 16:56:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/CorpMaintain.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue
index 38a2775..bca4d38 100644
--- a/src/views/basic/CorpMaintain.vue
+++ b/src/views/basic/CorpMaintain.vue
@@ -417,9 +417,6 @@ export default {
             this.getList();
         },
         getList() {
-                if(this.query.key!=null){
-                    this.query.page=1
-                }
             this.loading = true;
             this.erpIdColumn = false;
             this.thirdIdColumn = false;
@@ -630,6 +627,7 @@ export default {
         handleCurrentChange(val) {
             this.query.page = val;
             this.getList();
+            this.query.page =''
         },
         getBasicThirdSys() {
             let query = {