diff --git a/src/api/approvals.ts b/src/api/approvals.ts index 3f42c41..25a49a7 100644 --- a/src/api/approvals.ts +++ b/src/api/approvals.ts @@ -25,6 +25,7 @@ export interface ApprovalTasksResponse { export interface ApprovalsListParams { offset?: number limit?: number + id?: number status?: string initiator_id?: number topic_id?: number // одиночный (для обратной совместимости) @@ -59,6 +60,7 @@ export const approvalsApi = { if (params.status) query.status = params.status if (params.initiator_id) query.initiator_id = params.initiator_id if (params.topic_id) query.topic_id = params.topic_id + if (params.id) query.id = params.id if (params.department_id) query.department_id = params.department_id if (params.content) query.content = params.content if (params.date_from) query.date_from = params.date_from diff --git a/src/pages/approvals/ApprovalsPage.tsx b/src/pages/approvals/ApprovalsPage.tsx index 2c222fa..0310423 100644 --- a/src/pages/approvals/ApprovalsPage.tsx +++ b/src/pages/approvals/ApprovalsPage.tsx @@ -71,6 +71,7 @@ export default function ApprovalsPage() { // === Состояния фильтров === const [page, setPage] = useState(1) + const [idInput, setIdInput] = useState('') const [searchInput, setSearchInput] = useState('') const [search, setSearch] = useState('') const [searchError, setSearchError] = useState(null) @@ -187,6 +188,7 @@ export default function ApprovalsPage() { offset: (page - 1) * LIMIT, limit: LIMIT, } + if (idInput) params.id = Number(idInput) if (search) params.content = search if (statusFilter) params.status = statusFilter if (departmentFilter) params.department_id = Number(departmentFilter) @@ -200,10 +202,7 @@ export default function ApprovalsPage() { if (dateFrom) params.date_from = dayjs(dateFrom).format('YYYY-MM-DD') if (dateTo) params.date_to = dayjs(dateTo).format('YYYY-MM-DD') return params - }, [ - page, search, statusFilter, departmentFilter, - initiatorFilter, categoryFilter, topicFilter, dateFrom, dateTo, - ]) + }, [page, search, statusFilter, departmentFilter, initiatorFilter, categoryFilter, topicFilter, dateFrom, dateTo, idInput]) // === Запрос списка заявок === const { data, isLoading, isFetching } = useApprovals(requestParams) @@ -213,6 +212,7 @@ export default function ApprovalsPage() { // === Сброс фильтров === const handleResetFilters = () => { setSearchInput('') + setIdInput('') setSearch('') setStatusFilter(null) setCategoryFilter([]) @@ -226,6 +226,7 @@ export default function ApprovalsPage() { const hasActiveFilters = search || + idInput || statusFilter || categoryFilter.length > 0 || topicFilter.length > 0 || @@ -355,8 +356,32 @@ export default function ApprovalsPage() { - {/* Строка 1: Поиск + Статус + Инициатор */} + {/* Строка 1: ID + Поиск + Статус + Инициатор */} + } + value={idInput} + onChange={(e) => { + // Оставляем только цифры + setIdInput(e.currentTarget.value.replace(/\D/g, '')) + setPage(1) + }} + rightSection={ + idInput && ( + { + setIdInput('') + setPage(1) + }} + > + + + ) + } + />