feat: add rental_category/rate to Room, rental_type/tenant_id to Occupancy, tenant_id to Student

apps/admin/src/pages/Occupancies/index.tsx

@@ -34,6 +34,7 @@ const OccupanciesPage: React.FC = () => {
   const [data, setData] = useState<any[]>([]);
   const [students, setStudents] = useState<any[]>([]);
   const [rooms, setRooms] = useState<any[]>([]);
+  const [tenants, setTenants] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [checkInModal, setCheckInModal] = useState(false);
   const [checkOutModal, setCheckOutModal] = useState<any>(null);
@@ -52,14 +53,16 @@ const OccupanciesPage: React.FC = () => {
   const fetchData = async () => {
     setLoading(true);
     try {
-      const [occ, stu, rm]: any[] = await Promise.all([
+      const [occ, stu, rm, tn]: any[] = await Promise.all([
         api.get('/occupancies', { params: { active: showActive ? 'true' : undefined } }),
         api.get('/students'),
         api.get('/rooms/overview'),
+        api.get('/tenants'),
       ]);
       setData(occ);
       setStudents(stu);
       setRooms(rm);
+      setTenants(tn);
     } catch (e) {
       console.error(e);
     }
@@ -89,6 +92,8 @@ const OccupanciesPage: React.FC = () => {
         roomId: values.roomId,
         checkInDate: values.checkInDate.format('YYYY-MM-DD'),
         billingStartDate: values.billingStartDate?.format('YYYY-MM-DD'),
+        rentalType: values.rentalType,
+        tenantId: values.tenantId,
         notes: values.notes,
       });
       message.success('入住登记成功');
@@ -508,6 +513,28 @@ const OccupanciesPage: React.FC = () => {
               format="YYYY-MM-DD"
             />
           </Form.Item>
+          <Form.Item name="rentalType" label="租赁类型">
+            <Select
+              allowClear
+              options={[
+                { value: 'short', label: '短租' },
+                { value: 'long', label: '长租' },
+              ]}
+              placeholder="默认为短租"
+            />
+          </Form.Item>
+          <Form.Item name="tenantId" label="关联单位">
+            <Select
+              showSearch
+              allowClear
+              optionFilterProp="label"
+              placeholder="选择关联单位"
+              options={tenants.map((t: { id: number; name: string }) => ({
+                value: t.id,
+                label: t.name,
+              }))}
+            />
+          </Form.Item>
           <Form.Item name="notes" label="备注">
             <Input.TextArea rows={2} />
           </Form.Item>

apps/admin/src/pages/Rooms/index.tsx

@@ -422,6 +422,19 @@ const RoomsPage: React.FC = () => {
               placeholder="留空自动解析"
             />
           </Form.Item>
+          <Form.Item name="rentalCategory" label="租赁类别">
+            <Select
+              allowClear
+              options={[
+                { value: 'short', label: '短租' },
+                { value: 'long', label: '长租' },
+              ]}
+              placeholder="默认为短租"
+            />
+          </Form.Item>
+          <Form.Item name="monthlyRate" label="月租金">
+            <InputNumber min={0} precision={2} style={{ width: '100%' }} placeholder="长租月租金" />
+          </Form.Item>
           {editing && (
             <Form.Item name="status" label="状态">
               <Select