From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/system/userPassWord/UpdateUserPassWord.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/system/userPassWord/UpdateUserPassWord.vue b/north-glass-erp/northglass-erp/src/views/system/userPassWord/UpdateUserPassWord.vue
index 1038ab2..eccd06d 100644
--- a/north-glass-erp/northglass-erp/src/views/system/userPassWord/UpdateUserPassWord.vue
+++ b/north-glass-erp/northglass-erp/src/views/system/userPassWord/UpdateUserPassWord.vue
@@ -6,9 +6,11 @@
import {Avatar, UserFilled} from "@element-plus/icons-vue";
import useUserInfoStore from "@/stores/userInfo";
import {useRoute, useRouter} from "vue-router";
+import {useI18n} from "vue-i18n";
const router = useRouter()
const route = useRoute()
+const { t } = useI18n()
const userStore = useUserInfoStore()
//娉ㄥ唽鐢ㄦ埛鍙傛暟
const register = reactive({
@@ -21,7 +23,7 @@
const oldPassword = (rule: any, value: any, callback: any) => {
if (value.trim() === '') {
- callback(new Error('鏃у瘑鐮佷笉鑳戒负绌�'))
+ callback(new Error(t('user.OldPasswordCannotBeEmpty')))
}else{
callback()
}
@@ -29,9 +31,9 @@
const checkPassword = (rule: any, value: any, callback: any) => {
if (value.trim() === '') {
- callback(new Error('鏂板瘑鐮佷笉鑳戒负绌�'))
+ callback(new Error(t('user.TheNewPasswordCannotBeEmpty')))
}else if(value.length>16 || value.length<6){
- callback(new Error('瀵嗙爜闀垮害涓嶈兘浣庝簬6鎴栬秴杩�16'))
+ callback(new Error(t('user.ThePasswordLengthCannotBeLessThan6OrMoreThan16')))
}else{
callback()
}
@@ -39,11 +41,11 @@
const checkConfirmPassword = (rule: any, value: any, callback: any) => {
if (value.trim() === '') {
- callback(new Error('纭瀵嗙爜涓嶈兘涓虹┖'))
+ callback(new Error(t('user.ConfirmPasswordCannotBeEmpty')))
}else if(value !== register.password){
- callback(new Error('涓ゆ瀵嗙爜涓嶇浉鍚�'))
+ callback(new Error(t('user.ConfirmPasswordCannotBeEmpty')))
}else if(value.length>16 || value.length<6){
- callback(new Error('瀵嗙爜闀垮害涓嶈兘浣庝簬6鎴栬秴杩�16'))
+ callback(new Error(t('user.TheTwoPasswordsAreNotTheSame')))
}else{
callback()
}
@@ -64,14 +66,14 @@
register.oldPassword = btoa(register.oldPassword)
request.post('/user/updatePassWord', register).then((res) => {
if (res.data === true) {
- ElMessage.success(`淇敼鎴愬姛`)
+ ElMessage.success(t('basicData.msg.saveSuccess'))
router.push("/login")
} else {
- ElMessage.error('鏃у瘑鐮侀敊璇�')
+ ElMessage.error(t('user.OldPasswordError'))
return false
}
}).catch(error => {
- ElMessage.error("鏈嶅姟鍣ㄨ繛鎺ュけ璐�")
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
return false
})
}
@@ -91,20 +93,20 @@
status-icon
:rules="rules"
>
- <el-form-item label="鏃у瘑鐮侊細" prop="oldPassword">
+ <el-form-item :label="$t('user.OldPassword')" prop="oldPassword">
<el-input autocomplete="off" type="text" style="-webkit-text-security: disc" v-model="register.oldPassword" />
</el-form-item>
- <el-form-item label="鏂板瘑鐮侊細" prop="password">
+ <el-form-item :label="$t('user.TheNewPassword')" prop="password">
<el-input autocomplete="off" type="text" style="-webkit-text-security: disc" v-model="register.password" />
</el-form-item>
- <el-form-item label="纭瀵嗙爜锛�" prop="confirmPassword">
+ <el-form-item :label="$t('user.ConfirmPassword')" prop="confirmPassword">
<el-input autocomplete="off" type="text" style="-webkit-text-security: disc" v-model="register.confirmPassword" />
</el-form-item>
<el-form-item >
<el-button
type="primary"
@click="submitForm(ruleFormRef)"
- >淇敼
+ >{{ $t('basicData.save') }}
</el-button>
</el-form-item>
</el-form>
--
Gitblit v1.8.0