Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

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

@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="loadTable()"
       >
         <el-form-item label="所属组织名称" prop="orgName" label-width="130px">
           <el-cascader
@@ -36,7 +36,7 @@
           <el-button
             class="diy-button--search"
             size="small"
-            @click="getDataList()"
+            @click="loadTable()"
             >{{ $t("query") }}</el-button
           >
         </el-form-item>
@@ -208,7 +208,7 @@
     >
       <add-or-update
         ref="addOrUpdate"
-        @refreshDataList="getDataList"
+        @refreshDataList="loadTable"
         @closeDialog="closeDialog"
         :dialogTitle="dialogTitle"
       ></add-or-update>
@@ -238,7 +238,7 @@
 import mixinViewModule from "@/mixins/view-module";
 import AddOrUpdate from "./icpointnucleicmonitoring-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() {
@@ -265,6 +265,7 @@ export default {
     icpointNoice,
   },
   created() {
+    this.loadTable()
     this.noticeFun();
     this.getFormInfo();
   },
@@ -275,6 +276,7 @@ export default {
       let params = {
         limit: this.pageSize,
         page: this.pageNo,
+        ...this.dataForm
       };
       const { data, code, msg } = await requestGet(url, params);
 
@@ -319,7 +321,7 @@ export default {
           type: "success",
           message: "删除成功",
         });
-        this.getDataList();
+        this.loadTable();
       } else {
         this.$message.error(msg);
       }

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

@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="loadTable()"
       >
         <el-form-item label="疫苗接种点名称" prop="name">
           <el-input
@@ -24,7 +24,7 @@
           <el-button
             class="diy-button--search"
             size="small"
-            @click="getDataList()"
+            @click="loadTable()"
             >{{ $t("query") }}</el-button
           >
         </el-form-item>
@@ -220,7 +220,7 @@
     >
       <add-or-update
         ref="addOrUpdate"
-        @refreshDataList="getDataList"
+        @refreshDataList="loadTable"
         @closeDialog="closeDialog"
         :dialogTitle="dialogTitle"
       ></add-or-update>
@@ -285,6 +285,7 @@ export default {
       let params = {
         limit: this.pageSize,
         page: this.pageNo,
+        ...this.dataForm
       };
       const { data, code, msg } = await requestGet(url, params);
       
@@ -329,7 +330,7 @@ export default {
           type: "success",
           message: "删除成功",
         });
-        this.getDataList();
+        this.loadTable();
       } else {
         this.$message.error(msg);
       }