From a9cabedd5b3cd67a4ee5da0c8276e6906de64fc6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 3 Jan 2023 20:28:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=B5=84=E8=B4=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/assetManage.vue  |  2 +-
 src/views/purchase/supCertSearch.vue | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/inventory/assetManage.vue b/src/views/inventory/assetManage.vue
index 19f70a9..259d5f3 100644
--- a/src/views/inventory/assetManage.vue
+++ b/src/views/inventory/assetManage.vue
@@ -33,7 +33,7 @@
                 <el-table-column label="设备编号" prop="code" width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="产品DI" prop="nameCode" width="180"></el-table-column>
                 <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
-                <el-table-column label="失效日期" prop="exipreDate" width="180"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate" width="180"></el-table-column>
                 <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
                 <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
diff --git a/src/views/purchase/supCertSearch.vue b/src/views/purchase/supCertSearch.vue
index 122e5e1..b715320 100644
--- a/src/views/purchase/supCertSearch.vue
+++ b/src/views/purchase/supCertSearch.vue
@@ -87,6 +87,7 @@
             </el-table>
             <el-pagination
                 :page-size="filterQuery.limit"
+                :current-page="filterQuery.page"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
@@ -187,6 +188,7 @@
             </el-table>
             <el-pagination
                 :page-size="filterManufacturerQuery.limit"
+                :current-page="filterManufacturerQuery.page"
                 @current-change="handleManuChange"
                 layout="prev, pager, next"
                 :total="manufacturerTotal"
@@ -292,6 +294,7 @@
             </el-table>
             <el-pagination
                 :page-size="registrationQuery.limit"
+                :current-page="registrationQuery.page"
                 @current-change="certHandleCurrentChange"
                 layout="prev, pager, next"
                 :total="certTotal"
@@ -468,11 +471,8 @@ export default {
         },
         getList() {
             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;
@@ -554,12 +554,12 @@ export default {
                 .then((response) => {
                     this.manufacturerLoading = false;
                     this.manufacturerList = response.data.list || [];
-                    this.total = response.data.total || 0;
+                    this.manufacturerTotal = response.data.total || 0;
                 })
                 .catch(() => {
                     this.manufacturerLoading = false;
                     this.manufacturerList = [];
-                    this.total = 0;
+                    this.manufacturerTotal = 0;
                 });
         },
         addInfoDialog(row) {
@@ -640,15 +640,17 @@ export default {
                 .then((response) => {
                     this.registrationLoading = false;
                     this.registrationList = response.data.list || [];
+                    this.certTotal = response.data.total || 0;
                 })
                 .catch(() => {
                     this.registrationLoading = false;
                     this.registrationList = [];
+                    this.certTotal = 0;
                 });
         },
         certHandleCurrentChange(val) {
             this.registrationQuery.page = val;
-            this.registrationList();
+            this.getRegistrationList();
         }
 
     },