From cf801827402966a50402fee240996b6a6a6fdc97 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 15 Sep 2022 13:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E5=B1=85=E6=B0=91=E7=BE=A4?=
 =?UTF-8?q?=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 @@
                     <em>从本地上传，图片最大支持10MB，支持JPG,PNG格式；视频最大支持10MB，支持MP4格式；文件最大支持20MB</em>
                   </div>
                 </el-form-item>
+                <el-form-item label="结束时间" v-if="params.sendChannel === '1'" style="width: 100%;" prop="taskEndTime" :rules="[{ required: true, message: '请选择结束时间', trigger: 'change' }]">
+                  <el-date-picker
+                    style="width: 100%;"
+                    v-model="form.taskEndTime"
+                    type="datetime"
+                    size="small"
+                    :picker-options="pickerOptions"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="请选择结束时间">
+                  </el-date-picker>
+                </el-form-item>
                 <el-form-item label="宣发审批" prop="enableExamine" style="width: 100%;" :rules="[{ required: true, message: '请输入任务名称', trigger: 'blur' }]">
                   <el-switch
                       v-model="form.enableExamine"
@@ -324,6 +335,7 @@ export default {
         choiceTime: '',
         contents: [],
         enableExamine: '0',
+        taskEndTime: '',
         examines: [],
         wxGroups: [],
         wxGroupsName: '',
@@ -622,6 +634,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/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 @@
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template #left>
-          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">创建宣发</el-button>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="isShow = true">创建宣发</el-button>
           <ai-select
             v-model="search.status"
             @change="search.current = 1, getList()"
@@ -77,11 +77,21 @@
               <el-button type="text" @click="remindExamine(row.id)" v-if="['0'].includes(row.status)">催办</el-button>
               <el-button type="text" @click="cancel(row.id)" v-if="['0'].includes(row.status)">撤回</el-button>
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="toAdd(row.id)" v-if="['1', '3'].includes(row.status)">编辑</el-button>
+              <el-button type="text" @click="toAdd(row.mstSendChannel, row.id)" v-if="['1', '3'].includes(row.status)">编辑</el-button>
             </div>
           </template>
         </el-table-column>
       </ai-table>
+      <ai-dialog
+        :visible.sync="isShow"
+        width="590px"
+        title="定时发送"
+        customFooter>
+        <el-button @click="toAdd('0', '')">成员一键群发</el-button>
+        <el-button @click="toAdd('1', '')">通知成员群发</el-button>
+        <div class="dialog-footer" slot="footer">
+        </div>
+      </ai-dialog>
     </template>
   </ai-list>
 </template>
@@ -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
           }
         })
       },