diff --git a/src/api/admin/meeting/roomContent.js b/src/api/admin/meeting/roomContent.js
index 6684168..9c62f3f 100644
--- a/src/api/admin/meeting/roomContent.js
+++ b/src/api/admin/meeting/roomContent.js
@@ -125,6 +125,16 @@ export function getRoomListByFloorId (parameter) {
   })
 }
 
+export function getRoomListByBuildIdsRq (parameter) {
+  return axios({
+    url: api.roomContent + '/getRoomListByBuildIds',
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 
 export function selectRoomItemByRoom (parameter) {
   return axios({
diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index f1773f9..9d6b87c 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -40,19 +40,50 @@
             </a-col>
 
             <a-col :span='12'>
-              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' 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='labelColHalf' :wrapperCol='wrapperColHalf' label='所属地区'>
+                <a-select v-decorator="['tenantId', {rules: [{ required: true, message: '请选择所属地区' }]}]"
+                          @change='selectTenant'
+                          :disabled='tenantEnable'>
+                  <a-select-option v-for='item in tenantList' :key='item.id'>{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span='12'>
+              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='所属园区'>
+                <a-select v-decorator="['parkId', {rules: [{ required: true, message: '请选择所属园区' }]}]"
+                          @change='selectPark'
+                          :disabled='parkEnable'>
+                  <a-select-option v-for='item in parkList' :key='item.id'>{{ item.name }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span='12'>
+              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='所属楼宇'>
+                <a-select v-decorator="['buildingId', {rules: [{ required: true, message: '请选择所属楼宇' }]}]"
+                          @change='selectBuilding'>
+                  <a-select-option v-for='item in buildingList' :key='item.id'>{{ item.buildingName }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span='12'>
+              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='所属楼层'>
+                <a-select v-decorator="['buildingDetailIds',{rules: [{ required: true, message: '请选择所属楼层' }]}]"
+                          placeholder='所属楼层'
+                          mode='multiple'
+                          @change='selectBuildingDetail'>
+                  <a-select-option v-for='item in buildingDetailList' :key='item.id' :value='item.id'>
                     {{ item.floorName }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
+
             <a-col :span='12'>
-              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='房间'>
-                <a-select v-decorator="['roomId',{rules: [{ required: true, message: '选择所属房间' }]}]"
-                          placeholder='所属房间'>
+              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='所属房间'>
+                <a-select v-decorator="['roomIds',{rules: [{ required: true, message: '选择所属房间' }]}]"
+                          placeholder='所属房间'
+                          mode='multiple'>
                   <a-select-option v-for='item in roomList' :key='item.id' :value='item.id'>
                     {{ item.name }}
                   </a-select-option>
@@ -116,7 +147,8 @@
             </a-col>
             <a-col :span='12'>
               <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='联系电话'>
-                <a-input placeholder='联系电话' v-decorator="['phone',{rules: [{ required: true, message: '请输入联系电话' }]}]" />
+                <a-input placeholder='联系电话'
+                         v-decorator="['phone',{rules: [{ required: true, message: '请输入联系电话' }]}]" />
               </a-form-item>
             </a-col>
             <a-col :span='12'>
@@ -200,7 +232,7 @@
             </a-col>
             <a-col :span='8'>
               <a-form-item :labelCol='labelColOneThird' :wrapperCol='wrapperColOneThird' label='是否黑名单'>
-                <a-switch :checked='customerForm.isBlacklist' @change='onChangeBlacklist'
+                <a-switch :checked='mdl.isBlacklist' @change='onChangeBlacklist'
                           v-decorator="['isBlacklist']" />
               </a-form-item>
             </a-col>
@@ -376,6 +408,8 @@
 
 <script>
 
+import { getTenantList } from '@/api/tenant'
+
 let downloadLoadingInstance
 import moment from 'moment'
 import storage from 'store'
@@ -395,7 +429,8 @@ import {
 } from '@/api/admin/customer'
 import {
   getFloorList,
-  getRoomListByFloorId
+  getRoomListByFloorId,
+  getRoomListByBuildIdsRq
 } from '@/api/admin/meeting/roomContent'
 import { getCustomerContractList } from '@/api/admin/customerContract'
 import CustomerContactsModal from './modules/CustomerContactsModal.vue'
@@ -403,6 +438,10 @@ import CustomerAttachmentList from './modules/CustomerAttachmentList.vue'
 import pick from 'lodash.pick'
 import { message } from 'ant-design-vue'
 import { download } from '@/utils/request'
+import { getParkList } from '@/api/admin/park'
+import { getBuildingList } from '@/api/admin/building'
+import { getBuildingDetailList } from '@/api/admin/buildingDetail'
+import { getInfo } from '@/api/login'
 
 export default {
   name: 'BaseForm',
@@ -480,7 +519,7 @@ export default {
           scopedSlots: { customRender: 'operation' }
         }
       ],
-      deviceColumns:[
+      deviceColumns: [
         {
           title: '设备名称',
           dataIndex: 'equipmentName'
@@ -494,9 +533,9 @@ export default {
           dataIndex: 'floorName',
           scopedSlots: { customRender: 'floorName' }
 
-        },
+        }
       ],
-      deviceData:[],
+      deviceData: [],
       labelColHalf: {
         span: 6
       },
@@ -524,9 +563,8 @@ export default {
       orderReturnsData: [],
       contactsItemData: [],
 
-      selectedDeviceRowKeys:[],
-      selectedRowKeys:[],
-      customerForm: {},
+      selectedDeviceRowKeys: [],
+      selectedRowKeys: [],
       uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
@@ -536,14 +574,20 @@ export default {
       previewImage: '',
       loading: false,
       imageUrl: '',
-      userId:'',
+      userId: '',
       // form
       form: this.$form.createForm(this),
-      floorList: [],
-      roomList: [],
       file: '',
       visible: false,
-      visible1:false,
+      visible1: false,
+      tenantList: [], // 地区
+      parkList: [], // 园区
+      buildingList: [], // 楼宇
+      buildingDetailList: [], // 楼层
+      roomList: [], //房间
+      tenantEnable: false,
+      parkEnable: false,
+      mdl: {}
     }
   },
   filters: {
@@ -567,20 +611,139 @@ export default {
       this.defaultActiveKey = '2'
     }
     this.handleInit()
-    // 获取楼层
-    this.getFloorDataList()
     this.selectUserDeviceList()
+    // 查询地区
+    this.getTenantData()
+    // 获取用户详细信息
+    this.getUserDetail();
   },
   methods: {
+    // 获取用户详细信息
+    getUserDetail() {
+      getInfo().then(res => {
+        console.log('getUserDetail', res)
+        this.userDetail = res
+        // 园区：5
+        if (this.userDetail.roleIds && this.userDetail.roleIds.length > 0 && this.userDetail.roleIds[0] == 5) {
+          //
+          // 判断：是新增就查询园区
+          const { customerId } = this.$route.query
+          if (!customerId) {
+            // 选择地区 -> 查询园区
+            this.selectTenant(this.userDetail.tenantId)
+            // 选择园区 -> 查询楼宇
+            this.selectPark(this.userDetail.parkId)
+          }
+          //
+          // 不可编辑
+          this.tenantEnable = true
+          this.parkEnable = true
+          // 关联地区和园区
+          this.mdl.parkId = this.userDetail.parkId
+          this.mdl.tenantId = this.userDetail.tenantId
+          this.form.setFieldsValue({
+            parkId: this.mdl.parkId,
+            tenantId: this.mdl.tenantId
+          })
+        }
+      })
+    },
+    // 查询地区
+    getTenantData() {
+      getTenantList().then(res => {
+        this.tenantList = res.rows
+      })
+    },
+    // 选择地区 -> 查询园区
+    selectTenant(id) {
+      console.log('selectTenant', id)
+      // 清空数据
+      this.mdl.parkId = null // 园区
+      this.mdl.buildingId = null // 楼宇
+      this.mdl.buildingDetailIds = [] // 楼层
+      this.mdl.roomIds = [] // 所属房间
+
+      this.form.setFieldsValue({
+        parkId: null, // 园区
+        buildingId: null, // 楼宇
+        buildingDetailIds: [], // 楼层
+        roomIds: [] // 所属房间
+      })
+      // 查询园区
+      getParkList({
+        tenantId: id
+      }).then(res => {
+        this.parkList = res.rows
+      })
+    },
+    // 选择园区 -> 查询楼宇
+    selectPark(id) {
+      // 清空数据
+      this.mdl.buildingId = null // 楼宇
+      this.mdl.buildingDetailIds = [] // 楼层
+      this.mdl.roomIds = [] // 所属房间
+
+      this.form.setFieldsValue({
+        buildingId: null, // 楼宇
+        buildingDetailIds: [], // 楼层
+        roomIds: [] // 所属房间
+      })
+      // 查询楼宇
+      getBuildingList({
+        parkId: id
+      }).then(res => {
+        this.buildingList = res.rows
+      })
+    },
+    // 选择楼宇 -> 查询楼层
+    selectBuilding(id) {
+      // 清空数据
+      this.mdl.buildingDetailIds = [] // 楼层
+      this.mdl.roomIds = [] // 所属房间
+
+      this.form.setFieldsValue({
+        buildingDetailIds: [], // 楼层
+        roomIds: [] // 所属房间
+      })
+      // 查询楼层
+      getBuildingDetailList({
+        buildingId: id
+      }).then(res => {
+        this.buildingDetailList = res.rows
+      })
+    },
+    // 选择楼层 -> 查询房间
+    selectBuildingDetail(buildingDetailId) {
+      console.log('buildingDetailId', buildingDetailId)
+      // 查询房间
+      this.getRoomListByFloorIdMethod(buildingDetailId)
+    },
+    // 查询房间
+    getRoomListByFloorIdMethod(buildingDetailIds, ids) {
+      // 清空数据
+      this.mdl.roomIds = [] // 所属房间
+
+      this.form.setFieldsValue({
+        roomIds: [] // 所属房间
+      })
+      // 查询房间
+      getRoomListByBuildIdsRq({
+        'ids': ids,
+        'buildingDetailIds': buildingDetailIds,
+        'type': 0
+      }).then((res) => {
+        this.roomList = res.data
+      })
+    },
     //获取设备数量
-    handleDeviceTable(record){
+    handleDeviceTable(record) {
       this.visible1 = true
-      this.userId =record.id
-      selectEquipmentListById({userId:record.id}).then(res =>{
-        if (res.data){
+      this.userId = record.id
+      selectEquipmentListById({ userId: record.id }).then(res => {
+        if (res.data) {
           this.selectedDeviceRowKeys = res.data.map(d => d.id)
           this.selectedRowKeys = res.data
-        }else {
+        } else {
           this.selectedDeviceRowKeys = []
           this.selectedRowKeys = []
         }
@@ -588,37 +751,29 @@ export default {
 
     },
     //设备选中事件
-    onDeviceSelectChange(selectedRowKeys,selectedRows){
+    onDeviceSelectChange(selectedRowKeys, selectedRows) {
       this.selectedDeviceRowKeys = selectedRowKeys
       this.selectedRowKeys = selectedRows
 
     },
-    itemHandleOk(){
+    itemHandleOk() {
       saveUserEquipment(
         {
-          userId:this.userId,
-          userIds:this.selectedDeviceRowKeys
+          userId: this.userId,
+          userIds: this.selectedDeviceRowKeys
         }
-      ).then(res =>{
-        this.$refs.userTable.$forceUpdate()
-        this.visible1 =false
+      ).then(res => {
+        this.getContastsList()
+        this.visible1 = false
         this.$message.success(res.msg)
       })
     },
     //获取所有设备
-    selectUserDeviceList(){
-      selectUserDeviceList().then(res =>{
+    selectUserDeviceList() {
+      selectUserDeviceList().then(res => {
         this.deviceData = res.data
       })
     },
-
-
-    // 获取楼层
-    getFloorDataList() {
-      getFloorList().then((res) => {
-        this.floorList = res.data
-      })
-    },
     exportTemplate() {
       exportTemplate().then(res => {
         console.log(res)
@@ -686,16 +841,6 @@ export default {
         console.log(res)
       })
     },
-    // 获取房间
-    getRoomList(value) {
-      let param = {
-        'buildingDetailId': value,
-        'type': 0
-      }
-      getRoomListByFloorId(param).then((res) => {
-        this.roomList = res.data
-      })
-    },
     handleDetail(id) {
       this.$router.push({
         name: 'customerContractDetailModal',
@@ -706,7 +851,7 @@ export default {
       this.$router.push({ name: 'customerContractEdit', query: { customerId: this.id, url: 'customerEdit' } })
     },
     onChangeBlacklist(checked) {
-      this.customerForm.isBlacklist = checked
+      this.mdl.isBlacklist = checked
     },
     getQiXinBasicInfo() {
       var keyword = this.form.getFieldValue('creditNo')
@@ -726,26 +871,48 @@ export default {
       const { customerId } = this.$route.query
       if (customerId) {
         getCustomer(customerId).then(res => {
-          this.customerForm = res
-          // 房间
-          if (this.customerForm.roomId) {
-            this.roomList.push({
-              id: this.customerForm.roomId,
-              name: this.customerForm.roomName
-            })
-          }
+          this.mdl = Object.assign(this.mdl, res)
+          let copyMdl = JSON.parse(JSON.stringify(this.mdl))
           // 头像
-          if (this.customerForm.headImg) {
-            this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.customerForm.headImg
+          if (this.mdl.headImg) {
+            this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.headImg
           }
           // 照片墙
-          this.customerForm.bannerImages.forEach((item, i) => {
+          this.mdl.bannerImages.forEach((item, i) => {
             item.url = process.env.VUE_APP_API_BASE_URL + item.url
           })
-          this.fileList = this.customerForm.bannerImages
-          this.form.setFieldsValue(pick(this.customerForm, 'id', 'name', 'shortName', 'type', 'customerStatus', 'sector', 'country', 'process', 'contacts', 'phone', 'email', 'creditNo', 'mailAddress',
-            'postalCode', 'channelType', 'channelName', 'isBlacklist', 'regNo', 'status', 'orgNo', 'operName', 'econKind', 'startDate', 'registCapi', 'endDate'
-            , 'address', 'scope', 'delFlag', 'belongOrg', 'remark', 'headImg', 'bannerImages', 'roomId', 'buildId'))
+          this.fileList = this.mdl.bannerImages
+          // 选择地区 -> 查询园区
+          if (copyMdl.tenantId) {
+            this.mdl = JSON.parse(JSON.stringify(copyMdl))
+            this.selectTenant(copyMdl.tenantId)
+          }
+          // 选择园区 -> 查询楼宇
+          if (copyMdl.parkId) {
+            this.mdl = JSON.parse(JSON.stringify(copyMdl))
+            this.selectPark(copyMdl.parkId)
+          }
+          // 选择楼宇 -> 查询楼层
+          if (copyMdl.buildingId) {
+            this.mdl = JSON.parse(JSON.stringify(copyMdl))
+            this.selectBuilding(copyMdl.buildingId)
+          }
+          // 选择楼层 -> 查询房间
+          if (copyMdl.buildingDetailIds) {
+            this.mdl = JSON.parse(JSON.stringify(copyMdl))
+            this.getRoomListByFloorIdMethod(copyMdl.buildingDetailIds, copyMdl.roomIds)
+          }
+          // 防止替换
+          this.mdl = JSON.parse(JSON.stringify(copyMdl))
+          //
+          this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'shortName', 'type', 'customerStatus',
+            'sector', 'country', 'process', 'contacts', 'phone', 'email', 'creditNo', 'mailAddress',
+            'postalCode', 'channelType', 'channelName', 'isBlacklist', 'regNo', 'status', 'orgNo',
+            'operName', 'econKind', 'startDate', 'registCapi', 'endDate',
+            'address', 'scope', 'delFlag', 'belongOrg', 'remark', 'headImg', 'bannerImages',
+            'roomId', 'buildId', 'roomIds', 'buildingDetailIds', 'tenantId', 'parkId',
+            'buildingId'))
+          //
         })
       }
       this.getContastsList()