Merge branch 'feature/dev_point_manage'

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"
+      <el-pagination
-                       @current-change="pageCurrentChangeHandle"
+        @size-change="handleSizeChange"
-                       :page-sizes="[20, 50, 100, 200]"
+        @current-change="handleCurrentChange"
-                       :page-size="limit"
+        :current-page.sync="pageNo"
-                       layout="sizes, prev, pager, next, total"
+        :page-sizes="[20, 50, 100, 200]"
-                       :total="total">
+        :page-size="pageSize"
-        </el-pagination>
+        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: "确定",

src/views/modules/plugins/point/icpointvaccinesinoculation.vue

@@ -102,8 +102,8 @@
         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"
+        style="width: 100%; height: 564px;overflow: auto;"
       >
         <el-table-column
           label="序号"
@@ -202,13 +202,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="pageSizeChangeHandle"
+      <el-pagination
-                       @current-change="pageCurrentChangeHandle"
+        @size-change="handleSizeChange"
-                       :page-sizes="[20, 50, 100, 200]"
+        @current-change="handleCurrentChange"
-                       :page-size="limit"
+        :current-page.sync="pageNo"
-                       layout="sizes, prev, pager, next, total"
+        :page-sizes="[20, 50, 100, 200]"
-                       :total="total">
+        :page-size="pageSize"
-        </el-pagination>
+        layout="sizes, prev, pager, next, total"
+        :total="total"
+      >
+      </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <el-dialog
@@ -253,17 +256,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: "",
@@ -273,6 +270,9 @@ export default {
       noticeVisible: false,
       noticeOrigin: "4",
       dialogTitle: "",
+      pageSize: 20,
+      pageNo: 0,
+      total: 0,
     };
   },
   components: {
@@ -280,9 +280,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: "确定",