src/views/system/modules/PasswordModal.vue
@@ -21,7 +21,8 @@
        </a-form-item>
        <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码"
                   v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
        </a-form-item>
      </a-form>
@@ -33,7 +34,7 @@
  import {changePassword} from '@/api/api'
  export default {
    name: "PasswordModal",
  name: 'PasswordModal',
    data () {
      return {
        visible: false,
@@ -41,72 +42,74 @@
        confirmDirty: false,
        validatorRules:{
          password:{
            rules: [{
          rules: [
            {
              required: true,
              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
              message: '密码由8位数字、大小写字母和特殊符号组成!'
            }, {
              validator: this.validateToNextPassword,
            }],
              // pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
              message: '请输入登录密码!'
            },
            {
              validator: this.validateToNextPassword
            }]
          },
          confirmpassword:{
            rules: [{
              required: true, message: '请重新输入登录密码!',
            required: true, message: '请重新输入登录密码!'
            }, {
              validator: this.compareToFirstPassword,
            }],
          },
            validator: this.compareToFirstPassword
          }]
        }
        },
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        sm: { span: 5 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        sm: { span: 16 }
        },
        form:this.$form.createForm(this)
      }
    },
    created () {
      console.log("created");
    console.log('created')
    },
    methods: {
      show (username) {
        this.form.resetFields();
        this.visible = true;
        this.model.username = username;
      this.form.resetFields()
      this.visible = true
      this.model.username = username
        this.$nextTick(() => {
          this.form.setFieldsValue({username:username});
        });
        this.form.setFieldsValue({ username: username })
      })
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.disableSubmit = false;
        this.selectedRole = [];
      this.$emit('close')
      this.visible = false
      this.disableSubmit = false
      this.selectedRole = []
      },
      handleSubmit () {
        // 触发表单验证
        this.form.validateFields((err, values) => {
          if (!err) {
            this.confirmLoading = true;
            let formData = Object.assign(this.model, values);
          this.confirmLoading = true
          let formData = Object.assign(this.model, values)
            changePassword(formData).then((res)=>{
              if(res.success){
                this.$message.success(res.message);
                this.$emit('ok');
              this.$message.success(res.message)
              this.$emit('ok')
              }else{
                this.$message.warning(res.message);
              this.$message.warning(res.message)
              }
            }).finally(() => {
              this.confirmLoading = false;
              this.close();
            });
            this.confirmLoading = false
            this.close()
          })
          }
        })
      },
@@ -114,21 +117,21 @@
        this.close()
      },
      validateToNextPassword  (rule, value, callback) {
        const form = this.form;
        const confirmpassword=form.getFieldValue('confirmpassword');
        console.log("confirmpassword==>",confirmpassword);
      const form = this.form
      const confirmpassword = form.getFieldValue('confirmpassword')
      console.log('confirmpassword==>', confirmpassword)
        if (value && confirmpassword && value !== confirmpassword) {
          callback('两次输入的密码不一样!');
        callback('两次输入的密码不一样!')
        }
        if (value && this.confirmDirty) {
          form.validateFields(['confirm'], { force: true })
        }
        callback();
      callback()
      },
      compareToFirstPassword  (rule, value, callback) {
        const form = this.form;
      const form = this.form
        if (value && value !== form.getFieldValue('password')) {
          callback('两次输入的密码不一样!');
        callback('两次输入的密码不一样!')
        } else {
          callback()
        }