|
@@ -82,7 +82,7 @@
|
|
ref="formInfo2"
|
|
ref="formInfo2"
|
|
:model="form"
|
|
:model="form"
|
|
class="demo-form-inline"
|
|
class="demo-form-inline"
|
|
- label-width="150px"
|
|
|
|
|
|
+ label-width="120px"
|
|
:rules="rules"
|
|
:rules="rules"
|
|
>
|
|
>
|
|
<el-form-item label="账号" prop="userName">
|
|
<el-form-item label="账号" prop="userName">
|
|
@@ -150,9 +150,9 @@ export default defineComponent({
|
|
) {
|
|
) {
|
|
callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
|
|
callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
|
|
} else {
|
|
} else {
|
|
- if (this.ruleForm.confirmPwd !== '') {
|
|
|
|
- this.$refs.ruleForm.validateField('confirmPwd')
|
|
|
|
- }
|
|
|
|
|
|
+ // if (this.ruleForm.confirmPwd !== '') {
|
|
|
|
+ // this.$refs.ruleForm.validateField('confirmPwd')
|
|
|
|
+ // }
|
|
callback()
|
|
callback()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -226,9 +226,8 @@ export default defineComponent({
|
|
|
|
|
|
// 保存-修改密码操作
|
|
// 保存-修改密码操作
|
|
const submitForm2 = () => {
|
|
const submitForm2 = () => {
|
|
- alert(2)
|
|
|
|
|
|
+
|
|
formInfo2.value.validate((valid) =>{
|
|
formInfo2.value.validate((valid) =>{
|
|
- alert(3)
|
|
|
|
if (valid) {
|
|
if (valid) {
|
|
api
|
|
api
|
|
.updatePwd({
|
|
.updatePwd({
|
|
@@ -314,7 +313,7 @@ export default defineComponent({
|
|
|
|
|
|
userName: [{ required: true, message: '请输入账号', trigger: 'blur' }],
|
|
userName: [{ required: true, message: '请输入账号', trigger: 'blur' }],
|
|
password: [
|
|
password: [
|
|
- { required: true, message: '请输入原密码', trigger: 'blur' },
|
|
|
|
|
|
+ { required: false, message: '请输入原密码', trigger: 'blur' },
|
|
{ validator: validatePass, trigger: 'blur' },
|
|
{ validator: validatePass, trigger: 'blur' },
|
|
],
|
|
],
|
|
newPass: [
|
|
newPass: [
|
|
@@ -322,7 +321,7 @@ export default defineComponent({
|
|
{ validator: validatePass, trigger: 'blur' },
|
|
{ validator: validatePass, trigger: 'blur' },
|
|
],
|
|
],
|
|
passAgain: [
|
|
passAgain: [
|
|
- { required: true, message: '请再次输入密码', trigger: 'blur' },
|
|
|
|
|
|
+ { required: false, message: '请再次输入密码', trigger: 'blur' },
|
|
{ validator: validatePass2, trigger: 'blur', required: true },
|
|
{ validator: validatePass2, trigger: 'blur', required: true },
|
|
],
|
|
],
|
|
},
|
|
},
|