diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 22f6431..54c66ab 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -112,7 +112,7 @@
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="审核">
-                <j-dict-select-tag v-model="queryParam.audit" placeholder="请选择"
+                <j-dict-select-tag v-model="queryParam.checkResult" placeholder="请选择"
                                    dictCode="signup_status"/>
               </a-form-item>
             </a-col>
@@ -250,6 +250,7 @@ export default {
   data() {
     return {
       description: '参会情况',
+
       columns: [
         {
           title: '序号',
@@ -346,6 +347,7 @@ export default {
           scopedSlots: {customRender: 'action'}
         },
       ],
+      disableMixinCreated:true,
       url: {
         list: '/meeting/payMeetingSituation/page',
         delete: '/meeting/payMeetingSituation/delete',
@@ -371,6 +373,8 @@ export default {
         this.meetingType = this.generateMeetingType(this.currentMeetingInfo.meetingType)
       }
     })
+    this.filters.meetingId = this.$route.query.id
+    this.loadData(1)
   },
   computed: {
     // 标协会议类型
@@ -418,7 +422,8 @@ export default {
       this.$router.push({
         path: '/incomePayments/meetManage/SignUpInfoEdit',
         query: {
-          id:record.id
+          id:record.id,
+          meetingType: this.currentMeetingInfo.meetingType,
         }
       })
     },
diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index 2aa670f..8502cce 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -31,6 +31,7 @@
       <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"
+                           :init-contacts="selectPostPerson"
                            placeholder="请选择邮寄联系人"
                            v-decorator="['postContactId',validatorRules.postContactId]"
                            :maxLength='50'
@@ -51,7 +52,7 @@
     <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 && !payModeBool">
+      <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2">
         <a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group v-decorator="['payMode',validatorRules.payMode]" @change="changePayMode">
             <a-radio :value="1">汇款</a-radio>
@@ -140,6 +141,8 @@ export default {
       },
       // 缴费方式为打包
       payModeBool:false,
+      // 回显的邮寄联系人
+      selectPostPerson:null,
       validatorRules: {
         postContactId: {
           rules: [{required: true, message: '请选择邮寄联系人'}],
@@ -161,6 +164,7 @@ export default {
     identifyType(val){
       if(val !== 2){
         this.payModeBool = false
+        console.log(val)
         return val
       }
     }
@@ -205,6 +209,34 @@ export default {
       }else {
         this.payModeBool = false
       }
+    },
+    /*
+    * 编辑回显值
+    * */
+    setFormVal(record){
+      console.log('record============',record)
+      // 回显邮寄联系人
+      this.selectPostPerson = {
+        id:record.postContactTemporaryId,
+        name:record.postContactName
+      }
+      this.$nextTick(() => {
+        // 身份类型是嘉宾 内部企业只渲染 住店 抵达时间 离开时间
+        this.form.setFieldsValue(pick(record,
+          'checkInHotel',
+          'arrivalTime',
+          'departureTime',
+          'arrivalTime',
+          'departureTime',
+          'postContactId',
+          'postContactAddress',
+          'payMode',
+          'needInvoice',
+          'paymentRecord'
+        ))
+      })
+
+
     },
     addContactsOk() {
     }
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index 9c2d10e..5f9f682 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -22,6 +22,7 @@
                                  placeholder="请选择参会人"
                                  v-decorator="['companyContactId',validatorRules.companyContactId]"
                                  :maxLength='50'
+                                 :init-contacts="selectPerson"
                                  @change="changeContact"
                                  ref="selectMailContacts"
                                  @ok="addContactsOk"></select-contacts>
@@ -196,11 +197,13 @@ export default {
       identifyType: null,
       // 嘉宾类型
       guestType: null,
+      // 姓名的回显
+      selectPerson:null,
       // 会议类型
       meetingType: '',
       url:{
         add:'/meeting/payMeetingSituation/add',
-        edit:''
+        edit:'/meeting/payMeetingSituation/edit'
       }
     }
   },
@@ -208,9 +211,9 @@ export default {
     this.meetingType = this.$route.query.meetingType
     if(this.$route.query.id){
       // 通过id获取参会人信息
-      getSingUpUserInfo({id:this.$route.query}).then(res => {
+      getSingUpUserInfo({id:this.$route.query.id}).then(res => {
         if(res.success){
-          console.log(res.result)
+         this.edit(res.result)
         }
       })
     }
@@ -221,6 +224,55 @@ export default {
       this.$refs.selectContacts.getContactsList()
     },
     /*
+    * 编辑
+    * */
+    edit(record){
+      this.form.resetFields()
+      this.model = Object.assign({},record)
+      console.log(this.model)
+      // 设置编辑的显示隐藏状态
+      this.identifyType = this.model.identity
+      this.guestType = this.model.guestType ? this.model.guestType : null
+      // 参会单位回显
+      this.model.companyId = {
+        id:this.model.companyId,
+        companyName:this.model.companyName
+      }
+      // 参会人回显
+      this.selectedCompany = this.model.companyId
+      this.selectPerson = {
+        id:this.model.companyContactTemporaryId,
+        name:this.model.companyContactName
+      }
+
+      console.log(this.$refs.formother,'=====================')
+
+      //国际研讨会的嘉宾编辑回显值
+      this.$nextTick(() => {
+        // 普通会议的编辑回显值
+        if(this.$refs.formother){
+          this.$refs.formother.setFormVal(this.model)
+        }
+        //国际研讨会的嘉宾前三个的编辑回显值
+        if(this.$refs.seminarVipForm){
+          this.$refs.seminarVipForm.setFormVal(this.model)
+        }
+        // 国际研讨会合作伙伴的回显
+        if(this.$refs.seminarPartnerForm){
+          this.$refs.seminarPartnerForm.setFormVal(this.model)
+        }
+        this.form.setFieldsValue(pick(this.model,
+          'companyId',
+          'companyContactId',
+          'phone',
+          'email',
+          'post',
+          'identity',
+          'guestType'
+        ))
+      })
+    },
+    /*
     *  确定
     * */
     handleOk() {
diff --git a/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue b/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue
index 41d0c8a..775de18 100644
--- a/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue
+++ b/src/views/incomePayments/meetManage/modules/SeminarPartnerForm.vue
@@ -30,6 +30,7 @@
 <script>
 import JDate from '@comp/jero/JDate'
 import moment from 'moment'
+import pick from 'lodash.pick'
 
 export default {
   name: 'SeminarPartnerForm',
@@ -69,6 +70,20 @@ export default {
           this.$emit('formData', {stop:true})
         }
       })
+    },
+    /*
+    * 编辑回显值
+    * */
+    setFormVal(record){
+      // 合作伙伴回显
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(record,
+          'arrivalTime',
+          'departureTime'
+        ))
+      })
+
+
     },
     /*
     * 离开时间禁用
diff --git a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
index 91cb429..d6ec706 100644
--- a/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
+++ b/src/views/incomePayments/meetManage/modules/SeminarVipForm.vue
@@ -8,7 +8,7 @@
         <a-col :xxl="8" :xl="12" :sm="24">
           <a-form-item label="演讲题目" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入演讲题目"
-                     :maxLength='50'
+                     @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
                      v-decorator="['speechTopic']"></a-input>
           </a-form-item>
         </a-col>
@@ -126,7 +126,7 @@
       <a-col :xxl="8" :xl="12" :sm="24" v-if="pickUpBool">
         <a-form-item label="到达站" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入到达站"
-                   :maxLength='50'
+                   @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
                    v-decorator="[ 'destination']"></a-input>
         </a-form-item>
       </a-col>
@@ -135,7 +135,7 @@
       <a-col :xxl="8" :xl="12" :sm="24" v-if="pickUpBool">
         <a-form-item label="到达班次" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入到达班次"
-                   :maxLength='50'
+                   @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
                    v-decorator="[ 'arrivalShift']"></a-input>
         </a-form-item>
       </a-col>
@@ -162,7 +162,7 @@
       <a-col :xxl="8" :xl="12" :sm="24" v-if="sendBool">
         <a-form-item label="离开站" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入离开站"
-                   :maxLength='50'
+                   @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
                    v-decorator="[ 'departureStation']"></a-input>
         </a-form-item>
       </a-col>
@@ -171,7 +171,7 @@
       <a-col :xxl="8" :xl="12" :sm="24" v-if="sendBool">
         <a-form-item label="离开班次" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入离开班次"
-                   :maxLength='50'
+                   @change="event => event.target.value = event.target.value.trim()" :maxLength="50"
                    v-decorator="[ 'departureShift']"></a-input>
         </a-form-item>
       </a-col>
@@ -181,6 +181,7 @@
         <a-form-item label="同行人" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入同行人"
                    :maxLength='50'
+                   @change="event => event.target.value = event.target.value.trim()"
                    v-decorator="[ 'peer']"></a-input>
         </a-form-item>
       </a-col>
@@ -209,6 +210,7 @@ import JDate from '@comp/jero/JDate'
 import JImageUpload from '@comp/jero/JImageUpload'
 import JUpload from '@comp/jero/JUpload'
 import moment from 'moment'
+import pick from 'lodash.pick'
 
 export default {
   name: 'SeminarVipForm',
@@ -351,7 +353,91 @@ export default {
         return false
       }
       return startValue.valueOf() > endValue.valueOf()
-    }
+    },
+    /*
+    * 编辑回显值
+    * */
+    setFormVal(record){
+      // 回显邮寄联系人
+      // this.selectPostPerson = {
+      //   id:record.postContactTemporaryId,
+      //   name:record.postContactName
+      // }
+      // 是否用餐的显示
+     if(record.haveMeals === 1){
+       this.haveMealBool = true
+       this.$nextTick(() => {
+         // 是否回民回显
+         this.form.setFieldsValue(pick(record,
+           'huiPeople',
+         ))
+       })
+     }else if(record.haveMeals === 0){
+       this.haveMealBool = false
+     }
+     // 是否住酒店
+      if(record.checkInHotel === 1){
+        this.inHotelBool = true
+        // 入住酒店回显 离店时间回显 房型回显
+        this.$nextTick(() => {
+          // 身份类型是嘉宾 内部企业只渲染 住店 抵达时间 离开时间
+          this.form.setFieldsValue(pick(record,
+            'inHotelTime',
+            'outHotelTime',
+            'roomLayout',
+          ))
+        })
+      }else if(record.checkInHotel === 0){
+        this.inHotelBool = false
+      }
+      // 是否接站
+      if(record.pickUp === 1){
+        this.pickUpBool = true
+        // 抵达时间 到达站 到达班次
+        this.$nextTick(() => {
+          // 身份类型是嘉宾 内部企业只渲染 住店 抵达时间 离开时间
+          this.form.setFieldsValue(pick(record,
+            'arrivalTime',
+            'destination',
+            'arrivalShift',
+          ))
+        })
+      }else if(record.pickUp === 0){
+        this.pickUpBool = false
+      }
+      // 是否送站
+      if(record.deliveryStation === 1){
+        this.sendBool = true
+        this.$nextTick(() => {
+          // 离开时间 离开站 离开班次
+          this.form.setFieldsValue(pick(record,
+            'departureTime',
+            'departureStation',
+            'departureShift',
+          ))
+        })
+      }else if(record.pickUp === 0){
+        this.sendBool = false
+      }
+      console.log(record,'record')
+      this.$nextTick(() => {
+        // 身份类型是嘉宾 内部企业只渲染 住店 抵达时间 离开时间
+        this.form.setFieldsValue(pick(record,
+          'speechTopic',
+          'speechPpt',
+          'photo',
+          'profile',
+          'haveMeals',
+          'checkInHotel',
+          'pickUp',
+          'deliveryStation',
+          'peer',
+          'remark'
+        ))
+      })
+
+
+    },
   }
 }
 </script>