diff --git a/src/api/admin/meeting/visitorPerson.js b/src/api/admin/meeting/visitorPerson.js
index cf959d4..d729da9 100644
--- a/src/api/admin/meeting/visitorPerson.js
+++ b/src/api/admin/meeting/visitorPerson.js
@@ -58,10 +58,11 @@ export function selectUserByCustomer(id) {
   })
 }
 
-export function selectCustomer () {
+export function selectCustomer (parameter) {
   return axios({
     url: api.visitorPerson + '/selectCustomer',
     method: 'get',
+    params: parameter
   })
 }
 
diff --git a/src/views/admin/meeting/VisitorPersonInfo.vue b/src/views/admin/meeting/VisitorPersonInfo.vue
index 3dd690e..8474e36 100644
--- a/src/views/admin/meeting/VisitorPersonInfo.vue
+++ b/src/views/admin/meeting/VisitorPersonInfo.vue
@@ -10,6 +10,25 @@
       <span style='display: block;margin-top: 11px;font-size: 15px'>访客详情</span>
     </div>
     <a-form-model :model='form' :label-col='labelCol' :wrapper-col='wrapperCol'>
+      <a-row>
+        <a-col :span='10'>
+          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='地区'>
+            {{ form.userName }}
+          </a-form-item>
+        </a-col>
+        <a-col :span='10'>
+          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='园区'>
+            {{ form.tenantName }}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span='10'>
+          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访单位'>
+            {{ form.customerName }}
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row>
         <a-col :span='10'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访人员'>
@@ -23,11 +42,6 @@
         </a-col>
       </a-row>
       <a-row>
-        <a-col :span='10'>
-          <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访单位'>
-            {{ form.customerName }}
-          </a-form-item>
-        </a-col>
         <a-col :span='10'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='来访人照片'>
             <img :src='baseUrl + form.photo' style='max-width: 80px; max-height: 80px'>
diff --git a/src/views/admin/meeting/modules/VisitorPersonModal.vue b/src/views/admin/meeting/modules/VisitorPersonModal.vue
index 826881a..5573c59 100644
--- a/src/views/admin/meeting/modules/VisitorPersonModal.vue
+++ b/src/views/admin/meeting/modules/VisitorPersonModal.vue
@@ -14,10 +14,24 @@
       <a-form-item style='display:none'>
         <a-input v-decorator="['version']" />
       </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' 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-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' 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-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访单位'>
         <a-select v-decorator="['customerId',{rules: [{ required: true, message: '请选择被访单位' }]}]"
                   placeholder='请选择被访单位'
-                  @change='getPersonList'>
+                  @change='selectEnterprise'>
           <a-select-option v-for='item in enterpriseList' :key='item.id' :value='item.id'>
             {{ item.name }}
           </a-select-option>
@@ -26,7 +40,7 @@
       <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访人姓名'>
         <a-select v-decorator="['userId',{rules: [{ required: true, message: '请选择被访人姓名' }]}]"
                   placeholder='请选择被访人姓名'
-                  @change='getPersonData'>
+                  @change='selectPerson'>
           <a-select-option v-for='item in personList' :key='item.id' :value='item.id'>
             {{ item.mobile + '-' + item.username }}
           </a-select-option>
@@ -105,10 +119,14 @@
 </template>
 <script>
 import { saveVisitorPerson, selectUserByCustomer, selectCustomer } from '@/api/admin/meeting/visitorPerson'
+import { getInfo } from '@/api/login'
+import { getTenantList } from '@/api/tenant'
+import { getParkList } from '@/api/admin/park'
 import pick from 'lodash.pick'
 import { getRoomListByFloorId } from '@/api/admin/meeting/roomContent'
 import storage from 'store'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { getBuildingList } from '@/api/admin/building'
 
 
 export default {
@@ -129,8 +147,6 @@ export default {
       confirmLoading: false,
       mdl: {},
       form: this.$form.createForm(this),
-      enterpriseList: [],
-      personList: [],
       idcardTypeList: [{
         name: '居民身份证'
       }],
@@ -138,30 +154,131 @@ export default {
       imageUrl: '',
       headers: {
         Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
-      }
+      },
+      userDetail: {},
+      tenantList: [], // 地区
+      parkList: [], // 园区
+      enterpriseList: [], // 企业
+      personList: [],  // 人员
+      tenantEnable: false,
+      parkEnable: false
     }
   },
   beforeCreate() {
   },
   created() {
-    // 查询企业
-    selectCustomer().then(res => {
-      console.log('selectCustomer', res)
-      this.enterpriseList = res.data
-    })
+
   },
   methods: {
-    getPersonList(value) {
-      console.log('getPersonList', value)
-      selectUserByCustomer(value).then(res => {
-        console.log('selectUserByCustomer', res)
-        this.personList = res.data
-        this.form.setFieldsValue({ mobile: null, userId: null })
+    // 获取用户详细信息
+    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) {
+          //
+          // 判断：是新增就查询园区
+          let { id } = this.mdl
+          if (!id) {
+            // 选择地区 -> 查询园区
+            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
+          })
+        }
       })
     },
-    getPersonData(value) {
-      console.log('getPersonData', value)
-      this.form.setFieldsValue({ mobile: this.personList.find(item => item.id == value).mobile })
+    // 查询地区
+    getTenantData() {
+      getTenantList().then(res => {
+        this.tenantList = res.rows
+      })
+    },
+    // 选择地区 -> 查询园区
+    selectTenant(id) {
+      console.log('selectTenant', id)
+      // 清空数据
+      this.mdl.parkId = null // 园区
+      this.mdl.customerId = null // 企业
+      this.mdl.userId = null // 人员
+      this.mdl.mobile = null // 手机号
+
+      this.form.setFieldsValue({
+        parkId: null, // 园区
+        customerId: null, // 企业
+        userId: null, // 人员
+        mobile: null // 手机号
+      })
+      // 查询园区
+      getParkList({
+        tenantId: id
+      }).then(res => {
+        this.parkList = res.rows
+      })
+    },
+    // 选择园区 -> 查询企业
+    selectPark(id) {
+      // 清空数据
+      this.mdl.customerId = null // 企业
+      this.mdl.userId = null // 人员
+      this.mdl.mobile = null // 手机号
+
+      this.form.setFieldsValue({
+        customerId: null, // 企业
+        userId: null, // 人员
+        mobile: null // 手机号
+      })
+      // 查询企业
+      selectCustomer({
+        parkId: id
+      }).then(res => {
+        console.log('selectCustomer', res)
+        this.enterpriseList = res.data
+      })
+    },
+    // 选择企业 -> 查询人员
+    selectEnterprise(id, userId) {
+      // 清空数据
+      this.mdl.userId = null // 人员
+      this.mdl.mobile = null // 手机号
+
+      this.form.setFieldsValue({
+        userId: null, // 人员
+        mobile: null // 手机号
+      })
+      // 查询人员
+      selectUserByCustomer(id).then(res => {
+        console.log('selectUserByCustomer', res)
+        this.personList = res.data
+        // 选择人员 -> 赋值"手机号"
+        if (userId) {
+          this.selectPerson(userId)
+        }
+      })
+    },
+    // 选择人员 -> 赋值"手机号"
+    selectPerson(id) {
+      // 清空数据
+      this.mdl.mobile = null // 手机号
+
+      this.form.setFieldsValue({
+        mobile: null // 手机号
+      })
+      console.log('this.personList', this.personList)
+      console.log('id', id)
+      this.form.setFieldsValue({ mobile: this.personList.find(item => item.id == id).mobile })
     },
     beforeUpload(file) {
       const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'
@@ -202,18 +319,51 @@ export default {
       reader.readAsDataURL(img)
     },
     add() {
+      this.mdl = {}
       this.form.resetFields()
       this.edit({ id: 0 })
-      this.imageUrl = null
     },
     edit(record) {
-      this.mdl = Object.assign(record)
+      this.mdl = Object.assign(this.mdl, record)
+      let copyMdl = JSON.parse(JSON.stringify(this.mdl))
+      // 查询地区
+      this.getTenantData()
+      //
+      if (record.id) { // 编辑
+        // 选择地区 -> 查询园区
+        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.customerId) {
+          this.mdl = JSON.parse(JSON.stringify(copyMdl))
+          this.selectEnterprise(copyMdl.customerId, copyMdl.userId)
+        }
+        // 防止替换
+        this.mdl = JSON.parse(JSON.stringify(copyMdl))
+
+      } else { // 新增
+
+      }
+      // 获取用户信息
+      this.getUserDetail()
+      //
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'userId', 'customerId', 'intervieweeId', 'name', 'phone', 'joinTime', 'visitTime', 'leaveTime', 'visitContent', 'cardType', 'cardNo', 'status', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag', 'photo'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'tenantId', 'parkId', 'customerId', 'userId', 'mobile', 'intervieweeId',
+          'name', 'phone', 'joinTime', 'visitTime', 'leaveTime', 'visitContent', 'cardType',
+          'cardNo', 'status', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag', 'photo'))
       })
       if (this.mdl.photo) {
         this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.photo
+      } else {
+        this.imageUrl = null
       }
     },
     handleSubmit(e) {