From 74e78c8e59b1a5b9e6fc23c04a260831c467d9b2 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Mar 2023 14:48:23 +0800
Subject: [PATCH] bug

---
 .../AppAnnounceResident/components/Detail.vue | 32 +++++++++++--------
 .../AppAnnounceWeChat/components/Add.vue      |  8 +++--
 .../AppAnnounceWeChat/components/Detail.vue   | 28 +++++++++-------
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue
index c5862d48..59445940 100644
--- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue
+++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/Detail.vue
@@ -149,22 +149,26 @@
       <ai-dialog
         :visible.sync="isShowGroups"
         width="890px"
+        customFooter
         title="群发范围"
         @onConfirm="isShowGroups = false">
-          <ai-wrapper>
-            <ai-info-item label="消息发送" isLine :value="info.taskTitle">
-              <div class="text">
-                <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
-                <i>{{ info.groupList.length }}</i>
-                <span>个居民</span>
-              </div>
-            </ai-info-item>
-            <ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
-            <ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
-            <ai-info-item label="剔除标签" isLine>{{ info.excludeFilterTagsName || '-' }}</ai-info-item>
-            <ai-info-item label="性别" isLine>{{ mapGender(info.gender) }}</ai-info-item>
-            <ai-info-item label="添加时间" isLine>{{ info.addEndTime + '-' + info.addFromTime }}</ai-info-item>
-          </ai-wrapper>
+        <ai-wrapper>
+          <ai-info-item label="消息发送" isLine :value="info.taskTitle">
+            <div class="text">
+              <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
+              <i>{{ info.groupList.length }}</i>
+              <span>个居民</span>
+            </div>
+          </ai-info-item>
+          <ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
+          <ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
+          <ai-info-item label="剔除标签" isLine>{{ info.excludeFilterTagsName || '-' }}</ai-info-item>
+          <ai-info-item label="性别" isLine>{{ mapGender(info.gender) }}</ai-info-item>
+          <ai-info-item label="添加时间" isLine>{{ info.addEndTime + '-' + info.addFromTime }}</ai-info-item>
+        </ai-wrapper>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="isShowGroups = false">关闭</el-button>
+        </div>
       </ai-dialog>
       <div class="detail-phone" v-if="isShowPhone">
         <div class="mask"></div>
diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
index 77319c0a..5f896c32 100644
--- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
+++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Add.vue
@@ -53,11 +53,11 @@
                     </div>
                   </div>
                   <div class="tips">
-                    <p>消息预计送达居民群数：</p>
+                    <p>消息预计可见居民数：</p>
                     <span>{{ groupLen }}</span>
                     <el-tooltip
                         placement="top"
-                        content="将由指定群主发送给TA作为群主的所有的群，由于企业微信限制，当超过1000个时将只发送到最近活跃的1000个群">
+                        content="将由指定人员发送给TA添加的且符合所有筛选条件的居民，当多个人员添加同一个居民时，该居民只可看见第1个完成发表的人员的朋友圈">
                       <i class="iconfont iconModal_Warning"></i>
                     </el-tooltip>
                   </div>
@@ -335,7 +335,9 @@ export default {
     ...mapState(['user']),
 
     groupLen() {
-      return this.form.executorList.length
+      return this.form.executorList.map(v => v.customerCount).reduce((prev, cur) => {
+        return prev + cur
+      }, 0)
     }
   },
 
diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
index 5a68c6b9..9715a8dc 100644
--- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
+++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/Detail.vue
@@ -149,19 +149,23 @@
       <ai-dialog
         :visible.sync="isShowGroups"
         width="890px"
+        customFooter
         title="群发范围"
         @onConfirm="isShowGroups = false">
-          <ai-wrapper>
-            <ai-info-item label="消息发送" isLine :value="info.taskTitle">
-              <div class="text">
-                <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
-                <i>{{ info.executorList.length }}</i>
-                <span>个居民</span>
-              </div>
-            </ai-info-item>
-            <ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
-            <ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
-          </ai-wrapper>
+        <ai-wrapper>
+          <ai-info-item label="消息发送" isLine :value="info.taskTitle">
+            <div class="text">
+              <span>{{ info.sendScope === '0' ? '全部' : '按条件筛选的' }}</span>
+              <i>{{ info.executorList.length }}</i>
+              <span>个居民</span>
+            </div>
+          </ai-info-item>
+          <ai-info-item label="添加人" isLine :value="userNames"></ai-info-item>
+          <ai-info-item label="标签" isLine>{{ info.filterTagsName || '-' }}</ai-info-item>
+        </ai-wrapper>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="isShowGroups = false">关闭</el-button>
+        </div>
       </ai-dialog>
       <div class="detail-phone" v-if="isShowPhone">
         <div class="mask"></div>
@@ -212,7 +216,7 @@
         currIndex: 0,
         colConfigs1: [
           { slot: 'user', label: '成员' },
-          { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
+          { prop: 'groupCount', label: '预计发送朋友圈', align: 'center' }
         ],
         groups: [],
         timer: null,