From 509a4e5f323fa2f6595d3859696379ad29431631 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 9 May 2022 10:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/antiInfo.vue | 389 +++++---- .../base/epidemic/natFocus/natFocusList.vue | 14 +- src/views/modules/base/epidemic/vaccin.vue | 484 +++++------- .../base/epidemic/veroFocus/veroFocusList.vue | 743 ++++++++---------- 4 files changed, 723 insertions(+), 907 deletions(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 524f139d..dc93596d 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -1,6 +1,7 @@ @@ -528,13 +511,13 @@ export default { natCount: '' }, formDetail: { - name: '', - gridName: '', - houseName: '', - mobile: '', - idCard: '', - vaccineCount: '', - natCount: '' + name: '', + gridName: '', + houseName: '', + mobile: '', + idCard: '', + vaccineCount: '', + natCount: '' }, vaccineList: [], // 疫苗接种 natList: [], // 核酸检测 @@ -573,7 +556,7 @@ export default { }, methods: { - handleCnalceForm() { + handleCnalceForm () { this.$refs.detail_form.resetFields() this.vaccineList = [] this.natList = [] @@ -585,21 +568,21 @@ export default { handleSearch () { this.loadTable() }, - handleClearVillage() { + handleClearVillage () { this.searchForm.buildingId = '' this.searchForm.unitId = '' this.searchForm.houseId = '' }, - handleClearBuild() { + handleClearBuild () { this.searchForm.buildingId = '' this.searchForm.unitId = '' this.searchForm.houseId = '' }, - handleClearDan() { + handleClearDan () { this.searchForm.unitId = '' this.searchForm.houseId = '' }, - handleChangeGrid(val) { + handleChangeGrid (val) { console.log('val', val) this.searchForm.neighborId = '' this.searchForm.buildingId = '' @@ -607,25 +590,25 @@ export default { this.searchForm.houseId = '' this.getValiheList() }, - handleChangeV(val) { + handleChangeV (val) { console.log('val', val) this.searchForm.buildingId = '' this.searchForm.unitId = '' this.searchForm.houseId = '' this.getBuildList() }, - handleChangeB(val) { + handleChangeB (val) { console.log('val', val) this.searchForm.unitId = '' this.searchForm.houseId = '' this.getUniList() }, - handleChangeD(val) { + handleChangeD (val) { console.log('val', val) this.searchForm.houseId = '' this.getHouseList() }, - getGridList() { + getGridList () { const { user } = this.$store.state this.$http .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' }) @@ -641,7 +624,7 @@ export default { return this.$message.error('网络错误') }) }, - getValiheList() { + getValiheList () { const { user } = this.$store.state this.$http .post('/gov/org/icneighborhood/neighborhoodoption', { @@ -661,7 +644,7 @@ export default { return this.$message.error('网络错误') }) }, - getBuildList() { + getBuildList () { this.$http .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.searchForm.neighborId @@ -678,7 +661,7 @@ export default { return this.$message.error('网络错误') }) }, - getUniList() { + getUniList () { this.$http .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.searchForm.buildingId @@ -695,7 +678,7 @@ export default { return this.$message.error('网络错误') }) }, - getHouseList() { + getHouseList () { this.$http .post('/gov/org/ichouse/houseoption', { unitId: this.searchForm.unitId }) .then(({ data: res }) => { @@ -780,7 +763,7 @@ export default { async handleDetail (row) { - + await this.getDetailInfo(row.id) await this.getDetailList(row.id) this.formTitle = '详情' @@ -884,22 +867,22 @@ export default { @import "@/assets/scss/modules/management/epidemic.scss"; .resi-cell-select { - width: 170px; - box-sizing: border-box; - margin-right: 10px; - &-middle { - width: 130px; - } - &-small { - width: 88px; - } - } - .resi-cell-select:last-child { - margin-right: 0; + width: 170px; + box-sizing: border-box; + margin-right: 10px; + &-middle { + width: 130px; } - .min-w180 { - min-width: 170px; + &-small { + width: 88px; } +} +.resi-cell-select:last-child { + margin-right: 0; +} +.min-w180 { + min-width: 170px; +} diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 8d7fbc47..917b9723 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -670,23 +670,23 @@ export default { }) }, - async handleEdit(row) { + async handleEdit (row) { this.editFormTitle = "修改核酸检测关注名单"; this.editFormShow = true; - - let row2 = await this.getInfo(row); + let rowTem = JSON.parse(JSON.stringify(row)) + let row2 = await this.getInfo(rowTem); this.$refs.ref_form_edit.initForm("edit", row2); }, - async handleDetail(row) { + async handleDetail (row) { this.editFormTitle = "查看核酸检测关注名单"; this.editFormShow = true; - - let row2 = await this.getInfo(row); + let rowTem = JSON.parse(JSON.stringify(row)) + let row2 = await this.getInfo(rowTem); this.$refs.ref_form_edit.initForm("detail", row2); }, - async getInfo(row) { + async getInfo (row) { const url = "/epmetuser/icEpidemicSpecialAttention/detail"; let params = { diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue index 87d99e65..44b7ae5a 100644 --- a/src/views/modules/base/epidemic/vaccin.vue +++ b/src/views/modules/base/epidemic/vaccin.vue @@ -1,110 +1,91 @@ @@ -314,7 +249,7 @@ import { Loading } from "element-ui"; // 引入Loading服务 let loading; // 加载动画 export default { - data() { + data () { return { loading: false, total: 0, @@ -367,8 +302,8 @@ export default { vaccinForm, natForm, }, - async created() {}, - async mounted() { + async created () { }, + async mounted () { //获取场所类型 const { user } = this.$store.state; @@ -378,7 +313,7 @@ export default { }, methods: { - async handleSearch() { + async handleSearch () { this.isResiUser = this.formData.searchType === "current"; await this.loadTable(); @@ -388,7 +323,7 @@ export default { }); }, - async loadTable() { + async loadTable () { this.tableLoading = true; const url = "/epmetuser/icVaccine/vaccine-list"; @@ -421,7 +356,7 @@ export default { this.tableLoading = false; }, - handleTimeChange(time) { + handleTimeChange (time) { if (time) { this.formData.startTime = time[0]; this.formData.endTime = time[1]; @@ -431,19 +366,20 @@ export default { } }, - diaClose() { + diaClose () { this.$refs.ref_form.resetData(); this.formShow = false; }, - async handleDetail(row) { + async handleDetail (row) { this.formTitle = "详情"; this.formShow = true; - let row2 = await this.getInfo(row); + let rowTem = JSON.parse(JSON.stringify(row)) + let row2 = await this.getInfo(rowTem); this.$refs.ref_form.initForm("detail", row2); }, - handleAdd() { + handleAdd () { this.formTitle = "新增"; this.formShow = true; this.$nextTick(() => { @@ -451,7 +387,7 @@ export default { }); }, - handleEdit(row) { + handleEdit (row) { this.formTitle = "修改"; this.formShow = true; this.$nextTick(() => { @@ -459,12 +395,12 @@ export default { }); }, - addFormOk() { + addFormOk () { this.formShow = false; this.loadTable(); }, - async getInfo(row) { + async getInfo (row) { const url = "/epmetuser/icVaccine/detail"; let params = { @@ -480,7 +416,7 @@ export default { return row; }, - async handleDelete(row) { + async handleDelete (row) { let message = "确认删除?"; this.$confirm(message, "提示", { @@ -491,10 +427,10 @@ export default { .then(() => { this.deleteNat(row); }) - .catch((err) => {}); + .catch((err) => { }); }, - async deleteNat(row) { + async deleteNat (row) { const url = "/epmetuser/icNat/del"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del" @@ -516,7 +452,7 @@ export default { } }, - async handleCancelAttention(row) { + async handleCancelAttention (row) { let message = "取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？"; @@ -528,10 +464,10 @@ export default { .then(() => { this.cancelAttention(row); }) - .catch((err) => {}); + .catch((err) => { }); }, - async cancelAttention(row) { + async cancelAttention (row) { const url = "/epmetuser/icVaccine/cancelsynchro"; let params = { @@ -552,7 +488,7 @@ export default { } }, - async handleAttention(row) { + async handleAttention (row) { this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -567,7 +503,7 @@ export default { }); }, - async attentionNat(row) { + async attentionNat (row) { const url = "/epmetuser/icVaccine/synchro"; // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro" @@ -590,7 +526,7 @@ export default { }, //重置搜索条件 - resetSearch() { + resetSearch () { this.formData = { searchType: "current", //当前组织:current 根组织：all name: "", //姓名 @@ -605,18 +541,18 @@ export default { // this.loadTable() }, - handleSizeChange(val) { + handleSizeChange (val) { this.pageSize = val; this.pageNo = 1; this.loadTable(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { this.pageNo = val; this.loadTable(); }, //导出表格 - async handleExport() { + async handleExport () { let title = "核酸检测信息"; const url = "/epmetuser/icVaccine/export"; @@ -656,7 +592,7 @@ export default { }, // 下载文件 - download(data, fileName) { + download (data, fileName) { if (!data) { return; } @@ -680,7 +616,7 @@ export default { } }, - async handleExportModule() { + async handleExportModule () { let title = "核酸检测信息导入模板"; const url = "/epmetuser/icVaccine/import-template-download"; @@ -721,7 +657,7 @@ export default { }, // 上传文件之前的钩子 - beforeUpload(file) { + beforeUpload (file) { const array = file.name.split("."); const extension = array[array.length - 1]; // const isLt1M = (file.size / 1024 / 1024) < 5 @@ -735,11 +671,11 @@ export default { } }, // 上传文件个数超过定义的数量 - handleExceed(files, fileList) { + handleExceed (files, fileList) { this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`); }, - async uploadFile() { + async uploadFile () { if (this.fileName == "") { this.$message.warning("请选择要上传的文件！"); return false; @@ -776,13 +712,13 @@ export default { this.$message.error(rspMsg); } }, - (rspMsg, data) => {}, + (rspMsg, data) => { }, { headers: { "Content-Type": "multipart/form-data" } } ); }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -790,7 +726,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); @@ -798,7 +734,7 @@ export default { }, }, computed: { - tableHeight() { + tableHeight () { return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420; diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue index 43538280..f5cf8428 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue @@ -1,58 +1,50 @@ @@ -485,7 +378,7 @@ import { Loading } from "element-ui"; // 引入Loading服务 let loading; // 加载动画 export default { - data() { + data () { return { loading: false, total: 0, @@ -534,11 +427,11 @@ export default { vfSendNotice, vfVisiteList, }, - async created() {}, - activated() { + async created () { }, + activated () { this.$refs["ref_table"].doLayout(); }, - async mounted() { + async mounted () { const { user } = this.$store.state; this.agencyId = user.agencyId; for (let i = 0; i < 11; i++) { @@ -553,12 +446,12 @@ export default { }, methods: { - handleSearch() { + handleSearch () { this.selectionAll = []; this.loadTable(); }, - async loadTable() { + async loadTable () { this.tableLoading = true; const url = "/epmetuser/icEpidemicSpecialAttention/list"; @@ -610,7 +503,7 @@ export default { this.tableLoading = false; }, - handleChangeV(val) { + handleChangeV (val) { console.log("val", val); this.formData.buildId = ""; this.formData.unitId = ""; @@ -619,19 +512,19 @@ export default { this.getUniList(); this.getHouseList(); }, - handleChangeB(val) { + handleChangeB (val) { console.log("val", val); this.formData.unitId = ""; this.formData.homeId = ""; this.getUniList(); this.getHouseList(); }, - handleChangeD() { + handleChangeD () { this.formData.homeId = ""; this.getHouseList(); }, - getValiheList() { + getValiheList () { const { user } = this.$store.state; this.$http .post("/gov/org/icneighborhood/neighborhoodoption", { @@ -651,7 +544,7 @@ export default { }); }, - getBuildList() { + getBuildList () { this.$http .post("/gov/org/icbuilding/buildingoption", { neighborHoodId: this.formData.villageId, @@ -668,7 +561,7 @@ export default { return this.$message.error("网络错误"); }); }, - getUniList() { + getUniList () { this.$http .post("/gov/org/icbuildingunit/unitoption", { buildingId: this.formData.buildId, @@ -685,7 +578,7 @@ export default { return this.$message.error("网络错误"); }); }, - getHouseList() { + getHouseList () { this.$http .post("/gov/org/ichouse/houseoption", { unitId: this.formData.unitId }) .then(({ data: res }) => { @@ -701,7 +594,7 @@ export default { }); }, - handleSelectTable(selection, row) { + handleSelectTable (selection, row) { row.isSel = !row.isSel; if (row.isSel) { @@ -717,7 +610,7 @@ export default { } }, - handleSelAll(selection) { + handleSelAll (selection) { let selFlag = selection.length > 0; //全选选中 还是 全选不选中 for (let i = 0; i < this.tableData.length; i++) { let tableItem = this.tableData[i]; @@ -741,7 +634,7 @@ export default { }, //回显列表选中的行 - analysisTableSelection() { + analysisTableSelection () { this.$nextTick(() => { this.tableData.forEach((tableItem) => { for (let j = 0; j < this.selectionAll.length; j++) { @@ -759,7 +652,7 @@ export default { }); }, - diaClose() { + diaClose () { this.addFormShow = false; this.editFormShow = false; this.sendNoticeFormShow = false; @@ -767,30 +660,34 @@ export default { this.visiteListFormShow = false; }, - handleAdd() { + handleAdd () { this.addFormShow = true; this.$nextTick(() => { this.$refs.ref_form_add.initForm(null, this.agencyId); }); }, - async handleEdit(row) { + async handleEdit (row) { this.editFormTitle = "修改疫苗接种关注名单"; this.editFormShow = true; - let row2 = await this.getInfo(row); + let rowTem = JSON.parse(JSON.stringify(row)) + + let row2 = await this.getInfo(rowTem); this.$refs.ref_form_edit.initForm("edit", row2); }, - async handleDetail(row) { + async handleDetail (row) { this.editFormTitle = "查看疫苗接种关注名单"; this.editFormShow = true; - let row2 = await this.getInfo(row); + let rowTem = JSON.parse(JSON.stringify(row)) + + let row2 = await this.getInfo(rowTem); this.$refs.ref_form_edit.initForm("detail", row2); }, - async getInfo(row) { + async getInfo (row) { const url = "/epmetuser/icEpidemicSpecialAttention/detail"; let params = { @@ -806,7 +703,7 @@ export default { return row; }, - handleSendNotice() { + handleSendNotice () { if (this.selectionAll.length === 0) { this.$message.info("请选择要通知的人员"); return false; @@ -817,31 +714,31 @@ export default { }); }, - handleNoticeList(row) { + handleNoticeList (row) { this.noticeListFormShow = true; this.$nextTick(() => { this.$refs.ref_noticelist.initTable(row.idCard); }); }, - handleVisiteList(row) { + handleVisiteList (row) { this.visiteListFormShow = true; this.$nextTick(() => { this.$refs.ref_visitelist.initTable(row); }); }, - addFormOk() { + addFormOk () { this.addFormShow = false; this.editFormShow = false; this.loadTable(); }, - sendNoticeOk() { + sendNoticeOk () { this.sendNoticeFormShow = false; this.selectionAll = []; this.loadTable(); }, - async handleDelete(row) { + async handleDelete (row) { if (this.selectionAll.length === 0) { this.$message.info("请选择要取消关注的名单"); return false; @@ -860,7 +757,7 @@ export default { }); }, - async deleteFocus(row) { + async deleteFocus (row) { const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" let idCards = []; @@ -888,7 +785,7 @@ export default { }, //重置搜索条件 - resetSearch() { + resetSearch () { this.formData = { attentionType: 1, //关注类型，核酸检测：2，疫苗接种：1 name: "", @@ -901,18 +798,18 @@ export default { // this.loadTable() }, - handleSizeChange(val) { + handleSizeChange (val) { this.pageSize = val; this.pageNo = 1; this.loadTable(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { this.pageNo = val; this.loadTable(); }, //导出表格 - async handleExport() { + async handleExport () { let title = "疫苗接种关注名单"; const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export"; @@ -930,7 +827,7 @@ export default { }, // 下载文件 - download(data, fileName) { + download (data, fileName) { if (!data) { return; } @@ -954,7 +851,7 @@ export default { } }, - handleExportModule() { + handleExportModule () { let title = "疫苗接种关注名单模板"; const url = "/epmetuser/icEpidemicSpecialAttention/export-template"; @@ -975,7 +872,7 @@ export default { }, // 上传文件之前的钩子 - beforeUpload(file) { + beforeUpload (file) { const array = file.name.split("."); const extension = array[array.length - 1]; // const isLt1M = (file.size / 1024 / 1024) < 5 @@ -989,11 +886,11 @@ export default { } }, // 上传文件个数超过定义的数量 - handleExceed(files, fileList) { + handleExceed (files, fileList) { this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`); }, - async uploadFile() { + async uploadFile () { if (this.fileName == "") { this.$message.warning("请选择要上传的文件！"); return false; @@ -1032,13 +929,13 @@ export default { // this.loadTable() }, - (rspMsg, data) => {}, + (rspMsg, data) => { }, { headers: { "Content-Type": "multipart/form-data" } } ); }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -1046,7 +943,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); @@ -1054,7 +951,7 @@ export default { }, }, computed: { - tableHeight() { + tableHeight () { return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415;