From 0117fbdd8b558ee25caaa29783c563c56db1401c Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 7 Jan 2022 16:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=9A=E8=AE=AE=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/AddOrDetailMeet.vue |  3 ++-
 src/views/signUp/SignUpEntrance.vue               | 15 +++++++++++++--
 src/views/signUp/SignUpPage.vue                   | 14 ++++++++++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 48089ec..08225c6 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -251,8 +251,9 @@
                     <select-principal placeholder="请选择会议联系人"
                                       :index="index"
                                       @change="selectMeetingContact"
-                                      v-decorator="['meetingContactsList['+index+'].meetingContactsId',validateInviteCode.meetingContactsId]">
+                                      v-decorator="['meetingContactsList['+index+'].meetingContactsId']">
                     </select-principal>
+<!--                    ,validateInviteCode.meetingContactsId-->
                   </a-form-item>
                 </a-col>
                 <a-col :xxl="8" :xl="10" :md="12">
diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue
index c0c7d35..ca43f77 100644
--- a/src/views/signUp/SignUpEntrance.vue
+++ b/src/views/signUp/SignUpEntrance.vue
@@ -37,6 +37,13 @@
 <!--              <span>{{ currentMeetingInfo.estimatedNumber }}</span>-->
 <!--            </a-col>-->
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12"  v-for="(item,index) of currentMeetingInfo.meetingContactsList"
+                   :key="index">
+              <label>会议联系人及手机号：</label>
+              <span> {{ item.meetingContactsName +  (item.meetingContactsPhone ?'：': '') + item.meetingContactsPhone + ' ' }}</span>
+            </a-col>
+          </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
               <label>召开时间：</label>
@@ -44,13 +51,13 @@
             </a-col>
             <a-col :span="12">
               <label>会议内容：</label>
-              <span>{{ currentMeetingInfo.meetingContent }}</span>
+              <span class="word-beak">{{ currentMeetingInfo.meetingContent }}</span>
             </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
               <label>备注：</label>
-              <span>{{ currentMeetingInfo.remark }}</span>
+              <span class="word-beak">{{ currentMeetingInfo.remark }}</span>
             </a-col>
           </a-row>
           <a-row :gutter="24">
@@ -318,4 +325,8 @@ export default {
   height: 140px;
 }
 
+.word-beak {
+  word-break: break-all;
+}
+
 </style>
\ No newline at end of file
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index 3f203ed..c31867b 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -47,6 +47,13 @@
 <!--              <span>{{ currentMeetingInfo.estimatedNumber }}</span>-->
 <!--            </a-col>-->
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12"  v-for="(item,index) of currentMeetingInfo.meetingContactsList"
+                   :key="index">
+              <label>会议联系人及手机号：</label>
+              <span> {{ item.meetingContactsName +  (item.meetingContactsPhone ?'：': '') + item.meetingContactsPhone + ' ' }}</span>
+            </a-col>
+          </a-row>
           <a-row :gutter="24">
             <a-col :span="12">
               <label>召开时间：</label>
@@ -54,7 +61,7 @@
             </a-col>
             <a-col :span="12">
               <label>会议内容：</label>
-              <span>{{ currentMeetingInfo.meetingContent }}</span>
+              <span class="word-beak">{{ currentMeetingInfo.meetingContent }}</span>
             </a-col>
           </a-row>
           <a-row :gutter="24">
@@ -76,7 +83,7 @@
           <a-row>
             <a-col :span="24">
               <label>备注：</label>
-              <span>{{ currentMeetingInfo.remark }}</span>
+              <span class="word-beak">{{ currentMeetingInfo.remark }}</span>
             </a-col>
           </a-row>
         </section>
@@ -837,4 +844,7 @@ export default {
   text-align: center;
   margin-bottom: 10px;
 }
+.word-beak {
+  word-break: break-all;
+}
 </style>
\ No newline at end of file