diff --git a/src/api/admin/meeting/ticket.js b/src/api/admin/meeting/ticket.js
index 1b1945d..f8651cc 100644
--- a/src/api/admin/meeting/ticket.js
+++ b/src/api/admin/meeting/ticket.js
@@ -19,6 +19,14 @@ export function getTicketByCompany () {
   })
 }
 
+export function get (id) {
+  return axios({
+    url: api.ticket + '/get/'+id,
+    method: 'get',
+    params: {}
+  })
+}
+
 
 
 export function saveTicket (parameter) {
diff --git a/src/views/admin/meeting/ReservationList.vue b/src/views/admin/meeting/ReservationList.vue
index 5b873e1..b0d1fbf 100644
--- a/src/views/admin/meeting/ReservationList.vue
+++ b/src/views/admin/meeting/ReservationList.vue
@@ -3,11 +3,6 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="48">
-          <a-col :md="5" :sm="15">
-            <a-form-item label="用户id">
-              <a-input placeholder="请输入用户id" v-model="queryParam.userId"/>
-            </a-form-item>
-          </a-col>
           <a-col :md="5" :sm="15">
             <a-form-item label="主题">
               <a-input placeholder="请输入主题" v-model="queryParam.title"/>
@@ -88,8 +83,12 @@
       // 表头
       columns: [
         {
-          title: '会议主体id',
-          dataIndex: 'roomContentId'
+          title: '会议名称',
+          dataIndex: 'title'
+        },
+        {
+          title: '会议室名称',
+          dataIndex: 'roomContentName'
         },
         {
           title: '用户id',
@@ -103,10 +102,7 @@
           title: '企业id',
           dataIndex: 'customerId'
         },
-        {
-          title: '主题',
-          dataIndex: 'title'
-        },
+
         {
           title: '预约状态',
           dataIndex: 'stauts'
diff --git a/src/views/admin/meeting/modules/TicketModal.vue b/src/views/admin/meeting/modules/TicketModal.vue
index 0516608..b68d279 100644
--- a/src/views/admin/meeting/modules/TicketModal.vue
+++ b/src/views/admin/meeting/modules/TicketModal.vue
@@ -47,6 +47,9 @@
           <a-form-item v-if="form.type === '1' " :labelCol='labelCol' :wrapperCol='wrapperCol' label='时长'>
             <a-input placeholder='时长' v-decorator="['duration',{rules: [{ required: true, message: '时长'}]}]" />
           </a-form-item>
+          <a-form-item v-if="form.type === '2' " :labelCol='labelCol' :wrapperCol='wrapperCol' label='折扣'>
+            <a-input placeholder='折扣' v-decorator="['discount',{rules: [{ required: true, message: '折扣'}]}]" />
+          </a-form-item>
         </a-col>
       </a-row>
 
@@ -156,7 +159,7 @@
 
 </template>
 <script>
-import { saveTicket, getTicketByCompany } from '@/api/admin/meeting/ticket'
+import { saveTicket, getTicketByCompany,get } from '@/api/admin/meeting/ticket'
 import pick from 'lodash.pick'
 import { STable } from '@/components'
 
@@ -281,6 +284,10 @@ export default {
       console.log(selectedRowKeys, selectedRows)
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
+
+      //选择企业
+
+
     },
     onCustomerSelectChange(selectedRowKeys, selectedRows) {
       this.selectedCustomerRowKeys = selectedRowKeys
@@ -313,8 +320,18 @@ export default {
         this.loadData = res.rows
       })
 
+      //todo 时长没回显
+      get(record.id).then(res =>{
+        this.form.setFieldsValue({
+          type:res.type.toString(),
+          duration:res.duration,
+          discount:res.discount,
+        })
+        this.selectedRowKeys =res.enterpriseIds
+      })
+
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'duration', 'type', 'money', 'address', 'isVerification', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'duration', 'type', 'money', 'address', 'isVerification','enterpriseIds', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
       })
     },
     handleSubmit(e) {
@@ -322,6 +339,12 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log('Received values of form: ', values)
+          values.count = 1
+          let ids = []
+          this.loadData.forEach(item =>{
+            ids.push(item.id)
+          })
+          values.enterpriseIds=this.selectedRowKeys>0?this.selectedRowKeys:ids
           this.confirmLoading = true
           saveTicket(values).then(res => {
             if (res.code === 0) {