From 0c2ac4808a35953f94ca257f837e61aa576e3438 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 14 Sep 2022 18:04:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppAnnounceWeChat/components/Add.vue | 5 +- .../AppAnnounceWeChat/components/Detail.vue | 56 ++++++++++--------- 2 files changed, 32 insertions(+), 29 deletions(-) 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') From cf801827402966a50402fee240996b6a6a6fdc97 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 15 Sep 2022 13:44:11 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=BE=A4=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Announce/AppAnnounce/components/Add.vue | 13 ++++++++++++ .../Announce/AppAnnounce/components/List.vue | 20 +++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index 5d5d7572..bfc65cdb 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -136,6 +136,17 @@ 从本地上传，图片最大支持10MB，支持JPG,PNG格式；视频最大支持10MB，支持MP4格式；文件最大支持20MB
+ + + + { diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue index 8d1d7179..583bfbb1 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/List.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue @@ -10,7 +10,7 @@ @@ -107,6 +117,7 @@ endTime: '' }, name: '', + isShow: false, user: [], tableData: [], loading: false, @@ -213,11 +224,12 @@ }) }, - toAdd(id) { + toAdd(type, id) { this.$emit('change', { type: 'Add', params: { - id + id, + sendChannel: type } }) }, From 653e441f5591a86058b241af1ad3141e1358f862 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 15 Sep 2022 13:48:22 +0800 Subject: [PATCH 3/7] bug --- .../wxwork/Announce/AppAnnounce/components/Detail.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue index dfe924fd..4938f07f 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue @@ -37,6 +37,9 @@
+ + {{ info.sendChannel === '1' ? '通知员工转发' : '成员一键群发' }} + @@ -95,7 +98,7 @@

{{ memberInfo.executedCount || 0 }}

-
+

无法执行成员

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

{{ groupInfo.executedCount || 0 }}

-
+

无法送达居民群

@@ -183,7 +186,7 @@ 未送达 已送达 - 无法送达 + 无法送达 Date: Thu, 15 Sep 2022 14:21:39 +0800 Subject: [PATCH 4/7] bug --- .../Announce/AppAnnounce/components/List.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue index 583bfbb1..22ba11ff 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/List.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue @@ -75,9 +75,10 @@ @@ -202,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 => { From 0fc014b17b66a296169beed6e94b6e1a2e841497 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 15 Sep 2022 15:00:07 +0800 Subject: [PATCH 5/7] 1 --- .../wxwork/Announce/AppAnnounce/components/Add.vue | 10 ++++++++-- .../wxwork/Announce/AppAnnounce/components/Detail.vue | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index bfc65cdb..fc60f325 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -596,9 +596,15 @@ export default { if (valid) { if (new Date(this.dateForm.choiceTime).getTime() < Date.now()) { return this.$message.error('定时发送时间不得早于当前时间') - } else { - this.confirm(1) } + + if (this.params.sendChannel === 'sendChannel' && new Date(this.dateForm.choiceTime).getTime() > new Date(this.dateForm.taskEndTime).getTime()) { + return this.$message.error('定时发送时间不得晚于结束时间') + } + + taskEndTime + + this.confirm(1) } }) }, diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue index 4938f07f..56924096 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue @@ -42,6 +42,7 @@ +
{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }} From e16c1d6c853c673b3e6f65ff5954224859df4de0 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 15 Sep 2022 15:26:49 +0800 Subject: [PATCH 6/7] bug --- packages/wxwork/Announce/AppAnnounce/components/Add.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index fc60f325..38c0b5ff 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -598,12 +598,10 @@ export default { return this.$message.error('定时发送时间不得早于当前时间') } - if (this.params.sendChannel === 'sendChannel' && new Date(this.dateForm.choiceTime).getTime() > new Date(this.dateForm.taskEndTime).getTime()) { + if (this.params.sendChannel === '1' && new Date(this.dateForm.choiceTime).getTime() > new Date(this.form.taskEndTime).getTime()) { return this.$message.error('定时发送时间不得晚于结束时间') } - taskEndTime - this.confirm(1) } }) @@ -616,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 From a804b82b06cb288d5d84ec759867c1ce3910e88f Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 15 Sep 2022 16:17:57 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=8C=BA=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/grid/AppGridBlock/components/list.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ > 删除 - 导出全部 - + -->