Updated tasks page ui
Deploy Frontend / build-and-deploy (push) Successful in 26s
Details
Deploy Frontend / build-and-deploy (push) Successful in 26s
Details
This commit is contained in:
parent
5ca93bd568
commit
86a456a296
|
|
@ -0,0 +1,60 @@
|
|||
import { ActionIcon, Box, Divider, Group, Stack, Text, ThemeIcon, Tooltip } from '@mantine/core'
|
||||
import { IconDownload, IconEye, IconFileText } from '@tabler/icons-react'
|
||||
import { formatFileSize, getMimeType, isPreviewable } from '@/lib/fileApi'
|
||||
|
||||
export interface FileItem {
|
||||
id?: number
|
||||
file_name?: string
|
||||
file_base64?: string
|
||||
}
|
||||
|
||||
interface Props {
|
||||
files: FileItem[]
|
||||
onPreview: (file: { id: number; name: string; type: string }) => void
|
||||
onDownload: (id: number, name: string) => void
|
||||
}
|
||||
|
||||
export function FileList({ files, onPreview, onDownload }: Props) {
|
||||
return (
|
||||
<Stack gap={0}>
|
||||
{files.map((file, i) => {
|
||||
const name = file.file_name || 'Без имени'
|
||||
const mime = getMimeType(name)
|
||||
const kb = file.file_base64 ? Math.round((file.file_base64.length * 3) / 4 / 1024) : 0
|
||||
return (
|
||||
<Box key={file.id ?? i}>
|
||||
{i > 0 && <Divider />}
|
||||
<Group justify="space-between" wrap="nowrap" py={8}>
|
||||
<Group gap="sm" wrap="nowrap" style={{ minWidth: 0 }}>
|
||||
<ThemeIcon variant="light" color="gray" size={32} radius="md">
|
||||
<IconFileText size={16} stroke={1.6} />
|
||||
</ThemeIcon>
|
||||
<Box style={{ minWidth: 0 }}>
|
||||
<Text size="sm" fw={500} truncate>{name}</Text>
|
||||
{kb > 0 && <Text size="xs" c="dimmed">{formatFileSize(kb)}</Text>}
|
||||
</Box>
|
||||
</Group>
|
||||
<Group gap={4} wrap="nowrap">
|
||||
{isPreviewable(mime) && (
|
||||
<Tooltip label="Предпросмотр">
|
||||
<ActionIcon
|
||||
aria-label="Предпросмотр"
|
||||
onClick={() => onPreview({ id: file.id!, name, type: mime })}
|
||||
>
|
||||
<IconEye size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip label="Скачать">
|
||||
<ActionIcon aria-label="Скачать" onClick={() => onDownload(file.id!, name)}>
|
||||
<IconDownload size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
</Group>
|
||||
</Box>
|
||||
)
|
||||
})}
|
||||
</Stack>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,285 +1,236 @@
|
|||
import { useState } from 'react'
|
||||
import {
|
||||
Paper,
|
||||
Table,
|
||||
Badge,
|
||||
Group,
|
||||
ActionIcon,
|
||||
Button,
|
||||
Text,
|
||||
Select,
|
||||
Pagination,
|
||||
Loader,
|
||||
Center,
|
||||
Tooltip,
|
||||
Box,
|
||||
Stack,
|
||||
Switch,
|
||||
} from '@mantine/core'
|
||||
import { IconEye, IconTrash, IconSearch } from '@tabler/icons-react'
|
||||
import { modals } from '@mantine/modals'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useSearchParams } from 'react-router-dom'
|
||||
import { useApprovalTasks, useDeleteApprovalTask } from '@/features/approvalTasks/hooks/useApprovalTasks'
|
||||
import { useUsers } from '@/features/users/hooks/useUsers'
|
||||
import { TASK_STATUSES, STATUS_COLORS, STATUS_LABELS } from '@/features/approvalTasks/const'
|
||||
import ApprovalTaskDetailsModal from './components/ApprovalTaskDetailsModal'
|
||||
import { ActionIcon, Avatar, Group, Select, Stack, Switch, Text, Tooltip } from '@mantine/core'
|
||||
import { IconPaperclip, IconTrash } from '@tabler/icons-react'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
import { useApprovalTasks, useDeleteApprovalTask } from '@/features/approvalTasks/hooks/useApprovalTasks'
|
||||
import { useUsers } from '@/features/users/hooks/useUsers'
|
||||
import { formatMsk } from '@/utils/date'
|
||||
|
||||
import { PageHeader } from '@/components/ui/PageHeader'
|
||||
import { FilterBar } from '@/components/ui/FilterBar'
|
||||
import { DataTable, type Column } from '@/components/ui/DataTable'
|
||||
import { StatusBadge } from '@/components/ui/StatusBadge'
|
||||
import { ConfirmModal } from '@/components/ui/ConfirmModal'
|
||||
import { TASK_STATUS } from '@/components/ui/statuses'
|
||||
import ApprovalTaskDetailsDrawer from './components/ApprovalTaskDetailsDrawer'
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
const LIMIT = 20
|
||||
|
||||
type Row = NonNullable<NonNullable<ReturnType<typeof useApprovalTasks>['data']>['data']>[number]
|
||||
|
||||
interface Filters {
|
||||
status: string | null
|
||||
executor: string | null
|
||||
requireFile: boolean
|
||||
}
|
||||
|
||||
const STATUS_OPTIONS = Object.entries(TASK_STATUS).map(([value, m]) => ({ value, label: m.label }))
|
||||
const VALID_STATUSES = new Set(STATUS_OPTIONS.map((o) => o.value))
|
||||
|
||||
export default function ApprovalTasksPage() {
|
||||
// 🆕 Начальный статус берём из URL (например, с дашборда:
|
||||
// /approval-tasks?status=completed) — читаем один раз при монтировании.
|
||||
// Начальный статус берём из URL (например, с дашборда: /approval-tasks?status=completed).
|
||||
// Читаем один раз при монтировании.
|
||||
const [searchParams] = useSearchParams()
|
||||
|
||||
const [page, setPage] = useState(1)
|
||||
const [statusFilter, setStatusFilter] = useState<string | null>(
|
||||
() => searchParams.get('status')
|
||||
)
|
||||
const [executorFilter, setExecutorFilter] = useState<string | null>(null)
|
||||
const [requireFileFilter, setRequireFileFilter] = useState<boolean | null>(null)
|
||||
const [selectedTaskId, setSelectedTaskId] = useState<number | null>(null)
|
||||
const [filters, setFilters] = useState<Filters>(() => {
|
||||
const status = searchParams.get('status')
|
||||
return { status: status && VALID_STATUSES.has(status) ? status : null, executor: null, requireFile: false }
|
||||
})
|
||||
|
||||
// Drawer: id храним отдельно от opened, чтобы содержимое не мигало при закрытии
|
||||
const [drawerId, setDrawerId] = useState<number | null>(null)
|
||||
const [drawerOpened, setDrawerOpened] = useState(false)
|
||||
const [deleteId, setDeleteId] = useState<number | null>(null)
|
||||
|
||||
const update = (patch: Partial<Filters>) => {
|
||||
setFilters((prev) => ({ ...prev, ...patch }))
|
||||
setPage(1)
|
||||
}
|
||||
|
||||
const { data, isLoading, isFetching } = useApprovalTasks({
|
||||
offset: (page - 1) * LIMIT,
|
||||
limit: LIMIT,
|
||||
...(statusFilter && { status: statusFilter }),
|
||||
...(executorFilter && { executor_id: Number(executorFilter) }),
|
||||
...(requireFileFilter !== null && { require_file: requireFileFilter }),
|
||||
...(filters.status && { status: filters.status }),
|
||||
...(filters.executor && { executor_id: Number(filters.executor) }),
|
||||
...(filters.requireFile && { require_file: true }),
|
||||
})
|
||||
const total = data?.total_count ?? 0
|
||||
|
||||
const { data: users } = useUsers({ limit: 1000 })
|
||||
const deleteTask = useDeleteApprovalTask()
|
||||
|
||||
const totalPages = data?.total_count ? Math.ceil(data.total_count / LIMIT) : 1
|
||||
const executorOptions = useMemo(
|
||||
() => (users?.data ?? []).map((u) => ({ value: String(u.id), label: u.full_name || '' })),
|
||||
[users],
|
||||
)
|
||||
|
||||
const executorOptions = users?.data?.map((u) => ({
|
||||
value: String(u.id),
|
||||
label: u.full_name || '',
|
||||
})) || []
|
||||
|
||||
const handleDelete = (id: number) => {
|
||||
modals.openConfirmModal({
|
||||
title: 'Подтвердите удаление',
|
||||
children: (
|
||||
<Text size="sm">
|
||||
Вы уверены, что хотите удалить эту задачу? Это действие нельзя отменить.
|
||||
</Text>
|
||||
),
|
||||
labels: { confirm: 'Удалить', cancel: 'Отмена' },
|
||||
confirmProps: { color: 'red' },
|
||||
onConfirm: () => deleteTask.mutate(id),
|
||||
})
|
||||
const activeCount = [filters.status, filters.executor, filters.requireFile].filter(Boolean).length
|
||||
const resetFilters = () => {
|
||||
setFilters({ status: null, executor: null, requireFile: false })
|
||||
setPage(1)
|
||||
}
|
||||
|
||||
return (
|
||||
<Stack gap="md">
|
||||
<Group justify="space-between">
|
||||
<Text size="xl" fw={700}>Задачи по заявкам</Text>
|
||||
<Text c="dimmed" size="sm">
|
||||
Всего: {data?.total_count || 0}
|
||||
</Text>
|
||||
</Group>
|
||||
|
||||
{/* Фильтры */}
|
||||
<Paper withBorder p="md">
|
||||
<Group gap="md" align="flex-end">
|
||||
<Select
|
||||
label="Статус"
|
||||
placeholder="Все статусы"
|
||||
data={TASK_STATUSES.map((s) => ({ value: s.value, label: s.label }))}
|
||||
value={statusFilter}
|
||||
onChange={(v) => {
|
||||
setStatusFilter(v)
|
||||
setPage(1)
|
||||
}}
|
||||
clearable
|
||||
style={{ minWidth: 180 }}
|
||||
/>
|
||||
|
||||
<Select
|
||||
label="Исполнитель"
|
||||
placeholder="Все исполнители"
|
||||
data={executorOptions}
|
||||
value={executorFilter}
|
||||
onChange={(v) => {
|
||||
setExecutorFilter(v)
|
||||
setPage(1)
|
||||
}}
|
||||
clearable
|
||||
searchable
|
||||
style={{ minWidth: 200 }}
|
||||
/>
|
||||
|
||||
<Switch
|
||||
label="Требуют файл"
|
||||
checked={requireFileFilter === true}
|
||||
onChange={(e) => {
|
||||
setRequireFileFilter(e.currentTarget.checked ? true : null)
|
||||
setPage(1)
|
||||
}}
|
||||
/>
|
||||
const columns: Column<Row>[] = [
|
||||
{
|
||||
key: 'id',
|
||||
header: 'ID',
|
||||
width: 80,
|
||||
cell: (r) => <Text size="sm" fw={500}>#{r.id}</Text>,
|
||||
},
|
||||
{
|
||||
key: 'task',
|
||||
header: 'Задача',
|
||||
cell: (r) => (
|
||||
<Group gap={6} wrap="nowrap" align="flex-start">
|
||||
<Text size="sm" lineClamp={2} style={{ flex: 1, minWidth: 0 }}>{r.task_text || '—'}</Text>
|
||||
{r.require_file && (
|
||||
<Tooltip label="Нужен файл">
|
||||
<IconPaperclip size={14} style={{ flexShrink: 0, marginTop: 3, opacity: 0.55 }} />
|
||||
</Tooltip>
|
||||
)}
|
||||
</Group>
|
||||
</Paper>
|
||||
|
||||
{/* Таблица */}
|
||||
<Paper withBorder>
|
||||
{isLoading ? (
|
||||
<Center p={60}>
|
||||
<Loader />
|
||||
</Center>
|
||||
),
|
||||
},
|
||||
{
|
||||
key: 'approval',
|
||||
header: 'Заявка',
|
||||
width: 220,
|
||||
cell: (r) => (
|
||||
<Stack gap={0} miw={0}>
|
||||
<Text size="sm" lineClamp={1}>{r.approval?.topic?.name || '—'}</Text>
|
||||
<Text size="xs" c="dimmed">#{r.approval_id} · шаг {r.step_order}</Text>
|
||||
</Stack>
|
||||
),
|
||||
},
|
||||
{
|
||||
key: 'executor',
|
||||
header: 'Исполнитель',
|
||||
width: 220,
|
||||
cell: (r) =>
|
||||
r.executor?.full_name ? (
|
||||
<Group gap="xs" wrap="nowrap">
|
||||
<Avatar size={24} radius="xl" color="initials" name={r.executor.full_name} />
|
||||
<Stack gap={0} miw={0}>
|
||||
<Text size="sm" truncate>{r.executor.full_name}</Text>
|
||||
{r.executor.department?.name && (
|
||||
<Text size="xs" c="dimmed" truncate>{r.executor.department.name}</Text>
|
||||
)}
|
||||
</Stack>
|
||||
</Group>
|
||||
) : (
|
||||
<>
|
||||
<Table striped highlightOnHover>
|
||||
<Table.Thead>
|
||||
<Table.Tr>
|
||||
<Table.Th style={{ width: 60 }}>ID</Table.Th>
|
||||
<Table.Th>Заявка</Table.Th>
|
||||
<Table.Th>Исполнитель</Table.Th>
|
||||
<Table.Th>Текст задачи</Table.Th>
|
||||
<Table.Th style={{ width: 80 }}>Шаг</Table.Th>
|
||||
<Table.Th style={{ width: 120 }}>Статус</Table.Th>
|
||||
<Table.Th style={{ width: 80 }}>Файл</Table.Th>
|
||||
<Table.Th>Создана</Table.Th>
|
||||
<Table.Th>Выполнена</Table.Th>
|
||||
<Table.Th style={{ width: 100 }}>Действия</Table.Th>
|
||||
</Table.Tr>
|
||||
</Table.Thead>
|
||||
<Table.Tbody>
|
||||
{data?.data?.length === 0 ? (
|
||||
<Table.Tr>
|
||||
<Table.Td colSpan={10}>
|
||||
<Center p={40}>
|
||||
<Text c="dimmed">Задачи не найдены</Text>
|
||||
</Center>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
) : (
|
||||
(data?.data || []).map((task) => (
|
||||
<Table.Tr key={task.id}>
|
||||
<Table.Td>
|
||||
<Text fw={500}>#{task.id}</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Stack gap={0}>
|
||||
<Text size="xs" c="dimmed">
|
||||
#{task.approval_id}
|
||||
</Text>
|
||||
<Text size="sm" lineClamp={1}>
|
||||
{task.approval?.topic?.name || '—'}
|
||||
</Text>
|
||||
</Stack>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm">
|
||||
{task.executor?.full_name || '—'}
|
||||
</Text>
|
||||
<Text size="xs" c="dimmed">
|
||||
{task.executor?.department?.name}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="sm" lineClamp={2}>
|
||||
{task.task_text || '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Badge variant="light" color="gray">
|
||||
#{task.step_order}
|
||||
</Badge>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Badge
|
||||
color={STATUS_COLORS[task.status || ''] || 'gray'}
|
||||
variant={task.status === 'completed' ? 'filled' : 'light'}
|
||||
>
|
||||
{STATUS_LABELS[task.status || ''] || task.status}
|
||||
</Badge>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
{task.require_file ? (
|
||||
<Badge size="xs" color="violet" variant="light">
|
||||
Да
|
||||
</Badge>
|
||||
) : (
|
||||
<Text size="xs" c="dimmed">—</Text>
|
||||
)}
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="xs" c="dimmed">
|
||||
{task.created_at
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Text size="xs" c="dimmed">
|
||||
{task.completed_at
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Group gap="xs">
|
||||
<Tooltip label="Просмотреть">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="blue"
|
||||
onClick={() => setSelectedTaskId(task.id!)}
|
||||
>
|
||||
<IconEye size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label="Удалить">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="red"
|
||||
onClick={() => handleDelete(task.id!)}
|
||||
>
|
||||
<IconTrash size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
</Table.Td>
|
||||
</Table.Tr>
|
||||
))
|
||||
)}
|
||||
</Table.Tbody>
|
||||
</Table>
|
||||
<Text size="sm" c="dimmed">—</Text>
|
||||
),
|
||||
},
|
||||
{
|
||||
key: 'status',
|
||||
header: 'Статус',
|
||||
width: 150,
|
||||
cell: (r) => <StatusBadge kind="task" status={r.status || ''} />,
|
||||
},
|
||||
{
|
||||
key: 'created',
|
||||
header: 'Создана',
|
||||
width: 150,
|
||||
cell: (r) => <Text size="sm" c="dimmed">{r.created_at ? formatMsk(r.created_at) : '—'}</Text>,
|
||||
},
|
||||
{
|
||||
key: 'completed',
|
||||
header: 'Выполнена',
|
||||
width: 150,
|
||||
cell: (r) => <Text size="sm" c="dimmed">{r.completed_at ? formatMsk(r.completed_at) : '—'}</Text>,
|
||||
},
|
||||
{
|
||||
key: 'actions',
|
||||
header: '',
|
||||
width: 56,
|
||||
align: 'right',
|
||||
cell: (r) => (
|
||||
<Tooltip label="Удалить">
|
||||
<ActionIcon
|
||||
color="red"
|
||||
aria-label="Удалить задачу"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation() // не открывать drawer
|
||||
setDeleteId(r.id!)
|
||||
}}
|
||||
>
|
||||
<IconTrash size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
),
|
||||
},
|
||||
]
|
||||
|
||||
{totalPages > 1 && (
|
||||
<Box p="md" style={{ borderTop: '1px solid var(--mantine-color-gray-3)' }}>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">
|
||||
Страница {page} из {totalPages}
|
||||
</Text>
|
||||
<Pagination
|
||||
value={page}
|
||||
onChange={setPage}
|
||||
total={totalPages}
|
||||
withEdges
|
||||
/>
|
||||
</Group>
|
||||
</Box>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</Paper>
|
||||
return (
|
||||
<Stack gap="lg">
|
||||
<PageHeader title="Задачи" description={isLoading ? undefined : `Всего: ${total}`} />
|
||||
|
||||
{isFetching && !isLoading && (
|
||||
<Box style={{ position: 'fixed', top: 70, right: 20, zIndex: 1000 }}>
|
||||
<Loader size="xs" />
|
||||
</Box>
|
||||
)}
|
||||
<FilterBar activeCount={activeCount} onReset={resetFilters}>
|
||||
<Select
|
||||
placeholder="Статус"
|
||||
data={STATUS_OPTIONS}
|
||||
value={filters.status}
|
||||
onChange={(status) => update({ status })}
|
||||
clearable
|
||||
w={180}
|
||||
/>
|
||||
<Select
|
||||
placeholder="Исполнитель"
|
||||
data={executorOptions}
|
||||
value={filters.executor}
|
||||
onChange={(executor) => update({ executor })}
|
||||
searchable
|
||||
clearable
|
||||
w={220}
|
||||
/>
|
||||
<Switch
|
||||
label="Нужен файл"
|
||||
checked={filters.requireFile}
|
||||
onChange={(e) => update({ requireFile: e.currentTarget.checked })}
|
||||
/>
|
||||
</FilterBar>
|
||||
|
||||
<ApprovalTaskDetailsModal
|
||||
taskId={selectedTaskId}
|
||||
opened={selectedTaskId !== null}
|
||||
onClose={() => setSelectedTaskId(null)}
|
||||
<DataTable<Row>
|
||||
columns={columns}
|
||||
rows={data?.data ?? []}
|
||||
getRowId={(r) => r.id!}
|
||||
loading={isLoading}
|
||||
refreshing={isFetching}
|
||||
minWidth={1000}
|
||||
onRowClick={(r) => {
|
||||
setDrawerId(r.id!)
|
||||
setDrawerOpened(true)
|
||||
}}
|
||||
empty={{
|
||||
title: 'Задачи не найдены',
|
||||
description: activeCount > 0 ? 'Измените или сбросьте фильтры' : undefined,
|
||||
}}
|
||||
pagination={{ page, pageSize: LIMIT, total, onChange: setPage }}
|
||||
/>
|
||||
|
||||
<ApprovalTaskDetailsDrawer
|
||||
taskId={drawerId}
|
||||
opened={drawerOpened}
|
||||
onClose={() => setDrawerOpened(false)}
|
||||
/>
|
||||
|
||||
<ConfirmModal
|
||||
opened={deleteId !== null}
|
||||
onClose={() => setDeleteId(null)}
|
||||
onConfirm={() => {
|
||||
if (deleteId !== null) deleteTask.mutate(deleteId, { onSettled: () => setDeleteId(null) })
|
||||
}}
|
||||
title="Удалить задачу?"
|
||||
message={`Задача #${deleteId} будет удалена без возможности восстановления.`}
|
||||
confirmLabel="Удалить"
|
||||
danger
|
||||
loading={deleteTask.isPending}
|
||||
/>
|
||||
</Stack>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,211 @@
|
|||
import { useEffect, useState } from 'react'
|
||||
import { Avatar, Box, Button, Drawer, Group, Select, Skeleton, Stack, Text } from '@mantine/core'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import { IconPaperclip } from '@tabler/icons-react'
|
||||
|
||||
import { useApprovalTask, useUpdateApprovalTask } from '@/features/approvalTasks/hooks/useApprovalTasks'
|
||||
import { TASK_STATUSES } from '@/features/approvalTasks/const'
|
||||
import { StatusBadge } from '@/components/ui/StatusBadge'
|
||||
import { InfoList, InfoRow } from '@/components/ui/InfoRow'
|
||||
import { FileList } from '@/components/ui/FileList'
|
||||
import { saveFile, taskFileUrl } from '@/lib/fileApi'
|
||||
import { formatMsk } from '@/utils/date'
|
||||
import FilePreviewModal from '@/pages/approvals/components/FilePreviewModal'
|
||||
import classes from '@/components/UserDrawer.module.css'
|
||||
|
||||
interface Props {
|
||||
taskId: number | null
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
function Section({ title, count, children }: { title: string; count?: number; children: React.ReactNode }) {
|
||||
return (
|
||||
<Box>
|
||||
<Group gap={6} mb="xs">
|
||||
<Text size="sm" fw={600}>{title}</Text>
|
||||
{count !== undefined && <Text size="xs" c="dimmed">{count}</Text>}
|
||||
</Group>
|
||||
{children}
|
||||
</Box>
|
||||
)
|
||||
}
|
||||
|
||||
export default function ApprovalTaskDetailsDrawer({ taskId, opened, onClose }: Props) {
|
||||
const { data: task, isLoading } = useApprovalTask(taskId)
|
||||
const updateTask = useUpdateApprovalTask()
|
||||
|
||||
const [status, setStatus] = useState<string | null>(null)
|
||||
const [preview, setPreview] = useState<{ id: number; name: string; type: string } | null>(null)
|
||||
|
||||
// Выбранный статус синхронизируем с данными задачи
|
||||
useEffect(() => {
|
||||
setStatus(task?.status ?? null)
|
||||
}, [task?.id, task?.status])
|
||||
|
||||
useEffect(() => {
|
||||
if (!opened) setPreview(null)
|
||||
}, [opened])
|
||||
|
||||
const dirty = !!task && !!status && status !== task.status
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!task?.id || !status) return
|
||||
await updateTask.mutateAsync({ id: task.id, status })
|
||||
onClose()
|
||||
}
|
||||
|
||||
const handleDownload = async (fileId: number, fileName: string) => {
|
||||
if (!taskId) return
|
||||
try {
|
||||
await saveFile(taskFileUrl(taskId, fileId, true), fileName)
|
||||
notifications.show({ title: 'Готово', message: 'Файл скачан', color: 'green' })
|
||||
} catch (error) {
|
||||
console.error('Download error:', error)
|
||||
notifications.show({ title: 'Ошибка', message: 'Не удалось скачать файл', color: 'red' })
|
||||
}
|
||||
}
|
||||
|
||||
const files = task?.files ?? []
|
||||
|
||||
return (
|
||||
<>
|
||||
<Drawer.Root opened={opened} onClose={onClose} position="right" size="min(560px, 100vw)">
|
||||
<Drawer.Overlay backgroundOpacity={0.25} />
|
||||
<Drawer.Content>
|
||||
<Drawer.Header>
|
||||
<Box style={{ minWidth: 0 }}>
|
||||
<Group gap="sm" wrap="nowrap">
|
||||
<Text fw={600}>Задача #{taskId}</Text>
|
||||
{task && <StatusBadge kind="task" status={task.status || ''} />}
|
||||
</Group>
|
||||
{task && (
|
||||
<Text size="xs" c="dimmed" truncate>
|
||||
Заявка #{task.approval_id}
|
||||
{task.approval?.topic?.name && ` · ${task.approval.topic.name}`}
|
||||
</Text>
|
||||
)}
|
||||
</Box>
|
||||
<Drawer.CloseButton />
|
||||
</Drawer.Header>
|
||||
|
||||
<Drawer.Body className={classes.body}>
|
||||
{isLoading ? (
|
||||
<Stack className={classes.section} gap="md">
|
||||
<Skeleton h={160} />
|
||||
<Skeleton h={80} />
|
||||
<Skeleton h={120} />
|
||||
</Stack>
|
||||
) : !task ? (
|
||||
<Text className={classes.section} size="sm" c="dimmed">Задача не найдена</Text>
|
||||
) : (
|
||||
<>
|
||||
<Stack className={classes.section} gap="xl">
|
||||
<Section title="Текст задачи">
|
||||
<Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>{task.task_text || '—'}</Text>
|
||||
{task.require_file && (
|
||||
<Group gap={6} mt="xs" c="dimmed">
|
||||
<IconPaperclip size={14} />
|
||||
<Text size="xs" c="dimmed">Для выполнения нужен файл</Text>
|
||||
</Group>
|
||||
)}
|
||||
</Section>
|
||||
|
||||
<InfoList>
|
||||
<InfoRow label="Исполнитель">
|
||||
{task.executor?.full_name ? (
|
||||
<>
|
||||
<Avatar size={22} radius="xl" color="initials" name={task.executor.full_name} />
|
||||
<Text size="sm">{task.executor.full_name}</Text>
|
||||
</>
|
||||
) : (
|
||||
<Text size="sm">—</Text>
|
||||
)}
|
||||
</InfoRow>
|
||||
{task.executor?.department?.name && (
|
||||
<InfoRow label="Отдел">
|
||||
<Text size="sm">{task.executor.department.name}</Text>
|
||||
</InfoRow>
|
||||
)}
|
||||
<InfoRow label="Шаг">
|
||||
<Text size="sm">{task.step_order}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Создана (МСК)">
|
||||
<Text size="sm">{task.created_at ? formatMsk(task.created_at) : '—'}</Text>
|
||||
</InfoRow>
|
||||
{task.updated_at && (
|
||||
<InfoRow label="Обновлена (МСК)">
|
||||
<Text size="sm">{formatMsk(task.updated_at)}</Text>
|
||||
</InfoRow>
|
||||
)}
|
||||
{task.completed_at && (
|
||||
<InfoRow label="Выполнена (МСК)">
|
||||
<Text size="sm">{formatMsk(task.completed_at)}</Text>
|
||||
</InfoRow>
|
||||
)}
|
||||
</InfoList>
|
||||
|
||||
{files.length > 0 && (
|
||||
<Section title="Файлы" count={files.length}>
|
||||
<FileList files={files} onPreview={setPreview} onDownload={handleDownload} />
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{task.approval && (
|
||||
<Section title="Связанная заявка">
|
||||
<InfoList>
|
||||
<InfoRow label="Заявка">
|
||||
<Text size="sm" fw={500}>#{task.approval.id}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Тема">
|
||||
<Text size="sm">{task.approval.topic?.name || '—'}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Инициатор">
|
||||
<Text size="sm">{task.approval.initiator?.full_name || '—'}</Text>
|
||||
</InfoRow>
|
||||
<InfoRow label="Статус">
|
||||
<StatusBadge kind="approval" status={task.approval.status || ''} size="sm" />
|
||||
</InfoRow>
|
||||
</InfoList>
|
||||
</Section>
|
||||
)}
|
||||
</Stack>
|
||||
|
||||
<Group className={classes.footer} justify="space-between" wrap="nowrap">
|
||||
<Select
|
||||
aria-label="Статус задачи"
|
||||
placeholder="Статус"
|
||||
data={TASK_STATUSES.map((s) => ({ value: s.value, label: s.label }))}
|
||||
value={status}
|
||||
onChange={setStatus}
|
||||
allowDeselect={false}
|
||||
w={200}
|
||||
/>
|
||||
<Group gap="xs" wrap="nowrap">
|
||||
<Button variant="default" onClick={onClose} disabled={updateTask.isPending}>
|
||||
Закрыть
|
||||
</Button>
|
||||
<Button onClick={handleSave} loading={updateTask.isPending} disabled={!dirty}>
|
||||
Сохранить
|
||||
</Button>
|
||||
</Group>
|
||||
</Group>
|
||||
</>
|
||||
)}
|
||||
</Drawer.Body>
|
||||
</Drawer.Content>
|
||||
</Drawer.Root>
|
||||
|
||||
{preview && taskId && (
|
||||
<FilePreviewModal
|
||||
taskId={taskId}
|
||||
fileId={preview.id}
|
||||
fileName={preview.name}
|
||||
fileType={preview.type}
|
||||
opened
|
||||
onClose={() => setPreview(null)}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,398 +0,0 @@
|
|||
import { useState } from 'react'
|
||||
import {
|
||||
Modal,
|
||||
Stack,
|
||||
Text,
|
||||
Group,
|
||||
Badge,
|
||||
Paper,
|
||||
Loader,
|
||||
Center,
|
||||
ScrollArea,
|
||||
Select,
|
||||
Button,
|
||||
Box,
|
||||
ActionIcon,
|
||||
Tooltip,
|
||||
} from '@mantine/core'
|
||||
import { useForm } from '@mantine/form'
|
||||
import { notifications } from '@mantine/notifications'
|
||||
import {
|
||||
IconUser,
|
||||
IconBuilding,
|
||||
IconCalendar,
|
||||
IconFileText,
|
||||
IconCheck,
|
||||
IconEye,
|
||||
IconDownload,
|
||||
} from '@tabler/icons-react'
|
||||
import { useApprovalTask, useUpdateApprovalTask } from '@/features/approvalTasks/hooks/useApprovalTasks'
|
||||
import { TASK_STATUSES, STATUS_COLORS, STATUS_LABELS } from '@/features/approvalTasks/const'
|
||||
import FilePreviewModal from '@/pages/approvals/components/FilePreviewModal'
|
||||
import dayjs from 'dayjs'
|
||||
import 'dayjs/locale/ru'
|
||||
import {formatMsk} from "@/utils/date.ts";
|
||||
|
||||
dayjs.locale('ru')
|
||||
|
||||
interface ApprovalTaskDetailsModalProps {
|
||||
taskId: number | null
|
||||
opened: boolean
|
||||
onClose: () => void
|
||||
}
|
||||
|
||||
// Определение MIME типа по расширению
|
||||
const getMimeType = (fileName: string): string => {
|
||||
const ext = fileName.split('.').pop()?.toLowerCase() || ''
|
||||
const mimeTypes: Record<string, string> = {
|
||||
'jpg': 'image/jpeg', 'jpeg': 'image/jpeg', 'png': 'image/png',
|
||||
'gif': 'image/gif', 'webp': 'image/webp', 'svg': 'image/svg+xml',
|
||||
'pdf': 'application/pdf', 'txt': 'text/plain',
|
||||
'doc': 'application/msword',
|
||||
'docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||
'xls': 'application/vnd.ms-excel',
|
||||
'xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
}
|
||||
return mimeTypes[ext] || 'application/octet-stream'
|
||||
}
|
||||
|
||||
const PREVIEWABLE_TYPES = [
|
||||
'image/jpeg', 'image/png', 'image/gif', 'image/webp',
|
||||
'image/svg+xml', 'application/pdf', 'text/plain',
|
||||
]
|
||||
|
||||
export default function ApprovalTaskDetailsModal({
|
||||
taskId,
|
||||
opened,
|
||||
onClose
|
||||
}: ApprovalTaskDetailsModalProps) {
|
||||
const { data: task, isLoading } = useApprovalTask(taskId)
|
||||
const updateTask = useUpdateApprovalTask()
|
||||
|
||||
// Состояние для предпросмотра файла
|
||||
const [previewFileId, setPreviewFileId] = useState<number | null>(null)
|
||||
const [previewFileName, setPreviewFileName] = useState('')
|
||||
const [previewFileType, setPreviewFileType] = useState('')
|
||||
|
||||
const form = useForm({
|
||||
initialValues: {
|
||||
status: '',
|
||||
},
|
||||
})
|
||||
|
||||
const handleFilePreview = (fileId: number, fileName: string) => {
|
||||
setPreviewFileId(fileId)
|
||||
setPreviewFileName(fileName)
|
||||
setPreviewFileType(getMimeType(fileName))
|
||||
}
|
||||
|
||||
const handleFileDownload = async (fileId: number, fileName: string) => {
|
||||
try {
|
||||
const token = localStorage.getItem('token')
|
||||
const timestamp = Math.floor(Date.now() / 1000).toString()
|
||||
const publicKey = import.meta.env.VITE_API_PUBLIC_KEY
|
||||
const privateKey = import.meta.env.VITE_API_PRIVATE_KEY
|
||||
const message = publicKey + ':' + timestamp
|
||||
const CryptoJS = await import('crypto-js')
|
||||
const signature = CryptoJS.HmacSHA256(message, privateKey).toString(CryptoJS.enc.Hex)
|
||||
const deviceId = localStorage.getItem('device_id') || 'admin-panel'
|
||||
|
||||
// 🆕 Используем URL для задач
|
||||
const url = `/api/approval-tasks/${taskId}/files/${fileId}/download`
|
||||
|
||||
const response = await fetch(url, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Authorization': `Bearer ${token}`,
|
||||
'ApiKey': signature,
|
||||
'X-Timestamp': timestamp,
|
||||
'x-device-id': deviceId,
|
||||
},
|
||||
})
|
||||
|
||||
if (!response.ok) throw new Error('Failed to download file')
|
||||
|
||||
const blob = await response.blob()
|
||||
const blobUrl = window.URL.createObjectURL(blob)
|
||||
const link = document.createElement('a')
|
||||
link.href = blobUrl
|
||||
link.download = fileName
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
link.remove()
|
||||
window.URL.revokeObjectURL(blobUrl)
|
||||
|
||||
notifications.show({
|
||||
title: 'Успешно',
|
||||
message: 'Файл скачан',
|
||||
color: 'green',
|
||||
})
|
||||
} catch (error) {
|
||||
notifications.show({
|
||||
title: 'Ошибка',
|
||||
message: 'Не удалось скачать файл',
|
||||
color: 'red',
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const handleSubmit = async (values: typeof form.values) => {
|
||||
if (!task?.id) return
|
||||
await updateTask.mutateAsync({
|
||||
id: task.id,
|
||||
status: values.status,
|
||||
})
|
||||
onClose()
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={
|
||||
<Group>
|
||||
<Text fw={700}>Задача #{taskId}</Text>
|
||||
{task && (
|
||||
<Badge color={STATUS_COLORS[task.status || ''] || 'gray'}>
|
||||
{STATUS_LABELS[task.status || ''] || task.status}
|
||||
</Badge>
|
||||
)}
|
||||
</Group>
|
||||
}
|
||||
size="xl"
|
||||
styles={{
|
||||
body: {
|
||||
height: 'calc(80vh - 120px)',
|
||||
padding: 0,
|
||||
},
|
||||
}}
|
||||
>
|
||||
{isLoading ? (
|
||||
<Center p={40}>
|
||||
<Loader />
|
||||
</Center>
|
||||
) : task ? (
|
||||
<ScrollArea
|
||||
style={{ height: 'calc(80vh - 120px)' }}
|
||||
offsetScrollbars
|
||||
>
|
||||
<Box p="md">
|
||||
<Stack gap="md">
|
||||
{/* Информация о задаче */}
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Информация о задаче</Text>
|
||||
<Stack gap="sm">
|
||||
<Text size="sm" c="dimmed">Текст задачи:</Text>
|
||||
<Text size="sm" style={{ whiteSpace: 'pre-wrap' }}>
|
||||
{task.task_text || '—'}
|
||||
</Text>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Шаг:</Text>
|
||||
<Badge variant="light">#{task.step_order}</Badge>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Требует файл:</Text>
|
||||
<Badge color={task.require_file ? 'violet' : 'gray'} variant="light">
|
||||
{task.require_file ? 'Да' : 'Нет'}
|
||||
</Badge>
|
||||
</Group>
|
||||
</Stack>
|
||||
</Paper>
|
||||
|
||||
{/* 🆕 Прикреплённые файлы */}
|
||||
{task.files && task.files.length > 0 && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Прикреплённые файлы</Text>
|
||||
<Stack gap="xs">
|
||||
{task.files.map((file) => {
|
||||
const mimeType = getMimeType(file.file_name || '')
|
||||
const canPreview = PREVIEWABLE_TYPES.includes(mimeType)
|
||||
const fileSizeKB = file.file_base64
|
||||
? Math.round((file.file_base64.length * 3 / 4) / 1024)
|
||||
: 0
|
||||
|
||||
return (
|
||||
<Paper key={file.id} withBorder p="sm">
|
||||
<Group justify="space-between">
|
||||
<Group gap="sm">
|
||||
<IconFileText size={20} color="blue" />
|
||||
<Stack gap={0}>
|
||||
<Text size="sm" fw={500}>
|
||||
{file.file_name || 'Без имени'}
|
||||
</Text>
|
||||
{fileSizeKB > 0 && (
|
||||
<Text size="xs" c="dimmed">
|
||||
{fileSizeKB} KB
|
||||
</Text>
|
||||
)}
|
||||
</Stack>
|
||||
</Group>
|
||||
<Group gap="xs">
|
||||
{canPreview && (
|
||||
<Tooltip label="Предпросмотр">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="blue"
|
||||
onClick={() => handleFilePreview(file.id!, file.file_name || '')}
|
||||
>
|
||||
<IconEye size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
)}
|
||||
<Tooltip label="Скачать">
|
||||
<ActionIcon
|
||||
variant="light"
|
||||
color="green"
|
||||
onClick={() => handleFileDownload(file.id!, file.file_name || '')}
|
||||
>
|
||||
<IconDownload size={16} />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
</Group>
|
||||
</Paper>
|
||||
)
|
||||
})}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Связанная заявка */}
|
||||
{task.approval && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Связанная заявка</Text>
|
||||
<Stack gap="sm">
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">ID заявки:</Text>
|
||||
<Text fw={500}>#{task.approval.id}</Text>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Тема:</Text>
|
||||
<Text>{task.approval.topic?.name || '—'}</Text>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Инициатор:</Text>
|
||||
<Group gap="xs">
|
||||
<IconUser size={16} />
|
||||
<Text>{task.approval.initiator?.full_name || '—'}</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Статус заявки:</Text>
|
||||
<Badge>{task.approval.status}</Badge>
|
||||
</Group>
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Исполнитель */}
|
||||
{task.executor && (
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Исполнитель</Text>
|
||||
<Stack gap="sm">
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Имя:</Text>
|
||||
<Group gap="xs">
|
||||
<IconUser size={16} />
|
||||
<Text fw={500}>{task.executor.full_name}</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
{task.executor.department && (
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Отдел:</Text>
|
||||
<Group gap="xs">
|
||||
<IconBuilding size={16} />
|
||||
<Text>{task.executor.department.name}</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
)}
|
||||
</Stack>
|
||||
</Paper>
|
||||
)}
|
||||
|
||||
{/* Даты */}
|
||||
<Paper withBorder p="md">
|
||||
<Text size="sm" c="dimmed" mb="xs">Временные метки</Text>
|
||||
<Stack gap="sm">
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Создана:</Text>
|
||||
<Group gap="xs">
|
||||
<IconCalendar size={16} />
|
||||
<Text>
|
||||
{task.created_at
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Обновлена:</Text>
|
||||
<Text>
|
||||
{task.updated_at
|
||||
? formatMsk(task.created_at)
|
||||
: '—'}
|
||||
</Text>
|
||||
</Group>
|
||||
{task.completed_at && (
|
||||
<Group justify="space-between">
|
||||
<Text size="sm" c="dimmed">Выполнена:</Text>
|
||||
<Group gap="xs">
|
||||
<IconCheck size={16} color="green" />
|
||||
<Text c="green">
|
||||
{formatMsk(task.created_at)}
|
||||
</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
)}
|
||||
</Stack>
|
||||
</Paper>
|
||||
|
||||
{/* Форма обновления статуса */}
|
||||
<Paper withBorder p="md" bg="blue.0">
|
||||
<Text size="sm" fw={600} mb="sm">Изменить статус</Text>
|
||||
<form onSubmit={form.onSubmit(handleSubmit)}>
|
||||
<Stack gap="md">
|
||||
<Select
|
||||
label="Новый статус"
|
||||
placeholder="Выберите статус"
|
||||
data={TASK_STATUSES.map((s) => ({ value: s.value, label: s.label }))}
|
||||
value={form.values.status || task.status}
|
||||
onChange={(v) => form.setFieldValue('status', v || '')}
|
||||
required
|
||||
/>
|
||||
<Group justify="flex-end">
|
||||
<Button
|
||||
type="submit"
|
||||
loading={updateTask.isPending}
|
||||
leftSection={<IconCheck size={16} />}
|
||||
>
|
||||
Обновить статус
|
||||
</Button>
|
||||
</Group>
|
||||
</Stack>
|
||||
</form>
|
||||
</Paper>
|
||||
</Stack>
|
||||
</Box>
|
||||
</ScrollArea>
|
||||
) : (
|
||||
<Center p={40}>
|
||||
<Text c="dimmed">Задача не найдена</Text>
|
||||
</Center>
|
||||
)}
|
||||
</Modal>
|
||||
|
||||
{previewFileId && taskId && (
|
||||
<FilePreviewModal
|
||||
taskId={taskId}
|
||||
fileId={previewFileId}
|
||||
fileName={previewFileName}
|
||||
fileType={previewFileType}
|
||||
opened={!!previewFileId}
|
||||
onClose={() => setPreviewFileId(null)}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
Loading…
Reference in New Issue