From 585d896cc3f413f7e9e7b4259b99e646575a5ca4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 16:16:05 +0800
Subject: [PATCH] BUG 25559

---
 .../AppMeetingChinaunion.vue                  | 27 ++++++++++++++++---
 .../AppMeetingChinaunion/components/add.vue   |  4 +--
 .../components/meetingDetail.vue              |  2 +-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index e51c222a..c4670d78 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -3,8 +3,15 @@
     <ai-list v-if="showList">
       <ai-title title="三会一课" isShowBottomBorder slot="title">
         <template #rightBtn>
-          <ai-party :instance="instance" v-model="partyId" :topOrgId="topOrgId" size="small"
-                    style="display:inline-block" @origin="changeParty"/>
+          <ai-party :instance="instance" v-model="partyId" :topOrgId="topOrgId" :name.sync="partyOrgLabel"
+                    style="display:inline-block" @origin="changeParty" customClicker>
+            <el-input size="small" v-model="partyOrgLabel" readonly placeholder="选择党组织">
+              <el-row slot="append" type="flex" class="partyPicker">
+                <i class="iconfont icondangyuan"/>
+                <div v-text="`切换党组织`"/>
+              </el-row>
+            </el-input>
+          </ai-party>
           <el-button icon="iconfont iconNav_DataCenter" size="small" type="primary" @click="showStatistics()">会议统计
           </el-button>
           <el-button icon="iconfont iconSetting" size="small" type="primary" @click="toMeetSet()">设置</el-button>
@@ -235,6 +242,7 @@ export default {
       totalTitleList: [],
       pieData: {},
       pieChart: [],
+      partyOrgLabel: ""
     }
   },
   methods: {
@@ -413,10 +421,23 @@ export default {
 .AppMeetingChinaunion {
   height: 100%;
 
-  ::v-deep .ai-party {
+  ::v-deep .ai-partyorg {
     .el-dialog__header, .el-dialog__footer {
       line-height: 1 !important;
     }
+
+    .el-input-group__append {
+      background: rgba(245, 245, 245, 1);
+    }
+
+    .el-input__inner {
+      direction: rtl;
+    }
+
+    .partyPicker {
+      gap: 8px;
+      align-items: center;
+    }
   }
 
   .pieList {
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/add.vue b/packages/3.0.0/AppMeetingChinaunion/components/add.vue
index e764d7f5..d1e45dc6 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/add.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/add.vue
@@ -394,7 +394,6 @@ export default {
     filterText(val) {
       this.$refs.partyTree.filter(val);
     },
-
     selectParty(newVal) {
       ++this.partyKey
 
@@ -413,7 +412,6 @@ export default {
       this.$set(this.form, 'chargeOfSignInList', [])
       this.$set(this.form, 'participantList', [])
     },
-
     form: {
       handler(newVal) {
         if (newVal.startTime && newVal.meetingBefore) {
@@ -590,7 +588,7 @@ export default {
 
     //获取会议详请
     getDetailInfo() {
-      this.instance.post(`/app/appthreemeetinginfo/queryDetailById?id=${this.detail.id}`).then(res => {
+      this.detail.id && this.instance.post(`/app/appthreemeetinginfo/queryDetailById?id=${this.detail.id}`).then(res => {
         if (res && res.data) {
           this.form = res.data
           this.form.meetingClassification = res.data.meetingClassification.split(",");
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
index 1085c740..d96f4049 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
@@ -429,7 +429,7 @@ export default {
     },
     //获取会议详请
     getDetailInfo() {
-      this.instance.post(`/app/appthreemeetinginfo/queryDetailById?id=${this.detail.id}`).then(res => {
+      this.detail.id&& this.instance.post(`/app/appthreemeetinginfo/queryDetailById?id=${this.detail.id}`).then(res => {
         if (res?.data) {
           res.data.annex = JSON.parse(res.data.annex);
           res.data.meetingClassification = res.data.meetingClassification.split(',');