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