diff --git a/src/api/admin/meeting/visitorPerson.js b/src/api/admin/meeting/visitorPerson.js
index 14d3407..cf959d4 100644
--- a/src/api/admin/meeting/visitorPerson.js
+++ b/src/api/admin/meeting/visitorPerson.js
@@ -49,4 +49,21 @@ export function delVisitorPerson(parameter) {
   })
 }
 
+
+export function selectUserByCustomer(id) {
+  return axios({
+    url: api.visitorPerson + '/selectUserByCustomer/' + id,
+    method: 'get',
+    params: {}
+  })
+}
+
+export function selectCustomer () {
+  return axios({
+    url: api.visitorPerson + '/selectCustomer',
+    method: 'get',
+  })
+}
+
+
 export const visitorPersonExport = api.visitorPerson + '/export'
diff --git a/src/views/admin/meeting/modules/VisitorPersonModal.vue b/src/views/admin/meeting/modules/VisitorPersonModal.vue
index 0458243..b181767 100644
--- a/src/views/admin/meeting/modules/VisitorPersonModal.vue
+++ b/src/views/admin/meeting/modules/VisitorPersonModal.vue
@@ -1,63 +1,121 @@
 <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="访客id">
-        <a-input placeholder="访客id" v-decorator="['userId']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访单位'>
+        <a-select v-decorator="['customerId',{rules: [{ required: true, message: '请选择被访单位' }]}]"
+                  placeholder='请选择被访单位'
+                  @change='getPersonList'>
+          <a-select-option v-for='item in enterpriseList' :key='item.id' :value='item.id'>
+            {{ item.name }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="被访人id">
-        <a-input placeholder="被访人id" v-decorator="['intervieweeId']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访人姓名'>
+        <a-select v-decorator="['userId',{rules: [{ required: true, message: '请选择被访人姓名' }]}]"
+                  placeholder='请选择被访人姓名'
+                  @change='getPersonData'>
+          <a-select-option v-for='item in personList' :key='item.id' :value='item.id'>
+            {{ item.mobile + '-' + item.username }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="姓名">
-        <a-input placeholder="姓名" v-decorator="['name']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='被访人手机号'>
+        <a-input placeholder='被访人手机号'
+                 v-decorator="['mobile',{rules: [{ required: true, message: '被访人手机号不能为空'}]}]" disabled />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号">
-        <a-input placeholder="手机号" v-decorator="['phone']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='来访人姓名'>
+        <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="['visitContent']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='来访人联系方式'>
+        <a-input placeholder='请输入来访人联系方式'
+                 v-decorator="['phone',{rules: [{ required: true, message: '来访人联系方式不能为空'}]}]" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="证件号码">
-        <a-input placeholder="证件号码" v-decorator="['cardNo']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='身份证类型'>
+        <a-select v-decorator="['cardType',{rules: [{ required: true, message: '身份证类型不能为空' }]}]"
+                  placeholder='请选择身份证类型'>
+          <a-select-option v-for='item in idcardTypeList' :key='item.name' :value='item.name'>
+            {{ item.name }}
+          </a-select-option>
+        </a-select>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建者">
-        <a-input placeholder="创建者" v-decorator="['createBy']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='身份证号'>
+        <a-input placeholder='请输入身份证号'
+                 v-decorator="['cardNo',{rules: [{ required: true, message: '身份证号不能为空'}]}]" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="更新者">
-        <a-input placeholder="更新者" v-decorator="['updateBy']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='到访时间'>
+        <a-date-picker
+          format='YYYY-MM-DD HH:mm'
+          valueFormat='YYYY-MM-DD HH:mm:ss'
+          :show-time="{ format: 'HH:mm' }"
+          v-decorator="['visitTime',{rules: [{ required: true, message: '到访时间不能为空'}]}]"
+          type='date'
+          placeholder='请选择到访时间'
+          style='width: 100%;'
+        />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="版本">
-        <a-input placeholder="版本" v-decorator="['version']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='离开时间'>
+        <a-date-picker
+          format='YYYY-MM-DD HH:mm'
+          valueFormat='YYYY-MM-DD HH:mm:ss'
+          :show-time="{ format: 'HH:mm' }"
+          v-decorator="['leaveTime',{rules: [{ required: true, message: '离开时间不能为空'}]}]"
+          type='date'
+          placeholder='请选择离开时间'
+          style='width: 100%;'
+        />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="照片">
-        <a-input placeholder="照片" v-decorator="['photo']"/>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='来访事由'>
+        <a-input placeholder='请输入来访事由'
+                 v-decorator="['visitContent',{rules: [{ required: true, message: '来访事由不能为空'}]}]" />
+      </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='照片'>
+        <a-upload
+          v-decorator="['photo']"
+          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 {saveVisitorPerson} from '@/api/admin/meeting/visitorPerson'
-    import pick from 'lodash.pick'
+import { saveVisitorPerson, selectUserByCustomer, selectCustomer } from '@/api/admin/meeting/visitorPerson'
+import pick from 'lodash.pick'
+import { getRoomListByFloorId } from '@/api/admin/meeting/roomContent'
+import storage from 'store'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 
-    export default {
+
+export default {
   name: 'VisitorPersonModal',
-  props: {
-  },
-  components: {
-  },
-  data () {
+  props: {},
+  components: {},
+  data() {
     return {
       visible: false,
       labelCol: {
@@ -70,26 +128,91 @@
       },
       confirmLoading: false,
       mdl: {},
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      enterpriseList: [],
+      personList: [],
+      idcardTypeList: [{
+        name: '居民身份证'
+      }],
+      uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload',
+      imageUrl: '',
+      headers: {
+        Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN)
+      }
     }
   },
-  beforeCreate () {
+  beforeCreate() {
   },
-  created () {
+  created() {
+    // 查询企业
+    selectCustomer().then(res => {
+      console.log('selectCustomer', res)
+      this.enterpriseList = res.data
+    })
   },
   methods: {
-    add () {
+    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 })
+      })
+    },
+    getPersonData(value) {
+      console.log('getPersonData', value)
+      this.form.setFieldsValue({ mobile: this.personList.find(item => item.id == value).mobile })
+    },
+    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({
+            // 设置相对路径
+            photo: result.fileName
+          })
+        })
+        // Get this url from response in real world.
+        this.getBase64(info.file.originFileObj, imageUrl => {
+          this.imageUrl = imageUrl
+          this.loading = false
+        })
+      }
+    },
+    getBase64(img, callback) {
+      const reader = new FileReader()
+      reader.addEventListener('load', () => callback(reader.result))
+      reader.readAsDataURL(img)
+    },
+    add() {
       this.form.resetFields()
       this.edit({ id: 0 })
     },
-    edit (record) {
+    edit(record) {
       this.mdl = Object.assign(record)
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id', 'userId', 'intervieweeId', 'name', 'phone', 'joinTime', 'visitTime', 'leaveTime', 'visitContent', 'cardType', 'cardNo', 'status', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag', 'photo'))
       })
     },
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
       this.form.validateFields((err, values) => {
         if (!err) {