diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
index 6692920..a23c6e4 100644
--- a/src/views/admin/meeting/RoomContentList.vue
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -11,25 +11,19 @@
           <a-col :md='5' :sm='15'>
             <a-form-item label='类型'>
               <a-select v-model='queryParam.typeName' placeholder='请选择类型'>
-                <a-select-option value='1'>
+                <a-select-option value="1">
                   会议室
                 </a-select-option>
-                <a-select-option value='2'>
+                <a-select-option value="2">
                   路演厅
                 </a-select-option>
-                <a-select-option value='3'>
-                  数仓
-                </a-select-option>
-                <a-select-option value='4'>
-                  数纽
-                </a-select-option>
-                <a-select-option value='5'>
+                <a-select-option value="3">
                   洽谈室
                 </a-select-option>
-                <a-select-option value='6'>
+                <a-select-option value="4">
                   直播间
                 </a-select-option>
-                <a-select-option value='7'>
+                <a-select-option value="5">
                   茶室
                 </a-select-option>
               </a-select>
@@ -266,8 +260,8 @@ export default {
         },
         {
           title: '类型',
-          dataIndex: 'typeName',
-          scopedSlots: { customRender: 'typeName' }
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' }
         },
         {
           title: '容纳人数',
@@ -339,6 +333,7 @@ export default {
     TypeData.map(d => {
       typeMap[d.dictValue] = { text: d.dictLabel }
     })
+    console.log(typeMap)
     const serveTypeData = await getDictArray('serve_type')
     serveTypeData.map(d => {
       serveTypeMap[d.dictValue] = { text: d.dictLabel }
@@ -360,9 +355,9 @@ export default {
         if (res.code == 0) {
           this.$message.success('关联成功')
           this.visible = false
-          this.handleOk()
           this.selectedItemRowKeys = []
           this.selectedItemRows = []
+          window.location.reload()
         }
       })
     },
@@ -376,10 +371,11 @@ export default {
       addRoomServe(params).then((res) => {
         if (res.code == 0) {
           this.$message.success('关联成功')
+          this.handleOk()
           this.visible1 = false
           this.selectedServeRowKeys = []
           this.selectedServeRows = []
-          this.handleOk()
+          window.location.reload()
         }
       })
 
diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index 43206df..874c483 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    title="操作"
+    :title="mdl.id>0?'编辑':'新增'"
     style="top: 20px"
     :width="1000"
     v-model="visible"
@@ -34,25 +34,19 @@
         <a-col :span="10">
           <a-form-item  label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select v-decorator="['type',{rules: [{ required: true, message: '输入会议类型' }]}]" placeholder="会议类型">
-              <a-select-option value="1">
+              <a-select-option :value="1">
                 会议室
               </a-select-option>
-              <a-select-option value="2">
+              <a-select-option :value="2">
                 路演厅
               </a-select-option>
-              <a-select-option value="3">
-                数仓
-              </a-select-option>
-              <a-select-option value="4">
-                数纽
-              </a-select-option>
-              <a-select-option value="5">
+              <a-select-option :value="3">
                 洽谈室
               </a-select-option>
-              <a-select-option value="6">
+              <a-select-option :value="4">
                 直播间
               </a-select-option>
-              <a-select-option value="7">
+              <a-select-option :value="5">
                 茶室
               </a-select-option>
             </a-select>
@@ -164,10 +158,10 @@
         <a-col :span="10">
           <a-form-item  label="是否使用优惠劵" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select v-decorator="['isTicket',{rules: [{ required: true, message: '请选择优惠券'}]}]" placeholder="是否收费">
-              <a-select-option value="0">
+              <a-select-option :value="0">
                 是
               </a-select-option>
-              <a-select-option value="1">
+              <a-select-option :value="1">
                 否
               </a-select-option>
             </a-select>
@@ -177,18 +171,19 @@
       <a-row>
         <a-col :span="10">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="是否收费">
-            <a-select v-decorator="['isToll',{rules: [{ required: true, message: '请选择是否收费'}]}]" placeholder="是否收费">
-              <a-select-option value="0">
+            <a-select v-decorator="['isToll',{rules: [{ required: true, message: '请选择是否收费'}]}]"
+                      @change='selectChangeIsToll' placeholder="是否收费">
+              <a-select-option :value="0">
                 是
               </a-select-option>
-              <a-select-option value="1">
+              <a-select-option :value="1">
                 否
               </a-select-option>
             </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="10">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="收费金额 ">
+          <a-form-item v-if='mdl.isToll === 0' :labelCol="labelCol" :wrapperCol="wrapperCol"  label="收费金额 ">
             <a-input placeholder="收费金额 " v-decorator="['money',{rules: [{ required: true, message: '请输入收费金额'}]}]" />
           </a-form-item>
         </a-col>
@@ -197,11 +192,10 @@
         <a-col :span="10">
           <a-form-item  label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select v-decorator="['isShow',{rules: [{ required: true, message: '请选择是否启用'}]}]" placeholder="是否启用">
-
-            <a-select-option value="0">
+            <a-select-option :value="0">
               是
             </a-select-option>
-            <a-select-option value="1">
+            <a-select-option :value="1">
               否
             </a-select-option>
             </a-select>
@@ -295,6 +289,9 @@ export default {
     this.getFloorList()
   },
   methods: {
+    selectChangeIsToll(value){
+      this.mdl.isToll = value
+    },
 
     moment,
     // 获取面积
@@ -315,7 +312,8 @@ export default {
     },
     getRoomList(value){
       let param={
-        "buildingDetailId":value
+        "buildingDetailId":value,
+        "type":0
       }
       getRoomListByFloorId(param).then((res) =>{
         this.roomList = res.data
@@ -363,15 +361,6 @@ export default {
     edit (record) {
       if (record.id != 0){
         get(record.id).then((res) =>{
-          this.form.setFieldsValue({
-            area: res.area,
-            buildId:res.buildingName,
-            roomId:res.roomName,
-            isToll:res.isToll.toString(),
-            isShow:res.isShow.toString(),
-            isTicket:res.isTicket.toString(),
-            type:res.typeValue.toString()
-          })
         })
       }
 
@@ -379,6 +368,14 @@ export default {
       if (this.mdl.indoorPicUrl) {
         this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.indoorPicUrl
       }
+      getRoomListByFloorId({
+        "buildingDetailId":this.mdl.buildId,
+        "type":0
+
+      }).then((res) =>{
+        this.roomList = res.data
+      })
+
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(