[bug] -多个联系人及手机号 换行显示;标协会议显示字段错误

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"
+          <span class="mul-row-content">
-                v-for="(item,index) of currentMeetingInfo.hotelContactsList"
+            <span class="content"
-                :key="index">
+                  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"
+          <span class="mul-row-content">
-                v-for="(item,index) of currentMeetingInfo.meetingContactsList"
+            <span class="content"
-                :key="index">
+                  v-for="(item,index) of currentMeetingInfo.meetingContactsList"
-          {{ item.meetingContactsName +  (item.meetingContactsPhone ?'：': '') + item.meetingContactsPhone + ' ' }}</span>
+                  :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>

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>
+</style>