guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Revert "[代码更新](dev)" 

This reverts commit 95525221d5.
hyx_2024-9-25_tongbu
water_xu 2024-09-14 10:02:22 +08:00
parent 811071680d
commit 03225846fc
8 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/views/corpInfo/user/components/edit.vue
View File

@ -798,12 +798,12 @@ export default {
{ validator: hasUser, trigger: 'blur' }
],
EMAIL: [
{ required: false, message: '请输入邮箱', trigger: 'blur' },
{ required: true, 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: false, trigger: 'blur' }],
SEX: [{ required: false, trigger: 'blur' }],
NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
SEX: [{ required: true, message: '性别不能为空', 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: false, trigger: 'blur' },
USER_ID_CARD: [{ required: true, message: '身份证号不能为空', 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 = true
this.$message.warning('请确认身份证号与手机号后进行校验')
this.ISCHECK = false
}
},
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'

8
src/views/corpInfo/user/components/list.vue
View File

@ -48,11 +48,9 @@
<el-button v-waves v-if="LOGIN_USER === 'f0c2c728c85446b0b96a370f5f8da38f'" class="filter-item" type="warning" icon="el-icon-bottom-right" size="mini" @click="resetPassword">
一键密码重置
</el-button>
<!--导入功能未同步人员中台，暂时屏蔽-->
<!--plain @click="dialogFormDaoru = true"-->
<!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >-->
<!-- 导入-->
<!-- </el-button>-->
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">
导入
</el-button>
<el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
导出
</el-button>

7
src/views/corpInfo/userCenter/components/list.vue
View File

@ -48,10 +48,9 @@
<el-button v-waves v-if="LOGIN_USER === 'f0c2c728c85446b0b96a370f5f8da38f'" class="filter-item" type="warning" icon="el-icon-bottom-right" size="mini" @click="resetPassword">
一键密码重置
</el-button>
<!--暂时取消导入功能-->
<!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">-->
<!-- 导入-->
<!-- </el-button>-->
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">
导入
</el-button>
<el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
导出
</el-button>

2
src/views/safetyenvironmental/archive/components/assign.vue
View File

@ -340,7 +340,7 @@ export default {
})
this.listLoading = true
requestFN(
'/hidden/assign',
'/safetyenvironmental/V2/assign',
{ ...this.form,
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
INSPECTION_ID: this.$parent.INSPECTION_ID

2
src/views/safetyenvironmental/archive/components/info.vue
View File

@ -243,7 +243,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
'/safetyenvironmental/goShow',
'/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}

2
src/views/safetyenvironmental/hidden/components/assign.vue
View File

@ -436,7 +436,7 @@ export default {
})
this.listLoading = true
requestFN(
'/hidden/assign',
'/safetyenvironmental/V2/assign',
{ ...this.form,
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
INSPECTION_ID: this.$parent.INSPECTION_ID

2
src/views/safetyenvironmental/inspection/components/info.vue
View File

@ -306,7 +306,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
'/safetyenvironmental/goShow',
'/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}

2
src/views/safetyenvironmental/inspection/components/list.vue
View File

@ -357,7 +357,7 @@ export default {
getList() {
this.listLoading = true
requestFN(
'/safetyenvironmental/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
'/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
...this.search,
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],