[代码更新](pet)
- 用户管理 导出功能隐藏 - 用户管理 取消邮箱,身份证,民族,性别,上传人脸照片必填项 - 人员中台 推送功能隐藏 - 人员中台 导出功能隐藏hyx_2024-9-25_tongbu
parent
2572f05bf9
commit
e6020b5976
|
@ -732,27 +732,27 @@ export default {
|
||||||
callback()
|
callback()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
var hasEmail = (rule, value, callback) => {
|
// var hasEmail = (rule, value, callback) => {
|
||||||
if (value) {
|
// if (value) {
|
||||||
requestFN(
|
// requestFN(
|
||||||
'/user/hasEmail',
|
// '/user/hasEmail',
|
||||||
{
|
// {
|
||||||
EMAIL: value,
|
// EMAIL: value,
|
||||||
USERNAME: this.form.USERNAME
|
// USERNAME: this.form.USERNAME
|
||||||
}
|
// }
|
||||||
).then((data) => {
|
// ).then((data) => {
|
||||||
if (data.result == 'success') {
|
// if (data.result == 'success') {
|
||||||
callback()
|
// callback()
|
||||||
} else {
|
// } else {
|
||||||
callback(new Error('邮箱重复'))
|
// callback(new Error('邮箱重复'))
|
||||||
}
|
// }
|
||||||
}).catch((e) => {
|
// }).catch((e) => {
|
||||||
|
//
|
||||||
})
|
// })
|
||||||
} else {
|
// } else {
|
||||||
callback()
|
// callback()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
return {
|
return {
|
||||||
ISCHECK: false,
|
ISCHECK: false,
|
||||||
dayTime: [],
|
dayTime: [],
|
||||||
|
@ -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'
|
||||||
|
|
|
@ -50,9 +50,9 @@
|
||||||
</el-button>
|
</el-button>
|
||||||
<!--导入功能未同步人员中台,暂时屏蔽-->
|
<!--导入功能未同步人员中台,暂时屏蔽-->
|
||||||
<!--plain @click="dialogFormDaoru = true"-->
|
<!--plain @click="dialogFormDaoru = true"-->
|
||||||
<el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >
|
<!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" >-->
|
||||||
导入
|
<!-- 导入-->
|
||||||
</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>
|
||||||
|
|
|
@ -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>
|
||||||
|
@ -94,7 +95,8 @@
|
||||||
</template>
|
</template>
|
||||||
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
|
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
|
||||||
<el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
|
<el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
|
||||||
<el-button v-if="row.ISPUSH == '0' | row.ISPUSH == undefined" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
|
<!--暂时隐藏推送功能-->
|
||||||
|
<!-- <el-button v-if="row.ISPUSH == '0' | row.ISPUSH == undefined" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>-->
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
Loading…
Reference in New Issue