From 05b7fb0c11d049f09bbd3ac2e7346fb5949100ff Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Thu, 27 Aug 2026 14:20:01 +0300 Subject: [PATCH] Add znzt module --- src/App.tsx | 12 ++- src/api/monthlyOrders.ts | 39 ++++--- src/pages/AnalystDashboard.tsx | 54 ++++++++++ src/pages/OrdersPage.tsx | 181 +++++++++++++++------------------ 4 files changed, 160 insertions(+), 126 deletions(-) create mode 100644 src/pages/AnalystDashboard.tsx diff --git a/src/App.tsx b/src/App.tsx index 8a41120..508089e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -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 ( - + Π£ΠΏΡ€Π°Π²Π»Π΅Π½ΠΈΠ΅ Π·Π°ΠΊΠ°Π·Π°ΠΌΠΈ @@ -48,6 +46,10 @@ export function App() { } /> + + } /> + navigate('/login')} />} /> + navigate('/login')} />} /> diff --git a/src/api/monthlyOrders.ts b/src/api/monthlyOrders.ts index 395b4f1..6b66aef 100644 --- a/src/api/monthlyOrders.ts +++ b/src/api/monthlyOrders.ts @@ -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('/monthly-orders/matrix'), + // 🟒 Π’Π΅ΠΏΠ΅Ρ€ΡŒ функция ΡƒΠΌΠ΅Π΅Ρ‚ ΠΏΡ€ΠΈΠ½ΠΈΠΌΠ°Ρ‚ΡŒ ID ΠΌΠ΅Π½Π΅Π΄ΠΆΠ΅Ρ€Π° + getMatrix: (managerId?: number) => { + const url = managerId ? `/monthly-orders/matrix?manager_id=${managerId}` : '/monthly-orders/matrix'; + return apiClient.get(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'), }; \ No newline at end of file diff --git a/src/pages/AnalystDashboard.tsx b/src/pages/AnalystDashboard.tsx new file mode 100644 index 0000000..e6d9403 --- /dev/null +++ b/src/pages/AnalystDashboard.tsx @@ -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([]); + 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 ; + + return ( + + ПанСль Π°Π½Π°Π»ΠΈΡ‚ΠΈΠΊΠ° + Π’Ρ‹Π±Π΅Ρ€ΠΈΡ‚Π΅ ΠΌΠ΅Π½Π΅Π΄ΠΆΠ΅Ρ€Π° для просмотра Π΅Π³ΠΎ Ρ‚Π°Π±Π»ΠΈΡ†Ρ‹ Π·Π°ΠΊΠ°Π·ΠΎΠ²: + + + {users.map(u => ( + + + {u.name || u.login} + + + + {u.is_analyst && Аналитик} + {u.is_root && Root} + {!u.is_analyst && !u.is_root && ΠœΠ΅Π½Π΅Π΄ΠΆΠ΅Ρ€} + + + + + ))} + + + ); +} \ No newline at end of file diff --git a/src/pages/OrdersPage.tsx b/src/pages/OrdersPage.tsx index c9cfb69..1f70381 100644 --- a/src/pages/OrdersPage.tsx +++ b/src/pages/OrdersPage.tsx @@ -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(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>({}) - const [draftSavedAt, setDraftSavedAt] = useState(null); // πŸ‘ˆ Π‘Ρ‚Π΅ΠΉΡ‚ для Π²Ρ€Π΅ΠΌΠ΅Π½ΠΈ + const [draftSavedAt, setDraftSavedAt] = useState(null); + // Π€ΠΈΠ»ΡŒΡ‚Ρ€Ρ‹ const [searchQuery, setSearchQuery] = useState(''); const [selectedType, setSelectedType] = useState(null); const [clientSearchQuery, setClientSearchQuery] = useState(''); @@ -54,10 +56,16 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void const tableContainerRef = useRef(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 = {} 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 if (!data) return НСт Π΄Π°Π½Π½Ρ‹Ρ… + // ΠžΠ±Ρ‰ΠΈΠΉ Ρ„Π»Π°Π³ ΠΎΡ‚ΠΊΠ»ΡŽΡ‡Π΅Π½ΠΈΡ элСмСнтов + const inputsDisabled = data.is_locked || isReadOnly; + return ( + + {/* 🟒 Кнопка Π²ΠΎΠ·Π²Ρ€Π°Ρ‚Π° для Π°Π½Π°Π»ΠΈΡ‚ΠΈΠΊΠ° */} + {isReadOnly && ( + + + Π Π΅ΠΆΠΈΠΌ просмотра: ΠœΠ΅Π½Π΅Π΄ΠΆΠ΅Ρ€ ID {targetManagerId} + + )} + @@ -290,24 +313,26 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void - {data.is_locked ? ( - }>ΠŸΡ€ΠΈΠ΅ΠΌ Π·Π°ΠΊΡ€Ρ‹Ρ‚ - ) : ( - - {/* 🟒 ΠžΡ‚ΠΎΠ±Ρ€Π°ΠΆΠ°Π΅ΠΌ врСмя сохранСния Ρ‡Π΅Ρ€Π½ΠΎΠ²ΠΈΠΊΠ° */} - {draftSavedAt && ( - - Π›ΠΎΠΊΠ°Π»ΡŒΠ½Ρ‹ΠΉ Ρ‡Π΅Ρ€Π½ΠΎΠ²ΠΈΠΊ:
- {formatMSKTime(draftSavedAt)} (МБК) -
- )} - - -
+ {/* Если Аналитик β€” прячСм ΠΊΠ½ΠΎΠΏΠΊΠΈ управлСния Π΄Π°Π½Π½Ρ‹ΠΌΠΈ */} + {!isReadOnly && ( + data.is_locked ? ( + }>ΠŸΡ€ΠΈΠ΅ΠΌ Π·Π°ΠΊΡ€Ρ‹Ρ‚ + ) : ( + + {draftSavedAt && ( + + Π›ΠΎΠΊΠ°Π»ΡŒΠ½Ρ‹ΠΉ Ρ‡Π΅Ρ€Π½ΠΎΠ²ΠΈΠΊ:
+ {formatMSKTime(draftSavedAt)} (МБК) +
+ )} + + +
+ ) )}
@@ -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} // πŸ‘ˆ ΠŸΠ΅Ρ€Π΅Π΄Π°Π΅ΠΌ Ρ„Π»Π°Π³ Π±Π»ΠΎΠΊΠΈΡ€ΠΎΠ²ΠΊΠΈ />
@@ -355,14 +380,14 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void