From 8eb75f79a517038f14b6b25eed3276347684ea33 Mon Sep 17 00:00:00 2001
From: ygx <ygx>
Date: Sun, 29 Mar 2026 09:58:50 +0800
Subject: [PATCH] feat

---
 .../components/PasswordChangeDialog.vue       |  8 +++--
 .../account-management/index.vue              | 34 ++++++++++++++-----
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/views/ops/pages/system-settings/account-management/components/PasswordChangeDialog.vue b/src/views/ops/pages/system-settings/account-management/components/PasswordChangeDialog.vue
index 7a16ac1..57e027f 100644
--- a/src/views/ops/pages/system-settings/account-management/components/PasswordChangeDialog.vue
+++ b/src/views/ops/pages/system-settings/account-management/components/PasswordChangeDialog.vue
@@ -47,7 +47,7 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, watch } from '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'
 
 const props = defineProps<{
@@ -113,9 +113,11 @@ const handleSubmit = async () => {
     if (valid) return
 
     loading.value = true
-    const res = await adminResetUserPassword({
-      id: props.user!.id!,
+    const res = await resetUserPassword({
+      account: props.user!.account || '',
+      code: '123456', // 暂时没校验，随便传
       password: formData.password,
+      phone: props.user!.phone || '13800138000', // 暂时没校验，随便传
     })
 
     if (res.code === 0) {
diff --git a/src/views/ops/pages/system-settings/account-management/index.vue b/src/views/ops/pages/system-settings/account-management/index.vue
index bb2201d..8d8b543 100644
--- a/src/views/ops/pages/system-settings/account-management/index.vue
+++ b/src/views/ops/pages/system-settings/account-management/index.vue
@@ -55,7 +55,7 @@
       :title="modalTitle"
       :mask-closable="false"
       :width="520"
-      @ok="handleModalOk"
+      @before-ok="handleModalOk"
       @cancel="handleModalCancel"
     >
       <a-form
@@ -228,11 +228,16 @@ const formRules = {
     { required: true, message: '请输入姓名' },
   ],
   email: [
+    { required: true, message: '请输入邮箱' },
     { match: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, message: '请输入正确的邮箱格式' },
   ],
   phone: [
+    { required: true, message: '请输入手机号' },
     { match: /^1[3-9]\d{9}$/, message: '请输入正确的手机号' },
   ],
+  status: [
+    { required: true, message: '请选择状态' },
+  ],
 }
 
 // 删除确认
@@ -353,20 +358,33 @@ const handleConfirmDelete = async () => {
 const handleModalOk = async () => {
   try {
     const valid = await formRef.value?.validate()
-    if (valid) return
+    if (valid) return false
 
     loading.value = true
     if (isEdit.value && formData.id) {
-      await modifyUser(formData)
-      Message.success('修改成功')
+      const res = await modifyUser(formData)
+      if (res.code === 0) {
+        Message.success('修改成功')
+        await fetchData()
+        return true
+      } else {
+        Message.error('修改失败')
+        return false
+      }
     } else {
-      await createUser(formData)
-      Message.success('创建成功')
+      const res = await createUser(formData)
+      if (res.code === 0) {
+        Message.success('创建成功')
+        await fetchData()
+        return true
+      } else {
+        Message.error('创建失败')
+        return false
+      }
     }
-    modalVisible.value = false
-    await fetchData()
   } catch (error) {
     console.error('Failed to save user:', error)
+    return false
   } finally {
     loading.value = false
   }