Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-11-29 42295ef2ac0a5e78674cf24b62d6834138f0ffdc

 ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -1,68 +1,68 @@
<template>

  <el-form ref="form" :model="user" :rules="rules" label-width="80px">

    <el-form-item label="旧密码" prop="oldPassword">

      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>

    </el-form-item>

    <el-form-item label="新密码" prop="newPassword">

      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>

    </el-form-item>

    <el-form-item label="确认密码" prop="confirmPassword">

      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>

    </el-form-item>

    <el-form-item>

      <el-button type="primary" size="mini" @click="submit">保存</el-button>

      <el-button type="danger" size="mini" @click="close">关闭</el-button>

    </el-form-item>

  </el-form>

</template>



<script>

import { updateUserPwd } from "@/api/system/user";



export default {

  data() {

    const equalToPassword = (rule, value, callback) => {

      if (this.user.newPassword !== value) {

        callback(new Error("两次输入的密码不一致"));

      } else {

        callback();

      }

    };

    return {

      user: {

        oldPassword: undefined,

        newPassword: undefined,

        confirmPassword: undefined

      },

      // 表单校验

      rules: {

        oldPassword: [

          { required: true, message: "旧密码不能为空", trigger: "blur" }

        ],

        newPassword: [

          { required: true, message: "新密码不能为空", trigger: "blur" },

          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }

        ],

        confirmPassword: [

          { required: true, message: "确认密码不能为空", trigger: "blur" },

          { required: true, validator: equalToPassword, trigger: "blur" }

        ]

      }

    };

  },

  methods: {

    submit() {

      this.$refs["form"].validate(valid => {

        if (valid) {

          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {

            this.$modal.msgSuccess("修改成功");

          });

        }

      });

    },

    close() {

      this.$tab.closePage();

    }

  }

};

</script>

<template>
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="旧密码" prop="oldPassword">
      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
    </el-form-item>
    <el-form-item label="新密码" prop="newPassword">
      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
    </el-form-item>
    <el-form-item label="确认密码" prop="confirmPassword">
      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password/>
    </el-form-item>
    <el-form-item>
      <el-button type="primary" size="mini" @click="submit">保存</el-button>
      <el-button type="danger" size="mini" @click="close">关闭</el-button>
    </el-form-item>
  </el-form>
</template>

<script>
import { updateUserPwd } from "@/api/system/user";

export default {
  data() {
    const equalToPassword = (rule, value, callback) => {
      if (this.user.newPassword !== value) {
        callback(new Error("两次输入的密码不一致"));
      } else {
        callback();
      }
    };
    return {
      user: {
        oldPassword: undefined,
        newPassword: undefined,
        confirmPassword: undefined
      },
      // 表单校验
      rules: {
        oldPassword: [
          { required: true, message: "旧密码不能为空", trigger: "blur" }
        ],
        newPassword: [
          { required: true, message: "新密码不能为空", trigger: "blur" },
          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
        ],
        confirmPassword: [
          { required: true, message: "确认密码不能为空", trigger: "blur" },
          { required: true, validator: equalToPassword, trigger: "blur" }
        ]
      }
    };
  },
  methods: {
    submit() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
            this.$modal.msgSuccess("修改成功");
          });
        }
      });
    },
    close() {
      this.$tab.closePage();
    }
  }
};
</script>