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

src/views/thrsys/ThrCorps.vue

@@ -114,7 +114,9 @@ export default {
         },
 
         getList() {
-
+                if(!(this.filterQuery.unitId==null || this.filterQuery.name==null || this.filterQuery.thirdSys==null)){
+                    this.filterQuery.page=1
+                }
 
             if (this.filterQuery.thirdSys == null) {
                 this.$message.warning("请先选择第三方系统！")

src/views/thrsys/ThrInvWarehouse.vue

@@ -411,6 +411,8 @@ export default {
             this.query = {
                 name: "",
                 status: "",
+                page:1,
+                limit:20,
                 thirdSysFk: null
             };
             this.getList();
@@ -419,6 +421,9 @@ export default {
             this.getList();
         },
         getList() {
+            if(this.query.key!=null || this.query.advanceType!=null || this.query.thirdSysFk!=null){
+                this.query.page=1
+            }
             this.loading = true;
             if (this.query.thirdSysFk != null) {
                 this.getQueryThirdSysFk(this.query.thirdSysFk);