From 121892301255dc55c2d1be42295dc0e579abcba9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 21 Feb 2023 11:40:20 +0800
Subject: [PATCH] =?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    |  6 +++---
 .../Announce/AppAnnounce/components/List.vue   | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
index b71c9dd6..1a85c7d8 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -44,11 +44,11 @@
                   <div class="tips">
                     <p>消息预计送达居民群数：</p>
                     <span>{{ groupLen }}</span>
-                    <!-- <el-tooltip
+                    <el-tooltip
                         placement="top"
                         content="将由指定群主发送给TA作为群主的所有的群，由于企业微信限制，当超过1000个时将只发送到最近活跃的1000个群">
                       <i class="iconfont iconModal_Warning"></i>
-                    </el-tooltip> -->
+                    </el-tooltip>
                   </div>
                 </el-form-item>
                 <el-form-item label="发送内容" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入发送内容', trigger: 'blur' }]">
@@ -136,7 +136,7 @@
                     <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-form-item label="结束时间" style="width: 100%;" prop="taskEndTime" :rules="[{ required: true, message: '请选择结束时间', trigger: 'change' }]">
                   <el-date-picker
                     style="width: 100%;"
                     v-model="form.taskEndTime"
diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue
index db4e778d..6723b102 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="isShow = true">创建宣发</el-button>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">创建宣发</el-button>
           <ai-select
             v-model="search.status"
             @change="search.current = 1, getList()"
@@ -83,18 +83,18 @@
           </template>
         </el-table-column>
       </ai-table>
-      <div class="dialog" v-if="isShow">
+      <!-- <div class="dialog" v-if="isShow">
         <div class="mask"></div>
         <div class="dialog-wrapper">
           <img src="https://cdn.cunwuyun.cn/dvcp/announce/close1.png" @click="isShow = false" />
           <h2>选择群发方式</h2>
           <p>可根据不同的使用需求，选择相应的群发方式</p>
           <div class="dialog-list">
-            <!-- <div class="item" :class="[currIndex === '0' ? 'active' : '']" @click="currIndex = '0'">
+            <div class="item" :class="[currIndex === '0' ? 'active' : '']" @click="currIndex = '0'">
               <img src="https://cdn.cunwuyun.cn/dvcp/announce/icon1.png" />
               <h3>成员一键群发</h3>
               <p>成员收到通知后，可一键直接群发到居民群,任务开始后不支持关闭</p>
-            </div> -->
+            </div>
             <div class="item" :class="[currIndex === '1' ? 'active' : '']" @click="currIndex = '1'">
               <img src="https://cdn.cunwuyun.cn/dvcp/announce/icon2.png" />
               <h3>通知成员群发</h3>
@@ -103,7 +103,7 @@
           </div>
           <el-button style="width: 106px;" size="small" type="primary" icon="iconfont" @click="isShow = false, toAdd(currIndex, '')">去创建</el-button>
         </div>
-      </div>
+      </div> -->
     </template>
   </ai-list>
 </template>
@@ -128,7 +128,7 @@
           startTime: '',
           endTime: ''
         },
-        currIndex: '0',
+        currIndex: '1',
         name: '',
         isShow: false,
         user: [],
@@ -248,12 +248,12 @@
         })
       },
 
-      toAdd(type, id) {
+      toAdd(id) {
         this.$emit('change', {
           type: 'Add',
           params: {
-            id,
-            sendChannel: type
+            id: id || '',
+            sendChannel: 0
           }
         })
       },