diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index 2ed7592..7240fca 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -732,27 +732,27 @@ export default { callback() }) } - var hasEmail = (rule, value, callback) => { - if (value) { - requestFN( - '/user/hasEmail', - { - EMAIL: value, - USERNAME: this.form.USERNAME - } - ).then((data) => { - if (data.result == 'success') { - callback() - } else { - callback(new Error('邮箱重复')) - } - }).catch((e) => { - - }) - } else { - callback() - } - } + // var hasEmail = (rule, value, callback) => { + // if (value) { + // requestFN( + // '/user/hasEmail', + // { + // EMAIL: value, + // USERNAME: this.form.USERNAME + // } + // ).then((data) => { + // if (data.result == 'success') { + // callback() + // } else { + // callback(new Error('邮箱重复')) + // } + // }).catch((e) => { + // + // }) + // } else { + // callback() + // } + // } return { ISCHECK: false, dayTime: [], @@ -811,8 +811,8 @@ export default { DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }], DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }], SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }], - NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }], - SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }], + NATION: [{ required: false, trigger: 'blur' }], + SEX: [{ required: false, trigger: 'blur' }], POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }], DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }], DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }], @@ -827,7 +827,7 @@ export default { TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }], DUTIES: [{ required: true, message: '职务不能为空', trigger: 'blur' }], // /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/ - USER_ID_CARD: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }, + USER_ID_CARD: [{ required: false, trigger: 'blur' }, { pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, message: '请输入正确的身份证号' @@ -1055,8 +1055,8 @@ export default { this.ISCHECK = false } } else { - this.$message.warning('请确认身份证号与手机号后进行校验') - this.ISCHECK = false + // this.$message.warning('请确认身份证号与手机号后进行校验') + this.ISCHECK = true } }, getScheduleAll() { @@ -1441,13 +1441,13 @@ export default { // debugger // this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息 this.$refs.form.validate(valid => { - if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { - this.$message({ - message: '请上传人脸照片', - type: 'error' - }) - return false - } + // if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { + // this.$message({ + // message: '请上传人脸照片', + // type: 'error' + // }) + // return false + // } let isUpdateFace = '0' if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) { isUpdateFace = '1' diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index db0d5a4..5cf7dbb 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -50,9 +50,9 @@ - - 导入 - + + + 导出 diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index d67d29e..5902be6 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -48,9 +48,10 @@ 一键密码重置 - - 导入 - + + + + 导出 @@ -94,7 +95,8 @@ 编辑 删除 - 推送 + +