From 07fac1c94e252adc7b1a2efe329a03db637b8147 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 25 Jul 2022 15:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppAnnounce/components/Detail.vue         | 42 +++++++++++++++++--
 .../Announce/AppAnnounce/components/List.vue  | 33 +++++++++++++--
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
index 07cc0051..cc835bb8 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/Detail.vue
@@ -125,6 +125,18 @@
                 :current.sync="search1.current"
                 :size.sync="search1.size"
                 @getList="getMemberInfo">
+                <el-table-column slot="user" label="成员" align="center">
+                  <template slot-scope="{ row }">
+                    <div class="userinfo">
+                      <span>
+                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
+                      </span>
+                      <span style="color: #999">
+                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
+                      </span>
+                    </div>
+                  </template>
+                </el-table-column>
               </ai-table>
             </div>
           </div>
@@ -175,6 +187,18 @@
                 :current.sync="search2.current"
                 :size.sync="search2.size"
                 @getList="getGroupInfo">
+                <el-table-column slot="user" label="群组" align="center">
+                  <template slot-scope="{ row }">
+                    <div class="userinfo">
+                      <span>
+                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
+                      </span>
+                      <span style="color: #999">
+                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
+                      </span>
+                    </div>
+                  </template>
+                </el-table-column>
               </ai-table>
             </div>
           </div>
@@ -222,15 +246,13 @@
         content: '',
         currIndex: 0,
         colConfigs1: [
-          { prop: 'groupOwnerId', label: '成员', openType: 'userName' },
-          { prop: 'mainDepartment', label: '成员所属部门', openType: 'departmentName', align: 'center' },
+          { slot: 'user', label: '成员', openType: 'userName' },
           { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
         ],
         colConfigs2: [
           { prop: 'groupName', label: '居民群' },
           { prop: 'memberCount', label: '群人数', align: 'center' },
-          { prop: 'groupOwnerId', label: '群主', openType: 'userName', align: 'center' },
-          { prop: 'mainDepartment', label: '群主所属部门', openType: 'departmentName', align: 'center' }
+          { slot: 'user', label: '群主', align: 'center' },
         ]
       }
     },
@@ -341,6 +363,18 @@
       display: flex;
       flex-wrap: wrap;
     }
+
+    .userinfo {
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+      line-height: 1;
+
+      span:first-child {
+        margin-bottom: 4px;
+      }
+    }
     .user {
       display: flex;
       align-items: center;
diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue
index 5016520e..64e66d57 100644
--- a/project/sass/apps/Announce/AppAnnounce/components/List.vue
+++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue
@@ -13,7 +13,7 @@
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">创建宣发</el-button>
           <ai-select
             v-model="search.status"
-            @change="search.current = 1, getList"
+            @change="search.current = 1, getList()"
             placeholder="任务状态"
             :selectList="dict.getDict('mstStatus')">
           </ai-select>
@@ -21,14 +21,16 @@
             v-model="search.startTime"
             type="date"
             size="small"
-            value-format="yyyy-MM-DD"
+            value-format="yyyy-MM-dd"
+            @change="search.current = 1, getList()"
             placeholder="选择群发开始日期">
           </el-date-picker>
           <el-date-picker
             v-model="search.endTime"
             type="date"
             size="small"
-            value-format="yyyy-MM-DD"
+            value-format="yyyy-MM-dd"
+            @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
         </template>
@@ -53,6 +55,18 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
+        <el-table-column slot="user" width="140px" fixed="right" label="创建人" align="center">
+          <template slot-scope="{ row }">
+            <div class="userinfo">
+              <span>
+                <ai-open-data type="userName" :openid="row.createUserId"></ai-open-data>
+              </span>
+              <span style="color: #999">
+                <ai-open-data type="departmentName" :openid="row.createUserSecondDept"></ai-open-data>
+              </span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
@@ -94,7 +108,7 @@ export default {
       colConfigs: [
         { prop: 'taskTitle', label: '任务名称' },
         { prop: 'sendType', label: '群发类型', formart: v => v === '0' ? '立即发送' : '定时发送', align: 'center' },
-        { prop: 'createUserId', label: '创建人', openType: 'userName', align: 'center' },
+        { slot: 'user', label: '创建人', openType: 'userName', align: 'center' },
         { prop: 'createTime', label: '群发时间', align: 'center' },
         { prop: 'status', label: '状态', formart: v => this.dict.getLabel('mstStatus', v), align: 'center' },
         { prop: 'completionRate', label: '任务完成率', align: 'center' }
@@ -171,5 +185,16 @@ export default {
 <style lang="scss" scoped>
   .AppAnnounce {
     height: 100%;
+    .userinfo {
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      justify-content: center;
+      line-height: 1;
+
+      span:first-child {
+        margin-bottom: 4px;
+      }
+    }
   }
 </style>