diff --git a/src/api/admin/meeting/reservation.js b/src/api/admin/meeting/reservation.js
index a69fd44..ca095df 100644
--- a/src/api/admin/meeting/reservation.js
+++ b/src/api/admin/meeting/reservation.js
@@ -28,6 +28,14 @@ export function get (id) {
   })
 }
 
+export function roomContentList () {
+  return axios({
+    url: '/meeting/roomContent/roomContentList',
+    method: 'get',
+    params: {}
+  })
+}
+
 
 export function saveReservation (parameter) {
   return axios({
diff --git a/src/views/admin/meeting/modules/ReservationModal.vue b/src/views/admin/meeting/modules/ReservationModal.vue
index fa2e87d..9238aca 100644
--- a/src/views/admin/meeting/modules/ReservationModal.vue
+++ b/src/views/admin/meeting/modules/ReservationModal.vue
@@ -1,92 +1,66 @@
 <template>
   <a-modal
-    title="操作"
-    style="top: 20px;"
-    :width="800"
-    v-model="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
+    title='操作'
+    style='top: 20px;'
+    :width='800'
+    v-model='visible'
+    :confirmLoading='confirmLoading'
+    @ok='handleSubmit'
   >
-    <a-form :form="form">
-      <a-form-item style="display:none">
-        <a-input v-decorator="['id']"/>
+    <a-form :form='form'>
+      <a-form-item style='display:none'>
+        <a-input v-decorator="['id']" />
       </a-form-item>
-      <a-form-item style="display:none">
-        <a-input v-decorator="['version']"/>
+      <a-form-item style='display:none'>
+        <a-input v-decorator="['version']" />
       </a-form-item>
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议主体id">-->
-<!--        <a-input placeholder="会议室名称" v-decorator="['roomContentId']"/>-->
-<!--      </a-form-item>-->
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户id">-->
-<!--        <a-input placeholder="用户id" v-decorator="['userId']"/>-->
-<!--      </a-form-item>-->
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠卷id">-->
-<!--        <a-input placeholder="优惠卷id" v-decorator="['ticketId']"/>-->
-<!--      </a-form-item>-->
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="企业id">-->
-<!--        <a-input placeholder="企业id" v-decorator="['customerId']"/>-->
-<!--      </a-form-item>-->
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="主题">
-        <a-input placeholder="主题" v-decorator="['title']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='主题'>
+        <a-input placeholder='主题' v-decorator="['title', {rules: [{required: true, message: '请输入主题'}]}]" />
       </a-form-item>
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='开始时间'>
-<!--        <a-input placeholder='开始时间' v-decorator="['startTime']" />-->
+        <!--        <a-input placeholder='开始时间' v-decorator="['startTime']" />-->
         <a-date-picker
           :ranges="{ Today: [moment(), moment()], 'This Month': [moment(), moment().endOf('month')] }"
           show-time
-          format="YYYY-MM-DD HH:mm"
-          @change="onRangeChangeSign"
-          v-decorator="['startTime', {rules: [{required: true, message: '开始时间'}]}]"
-          placeholder="开始时间"/>
+          format='YYYY-MM-DD HH:mm'
+          valueFormat='YYYY-MM-DD HH:mm:ss'
+          v-decorator="['startTime', {rules: [{required: true, message: '请选择开始时间'}]}]"
+          placeholder='开始时间' />
       </a-form-item>
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='结束时间'>
         <a-date-picker
           :ranges="{ Today: [moment(), moment()], 'This Month': [moment(), moment().endOf('month')] }"
           show-time
-          format="YYYY-MM-DD HH:mm"
-          @change="onRangeChangeSign"
-          v-decorator="['endDate', {rules: [{required: true, message: '结束时间'}]}]"
-          placeholder="开始时间"/>
+          format='YYYY-MM-DD HH:mm'
+          valueFormat='YYYY-MM-DD HH:mm:ss'
+          v-decorator="['endDate', {rules: [{required: true, message: '请选择结束时间'}]}]"
+          placeholder='结束时间' />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="时长">
-        <a-input placeholder="时长" v-decorator="['duration']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='会议室'>
+        <a-select v-decorator="['roomContentId',{rules: [{ required: true, message: '请选择会议室' }]}]"
+                  placeholder='请选择会议室'>
+          <a-select-option v-for='item in roomContentList' :key='item.id' :value='item.id'>
+            {{ item.meetingName }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="发起人">
-        <a-input placeholder="发起人" v-decorator="['title']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
-        <a-input placeholder="联系电话" v-decorator="['title']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议室">
-        <a-input placeholder="会议室" v-decorator="['title']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司">
-        <a-input placeholder="公司" v-decorator="['oderNumber']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠卷">
-        <a-input placeholder="优惠卷" v-decorator="['orderMoney']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
-        <a-input placeholder="备注" v-decorator="['orderMoney']"/>
-      </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="总金额">
-        <a-input placeholder="总金额" v-decorator="['orderMoney']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='备注'>
+        <a-input placeholder='备注' v-decorator="['orderMoney']" />
       </a-form-item>
     </a-form>
   </a-modal>
 </template>
 <script>
-    import {saveReservation,get} from '@/api/admin/meeting/reservation'
-    import pick from 'lodash.pick'
-    import moment from 'moment'
+import { saveReservation, get, roomContentList } from '@/api/admin/meeting/reservation'
+import pick from 'lodash.pick'
+import moment from 'moment'
+import { selectRoomById } from '@/api/admin/meeting/roomContent'
 
-    export default {
+export default {
   name: 'ReservationModal',
-  props: {
-  },
-  components: {
-  },
-  data () {
+  props: {},
+  components: {},
+  data() {
     return {
       visible: false,
       labelCol: {
@@ -99,39 +73,45 @@
       },
       confirmLoading: false,
       mdl: {},
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      roomContentList: []
     }
   },
-  beforeCreate () {
+  beforeCreate() {
   },
-  created () {
+  created() {
+    this.getRoomContentDataList()
   },
   methods: {
     moment,
-    onRangeChangeSign(){
+    onRangeChangeSign() {
 
     },
-
-
-    add () {
+    getRoomContentDataList() {
+      roomContentList().then(res => {
+        console.log('roomContentList', res)
+        this.roomContentList = res.data
+      })
+    },
+    add() {
       this.form.resetFields()
       this.edit({ id: 0 })
     },
-    edit (record) {
+    edit(record) {
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id', 'roomContentId', 'userId', 'ticketId', 'customerId', 'title', 'stauts', 'isAfterSale', 'oderNumber', 'orderMoney', 'cancelTime', 'cancelResaon', 'visitType', 'explainNeedType', 'meetingNeedType', 'meetingId', 'photographType', 'startTime', 'endTime', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'remake'))
       })
-      get(record.id).then(res =>{
+      get(record.id).then(res => {
         this.form.setFieldsValue({
-          endDate:res.endDate,
-          duration:res.duration
+          endDate: res.endDate,
+          duration: res.duration
 
         })
       })
     },
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
       this.form.validateFields((err, values) => {
         if (!err) {