This commit is contained in:
ygx
2026-03-29 09:58:50 +08:00
parent 8021c78cf2
commit 8eb75f79a5
2 changed files with 31 additions and 11 deletions

View File

@@ -47,7 +47,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, computed, watch } from 'vue' import { ref, reactive, computed, watch } from 'vue'
import { Message } from '@arco-design/web-vue' import { Message } from '@arco-design/web-vue'
import { adminResetUserPassword } from '@/api/module/user' import { resetUserPassword } from '@/api/module/user'
import type { UserItem } from '@/api/types' import type { UserItem } from '@/api/types'
const props = defineProps<{ const props = defineProps<{
@@ -113,9 +113,11 @@ const handleSubmit = async () => {
if (valid) return if (valid) return
loading.value = true loading.value = true
const res = await adminResetUserPassword({ const res = await resetUserPassword({
id: props.user!.id!, account: props.user!.account || '',
code: '123456', // 暂时没校验,随便传
password: formData.password, password: formData.password,
phone: props.user!.phone || '13800138000', // 暂时没校验,随便传
}) })
if (res.code === 0) { if (res.code === 0) {

View File

@@ -55,7 +55,7 @@
:title="modalTitle" :title="modalTitle"
:mask-closable="false" :mask-closable="false"
:width="520" :width="520"
@ok="handleModalOk" @before-ok="handleModalOk"
@cancel="handleModalCancel" @cancel="handleModalCancel"
> >
<a-form <a-form
@@ -228,11 +228,16 @@ const formRules = {
{ required: true, message: '请输入姓名' }, { required: true, message: '请输入姓名' },
], ],
email: [ email: [
{ required: true, message: '请输入邮箱' },
{ match: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, message: '请输入正确的邮箱格式' }, { match: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, message: '请输入正确的邮箱格式' },
], ],
phone: [ phone: [
{ required: true, message: '请输入手机号' },
{ match: /^1[3-9]\d{9}$/, message: '请输入正确的手机号' }, { match: /^1[3-9]\d{9}$/, message: '请输入正确的手机号' },
], ],
status: [
{ required: true, message: '请选择状态' },
],
} }
// 删除确认 // 删除确认
@@ -353,20 +358,33 @@ const handleConfirmDelete = async () => {
const handleModalOk = async () => { const handleModalOk = async () => {
try { try {
const valid = await formRef.value?.validate() const valid = await formRef.value?.validate()
if (valid) return if (valid) return false
loading.value = true loading.value = true
if (isEdit.value && formData.id) { if (isEdit.value && formData.id) {
await modifyUser(formData) const res = await modifyUser(formData)
Message.success('修改成功') if (res.code === 0) {
Message.success('修改成功')
await fetchData()
return true
} else {
Message.error('修改失败')
return false
}
} else { } else {
await createUser(formData) const res = await createUser(formData)
Message.success('创建成功') if (res.code === 0) {
Message.success('创建成功')
await fetchData()
return true
} else {
Message.error('创建失败')
return false
}
} }
modalVisible.value = false
await fetchData()
} catch (error) { } catch (error) {
console.error('Failed to save user:', error) console.error('Failed to save user:', error)
return false
} finally { } finally {
loading.value = false loading.value = false
} }