diff --git a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue index 3c4acd59..62df8c40 100644 --- a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -144,7 +144,10 @@ export default { uni.clearStorageSync('ResidentTagsRemove') uni.clearStorageSync('circleTags') uni.clearStorageSync('circleTagsRemove') - this.getList() + this.$dict.load('mstStatus').then(() => { + this.getList() + }) + }, toDetail(item) { uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`}) @@ -155,13 +158,20 @@ export default { this.getList() }, getList() { - this.$http.post(`/app/appmasssendingtask/list`, null, { + let url = '' + if(this.tabIndex==0) { + url = `/app/appmasssendingtask/list` + } else if(this.tabIndex==1 || this.tabIndex==2) { + url = `/app/whchatmomentstask/list` + } + this.$http.post(url, null, { params: { current: this.current, taskTitle: this.taskTitle, startTime: this.start, endTime: this.end, createUserId: this.createUserId, + status: this.status } }).then(res=> { if(res?.data) { @@ -213,7 +223,7 @@ export default { }, onShow() { document.title = '协同宣发' - this.$dict.load(['mstStatus']).then(() => { + this.$dict.load('mstStatus').then(() => { this.list = [] this.current = 1 this.getList() diff --git a/src/apps/AppCooperationPropaganda/selectUser.vue b/src/apps/AppCooperationPropaganda/selectUser.vue index eb54659b..8a9303b9 100644 --- a/src/apps/AppCooperationPropaganda/selectUser.vue +++ b/src/apps/AppCooperationPropaganda/selectUser.vue @@ -69,6 +69,7 @@ export default { if(!this.selected.userId) { return this.$u.toast('请选择创建人') } + uni.$emit("pagePicker:custom", [this.selected]) uni.setStorageSync('userSelect', this.selected) uni.navigateBack() }, diff --git a/src/apps/AppCooperationPropaganda/sendScoped.vue b/src/apps/AppCooperationPropaganda/sendScoped.vue index ffc9d509..f70efc4c 100644 --- a/src/apps/AppCooperationPropaganda/sendScoped.vue +++ b/src/apps/AppCooperationPropaganda/sendScoped.vue @@ -36,13 +36,11 @@ export default { sendType: '', deptSelect: [], girdSelect: [], - sendScope: '0', + sendScope: 0, girdListIds: [], deptListIds: [], wxGroups: [], // 居民群,居民,朋友圈 sex: '', - // groupList: [], // 居民 - // executorList: [], // 朋友圈 ResidentTags: [], ResidentTagsRemove: [], startTime: '', @@ -56,7 +54,6 @@ export default { if(e.value == '1' || e.value == '2') { uni.navigateTo({url: `./scopedSelect?type=${e.value}&sendType=${this.sendType}`}) - } this.sendScope = e.value; uni.setStorageSync('sendScope', this.sendScope) @@ -88,7 +85,7 @@ export default { getWxGroups() { this.$http.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.sendScope}`, { - filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',') + filterCriteria: this.girdListIds.join(',') || this.deptListIds.join(',') }).then(res => { if (res.code === 0) { this.wxGroups = res.data diff --git a/src/project/saas/AppCooperationPropaganda/selectUser.vue b/src/project/saas/AppCooperationPropaganda/selectUser.vue index ce406eba..047dfc22 100644 --- a/src/project/saas/AppCooperationPropaganda/selectUser.vue +++ b/src/project/saas/AppCooperationPropaganda/selectUser.vue @@ -68,7 +68,6 @@ export default { if(!this.selected.userId) { return this.$u.toast('请选择创建人') } - uni.$emit("pagePicker:custom", [this.selected]) uni.setStorageSync('userSelect', this.selected) uni.navigateBack() },