From 05e60d49514fb4bd97d7d3c4c9da2c204e478639 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 6 Jan 2022 20:24:34 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=20-=E5=A4=9A=E4=B8=AA=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=8A=E6=89=8B=E6=9C=BA=E5=8F=B7=20=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA;=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  | 33 ++++++++++++++-----
 .../projectManagement/CommitteeMeeting.vue    | 11 +++++--
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index d3292cb..067d734 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -54,19 +54,23 @@
           <label>酒店地址：</label><span>{{ currentMeetingInfo.hotelAddress }}</span>
         </a-col>
 
-        <a-row  class="flex-col">
+        <a-row  class="flex-col mul-row-row">
           <label class="label">酒店联系人及手机号：</label>
-          <span class="content"
-                v-for="(item,index) of currentMeetingInfo.hotelContactsList"
-                :key="index">
+          <span class="mul-row-content">
+            <span class="content"
+                  v-for="(item,index) of currentMeetingInfo.hotelContactsList"
+                  :key="index">
           {{ item.hotelContacts +  (item.hotelContactsPhone ?'：':'') + item.hotelContactsPhone + ' ' }}</span>
+          </span>
         </a-row>
-        <a-row  class="flex-col">
+        <a-row  class="flex-col mul-row-row">
           <label class="label">会议联系人及手机号：</label>
-          <span class="content"
-                v-for="(item,index) of currentMeetingInfo.meetingContactsList"
-                :key="index">
-          {{ item.meetingContactsName +  (item.meetingContactsPhone ?'：': '') + item.meetingContactsPhone + ' ' }}</span>
+          <span class="mul-row-content">
+            <span class="content"
+                  v-for="(item,index) of currentMeetingInfo.meetingContactsList"
+                  :key="index">
+            {{ item.meetingContactsName +  (item.meetingContactsPhone ?'：': '') + item.meetingContactsPhone + ' ' }}</span>
+          </span>
         </a-row>
         <!-- 国际研讨会的邀请码-->
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
@@ -949,4 +953,15 @@ export default {
   font-style: normal;
   cursor: pointer;
 }
+// 多个联系人及手机号 换行显示
+.mul-row-row{
+  display: flex;
+  clear: both;
+}
+.mul-row-content{
+  display: block;
+  .content{
+    display: block;
+  }
+}
 </style>
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index e4b705c..ef3af17 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -214,7 +214,14 @@ export default {
           align: 'center',
           dataIndex: 'meetingType_dictText',
           width: 120,
-          scopedSlots: {customRender: 'text'}
+          customRender: (text, record) => {
+            if(text !== '标协会议') {
+              return text
+            } else {
+              return record.tbMeetingType_dictText
+            }
+          }
+          // scopedSlots: {customRender: 'text'}
         },
         {
           title: '负责人',
@@ -491,4 +498,4 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+</style>