diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index eda6399..b25093d 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -798,12 +798,12 @@ export default { { validator: hasUser, trigger: 'blur' } ], EMAIL: [ - { required: true, message: '请输入邮箱', trigger: 'blur' }, + { required: false, message: '请输入邮箱', trigger: 'blur' }, { pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, message: '请输入正确的邮箱' - }, - { validator: hasEmail, trigger: 'blur' } + } + // { validator: hasEmail, trigger: 'blur' } ], PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }], ROLE_NAME: [{ required: true, message: '请选择角色组', trigger: 'change' }], @@ -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 059f7ea..de867a0 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -48,9 +48,11 @@ 一键密码重置 - - 导入 - + + + + + 导出 diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index d67d29e..73b9a36 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -48,9 +48,10 @@ 一键密码重置 - - 导入 - + + + + 导出 diff --git a/src/views/safetyenvironmental/archive/components/assign.vue b/src/views/safetyenvironmental/archive/components/assign.vue index aaceb36..8cbbb66 100644 --- a/src/views/safetyenvironmental/archive/components/assign.vue +++ b/src/views/safetyenvironmental/archive/components/assign.vue @@ -340,7 +340,7 @@ export default { }) this.listLoading = true requestFN( - '/safetyenvironmental/V2/assign', + '/hidden/assign', { ...this.form, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, INSPECTION_ID: this.$parent.INSPECTION_ID diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index c0c30af..cdc7b26 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -243,7 +243,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/V2/goShow', + '/safetyenvironmental/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/hidden/components/assign.vue b/src/views/safetyenvironmental/hidden/components/assign.vue index 53728ea..78a49c1 100644 --- a/src/views/safetyenvironmental/hidden/components/assign.vue +++ b/src/views/safetyenvironmental/hidden/components/assign.vue @@ -436,7 +436,7 @@ export default { }) this.listLoading = true requestFN( - '/safetyenvironmental/V2/assign', + '/hidden/assign', { ...this.form, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, INSPECTION_ID: this.$parent.INSPECTION_ID diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue index a0d65fd..2414b31 100644 --- a/src/views/safetyenvironmental/inspection/components/info.vue +++ b/src/views/safetyenvironmental/inspection/components/info.vue @@ -306,7 +306,7 @@ export default { getData() { return new Promise((resolve) => { requestFN( - '/safetyenvironmental/V2/goShow', + '/safetyenvironmental/goShow', { INSPECTION_ID: this.$parent.INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 01382bb..4389bb3 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -357,7 +357,7 @@ export default { getList() { this.listLoading = true requestFN( - '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, + '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { ...this.search, INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],