From 2fdb5321b0c587a014bf6e86b02010a99524f53a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 8 Sep 2021 19:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue    | 17 +++++++++--------
 .../meetManage/SignUpInfoEdit.vue               |  6 +++++-
 .../meetManage/SignUpInfoList.vue               |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index b1368ce..e9bfe23 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -242,13 +242,13 @@ export default {
         {
           title: '参会单位',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'companyName',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '参会人员',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'companyContactName',
         },
         {
           title: '应收金额',
@@ -273,22 +273,22 @@ export default {
         {
           title: '打包',
           align: 'center',
-          dataIndex: ''
+          dataIndex: 'pack'
         },
         {
           title: '需要发票',
           align: 'center',
-          dataIndex: ''
+          dataIndex: 'needInvoice'
         },
         {
           title: '到账',
           align: 'center',
-          dataIndex: ''
+          dataIndex: 'inAccount'
         },
         {
           title: '开票',
           align: 'center',
-          dataIndex: ''
+          dataIndex: 'makeInvoice'
         },
         {
           title: '邮寄',
@@ -298,7 +298,7 @@ export default {
         {
           title: '对接人',
           align: 'center',
-          dataIndex: ''
+          dataIndex: 'mail'
         },
         {
           title: '操作',
@@ -365,7 +365,8 @@ export default {
       this.$router.push({
         path: '/incomePayments/meetManage/SignUpInfoEdit',
         query:{
-          meetingType:this.currentMeetingInfo.meetingType
+          meetingType:this.currentMeetingInfo.meetingType,
+          meetingId:this.$route.query.id
         }
       })
     },
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index ae7771c..1e3d418 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -60,7 +60,7 @@
 
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-radio-group v-decorator="['identify',validatorRules.identify]" @change="changeIdentify">
+                <a-radio-group v-decorator="['identity',validatorRules.identify]" @change="changeIdentify">
                   <a-radio :value="1">嘉宾</a-radio>
                   <a-radio :value="2">参会人</a-radio>
                   <a-radio :value="3">内部企业</a-radio>
@@ -235,6 +235,10 @@ export default {
           this.confirmLoading = true
           let submitData = Object.assign({},values,this.formData)
           submitData.companyId = values.companyId.id
+          // 会议id
+          submitData.meetingId = this.$route.query.meetingId
+          // 会议类型
+          submitData.meetingType = this.$route.query.meetingType
           console.log(submitData)
           let url = ''
           if(!this.model.id){
diff --git a/src/views/incomePayments/meetManage/SignUpInfoList.vue b/src/views/incomePayments/meetManage/SignUpInfoList.vue
index 5e2e857..9718a9c 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoList.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoList.vue
@@ -166,7 +166,7 @@ export default {
         sm: {span: 18}
       },
       url: {
-        list: '/jero/memberProject/page',
+        list: '/meeting/payMeetingSituation/add/page',
         delete: '/jero/memberProject/delete',
         deleteBatch: '/jero/memberProject/deleteBatch',
         exportXlsUrl: '/jero/memberProject/exportXls',