diff --git a/src/apps/AppCooperationPropaganda/addPropaganda.vue b/src/apps/AppCooperationPropaganda/addPropaganda.vue index ef1654fe..82c1a4de 100644 --- a/src/apps/AppCooperationPropaganda/addPropaganda.vue +++ b/src/apps/AppCooperationPropaganda/addPropaganda.vue @@ -401,19 +401,22 @@ export default { return this.$u.toast("请输入发送内容") } - if(this.enableExamine) { + if(this.enableExamine) { // 是否需要审批,0:否、1:是 if(!this.form.examines.length) { return this.$u.toast("请选择审批人") } else { - this.form.enableExamine = this.form.enableExamine + this.form.examineList = this.form.examineList } - this.forms.enableExamine = this.form.enableExamine + this.form.enableExamine = 1 + this.forms.enableExamine = 1 } else { - this.forms.enableExamine - this.form. + this.form.enableExamine = 0 + this.forms.enableExamine = 0 + this.form.examineList = [] + this.form.examineList = [] } - if(this.isTimedTask) { + if(this.isTimedTask) { // 发送类型,0:立即发送、1:定时发送 this.form.sendType = 1 this.forms.sendType = 1 if(!this.form.choiceTime.length) { @@ -453,10 +456,10 @@ export default { fromDepartmentId: 0, mode: "multi", type: ["user"], - selectedUserIds: this.userList?.map(e => e.id) + selectedUserIds: this.form.examineList?.map(e => e.id) }).then((res)=>{ if(res?.userList) { - this.userList = res.userList + this.form.examineList = res.userList } } ).catch((err) => { diff --git a/src/apps/AppCooperationPropaganda/sendScoped.vue b/src/apps/AppCooperationPropaganda/sendScoped.vue index ccd62330..ffc9d509 100644 --- a/src/apps/AppCooperationPropaganda/sendScoped.vue +++ b/src/apps/AppCooperationPropaganda/sendScoped.vue @@ -102,7 +102,7 @@ export default { const removeTags = this.ResidentTagsRemove.join(',') this.$http.post(`/app/whchatmomentstask/getCustomerGroups?sendScope=${this.sendScope}&addFromTime=${this.startTime}&addEndTime=${this.endTime}&gender=${this.sex}&filteTags=${tags}&excludeFilterTags=${removeTags}`, { - filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',') + filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(','), }).then(res => { if (res.code === 0) { // this.groupList = res.data @@ -112,10 +112,15 @@ export default { } }) }, + + // const array1 = [{name:'zs',num: 1},{name:'zls',num: 5},{name:'azs',num: 4}] + // const sum = array1.reduce((pre, cur) => pre + cur.num, 0) + // console.log(sum) + // 群发朋友圈 getCircleOfFriends() { this.$http.post(`/app/whchatmomentstask/getExecutors?sendScope=${this.sendScope}`, - { + { filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',') }).then(res => { if (res.code === 0) { @@ -149,7 +154,6 @@ export default { } // 时间 this.startTime = uni.getStorageSync('startTime') - // console.log(this.startTime, '哈哈哈哈'); this.endTime = uni.getStorageSync('endTime') // else if(this.sendType == 'CircleOfFriends') { // this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含