From 36cd6f8dd23cd92a0da2278ff7978a12fb88d925 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 1 Jul 2022 13:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8F=82?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E5=92=8C=E5=86=85=E9=83=A8=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=20=E4=B8=8D=E5=B1=95=E7=A4=BA=E8=A1=8C=E7=A8=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signUpForm/OtherMeetingForm.vue           | 72 +++++++------------
 src/views/signUp/SignUpPage.vue               |  6 +-
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/src/components/signUpForm/OtherMeetingForm.vue b/src/components/signUpForm/OtherMeetingForm.vue
index 46ca434..b9a2343 100644
--- a/src/components/signUpForm/OtherMeetingForm.vue
+++ b/src/components/signUpForm/OtherMeetingForm.vue
@@ -1,33 +1,33 @@
 <template>
   <a-form :form="form">
-    <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 v-decorator="['checkInHotel']">
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-      </a-col>
-    </a-row>
-    <a-row :gutter="24">
+<!--    <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 v-decorator="['checkInHotel']">-->
+<!--            <a-radio :value="1">是</a-radio>-->
+<!--            <a-radio :value="0">否</a-radio>-->
+<!--          </a-radio-group>-->
+<!--        </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">
-          <j-date placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true" :disabled-date="disabledStartDate"
-                  date-format="YYYY-MM-DD"/>
-        </a-form-item>
-      </a-col>
+<!--      <a-col :xxl="8" :xl="12" :sm="24">-->
+<!--        <a-form-item label="抵达时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <j-date placeholder="请选择抵达时间" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true" :disabled-date="disabledStartDate"-->
+<!--                  date-format="YYYY-MM-DD"/>-->
+<!--        </a-form-item>-->
+<!--      </a-col>-->
 
-      <a-col :xxl="8" :xl="12" :sm="24">
-        <a-form-item label="离开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择离开时间" :disabled-date="disabledEndDate" style="width: 100%;"
-                  v-decorator="['departureTime']" :trigger-change="true"
-                  date-format="YYYY-MM-DD"/>
-        </a-form-item>
-      </a-col>
-    </a-row>
+<!--      <a-col :xxl="8" :xl="12" :sm="24">-->
+<!--        <a-form-item label="离开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <j-date placeholder="请选择离开时间" :disabled-date="disabledEndDate" style="width: 100%;"-->
+<!--                  v-decorator="['departureTime']" :trigger-change="true"-->
+<!--                  date-format="YYYY-MM-DD"/>-->
+<!--        </a-form-item>-->
+<!--      </a-col>-->
+<!--    </a-row>-->
     <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
     <!--    会议费为0不显示 -->
     <template v-if="!meetingCostBool">
@@ -54,23 +54,7 @@
                                placeholder="请选择发票类型"></j-dict-select-tag>
           </a-form-item>
         </a-col>
-        <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
-        <!--        <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool  ">-->
-        <!--          <a-form-item label="付款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-        <!--            <j-image-upload :disabled="isEditBool" v-decorator="['paymentRecord']" :return-id="true"></j-image-upload>-->
-        <!--          </a-form-item>-->
-        <!--        </a-col>-->
-        <!--缴费方式为线上的需要上传 -->
-        <!--       暂时注释  2021 10 14 author: fac  需求说是 不在报名和添加参会人的时候去上传 缴费凭证和订单后四位-->
-        <!--        <a-col :xxl="8" :xl="12" :sm="24" v-if="onlinePayModeBool">-->
-        <!--          <a-form-item label="订单号后四位" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-        <!--            <a-input placeholder="请输入订单号后四位"-->
-        <!--                     :maxLength='4'-->
-        <!--                     :disabled="isEditBool"-->
-        <!--                     @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"-->
-        <!--                     v-decorator="[ 'orderCode',validatorRules.orderCode]"></a-input>-->
-        <!--          </a-form-item>-->
-        <!--        </a-col>-->
+
       </a-row>
     </template>
     <!--    其他会议选择嘉宾和内部企业、缴费方式为打包也不显示-->
@@ -118,7 +102,6 @@
 </template>
 
 <script>
-import JDate from '@comp/jero/JDate'
 import SelectContacts from '@comp/company/SelectContacts'
 import pick from 'lodash.pick'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
@@ -128,7 +111,6 @@ import {getContactsById} from '@api/incomePaymentsApi'
 export default {
   name: 'OtherMeetingForm',
   components: {
-    JDate,
     // JImageUpload,
     SelectContacts,
     JDictSelectTag
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index 6a1e4a9..ad8afee 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -186,7 +186,7 @@
                 <other-meeting-form ref="formother" :selected-company="selectedCompany"
                                     :meeting-cost-bool="meetingCostBool"
                                     :identify-type="identifyType" @formData="getFormData"
-                                    @isPack="isPack"></other-meeting-form>
+                                   ></other-meeting-form>
               </template>
 
               <!--国际研讨会参会人与内部企业的显示 默认不展示  -->
@@ -673,7 +673,7 @@ export default {
     * 下一步
     * */
     nextSetp() {
-      this.form.validateFields(['code'],(err) => {
+      this.form.validateFields(['invitationCode'],(err) => {
         if(!err){
           // 获取邀请码
           let currentCode = this.form.getFieldValue('invitationCode')
@@ -747,7 +747,7 @@ export default {
         this.guestType = null
         this.meetingCostSum = this.currentMeetingInfo.meetingCosts
       } else {
-        this.$message.success('邀请码填写正确')
+        // this.$message.success('邀请码填写正确')
         this.meetingCostSum =  '0.00'
       }
     },