diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue index 9abd4a5af..feab29578 100644 --- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue +++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue @@ -78,7 +78,8 @@ export default { isSelChannel: false, channel: [], content: '', - userList: [], + // userList: [], + bdIds: [] }, @@ -93,15 +94,18 @@ export default { methods: { - async initForm (selectionAll) { + async initForm (selectionAll, origin) { this.$refs['ref_form1'].resetFields(); + if (origin) { + this.formData.origin = origin + } // this.formData.userList = selectionAll - this.formData.userList = JSON.parse(JSON.stringify(selectionAll)) - - this.formData.userList.forEach(element => { + // this.formData.userList = JSON.parse(JSON.stringify(selectionAll)) - element.idCard = element.realIdCard + this.formData.bdIds = [] + selectionAll.forEach(element => { + this.formData.bdIds.push(element.id) }); }, @@ -131,7 +135,7 @@ export default { let url = '' - url = '/epmetuser/icNotice/sendNotice' + url = '/epmetuser/icNotice/sendNoticeV2' const { data, code, msg } = await requestPost(url, this.formData) @@ -169,7 +173,8 @@ export default { isSelChannel: false, channel: [], content: '', - userList: [], + // userList: [], + bdIds: [] } }, diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue index c19134888..b6db0d56e 100644 --- a/src/views/modules/base/epidemic/travel.vue +++ b/src/views/modules/base/epidemic/travel.vue @@ -558,7 +558,8 @@ export default { userId: item.userId, idCard: item.idCard, realIdCard: item.realIdCard, - mobile: item.mobile + mobile: item.mobile, + id: item.id } }) this.$refs.ref_sendnotice.initForm(arr, '0') @@ -641,7 +642,7 @@ export default { let ids = [] this.selectionAll.forEach(element => { - if (element.epidemicId !== '' && element.epidemicId !== null && element.epidemicId !== undefined){ + if (element.epidemicId !== '' && element.epidemicId !== null && element.epidemicId !== undefined) { ids.push(element.epidemicId) } }); diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue index de1450d8d..a7535ec02 100644 --- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue +++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue @@ -78,7 +78,8 @@ export default { isSelChannel: false, channel: [], content: '', - userList: [], + // userList: [], + bdIds: [] }, @@ -96,10 +97,10 @@ export default { async initForm (selectionAll) { console.log(selectionAll) this.$refs['ref_form1'].resetFields(); - this.formData.userList = JSON.parse(JSON.stringify(selectionAll)) - - this.formData.userList.forEach(element => { - element.idCard = element.realIdCard + // this.formData.userList = JSON.parse(JSON.stringify(selectionAll)) + this.formData.bdIds = [] + selectionAll.forEach(element => { + this.formData.bdIds.push(element.id) }); @@ -125,7 +126,7 @@ export default { let url = '' - url = '/epmetuser/icNotice/sendNotice' + url = '/epmetuser/icNotice/sendNoticeV2' const { data, code, msg } = await requestPost(url, this.formData) @@ -163,7 +164,8 @@ export default { isSelChannel: false, channel: [], content: '', - userList: [], + // userList: [], + bdIds: [] } },