feat: add date range filter to Occupancies, status filter to Tenants

This commit is contained in:
2026-07-06 14:36:03 +08:00
parent ca909fae86
commit fb6d99266e
2 changed files with 20 additions and 10 deletions

View File

@@ -29,6 +29,7 @@ import {
import dayjs from 'dayjs';
import api from '../../api';
import PermissionButton from '../../components/PermissionButton';
const { RangePicker } = DatePicker;
const OccupanciesPage: React.FC = () => {
const [data, setData] = useState<any[]>([]);
@@ -43,8 +44,9 @@ const OccupanciesPage: React.FC = () => {
const [autoDeposit, setAutoDeposit] = useState(true);
const [depositAmount, setDepositAmount] = useState(500);
const [searchText, setSearchText] = useState('');
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
const [dateRange, setDateRange] = useState<[dayjs.Dayjs | null, dayjs.Dayjs | null] | null>(null);
const [batchCheckOutModal, setBatchCheckOutModal] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
const [checkInForm] = Form.useForm();
const [checkOutForm] = Form.useForm();
const [transferForm] = Form.useForm();
@@ -54,7 +56,7 @@ const OccupanciesPage: React.FC = () => {
setLoading(true);
try {
const [occ, stu, rm, tn]: any[] = await Promise.all([
api.get('/occupancies', { params: { active: showActive ? 'true' : undefined } }),
api.get('/occupancies', { params: { active: showActive ? 'true' : undefined, dateFrom: dateRange?.[0]?.format('YYYY-MM-DD'), dateTo: dateRange?.[1]?.format('YYYY-MM-DD') } }),
api.get('/students'),
api.get('/rooms/overview'),
api.get('/tenants'),
@@ -72,7 +74,7 @@ const OccupanciesPage: React.FC = () => {
useEffect(() => {
fetchData();
setSelectedRowKeys([]);
}, [showActive]);
}, [showActive, dateRange]);
const filteredData = useMemo(() => {
if (!searchText) return data;
@@ -275,6 +277,7 @@ const OccupanciesPage: React.FC = () => {
allowClear
style={{ width: 200 }}
/>
<RangePicker value={dateRange} onChange={(dates) => { setDateRange(dates ? [dates[0], dates[1]] : null); }} placeholder={['入住开始', '入住结束']} style={{ width: 240 }} />
</Space>
<Space wrap>
<PermissionButton