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

[代码更新](dev) 

回退代码版本
hyx_2024-9-9_prevention
huangyuxuan 2024-09-09 16:28:36 +08:00
parent 5c21788daf
commit 95525221d5
8 changed files with 29 additions and 26 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' } { validator: hasUser, trigger: 'blur' }
], ],
EMAIL: [ EMAIL: [
{ required: true, message: '请输入邮箱', trigger: 'blur' }, { required: false, message: '请输入邮箱', trigger: 'blur' },
{ {
pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/, pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/,
message: '请输入正确的邮箱' message: '请输入正确的邮箱'
}, }
{ validator: hasEmail, trigger: 'blur' } // { validator: hasEmail, trigger: 'blur' }
], ],
PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }], PERSON_TYPE: [{ required: true, message: '请选择人员类型', trigger: 'change' }],
ROLE_NAME: [{ 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' }], DEPARTMENT_ID: [{ required: true, message: '请选择部门', trigger: 'change' }],
DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }], DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }], SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
NATION: [{ required: true, message: '民族不能为空', trigger: 'blur' }], NATION: [{ required: false, trigger: 'blur' }],
SEX: [{ required: true, message: '性别不能为空', trigger: 'blur' }], SEX: [{ required: false, trigger: 'blur' }],
POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }], POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }], DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
DEGREE_OF_EDUCATION: [{ 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' }], TITLE: [{ required: true, message: '职称不能为空', trigger: 'blur' }],
DUTIES: [{ 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)$/ // /^\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)$/, 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: '请输入正确的身份证号' message: '请输入正确的身份证号'
@ -1055,8 +1055,8 @@ export default {
this.ISCHECK = false this.ISCHECK = false
} }
} else { } else {
this.$message.warning('请确认身份证号与手机号后进行校验') // this.$message.warning('请确认身份证号与手机号后进行校验')
this.ISCHECK = false this.ISCHECK = true
} }
}, },
getScheduleAll() { getScheduleAll() {
@ -1441,13 +1441,13 @@ export default {
// debugger // debugger
// this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息 // this.uploadImgByZhengshu(this.form.USER_ID) // 保存证书信息
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) { // if (this.$refs.uploadUserAvatar.uploadFiles.length < 1 && this.form.face_file.length < 1) {
this.$message({ // this.$message({
message: '请上传人脸照片', // message: '请上传人脸照片',
type: 'error' // type: 'error'
}) // })
return false // return false
} // }
let isUpdateFace = '0' let isUpdateFace = '0'
if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) { if (this.$refs.uploadUserAvatar.uploadFiles.length > 0) {
isUpdateFace = '1' isUpdateFace = '1'

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

@ -48,9 +48,11 @@
<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 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>
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true"> <!--导入功能未同步人员中台，暂时屏蔽-->
导入 <!--plain @click="dialogFormDaoru = true"-->
</el-button> <!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >-->
<!-- 导入-->
<!-- </el-button>-->
<el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel"> <el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
导出 导出
</el-button> </el-button>

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

@ -48,9 +48,10 @@
<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 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>
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true"> <!--暂时取消导入功能-->
导入 <!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">-->
</el-button> <!-- 导入-->
<!-- </el-button>-->
<el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel"> <el-button v-waves size="mini" plain type="info" icon="el-icon-right" @click="goExcel">
导出 导出
</el-button> </el-button>

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

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

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

@ -243,7 +243,7 @@ export default {
getData() { getData() {
return new Promise((resolve) => { return new Promise((resolve) => {
requestFN( requestFN(
'/safetyenvironmental/V2/goShow', '/safetyenvironmental/goShow',
{ {
INSPECTION_ID: this.$parent.INSPECTION_ID 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 this.listLoading = true
requestFN( requestFN(
'/safetyenvironmental/V2/assign', '/hidden/assign',
{ ...this.form, { ...this.form,
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS, HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
INSPECTION_ID: this.$parent.INSPECTION_ID INSPECTION_ID: this.$parent.INSPECTION_ID

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

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

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

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