From 11ea9ec0ea25dde0fe8d4c60a09fedc93ffd3efd Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 30 Nov 2021 10:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=B8=BA=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/AddMeetingPerson.vue              | 31 ++++++++----
 .../meetManage/OtherMeetingForm.vue           |  4 ++
 .../meetManage/SignUpInfoEdit.vue             | 48 ++++++++++++++++++-
 src/views/signUp/SignUpPage.vue               |  1 -
 4 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
index b949b06..f1a828a 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
@@ -58,7 +58,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <!--  会议费用 为 0不显示 -->
+        <a-row :gutter="24" v-if="!meetingCostBool">
           <a-col :xl="12" :sm="24">
             <a-form-item label="邮寄人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-contacts placeholder="请选择邮寄人"
@@ -76,7 +77,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="!meetingCostBool">
           <a-col :xl="12" :sm="24">
             <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入邮编"
@@ -96,7 +97,7 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
-          <a-col :xl="12" :sm="24">
+          <a-col :xl="12" :sm="24" v-if="!meetingCostBool">
             <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 100%" dict-code="invoice_type"
                                  v-decorator="['needInvoice',validatorRules.needInvoice]"
@@ -110,14 +111,15 @@
                       date-format="YYYY-MM-DD"/>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
             <a-form-item label="离开日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择离开日期" style="width: 100%;" v-decorator="['departureTime']" :trigger-change="true"
                       date-format="YYYY-MM-DD"/>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
+
         </a-row>
         <a-row>
           <a-col :xl="12" :sm="24">
@@ -129,7 +131,7 @@
               </a-radio-group>
             </a-form-item>
           </a-col>
-          <a-col :xl="12" :sm="24">
+          <a-col :xl="12" :sm="24" v-if="!meetingCostBool">
             <a-form-item label="缴费凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-image-upload :return-id="true"
                               v-decorator="['paymentRecord',validatorRules.paymentRecord]"></j-image-upload>
@@ -137,7 +139,7 @@
           </a-col>
         </a-row>
         <!-- 只有线上的才输入订单后四位-->
-        <a-row :gutter="24" v-if="onlinePayModeBool">
+        <a-row :gutter="24" v-if="onlinePayModeBool && !meetingCostBool">
           <a-col :xl="12" :sm="24">
             <a-form-item label="订单号后四位" :labelCol="{xs: {span: 24},sm: {span: 8} }"
                          :wrapperCol="{xs: {span: 24},sm: {span: 16} }">
@@ -276,8 +278,9 @@ export default {
       // 会议金额
       meetingCosts: '',
       // 参会单位
-      selectedCompanyName: ''
-
+      selectedCompanyName: '',
+      // 会议费用 是否为 0
+      meetingCostBool: false
     }
   },
   methods: {
@@ -428,6 +431,16 @@ export default {
       }
     }
 
+  },
+  watch: {
+    // 判断会议费用 是否为 0
+    meetingCosts(val) {
+      if (val === '0.00') {
+        this.meetingCostBool = true
+      } else {
+        this.meetingCostBool = false
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 07272c7..169c0c3 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -226,6 +226,10 @@ export default {
         console.log(val)
         return val
       }
+    },
+    meetingCostBool(val){
+      console.log(val)
+      return val
     }
   },
   methods: {
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index b132857..506a3cc 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -131,7 +131,7 @@ import SeminarVipForm from '@views/incomePayments/meetManage/modules/SeminarVipF
 import SeminarPartnerForm from '@views/incomePayments/meetManage/modules/SeminarPartnerForm'
 import AddMeetingCompany from '@comp/company/AddMeetingCompany'
 import {getContactsById} from '@api/api'
-import {getSingUpUserInfo} from '@api/incomeMeetingApi'
+import {getSingUpUserInfo, validateStandard, getMeetInfoById} from '@api/incomeMeetingApi'
 import {httpAction} from '@api/manage'
 import pick from 'lodash.pick'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
@@ -202,8 +202,12 @@ export default {
       selectPerson:null,
       // 会议类型
       meetingType: '',
+      // 当前会议的信息
+      currentMeetingInfo:{},
       // 会议费用是否为0
       meetingCostBool:false,
+      // 是否是标协成员
+      isStandardBool: false,
       // url:{
       //   add:'/meeting/payMeetingSituation/add',
       //   edit:'/meeting/payMeetingSituation/edit'
@@ -252,6 +256,10 @@ export default {
         }
       })
     }
+    //获取 会议信息
+    if(this.$route.query.meetingId){
+     this.queryMeetingInfo(this.$route.query.meetingId)
+    }
 
   },
   computed:{
@@ -429,6 +437,30 @@ export default {
     * */
     changeCompany(value) {
       this.selectedCompany = value
+      // 去掉未审核 去判断的企业是否是标协会企业
+      let companyName = this.selectedCompany.companyName.replaceAll('（未审核）','')
+
+      // 通过企业名称判断当前会议费用 是否为 0
+      if (this.currentMeetingInfo.meetingType + '' === '2') {
+        validateStandard({companyName: companyName}).then(res => {
+          this.isStandardBool = res.result
+          this.meetingCostBool = false
+          if (this.isStandardBool) {
+            // 是标协企业 判断  会员费用是否为0
+            if(this.currentMeetingInfo.meetingCostsVip === '0.00'){
+              this.meetingCostBool = true
+            }
+          }else {
+            // 不是标协企业 判断正常会议费用 是否为 0
+            if( this.currentMeetingInfo.meetingCosts === '0.00'){
+              this.meetingCostBool = true
+            }
+          }
+          if(  this.$refs.formother !== undefined ){
+            console.log( this.$refs.formother.meetingCostBool,' this.$refs.formother.meetingCostBool')
+          }
+        })
+      }
       // 选择企业清空 姓名 手机号
       this.form.resetFields(['companyContactId','phone'])
       if(this.$refs.formother ){
@@ -452,6 +484,20 @@ export default {
         }
       })
     },
+    /**
+     * @Description 通过会议id获取会议信息
+     * @Date 2021-11-29
+     * @param meetingId 会议id
+     * @author fac
+     * */
+    queryMeetingInfo(meetingId){
+      this.currentMeetingInfo = {}
+      getMeetInfoById({id:meetingId}).then(res => {
+        if(res.success){
+          this.currentMeetingInfo = res.result
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index 9b03e17..b4469b0 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -543,7 +543,6 @@ export default {
       this.selectedCompany = value
       // 通过企业名称判断当前参会人
       if (this.currentMeetingInfo.meetingType + '' === '2') {
-        console.log('标协会议')
         validateStandard({companyName: this.selectedCompany.companyName}).then(res => {
           this.isStandardBool = res.result
           if (this.isStandardBool) {