diff --git a/src/api/admin/meeting/roomContent.js b/src/api/admin/meeting/roomContent.js
new file mode 100644
index 0000000..6c822a9
--- /dev/null
+++ b/src/api/admin/meeting/roomContent.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  roomContent: '/meeting/roomContent'
+}
+
+export function getRoomContentList (parameter) {
+  return axios({
+    url: api.roomContent + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveRoomContent (parameter) {
+  return axios({
+    url: api.roomContent + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delRoomContent (parameter) {
+  return axios({
+    url: api.roomContent + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const roomContentExport = api.roomContent + '/export'
diff --git a/src/api/admin/meeting/roomItem.js b/src/api/admin/meeting/roomItem.js
new file mode 100644
index 0000000..9831892
--- /dev/null
+++ b/src/api/admin/meeting/roomItem.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  roomItem: '/meeting/roomItem'
+}
+
+export function getRoomItemList (parameter) {
+  return axios({
+    url: api.roomItem + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveRoomItem (parameter) {
+  return axios({
+    url: api.roomItem + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delRoomItem (parameter) {
+  return axios({
+    url: api.roomItem + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const roomItemExport = api.roomItem + '/export'
diff --git a/src/views/admin/ApplyParkList.vue b/src/views/admin/ApplyParkList.vue
index 4274d6f..e718c57 100644
--- a/src/views/admin/ApplyParkList.vue
+++ b/src/views/admin/ApplyParkList.vue
@@ -60,10 +60,10 @@
         {{ text | isRegisterFilter }}
       </span>
       <span slot="action" slot-scope="text, record">
-        <a v-if="editEnabel" @click="approveByOne(record)">审批</a>
-        <a-divider type="vertical" />
-        <a v-if="editEnabel" @click="cancel(record.id)">取消审批</a>
-        <a-divider type="vertical" />
+        <a v-if="editEnabel && record.status != 'PASS' " @click="approveByOne(record)">审批</a>
+        <a-divider type="vertical" v-if=" record.status != 'PASS'" />
+        <a v-if="editEnabel && record.status != 'PASS' "   @click="cancel(record.id)">取消审批</a>
+        <a-divider type="vertical" v-if=" record.status != 'PASS'" />
         <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
       </span>
     </s-table>
diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index 3e529a1..1d3051a 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -196,12 +196,12 @@
             </a-col>
             <a-col :span="12">
               <a-form-item :labelCol="labelColHalf" :wrapperCol="wrapperColHalf" label="登记机关">
-                <a-input placeholder="登记机关" v-decorator="['belongOrg']" />
+                <a-input placeholder="登记机关" v-decorator="['belongOrg',{rules: [{required: true, message: '请选择登记机关'}]}]" />
               </a-form-item>
             </a-col>
             <a-col :span="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="注册地址">
-                <a-input placeholder="注册地址" v-decorator="['address']" />
+                <a-input placeholder="注册地址" v-decorator="['address',{rules: [{required: true, message: '请选择注册地址'}]}]" />
               </a-form-item>
             </a-col>
             <a-col :span="24">
diff --git a/src/views/admin/RoomList.vue b/src/views/admin/RoomList.vue
index 7d01683..89d29cc 100644
--- a/src/views/admin/RoomList.vue
+++ b/src/views/admin/RoomList.vue
@@ -13,7 +13,7 @@
               <a-input placeholder="请输入所属楼宇名称" v-model="queryParam.buildingName"/>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="15">
+          <a-col :md="5" :sm="15">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租赁状态">
               <a-radio-group button-style="solid" @change="statusChange" v-model="queryParam.status">
                 <a-radio-button value="NO">未租</a-radio-button>
@@ -154,18 +154,18 @@ export default {
           title: '所属楼层',
           dataIndex: 'buildingDetail.floorName'
         },
-        {
-          title: '面积（平方米）',
-          dataIndex: 'area'
-        },
-        {
-          title: '收租面积（平方米）',
-          dataIndex: 'rentArea'
-        },
-        {
-          title: '公摊面积（平方米）',
-          dataIndex: 'commonArea'
-        },
+        // {
+        //   title: '面积（平方米）',
+        //   dataIndex: 'area'
+        // },
+        // {
+        //   title: '收租面积（平方米）',
+        //   dataIndex: 'rentArea'
+        // },
+        // {
+        //   title: '公摊面积（平方米）',
+        //   dataIndex: 'commonArea'
+        // },
         {
           title: '租赁状态',
           dataIndex: 'status',
diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
new file mode 100644
index 0000000..27e6cf9
--- /dev/null
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="5" :sm="15">
+            <a-form-item label="类型">
+              <a-input placeholder="请选择类型" v-model="queryParam.type" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="名称">
+              <a-input placeholder="请输入名称" v-model="queryParam.meetingName" />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :md="5" :sm="15">
+            <a-form-item label="容纳人数">
+              <a-input placeholder="请输入容纳人数" v-model="queryParam.capacityNum" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="扩充人数">
+              <a-input placeholder="请输入扩充人数" v-model="queryParam.expandNum" />
+            </a-form-item>
+          </a-col> -->
+<!--          <a-col :md="5" :sm="15">-->
+<!--            <a-form-item label="是否展示">-->
+<!--              <a-input placeholder="请输入是否展示" v-model="queryParam.isShow" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <a-col :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
+      <a-dropdown v-if="removeEnable && selectedRowKeys.length > 0">
+        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+      </a-dropdown>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <roomContent-modal ref="modal" @ok="handleOk" />
+  </a-card>
+</template>
+
+<script>
+import { STable } from '@/components'
+
+import { getRoomContentList,delRoomContent } from '@/api/admin/meeting/roomContent'
+import RoomContentModal from './modules/RoomContentModal.vue'
+import { checkPermission } from '@/utils/permissions'
+
+export default {
+  name: 'TableList',
+  components: {
+    STable,
+    RoomContentModal
+  },
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '类型',
+          dataIndex: 'type'
+        },
+        {
+          title: '名称',
+          dataIndex: 'meetingName'
+        },
+        {
+          title: '容纳人数',
+          dataIndex: 'capacityNum'
+        },
+        {
+          title: '扩充人数',
+          dataIndex: 'expandNum'
+        },
+        {
+          title: '室内图片url',
+          dataIndex: 'indoorPicUrl'
+        },
+        {
+          title: '开始时间',
+          dataIndex: 'startTime',
+          sorter: true
+        },
+        {
+          title: '结束时间',
+          dataIndex: 'endTime',
+          sorter: true
+        },
+        {
+          title: '价格单位：1小时、2天、3半天',
+          dataIndex: 'priceUnit'
+        },
+        {
+          title: '金额',
+          dataIndex: 'money'
+        },
+        {
+          title: '是否展示',
+          dataIndex: 'isShow'
+        },
+        {
+          title: '房间id',
+          dataIndex: 'roomId'
+        },
+        {
+          title: '形状',
+          dataIndex: 'shape'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        },
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: (parameter) => {
+        return getRoomContentList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:roomContent:add'),
+      editEnabel: checkPermission('meeting:roomContent:edit'),
+      removeEnable: checkPermission('meeting:roomContent:remove'),
+    }
+  },
+  filters: {},
+  created() {},
+  methods: {
+    onSelectChange(selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    handleAdd() {
+      this.$refs.modal.add()
+    },
+    handleEdit(record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk() {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+    delByIds(ids) {
+      delRoomContent({ ids: ids.join(',') }).then((res) => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    },
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+   },
+}
+</script>
diff --git a/src/views/admin/meeting/RoomItemList.vue b/src/views/admin/meeting/RoomItemList.vue
new file mode 100644
index 0000000..ad69ae4
--- /dev/null
+++ b/src/views/admin/meeting/RoomItemList.vue
@@ -0,0 +1,192 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="5" :sm="15">
+            <a-form-item label="名称">
+              <a-input placeholder="请输入名称" v-model="queryParam.name"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="品牌">
+              <a-input placeholder="请输入品牌" v-model="queryParam.brand"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="规格">
+              <a-input placeholder="请输入规格" v-model="queryParam.specification"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="图片url">
+              <a-input placeholder="请输入图片url" v-model="queryParam.picUrl"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="附件url">
+              <a-input placeholder="请输入附件url" v-model="queryParam.fileUrl"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="删除标志">
+              <a-input placeholder="请输入删除标志" v-model="queryParam.delFlag"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
+      <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
+        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+      </a-dropdown>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <roomItem-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delRoomItem} from '@/api/admin/meeting/roomItem'
+    import RoomItemModal from './modules/'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    RoomItemModal
+  },
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '名称',
+          dataIndex: 'name'
+        },
+        {
+          title: '品牌',
+          dataIndex: 'brand'
+        },
+        {
+          title: '规格',
+          dataIndex: 'specification'
+        },
+        {
+          title: '图片url',
+          dataIndex: 'picUrl'
+        },
+        {
+          title: '附件url',
+          dataIndex: 'fileUrl'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        },
+        {
+          title: '删除标志',
+          dataIndex: 'delFlag'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getRoomItemList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:roomItem:add'),
+      editEnabel: checkPermission('meeting:roomItem:edit'),
+      removeEnable: checkPermission('meeting:roomItem:remove')
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  methods: {
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    handleAdd () {
+      this.$refs.modal.add()
+    },
+    handleEdit (record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk () {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+    delByIds (ids) {
+      delRoomItem({ ids: ids.join(',') }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>
diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
new file mode 100644
index 0000000..04632bb
--- /dev/null
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -0,0 +1,197 @@
+<template>
+  <a-modal
+    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-item>
+      <a-form-item style="display: none">
+        <a-input v-decorator="['version']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+        <a-input placeholder="名称" v-decorator="['meetingName']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="容纳人数">
+        <a-input placeholder="容纳人数" v-decorator="['capacityNum']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扩充人数">
+        <a-input placeholder="扩充人数" v-decorator="['expandNum']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="室内图片url">
+<!--        <a-input placeholder="室内图片url" v-decorator="['indoorPicUrl']" />-->
+        <a-upload
+          v-decorator="['indoorPicUrl']"
+          list-type="picture-card"
+          class="avatar-uploader"
+          :show-upload-list="false"
+          :action="uploadUrl"
+          :headers="headers"
+          :before-upload="beforeUpload"
+          @change="handleChange"
+        >
+          <img v-if="imageUrl" :src="imageUrl" style="width: 102px; height: 102px"/>
+          <div v-else>
+            <a-icon :type="loading ? 'loading' : 'plus'" />
+            <div class="ant-upload-text"> 上传 </div>
+          </div>
+        </a-upload>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="价格单位：1小时、2天、3半天">
+        <a-input placeholder="价格单位：1小时、2天、3半天" v-decorator="['priceUnit']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="金额">
+        <a-input placeholder="金额" v-decorator="['money']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否展示">
+        <a-input placeholder="是否展示" v-decorator="['isShow']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="房间id">
+        <a-input placeholder="房间id" v-decorator="['roomId']" />
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="形状">
+        <a-input placeholder="形状" v-decorator="['shape']" />
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+import { saveRoomContent } from '@/api/admin/meeting/roomContent'
+import pick from 'lodash.pick'
+import storage from 'store'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+
+export default {
+  name: 'RoomContentModal',
+  props: {},
+  components: {},
+  data () {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      imageUrl: '',
+      headers: {
+        Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
+      },
+      loading: false,
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      mdl: {},
+      form: this.$form.createForm(this),
+    }
+  },
+  beforeCreate () {},
+  created () {},
+  methods: {
+    beforeUpload (file) {
+      const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'
+      if (!isJpgOrPng) {
+        this.$message.error('You can only upload JPG file!')
+      }
+      const isLt2M = file.size / 1024 < 500
+      if (!isLt2M) {
+        this.$message.error('图片必须小于 500kb!')
+      }
+      return isJpgOrPng && isLt2M
+    },
+    handleChange (info) {
+      if (info.file.status === 'uploading') {
+        this.loading = true
+        return
+      }
+      if (info.file.status === 'done') {
+        const { form: { setFieldsValue } } = this
+        const result = info.file.response
+        // 设置值
+        this.$nextTick(() => {
+          setFieldsValue({
+            // 设置相对路径
+            smallPic: result.fileName
+          })
+        })
+        // Get this url from response in real world.
+        getBase64(info.file.originFileObj, imageUrl => {
+          this.imageUrl = imageUrl
+          this.loading = false
+        })
+      }
+    },
+    add () {
+      this.form.resetFields()
+      this.edit({ id: 0 })
+    },
+    edit (record) {
+      this.mdl = Object.assign(record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(
+          pick(
+            this.mdl,
+            'id',
+            'type',
+            'meetingName',
+            'capacityNum',
+            'expandNum',
+            'indoorPicUrl',
+            'startTime',
+            'endTime',
+            'priceUnit',
+            'money',
+            'isShow',
+            'createBy',
+            'createTime',
+            'updateBy',
+            'updateTime',
+            'version',
+            'deleteFlag',
+            'roomId',
+            'shape'
+          )
+        )
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveRoomContent(values)
+            .then((res) => {
+              if (res.code === 0) {
+                this.$message.success('保存成功')
+                this.$emit('ok')
+                this.visible = false
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+            .catch(() => {
+              this.$message.error('系统错误，请稍后再试')
+            })
+            .finally(() => {
+              this.confirmLoading = false
+            })
+        }
+      })
+    },
+  }
+}
+function getBase64 (img, callback) {
+  const reader = new FileReader()
+  reader.addEventListener('load', () => callback(reader.result))
+  reader.readAsDataURL(img)
+}
+</script>
diff --git a/src/views/admin/meeting/modules/RoomItemModal.vue b/src/views/admin/meeting/modules/RoomItemModal.vue
new file mode 100644
index 0000000..b166ce1
--- /dev/null
+++ b/src/views/admin/meeting/modules/RoomItemModal.vue
@@ -0,0 +1,127 @@
+<template>
+  <a-modal
+    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-item>
+      <a-form-item style="display:none">
+        <a-input v-decorator="['version']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+        <a-input placeholder="名称" v-decorator="['name']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="品牌">
+        <a-input placeholder="品牌" v-decorator="['brand']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="规格">
+        <a-input placeholder="规格" v-decorator="['specification']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="图片url">
+        <a-input placeholder="图片url" v-decorator="['picUrl']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件url">
+        <a-input placeholder="附件url" v-decorator="['fileUrl']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+        <a-input placeholder="备注" v-decorator="['remark']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="删除标志">
+        <a-input placeholder="删除标志" v-decorator="['delFlag']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建者">
+        <a-input placeholder="创建者" v-decorator="['createBy']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="更新者">
+        <a-input placeholder="更新者" v-decorator="['updateBy']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+import {saveRoomItem} from '@/api/admin/meeting/roomItem'
+import pick from 'lodash.pick'
+
+export default {
+  name: 'RoomItemModal',
+  props: {
+  },
+  components: {
+  },
+  data () {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      confirmLoading: false,
+      mdl: {},
+      form: this.$form.createForm(this)
+    }
+  },
+  beforeCreate () {
+  },
+  created () {
+  },
+  methods: {
+    add () {
+      this.form.resetFields()
+      this.edit({ id: 0 })
+    },
+    edit (record) {
+      this.mdl = Object.assign(record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'brand', 'specification', 'picUrl', 'fileUrl', 'remark', 'delFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveRoomItem(values).then(res => {
+            if (res.code === 0) {
+              this.$message.success('保存成功')
+              this.$emit('ok')
+              this.visible = false
+            } else {
+              this.$message.error(res.msg)
+            }
+          }).catch(() => {
+            this.$message.error('系统错误，请稍后再试')
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>