diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 4cd4609f..db245c03 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -505,7 +505,7 @@ export default { } this.sendNoticeFormShow = true this.$nextTick(() => { - this.$refs.ref_sendnotice.initForm(this.selectionAll) + this.$refs.ref_sendnotice.initForm(this.selectionAll, '2') }) }, @@ -513,7 +513,7 @@ export default { handleNoticeList (row) { this.noticeListFormShow = true this.$nextTick(() => { - this.$refs.ref_noticelist.initTable(row.idCard) + this.$refs.ref_noticelist.initTable(row.idCard, '2') }) }, diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue index 664e3ab6..05713c97 100644 --- a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue @@ -70,7 +70,7 @@ export default { tableData: [], pageSize: 20, pageNo: 1, - + origin: '' } }, components: {}, @@ -80,8 +80,9 @@ export default { methods: { - async initTable (idCard) { + async initTable (idCard, origin) { this.idCard = idCard + this.origin = origin await this.loadTable() }, @@ -95,7 +96,7 @@ export default { idCard: this.idCard, pageNo: this.pageNo, pageSize: this.pageSize, - origin: '2' + origin: this.origin } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue index beec2e63..0626a739 100644 --- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue +++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue @@ -8,7 +8,7 @@ :rules="dataRule" class="form"> - --> - { @@ -130,8 +131,7 @@ export default { let url = '' - url = '/epmetuser/icNotice/batchnotice' - // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice" + url = '/epmetuser/icNotice/sendNotice' const { data, code, msg } = await requestPost(url, this.formData) diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue index 70fcf372..98c7d597 100644 --- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue +++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue @@ -55,7 +55,7 @@ title="新增" append-to-body @closed="handleCancle"> -
+
+ placeholder="请输入手机号"> @@ -44,13 +44,14 @@ - - - + --> + 发送通知 + 加入关注 + width="55" fixed="left"> + width="50" fixed="left"> + width="100" fixed="left"> { + + // }, 1000) + }, handleSearch () { this.loadTable() }, @@ -391,7 +407,31 @@ export default { console.log('val----', val) this.selectionAll = val }, + async getArea (node, resolve) { + + const url = "/commonservice/areacode/nextarea" + let params = { + parentLevel: node.data ? node.data.level : '', + parentAreaCode: node.data ? node.data.code : '' + } + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + const nodes = data.map(item => ({ + value: item.areaCode, // + label: item.areaName, + code: item.areaCode, + level: item.level, + leaf: node.level >= 4 // 5层级 + })) + resolve(nodes) + + } else { + this.$message.error(msg) + } + + }, async loadTable () { this.tableLoading = true @@ -421,7 +461,13 @@ export default { } this.tableLoading = false }, - + handleAreaChange(val) { + + if (val.length > 0) { + const len = val.length - 1 + this.formData.sourceAddressCode = val[len] + } else this.formData.sourceAddressCode = '' + }, handleScheduledTimeChange (time) { if (time) { this.formData.startDate = time[0] @@ -445,7 +491,7 @@ export default { handleNoticeList (row) { this.noticeListFormShow = true this.$nextTick(() => { - this.$refs.ref_noticelist.initTable(row.idCard) + this.$refs.ref_noticelist.initTable(row.idCard, '0') }) }, @@ -465,10 +511,36 @@ export default { } this.sendNoticeFormShow = true this.$nextTick(() => { - this.$refs.ref_sendnotice.initForm(this.selectionAll) + const arr = this.selectionAll.map(item => { + return { + userId: item.userId, + idCard: item.idCard, + mobile: item.mobile + } + }) + this.$refs.ref_sendnotice.initForm(arr, '0') }) }, + handleAttention(row) { + if (this.selectionAll.length === 0) { + this.$message.info('请选择要加入关注的名单') + return false + } + this.$confirm("确认选择的名单加入关注?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.saveFocus(row) + }) + .catch(err => { + console.log('err-----', err) + + }); + }, + async handleDeletes (row) { if (this.selectionAll.length === 0) { this.$message.info('请选择要取消关注的名单') @@ -489,6 +561,37 @@ export default { }); }, + async saveFocus (row) { + const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add" + // let idCards = [] + + // this.selectionAll.forEach(element => { + // idCards.push(element.idCard) + // }); + let params = { + list: this.selectionAll.map(item => { + return { + name: item.name, + mobile: item.mobile, + idCard: item.idCard, + attentionType: 2 + } + }) + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.$message({ + type: "success", + message: "操作成功" + }); + + this.loadTable() + } else { + this.$message.error(msg) + } + }, async deleteFocus (row) { const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention" // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" @@ -498,7 +601,7 @@ export default { idCards.push(element.idCard) }); let params = { - attentionType: 0, + attentionType: 2, idCards: idCards } @@ -592,6 +695,7 @@ export default { this.$refs.ref_searchform.resetFields() this.formData.startDate = '' this.formData.endDate = '' + this.searchAreacode = [] this.timeRange = [] this.pageSize = 20 this.pageNo = 1 diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue index 631a8c49..fa874c81 100644 --- a/src/views/modules/base/epidemic/travelForm.vue +++ b/src/views/modules/base/epidemic/travelForm.vue @@ -155,7 +155,7 @@ style="display: block">