From 8732aa76db69b181080d8b95cad2f469838a16a5 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 10 Sep 2021 18:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=20=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  |  2 +-
 .../meetManage/OtherMeetingForm.vue           | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 286823e..22f6431 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -295,7 +295,7 @@ export default {
         {
           title: '是否签到',
           align: 'center',
-          dataIndex: 'checkIn',
+          dataIndex: 'checkIn_dictText',
           width: 100,
         },
         {
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 92678ee..2aa670f 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -25,10 +25,10 @@
         </a-form-item>
       </a-col>
     </a-row>
-
-    <div class="item-title">邮寄信息</div>
+    <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
+    <div class="item-title" v-if="identifyType === 2 && !payModeBool ">邮寄信息</div>
     <a-row :gutter="24">
-      <a-col :xxl="8" :xl="12" :sm="24">
+      <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool ">
         <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <select-contacts :selected-company="selectedCompany"
                            placeholder="请选择邮寄联系人"
@@ -38,8 +38,8 @@
                            @ok="addContactsOk"></select-contacts>
         </a-form-item>
       </a-col>
-
-      <a-col :xxl="8" :xl="12" :sm="24">
+      <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
+      <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool ">
         <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入地址"
                    :maxLength='50'
@@ -48,20 +48,20 @@
       </a-col>
     </a-row>
 
-    <div class="item-title">缴费信息</div>
-    <!--    选择嘉宾和内部企业不显示缴费方式-->
+    <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-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool">
         <a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group v-decorator="['payMode',validatorRules.payMode]">
+          <a-radio-group v-decorator="['payMode',validatorRules.payMode]" @change="changePayMode">
             <a-radio :value="1">汇款</a-radio>
             <a-radio :value="2">现场</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">
+      <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
+      <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]"
@@ -69,8 +69,8 @@
                              placeholder="请选择发票类型"></j-dict-select-tag>
         </a-form-item>
       </a-col>
-
-      <a-col :xxl="8" :xl="12" :sm="24">
+      <!--    选择嘉宾和内部企业、缴费方式为打包也不显示-->
+      <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool  ">
         <a-form-item label="付款凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-image-upload v-decorator="['paymentRecord']" :return-id="true"></j-image-upload>
         </a-form-item>
@@ -138,6 +138,8 @@ export default {
         xs: {span: 24},
         sm: {span: 21}
       },
+      // 缴费方式为打包
+      payModeBool:false,
       validatorRules: {
         postContactId: {
           rules: [{required: true, message: '请选择邮寄联系人'}],
@@ -154,6 +156,15 @@ export default {
       }
     }
   },
+  watch:{
+    // 监听它是因为 当选择参会人并且选择打包 再去切换身份 底下不显示bug
+    identifyType(val){
+      if(val !== 2){
+        this.payModeBool = false
+        return val
+      }
+    }
+  },
   methods: {
     moment,
     handleOk() {
@@ -185,6 +196,16 @@ export default {
       }
       return startValue.valueOf() > endValue.valueOf()
     },
+    /*
+    * 缴费方式选择
+    * */
+    changePayMode(e){
+      if(e.target.value === 3){
+        this.payModeBool = true
+      }else {
+        this.payModeBool = false
+      }
+    },
     addContactsOk() {
     }
   }