Merge remote-tracking branch 'origin/otherChange' into zhairh

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 = {

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) {

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("请先选择第三方系统！")