From e36ededcba423897fa404794624a0edf541c8085 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 30 Jun 2022 19:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9Cfix:=E7=A7=80=E9=98=BF=E8=B4=B5?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/icpointnucleicmonitoring.vue        | 56 ++++++++++++-----
 .../point/icpointvaccinesinoculation.vue      | 60 ++++++++++++++-----
 2 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index dc9a9d1a..e9bf84f9 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -112,7 +112,7 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
-        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
         style="width: 100%; height: 564px"
         ><el-table-column
           label="序号"
@@ -184,13 +184,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="pageSizeChangeHandle"
-                       @current-change="pageCurrentChangeHandle"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="limit"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="pageNo"
+        :page-sizes="[20, 50, 100, 200]"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, total"
+        :total="total"
+      >
+      </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -240,13 +243,6 @@ export default {
   mixins: [mixinViewModule],
   data() {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: "/epmetuser/icPointNucleicMonitoring/page",
-        getDataListIsPage: true,
-        deleteURL: "/epmetuser/icPointNucleicMonitoring",
-        deleteIsBatch: true,
-        // exportURL: '/epmetuser/icPointNucleicMonitoring/export'
-      },
       dataForm: {
         name: "",
         mobile: "",
@@ -258,6 +254,9 @@ export default {
       sendNoticeFormShow: false,
       noticeVisible: false,
       noticeOrigin: "3",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
     };
   },
   components: {
@@ -269,6 +268,33 @@ export default {
     this.getFormInfo();
   },
   methods: {
+    async loadTable() {
+      this.dataListLoading = true;
+      const url = "/epmetuser/icPointNucleicMonitoring/page";
+      let params = {
+        limit: this.pageSize,
+        page: this.pageNo,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        console.log(data.list);
+        this.dataList = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+      this.dataListLoading = false;
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
     async handleDelete(id) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 1e543d11..d8c3c7db 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -102,8 +102,8 @@
         v-loading="dataListLoading"
         :data="dataList"
         border
-        :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-        style="width: 100%; height: 564px"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+        style="width: 100%; height: 564px;overflow: auto;"
       >
         <el-table-column
           label="序号"
@@ -200,13 +200,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="pageSizeChangeHandle"
-                       @current-change="pageCurrentChangeHandle"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="limit"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page.sync="pageNo"
+        :page-sizes="[20, 50, 100, 200]"
+        :page-size="pageSize"
+        layout="sizes, prev, pager, next, total"
+        :total="total"
+      >
+      </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -251,17 +254,11 @@
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointvaccinesinoculation-add-or-update";
 import icpointNoice from "./icpointNoice";
-import { requestPost } from "@/js/dai/request";
+import { requestPost , requestGet} from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
   data() {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: "/epmetuser/icPointVaccinesInoculation/page",
-        getDataListIsPage: true,
-        deleteURL: "/epmetuser/icPointVaccinesInoculation",
-        deleteIsBatch: true,
-      },
       dataForm: {
         name: "",
         mobile: "",
@@ -271,6 +268,9 @@ export default {
       noticeVisible: false,
       noticeOrigin: "4",
       dialogTitle: "",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
     };
   },
   components: {
@@ -278,9 +278,37 @@ export default {
     icpointNoice,
   },
   mounted() {
+    this.loadTable();
     this.noticeFun();
   },
   methods: {
+    async loadTable() {
+      this.dataListLoading = true;
+      const url = "/epmetuser/icPointVaccinesInoculation/page";
+      let params = {
+        limit: this.pageSize,
+        page: this.pageNo,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+      
+      if (code === 0) {
+        console.log(data.list);
+        this.dataList = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
+      this.dataListLoading = false;
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
     async handleDelete(id) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",