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 @@
{{ currentMeetingInfo.hotelAddress }}
-
+
-
+
+
{{ item.hotelContacts + (item.hotelContactsPhone ?':':'') + item.hotelContactsPhone + ' ' }}
+
-
+
-
- {{ item.meetingContactsName + (item.meetingContactsPhone ?':': '') + item.meetingContactsPhone + ' ' }}
+
+
+ {{ item.meetingContactsName + (item.meetingContactsPhone ?':': '') + item.meetingContactsPhone + ' ' }}
+
@@ -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;
+ }
+}
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 {
\ No newline at end of file
+