diff --git a/src/api/approvals.ts b/src/api/approvals.ts index f5af568..79fdedf 100644 --- a/src/api/approvals.ts +++ b/src/api/approvals.ts @@ -6,8 +6,12 @@ export interface ApprovalsListParams { limit?: number status?: string initiator_id?: number - topic_id?: number + topic_id?: number // одиночный (для обратной совместимости) + topic_ids?: number[] // 🆕 множественный выбор тем + category_ids?: number[] // 🆕 множественный выбор категорий department_id?: number + date_from?: string // 🆕 YYYY-MM-DD + date_to?: string // 🆕 YYYY-MM-DD content?: string } @@ -25,8 +29,30 @@ export interface UpdateApprovalRequest { } export const approvalsApi = { - getList: (params: ApprovalsListParams = {}) => - apiClient.get>('/approvals', { params }), + getList: (params: ApprovalsListParams = {}) => { + // Формируем query-параметры, корректно сериализуя массивы + const query: Record = {} + + if (params.offset !== undefined) query.offset = params.offset + if (params.limit !== undefined) query.limit = params.limit + 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.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 + if (params.date_to) query.date_to = params.date_to + + // 🆕 Массивы передаём через запятую: "1,2,3" + if (params.topic_ids && params.topic_ids.length > 0) { + query.topic_ids = params.topic_ids.join(',') + } + if (params.category_ids && params.category_ids.length > 0) { + query.category_ids = params.category_ids.join(',') + } + + return apiClient.get>('/approvals', { params: query }) + }, getById: (id: number) => apiClient.get(`/approvals/${id}`), @@ -37,7 +63,6 @@ export const approvalsApi = { delete: (id: number) => apiClient.delete('/approvals', { data: { id } }), - // 🆕 Получение заявок для отчёта (с фильтрами по датам) getForReport: (params: ApprovalsReportParams = {}) => apiClient.get>('/approvals/report', { params }), @@ -46,30 +71,28 @@ export const approvalsApi = { params, responseType: 'blob', }), + getFile: (approvalId: number, fileId: number) => apiClient.get(`/approvals/${approvalId}/files/${fileId}`, { responseType: 'blob', }), + downloadFile: (approvalId: number, fileId: number, fileName: string) => { const token = localStorage.getItem('token') - const apiKey = import.meta.env.VITE_API_KEY const timestamp = Math.floor(Date.now() / 1000).toString() const deviceId = localStorage.getItem('device_id') || 'admin-panel' - // Генерируем HMAC подпись (как в client.ts) const publicKey = import.meta.env.VITE_API_PUBLIC_KEY const privateKey = import.meta.env.VITE_API_PRIVATE_KEY const message = publicKey + ":" + timestamp const signature = CryptoJS.HmacSHA256(message, privateKey).toString(CryptoJS.enc.Hex) - // Создаём URL с query параметрами const url = `${apiClient.defaults.baseURL}/approvals/${approvalId}/files/${fileId}/download` const link = document.createElement('a') link.href = `${url}?_t=${timestamp}` link.setAttribute('download', fileName) - // Добавляем заголовки через fetch fetch(url, { method: 'GET', headers: { diff --git a/src/pages/approvals/ApprovalsPage.tsx b/src/pages/approvals/ApprovalsPage.tsx index efdf96e..7ed720b 100644 --- a/src/pages/approvals/ApprovalsPage.tsx +++ b/src/pages/approvals/ApprovalsPage.tsx @@ -1,4 +1,4 @@ -import {useEffect, useState} from 'react' +import { useEffect, useState, useMemo } from 'react' import { Paper, Table, @@ -9,6 +9,7 @@ import { Text, TextInput, Select, + MultiSelect, Pagination, Loader, Center, @@ -19,17 +20,26 @@ import { Alert, } from '@mantine/core' import { DatePickerInput } from '@mantine/dates' -import {IconEye, IconSearch, IconFileText, IconFileExcel, IconInfoCircle, IconX} from '@tabler/icons-react' +import { + IconEye, + IconSearch, + IconFileText, + IconFileExcel, + IconInfoCircle, + IconX, + IconFilter, +} from '@tabler/icons-react' import { notifications } from '@mantine/notifications' import { useApprovals } from '@/features/approvals/hooks/useApprovals' import { useTopics } from '@/features/topics/hooks/useTopics' import { useDepartments } from '@/features/departments/hooks/useDepartments' import { useCategories } from '@/features/categories/hooks/useCategories' +import { useUsers } from '@/features/users/hooks/useUsers' import { approvalsApi } from '@/api/approvals' import ApprovalDetailsModal from './components/ApprovalDetailsModal' import dayjs from 'dayjs' import 'dayjs/locale/ru' -import {useDebouncedValue} from "@mantine/hooks"; +import { useDebouncedValue } from '@mantine/hooks' dayjs.locale('ru') @@ -52,24 +62,29 @@ const STATUS_LABELS: Record = { } export default function ApprovalsPage() { - // Фильтры списка + // === Состояния фильтров === const [page, setPage] = useState(1) + const [searchInput, setSearchInput] = useState('') const [search, setSearch] = useState('') - const [statusFilter, setStatusFilter] = useState(null) - const [categoryFilter, setCategoryFilter] = useState(null) - const [topicFilter, setTopicFilter] = useState(null) - const [departmentFilter, setDepartmentFilter] = useState(null) + const [searchError, setSearchError] = useState(null) + const [debouncedSearch] = useDebouncedValue(searchInput, 400) + const [statusFilter, setStatusFilter] = useState(null) + const [categoryFilter, setCategoryFilter] = useState([]) + const [topicFilter, setTopicFilter] = useState([]) + const [departmentFilter, setDepartmentFilter] = useState(null) // 🆕 БЫЛО ПРОПУЩЕНО + const [initiatorFilter, setInitiatorFilter] = useState(null) + const [dateFrom, setDateFrom] = useState(null) + const [dateTo, setDateTo] = useState(null) + + // === Отчёт === const [reportDateFrom, setReportDateFrom] = useState(null) const [reportDateTo, setReportDateTo] = useState(null) const [reportLoading, setReportLoading] = useState(false) const [selectedApprovalId, setSelectedApprovalId] = useState(null) - const [searchInput, setSearchInput] = useState('') - const [searchError, setSearchError] = useState(null) - const [debouncedSearch] = useDebouncedValue(searchInput, 400) - + // === Обработка поиска === useEffect(() => { if (debouncedSearch === '') { setSearch('') @@ -77,89 +92,153 @@ export default function ApprovalsPage() { setPage(1) return } - if (debouncedSearch.length < 2) { setSearchError('Введите минимум 2 символа') return } - setSearchError(null) setSearch(debouncedSearch) setPage(1) }, [debouncedSearch]) - const { data: categoryTopics } = useTopics({ - limit: 1000, - ...(categoryFilter && { category_id: Number(categoryFilter) }), - }) - - const effectiveTopicFilter = categoryFilter && categoryTopics?.data?.length === 1 - ? String(categoryTopics.data[0].id) - : topicFilter - - const { data, isLoading, isFetching } = useApprovals({ - offset: (page - 1) * LIMIT, - limit: LIMIT, - ...(search && { content: search }), - ...(statusFilter && { status: statusFilter }), - ...(effectiveTopicFilter && { topic_id: Number(effectiveTopicFilter) }), - ...(departmentFilter && { department_id: Number(departmentFilter) }), - }) - + // === Загрузка справочников === const { data: categories } = useCategories({ limit: 1000 }) - const { data: topics } = useTopics({ limit: 1000 }) + const { data: allTopics } = useTopics({ limit: 1000 }) const { data: departments } = useDepartments() + const { data: users } = useUsers({ limit: 1000 }) + + // === Темы, отфильтрованные по выбранным категориям === + const filteredTopics = useMemo(() => { + if (!allTopics?.data) return [] + if (categoryFilter.length === 0) return allTopics.data + const categoryIds = categoryFilter.map(Number) + return allTopics.data.filter((t) => + t.category_id && categoryIds.includes(t.category_id) + ) + }, [allTopics, categoryFilter]) + + // === Сброс невалидных тем при изменении категорий === + useEffect(() => { + if (categoryFilter.length > 0 && topicFilter.length > 0) { + const validTopicIds = new Set(filteredTopics.map((t) => String(t.id))) + const validSelected = topicFilter.filter((id) => validTopicIds.has(id)) + if (validSelected.length !== topicFilter.length) { + setTopicFilter(validSelected) + } + } + // Если категории сброшены — темы остаются как есть + }, [categoryFilter, filteredTopics, topicFilter]) + + // === Опции для Select/MultiSelect === + const categoryOptions = useMemo( + () => + categories?.data?.map((c) => ({ + value: String(c.id), + label: c.name || '', + })) || [], + [categories] + ) + + const topicOptions = useMemo( + () => + filteredTopics.map((t) => ({ + value: String(t.id), + label: `${t.category?.name || '—'} / ${t.name || ''}`, + })), + [filteredTopics] + ) + + const departmentOptions = useMemo( + () => + departments?.data?.map((d) => ({ + value: String(d.id), + label: d.name || '', + })) || [], + [departments] + ) + + const userOptions = useMemo( + () => + users?.data?.map((u) => ({ + value: String(u.id), + label: u.full_name || u.username || `ID: ${u.id}`, + })) || [], + [users] + ) + + // === Формирование параметров запроса === + const requestParams = useMemo(() => { + const params: any = { + offset: (page - 1) * LIMIT, + limit: LIMIT, + } + if (search) params.content = search + if (statusFilter) params.status = statusFilter + if (departmentFilter) params.department_id = Number(departmentFilter) + if (initiatorFilter) params.initiator_id = Number(initiatorFilter) + if (categoryFilter.length > 0) { + params.category_ids = categoryFilter.map(Number) + } + if (topicFilter.length > 0) { + params.topic_ids = topicFilter.map(Number) + } + 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, + ]) + + // === Запрос списка заявок === + const { data, isLoading, isFetching } = useApprovals(requestParams) const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1 - const categoryOptions = categories?.data?.map((c) => ({ - value: String(c.id), - label: c.name || '', - })) || [] - - const topicOptions = topics?.data?.map((t) => ({ - value: String(t.id), - label: t.name || '', - })) || [] - - const departmentOptions = departments?.data?.map((d) => ({ - value: String(d.id), - label: d.name || '', - })) || [] - - const handleCategoryChange = (value: string | null) => { - setCategoryFilter(value) - setTopicFilter(null) + // === Сброс фильтров === + const handleResetFilters = () => { + setSearchInput('') + setSearch('') + setStatusFilter(null) + setCategoryFilter([]) + setTopicFilter([]) + setDepartmentFilter(null) + setInitiatorFilter(null) + setDateFrom(null) + setDateTo(null) setPage(1) } - // 🆕 Генерация отчёта + const hasActiveFilters = + search || + statusFilter || + categoryFilter.length > 0 || + topicFilter.length > 0 || + departmentFilter || + initiatorFilter || + dateFrom || + dateTo + + // === Генерация отчёта === const handleGenerateReport = async () => { setReportLoading(true) try { const params: any = { all_access: true } - - if (reportDateFrom) { - params.date_from = dayjs(reportDateFrom).format('YYYY-MM-DD') - } - if (reportDateTo) { - params.date_to = dayjs(reportDateTo).format('YYYY-MM-DD') - } + if (reportDateFrom) params.date_from = dayjs(reportDateFrom).format('YYYY-MM-DD') + if (reportDateTo) params.date_to = dayjs(reportDateTo).format('YYYY-MM-DD') const response = await approvalsApi.downloadReport(params) - const blob = new Blob([response.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', }) - const url = window.URL.createObjectURL(blob) const link = document.createElement('a') link.href = url - const now = dayjs() - let fileName = `Согласования_${now.format('DD.MM.YYYY')}_${now.format('HH-mm')}.xlsx` - - link.setAttribute('download', fileName) + link.setAttribute( + 'download', + `Согласования_${now.format('DD.MM.YYYY')}_${now.format('HH-mm')}.xlsx` + ) document.body.appendChild(link) link.click() link.remove() @@ -171,20 +250,11 @@ export default function ApprovalsPage() { color: 'green', }) } catch (error: any) { - if (error.response?.data instanceof Blob) { - const text = await error.response.data.text() - notifications.show({ - title: 'Ошибка', - message: text || 'Не удалось сформировать отчёт', - color: 'red', - }) - } else { - notifications.show({ - title: 'Ошибка', - message: error.response?.data?.error_description || 'Не удалось сформировать отчёт', - color: 'red', - }) - } + notifications.show({ + title: 'Ошибка', + message: error.response?.data?.error_description || 'Не удалось сформировать отчёт', + color: 'red', + }) } finally { setReportLoading(false) } @@ -192,7 +262,7 @@ export default function ApprovalsPage() { return ( - {/* Заголовок и кнопка отчёта */} + {/* Заголовок */} Заявки @@ -200,7 +270,7 @@ export default function ApprovalsPage() { - {/* 🆕 Секция формирования отчёта */} + {/* Секция отчёта */} @@ -251,11 +321,29 @@ export default function ApprovalsPage() { {/* Фильтры списка */} - Фильтры списка + + + + Фильтры + + {hasActiveFilters && ( + + )} + + - + {/* Строка 1: Поиск + Статус + Инициатор */} + } value={searchInput} @@ -271,7 +359,6 @@ export default function ApprovalsPage() { ) } - style={{ flex: 1 }} /> { + setInitiatorFilter(v) + setPage(1) + }} + clearable + searchable /> - - + + {/* Строка 3: Период дат */} + + { + setDateFrom(val as Date | null) + setPage(1) + }} + clearable + maxDate={dateTo || undefined} + /> + { + setDateTo(val as Date | null) + setPage(1) + }} + clearable + minDate={dateFrom || undefined} + /> + + @@ -436,14 +585,7 @@ export default function ApprovalsPage() { {isFetching && !isLoading && ( - + )}