From dd81c894e02429a4c71d0569628a7ae36dd9e5d5 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 18 Aug 2022 17:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8C=E5=AE=A3=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Announce/AppAnnounce/components/Add.vue   | 37 ++++++++-----------
 .../AppAnnounce/components/Detail.vue         | 32 +++++++---------
 .../Announce/AppAnnounce/components/List.vue  | 21 +++++------
 3 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
index 5115b668..b8d8cf0d 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -34,12 +34,7 @@
                     <div class="AppAnnounceDetail-select">
                       <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
                       <div class="select-left" v-if="form.wxGroups.length">
-                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">
-                          <ai-open-data
-                            type="userName"
-                            :openid="item.groupOwnerId">
-                            </ai-open-data>
-                        </span>
+                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">{{ item.groupOwnerName }}</span>
                         <em v-if="form.wxGroups.length > 9">等{{ form.wxGroups.length }}个</em>
                       </div>
                       <i v-if="!form.wxGroups.length">请选择</i>
@@ -150,18 +145,16 @@
                   </el-switch>
                 </el-form-item>
                 <el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
-                  <ai-user-get :instance="instance" v-model="form.examines" @change="onUserChange">
+                  <ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
                     <div class="AppAnnounceDetail-select">
                       <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
                       <div class="select-left" v-if="form.examines.length">
-                        <span v-for="(item, index) in form.examines" :key="index">
-                          <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
-                        </span>
+                        <span v-for="(item, index) in form.examines" :key="index">{{ item.name }}</span>
                       </div>
                       <i v-if="!form.examines.length">请选择</i>
                         <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
                     </div>
-                  </ai-user-get>
+                  </ai-wechat-selecter>
                 </el-form-item>
               </div>
             </template>
@@ -249,21 +242,21 @@
           </el-form>
         </ai-dialog>
         <ai-dialog
-            :visible.sync="isShowDate"
-            width="590px"
-            title="定时发送"
-            customFooter>
+          :visible.sync="isShowDate"
+          width="590px"
+          title="定时发送"
+          customFooter>
           <el-form ref="dateForm" :model="dateForm" label-width="130px" label-position="right">
             <div class="ai-form">
               <el-form-item label="定时发送时间" style="width: 100%;" prop="choiceTime" :rules="[{ required: true, message: '请选择定时发送时间', trigger: 'change' }]">
                 <el-date-picker
-                    style="width: 100%;"
-                    v-model="dateForm.choiceTime"
-                    type="datetime"
-                    size="small"
-                    :picker-options="pickerOptions"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="请选择定时发送时间">
+                  style="width: 100%;"
+                  v-model="dateForm.choiceTime"
+                  type="datetime"
+                  size="small"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择定时发送时间">
                 </el-date-picker>
               </el-form-item>
             </div>
diff --git a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
index 7396255c..c29062da 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
@@ -25,15 +25,15 @@
             <ai-info-item label="创建人" isLine>
               <div class="user">
                 <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                <span><ai-open-data type="userName" :openid="info.createUserId"></ai-open-data></span>
-                （<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>）
+                <span>{{ info.createUserName }}</span>
+                （<span>{{ info.createUserDeptName }}</span>）
               </div>
             </ai-info-item>
             <ai-info-item label="审批人" isLine v-if="info.enableExamine === '1'">
               <div class="user-wrapper">
                 <div class="user" v-for="(item, index) in info.examines" :key="index">
                   <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <span><ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data></span>
+                  <span>{{ item.name }}</span>
                 </div>
               </div>
             </ai-info-item>
@@ -121,7 +121,7 @@
                     :instance="instance"
                     @pick="e => onUserChange(e, 'search1')" :multiple="false" v-model="user1">
                     <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
+                      <span style="color: #606266;" v-if="search1.deptartId">{{ name1 }}</span>
                       <span v-else>部门</span>
                       <i class="el-icon-arrow-up"  v-if="!search1.deptartId"></i>
                       <i class="el-icon-circle-close" v-if="search1.deptartId" @click.stop="user1 = [], search1.deptartId = '', search1.current = 1, getMemberInfo()"></i>
@@ -142,12 +142,8 @@
                 <el-table-column slot="user" label="成员" align="left">
                   <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>
+                      <span>{{ row.groupOwnerName }}</span>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -195,7 +191,7 @@
                     :instance="instance"
                     @pick="e => onUserChange(e, 'search2')" :multiple="false" v-model="user2">
                     <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
+                      <span style="color: #606266;" v-if="search2.deptartId">{{ name2 }}</span>
                       <span v-else>部门</span>
                       <i class="el-icon-arrow-up"  v-if="!search2.deptartId"></i>
                       <i class="el-icon-circle-close" v-if="search2.deptartId" @click.stop="user1 = [], search2.deptartId = '', search2.current = 1, getGroupInfo()"></i>
@@ -216,12 +212,8 @@
                 <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>
+                      <span>{{ row.groupOwnerName }}</span>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -276,6 +268,8 @@
         total2: 0,
         user1: [],
         user2: [],
+        name1: '',
+        name2: '',
         radio1: '未执行',
         search1: {
           current: 1,
@@ -300,7 +294,7 @@
         content: '',
         currIndex: 0,
         colConfigs3: [
-          { prop: 'groupOwnerId', label: '群主', openType: 'userName' },
+          { prop: 'groupOwnerName', label: '群主', openType: 'userName' },
           { prop: 'groupNames', label: '群名称' }
         ],
         colConfigs1: [
@@ -352,9 +346,11 @@
 
       onUserChange (e, search) {
         if (e.length) {
+          search === 'search1' ? this.name1 = e[0].name : this.name2 = e[0].name
           this[search].deptartId = e[0].id
         } else {
           this[search].deptartId = ''
+          search === 'search1' ? this.name1 = '' : this.name2 = ''
         }
 
         this[search].current = 1
diff --git a/packages/wxwork/Announce/AppAnnounce/components/List.vue b/packages/wxwork/Announce/AppAnnounce/components/List.vue
index 123eea3a..23a4130f 100644
--- a/packages/wxwork/Announce/AppAnnounce/components/List.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue
@@ -33,14 +33,14 @@
             @change="search.current = 1, getList()"
             placeholder="选择群发结束日期">
           </el-date-picker>
-          <ai-user-get :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
             <div class="userSelcet">
-              <span style="color: #606266;" v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
+              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
               <span v-else>创建人</span>
               <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', search.current = 1, getList()"></i>
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
             </div>
-          </ai-user-get>
+          </ai-wechat-selecter>
         </template>
         <template slot="right">
           <el-input
@@ -66,12 +66,8 @@
         <el-table-column slot="user" width="140px" 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.createUserDept"></ai-open-data>
-              </span>
+              <span>{{ row.createUserName }}</span>
+              <span style="color: #999">{{ row.createUserDeptName }}</span>
             </div>
           </template>
         </el-table-column>
@@ -110,6 +106,7 @@
           startTime: '',
           endTime: ''
         },
+        name: '',
         user: [],
         tableData: [],
         loading: false,
@@ -145,9 +142,11 @@
     methods: {
       onUserChange (e) {
         if (e.length) {
-          this.search.createUserId = e[0].wxOpenUserId
+          this.name = e[0].name
+          this.search.createUserId = e[0].id
         } else {
           this.search.createUserId = ''
+          this.name = ''
         }
 
         this.search.current = 1