Merge remote-tracking branch 'origin/dev' into dev

2 years ago · 33470f3cac
parent 5112f49d2f 1d9a3a9c31
commit 33470f3cac
2 changed files with 6 additions and 0 deletions
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@ -526,6 +526,7 @@ export default {
        });
    },
    onSubmit() {
+      this.filterQuery.page=1;
      this.getList();
    },
    editCompany(row) {
@ -596,6 +597,7 @@ export default {
      this.getManufacturerList();
    },
    onManufacturerSubmit() {
+      this.filterManufacturerQuery.page=1;
      //this.onManufacturerReset();
      this.getManufacturerList();
      this.addInfoVisible = false;
@ -675,6 +677,7 @@ export default {
      this.getRegistrationList();
    },
    onSubmit2() {
+      this.registrationQuery.page=1;
      this.getRegistrationList();
    },
    hideSearch3() {
--- a/src/views/purchase/cert/supCertSearch.vue
+++ b/src/views/purchase/cert/supCertSearch.vue
@ -410,6 +410,7 @@ export default {
                });
        },
        onSubmit() {
+            this.filterQuery.page = 1;
            this.getList();
        },
        editCompany(row) {
@ -474,6 +475,7 @@ export default {
          this.showSearch1 = !this.showSearch1;
        },
        onManufacturerSubmit() {
+            this.filterManufacturerQuery.page=1;
            this.manufacturerList = [];
            this.getManufacturerList();
        },
@ -542,6 +544,7 @@ export default {
            this.getRegistrationList();
        },
        onSubmit2() {
+            this.registrationQuery.page=1;
            this.getRegistrationList();
        },
        hideSearch2() {