|
|
@@ -22,15 +22,6 @@ const Departments: React.FC = () => {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- // 查询用户列表
|
|
|
- const { data: usersData } = useQuery({
|
|
|
- queryKey: ['users-for-departments'],
|
|
|
- queryFn: async () => {
|
|
|
- const response = await userClient.$get({ query: { page: 1, pageSize: 1000 } });
|
|
|
- if (response.status !== 200) throw new Error('获取用户列表失败');
|
|
|
- return response.json();
|
|
|
- }
|
|
|
- });
|
|
|
|
|
|
// 创建部门
|
|
|
const createMutation = useMutation({
|
|
|
@@ -110,13 +101,12 @@ const Departments: React.FC = () => {
|
|
|
},
|
|
|
{
|
|
|
title: '负责人',
|
|
|
- dataIndex: 'managerId',
|
|
|
- key: 'managerId',
|
|
|
+ dataIndex: 'manager',
|
|
|
+ key: 'manager',
|
|
|
width: 120,
|
|
|
- render: (managerId: number) => {
|
|
|
- if (!managerId) return '-';
|
|
|
- const manager = usersData?.data.find((u: any) => u.id === managerId);
|
|
|
- return manager?.name || manager?.username || '-';
|
|
|
+ render: (manager: any) => {
|
|
|
+ if (!manager) return '-';
|
|
|
+ return manager.name || manager.username || '-';
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
@@ -188,7 +178,8 @@ const Departments: React.FC = () => {
|
|
|
const handleSubmit = async (values: any) => {
|
|
|
const data = {
|
|
|
...values,
|
|
|
- isActive: values.isActive ? 1 : 0
|
|
|
+ isActive: values.isActive ? 1 : 0,
|
|
|
+ description: values.description || null
|
|
|
};
|
|
|
|
|
|
if (editingRecord) {
|