From a6765b529239a87cedaf2e5c880d9c2348ef21ec Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Fri, 3 Nov 2023 16:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E6=AF=8F=E7=B1=BB?=
 =?UTF-8?q?=E5=98=89=E5=AE=BE=E5=A2=9E=E5=8A=A0=E4=BD=8F=E5=AE=BF=E3=80=81?=
 =?UTF-8?q?=E5=90=83=E9=A5=AD=E3=80=81=E6=8E=A5=E7=AB=99=E7=9A=84=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/AddOrDetailMeet.vue            | 16 +++--
 .../incomePayments/meetManage/Attendance.vue  | 10 +--
 .../meetManage/SignUpInfoEdit.vue             | 10 +--
 .../meetManage/modules/SeminarVipForm.vue     | 70 +++++++++----------
 4 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 945bcbf..cee0113 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -256,7 +256,7 @@
             <div class="item-title">邀请码</div>
             <a-row :gutter="24">
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="VIP" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="VIP（吃饭+住宿+接站）" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入邀请码"
                            @change="event => event.target.value = event.target.value.trim()"
                            :maxLength='50'
@@ -265,7 +265,7 @@
               </a-col>
 
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="演讲嘉宾" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="演讲嘉宾（吃饭+接站）" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入邀请码"
                            @change="event => event.target.value = event.target.value.trim()"
                            :maxLength='50'
@@ -274,7 +274,7 @@
               </a-col>
 
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="特邀嘉宾" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="特邀嘉宾（接站）" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入邀请码"
                            @change="event => event.target.value = event.target.value.trim()"
                            :maxLength='50'
@@ -283,7 +283,7 @@
               </a-col>
 
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="合作伙伴" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="合作伙伴（只登记行程）" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入邀请码"
                            @change="event => event.target.value = event.target.value.trim()"
                            :maxLength='50'
@@ -292,7 +292,7 @@
               </a-col>
 
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="参展商类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="参展商类别（只登记行程）" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入邀请码"
                            @change="event => event.target.value = event.target.value.trim()"
                            :maxLength='50'
@@ -339,7 +339,7 @@
             <!--2023-10-23 wasic会议的时候存在-->
             <template v-if="isWasic">
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="1个及以下专题研讨费用" :labelCol="{ xs: {span: 24},sm: {span: 8}}" :wrapperCol="{ xs: {span: 24},sm: {span: 14}}">
+                <a-form-item label="1个及以下专题研讨费用" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入1个及以下专题研讨费用"
                            :maxLength='50'
                            @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
@@ -349,7 +349,7 @@
                 </a-form-item>
               </a-col>
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="2个及以上专题研讨费用" :labelCol="{ xs: {span: 24},sm: {span: 8}}" :wrapperCol="{ xs: {span: 24},sm: {span: 14}}">
+                <a-form-item label="2个及以上专题研讨费用" :labelCol="labelColTwo" :wrapperCol="wrapperColTwo">
                   <a-input placeholder="请输入2个及以上专题研讨费用"
                            :maxLength='50'
                            @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
@@ -571,6 +571,8 @@ export default {
         xs: {span: 24},
         sm: {span: 18}
       },
+      labelColTwo: { xs: {span: 24},sm: {span: 8}},
+      wrapperColTwo: { xs: {span: 24},sm: {span: 14}},
       remarksLabelCol: {
         xxl: {span: 3},
         xl: {span: 4},
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 15714d5..cca0809 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -118,19 +118,19 @@
         </a-row>
         <!-- 国际研讨会的邀请码-->
         <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
-          <label>VIP邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</span>
+          <label>VIP（吃饭+住宿+接站）邀请码：</label><span>{{ currentMeetingInfo.vipInvitationCode }}</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.speakerInvitationCode" :length="35" ></j-ellipsis></span>
+          <label style="min-width: 116px">演讲嘉宾（吃饭+接站）邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.speakerInvitationCode" :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.guestInvitationCode" :length="35"></j-ellipsis></span>
+          <label style="min-width: 116px">特邀嘉宾（接站）邀请码：</label><span><j-ellipsis :value="currentMeetingInfo.guestInvitationCode" :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.cooperativeInvitationCode" :length="35"></j-ellipsis></span>
+          <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>
+          <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">
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index aeb16fe..eefe4c6 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -57,11 +57,11 @@
             <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 1 && meetingType === '3' ">
               <a-form-item label="嘉宾类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-radio-group   v-decorator="['guestType',validatorRules.guestType]" @change="changeGuestType">
-                  <a-radio :value="1">VIP</a-radio>
-                  <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 :value="1">VIP（吃饭+住宿+接站）</a-radio>
+                  <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>
diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
index 4e9ec03..fa451f9 100644
--- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
+++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
@@ -1,8 +1,8 @@
 <template>
   <a-form :form="form">
     <!--演讲信息begin-->
-    <!-- 特邀嘉宾没有用餐信息-->
-    <template v-if="guestType !== 3 ">
+    <!-- 特邀嘉宾没有用餐信息 ;VIP || 演讲嘉宾 有-->
+    <template v-if="guestType === 1 ||  guestType === 2">
       <div class="item-title">演讲信息</div>
       <a-row :gutter="24">
         <a-col :xxl="8" :xl="12" :sm="24">
@@ -45,28 +45,30 @@
     </template>
     <!--演讲信息end-->
     <!--用餐信息begin-->
-    <!-- 合作伙伴不需要用餐信息 -->
-    <div class="item-title">用餐信息</div>
-    <a-row :gutter="24">
-      <a-col :xxl="8" :xl="12" :sm="24">
-        <a-form-item label="是否用餐" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group :disabled="isEditBool" v-decorator="['haveMeals',validatorRules.haveMealBools]"
-                         @change="selecthaveMealBools">
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-      </a-col>
-      <!--选择了用餐才会出现-->
-      <a-col :xxl="8" :xl="12" :sm="24" v-if="haveMealBool">
-        <a-form-item label="是否回民" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group :disabled="isEditBool" v-decorator="['huiPeople',validatorRules.huiPeople]">
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-      </a-col>
-    </a-row>
+    <!--  VIP || 演讲嘉宾 有 用餐信息 -->
+    <template v-if="guestType === 1 ||  guestType === 2">
+      <div class="item-title">用餐信息</div>
+      <a-row :gutter="24">
+        <a-col :xxl="8" :xl="12" :sm="24">
+          <a-form-item label="是否用餐" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-radio-group :disabled="isEditBool" v-decorator="['haveMeals',validatorRules.haveMealBools]"
+                           @change="selecthaveMealBools">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">否</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+        <!--选择了用餐才会出现-->
+        <a-col :xxl="8" :xl="12" :sm="24" v-if="haveMealBool">
+          <a-form-item label="是否回民" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-radio-group :disabled="isEditBool" v-decorator="['huiPeople',validatorRules.huiPeople]">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">否</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </template>
     <!--用餐信息end-->
     <!--住店信息begin-->
     <!--   特邀嘉宾 演讲嘉宾没有住店信息-->
@@ -147,6 +149,14 @@
                    v-decorator="[ 'arrivalShift',validatorRules.arrivalShift]"></a-input>
         </a-form-item>
       </a-col>
+      <!--需要做判断 增加 目的地 字段  演讲嘉宾 || 特邀嘉宾 存在-->
+      <a-col :xxl="8" :xl="12" :sm="24" v-if="guestType === 2 || guestType === 3">
+        <a-form-item label="目的地" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :disabled="isEditBool" placeholder="请输入目的地"
+                   @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
+                   v-decorator="['destination']"></a-input>
+        </a-form-item>
+      </a-col>
     </a-row>
     <a-row :gutter="24">
       <a-col :xxl="8" :xl="12" :sm="24">
@@ -188,18 +198,8 @@
         </a-form-item>
       </a-col>
     </a-row>
-    <a-row :gutter="24">
-      <a-col :xxl="8" :xl="12" :sm="24">
-        <a-form-item label="同行人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入同行人"
-                   :maxLength='50'
-                   :disabled="isEditBool"
-                   @change="event => event.target.value = event.target.value.trim()"
-                   v-decorator="[ 'peer']"></a-input>
-        </a-form-item>
-      </a-col>
 
-    </a-row>
+    <!--</a-row>-->
     <!--特邀嘉宾没有备注-->
     <a-row v-if="guestType!== 3" :gutter="24" style="transform: translateX(-4px)">
       <a-col>