diff --git a/fund-admin/src/views/system/user.vue b/fund-admin/src/views/system/user.vue index 12aa1b8..a923082 100644 --- a/fund-admin/src/views/system/user.vue +++ b/fund-admin/src/views/system/user.vue @@ -239,23 +239,27 @@ const resetForm = () => { const handleSubmit = async () => { if (!formRef.value) return - await formRef.value.validate(async (valid) => { - if (valid) { - try { - if (form.userId) { - await updateUser(form.userId, form) - ElMessage.success('更新成功') - } else { - await createUser(form) - ElMessage.success('创建成功') - } - dialogVisible.value = false - fetchData() - } catch (error) { - console.error('保存失败:', error) - } + try { + await formRef.value.validate() + } catch (error) { + ElMessage.warning('请检查表单填写是否完整') + return + } + + try { + if (form.userId) { + await updateUser(form.userId, form) + ElMessage.success('更新成功') + } else { + await createUser(form) + ElMessage.success('创建成功') } - }) + dialogVisible.value = false + await fetchData() + } catch (error) { + console.error('保存失败:', error) + ElMessage.error(error.message || '操作失败') + } } const handleResetPassword = (row) => { @@ -273,8 +277,10 @@ const handlePasswordSubmit = async () => { await resetPassword(passwordForm.userId, passwordForm.newPassword) ElMessage.success('密码重置成功') passwordDialogVisible.value = false + await fetchData() } catch (error) { console.error('密码重置失败:', error) + ElMessage.error(error.message || '密码重置失败') } } @@ -289,9 +295,10 @@ const handleToggleStatus = (row) => { try { await updateUserStatus(row.userId, newStatus) ElMessage.success(`${actionText}成功`) - fetchData() + await fetchData() } catch (error) { console.error('状态更新失败:', error) + ElMessage.error(error.message || '操作失败') } }) } @@ -305,9 +312,14 @@ const handleDelete = (row) => { try { await deleteUser(row.userId) ElMessage.success('删除成功') - fetchData() + // 如果删除的是当前页最后一条且不是第一页,返回上一页 + if (tableData.value.length === 1 && page.current > 1) { + page.current-- + } + await fetchData() } catch (error) { console.error('删除失败:', error) + ElMessage.error(error.message || '删除失败') } }) } diff --git a/fundplatform b/fundplatform index 60e29de..fb2653f 160000 --- a/fundplatform +++ b/fundplatform @@ -1 +1 @@ -Subproject commit 60e29de355ce8eaea6bac706fb17947b1294e6f4 +Subproject commit fb2653fb5c2e5c0003168a35655c8fba1f2c32c2