Browse Source

Merge branch 'feature/dev_point_manage'

master
wanggongfeng 3 years ago
parent
commit
88c1c1f5d9
  1. 12
      src/views/modules/plugins/point/icpointnucleicmonitoring.vue
  2. 9
      src/views/modules/plugins/point/icpointvaccinesinoculation.vue

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

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

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

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

Loading…
Cancel
Save