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

src/views/purchase/supCertAudit.vue

@@ -86,6 +86,7 @@
             </el-table>
             <el-pagination
                 :page-size="filterQuery.limit"
+                :current-page="filterQuery.page"
                 :current-page.sync="filterQuery.page"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
@@ -187,6 +188,7 @@
             </el-table>
             <el-pagination
                 :page-size="filterManufacturerQuery.limit"
+                :current-page="filterManufacturerQuery.page"
                 :current-page.sync="filterManufacturerQuery.page"
                 @current-change="handleManuChange"
                 layout="prev, pager, next"
@@ -293,6 +295,7 @@
             </el-table>
             <el-pagination
                 :page-size="registrationQuery.limit"
+                :current-page="registrationQuery.page"
                 :current-page.sync="registrationQuery.page"
                 @current-change="certHandleCurrentChange"
                 layout="prev, pager, next"
@@ -473,7 +476,6 @@ export default {
             this.loading = true;
             getSupComapnys(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
@@ -560,7 +562,7 @@ export default {
                 .catch(() => {
                     this.manufacturerLoading = false;
                     this.manufacturerList = [];
-                    this.total = 0;
+                    this.manufacturerTotal = 0;
                 });
         },
         addInfoDialog(row) {
@@ -577,7 +579,7 @@ export default {
             this.addInfoVisible = true;
         },
         closeManufacturerDialog(type) {
-           
+
            if(type==true){
             this.addInfoVisible = false;
             this.enterpriseId = null;
@@ -646,12 +648,13 @@ export default {
                 .then((response) => {
                     this.registrationLoading = false;
                     this.registrationList = response.data.list || [];
-                    this.certTotal= response.data.total
+                    this.certTotal = response.data.total
 
                 })
                 .catch(() => {
                     this.registrationLoading = false;
                     this.registrationList = [];
+                    this.certTotal = 0;
                 });
         },
         certHandleCurrentChange(val) {