From 7cee782996ee460d3c0c439221d37a2f17b591eb Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 16 Jun 2023 15:57:29 +0800
Subject: [PATCH] bug

---
 .../Announce/AppAnnounce/components/List.vue  | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/project/qianxinan/Announce/AppAnnounce/components/List.vue b/project/qianxinan/Announce/AppAnnounce/components/List.vue
index 9c6dd17e..0c252841 100644
--- a/project/qianxinan/Announce/AppAnnounce/components/List.vue
+++ b/project/qianxinan/Announce/AppAnnounce/components/List.vue
@@ -17,6 +17,14 @@
             placeholder="任务状态"
             :selectList="dict.getDict('mstStatus')">
           </ai-select>
+          <ai-select
+            v-model="search.markTag"
+            multiple
+            collapse-tags
+            @change="search.current = 1, getList()"
+            placeholder="请选择标签"
+            :selectList="dict.getDict('mstTag')">
+          </ai-select>
           <el-date-picker
             v-model="search.startTime"
             type="date"
@@ -83,27 +91,6 @@
           </template>
         </el-table-column>
       </ai-table>
-      <!-- <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'">
-              <img src="https://cdn.cunwuyun.cn/dvcp/announce/icon1.png" />
-              <h3>成员一键群发</h3>
-              <p>成员收到通知后，可一键直接群发到居民群,任务开始后不支持关闭</p>
-            </div>
-            <div class="item" :class="[currIndex === '1' ? 'active' : '']" @click="currIndex = '1'">
-              <img src="https://cdn.cunwuyun.cn/dvcp/announce/icon2.png" />
-              <h3>通知成员群发</h3>
-              <p>员工收到通知后，需通过群发助手发送至居民群,任务到期后自动关闭，未完成的成员无法再执行</p>
-            </div>
-          </div>
-          <el-button style="width: 106px;" size="small" type="primary" icon="iconfont" @click="isShow = false, toAdd(currIndex, '')">去创建</el-button>
-        </div>
-      </div> -->
     </template>
   </ai-list>
 </template>
@@ -126,7 +113,8 @@
           createUserId: '',
           taskTitle: '',
           startTime: '',
-          endTime: ''
+          endTime: '',
+          markTag: ''
         },
         currIndex: '1',
         name: '',
@@ -184,6 +172,7 @@
         this.instance.post(`/app/appmasssendingtask/list`, null, {
           params: {
             ...this.search,
+            markTag: this.search.markTag ? this.search.markTag.join(',') : ''
           }
         }).then(res => {
           if (res.code == 0) {