|
|
@@ -149,10 +149,8 @@
|
|
|
validatorRules:{
|
|
|
username:[{required: true, message: '请输入用户账号!'},
|
|
|
{validator: this.validateUsername,}],
|
|
|
- password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
|
|
|
- {validator: this.validateToNextPassword,trigger: 'change'}],
|
|
|
- confirmpassword: [{required: true, message: '请重新输入登录密码!',},
|
|
|
- { validator: this.compareToFirstPassword,}],
|
|
|
+ password: [{required: true, message: '请输入密码!'}],
|
|
|
+ confirmpassword: [{required: true, message: '请重新输入登录密码!',}],
|
|
|
realname:[{ required: true, message: '请输入用户名称!' }],
|
|
|
phone: [{required: true, message: '请输入手机号!'}, {validator: this.validatePhone}],
|
|
|
email: [{validator: this.validateEmail}],
|
|
|
@@ -323,6 +321,19 @@
|
|
|
// 触发表单验证
|
|
|
this.$refs.form.validate(valid => {
|
|
|
if (valid) {
|
|
|
+ // if (this.model.password==='' || this.model.confirmpassword===''){
|
|
|
+ // this.$message.warning('密码为空！！！');
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // if (this.model.password!==this.model.confirmpassword ) {
|
|
|
+ // this.$message.warning('两次输入密码不一致');
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // var reg=/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/;
|
|
|
+ // if(!reg.test(this.model.password)){
|
|
|
+ // this.$message.warning('密码由8位数字、大小写字母和特殊符号组成!');
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
that.confirmLoading = true;
|
|
|
//如果是上级择传入departIds,否则为空
|
|
|
if(this.model.userIdentity!==2){
|
|
|
@@ -425,6 +436,8 @@
|
|
|
fieldVal: value,
|
|
|
dataId: this.userId
|
|
|
};
|
|
|
+ this.model.password='s@Gr4n5h1P'
|
|
|
+ this.model.confirmpassword='s@Gr4n5h1P'
|
|
|
duplicateCheck(params).then((res) => {
|
|
|
if (res.success) {
|
|
|
callback()
|
liuhy