From 0fc014b17b66a296169beed6e94b6e1a2e841497 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 15 Sep 2022 15:00:07 +0800
Subject: [PATCH] 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 @@
             </ai-info-item>
             <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
             <ai-info-item label="群发时间" :value="info.choiceTime"></ai-info-item>
+            <ai-info-item label="结束时间" :value="info.taskEndTime" v-if="info.sendChannel === '1'"></ai-info-item>
             <ai-info-item label="群发范围" isLine>
               <div class="text">
                 <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>