diff --git a/packages/grid/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue index 3be572df..5cf35949 100644 --- a/packages/grid/AppGridBlock/components/list.vue +++ b/packages/grid/AppGridBlock/components/list.vue @@ -62,7 +62,7 @@ > 删除 - 导出全部 - + --> 从本地上传，图片最大支持10MB，支持JPG,PNG格式；视频最大支持10MB，支持MP4格式；文件最大支持20MB + + + + new Date(this.form.taskEndTime).getTime()) { + return this.$message.error('定时发送时间不得晚于结束时间') + } + + this.confirm(1) } }) }, @@ -598,6 +614,10 @@ export default { return this.$message.error('居民群数量不能为0') } + if (this.params.sendChannel === '1' && new Date(this.form.taskEndTime).getTime() < Date.now()) { + return this.$message.error('结束时间不得早于当前时间') + } + if (sendType === 1 && !this.dateForm.choiceTime) { this.isShowDate = true return false @@ -622,6 +642,7 @@ export default { wxGroups: this.form.wxGroups, contents, sendType, + sendChannel: this.params.sendChannel, choiceTime: this.dateForm.choiceTime, filterCriteria: this.form.filterCriteria.join(','), examines: this.form.examines.length ? this.form.examines.map(v => { diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue index dfe924fd..56924096 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue @@ -37,8 +37,12 @@ + + {{ info.sendChannel === '1' ? '通知员工转发' : '成员一键群发' }} + +
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }} @@ -95,7 +99,7 @@

{{ memberInfo.executedCount || 0 }}

-
+

无法执行成员

未执行 已执行 - 无法执行 + 无法执行

{{ groupInfo.executedCount || 0 }}

-
+

无法送达居民群

@@ -183,7 +187,7 @@ 未送达 已送达 - 无法送达 + 无法送达 + + 成员一键群发 + 通知成员群发 +
+
+ @@ -107,6 +118,7 @@ endTime: '' }, name: '', + isShow: false, user: [], tableData: [], loading: false, @@ -191,6 +203,17 @@ }) }, + close (id) { + this.$confirm('确认关闭该群发任务？').then(() => { + this.instance.post(`/app/appmasssendingtask/closeTask?id=${id}`).then(res => { + if (res.code == 0) { + this.$message.success('关闭成功！') + this.getList() + } + }) + }) + }, + cancel (id) { this.$confirm('确认撤回该群发任务？').then(() => { this.instance.post(`/app/appmasssendingtask/cancel?id=${id}`).then(res => { @@ -213,11 +236,12 @@ }) }, - toAdd(id) { + toAdd(type, id) { this.$emit('change', { type: 'Add', params: { - id + id, + sendChannel: type } }) }, diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue index 9bc13d94..706a723d 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue @@ -552,9 +552,10 @@ export default { }[type] let formData = new FormData() formData.append('file', file.file) - formData.append('type', fileType) + formData.append('attachmentType', 1) + formData.append('mediaType', fileType) let loading = this.$loading() - this.instance.post(`/app/wxcp/upload/uploadFile`, formData, { + this.instance.post(`/app/wxcp/upload/uploadAttachment`, formData, { withCredentials: false }).then(res => { if (res.code == 0) { diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue index 662d7e1a..b5fa2d6d 100644 --- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue +++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue @@ -42,8 +42,8 @@
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }} - {{ groups.length }} - 个居民群 + {{ info.executorList.length }} + 个居民 详情
@@ -73,25 +73,25 @@
-

计划执行成员

+

预计执行员工

{{ memberInfo.planCount || 0 }}

-

未执行成员

+

未执行员工

{{ memberInfo.unExecutedCount || 0 }}

-

已执行成员

+

已执行员工

{{ memberInfo.executedCount || 0 }}

-

无法执行成员

+

无法执行员工

@@ -151,14 +151,17 @@ width="890px" title="群发范围" @onConfirm="isShowGroups = false"> - - + + +
+ {{ info.sendScope === '0' ? '全部' : '按条件筛选的' }} + {{ info.executorList.length }} + 个居民 +
+ + + {{ info.filterTagsName || '-' }} +
@@ -219,7 +222,8 @@ timer: null, min: 60, isDisabled: false, - rejecterId: '' + rejecterId: '', + userNames: '' } }, @@ -238,15 +242,15 @@ methods: { getMemberInfo () { - this.instance.post(`/app/appmasssendingtask/detailStatistics`, null, { + this.instance.post(`/app/whchatmomentstask/detailStatistics`, null, { params: { ...this.search1, taskId: this.params.id } }).then(res => { if (res.code === 0) { - this.tableData1 = res.data.executedList.records - this.total1 = res.data.executedList.total + // this.tableData1 = res.data.executedList.records + // this.total1 = res.data.executedList.total this.memberInfo = res.data } }) @@ -264,7 +268,7 @@ }, sendMsg () { - this.instance.post(`/app/appmasssendingtask/remindSend?id=${this.params.id}`).then(res => { + this.instance.post(`/app/whchatmomentstask/remindExamine?id=${this.params.id}`).then(res => { if (res.code === 0) { this.$message.success('提醒成功') this.getInfo(this.params.id) @@ -288,7 +292,7 @@ }, getInfo (id) { - this.instance.post(`/app/whchatmomentstask/customerTasKDetail?id=${id}`).then(res => { + this.instance.post(`/app/whchatmomentstask/queryDetailById?id=${id}`).then(res => { if (res.code === 0) { this.info = res.data if (res.data.status === '4' && res.data.remindTime) { @@ -308,15 +312,13 @@ } }) - this.info.wxGroups = res.data.wxGroups.map(v => { - this.groups.push(...v.groupIds.split(',')) - - return { - ...v, - groupIds: v.groupIds.split(',') - } + let userNames = '' + res.data.executorList.forEach(e => { + userNames = e.executorName + userNames }) + this.userNames = res.data.executorList.map(e => e.executorName).join(',') + if (res.data.examines && res.data.examines.length) { const user = res.data.examines.filter(v => v.examineStatus === '2')