From d1d5b4681b6c506e88603fe5af8e3b48224fe3cd Mon Sep 17 00:00:00 2001
From: wangziqi <wangziqi@gongxue100.com>
Date: Thu, 9 Jul 2026 16:31:53 +0800
Subject: [PATCH] feat(schedules): replace teacher ID input with searchable
 user select, show teacher name, add schedule button

---
 apps/admin/src/pages/Schedules/index.tsx | 51 +++++++++++++++++++++---
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/apps/admin/src/pages/Schedules/index.tsx b/apps/admin/src/pages/Schedules/index.tsx
index 1cdaccb..f20b225 100644
--- a/apps/admin/src/pages/Schedules/index.tsx
+++ b/apps/admin/src/pages/Schedules/index.tsx
@@ -10,6 +10,7 @@ import {
   RightOutlined,
   DeleteOutlined,
   CloudSyncOutlined,
+  PlusOutlined,
 } from '@ant-design/icons';
 import dayjs, { Dayjs } from 'dayjs';
 import api from '../../api';
@@ -49,6 +50,12 @@ interface ClassItem {
   code: string;
 }
 
+
+interface UserItem {
+  id: number;
+  username: string;
+  name: string;
+}
 interface ScheduleFormValues {
   classId: number;
   subject: string;
@@ -83,6 +90,7 @@ const SchedulesPage: React.FC = () => {
   // Data
   const [classrooms, setClassrooms] = useState<ClassroomItem[]>([]);
   const [classes, setClasses] = useState<ClassItem[]>([]);
+  const [users, setUsers] = useState<UserItem[]>([]);
   const [matrix, setMatrix] = useState<Record<number, Record<number, ClassScheduleItem[]>>>({});
   const [loading, setLoading] = useState(false);
 
@@ -236,6 +244,10 @@ const SchedulesPage: React.FC = () => {
     fetchData();
   }, [fetchData]);
 
+  useEffect(() => {
+    api.get<UserItem[]>('/rbac/users').then(setUsers).catch(() => {});
+  }, []);
+
   // ---- Filtered classrooms ----
 
   const filteredClassrooms = useMemo(() => {
@@ -394,6 +406,15 @@ const SchedulesPage: React.FC = () => {
     [classes],
   );
 
+  const userOptions = useMemo(
+    () =>
+      users.map((u) => ({
+        value: u.id,
+        label: `${u.name || u.username}${u.name ? ` (${u.username})` : ''}`,
+      })),
+    [users],
+  );
+
   // ---- Render ----
 
   const selectedClassroom = selectedCell
@@ -785,10 +806,15 @@ const SchedulesPage: React.FC = () => {
 
             <Form.Item
               name="teacherId"
-              label="教师ID（可选）"
-              normalize={(v) => (v ? Number(v) : undefined)}
+              label="教师（可选）"
             >
-              <Input type="number" placeholder="输入教师用户ID" />
+              <Select
+                showSearch
+                allowClear
+                placeholder="搜索并选择教师"
+                optionFilterProp="label"
+                options={userOptions}
+              />
             </Form.Item>
 
             <Form.Item label="教室">
@@ -828,6 +854,19 @@ const SchedulesPage: React.FC = () => {
           </Form>
         ) : (
           <div style={{ lineHeight: 2 }}>
+            <div style={{ marginBottom: 12, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+              <span style={{ fontWeight: 500 }}>已有排课</span>
+              <Button
+                type="primary"
+                icon={<PlusOutlined />}
+                onClick={() => {
+                  setModalMode('create');
+                  form.resetFields();
+                }}
+              >
+                新增排课
+              </Button>
+            </div>
             {selectedSchedules.length === 0 ? (
               <Empty description="该时段暂无排课" />
             ) : (
@@ -850,8 +889,10 @@ const SchedulesPage: React.FC = () => {
                       </div>
                       {s.teacherId != null && (
                         <div>
-                          <strong>教师ID：</strong>
-                          {s.teacherId}
+                          <strong>教师：</strong>
+                          {users.find((u) => u.id === s.teacherId)?.name
+                            || users.find((u) => u.id === s.teacherId)?.username
+                            || `#${s.teacherId}`}
                         </div>
                       )}
                       <div>