From f58aafbaa617ed1e3277673bd190f603e21807d7 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 22 Sep 2021 12:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E5=85=A5=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=20=E5=85=B3=E8=81=94=E4=BC=9A=E8=AE=AE=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/AddMeetingPerson.vue              | 88 ++++++++++++++++---
 .../modules/RevenueContractModule.vue         |  6 +-
 2 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
index 74d5804..c0151fb 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
@@ -31,14 +31,14 @@
             <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-contacts placeholder="请选择参会人"
                                :selected-company="contractInfo.companyId"
-                               :init-contacts="selectContact"
+                               @change="changeSelectContract"
                                v-decorator="['companyContactId',validatorRules.companyContactId]"></select-contacts>
             </a-form-item>
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入手机号"
-                       v-decorator="['phone',validatorRules.phone]"
+                       v-decorator="['phone']"
                        disabled=""
                        :maxLength='11'
                        ></a-input>
@@ -68,7 +68,7 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="邮寄地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入邮寄地址"
-                       v-decorator="['postAddress',validatorRules.postAddress]"
+                       v-decorator="['postContactAddress',validatorRules.postAddress]"
                        @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
               ></a-input>
             </a-form-item>
@@ -78,7 +78,7 @@
           <a-col :xl="12" :sm="24">
           <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入邮编"
-                     v-decorator="['postCode',validatorRules.postCode]"
+                     v-decorator="['postContacCode',validatorRules.postCode]"
                      @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
             ></a-input>
           </a-form-item>
@@ -87,8 +87,8 @@
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['payMode',validatorRules.payMode]">
                 <a-radio :value="1">汇款</a-radio>
-                <a-radio :value="2">现场</a-radio>
-                <a-radio :value="2" disabled>打包</a-radio>
+                <a-radio :value="2">线上缴费</a-radio>
+                <a-radio :value="3" disabled>打包</a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
@@ -112,7 +112,7 @@
         <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="['arrivalTime']" :trigger-change="true"
+              <j-date placeholder="请选择离开日期" style="width: 100%;" v-decorator="['departureTime']" :trigger-change="true"
                       date-format="YYYY-MM-DD"/>
             </a-form-item>
           </a-col>
@@ -126,6 +126,21 @@
               </a-radio-group>
             </a-form-item>
           </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="缴费凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-image-upload :return-id="true"   v-decorator="['paymentRecord',validatorRules.paymentRecord]"></j-image-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="订单号后四位" :labelCol="{xs: {span: 24},sm: {span: 8} }" :wrapperCol="{xs: {span: 24},sm: {span: 16} }">
+              <a-input placeholder="请输入订单号后四位"
+                       v-decorator="['housiwei',validatorRules.housiwei]"
+                       @change="event => event.target.value = event.target.value.trim()" :maxLength="4"
+              ></a-input>
+            </a-form-item>
+          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
@@ -136,6 +151,10 @@
         </a-row>
       </a-form>
     </a-spin>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+      <a-button @click="handleOk" type="primary" v-preventclick>确定</a-button>
+    </template>
   </j-modal>
 </template>
 
@@ -146,8 +165,10 @@ import SelectContacts from '@comp/company/SelectContacts'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import CompanySelect from '@comp/company/CompanySelect'
 import MeetingSelect from '@comp/company/MeetingSelect'
+import JImageUpload from '@comp/jero/JImageUpload'
 import JDate from '@comp/tools/JDate'
 import pick from 'lodash.pick'
+import {getContactsById} from '@api/api'
 
 
 export default {
@@ -157,7 +178,8 @@ export default {
     JDictSelectTag,
     CompanySelect,
     JDate,
-    MeetingSelect
+    MeetingSelect,
+    JImageUpload
   },
   data() {
     return {
@@ -192,6 +214,14 @@ export default {
           rules: [{required: true, message: '请输入邮寄地址'}],
           validateTrigger: 'blur'
         },
+        paymentRecord: {
+          rules: [{required: true, message: '请上传缴费凭证'}],
+          validateTrigger: 'change'
+        },
+        housiwei: {
+          rules: [{required: true, message: '请输入订单号后四位'}],
+          validateTrigger: 'blur'
+        },
         postAddress: {
           rules: [{required: true, message: '请输入邮编'}],
           validateTrigger: 'blur'
@@ -227,8 +257,7 @@ export default {
         },
       },
       url: {
-        add: '',
-        edit: '',
+        add:'/meeting/payMeetingSituation/add'
       },
       // 合同信息
       contractInfo:{},
@@ -241,16 +270,24 @@ export default {
   },
   methods:{
     open(record){
+      console.log(record,'addMeetingPerson')
       this.meetingCosts =''
       this.form.resetFields()
       this.visible = true
       this.contractInfo = Object.assign({},record)
       // 参会单位的默认显示
-      this.contractInfo.companyId = record.signedCompany
+      this.contractInfo.companyId = {
+        id:record.signedCompanyId,
+        companyName:record.signedCompanyTemporaryName
+      }
       // 姓名的默认显示
-      this.contractInfo.companyContactId = record.signedContactsTemporaryId
+      this.contractInfo.companyContactId = record.signedContactsId
+      // 通过联系人id获取手机号
+      this.queryInfoById(record.signedContactsId).then( res => {
+        this.form.setFieldsValue({'phone':res.phone})
+      })
       // 邮寄联系人显示
-      this.contractInfo.postContactId = record.signedContactsTemporaryId
+      this.contractInfo.postContactId = record.signedContactsId
       // 合同编号显示
       this.contractInfo.contractNum = record.contractNum
       // 身份默认选择参会人
@@ -274,6 +311,8 @@ export default {
           let method = 'post'
           let url = this.url.add
           const formData = Object.assign({},values)
+          formData.companyId = values.companyId.id
+          formData.meetingId = values.meetingId.id
           httpAction(url,formData,method).then(res => {
             if(res.success){
               that.$message.success(res.message)
@@ -306,6 +345,29 @@ export default {
       }
 
 
+    },
+    /*
+    * 通过id获取联系人信息
+    * */
+    queryInfoById(id){
+      return new Promise(resolve => {
+        let result = {}
+        getContactsById({id}).then(res => {
+          if(res.success){
+            result = res.result
+          }
+        }).finally(() => {
+          resolve(result)
+        })
+      })
+    },
+    /*
+    * 选择姓名 更新手机号
+    * */
+    changeSelectContract(val){
+      this.queryInfoById(val).then(res => {
+        this.form.setFieldsValue({'phone':res.phone})
+      })
     }
 
   }
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index daf64ac..3e223d3 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -796,13 +796,13 @@ export default {
           break
         // 会议项目
         case 3:
-          // 传入合同信息
           // 打包为是不能选择关联会议项目
           if(this.newFormData.pack === 1){
             this.$message.warn('打包不可选择会议项目')
-            return
+          }else {
+            // 传入合同信息
+            this.$refs.selectMeetingProjectModule.open(this.newFormData)
           }
-          this.$refs.selectMeetingProjectModule.open(this.newFormData)
           break
         // 会员项目
         case 4: