@@ -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 @@
-
关闭
+
关闭
催办
撤回
详情
diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
index 5f896c32..5f3a9966 100644
--- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
+++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
@@ -14,13 +14,13 @@
-
+
全部居民群
按部门选择
按网格选择
-
+
-
+
diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
index 9715a8dc..73eaa0c2 100644
--- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
+++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
@@ -42,7 +42,7 @@
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}
- {{ info.executorList.length }}
+ {{ totalLength }}
个居民
详情
@@ -89,17 +89,6 @@
{{ memberInfo.executedCount || 0 }}
-
-
-
无法执行员工
-
-
-
-
-
{{ memberInfo.cannotExecuteCount || 0 }}
-
@@ -107,7 +96,6 @@
未执行
已执行
- 无法执行
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}
- {{ info.executorList.length }}
+ {{ totalLength }}
个居民
@@ -216,7 +204,7 @@
currIndex: 0,
colConfigs1: [
{ slot: 'user', label: '成员' },
- { prop: 'groupCount', label: '预计发送朋友圈', align: 'center' }
+ { prop: 'customerCount', label: '预计发送朋友圈', align: 'center' }
],
groups: [],
timer: null,
@@ -229,7 +217,17 @@
},
computed: {
- ...mapState(['user'])
+ ...mapState(['user']),
+
+ totalLength () {
+ if (!this.info.executorList) {
+ return 0
+ }
+
+ return this.info.executorList.map(v => v.customerCount).reduce((prev, cur) => {
+ return prev + cur
+ }, 0)
+ }
},
created () {
diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
index f4502819..65a2a102 100644
--- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
+++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
@@ -74,7 +74,7 @@
- 关闭
+ 关闭
催办
撤回
详情