diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 875f90e..282d7bc 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
+                <el-input v-model.trim="personForm.personCode" type="text" placeholder="员工编号，不填系统将自动生成"/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="身份证号" prop="idCardNo">
-                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="encrypIdCardNo" :disabled="isEditMode" type="text" placeholder="身份证号"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -25,13 +25,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="11" >
-              <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
+              <el-form-item label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
                   :editable="false"
                   type="date"
                   style="width: 100%"
-                  value-format="yyyy-MM-dd"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择出生日期"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -312,11 +313,11 @@
       rules: {
         // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
-        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        // idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        duty: [{ required: true, message: '职务必选', trigger: 'change' }],
-        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        // duty: [{ required: true, message: '职务必选', trigger: 'change' }],
+        // sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        // birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
         'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
         'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
         'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
@@ -333,6 +334,15 @@
       idsrc: 'static/IDCard/IDCardReader.htm'
     }
   },
+  computed: {
+    encrypIdCardNo() {
+      if (this.personForm.idCardNo) {
+        return this.personForm.idCardNo.substr(0, 6) + '********' + this.personForm.idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
+    }
+  },
   watch: {
     // 'personForm.idCardNo': function(val) {
     //   this.personForm.birthday = getBirthdayByIdNO(val)
@@ -396,7 +406,7 @@
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          // personCode: personForm.personCode, // 人员编号
+          personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -418,12 +428,6 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        // if (personForm.photo !== '') {
-        //   this.photo = base_url + personForm.photo
-        // }
-        if (personForm.personCode) {
-          this.personForm.personCode = personForm.personCode
-        }
         getPersonPhoto(id).then(res => {
           if (res.data) {
             this.photo = res.data
@@ -639,6 +643,11 @@
           resolve(fileResult)
         }
       })
+    },
+    encrypIdCard(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      }
     }
   }
 }

diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 875f90e..282d7bc 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -6,7 +6,7 @@
           <el-row :gutter="20">
             <el-col :span="11">
               <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
+                <el-input v-model.trim="personForm.personCode" type="text" placeholder="员工编号，不填系统将自动生成"/>
               </el-form-item>
               <el-form-item v-else label="访客编号">
                 <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -14,7 +14,7 @@
             </el-col>
             <el-col :span="11" >
               <el-form-item label="身份证号" prop="idCardNo">
-                <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" type="text" placeholder="必填"/>
+                <el-input v-model.trim="encrypIdCardNo" :disabled="isEditMode" type="text" placeholder="身份证号"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -25,13 +25,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="11" >
-              <el-form-item :disabled="isEditMode" label="出生日期" prop="birthday">
+              <el-form-item label="出生日期" prop="birthday">
                 <el-date-picker
                   v-model="personForm.birthday"
                   :editable="false"
                   type="date"
                   style="width: 100%"
-                  value-format="yyyy-MM-dd"/>
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择出生日期"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -312,11 +313,11 @@
       rules: {
         // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
-        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        // idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        duty: [{ required: true, message: '职务必选', trigger: 'change' }],
-        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        // duty: [{ required: true, message: '职务必选', trigger: 'change' }],
+        // sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        // birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
         'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
         'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
         'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
@@ -333,6 +334,15 @@
       idsrc: 'static/IDCard/IDCardReader.htm'
     }
   },
+  computed: {
+    encrypIdCardNo() {
+      if (this.personForm.idCardNo) {
+        return this.personForm.idCardNo.substr(0, 6) + '********' + this.personForm.idCardNo.substr(14, 18)
+      } else {
+        return ''
+      }
+    }
+  },
   watch: {
     // 'personForm.idCardNo': function(val) {
     //   this.personForm.birthday = getBirthdayByIdNO(val)
@@ -396,7 +406,7 @@
         const personForm = response.data
         this.personForm = {
           id: personForm.id, // 人员id
-          // personCode: personForm.personCode, // 人员编号
+          personCode: personForm.personCode, // 人员编号
           idCardNo: personForm.idCardNo, // 身份证号
           name: personForm.name, // 姓名
           deptid: personForm.deptid, // 单位/部门
@@ -418,12 +428,6 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        // if (personForm.photo !== '') {
-        //   this.photo = base_url + personForm.photo
-        // }
-        if (personForm.personCode) {
-          this.personForm.personCode = personForm.personCode
-        }
         getPersonPhoto(id).then(res => {
           if (res.data) {
             this.photo = res.data
@@ -639,6 +643,11 @@
           resolve(fileResult)
         }
       })
+    },
+    encrypIdCard(idCardNo) {
+      if (idCardNo) {
+        return idCardNo.substr(0, 6) + '********' + idCardNo.substr(14, 18)
+      }
     }
   }
 }
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index 3ca9a81..10be182 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -8,7 +8,7 @@
             <el-row :gutter="20">
               <el-col :span="11">
                 <el-form-item v-if="personType=='1'" label="员工编号" prop="personCode">
-                  <el-input v-model.trim="personForm.personCode" :disabled="isEditMode" type="text" placeholder=""/>
+                  <el-input v-model.trim="personForm.personCode" type="text" placeholder="员工编号，不填系统将自动生成"/>
                 </el-form-item>
                 <el-form-item v-else label="访客编号">
                   <el-input v-model.trim="personForm.personCode" disabled type="text" placeholder="系统将自动生成"/>
@@ -16,7 +16,7 @@
               </el-col>
               <el-col :span="11" >
                 <el-form-item label="身份证号" prop="idCardNo">
-                  <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" type="text" placeholder="必填"/>
+                  <el-input v-model.trim="personForm.idCardNo" :disabled="isEditMode" type="text" placeholder="身份证号"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -33,7 +33,7 @@
                     type="date"
                     style="width: 100%"
                     format="yyyy-MM-dd"
-                    placeholder="选择日期"/>
+                    placeholder="选择出生日期"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -169,9 +169,9 @@
       <div style="height: 120px;">
         <el-row type="flex" justify="center">
           <el-col :span="15" style="text-align:center">
-            <el-button v-show="!isEditMode" size="medium" @click="resetForm"> 重置 </el-button>
-            <el-button :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
-            <el-button v-show="!isEditMode" type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
+            <el-button v-show="showResetButton" size="medium" @click="resetForm"> 重置 </el-button>
+            <el-button v-show="showSaveButton" :disabled="!canSave" type="primary" size="medium" style="margin-left: 20px;" @click="saveData"> 保存 </el-button>
+            <el-button type="primary" size="medium" style="margin-left: 20px;" @click="registerIris"> 注册虹膜 </el-button>
           </el-col>
         </el-row>
       </div>
@@ -200,7 +200,7 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 // import { Uploadimg } from '@/api/common'
-import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType } from '@/api/person'
+import { addPerson, updatePerson, personInfo, getSexType, getDutyType, getNationType, getPersonPhoto } from '@/api/person'
 // import { getToken } from '@/utils/auth' // getToken from cookie
 // import { getProject } from '@/utils/baseConfig'
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
@@ -220,7 +220,8 @@
           callback()
         }
       } else {
-        callback(new Error('身份证号不能为空'))
+        // callback(new Error('身份证号不能为空'))
+        callback()
       }
     }
     // 校验年假
@@ -301,6 +302,7 @@
       personForm: {
         id: '', // 人员id
         idCardNo: '', // 身份证号
+        personCode: '', // 人员编号
         name: '', // 姓名
         deptid: '', // 单位/部门
         remarks: '', // 备注
@@ -331,11 +333,11 @@
       rules: {
         // personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
-        idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+        idCardNo: [{ validator: validateIDCard, trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        duty: [{ required: true, message: '职务必选', trigger: 'change' }],
-        sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
+        // duty: [{ required: true, message: '职务必选', trigger: 'change' }],
+        // sex: [{ required: true, message: '性别必选', trigger: 'blur' }],
+        // birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }],
         'ext.isKaoqin': [{ required: true, message: '是否考勤必选', trigger: ['change'] }],
         'ext.isOt': [{ required: true, message: '是否统计加班必选', trigger: ['change'] }],
         'ext.isZhuanwu': [{ required: true, message: '是否专务必选', trigger: ['change'] }],
@@ -355,6 +357,8 @@
       devInited: false,
       irisBtnName: '',
       irisBtnDisable: true,
+      showResetButton: true,
+      showSaveButton: true,
       irisForm: {
         personId: '',
         idCardNo: '',
@@ -368,6 +372,7 @@
   },
   watch: {
     'personForm.idCardNo': function(val) {
+      // if(val && )
       this.personForm.birthday = getBirthdayByIdNO(val)
       this.personForm.sex = getSexByIdNO(val)
     }
@@ -463,9 +468,11 @@
             annualLeave: personForm.ext.annualLeave
           }
         }
-        if (personForm.photo !== '') {
-          this.photo = base_url + personForm.photo
-        }
+        getPersonPhoto(id).then(res => {
+          if (res.data) {
+            this.photo = res.data
+          }
+        })
         this.formLoading = false
       })
     },
@@ -553,6 +560,7 @@
         }
       }
       this.$refs['dataForm'].validate((valid) => {
+        console.log(valid)
         if (valid) {
           this.canSave = false
           // 如果新增页面未保存，则调用add
@@ -570,6 +578,8 @@
                 this.$message.success('保存成功!')
               }
               this.canSave = true
+              this.showResetButton = false
+              this.showSaveButton = false
             }).catch(() => {
               this.canSave = true
             })
@@ -730,6 +740,7 @@
         }
       })
     }
+
   }
 }
 </script>