feat: bills expense type filter (backend join + frontend Select), sync stub docs

This commit is contained in:
2026-07-06 14:48:47 +08:00
parent 4b02012634
commit 20f3b79179
4 changed files with 20 additions and 9 deletions

View File

@@ -48,12 +48,16 @@ const BillsPage: React.FC = () => {
const [selectedRows, setSelectedRows] = useState<number[]>([]);
const [searchText, setSearchText] = useState('');
const [filterStatus, setFilterStatus] = useState<string | undefined>(undefined);
const [filterExpenseType, setFilterExpenseType] = useState<string | undefined>(undefined);
const [generateForm] = Form.useForm();
const fetchData = async () => {
setLoading(true);
try {
const res: any = await api.get('/bills');
const params: Record<string, string | undefined> = {};
if (filterStatus) params.status = filterStatus;
if (filterExpenseType) params.expenseType = filterExpenseType;
const res = await api.get('/bills', { params }) as unknown[];
setBills(res);
} catch (e) {
console.error(e);
@@ -63,7 +67,7 @@ const BillsPage: React.FC = () => {
useEffect(() => {
fetchData();
}, []);
}, [filterStatus, filterExpenseType]);
const filteredBills = useMemo(() => {
return bills.filter((b: any) => {
@@ -332,6 +336,8 @@ const BillsPage: React.FC = () => {
{ value: 'paid', label: '已支付' },
]}
/>
<Select placeholder="费用类型" allowClear style={{ width: 120 }} value={filterExpenseType} onChange={setFilterExpenseType}
options={[{value:'water',label:'水费'},{value:'electricity',label:'电费'},{value:'cleaning',label:'保洁费'},{value:'rent',label:'租金'},{value:'other',label:'其他'}]} />
<PermissionButton
permission="bill:confirm"
onClick={() => batchUpdateStatus('confirmed')}