refactor(executor/account): 重写为与 manager/Accounts.vue 完全一致
原差异 (现在都消除了): - breadcrumb: '账号信息' → '账号管理' - 删 page-sub 副标题 - form 字段: name/phone/oldPwd/newPwd/confirmPwd → nickName/phonenumber/oldPassword/newPassword/confirmPassword - 加 :rules + ref="formRef" (之前无校验, 只占位 ElMessage) - 真调用 /system/user/profile (PUT) + /system/user/profile/updatePwd (之前只占位) - onSave 用 formRef.validate + saving loading - onMounted 调 loadProfile() (之前从 store.user 读, 没有 PUT 接口) - account-form max-width 520 → 600 - 加 filter-tip 密码长度提示 - 加 .page-card max-width 1200px
This commit is contained in:
@@ -1,76 +1,83 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="page-card executor-account">
|
<div class="page-card executor-account">
|
||||||
<div class="breadcrumb">首页 / 账号信息</div>
|
<div class="breadcrumb">首页 / 账号管理</div>
|
||||||
<p class="page-sub">管理账号信息, 修改密码或手机号</p>
|
|
||||||
|
|
||||||
<el-form :model="form" label-width="120px" class="account-form">
|
<el-form :model="form" label-width="120px" :rules="rules" ref="formRef" class="account-form">
|
||||||
<el-form-item label="姓名">
|
<el-form-item label="姓名" prop="nickName"><el-input v-model="form.nickName" placeholder="请输入姓名" /></el-form-item>
|
||||||
<el-input v-model="form.name" placeholder="请输入姓名" />
|
<el-form-item label="手机号" prop="phonenumber"><el-input v-model="form.phonenumber" placeholder="请输入手机号" /></el-form-item>
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="手机号">
|
<el-form-item label="原密码" prop="oldPassword"><el-input v-model="form.oldPassword" type="password" show-password placeholder="请输入原密码" /></el-form-item>
|
||||||
<el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" />
|
<el-form-item label="新密码" prop="newPassword"><el-input v-model="form.newPassword" type="password" show-password placeholder="请输入新密码" /></el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="确认密码" prop="confirmPassword"><el-input v-model="form.confirmPassword" type="password" show-password placeholder="请再次输入新密码" /></el-form-item>
|
||||||
<el-form-item label="原密码">
|
<div class="filter-tip">* 密码长度 6-20 位,支持数字、字母、特殊字符;留空表示不修改密码</div>
|
||||||
<el-input v-model="form.oldPwd" type="password" show-password placeholder="请输入原密码" />
|
<el-form-item><el-button type="primary" :loading="saving" @click="onSave">保存</el-button><el-button @click="onCancel">取消</el-button></el-form-item>
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="新密码">
|
|
||||||
<el-input v-model="form.newPwd" type="password" show-password placeholder="请输入新密码" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="确认密码">
|
|
||||||
<el-input v-model="form.confirmPwd" type="password" show-password placeholder="请再次输入新密码" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" @click="onSave">保存</el-button>
|
|
||||||
<el-button @click="onCancel">取消</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { reactive, onMounted } from 'vue'
|
import { reactive, ref, onMounted } from 'vue'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
import { useUserStore } from '@/store/user'
|
import request from '@/utils/request'
|
||||||
|
|
||||||
const store = useUserStore()
|
const form = reactive({ nickName: '', phonenumber: '', oldPassword: '', newPassword: '', confirmPassword: '' })
|
||||||
const form = reactive({
|
const profile = ref({})
|
||||||
name: '',
|
const saving = ref(false)
|
||||||
phone: '',
|
const formRef = ref(null)
|
||||||
oldPwd: '',
|
|
||||||
newPwd: '',
|
|
||||||
confirmPwd: ''
|
|
||||||
})
|
|
||||||
|
|
||||||
onMounted(() => {
|
const rules = {
|
||||||
const u = store.user || {}
|
nickName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
|
||||||
form.name = u.nickName || u.userName || ''
|
phonenumber: [{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }],
|
||||||
form.phone = u.phonenumber || ''
|
oldPassword: [{ required: false }],
|
||||||
})
|
newPassword: [{ min: 6, max: 20, message: '密码长度 6-20 位', trigger: 'blur' }],
|
||||||
|
confirmPassword: [{
|
||||||
function onSave() {
|
validator: (rule, val, cb) => {
|
||||||
if (!form.name) { ElMessage.warning('请输入姓名'); return }
|
if (form.newPassword && val !== form.newPassword) return cb(new Error('两次输入密码不一致'))
|
||||||
if (!form.phone) { ElMessage.warning('请输入手机号'); return }
|
cb()
|
||||||
if (form.newPwd || form.confirmPwd) {
|
}, trigger: 'blur'
|
||||||
if (!form.oldPwd) { ElMessage.warning('请输入原密码'); return }
|
}],
|
||||||
if (form.newPwd !== form.confirmPwd) { ElMessage.error('两次新密码不一致'); return }
|
|
||||||
}
|
|
||||||
ElMessage.success('保存成功(占位)')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function loadProfile() {
|
||||||
|
try {
|
||||||
|
const { data } = await request({ url: '/system/user/profile', method: 'get' })
|
||||||
|
profile.value = data || {}
|
||||||
|
form.nickName = profile.value.nickName || ''
|
||||||
|
form.phonenumber = profile.value.phonenumber || ''
|
||||||
|
} catch { ElMessage.error('获取个人信息失败') }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onSave() {
|
||||||
|
if (form.newPassword && form.newPassword !== form.confirmPassword) {
|
||||||
|
ElMessage.error('两次输入密码不一致'); return
|
||||||
|
}
|
||||||
|
await formRef.value.validate()
|
||||||
|
saving.value = true
|
||||||
|
try {
|
||||||
|
await request({ url: '/system/user/profile', method: 'put', data: { nickName: form.nickName, phonenumber: form.phonenumber, sex: profile.value.sex } })
|
||||||
|
if (form.newPassword) {
|
||||||
|
await request({ url: '/system/user/profile/updatePwd', method: 'put', data: { oldPassword: form.oldPassword, newPassword: form.newPassword } })
|
||||||
|
}
|
||||||
|
ElMessage.success('保存成功')
|
||||||
|
form.oldPassword = ''; form.newPassword = ''; form.confirmPassword = ''
|
||||||
|
loadProfile()
|
||||||
|
} catch (e) {
|
||||||
|
ElMessage.error(e?.msg || '保存失败')
|
||||||
|
} finally { saving.value = false }
|
||||||
|
}
|
||||||
function onCancel() {
|
function onCancel() {
|
||||||
const u = store.user || {}
|
form.nickName = profile.value.nickName || ''
|
||||||
form.name = u.nickName || u.userName || ''
|
form.phonenumber = profile.value.phonenumber || ''
|
||||||
form.phone = u.phonenumber || ''
|
form.oldPassword = ''; form.newPassword = ''; form.confirmPassword = ''
|
||||||
form.oldPwd = ''
|
|
||||||
form.newPwd = ''
|
|
||||||
form.confirmPwd = ''
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onMounted(loadProfile)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
/* 整页面板 (与 People.vue 风格一致) */
|
/* 整页面板 (与 manager/Accounts.vue 一致: max-width 1200px) */
|
||||||
.executor-account { padding: 16px; }
|
.executor-account { padding: 16px; max-width: 1200px; }
|
||||||
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 12px; }
|
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 12px; }
|
||||||
.page-sub { font-size: 13px; color: #909399; margin-bottom: 16px; }
|
.account-form { max-width: 600px; }
|
||||||
.account-form { max-width: 520px; }
|
.filter-tip { color: #909399; font-size: 12px; margin-bottom: 12px; padding-left: 120px; }
|
||||||
</style>
|
</style>
|
||||||
Reference in New Issue
Block a user