diff --git a/src/components/EditUserDialog.vue b/src/components/EditUserDialog.vue
new file mode 100644
index 0000000..f878f1e
--- /dev/null
+++ b/src/components/EditUserDialog.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-dialog v-model="dialogVisible" :title="props.mode === 'create' ? '创建用户' : '修改用户信息'">
+    <el-form :model="editForm">
+      <el-form-item v-if="props.mode === 'edit'" label="用户ID">
+        <el-input v-model="editForm.id" disabled />
+      </el-form-item>
+      <el-form-item label="用户名">
+        <el-input v-model="editForm.username" />
+      </el-form-item>
+      <el-form-item label="角色">
+        <el-select v-model="editForm.role">
+          <el-option label="系统管理员" value="admin" />
+          <el-option label="管理员" value="manager" />
+          <el-option label="普通用户" value="user" />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="props.mode === 'create'" label="密码">
+        <el-input v-model="editForm.password" type="password" />
+      </el-form-item>
+      <el-form-item label="描述">
+        <el-input v-model="editForm.description" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">确认</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch } from 'vue'
+import type { UserResponse, UserCreate } from '@/api/types'
+import { userService } from '@/api/userService'
+
+const props = defineProps<{
+  mode: 'create' | 'edit',
+  userId?: number
+}>()
+
+const dialogVisible = ref(false)
+const editForm = ref<UserResponse & { password?: string }>({
+  id: 0,
+  username: '',
+  role: 'user',
+  description: '',
+  created_at: '',
+  updated_at: '',
+  password: ''
+})
+
+const emit = defineEmits(['confirm'])
+
+const open = async () => {
+  if (props.mode === 'edit' && props.userId) {
+    const user = await userService.getUser(props.userId)
+    editForm.value = { ...user }
+  } else {
+    editForm.value = {
+    id: 0,
+    username: '',
+    role: 'user',
+    description: '',
+    created_at: '',
+    updated_at: ''
+    }
+  }
+  dialogVisible.value = true
+}
+
+const handleConfirm = async () => {
+  try {
+    if (props.mode === 'create') {
+      // 调用创建用户API
+      const { id, created_at, updated_at, ...createData } = editForm.value
+      if (!createData.password) {
+        throw new Error('密码不能为空')
+      }
+      await userService.createUser({
+        username: createData.username,
+        password: createData.password,
+        role: createData.role,
+        description: createData.description
+      } as UserCreate)
+    } else {
+      // 调用更新用户API
+      const { id, created_at, updated_at, ...updateData } = editForm.value
+      await userService.updateUser(id, updateData)
+    }
+    emit('confirm', editForm.value)
+    dialogVisible.value = false
+  } catch (error) {
+    console.error('操作失败:', error)
+    // 这里可以添加错误提示
+  }
+}
+
+defineExpose({
+  open,
+  handleConfirm
+})
+</script>
\ No newline at end of file