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' ? '全部' : '按条件筛选的' }}