From a2f13185e18c274d80cadade406e2b47253b038a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 09 十月 2023 11:57:22 +0800
Subject: [PATCH] fix 修复 HeaderSearch组件跳转query参数丢失问题
---
src/views/system/user/profile/resetPwd.vue | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index dec2d79..11b00f6 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,34 +1,35 @@
<template>
- <el-form ref="pwdRef" :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-form ref="pwdRef" :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" @click="submit">淇濆瓨</el-button>
<el-button type="danger" @click="close">鍏抽棴</el-button>
- </el-form-item>
- </el-form>
+ </el-form-item>
+ </el-form>
</template>
-<script setup>
+<script setup lang="ts">
import { updateUserPwd } from "@/api/system/user";
+import type { ResetPwdForm } from "@/api/system/user/types";
-const { proxy } = getCurrentInstance();
-
-const user = reactive({
- oldPassword: undefined,
- newPassword: undefined,
- confirmPassword: undefined
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const pwdRef = ref<ElFormInstance>();
+const user = ref<ResetPwdForm>({
+ oldPassword: "",
+ newPassword: "",
+ confirmPassword: ""
});
-const equalToPassword = (rule, value, callback) => {
- if (user.newPassword !== value) {
+const equalToPassword = (rule: any, value: string, callback: any) => {
+ if (user.value.newPassword !== value) {
callback(new Error("涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"));
} else {
callback();
@@ -36,22 +37,30 @@
};
const rules = ref({
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" }]
+ 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"
+ }]
});
/** 鎻愪氦鎸夐挳 */
-function submit() {
- proxy.$refs.pwdRef.validate(valid => {
+const submit = () => {
+ pwdRef.value?.validate(async (valid: boolean) => {
if (valid) {
- updateUserPwd(user.oldPassword, user.newPassword).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- });
+ await updateUserPwd(user.value.oldPassword, user.value.newPassword);
+ proxy?.$modal.msgSuccess("淇敼鎴愬姛");
}
});
};
/** 鍏抽棴鎸夐挳 */
-function close() {
- proxy.$tab.closePage();
+const close = () => {
+ proxy?.$tab.closePage();
};
</script>
--
Gitblit v1.9.3