From 7c8f0e18e2afec85e41a9e7971af7297a8d77ab8 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 20 Oct 2021 19:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E7=A0=94=E8=AE=A8=E4=BC=9A=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E7=9A=84=E6=8B=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  |  8 +-
 .../meetManage/OtherMeetingForm.vue           | 87 ++++++++++---------
 src/views/signUp/SignUpEntrance.vue           |  2 +-
 src/views/signUp/SignUpPage.vue               |  8 +-
 4 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 74e3804..dd049d5 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -154,7 +154,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="身份">
-                <j-dict-select-tag v-model="queryParam.identity" placeholder="请选择身份"
+                <j-dict-select-tag v-model="queryParam.identity" placeholder="请选择身份" @input="selectIdentity"
                                    dictCode="meet_identify_type"/>
               </a-form-item>
             </a-col>
@@ -624,6 +624,12 @@ export default {
     }
   },
   methods: {
+    selectIdentity(){
+      console.log(this.queryParam.identity)
+      if(this.queryParam.identity !== '1'){
+       delete  this.queryParam.guestType
+      }
+    },
     /*
     *  审核
     * */
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 2e83492..bb78d1a 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -28,6 +28,49 @@
     </a-row>
     <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
     <!--    会议费为0不显示 -->
+    <template v-if="!meetingCostBool">
+      <div class="item-title" v-if="identifyType === 2 && !payModeBool">缴费信息</div>
+      <a-row :gutter="24">
+        <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2">
+          <a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-radio-group v-decorator="['payMode',validatorRules.payMode]" :disabled="isEditBool" @change="changePayMode">
+              <a-radio :value="1">汇款</a-radio>
+              <a-radio :value="2">线上缴费</a-radio>
+              <a-radio :value="3">打包</a-radio>
+            </a-radio-group>
+          </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-dict-select-tag style="width: 100%" dict-code="invoice_type"
+                               v-decorator="['needInvoice',validatorRules.needInvoice]"
+                               :trigger-change="true"
+                               :disabled="isEditBool"
+                               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>
+    <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
+    <!--    会议费为0不显示 -->
     <template v-if="!meetingCostBool">
       <div class="item-title" v-if="identifyType === 2 && !payModeBool ">邮寄信息</div>
       <a-row :gutter="24">
@@ -66,49 +109,7 @@
       </a-row>
     </template>
 
-    <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
-    <!--    会议费为0不显示 -->
-    <template v-if="!meetingCostBool">
-      <div class="item-title" v-if="identifyType === 2 && !payModeBool">缴费信息</div>
-      <a-row :gutter="24">
-        <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2">
-          <a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-radio-group v-decorator="['payMode',validatorRules.payMode]" :disabled="isEditBool" @change="changePayMode">
-              <a-radio :value="1">汇款</a-radio>
-              <a-radio :value="2">线上缴费</a-radio>
-              <a-radio :value="3">打包</a-radio>
-            </a-radio-group>
-          </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-dict-select-tag style="width: 100%" dict-code="invoice_type"
-                               v-decorator="['needInvoice',validatorRules.needInvoice]"
-                               :trigger-change="true"
-                               :disabled="isEditBool"
-                               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>
+
   </a-form>
 </template>
 
diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue
index f60f157..83522e6 100644
--- a/src/views/signUp/SignUpEntrance.vue
+++ b/src/views/signUp/SignUpEntrance.vue
@@ -26,7 +26,7 @@
           <a-row :gutter="24">
             <a-col :span="12">
               <label>负责人：</label>
-              <span>{{ currentMeetingInfo.directorName }}</span>
+              <span>{{ currentMeetingInfo.directorName }} {{currentMeetingInfo.directorPhone}}</span>
             </a-col>
             <a-col :span="12">
               <label>预计参加人数：</label>
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index ac852fe..4a2e48c 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -36,7 +36,7 @@
           <a-row :gutter="24">
             <a-col :span="12">
               <label>负责人：</label>
-              <span>{{ currentMeetingInfo.directorName }}</span>
+              <span>{{ currentMeetingInfo.directorName }}({{ currentMeetingInfo.directorPhone }})</span>
             </a-col>
             <a-col :span="12">
               <label>预计参加人数：</label>
@@ -146,7 +146,7 @@
               </a-col>
 
               <!--邀请码选择是出现填写邀请码 否选择身份-->
-              <a-col :xxl="8" :xl="12" :sm="24" v-if="meetingType === '3' && !inviteCodeBool ">
+              <a-col :xxl="8" :xl="12" :sm="24" v-if="meetingType === '3' && identityBool ">
                 <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-radio-group v-decorator="['identity',validatorRules.identify]" @change="changeIdentify">
                     <a-radio :value="2">参会人</a-radio>
@@ -324,6 +324,8 @@ export default {
       codeErrorBool: true,
       // 是否是打包
       isPackBool:false,
+      // 国际研讨会身份的控制
+      identityBool:false,
       url: {
         add: '/meeting/payMeetingSituation/signUp'
       }
@@ -549,8 +551,10 @@ export default {
         // 选择是说明身份是嘉宾
         this.identifyType = 1
         this.inviteCodeBool = true
+        this.identityBool = false
       } else if (e.target.value === 0) {
         this.inviteCodeBool = false
+        this.identityBool = true
         // 选的否 身份置空
         this.identifyType = null
         this.$nextTick(() => {