收入合同 会议参会人列表修改

src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue

@@ -12,7 +12,7 @@
         <a-row>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入会议名称" v-model="queryParam.workingGroupProject"></a-input>
+              <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="12" :lg="11" :md="12" :sm="24">
@@ -152,12 +152,13 @@ export default {
           width: 260,
           scopedSlots: {customRender: 'text'}
         },
+        // 合同里来款用途固定为会务费
         {
           title: '来款用途',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'chargeUse',
           width: 80,
-          // scopedSlots: {customRender: 'text'}
+          customRender: () => {return '会务费'}
         },
         {
           title: '参会人员',
@@ -190,9 +191,9 @@ export default {
         {
           title: '负责人',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'directorName',
           width: 80,
-          // scopedSlots: {customRender: 'text'}
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '打包',
@@ -238,7 +239,7 @@ export default {
         },
       ],
       url: {
-        list: '/meeting/payMeetingSituation/page',
+        list: '/meeting/payMeetingSituation/contractPage',
       },
       disableMixinCreated: true,
       contractId: '', // 收入合同id
@@ -252,11 +253,13 @@ export default {
     moment,
     open(record) {
       this.contranctInfo  =Object.assign({},record)
+      console.log(record,'meetingPerson')
+      this.filters.companyId = record.signedCompanyId
       //记录合同id
       this.contractId = this.contranctInfo.id
       // 记录打包状态
       this.pack = this.contranctInfo.pack
-      this.loadData()
+      this.loadData(1)
       this.visible = true
     },
     close() {

src/views/incomePayments/meetManage/Attendance.vue

@@ -404,6 +404,11 @@ export default {
         this.currentMeetingInfo = Object.assign({}, res.result)
         // 转化会议类型
         this.meetingType = this.generateMeetingType(this.currentMeetingInfo.meetingType)
+        // 列表表头只有国际研讨会有对接人字段
+        if(this.currentMeetingInfo.meetingType !== '3'){
+          let index = this.columns.findIndex(item => item.dataIndex === 'dockName' )
+          this.columns.splice(index,1)
+        }
         // 计算会议费用 会议费用为0 添加参会人不显示邮寄信息与缴费信息   标协会议
         if(this.currentMeetingInfo.meetingType === '2' && this.currentMeetingInfo.meetingCostsVip){
           // 标协会员的费用
@@ -438,7 +443,7 @@ export default {
   },
   async mounted() {
     // 生成会议报名二维码
-    this.signUpQRCode = await this.generateQRCode('https://www.baidu.com')
+    this.signUpQRCode = await this.generateQRCode(this.signUpHerfUrl)
     // 生成签到二维码
     this.signInQRCode = await this.generateQRCode('https://www.baidu.com')
   },

src/views/incomePayments/meetManage/OtherMeetingForm.vue

@@ -254,7 +254,6 @@ export default {
     * 编辑回显值
     * */
     setFormVal(record) {
-      console.log('record============', record)
       // 回显邮寄联系人
       this.selectPostPerson = {
         id: record.postContactTemporaryId,