Add znzt module
Deploy Manager App / deploy (push) Successful in 19s Details

This commit is contained in:
romanskijdev 2026-08-27 14:20:01 +03:00
parent 917171426a
commit 05b7fb0c11
4 changed files with 160 additions and 126 deletions

View File

@ -4,6 +4,7 @@ import { modals } from '@mantine/modals';
import { IconLogout } from '@tabler/icons-react';
import OrdersPage from './pages/OrdersPage';
import Login from './pages/Login';
import AnalystDashboard from './pages/AnalystDashboard'; // 👈 Подключаем дашборд
export function App() {
const navigate = useNavigate();
@ -17,7 +18,7 @@ export function App() {
onConfirm: () => {
localStorage.clear();
sessionStorage.clear();
navigate('/login'); // 👈 Правильный SPA-редирект
navigate('/login');
},
});
};
@ -25,10 +26,7 @@ export function App() {
const token = localStorage.getItem('token');
return (
<AppShell
header={{ height: 60 }}
padding="md"
>
<AppShell header={{ height: 60 }} padding="md">
<AppShell.Header>
<Group h="100%" px="md" justify="space-between">
<Title order={3}>Управление заказами</Title>
@ -48,6 +46,10 @@ export function App() {
<AppShell.Main display="flex" style={{ flexDirection: 'column', height: '100vh' }}>
<Routes>
<Route path="/login" element={<Login />} />
<Route path="/analyst" element={<AnalystDashboard />} />
<Route path="/manager/:id" element={<OrdersPage onError={() => navigate('/login')} />} />
<Route path="/" element={<OrdersPage onError={() => navigate('/login')} />} />
</Routes>
</AppShell.Main>

View File

@ -1,31 +1,26 @@
import apiClient from './client';
import type { FrontendOrderMatrix, MonthlyOrderClient } from "../types/orders.ts";
// Добавим интерфейс для администратора из БД
export interface AdminUser {
id: number;
login: string;
name?: string;
is_analyst: boolean;
is_root: boolean;
}
export const monthlyOrdersApi = {
getMatrix: () => apiClient.get<FrontendOrderMatrix>('/monthly-orders/matrix'),
// 🟢 Теперь функция умеет принимать ID менеджера
getMatrix: (managerId?: number) => {
const url = managerId ? `/monthly-orders/matrix?manager_id=${managerId}` : '/monthly-orders/matrix';
return apiClient.get<FrontendOrderMatrix>(url);
},
saveOrders: (orders: MonthlyOrderClient[]) =>
apiClient.post<{ data: string }>('/monthly-orders/save', { orders }),
// TODO: Реализовать на бэкенде
uploadAttachment: (file: File, clientName: string) => {
const fd = new FormData();
fd.append('file', file);
fd.append('client_name', clientName);
return apiClient.post<{ url: string }>('/monthly-orders/attachments', fd, {
headers: { 'Content-Type': 'multipart/form-data' },
});
},
// TODO: Реализовать на бэкенде
exportReport: (reportType: 1 | 2) =>
apiClient.get(`/monthly-orders/report/${reportType}`, { responseType: 'blob' })
.then((res) => {
const url = URL.createObjectURL(res.data);
const a = document.createElement('a');
a.href = url;
a.download = `report_${reportType}_${new Date().toISOString().split('T')[0]}.xlsx`;
a.click();
URL.revokeObjectURL(url);
}),
// 🟢 Метод для аналитика: получить всех сотрудников
getManagersList: () =>
apiClient.get<{ data: AdminUser[] }>('/admin?limit=100'),
};

View File

@ -0,0 +1,54 @@
import { useEffect, useState } from 'react';
import { Container, Title, SimpleGrid, Card, Text, Button, LoadingOverlay, Badge, Group } from '@mantine/core';
import { useNavigate } from 'react-router-dom';
import { monthlyOrdersApi, type AdminUser } from '../api/monthlyOrders';
import { IconTable } from '@tabler/icons-react';
export default function AnalystDashboard() {
const [users, setUsers] = useState<AdminUser[]>([]);
const [loading, setLoading] = useState(true);
const navigate = useNavigate();
useEffect(() => {
monthlyOrdersApi.getManagersList()
.then(res => setUsers(res.data.data || []))
.catch(console.error)
.finally(() => setLoading(false));
}, []);
if (loading) return <LoadingOverlay visible />;
return (
<Container size="lg" mt="md">
<Title mb="xl" order={2}>Панель аналитика</Title>
<Text c="dimmed" mb="lg">Выберите менеджера для просмотра его таблицы заказов:</Text>
<SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="lg">
{users.map(u => (
<Card key={u.id} shadow="sm" padding="lg" radius="md" withBorder>
<Group justify="space-between" mb="xs">
<Text fw={600} size="lg" truncate>{u.name || u.login}</Text>
</Group>
<Group gap="xs" mb="md">
{u.is_analyst && <Badge color="violet" variant="light">Аналитик</Badge>}
{u.is_root && <Badge color="red" variant="light">Root</Badge>}
{!u.is_analyst && !u.is_root && <Badge color="blue" variant="light">Менеджер</Badge>}
</Group>
<Button
variant="light"
color="blue"
fullWidth
radius="md"
leftSection={<IconTable size={16} />}
onClick={() => navigate(`/manager/${u.id}`)}
>
Смотреть заказы
</Button>
</Card>
))}
</SimpleGrid>
</Container>
);
}

View File

@ -4,13 +4,14 @@ import {
LoadingOverlay, Select, TextInput, HoverCard, ActionIcon, Stack, Textarea, Checkbox
} from '@mantine/core'
import { notifications } from '@mantine/notifications'
import { IconDeviceFloppy, IconLock, IconSettings, IconSearch, IconFilter, IconUserSearch, IconRefresh } from '@tabler/icons-react'
import { IconDeviceFloppy, IconLock, IconSettings, IconSearch, IconFilter, IconUserSearch, IconRefresh, IconArrowLeft } from '@tabler/icons-react'
import { useVirtualizer } from '@tanstack/react-virtual'
import { useNavigate, useParams } from 'react-router-dom' // 👈 Добавили для роутинга
import { monthlyOrdersApi } from "../api/monthlyOrders.ts"
import type { FrontendOrderMatrix, MonthlyOrderClient, NomenclatureItem } from "../types/orders.ts"
const DRAFT_KEY = 'orders_matrix_draft';
const DRAFT_TIME_KEY = 'orders_matrix_draft_time'; // 👈 Новый ключ для времени
const DRAFT_TIME_KEY = 'orders_matrix_draft_time';
const CellInput = React.memo(({ initialValue, disabled, onCommit }: { initialValue: number | null, disabled: boolean, onCommit: (val: number | null) => void }) => {
const [val, setVal] = useState<string>(initialValue !== null && initialValue !== undefined ? String(initialValue) : '');
@ -44,8 +45,9 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
const [loading, setLoading] = useState(true)
const [saving, setSaving] = useState(false)
const [editableOrders, setEditableOrders] = useState<Record<string, MonthlyOrderClient>>({})
const [draftSavedAt, setDraftSavedAt] = useState<Date | null>(null); // 👈 Стейт для времени
const [draftSavedAt, setDraftSavedAt] = useState<Date | null>(null);
// Фильтры
const [searchQuery, setSearchQuery] = useState('');
const [selectedType, setSelectedType] = useState<string | null>(null);
const [clientSearchQuery, setClientSearchQuery] = useState('');
@ -54,10 +56,16 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
const tableContainerRef = useRef<HTMLDivElement>(null);
// 🟢 Логика Аналитика
const navigate = useNavigate();
const { id } = useParams();
const targetManagerId = id ? Number(id) : undefined;
const isReadOnly = !!targetManagerId; // Если смотрим чужую, то только чтение
const loadData = async (ignoreDraft = false) => {
try {
setLoading(true)
const res = await monthlyOrdersApi.getMatrix()
const res = await monthlyOrdersApi.getMatrix(targetManagerId) // 👈 Передаем ID, если есть
const matrix = res.data
setData(matrix)
@ -65,24 +73,22 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
const initialMap: Record<string, MonthlyOrderClient> = {}
matrix.clients.forEach(c => {
const clientName = c.google_data.name
if (c.db_order) {
c.db_order.items = c.db_order.items || [];
initialMap[clientName] = c.db_order;
} else {
initialMap[clientName] = {
client_name: clientName,
items: [],
manager_comment: '',
client_name: clientName, items: [], manager_comment: '',
decade: null, delivery: null, payment_form: null, conditions: null,
}
}
})
// Черновик не загружаем, если мы Аналитик (isReadOnly = true)
const draft = localStorage.getItem(DRAFT_KEY);
const draftTime = localStorage.getItem(DRAFT_TIME_KEY); // 👈 Читаем время из кэша
const draftTime = localStorage.getItem(DRAFT_TIME_KEY);
if (draft && !matrix.is_locked && !ignoreDraft) {
if (draft && !matrix.is_locked && !ignoreDraft && !isReadOnly) {
try {
const parsedDraft = JSON.parse(draft);
setEditableOrders({ ...initialMap, ...parsedDraft });
@ -96,29 +102,35 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
}
}
} catch (err: any) {
onError(err.response?.data?.error_description || 'Ошибка загрузки');
const errorMsg = err.response?.data?.error_description || 'Ошибка загрузки';
// 🟢 Если бэкенд требует ID менеджера, значит зашел аналитик -> Редирект на дашборд!
if (errorMsg.includes('аналитику необходимо передать manager_id')) {
navigate('/analyst');
return;
}
onError(errorMsg);
} finally {
setLoading(false)
}
}
useEffect(() => { loadData() }, [])
useEffect(() => { loadData() }, [targetManagerId]) // 👈 Перезагружаем при смене ID
// Автосохранение черновика и ВРЕМЕНИ
// Автосохранение черновика (только если не аналитик!)
useEffect(() => {
if (loading || saving) return;
if (loading || saving || isReadOnly) return;
if (Object.keys(editableOrders).length > 0 && data && !data.is_locked) {
localStorage.setItem(DRAFT_KEY, JSON.stringify(editableOrders));
// 🟢 Фиксируем текущее время и сохраняем
const now = new Date();
localStorage.setItem(DRAFT_TIME_KEY, now.toISOString());
setDraftSavedAt(now);
}
}, [editableOrders, data, loading, saving]);
}, [editableOrders, data, loading, saving, isReadOnly]);
const handleQuantityChange = useCallback((clientName: string, nom: NomenclatureItem, qty: number | null) => {
if (isReadOnly) return; // Блокировка
setEditableOrders(prev => {
const currentOrder = prev[clientName];
const items = [...(currentOrder.items || [])];
@ -132,15 +144,17 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
}
return { ...prev, [clientName]: { ...currentOrder, items } };
})
}, []);
}, [isReadOnly]);
const updateClientMeta = useCallback((clientName: string, field: keyof MonthlyOrderClient, value: string | null) => {
if (isReadOnly) return; // Блокировка
setEditableOrders(prev => ({
...prev, [clientName]: { ...prev[clientName], [field]: value }
}))
}, []);
}, [isReadOnly]);
const handleSave = async () => {
if (isReadOnly) return;
for (const [clientName, order] of Object.entries(editableOrders)) {
if (order.items && order.items.length > 0 && !order.manager_comment?.trim()) {
return notifications.show({ title: 'Внимание', message: `Укажите комментарий для клиента "${clientName}"!`, color: 'yellow' })
@ -149,7 +163,6 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
try {
setSaving(true)
await monthlyOrdersApi.saveOrders(Object.values(editableOrders))
// 🟢 Очищаем оба ключа при успешном сохранении
localStorage.removeItem(DRAFT_KEY);
localStorage.removeItem(DRAFT_TIME_KEY);
setDraftSavedAt(null);
@ -164,8 +177,9 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
}
const handleResetDraft = () => {
if (isReadOnly) return;
localStorage.removeItem(DRAFT_KEY);
localStorage.removeItem(DRAFT_TIME_KEY); // 👈 Сбрасываем время
localStorage.removeItem(DRAFT_TIME_KEY);
setDraftSavedAt(null);
loadData(true);
notifications.show({ title: 'Черновик сброшен', message: 'Таблица синхронизирована с БД', color: 'teal' });
@ -219,23 +233,32 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
overscan: 10,
});
// 🟢 Форматирование даты и времени строго по Москве
const formatMSKTime = (date: Date) => {
return new Intl.DateTimeFormat('ru-RU', {
timeZone: 'Europe/Moscow',
day: '2-digit',
month: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
day: '2-digit', month: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit',
}).format(date);
};
if (loading) return <LoadingOverlay visible />
if (!data) return <Text ta="center">Нет данных</Text>
// Общий флаг отключения элементов
const inputsDisabled = data.is_locked || isReadOnly;
return (
<Box display="flex" style={{ flexDirection: 'column', flexGrow: 1, overflow: 'hidden' }}>
{/* 🟢 Кнопка возврата для аналитика */}
{isReadOnly && (
<Group mb="sm">
<Button variant="subtle" leftSection={<IconArrowLeft size={16} />} onClick={() => navigate('/analyst')}>
Назад к списку менеджеров
</Button>
<Badge color="violet" size="lg">Режим просмотра: Менеджер ID {targetManagerId}</Badge>
</Group>
)}
<Group justify="space-between" align="flex-start" mb="md">
<Stack gap="xs">
<Group align="center" gap="sm">
@ -290,24 +313,26 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
</Group>
</Stack>
{data.is_locked ? (
<Badge color="red" size="lg" leftSection={<IconLock size={14} />}>Прием закрыт</Badge>
) : (
<Group align="center" gap="md">
{/* 🟢 Отображаем время сохранения черновика */}
{draftSavedAt && (
<Text size="xs" c="dimmed">
Локальный черновик:<br/>
<Text span fw={500} c="gray.7">{formatMSKTime(draftSavedAt)} (МСК)</Text>
</Text>
)}
<Button variant="default" onClick={handleResetDraft} leftSection={<IconRefresh size={16} />}>
Сбросить черновик
</Button>
<Button onClick={handleSave} loading={saving} leftSection={<IconDeviceFloppy size={16} />}>
Сохранить в базу
</Button>
</Group>
{/* Если Аналитик — прячем кнопки управления данными */}
{!isReadOnly && (
data.is_locked ? (
<Badge color="red" size="lg" leftSection={<IconLock size={14} />}>Прием закрыт</Badge>
) : (
<Group align="center" gap="md">
{draftSavedAt && (
<Text size="xs" c="dimmed">
Локальный черновик:<br/>
<Text span fw={500} c="gray.7">{formatMSKTime(draftSavedAt)} (МСК)</Text>
</Text>
)}
<Button variant="default" onClick={handleResetDraft} leftSection={<IconRefresh size={16} />}>
Сбросить черновик
</Button>
<Button onClick={handleSave} loading={saving} leftSection={<IconDeviceFloppy size={16} />}>
Сохранить в базу
</Button>
</Group>
)
)}
</Group>
@ -337,7 +362,7 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
clientName={clientName}
order={order}
updateClientMeta={updateClientMeta}
isLocked={data.is_locked}
isLocked={inputsDisabled} // 👈 Передаем флаг блокировки
/>
</Group>
@ -355,14 +380,14 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
<Textarea
size="xs"
placeholder={hasOrderItems ? "Обязательный коммент *" : "Комментарий..."}
disabled={data.is_locked}
placeholder={hasOrderItems && !isReadOnly ? "Обязательный коммент *" : "Комментарий..."}
disabled={inputsDisabled} // 👈 Блокируем коммент для аналитика
value={order?.manager_comment || ''}
onChange={e => updateClientMeta(clientName, 'manager_comment', e.currentTarget.value)}
autosize
minRows={1}
maxRows={3}
error={isCommentMissing}
error={!isReadOnly && isCommentMissing} // Ошибку аналитику тоже не светим
/>
</Table.Th>
)
@ -407,7 +432,7 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
<Table.Td key={clientName} align="center">
<CellInput
initialValue={item?.quantity || null}
disabled={data.is_locked}
disabled={inputsDisabled} // 👈 Блокируем инпуты
onCommit={(val) => handleQuantityChange(clientName, nom, val)}
/>
</Table.Td>
@ -430,18 +455,12 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
)
}
// Меню параметров (отключается, если isLocked = true)
function ClientSettingsPopover({ clientName, order, updateClientMeta, isLocked }: any) {
return (
<HoverCard
width={300}
position="bottom"
withArrow
shadow="md"
openDelay={200}
closeDelay={300}
>
<HoverCard width={300} position="bottom" withArrow shadow="md" openDelay={200} closeDelay={300}>
<HoverCard.Target>
<ActionIcon variant="light" color="blue" size="sm">
<ActionIcon variant="light" color="blue" size="sm" disabled={isLocked}>
<IconSettings size={14} />
</ActionIcon>
</HoverCard.Target>
@ -449,48 +468,12 @@ function ClientSettingsPopover({ clientName, order, updateClientMeta, isLocked }
<Title order={6} mb="sm" style={{ whiteSpace: 'normal' }}>Настройки: {clientName}</Title>
<Stack gap="xs">
<Group grow>
<Select
label="Декада"
size="xs"
disabled={isLocked}
data={['1-я', '2-я', '3-я']}
value={order?.decade || null}
onChange={v => updateClientMeta(clientName, 'decade', v)}
comboboxProps={{ withinPortal: false }}
clearable
/>
<Select
label="Доставка"
size="xs"
disabled={isLocked}
data={['Склад', 'Клиент']}
value={order?.delivery || null}
onChange={v => updateClientMeta(clientName, 'delivery', v)}
comboboxProps={{ withinPortal: false }}
clearable
/>
<Select label="Декада" size="xs" disabled={isLocked} data={['1-я', '2-я', '3-я']} value={order?.decade || null} onChange={v => updateClientMeta(clientName, 'decade', v)} comboboxProps={{ withinPortal: false }} clearable />
<Select label="Доставка" size="xs" disabled={isLocked} data={['Склад', 'Клиент']} value={order?.delivery || null} onChange={v => updateClientMeta(clientName, 'delivery', v)} comboboxProps={{ withinPortal: false }} clearable />
</Group>
<Group grow>
<Select
label="Условия"
size="xs"
disabled={isLocked}
data={['Предоплата', 'Отсрочка']}
value={order?.conditions || null}
onChange={v => updateClientMeta(clientName, 'conditions', v)}
comboboxProps={{ withinPortal: false }}
clearable
/>
<Select
label="Оплата"
size="xs"
disabled={isLocked}
data={['Ф1-Ф1', 'Ф1-Ф2', 'Ф2-Ф1', 'Ф2-Ф2']}
value={order?.payment_form || null}
onChange={v => updateClientMeta(clientName, 'payment_form', v)}
comboboxProps={{ withinPortal: false }}
clearable
/>
<Select label="Условия" size="xs" disabled={isLocked} data={['Предоплата', 'Отсрочка']} value={order?.conditions || null} onChange={v => updateClientMeta(clientName, 'conditions', v)} comboboxProps={{ withinPortal: false }} clearable />
<Select label="Оплата" size="xs" disabled={isLocked} data={['Ф1-Ф1', 'Ф1-Ф2', 'Ф2-Ф1', 'Ф2-Ф2']} value={order?.payment_form || null} onChange={v => updateClientMeta(clientName, 'payment_form', v)} comboboxProps={{ withinPortal: false }} clearable />
</Group>
</Stack>
</HoverCard.Dropdown>