From 5ad75b217f0b9d78f3d76d631153142c381955fa Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 23 Dec 2021 14:16:15 +0800
Subject: [PATCH] 25561

---
 .../AppMeetingChinaunion.vue                  |  2 +-
 .../AppMeetingChinaunion/components/add.vue   | 40 +++++++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index 139282f2..e51c222a 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -192,7 +192,7 @@ import meetingDetail from "./components/meetingDetail";
 
 export default {
   name: "AppMeetingChinaunion",
-  label: "三会一课(联通专版)",
+  label: "三会一课",
   props: {
     instance: Function,
     dict: Object,
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/add.vue b/packages/3.0.0/AppMeetingChinaunion/components/add.vue
index 1d9b7ff0..88358e67 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/add.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/add.vue
@@ -79,10 +79,9 @@
                   <div class="select-person" v-for="(item,index) in form.participantList" :key="item.name"
                        style="margin-bottom: 36px;">
                     <div class="person-pictrue" style="cursor: pointer;" @click="selectHost(index)">
-                      <img :src="item.avatarUrl" alt="" v-if="item.avatarUrl"
-                           style="position: absolute;left: 0;top:0;">
+                      <img :src="item.avatarUrl" alt="" v-if="item.avatarUrl">
                       <div
-                          style="overflow: hidden;width:40px;white-space: nowrap;background-color:#2266FF;border-radius:50%;"
+                          style="overflow: hidden;width:40px;height: 40px;lineHeight: 40px;white-space: nowrap;background-color:#2266FF;border-radius:50%;"
                           v-else>{{ item.name }}
                       </div>
                       <span class="host">主持人</span>
@@ -101,15 +100,16 @@
                       v-model="form.participantList"
                       :key="partyKey"
                       customOrg
-                      v-if="isShowChooseUser"
+                      v-if="isShowChooseUser && partyOrgIdList.length"
                       :disable="hostDisable"
                       :area-id="areaId"
+                      :partyList="partyOrgIdList"
                       :partyOrgList="form.appThreeMeetingOrganizationList"
                       @change="handleSelectParty">
-                    <div class="select-person add-person">
-                      <div class="add-icon"><span class="el-icon-plus icon-add"></span></div>
-                      <span class="person-name">选择</span>
-                    </div>
+                      <div class="select-person add-person">
+                        <div class="add-icon"><span class="el-icon-plus icon-add"></span></div>
+                        <span class="person-name">选择</span>
+                      </div>
                   </ai-party-member>
                 </el-form-item>
                 <span class="tips">*从党员用户中选择，必须设置一名主持人(点击与会人员头像设置或变更主持人)</span>
@@ -348,6 +348,7 @@ export default {
         isOnline: "0",
         isVote: "0"
       },
+      partyOrgIdList: [],
       signStart: "",
       signEnd: "",
       areaId: "",
@@ -443,6 +444,18 @@ export default {
       }
       this.form.participantList.splice(index, 1);
     },
+			getOrgList () {
+				this.$axios.post('/app/partyOrganization/queryAllChildren', null, {
+					params: {
+						id: this.user.info.organizationId || ''
+					}
+				}).then((res) => {
+					if (res && res.code == 0) {
+            this.partyOrgIdList = res.data
+						// this.isShow = true
+					}
+				})
+			},
     //选择主持人
     selectHost(index) {
       this.form.participantList.map(e => {
@@ -634,7 +647,7 @@ export default {
     // 查询所有党组织 树形结构
     searchSysAll() {
       this.instance
-      .post("/admin/partyOrganization/queryAllChildren", null, {
+      .post("/app/partyOrganization/queryAllChildren", null, {
         params: {id: this.user.info.organizationId}
       })
       .then(res => {
@@ -699,6 +712,7 @@ export default {
   },
   created() {
     this.areaId = this.user.info.areaId;
+    this.getOrgList()
     this.dict.load('yesOrNo', 'ThreeMeetingAnonymous', "meetingClassification", "feminderMethod", "addSignMethod", "postStatus").then(() => {
       this.searchSysAll();
       if (this.detail && this.detail.id) {
@@ -741,8 +755,8 @@ export default {
     height: 40px;
     display: inline-block;
     position: absolute;
-    left: 0;
-    top: 0;
+    left: 7px;
+    top: 6px;
     color: #ffffff;
     background-color: transparent;
     border-radius: 50%;
@@ -807,8 +821,8 @@ export default {
         position: relative;
 
         img {
-          width: 40px;
-          height: 40px;
+          width: 54px;
+          height: 54px;
           border-radius: 50%;
         }