diff --git a/src/api/admin/meeting/equipment.js b/src/api/admin/meeting/equipment.js
index b9980e0..fc2d5bc 100644
--- a/src/api/admin/meeting/equipment.js
+++ b/src/api/admin/meeting/equipment.js
@@ -12,6 +12,14 @@ export function getEquipmentList (parameter) {
   })
 }
 
+export function get (id) {
+  return axios({
+    url: api.equipment + '/get/'+id,
+    method: 'get',
+    params: {}
+  })
+}
+
 export function saveEquipment (parameter) {
   return axios({
     url: api.equipment + (parameter.id > 0 ? '/update' : '/save'),
diff --git a/src/api/admin/meeting/roomContent.js b/src/api/admin/meeting/roomContent.js
index 663577c..6684168 100644
--- a/src/api/admin/meeting/roomContent.js
+++ b/src/api/admin/meeting/roomContent.js
@@ -99,6 +99,14 @@ export function getFloorList (parameter) {
   })
 }
 
+export function getCustomerList (parameter) {
+  return axios({
+    url: api.roomContent + '/customerList',
+    method: 'get',
+    params: parameter
+  })
+}
+
 
 export function selectRoomById (parameter) {
   return axios({
diff --git a/src/api/admin/meeting/roomRecord.js b/src/api/admin/meeting/roomRecord.js
new file mode 100644
index 0000000..90863f4
--- /dev/null
+++ b/src/api/admin/meeting/roomRecord.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  roomRecord: '/meeting/roomRecord'
+}
+
+export function getRoomRecordList (parameter) {
+  return axios({
+    url: api.roomRecord + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveRoomRecord (parameter) {
+  return axios({
+    url: api.roomRecord + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delRoomRecord (parameter) {
+  return axios({
+    url: api.roomRecord + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const roomRecordExport = api.roomRecord + '/export'
diff --git a/src/api/admin/meeting/showroom.js b/src/api/admin/meeting/showroom.js
new file mode 100644
index 0000000..5d9e1e1
--- /dev/null
+++ b/src/api/admin/meeting/showroom.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  showroom: '/meeting/showroom'
+}
+
+export function getShowroomList (parameter) {
+  return axios({
+    url: api.showroom + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveShowroom (parameter) {
+  return axios({
+    url: api.showroom + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delShowroom (parameter) {
+  return axios({
+    url: api.showroom + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const showroomExport = api.showroom + '/export'
diff --git a/src/api/admin/meeting/showroomRecord.js b/src/api/admin/meeting/showroomRecord.js
new file mode 100644
index 0000000..3769d67
--- /dev/null
+++ b/src/api/admin/meeting/showroomRecord.js
@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  showroomRecord: '/meeting/showroomRecord'
+}
+
+export function getShowroomRecordList (parameter) {
+  return axios({
+    url: api.showroomRecord + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveShowroomRecord (parameter) {
+  return axios({
+    url: api.showroomRecord + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delShowroomRecord (parameter) {
+  return axios({
+    url: api.showroomRecord + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const showroomRecordExport = api.showroomRecord + '/export'
diff --git a/src/views/admin/ActivityEdit.vue b/src/views/admin/ActivityEdit.vue
index cc261e9..8be12d7 100644
--- a/src/views/admin/ActivityEdit.vue
+++ b/src/views/admin/ActivityEdit.vue
@@ -108,7 +108,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/CustomerContractBillList.vue b/src/views/admin/CustomerContractBillList.vue
index 6dcd2e6..dfd8f69 100644
--- a/src/views/admin/CustomerContractBillList.vue
+++ b/src/views/admin/CustomerContractBillList.vue
@@ -176,7 +176,7 @@ export default {
       exportType: '0', // 账单导入类型
       fileName: '',
       fileList: [],
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/CustomerContractEdit.vue b/src/views/admin/CustomerContractEdit.vue
index d35b052..0d44b26 100644
--- a/src/views/admin/CustomerContractEdit.vue
+++ b/src/views/admin/CustomerContractEdit.vue
@@ -388,7 +388,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 15 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         token: storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/CustomerContractIntentionEdit.vue b/src/views/admin/CustomerContractIntentionEdit.vue
index 2859488..cb27607 100644
--- a/src/views/admin/CustomerContractIntentionEdit.vue
+++ b/src/views/admin/CustomerContractIntentionEdit.vue
@@ -431,7 +431,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 15 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         token: storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/CustomerContractRefundEdit.vue b/src/views/admin/CustomerContractRefundEdit.vue
index 1efdf32..6b88d93 100644
--- a/src/views/admin/CustomerContractRefundEdit.vue
+++ b/src/views/admin/CustomerContractRefundEdit.vue
@@ -169,7 +169,7 @@ export default {
       receiveFee: 0,
       refundFee: 0,
       // 上传
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index 1d3051a..6ef5508 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -368,7 +368,7 @@ export default {
       orderReturnsData: [],
       contactsItemData: [],
       customerForm: {},
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/DjBannerEdit.vue b/src/views/admin/DjBannerEdit.vue
index 74bf17b..a1c6cb3 100644
--- a/src/views/admin/DjBannerEdit.vue
+++ b/src/views/admin/DjBannerEdit.vue
@@ -63,7 +63,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/FileManagementList.vue b/src/views/admin/FileManagementList.vue
index 3338a11..9571e2d 100644
--- a/src/views/admin/FileManagementList.vue
+++ b/src/views/admin/FileManagementList.vue
@@ -125,7 +125,7 @@ export default {
       loadData: parameter => {
         return getFileManagementList(Object.assign(parameter, this.queryParam))
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/ParkEdit.vue b/src/views/admin/ParkEdit.vue
index 940330f..0a2200c 100644
--- a/src/views/admin/ParkEdit.vue
+++ b/src/views/admin/ParkEdit.vue
@@ -127,7 +127,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/ParkSetting.vue b/src/views/admin/ParkSetting.vue
index 281cf3e..37cd367 100644
--- a/src/views/admin/ParkSetting.vue
+++ b/src/views/admin/ParkSetting.vue
@@ -126,7 +126,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/PolicyBannerEdit.vue b/src/views/admin/PolicyBannerEdit.vue
index e1b16b6..e42a44f 100644
--- a/src/views/admin/PolicyBannerEdit.vue
+++ b/src/views/admin/PolicyBannerEdit.vue
@@ -63,7 +63,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/RoomEdit.vue b/src/views/admin/RoomEdit.vue
index fb6c910..5fb1dd4 100644
--- a/src/views/admin/RoomEdit.vue
+++ b/src/views/admin/RoomEdit.vue
@@ -150,7 +150,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/ServiceBannerEdit.vue b/src/views/admin/ServiceBannerEdit.vue
index 281bbbe..7ec96a4 100644
--- a/src/views/admin/ServiceBannerEdit.vue
+++ b/src/views/admin/ServiceBannerEdit.vue
@@ -63,7 +63,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/ServiceMenuEdit.vue b/src/views/admin/ServiceMenuEdit.vue
index 82c32e4..82c42ef 100644
--- a/src/views/admin/ServiceMenuEdit.vue
+++ b/src/views/admin/ServiceMenuEdit.vue
@@ -69,7 +69,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/ServiceSupplierEdit.vue b/src/views/admin/ServiceSupplierEdit.vue
index a60697e..8dc017b 100644
--- a/src/views/admin/ServiceSupplierEdit.vue
+++ b/src/views/admin/ServiceSupplierEdit.vue
@@ -90,7 +90,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/meeting/EquipmentList.vue b/src/views/admin/meeting/EquipmentList.vue
index a3e4dbe..9d139eb 100644
--- a/src/views/admin/meeting/EquipmentList.vue
+++ b/src/views/admin/meeting/EquipmentList.vue
@@ -41,6 +41,18 @@
       :columns='columns'
       :data='loadData'
     >
+      <span slot='type' slot-scope='text,record'>
+        <span v-if="text == 0"><a-tag color="green">门禁</a-tag></span>
+	      <span v-else><a-tag color="cyan">开门控制器</a-tag></span>
+      </span>
+      <span slot='roomName' slot-scope='text,record'>
+        <span >{{record.buildName}}{{record.roomName}}</span>
+      </span>
+      <span slot='status' slot-scope='text,record'>
+        <span v-if="text == 0"><a-tag color="green">启用</a-tag></span>
+	      <span v-if='text == 1'><a-tag color="warn">损坏</a-tag></span>
+	      <span v-if='text == 2'><a-tag color="danger">离线</a-tag></span>
+      </span>
       <span slot='action' slot-scope='text, record'>
         <a v-if='editEnabel' @click='handleEdit(record)'>编辑</a>
         <a-divider type='vertical' />
@@ -92,7 +104,9 @@ export default {
         },
         {
           title: '设备类型',
-          dataIndex: 'type'
+          dataIndex: 'type',
+          scopedSlots: { customRender: 'type' }
+
         },
         {
           title: '设备ip',
@@ -100,11 +114,14 @@ export default {
         },
         {
           title: '存放地点',
-          dataIndex: 'roomName'
+          dataIndex: 'roomName',
+          scopedSlots: { customRender: 'roomName' }
         },
         {
           title: '设备状态',
-          dataIndex: 'status'
+          dataIndex: 'status',
+          scopedSlots: { customRender: 'status' }
+
         },
 
         {
diff --git a/src/views/admin/meeting/RoomItemList.vue b/src/views/admin/meeting/RoomItemList.vue
index 0c47b8f..e1fc1e2 100644
--- a/src/views/admin/meeting/RoomItemList.vue
+++ b/src/views/admin/meeting/RoomItemList.vue
@@ -41,6 +41,7 @@
       :columns='columns'
       :data='loadData'
     >
+
       <span slot='action' slot-scope='text, record'>
         <a v-if='editEnabel' @click='handleEdit(record)'>编辑</a>
         <a-divider type='vertical' />
@@ -90,18 +91,18 @@ export default {
           title: '品牌',
           dataIndex: 'brand'
         },
-        {
-          title: '规格',
-          dataIndex: 'specification'
-        },
-        {
-          title: '图片url',
-          dataIndex: 'picUrl'
-        },
-        {
-          title: '附件url',
-          dataIndex: 'fileUrl'
-        },
+        // {
+        //   title: '规格',
+        //   dataIndex: 'specification'
+        // },
+        // {
+        //   title: '图片url',
+        //   dataIndex: 'picUrl'
+        // },
+        // {
+        //   title: '附件url',
+        //   dataIndex: 'fileUrl'
+        // },
         // {
         //   title: '备注',
         //   dataIndex: 'remark'
diff --git a/src/views/admin/meeting/RoomRecordList.vue b/src/views/admin/meeting/RoomRecordList.vue
new file mode 100644
index 0000000..8dc4a54
--- /dev/null
+++ b/src/views/admin/meeting/RoomRecordList.vue
@@ -0,0 +1,161 @@
+<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="房间id">
+              <a-input placeholder="请输入房间id" v-model="queryParam.roomId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="设备id">
+              <a-input placeholder="请输入设备id" v-model="queryParam.deviceId"/>
+            </a-form-item>
+          </a-col>
+          <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="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>
+    <roomRecord-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delRoomRecord} from '@/api/admin/meeting/roomRecord'
+    import RoomRecordModal from './modules/RoomRecordModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    RoomRecordModal
+  },
+  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: '房间id',
+          dataIndex: 'roomId'
+        },
+        {
+          title: '设备id',
+          dataIndex: 'deviceId'
+        },
+        {
+          title: '用户id',
+          dataIndex: 'userId'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getRoomRecordList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:roomRecord:add'),
+      editEnabel: checkPermission('meeting:roomRecord:edit'),
+      removeEnable: checkPermission('meeting:roomRecord: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) {
+      delRoomRecord({ 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/ShowroomList.vue b/src/views/admin/meeting/ShowroomList.vue
new file mode 100644
index 0000000..5ff435b
--- /dev/null
+++ b/src/views/admin/meeting/ShowroomList.vue
@@ -0,0 +1,252 @@
+<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.showroomCode"/>
+            </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="室内图片url">
+              <a-input placeholder="请输入室内图片url" v-model="queryParam.indoorPicUrl"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="地址">
+              <a-input placeholder="请输入地址" v-model="queryParam.address"/>
+            </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="5" :sm="15">
+            <a-form-item label="负责人姓名">
+              <a-input placeholder="请输入负责人姓名" v-model="queryParam.headName"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="负责人手机号">
+              <a-input placeholder="请输入负责人手机号" v-model="queryParam.headPhone"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="会议描述">
+              <a-input placeholder="请输入会议描述" v-model="queryParam.content"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="房间id">
+              <a-input placeholder="请输入房间id" v-model="queryParam.roomId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="展厅面积">
+              <a-input placeholder="请输入展厅面积" v-model="queryParam.area"/>
+            </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>
+    <showroom-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delShowroom} from '@/api/admin/meeting/showroom'
+    import ShowroomModal from './modules/ShowroomModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    ShowroomModal
+  },
+  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: 'showroomCode'
+        },
+        {
+          title: '展厅名称',
+          dataIndex: 'meetingName'
+        },
+        {
+          title: '容纳人数',
+          dataIndex: 'capacityNum'
+        },
+        {
+          title: '扩充人数',
+          dataIndex: 'expandNum'
+        },
+        {
+          title: '室内图片url',
+          dataIndex: 'indoorPicUrl'
+        },
+        {
+          title: '地址',
+          dataIndex: 'address'
+        },
+        {
+          title: '开始时间',
+          dataIndex: 'startTime',
+          sorter: true
+        },
+        {
+          title: '结束时间',
+          dataIndex: 'endDate',
+          sorter: true
+        },
+        {
+          title: '是否展示',
+          dataIndex: 'isShow'
+        },
+        {
+          title: '负责人姓名',
+          dataIndex: 'headName'
+        },
+        {
+          title: '负责人手机号',
+          dataIndex: 'headPhone'
+        },
+        {
+          title: '会议描述',
+          dataIndex: 'content'
+        },
+        {
+          title: '房间id',
+          dataIndex: 'roomId'
+        },
+        {
+          title: '展厅面积',
+          dataIndex: 'area'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getShowroomList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:showroom:add'),
+      editEnabel: checkPermission('meeting:showroom:edit'),
+      removeEnable: checkPermission('meeting:showroom: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) {
+      delShowroom({ 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/ShowroomRecordList.vue b/src/views/admin/meeting/ShowroomRecordList.vue
new file mode 100644
index 0000000..af4097b
--- /dev/null
+++ b/src/views/admin/meeting/ShowroomRecordList.vue
@@ -0,0 +1,212 @@
+<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="会议主体id">
+              <a-input placeholder="请输入会议主体id" v-model="queryParam.showroomId"/>
+            </a-form-item>
+          </a-col>
+          <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"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="预约状态">
+              <a-input placeholder="请输入预约状态" v-model="queryParam.stauts"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="预约编号">
+              <a-input placeholder="请输入预约编号" v-model="queryParam.reservationNumber"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="订单取消原因">
+              <a-input placeholder="请输入订单取消原因" v-model="queryParam.cancelResaon"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="备注">
+              <a-input placeholder="请输入备注" v-model="queryParam.remake"/>
+            </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>
+    <showroomRecord-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delShowroomRecord} from '@/api/admin/meeting/showroomRecord'
+    import ShowroomRecordModal from './modules/ShowroomRecordModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    ShowroomRecordModal
+  },
+  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: '会议主体id',
+          dataIndex: 'showroomId'
+        },
+        {
+          title: '用户id',
+          dataIndex: 'userId'
+        },
+        {
+          title: '主题',
+          dataIndex: 'title'
+        },
+        {
+          title: '预约状态',
+          dataIndex: 'stauts'
+        },
+        {
+          title: '预约编号',
+          dataIndex: 'reservationNumber'
+        },
+        {
+          title: '订单取消时间',
+          dataIndex: 'cancelTime',
+          sorter: true
+        },
+        {
+          title: '订单取消原因',
+          dataIndex: 'cancelResaon'
+        },
+        {
+          title: '预约-开始时间',
+          dataIndex: 'startTime',
+          sorter: true
+        },
+        {
+          title: '预约-结束时间',
+          dataIndex: 'endDate',
+          sorter: true
+        },
+        {
+          title: '备注',
+          dataIndex: 'remake'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getShowroomRecordList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:showroomRecord:add'),
+      editEnabel: checkPermission('meeting:showroomRecord:edit'),
+      removeEnable: checkPermission('meeting:showroomRecord: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) {
+      delShowroomRecord({ 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/EquipmentModal.vue b/src/views/admin/meeting/modules/EquipmentModal.vue
index 583f82b..f11d5d7 100644
--- a/src/views/admin/meeting/modules/EquipmentModal.vue
+++ b/src/views/admin/meeting/modules/EquipmentModal.vue
@@ -1,135 +1,208 @@
 <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="设备编号">
-        <a-input placeholder="设备编号" v-decorator="['equipmentNum', {rules: [{required: true, message: '请输入设备编号'}]}]"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备编号'>
+        <a-input placeholder='设备编号' v-decorator="['equipmentNum', {rules: [{required: true, message: '请输入设备编号'}]}]" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备名称">
-        <a-input placeholder="设备名称" v-decorator="['equipmentName',{rules: [{required: true, message: '请输入设备名称'}]}]"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备名称'>
+        <a-input placeholder='设备名称' v-decorator="['equipmentName',{rules: [{required: true, message: '请输入设备名称'}]}]" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备类型">
-        <a-select v-decorator="['type',{rules: [{ required: true, message: '请选择设备类型'}]}]" placeholder="请选择设备类型">
-          <a-select-option value="0">
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备类型'>
+        <a-select v-decorator="['type',{rules: [{ required: true, message: '请选择设备类型'}]}]" 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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备ip">
-        <a-input placeholder="设备ip" v-decorator="['ip',{rules: [{required: true, message: '请输入设备ip'}]}]"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备ip'>
+        <a-input placeholder='设备ip' v-decorator="['ip',{rules: [{required: true, message: '请输入设备ip'}]}]" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="所属楼层">
-        <a-select v-decorator="['buildId',{rules: [{ required: true, message: '请选择所属楼层' }]}]" placeholder="所属楼层"  @change='getRoomList' >
-          <a-select-option v-for="item in floorList" :key="item.id" :value="item.id" >
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='所属楼层'>
+        <a-select v-decorator="['buildId',{rules: [{ required: true, message: '请选择所属楼层' }]}]" placeholder='所属楼层'
+                  @change='getRoomList'>
+          <a-select-option v-for='item in floorList' :key='item.id' :value='item.id' >
             {{ item.floorName }}
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="存放地点">
-        <a-select v-decorator="['roomId',{rules: [{ required: true, message: '选择存放地点' }]}]" placeholder="所属房间"  @change='getArea' >
-          <a-select-option v-for="item in roomList" :key="item.id" :value="item.id" >
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='存放地点'>
+        <a-select v-decorator="['roomId',{rules: [{ required: true, message: '选择存放地点' }]}]" placeholder='所属房间'
+                  >
+          <a-select-option v-for='item in roomList' :key='item.id' :value='item.id' >
             {{ item.name }}
           </a-select-option>
         </a-select>
       </a-form-item>
-<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="存放地点">-->
-<!--        <a-input placeholder="存放地点" v-decorator="['roomId',{rules: [{required: true, message: '请输入存放地点'}]}]"/>-->
-<!--      </a-form-item>-->
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备状态">
-        <a-select v-decorator="['status',{rules: [{ required: true, message: '请选择设备状态'}]}]" placeholder="请选择设备状态">
-          <a-select-option value="0">
+      <!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="存放地点">-->
+      <!--        <a-input placeholder="存放地点" v-decorator="['roomId',{rules: [{required: true, message: '请输入存放地点'}]}]"/>-->
+      <!--      </a-form-item>-->
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备状态'>
+        <a-select v-decorator="['status',{rules: [{ required: true, message: '请选择设备状态'}]}]" placeholder='请选择设备状态'>
+          <a-select-option value='0'>
             开启
           </a-select-option>
-          <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>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备图片">
-        <a-input placeholder="设备图片" v-decorator="['pic',{rules: [{required: true, message: '请输入设备图片'}]}]"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='设备图片'>
+        <!--        <a-input placeholder="设备图片" v-decorator="['pic',{rules: [{required: true, message: '请输入设备图片'}]}]"/>-->
+        <a-upload
+          v-decorator="['pic']"
+          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>
   </a-modal>
 </template>
 <script>
-    import {saveEquipment} from '@/api/admin/meeting/equipment'
-    import pick from 'lodash.pick'
-    import { getFloorList,getRoomListByFloorId } from '@/api/admin/meeting/roomContent'
+import { saveEquipment, get } from '@/api/admin/meeting/equipment'
+import pick from 'lodash.pick'
+import { getFloorList, getRoomListByFloorId } from '@/api/admin/meeting/roomContent'
+import storage from 'store'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 
-    export default {
+export default {
   name: 'EquipmentModal',
-  props: {
-  },
-  components: {
-  },
-  data () {
+  props: {},
+  components: {},
+  data() {
     return {
       visible: false,
       labelCol: {
         xs: { span: 24 },
         sm: { span: 5 }
       },
+      loading: false,
       wrapperCol: {
         xs: { span: 24 },
         sm: { span: 16 }
       },
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
+      imageUrl: '',
+      headers: {
+        Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
+      },
       confirmLoading: false,
       mdl: {},
       form: this.$form.createForm(this),
-      floorList:[],
-      roomList:[]
+      floorList: [],
+      roomList: []
     }
   },
-  beforeCreate () {
+  beforeCreate() {
   },
-  created () {
+  created() {
     this.getFloorList()
   },
   methods: {
-    getFloorList(){
-      getFloorList().then((res) =>{
+    getFloorList() {
+      getFloorList().then((res) => {
         this.floorList = res.data
       })
     },
-    getRoomList(value){
-      let param={
-        "buildingDetailId":value
+    getRoomList(value) {
+      let param = {
+        'buildingDetailId': value
       }
-      getRoomListByFloorId(param).then((res) =>{
+      getRoomListByFloorId(param).then((res) => {
         this.roomList = res.data
       })
     },
-
-    add () {
+    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({
+            // 设置相对路径
+            pic: 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) {
+    edit(record) {
+      if (record.id != 0){
+        get(record.id).then((res) => {
+          console.log(res)
+          this.form.setFieldsValue({
+            ip: res.ip,
+            status: res.status.toString(),
+            type: res.type.toString(),
+            buildId: res.buildId,
+
+
+
+            roomId: res.roomName,
+          })
+        })
+      }
+
+
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id', 'type', 'equipmentName', 'status', 'createDate', 'equipmentNum', 'pic', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
       })
     },
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
       this.form.validateFields((err, values) => {
         if (!err) {
@@ -167,4 +240,10 @@
       */
   }
 }
+
+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/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue
index 0249a14..0f3e166 100644
--- a/src/views/admin/meeting/modules/RoomContentModal.vue
+++ b/src/views/admin/meeting/modules/RoomContentModal.vue
@@ -270,7 +270,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 5 },
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       imageUrl: '',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
@@ -361,18 +361,21 @@ export default {
       this.edit({ id: 0 })
     },
     edit (record) {
-      get(record.id).then((res) =>{
-        this.form.setFieldsValue({
+      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.typeName
+            buildId:res.buildingName,
+            roomId:res.roomName,
+            isToll:res.isToll.toString(),
+            isShow:res.isShow.toString(),
+            isTicket:res.isTicket.toString(),
+            type:res.typeName
 
+          })
         })
-      })
+      }
+
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
diff --git a/src/views/admin/meeting/modules/RoomItemModal.vue b/src/views/admin/meeting/modules/RoomItemModal.vue
index 07c71d7..74196a9 100644
--- a/src/views/admin/meeting/modules/RoomItemModal.vue
+++ b/src/views/admin/meeting/modules/RoomItemModal.vue
@@ -15,18 +15,18 @@
         <a-input v-decorator="['version']"/>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
-        <a-input placeholder="名称" v-decorator="['name']"/>
+        <a-input placeholder="名称" v-decorator="['name' ,{rules: [{required: true, message: '请输入名称'}]}]"/>
       </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-input placeholder="品牌" v-decorator="['brand', {rules: [{required: true, message: '请输入品牌'}]}]"/>
       </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-upload
-          v-decorator="['picUrl']"
+          v-decorator="['picUrl', {rules: [{required: true, message: '请输入图片url'}]}]"
           list-type="picture-card"
           class="avatar-uploader"
           :show-upload-list="false"
@@ -42,24 +42,6 @@
           </div>
         </a-upload>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件url">
-        <a-upload
-          v-decorator="['fileUrl']"
-          list-type="picture-card"
-          class="avatar-uploader"
-          :show-upload-list="false"
-          :action="uploadUrl"
-          :headers="headers"
-          :before-upload="beforeUpload"
-          @change="handleChange1"
-        >
-          <img v-if="imageUrl1" :src="imageUrl1" style="width: 102px; height: 102px"/>
-          <div v-else>
-            <a-icon :type="loading1 ? 'loading' : 'plus'" />
-            <div class="ant-upload-text"> 上传 </div>
-          </div>
-        </a-upload>
-      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
         <a-input placeholder="备注" v-decorator="['remark']"/>
       </a-form-item>
@@ -89,7 +71,7 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/meeting/modules/RoomRecordModal.vue b/src/views/admin/meeting/modules/RoomRecordModal.vue
new file mode 100644
index 0000000..3f89640
--- /dev/null
+++ b/src/views/admin/meeting/modules/RoomRecordModal.vue
@@ -0,0 +1,112 @@
+<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="房间id">
+        <a-input placeholder="房间id" v-decorator="['roomId']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="设备id">
+        <a-input placeholder="设备id" v-decorator="['deviceId']"/>
+      </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="创建者">
+        <a-input placeholder="创建者" v-decorator="['createBy']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveRoomRecord} from '@/api/admin/meeting/roomRecord'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'RoomRecordModal',
+  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', 'roomId', 'deviceId', 'userId', 'createTime', 'createBy', 'deleteFlag'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveRoomRecord(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>
diff --git a/src/views/admin/meeting/modules/RoomServeModal.vue b/src/views/admin/meeting/modules/RoomServeModal.vue
index ceb2c35..6169e87 100644
--- a/src/views/admin/meeting/modules/RoomServeModal.vue
+++ b/src/views/admin/meeting/modules/RoomServeModal.vue
@@ -75,7 +75,7 @@ export default {
         sm: { span: 16 }
       },
       loading: false,
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       imageUrl: '',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
diff --git a/src/views/admin/meeting/modules/ShowroomModal.vue b/src/views/admin/meeting/modules/ShowroomModal.vue
new file mode 100644
index 0000000..e5f368c
--- /dev/null
+++ b/src/views/admin/meeting/modules/ShowroomModal.vue
@@ -0,0 +1,145 @@
+<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="['showroomCode']"/>
+      </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-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
+        <a-input placeholder="地址" v-decorator="['address']"/>
+      </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="负责人姓名">
+        <a-input placeholder="负责人姓名" v-decorator="['headName']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负责人手机号">
+        <a-input placeholder="负责人手机号" v-decorator="['headPhone']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议描述">
+        <a-input placeholder="会议描述" v-decorator="['content']"/>
+      </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-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="版本">
+        <a-input placeholder="版本" v-decorator="['version']"/>
+      </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="['area']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveShowroom} from '@/api/admin/meeting/showroom'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'ShowroomModal',
+  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', 'showroomCode', 'meetingName', 'capacityNum', 'expandNum', 'indoorPicUrl', 'address', 'startTime', 'endDate', 'isShow', 'headName', 'headPhone', 'content', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag', 'roomId', 'area'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveShowroom(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>
diff --git a/src/views/admin/meeting/modules/ShowroomRecordModal.vue b/src/views/admin/meeting/modules/ShowroomRecordModal.vue
new file mode 100644
index 0000000..309664a
--- /dev/null
+++ b/src/views/admin/meeting/modules/ShowroomRecordModal.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="会议主体id">
+        <a-input placeholder="会议主体id" v-decorator="['showroomId']"/>
+      </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="主题">
+        <a-input placeholder="主题" v-decorator="['title']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="预约状态">
+        <a-input placeholder="预约状态" v-decorator="['stauts']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="预约编号">
+        <a-input placeholder="预约编号" v-decorator="['reservationNumber']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="订单取消原因">
+        <a-input placeholder="订单取消原因" v-decorator="['cancelResaon']"/>
+      </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-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+        <a-input placeholder="备注" v-decorator="['remake']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveShowroomRecord} from '@/api/admin/meeting/showroomRecord'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'ShowroomRecordModal',
+  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', 'showroomId', 'userId', 'title', 'stauts', 'reservationNumber', 'cancelTime', 'cancelResaon', 'startTime', 'endDate', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'remake'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveShowroomRecord(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>
diff --git a/src/views/admin/meeting/modules/TicketModal.vue b/src/views/admin/meeting/modules/TicketModal.vue
index ef168f4..0516608 100644
--- a/src/views/admin/meeting/modules/TicketModal.vue
+++ b/src/views/admin/meeting/modules/TicketModal.vue
@@ -76,7 +76,7 @@
                 有限制
               </a-radio>
               <div>
-                <a-input-number v-if='value === 2' placeholder='发送数量'
+                <a-input-number v-if='value === 2' placeholder='发送数量' @change='clickNumber'
                                 v-decorator="['num',{rules: [{ required: true, message: '结束日期'}]}]"
                                 style='margin-top: 20px;width: 200px' />
               </div>
@@ -116,7 +116,7 @@
       </a-table>
     </a-form>
 
-    <a-modal v-model='customerVisible' title='会议设备' width='800px' @ok='itemHandleOk()'>
+    <a-modal v-model='customerVisible' title='选择企业' width='800px' @ok='customerHandleOk()'>
       <div class='table-page-search-wrapper'>
         <a-form layout='inline'>
           <a-form-item label='关键词' style='width: 300px'>
@@ -146,7 +146,7 @@
     >
       <a-form layout='inline'>
         <a-form-item label='发放数量' >
-          <a-input-number placeholder='请输入发放数量' v-model='ticketNum' style='width: 200px' />
+          <a-input-number  placeholder='请输入发放数量' v-model='ticketNum' style='width: 200px'  />
         </a-form-item>
       </a-form>
     </a-modal>
@@ -251,11 +251,27 @@ export default {
     couponTicket(){
       this.numVisible =true
     },
+    clickNumber(value){
+      //数值改变
+      this.loadData.forEach(item =>{
+        item.num = value
+      })
+    },
 
     handleNumSubmit(){
 
     },
 
+    customerHandleOk(){
+      let record = this.selectedCustomerRows
+      record.forEach(record =>{
+        this.data = this.data.filter(item => item.id != record.id)
+        this.loadData.push(record)
+      })
+      this.customerVisible =false
+
+    },
+
     deleteRecord(record) {
       this.loadData = this.loadData.filter(item => item.id != record.id)
       this.data.push(record)
diff --git a/src/views/admin/modules/BuildingFloorModal.vue b/src/views/admin/modules/BuildingFloorModal.vue
index 910546d..aef9e05 100644
--- a/src/views/admin/modules/BuildingFloorModal.vue
+++ b/src/views/admin/modules/BuildingFloorModal.vue
@@ -52,7 +52,7 @@ export default {
       confirmLoading: false,
       roleAll: [],
       mdl: {},
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         token: storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/modules/BuildingModal.vue b/src/views/admin/modules/BuildingModal.vue
index 3c7bffe..2f6b7e0 100644
--- a/src/views/admin/modules/BuildingModal.vue
+++ b/src/views/admin/modules/BuildingModal.vue
@@ -54,7 +54,7 @@ export default {
       confirmLoading: false,
       roleAll: [],
       mdl: {},
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         token: storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/modules/CustomerAttachmentList.vue b/src/views/admin/modules/CustomerAttachmentList.vue
index 2c9e643..9be0e19 100644
--- a/src/views/admin/modules/CustomerAttachmentList.vue
+++ b/src/views/admin/modules/CustomerAttachmentList.vue
@@ -97,7 +97,7 @@ export default {
       loadData: parameter => {
         return getCustomerAttachmentsList(Object.assign(parameter, { customerId: this.customerId }))
       },
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/modules/CustomerContractBillModal.vue b/src/views/admin/modules/CustomerContractBillModal.vue
index e9d42ca..6f1bd47 100644
--- a/src/views/admin/modules/CustomerContractBillModal.vue
+++ b/src/views/admin/modules/CustomerContractBillModal.vue
@@ -85,7 +85,7 @@ export default {
       confirmLoading: false,
       roleAll: [],
       mdl: {},
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         token: storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/admin/modules/CustomerContractOtherBillModal.vue b/src/views/admin/modules/CustomerContractOtherBillModal.vue
index 967a1ef..0472e90 100644
--- a/src/views/admin/modules/CustomerContractOtherBillModal.vue
+++ b/src/views/admin/modules/CustomerContractOtherBillModal.vue
@@ -85,7 +85,7 @@ export default {
       confirmLoading: false,
       roleAll: [],
       mdl: {},
-      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/dfs/upload',
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         token: storage.get(ACCESS_TOKEN)
       },
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 0e77259..0de1946 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -62,6 +62,11 @@
             <a-select-option v-for="(action) in roleAll" :key="action.id" >{{ action.roleName }}</a-select-option>
           </a-select>
         </a-form-item>
+        <a-form-item  :labelCol="labelCol" :wrapperCol="wrapperCol" label="选择企业">
+          <a-select v-decorator="['customerId', {rules: [{ required: true, message: '请选择企业' }]}]">
+            <a-select-option v-for="item in customerList" :key="item.id" :value='item.id'>{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
 
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
           <a-textarea :rows="3" placeholder="..." v-decorator="['remark']"/>
@@ -72,6 +77,9 @@
 </template>
 <script>
 import { getRoleAll, saveUser, getUser } from '@/api/system'
+import {
+  getCustomerList
+} from '@/api/admin/meeting/roomContent'
 import { getTenantList } from '@/api/tenant'
 import { getParkList } from '@/api/admin/park'
 import pick from 'lodash.pick'
@@ -102,6 +110,7 @@ export default {
       confirmLoading: false,
       roleAll: [],
       mdl: {},
+      customerList:[],
       deptCheck: true,
       spinning: false,
       tenantData: [],
@@ -112,6 +121,10 @@ export default {
   beforeCreate () {
   },
   created () {
+    getCustomerList().then(res =>{
+      this.customerList = res.rows
+    })
+
     // 租户
     getTenantList().then(res => {
       if (res.code === 0) {