From 09381cedfc4cf4617941fdce1a42e71d4030357e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 1 Jul 2022 15:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E7=A0=94=E8=AE=A8=E4=BC=9A=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E5=B1=95=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/AddOrDetailMeet.vue  | 14 ++++++++++++--
 src/views/incomePayments/meetManage/Attendance.vue |  3 +++
 .../incomePayments/meetManage/SignUpInfoDetail.vue |  8 +++++---
 .../incomePayments/meetManage/SignUpInfoEdit.vue   |  5 +++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 86dfe80..0f1f16f 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -181,6 +181,16 @@
                            v-decorator="[ 'cooperativeInvitationCode',validateInviteCode.invitationCode]"></a-input>
                 </a-form-item>
               </a-col>
+
+              <a-col :xxl="8" :xl="12" :sm="24">
+                <a-form-item label="参展商类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入邀请码"
+                           @change="event => event.target.value = event.target.value.trim()"
+                           :maxLength='50'
+                           v-decorator="[ 'exhibitorInvitationCode',validateInviteCode.invitationCode]"></a-input>
+                </a-form-item>
+              </a-col>
+
             </a-row>
           </section>
           <!--邀请码end-->
@@ -641,7 +651,7 @@ export default {
         }
         // 如果是国际研讨会则赋值邀请码
         if (this.meetingType === '3') {
-          this.form.setFieldsValue(pick(this.model, 'vipInvitationCode', 'speakerInvitationCode', 'guestInvitationCode', 'cooperativeInvitationCode'))
+          this.form.setFieldsValue(pick(this.model, 'vipInvitationCode', 'speakerInvitationCode', 'guestInvitationCode', 'cooperativeInvitationCode','exhibitorInvitationCode'))
         }
 
       })
@@ -969,7 +979,7 @@ export default {
     * 校验邀请码
     * */
     validateCode(rule, value, callback) {
-      let codeObj = this.form.getFieldsValue(['cooperativeInvitationCode', 'vipInvitationCode', 'speakerInvitationCode', 'guestInvitationCode'])
+      let codeObj = this.form.getFieldsValue(['cooperativeInvitationCode','exhibitorInvitationCode', 'vipInvitationCode', 'speakerInvitationCode', 'guestInvitationCode'])
       let codeArr = Object.values(codeObj)
       codeArr = codeArr.filter(item => {
         return (item !== undefined && item !== '' && item !== null)
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 067d734..c876630 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -85,6 +85,9 @@
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
           <label style="min-width: 116px">合作伙伴邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.cooperativeInvitationCode" :length="35"></j-ellipsis></span>
         </a-col>
+        <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
+          <label style="min-width: 116px">参展商类别邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.exhibitorInvitationCode" :length="35"></j-ellipsis></span>
+        </a-col>
       </a-row>
       <a-row class="flex-col">
         <a-col>
diff --git a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
index 012e988..78840f0 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoDetail.vue
@@ -139,7 +139,7 @@
         <!--邮寄信息end-->
       </div>
       <!--国际研讨会选择嘉宾身份-->
-      <div v-if="meetingType === '3' && model.identity === 1 && model.guestType !== 4 ">
+      <div v-if="meetingType === '3' && model.identity === 1 && model.guestType !== 4 && model.guestType !== 5 ">
         <!--演讲信息begin-->
         <template v-if="model.guestType !== 3">
           <div class="item-title">演讲信息</div>
@@ -249,8 +249,8 @@
       <!--合作伙伴行程信息-->
 
       <!--合作伙伴行程信息begin-->
-      <template v-if="model.guestType === 4 && meetingType === '3'  ">
-        <div class="item-title">合作伙伴行程信息</div>
+      <template v-if="(model.guestType === 4 || model.guestType === 5) && meetingType === '3'  ">
+        <div class="item-title">{{model.guestType === 4 ? '合作伙伴':'参展商'}}行程信息</div>
         <a-row :gutter="24">
           <a-col :xxl="8" :xl="12" :sm="24">
             <label class="label">抵达时间：</label><span>{{ model.arrivalTime }}</span>
@@ -308,6 +308,8 @@ export default {
           return '特邀嘉宾'
         case 4:
           return '合作伙伴'
+        case 5:
+          return '参展商'
       }
     }
   }
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index a62f1b8..fd6cf27 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -80,6 +80,7 @@
                   <a-radio :value="2">演讲嘉宾</a-radio>
                   <a-radio :value="3">特邀嘉宾</a-radio>
                   <a-radio :value="4">合作伙伴</a-radio>
+                  <a-radio :value="5">参展商</a-radio>
                 </a-radio-group>
               </a-form-item>
             </a-col>
@@ -108,8 +109,8 @@
           <template v-if="identifyType === 1 && guestType === 3">
             <seminar-vip-form ref="seminarVipForm" @formData="getFormData" :guest-type="guestType"></seminar-vip-form>
           </template>
-          <!-- 国际研讨会身份选择嘉宾 并且是合作伙伴-->
-          <template v-if="identifyType === 1 && guestType === 4">
+          <!-- 国际研讨会身份选择嘉宾 并且是合作伙伴或者是参展商类别-->
+          <template v-if="identifyType === 1 && (guestType === 4 || guestType === 5)">
             <seminar-partner-form ref="seminarPartnerForm" @formData="getFormData"></seminar-partner-form>
           </template>