From d26274d89d377067c1e2648192cffbf89464b361 Mon Sep 17 00:00:00 2001
From: wsj <593216709@qq.com>
Date: Wed, 28 Oct 2026 23:34:32 +0800
Subject: [PATCH] feat: 拆包
---
src/pages/system/departments/components/DepartmentFormDrawer.tsx | 90 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/src/pages/system/departments/components/DepartmentFormDrawer.tsx b/src/pages/system/departments/components/DepartmentFormDrawer.tsx
index b159038..e0649b4 100644
--- a/src/pages/system/departments/components/DepartmentFormDrawer.tsx
+++ b/src/pages/system/departments/components/DepartmentFormDrawer.tsx
@@ -1,4 +1,5 @@
import { useCallback, useEffect, useMemo, useState } from 'react';
+import { ProFormSelect, ProFormTreeSelect } from '@ant-design/pro-components';
import {
App as AntdApp,
Button,
@@ -8,9 +9,8 @@
InputNumber,
Select,
Space,
- TreeSelect,
} from 'antd';
-import { createOrg, updateOrg } from '../server';
+import { createOrg, getLeaderDetail, getLeaderOptions, updateOrg } from '../service';
import type { DepartmentFormValues, OrgVO } from '../types';
import { toOrgTreeSelectData } from '../utils';
@@ -23,8 +23,6 @@
parentId?: number;
/** 组织树，用于上级组织选择。 */
orgTree: OrgVO[];
- /** 负责人员工下拉选项。 */
- leaderOptions: { label: string; value: number }[];
onClose: () => void;
onSuccess: () => void;
}
@@ -35,7 +33,6 @@
record,
parentId,
orgTree,
- leaderOptions,
onClose,
onSuccess,
}: DepartmentFormDrawerProps) => {
@@ -43,10 +40,46 @@
const [submitting, setSubmitting] = useState(false);
const { message } = AntdApp.useApp();
const isEdit = mode === 'edit';
+ /** 新增入口只有「新增子部门」，上级组织已确定，不允许再选择。 */
+ const parentDisabled = !isEdit;
const parentOptions = useMemo(
() => toOrgTreeSelectData(orgTree, isEdit ? record?.id : undefined),
[isEdit, orgTree, record],
+ );
+
+ /** 负责人远程搜索：按姓名 / 手机号模糊查询员工。 */
+ const requestLeaderOptions = useCallback(
+ async ({ keyWords }: { keyWords?: string }) => {
+ const keyword = keyWords?.trim();
+ const result = await getLeaderOptions({
+ page: 1,
+ size: 50,
+ keyword: keyword || undefined,
+ });
+ const options = (result.records ?? []).map((employee) => ({
+ label: employee.name,
+ value: employee.id,
+ }));
+
+ // 编辑时把当前负责人补进首屏选项，避免回填后显示为员工 ID。
+ const currentLeaderId = isEdit ? record?.leaderId : undefined;
+ if (
+ !keyword &&
+ currentLeaderId &&
+ !options.some((option) => option.value === currentLeaderId)
+ ) {
+ try {
+ const leader = await getLeaderDetail({ id: currentLeaderId });
+ options.unshift({ label: leader.name, value: leader.id });
+ } catch {
+ // 错误已由 request 统一提示
+ }
+ }
+
+ return options;
+ },
+ [isEdit, record],
);
useEffect(() => {
@@ -97,7 +130,7 @@
}
}, [form, isEdit, message, onSuccess, record]);
- const title = isEdit ? '编辑部门' : parentId ? '新增子部门' : '新增部门';
+ const title = isEdit ? '编辑部门' : '新增子部门';
return (
<Drawer
@@ -140,26 +173,31 @@
]}
/>
</Form.Item>
- <Form.Item name="parentId" label="上级组织">
- <TreeSelect
- treeData={parentOptions}
- treeDefaultExpandAll
- allowClear
- showSearch
- treeNodeFilterProp="title"
- placeholder="不选则作为根组织"
- style={{ width: '100%' }}
- />
- </Form.Item>
- <Form.Item name="leaderId" label="负责人">
- <Select
- options={leaderOptions}
- showSearch
- optionFilterProp="label"
- allowClear
- placeholder="请选择负责人"
- />
- </Form.Item>
+ <ProFormTreeSelect
+ name="parentId"
+ label="上级组织"
+ placeholder="不选则作为根组织"
+ disabled={parentDisabled}
+ fieldProps={{
+ treeData: parentOptions,
+ treeDefaultExpandAll: true,
+ allowClear: true,
+ showSearch: true,
+ treeNodeFilterProp: 'title',
+ style: { width: '100%' },
+ }}
+ />
+ <ProFormSelect
+ name="leaderId"
+ label="负责人"
+ rules={isEdit ? undefined : [{ required: true, message: '请选择负责人' }]}
+ placeholder="请输入姓名搜索负责人"
+ showSearch
+ allowClear
+ debounceTime={300}
+ request={requestLeaderOptions}
+ fieldProps={{ filterOption: false, style: { width: '100%' } }}
+ />
<Form.Item name="region" label="所在地区">
<Input placeholder="请输入所在地区" maxLength={50} />
</Form.Item>
--
Gitblit v1.9.3