diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 990db1df9..3ba383982 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -1,79 +1,69 @@ @@ -521,7 +411,7 @@ import peopleMore from "@/views/modules/shequ/cpts/people-more"; let loading; // 加载动画 export default { - data() { + data () { return { loading: false, total: 0, @@ -588,11 +478,11 @@ export default { peopleMore, }, - activated() { + activated () { this.$refs["ref_table"].doLayout(); }, - async mounted() { + async mounted () { for (let i = 0; i < 11; i++) { let obj = { value: i + "", @@ -611,7 +501,7 @@ export default { }, methods: { - async handleWatchPeopleInfo(rowIndex) { + async handleWatchPeopleInfo (rowIndex) { let item = this.tableData[rowIndex]; this.currentPepeleId = item.userId; this.currentPepeleGridName = item.gridName; @@ -619,7 +509,7 @@ export default { this.showedPeopleMoreInfo = true; }, - async getFmOptions(field, url, params, cookFn) { + async getFmOptions (field, url, params, cookFn) { const { data, code, msg } = await requestPost(url, { ...params, }); @@ -636,12 +526,12 @@ export default { } }, - handleSearch() { + handleSearch () { this.selectionAll = []; this.loadTable(); }, - async loadTable() { + async loadTable () { this.tableLoading = true; const url = "/epmetuser/icEpidemicSpecialAttention/list"; @@ -692,7 +582,7 @@ export default { this.tableLoading = false; }, - handleChangeV(val) { + handleChangeV (val) { console.log("val", val); this.formData.buildId = ""; this.formData.unitId = ""; @@ -701,19 +591,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", { @@ -733,7 +623,7 @@ export default { }); }, - getBuildList() { + getBuildList () { this.$http .post("/gov/org/icbuilding/buildingoption", { neighborHoodId: this.formData.villageId, @@ -750,7 +640,7 @@ export default { return this.$message.error("网络错误"); }); }, - getUniList() { + getUniList () { this.$http .post("/gov/org/icbuildingunit/unitoption", { buildingId: this.formData.buildId, @@ -767,7 +657,7 @@ export default { return this.$message.error("网络错误"); }); }, - getHouseList() { + getHouseList () { this.$http .post("/gov/org/ichouse/houseoption", { unitId: this.formData.unitId }) .then(({ data: res }) => { @@ -783,7 +673,7 @@ export default { }); }, - handleSelectTable(selection, row) { + handleSelectTable (selection, row) { row.isSel = !row.isSel; if (row.isSel) { @@ -799,7 +689,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]; @@ -823,7 +713,7 @@ export default { }, //回显列表选中的行 - analysisTableSelection() { + analysisTableSelection () { this.$nextTick(() => { this.tableData.forEach((tableItem) => { for (let j = 0; j < this.selectionAll.length; j++) { @@ -841,7 +731,7 @@ export default { }); }, - diaClose() { + diaClose () { this.addFormShow = false; this.editFormShow = false; this.sendNoticeFormShow = false; @@ -849,14 +739,14 @@ 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; const row1 = { ...row }; @@ -864,7 +754,7 @@ export default { this.$refs.ref_form_edit.initForm("edit", row2); }, - async handleDetail(row) { + async handleDetail (row) { this.editFormTitle = "查看核酸检测关注名单"; this.editFormShow = true; const row1 = { ...row }; @@ -872,7 +762,7 @@ export default { this.$refs.ref_form_edit.initForm("detail", row2); }, - async getInfo(row) { + async getInfo (row) { const url = "/epmetuser/icEpidemicSpecialAttention/detail"; let params = { @@ -888,7 +778,7 @@ export default { return row; }, - handleSendNotice() { + handleSendNotice () { if (this.selectionAll.length === 0) { this.$message.info("请选择要通知的人员"); return false; @@ -899,32 +789,32 @@ export default { }); }, - handleNoticeList(row) { + handleNoticeList (row) { this.noticeListFormShow = true; this.$nextTick(() => { - this.$refs.ref_noticelist.initTable(row.idCard, "2"); + this.$refs.ref_noticelist.initTable(row.realIdCard, "2"); }); }, - handleVisiteList(row) { + handleVisiteList (row) { this.visiteListFormShow = true; this.$nextTick(() => { this.$refs.ref_visitelist.initTable(row, "2"); }); }, - 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; @@ -943,7 +833,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 ids = []; @@ -971,7 +861,7 @@ export default { }, //重置搜索条件 - resetSearch() { + resetSearch () { this.formData = { attentionType: 2, //关注类型,核酸检测:2,疫苗接种:1 name: "", @@ -984,18 +874,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"; @@ -1013,7 +903,7 @@ export default { }, // 下载文件 - download(data, fileName) { + download (data, fileName) { if (!data) { return; } @@ -1037,7 +927,7 @@ export default { } }, - handleExportModule() { + handleExportModule () { let title = "核酸检测关注名单模板"; const url = "/epmetuser/icEpidemicSpecialAttention/export-template"; @@ -1058,7 +948,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 @@ -1072,11 +962,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; @@ -1115,13 +1005,13 @@ export default { // this.loadTable() }, - (rspMsg, data) => {}, + (rspMsg, data) => { }, { headers: { "Content-Type": "multipart/form-data" } } ); }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -1129,7 +1019,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); @@ -1137,7 +1027,7 @@ export default { }, }, computed: { - tableHeight() { + tableHeight () { return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415; diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue index c0b1f8ed6..c304582fc 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue @@ -840,7 +840,7 @@ export default { handleNoticeList(row) { this.noticeListFormShow = true; this.$nextTick(() => { - this.$refs.ref_noticelist.initTable(row.idCard, "2"); + this.$refs.ref_noticelist.initTable(row.realIdCard, "2"); }); }, handleVisiteList(row) { diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue index 05713c975..97383b5c2 100644 --- a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue @@ -38,6 +38,13 @@ min-width="380"> + + +
@@ -66,7 +73,7 @@ export default { return { tableLoading: false, total: 0, - idCard: '', + realIdCard: '', tableData: [], pageSize: 20, pageNo: 1, @@ -80,8 +87,8 @@ export default { methods: { - async initTable (idCard, origin) { - this.idCard = idCard + async initTable (realIdCard, origin) { + this.realIdCard = realIdCard this.origin = origin await this.loadTable() @@ -93,7 +100,7 @@ export default { const url = "/epmetuser/icNotice/page" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page" let params = { - idCard: this.idCard, + idCard: this.realIdCard, pageNo: this.pageNo, pageSize: this.pageSize, origin: this.origin @@ -105,15 +112,9 @@ export default { this.total = data.total this.tableData = data.list - // data.list.forEach(item => { - // item.isEdit = false - // item.isNew = false - // let arrayInspectors = item.inspectors.split(',') - // item.inspectorArray = [...arrayInspectors] - - // let arrayReviewTime = item.reviewTime.split(' ') - // item.reviewTime = arrayReviewTime[0] - // }); + this.tableData.forEach(item => { + item.sendResShow = item.sendRes === '1' ? '成功' : item.sendRes === '0' ? '失败' : '' + }); // this.tableData = [...data.list] diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index e2abd38ac..31792bc5b 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -55,7 +55,8 @@ title="新增" append-to-body @closed="handleCancle"> -
+
{ - this.$refs.ref_noticelist.initTable(row.idCard); + this.$refs.ref_noticelist.initTable(row.realIdCard); }); }, handleVisiteList (row) { diff --git a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue index 99ec32267..eeb9491b6 100644 --- a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue +++ b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue @@ -38,6 +38,13 @@ min-width="380"> + + +
@@ -80,8 +87,8 @@ export default { methods: { - async initTable (idCard) { - this.idCard = idCard + async initTable (realIdCard) { + this.realIdCard = realIdCard await this.loadTable() }, @@ -92,7 +99,7 @@ export default { const url = "/epmetuser/icNotice/page" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page" let params = { - idCard: this.idCard, + idCard: this.realIdCard, pageNo: this.pageNo, pageSize: this.pageSize, origin: '1' @@ -103,7 +110,9 @@ export default { if (code === 0) { this.total = data.total this.tableData = data.list - + this.tableData.forEach(item => { + item.sendResShow = item.sendRes === '1' ? '成功' : item.sendRes === '0' ? '失败' : '' + }); // data.list.forEach(item => { // item.isEdit = false // item.isNew = false