From d7f0b63eb95a6ca9a5d8d95aa43c9f09dcf5eb7e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 27 Jul 2022 17:19:40 +0800
Subject: [PATCH 1/3] 30638

---
 .../sass/apps/Announce/AppAnnounce/components/List.vue   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue
index bafc2f69..d4e36b22 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/List.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue
@@ -116,7 +116,7 @@
         total: 0,
         colConfigs: [
           { prop: 'taskTitle', label: '任务名称' },
-          { prop: 'sendType', label: '群发类型', formart: v => v === '0' ? '立即发送' : '定时发送', align: 'center' },
+          { prop: 'typeName', label: '群发类型', align: 'center' },
           { slot: 'user', label: '创建人', openType: 'userName', align: 'center' },
           { prop: 'choiceTime', label: '群发时间', align: 'center' },
           {
@@ -162,7 +162,12 @@
           }
         }).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records
+            this.tableData = res.data.records.map(v => {
+              return {
+                ...v,
+                typeName: '群发居民群'
+              }
+            })
             this.total = res.data.total
 
             this.$nextTick(() => {

From fb491446c77bf8092cff26c7560e1bdd2d167702 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 27 Jul 2022 17:23:12 +0800
Subject: [PATCH 2/3] 30574

---
 .../apps/Announce/AppAnnounce/components/Detail.vue    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
index f173f356..d798a474 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
@@ -88,7 +88,7 @@
                 <div class="top-item__title">
                   <h3>未执行成员</h3>
                 </div>
-                <p>{{ memberInfo.cannotExecuteCount || 0 }}</p>
+                <p>{{ memberInfo.unExecutedCount || 0 }}</p>
               </div>
               <div class="top-item">
                 <div class="top-item__title">
@@ -105,7 +105,7 @@
                     <i class="iconfont iconDetails"></i>
                   </el-tooltip>
                 </div>
-                <p>{{ memberInfo.unExecutedCount || 0 }}</p>
+                <p>{{ memberInfo.cannotExecuteCount || 0 }}</p>
               </div>
             </div>
             <div class="bottom">
@@ -162,19 +162,19 @@
                 <div class="top-item__title">
                   <h3>未送达居民群</h3>
                 </div>
-                <p>{{ groupInfo.planCount || 0 }}</p>
+                <p>{{ groupInfo.unExecutedCount || 0 }}</p>
               </div>
               <div class="top-item">
                 <div class="top-item__title">
                   <h3>已送达居民群</h3>
                 </div>
-                <p>{{ groupInfo.planCount || 0 }}</p>
+                <p>{{ groupInfo.executedCount || 0 }}</p>
               </div>
               <div class="top-item">
                 <div class="top-item__title">
                   <h3>无法送达居民群</h3>
                 </div>
-                <p>{{ groupInfo.planCount || 0 }}</p>
+                <p>{{ groupInfo.cannotExecuteCount || 0 }}</p>
               </div>
             </div>
             <div class="bottom">

From 9d0047e071770ef62ce02be34e0e491aab91169a Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 27 Jul 2022 17:25:38 +0800
Subject: [PATCH 3/3] 30636

---
 project/sass/apps/Announce/AppAnnounce/components/Detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
index d798a474..c94d58bd 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
@@ -118,7 +118,7 @@
                   </el-radio-group>
                   <div class="userSelcet" placeholder="请选择创建人">
                     <span v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
-                    <span v-else>请选择</span>
+                    <span v-else>请选择部门</span>
                     <ai-user-get :instance="instance" @change="e => onUserChange(e, 'search1')" isChooseUnit :isMultiple="false" v-model="user1">
                       <div class="select-btn">选择</div>
                     </ai-user-get>
@@ -187,7 +187,7 @@
                   </el-radio-group>
                   <div class="userSelcet" placeholder="请选择创建人">
                     <span v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
-                    <span v-else>请选择</span>
+                    <span v-else>请选择部门</span>
                     <ai-user-get :instance="instance"  @change="e => onUserChange(e, 'search2')" isChooseUnit :isMultiple="false" v-model="user2">
                       <div class="select-btn">选择</div>
                     </ai-user-get>