diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue index c6129e3b..a144ebba 100644 --- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Add.vue @@ -20,7 +20,7 @@ 按网格选择 - +
- +
@@ -433,6 +433,7 @@ export default { sendScope: '0', sendType: 0, name: '', + executorList: [], taskEndTime: '', groupList: [], addTime: '', @@ -462,7 +463,9 @@ export default { ...mapState(['user']), groupLen() { - return this.form.groupList.length + return this.form.executorList.map(v => v.customerCount).reduce((prev, cur) => { + return prev + cur + }, 0) } }, @@ -790,8 +793,8 @@ export default { sendType, taskType: 1, excludeFilterTags: this.form.excludeFilterTags.map(v => v.id).join(','), - addEndTime: this.form.addTime ? this.form.addTime[0] : '', - addFromTime: this.form.addTime ? this.form.addTime[1] : '', + addEndTime: this.form.addTime ? this.form.addTime[1] : '', + addFromTime: this.form.addTime ? this.form.addTime[0] : '', filterTags: this.form.filterTags.map(v => v.id).join(','), choiceTime: this.dateForm.choiceTime, filterCriteria: this.form.filterCriteria.join(','), diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue index 59445940..37df10bf 100644 --- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue @@ -42,7 +42,7 @@
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }} - {{ info.groupList.length }} + {{ totalLength }} 个居民 详情
@@ -156,7 +156,7 @@
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }} - {{ info.groupList.length }} + {{ totalLength }} 个居民
@@ -216,7 +216,7 @@ currIndex: 0, colConfigs1: [ { slot: 'user', label: '员工' }, - { prop: 'groupCount', label: '预计送达居民', align: 'center' } + { prop: 'customerCount', label: '预计送达居民', align: 'center' } ], groups: [], timer: null, @@ -228,7 +228,17 @@ }, computed: { - ...mapState(['user']) + ...mapState(['user']), + + totalLength () { + if (!this.info.groupList) { + return 0 + } + + return this.info.groupList.map(v => v.customerCount).reduce((prev, cur) => { + return prev + cur + }, 0) + } }, created () { @@ -276,7 +286,7 @@ }, sendMsg () { - this.instance.post(`/app/whchatmomentstask/remindExamine?id=${this.params.id}`).then(res => { + this.instance.post(`/app/whchatmomentstask/remindSend?id=${this.params.id}`).then(res => { if (res.code === 0) { this.$message.success('提醒成功') this.getInfo(this.params.id) diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue index 5ff26a3a..211bed16 100644 --- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue +++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue @@ -74,7 +74,7 @@