Add znzt module
Deploy Manager App / deploy (push) Successful in 19s
Details
Deploy Manager App / deploy (push) Successful in 19s
Details
This commit is contained in:
parent
057a430023
commit
9ca21f955b
|
|
@ -1,17 +1,17 @@
|
||||||
import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react'
|
import React, { useState, useEffect, useCallback, useRef, useMemo } from 'react'
|
||||||
import {
|
import {
|
||||||
Box, Table, Title, Text, Paper, Button, Group, Badge,
|
Box, Table, Title, Text, Paper, Button, Group, Badge,
|
||||||
LoadingOverlay, Select, TextInput, HoverCard, ActionIcon, Stack, Textarea
|
LoadingOverlay, Select, TextInput, HoverCard, ActionIcon, Stack, Textarea, Checkbox
|
||||||
} from '@mantine/core'
|
} from '@mantine/core'
|
||||||
import { notifications } from '@mantine/notifications'
|
import { notifications } from '@mantine/notifications'
|
||||||
import { IconDeviceFloppy, IconLock, IconSettings, IconSearch, IconFilter } from '@tabler/icons-react'
|
import { IconDeviceFloppy, IconLock, IconSettings, IconSearch, IconFilter, IconUserSearch } from '@tabler/icons-react'
|
||||||
import { useVirtualizer } from '@tanstack/react-virtual'
|
import { useVirtualizer } from '@tanstack/react-virtual'
|
||||||
import { monthlyOrdersApi } from "../api/monthlyOrders.ts"
|
import { monthlyOrdersApi } from "../api/monthlyOrders.ts"
|
||||||
import type { FrontendOrderMatrix, MonthlyOrderClient, NomenclatureItem } from "../types/orders.ts"
|
import type { FrontendOrderMatrix, MonthlyOrderClient, NomenclatureItem } from "../types/orders.ts"
|
||||||
|
|
||||||
const DRAFT_KEY = 'orders_matrix_draft';
|
const DRAFT_KEY = 'orders_matrix_draft';
|
||||||
|
|
||||||
// --- Локализованный инпут для мгновенного ввода без лагов всей таблицы ---
|
// --- Локализованный инпут для мгновенного ввода без лагов ---
|
||||||
const CellInput = React.memo(({ initialValue, disabled, onCommit }: { initialValue: number | null, disabled: boolean, onCommit: (val: number | null) => void }) => {
|
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) : '');
|
const [val, setVal] = useState<string>(initialValue !== null && initialValue !== undefined ? String(initialValue) : '');
|
||||||
|
|
||||||
|
|
@ -45,10 +45,15 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
const [saving, setSaving] = useState(false)
|
const [saving, setSaving] = useState(false)
|
||||||
const [editableOrders, setEditableOrders] = useState<Record<string, MonthlyOrderClient>>({})
|
const [editableOrders, setEditableOrders] = useState<Record<string, MonthlyOrderClient>>({})
|
||||||
|
|
||||||
// Фильтры
|
// Фильтры номенклатуры
|
||||||
const [searchQuery, setSearchQuery] = useState('');
|
const [searchQuery, setSearchQuery] = useState('');
|
||||||
const [selectedType, setSelectedType] = useState<string | null>(null);
|
const [selectedType, setSelectedType] = useState<string | null>(null);
|
||||||
|
|
||||||
|
// Фильтры клиентов
|
||||||
|
const [clientSearchQuery, setClientSearchQuery] = useState('');
|
||||||
|
const [selectedBranch, setSelectedBranch] = useState<string | null>(null);
|
||||||
|
const [showOnlyWithOrders, setShowOnlyWithOrders] = useState(false);
|
||||||
|
|
||||||
const tableContainerRef = useRef<HTMLDivElement>(null);
|
const tableContainerRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
const loadData = async () => {
|
const loadData = async () => {
|
||||||
|
|
@ -62,13 +67,13 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
const initialMap: Record<string, MonthlyOrderClient> = {}
|
const initialMap: Record<string, MonthlyOrderClient> = {}
|
||||||
matrix.clients.forEach(c => {
|
matrix.clients.forEach(c => {
|
||||||
const clientName = c.google_data.name
|
const clientName = c.google_data.name
|
||||||
|
// Дефолтные значения установлены в null, чтобы можно было ничего не выбирать
|
||||||
initialMap[clientName] = c.db_order || {
|
initialMap[clientName] = c.db_order || {
|
||||||
client_name: clientName, items: [], manager_comment: '',
|
client_name: clientName, items: [], manager_comment: '',
|
||||||
decade: '1-я', delivery: 'Предоплата', payment_form: 'Ф1-Ф1', conditions: 'Стандарт',
|
decade: null, delivery: null, payment_form: null, conditions: null,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// Восстановление черновика из localStorage
|
|
||||||
const draft = localStorage.getItem(DRAFT_KEY);
|
const draft = localStorage.getItem(DRAFT_KEY);
|
||||||
if (draft && !matrix.is_locked) {
|
if (draft && !matrix.is_locked) {
|
||||||
try {
|
try {
|
||||||
|
|
@ -91,7 +96,6 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
|
|
||||||
useEffect(() => { loadData() }, [])
|
useEffect(() => { loadData() }, [])
|
||||||
|
|
||||||
// Автосохранение черновика при изменении данных
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (Object.keys(editableOrders).length > 0 && data && !data.is_locked) {
|
if (Object.keys(editableOrders).length > 0 && data && !data.is_locked) {
|
||||||
localStorage.setItem(DRAFT_KEY, JSON.stringify(editableOrders));
|
localStorage.setItem(DRAFT_KEY, JSON.stringify(editableOrders));
|
||||||
|
|
@ -114,14 +118,13 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
})
|
})
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const updateClientMeta = useCallback((clientName: string, field: keyof MonthlyOrderClient, value: string) => {
|
const updateClientMeta = useCallback((clientName: string, field: keyof MonthlyOrderClient, value: string | null) => {
|
||||||
setEditableOrders(prev => ({
|
setEditableOrders(prev => ({
|
||||||
...prev, [clientName]: { ...prev[clientName], [field]: value }
|
...prev, [clientName]: { ...prev[clientName], [field]: value }
|
||||||
}))
|
}))
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
// Валидация
|
|
||||||
for (const [clientName, order] of Object.entries(editableOrders)) {
|
for (const [clientName, order] of Object.entries(editableOrders)) {
|
||||||
if (order.items && order.items.length > 0 && !order.manager_comment?.trim()) {
|
if (order.items && order.items.length > 0 && !order.manager_comment?.trim()) {
|
||||||
return notifications.show({ title: 'Внимание', message: `Укажите комментарий для клиента "${clientName}"!`, color: 'yellow' })
|
return notifications.show({ title: 'Внимание', message: `Укажите комментарий для клиента "${clientName}"!`, color: 'yellow' })
|
||||||
|
|
@ -130,7 +133,7 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
try {
|
try {
|
||||||
setSaving(true)
|
setSaving(true)
|
||||||
await monthlyOrdersApi.saveOrders(Object.values(editableOrders))
|
await monthlyOrdersApi.saveOrders(Object.values(editableOrders))
|
||||||
localStorage.removeItem(DRAFT_KEY); // Очищаем черновик после успеха
|
localStorage.removeItem(DRAFT_KEY);
|
||||||
notifications.show({ title: 'Успешно', message: 'Заказы сохранены', color: 'green' })
|
notifications.show({ title: 'Успешно', message: 'Заказы сохранены', color: 'green' })
|
||||||
loadData()
|
loadData()
|
||||||
} catch {
|
} catch {
|
||||||
|
|
@ -140,33 +143,53 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Извлечение уникальных типов номенклатуры для фильтра
|
// --- ПОДГОТОВКА ДАННЫХ И ФИЛЬТРАЦИЯ ---
|
||||||
|
|
||||||
const nomenclatureTypes = useMemo(() => {
|
const nomenclatureTypes = useMemo(() => {
|
||||||
if (!data?.nomenclatures) return [];
|
if (!data?.nomenclatures) return [];
|
||||||
return Array.from(new Set(data.nomenclatures.map(n => n.type))).sort();
|
return Array.from(new Set(data.nomenclatures.map(n => n.type))).sort();
|
||||||
}, [data?.nomenclatures]);
|
}, [data?.nomenclatures]);
|
||||||
|
|
||||||
// Фильтрация номенклатуры (поиск + тип)
|
const uniqueBranches = useMemo(() => {
|
||||||
|
if (!data?.clients) return [];
|
||||||
|
return Array.from(new Set(data.clients.map(c => c.google_data.branch).filter(Boolean))) as string[];
|
||||||
|
}, [data?.clients]);
|
||||||
|
|
||||||
|
// Фильтрация номенклатуры (поиск по имени или НОМЕРУ СТРОКИ)
|
||||||
const filteredNom = useMemo(() => {
|
const filteredNom = useMemo(() => {
|
||||||
if (!data?.nomenclatures) return [];
|
if (!data?.nomenclatures) return [];
|
||||||
return data.nomenclatures.filter(n => {
|
// Прокидываем оригинальный индекс (1-based), чтобы поиск по номеру строки работал корректно
|
||||||
const matchSearch = n.name.toLowerCase().includes(searchQuery.toLowerCase());
|
return data.nomenclatures.map((n, idx) => ({ ...n, originalIndex: idx + 1 })).filter(n => {
|
||||||
|
const searchLower = searchQuery.toLowerCase().trim();
|
||||||
|
const matchSearch = n.name.toLowerCase().includes(searchLower) || n.originalIndex.toString() === searchLower;
|
||||||
const matchType = selectedType ? n.type === selectedType : true;
|
const matchType = selectedType ? n.type === selectedType : true;
|
||||||
return matchSearch && matchType;
|
return matchSearch && matchType;
|
||||||
});
|
});
|
||||||
}, [data?.nomenclatures, searchQuery, selectedType]);
|
}, [data?.nomenclatures, searchQuery, selectedType]);
|
||||||
|
|
||||||
// Быстрый подсчет итоговой суммы для строки
|
// Фильтрация клиентов
|
||||||
|
const filteredClients = useMemo(() => {
|
||||||
|
if (!data?.clients) return [];
|
||||||
|
return data.clients.filter(c => {
|
||||||
|
const matchName = c.google_data.name.toLowerCase().includes(clientSearchQuery.toLowerCase());
|
||||||
|
const matchBranch = selectedBranch ? c.google_data.branch === selectedBranch : true;
|
||||||
|
const matchHasOrders = showOnlyWithOrders ? (editableOrders[c.google_data.name]?.items?.length ?? 0) > 0 : true;
|
||||||
|
|
||||||
|
return matchName && matchBranch && matchHasOrders;
|
||||||
|
});
|
||||||
|
}, [data?.clients, clientSearchQuery, selectedBranch, showOnlyWithOrders, editableOrders]);
|
||||||
|
|
||||||
|
// Итоговая сумма по строке (учитывает только отображаемых клиентов)
|
||||||
const getTotalForNom = useCallback((nomName: string) => {
|
const getTotalForNom = useCallback((nomName: string) => {
|
||||||
let total = 0;
|
let total = 0;
|
||||||
Object.values(editableOrders).forEach(order => {
|
filteredClients.forEach(c => {
|
||||||
const item = order.items?.find(i => i.nomenclature_name === nomName);
|
const order = editableOrders[c.google_data.name];
|
||||||
|
const item = order?.items?.find(i => i.nomenclature_name === nomName);
|
||||||
if (item?.quantity) total += item.quantity;
|
if (item?.quantity) total += item.quantity;
|
||||||
});
|
});
|
||||||
return total;
|
return total;
|
||||||
}, [editableOrders]);
|
}, [editableOrders, filteredClients]);
|
||||||
|
|
||||||
// Настройка виртуализации
|
|
||||||
const rowVirtualizer = useVirtualizer({
|
const rowVirtualizer = useVirtualizer({
|
||||||
count: filteredNom.length,
|
count: filteredNom.length,
|
||||||
getScrollElement: () => tableContainerRef.current,
|
getScrollElement: () => tableContainerRef.current,
|
||||||
|
|
@ -179,28 +202,62 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box display="flex" style={{ flexDirection: 'column', flexGrow: 1, overflow: 'hidden' }}>
|
<Box display="flex" style={{ flexDirection: 'column', flexGrow: 1, overflow: 'hidden' }}>
|
||||||
<Group justify="space-between" mb="md" align="flex-end">
|
|
||||||
<Group align="flex-end">
|
<Group justify="space-between" align="flex-start" mb="md">
|
||||||
<TextInput
|
<Stack gap="xs">
|
||||||
label="Поиск номенклатуры"
|
{/* Панель фильтров Номенклатуры */}
|
||||||
placeholder="Название..."
|
<Group align="center" gap="sm">
|
||||||
leftSection={<IconSearch size={16} />}
|
<Text size="sm" fw={600} w={120}>Номенклатура:</Text>
|
||||||
value={searchQuery}
|
<TextInput
|
||||||
onChange={(e) => setSearchQuery(e.currentTarget.value)}
|
placeholder="Название или № строки..."
|
||||||
w={250}
|
leftSection={<IconSearch size={16} />}
|
||||||
/>
|
value={searchQuery}
|
||||||
<Select
|
onChange={(e) => setSearchQuery(e.currentTarget.value)}
|
||||||
label="Фильтр по типу"
|
w={220}
|
||||||
placeholder="Все типы"
|
size="sm"
|
||||||
data={['', ...nomenclatureTypes]}
|
/>
|
||||||
value={selectedType || ''}
|
<Select
|
||||||
onChange={(val) => setSelectedType(val === '' ? null : val)}
|
placeholder="Все типы"
|
||||||
leftSection={<IconFilter size={16} />}
|
data={['', ...nomenclatureTypes]}
|
||||||
w={200}
|
value={selectedType || ''}
|
||||||
clearable
|
onChange={(val) => setSelectedType(val === '' ? null : val)}
|
||||||
/>
|
leftSection={<IconFilter size={16} />}
|
||||||
<Badge color="blue" variant="light" size="lg" mb={4}>Строк: {filteredNom.length}</Badge>
|
w={180}
|
||||||
</Group>
|
clearable
|
||||||
|
size="sm"
|
||||||
|
/>
|
||||||
|
<Badge color="blue" variant="light">Найдено: {filteredNom.length}</Badge>
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
{/* Панель фильтров Клиентов */}
|
||||||
|
<Group align="center" gap="sm">
|
||||||
|
<Text size="sm" fw={600} w={120}>Клиенты:</Text>
|
||||||
|
<TextInput
|
||||||
|
placeholder="Поиск по клиенту..."
|
||||||
|
leftSection={<IconUserSearch size={16} />}
|
||||||
|
value={clientSearchQuery}
|
||||||
|
onChange={(e) => setClientSearchQuery(e.currentTarget.value)}
|
||||||
|
w={220}
|
||||||
|
size="sm"
|
||||||
|
/>
|
||||||
|
<Select
|
||||||
|
placeholder="Все филиалы"
|
||||||
|
data={['', ...uniqueBranches]}
|
||||||
|
value={selectedBranch || ''}
|
||||||
|
onChange={(val) => setSelectedBranch(val === '' ? null : val)}
|
||||||
|
leftSection={<IconFilter size={16} />}
|
||||||
|
w={180}
|
||||||
|
clearable
|
||||||
|
size="sm"
|
||||||
|
/>
|
||||||
|
<Checkbox
|
||||||
|
label="Только с заказами"
|
||||||
|
size="sm"
|
||||||
|
checked={showOnlyWithOrders}
|
||||||
|
onChange={(e) => setShowOnlyWithOrders(e.currentTarget.checked)}
|
||||||
|
/>
|
||||||
|
</Group>
|
||||||
|
</Stack>
|
||||||
|
|
||||||
{data.is_locked ? (
|
{data.is_locked ? (
|
||||||
<Badge color="red" size="lg" leftSection={<IconLock size={14} />}>Прием закрыт</Badge>
|
<Badge color="red" size="lg" leftSection={<IconLock size={14} />}>Прием закрыт</Badge>
|
||||||
|
|
@ -211,26 +268,23 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
)}
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
{/* Контейнер таблицы */}
|
|
||||||
<Paper withBorder shadow="sm" style={{ flexGrow: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
|
<Paper withBorder shadow="sm" style={{ flexGrow: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden' }}>
|
||||||
<div ref={tableContainerRef} style={{ overflow: 'auto', flexGrow: 1 }}>
|
<div ref={tableContainerRef} style={{ overflow: 'auto', flexGrow: 1 }}>
|
||||||
<Table stickyHeader striped highlightOnHover style={{ tableLayout: 'fixed', minWidth: 'max-content' }}>
|
<Table stickyHeader striped highlightOnHover style={{ tableLayout: 'fixed', minWidth: 'max-content' }}>
|
||||||
<Table.Thead>
|
<Table.Thead>
|
||||||
<Table.Tr>
|
<Table.Tr>
|
||||||
{/* 3 зафиксированные слева колонки */}
|
{/* 3 зафиксированные слева колонки */}
|
||||||
<Table.Th w={50} style={{ position: 'sticky', left: 0, zIndex: 3, background: 'var(--mantine-color-body)' }}>№</Table.Th>
|
<Table.Th w={60} style={{ position: 'sticky', left: 0, zIndex: 3, background: 'var(--mantine-color-body)' }}>№</Table.Th>
|
||||||
<Table.Th w={300} style={{ position: 'sticky', left: 50, zIndex: 3, background: 'var(--mantine-color-body)' }}>Номенклатура</Table.Th>
|
<Table.Th w={300} style={{ position: 'sticky', left: 60, zIndex: 3, background: 'var(--mantine-color-body)' }}>Номенклатура</Table.Th>
|
||||||
<Table.Th w={100} style={{ position: 'sticky', left: 350, zIndex: 3, background: 'var(--mantine-color-body)', borderRight: '2px solid var(--mantine-color-gray-3)' }}>Итого</Table.Th>
|
<Table.Th w={100} style={{ position: 'sticky', left: 360, zIndex: 3, background: 'var(--mantine-color-body)', borderRight: '2px solid var(--mantine-color-gray-3)' }}>Итого</Table.Th>
|
||||||
|
|
||||||
{/* Динамические колонки клиентов */}
|
{/* Динамические колонки отфильтрованных клиентов */}
|
||||||
{data.clients?.map(c => {
|
{filteredClients.map(c => {
|
||||||
const clientName = c.google_data.name;
|
const clientName = c.google_data.name;
|
||||||
const branch = c.google_data.branch;
|
const branch = c.google_data.branch;
|
||||||
const order = editableOrders[clientName];
|
const order = editableOrders[clientName];
|
||||||
|
|
||||||
// Проверяем, есть ли у клиента заказ (кол-во > 0)
|
|
||||||
const hasOrderItems = order?.items && order.items.length > 0;
|
const hasOrderItems = order?.items && order.items.length > 0;
|
||||||
// Ошибка: заказ есть, а комментария нет
|
|
||||||
const isCommentMissing = hasOrderItems && (!order.manager_comment || order.manager_comment.trim() === '');
|
const isCommentMissing = hasOrderItems && (!order.manager_comment || order.manager_comment.trim() === '');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
@ -253,24 +307,22 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Индикаторы выбранных параметров (без комментария, так как он теперь ниже) */}
|
|
||||||
<Group gap={4} justify="center" mb="xs">
|
<Group gap={4} justify="center" mb="xs">
|
||||||
{order?.decade && <Badge size="xs" variant="outline" color="blue">{order.decade}</Badge>}
|
{order?.decade && <Badge size="xs" variant="outline" color="blue">{order.decade}</Badge>}
|
||||||
{order?.delivery && <Badge size="xs" variant="outline" color="teal">{order.delivery}</Badge>}
|
{order?.delivery && <Badge size="xs" variant="outline" color="teal">{order.delivery}</Badge>}
|
||||||
{order?.payment_form && <Badge size="xs" variant="outline" color="violet">{order.payment_form}</Badge>}
|
{order?.payment_form && <Badge size="xs" variant="outline" color="violet">{order.payment_form}</Badge>}
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
{/* Поле для комментария всегда под рукой */}
|
|
||||||
<Textarea
|
<Textarea
|
||||||
size="xs"
|
size="xs"
|
||||||
placeholder={hasOrderItems ? "Обязательный комментарий *" : "Комментарий..."}
|
placeholder={hasOrderItems ? "Обязательный коммент *" : "Комментарий..."}
|
||||||
disabled={data.is_locked}
|
disabled={data.is_locked}
|
||||||
value={order?.manager_comment || ''}
|
value={order?.manager_comment || ''}
|
||||||
onChange={e => updateClientMeta(clientName, 'manager_comment', e.currentTarget.value)}
|
onChange={e => updateClientMeta(clientName, 'manager_comment', e.currentTarget.value)}
|
||||||
autosize
|
autosize
|
||||||
minRows={1}
|
minRows={1}
|
||||||
maxRows={3}
|
maxRows={3}
|
||||||
error={isCommentMissing} // 👈 Автоматически подсветит красным, если нужно заполнить
|
error={isCommentMissing}
|
||||||
/>
|
/>
|
||||||
</Table.Th>
|
</Table.Th>
|
||||||
)
|
)
|
||||||
|
|
@ -279,34 +331,31 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
<Table.Tbody>
|
<Table.Tbody>
|
||||||
{/* Отступы виртуализации (сверху) */}
|
|
||||||
{rowVirtualizer.getVirtualItems().length > 0 && (
|
{rowVirtualizer.getVirtualItems().length > 0 && (
|
||||||
<tr><td colSpan={data.clients.length + 3} style={{ height: rowVirtualizer.getVirtualItems()[0].start }} /></tr>
|
<tr><td colSpan={filteredClients.length + 3} style={{ height: rowVirtualizer.getVirtualItems()[0].start }} /></tr>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Строки с данными */}
|
|
||||||
{rowVirtualizer.getVirtualItems().map(virtualRow => {
|
{rowVirtualizer.getVirtualItems().map(virtualRow => {
|
||||||
const nom = filteredNom[virtualRow.index];
|
const nom = filteredNom[virtualRow.index];
|
||||||
const total = getTotalForNom(nom.name);
|
const total = getTotalForNom(nom.name);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table.Tr key={nom.name}>
|
<Table.Tr key={nom.name}>
|
||||||
{/* Зафиксированные колонки ячеек */}
|
<Table.Td style={{ position: 'sticky', left: 0, background: 'var(--mantine-color-body)', zIndex: 1, borderRight: '1px solid var(--mantine-color-gray-2)', textAlign: 'center' }}>
|
||||||
<Table.Td style={{ position: 'sticky', left: 0, background: 'var(--mantine-color-body)', zIndex: 1, borderRight: '1px solid var(--mantine-color-gray-2)' }}>
|
{/* Отображаем оригинальный номер строки из справочника */}
|
||||||
<Text size="xs" c="dimmed">{virtualRow.index + 1}</Text>
|
<Text size="xs" c="dimmed">{nom.originalIndex}</Text>
|
||||||
</Table.Td>
|
</Table.Td>
|
||||||
<Table.Td style={{ position: 'sticky', left: 50, background: 'var(--mantine-color-body)', zIndex: 1, borderRight: '1px solid var(--mantine-color-gray-2)' }}>
|
<Table.Td style={{ position: 'sticky', left: 60, background: 'var(--mantine-color-body)', zIndex: 1, borderRight: '1px solid var(--mantine-color-gray-2)' }}>
|
||||||
<Text size="sm" fw={500} style={{ whiteSpace: 'normal', wordBreak: 'break-word', lineHeight: 1.2 }}>{nom.name}</Text>
|
<Text size="sm" fw={500} style={{ whiteSpace: 'normal', wordBreak: 'break-word', lineHeight: 1.2 }}>{nom.name}</Text>
|
||||||
<Text size="xs" c="dimmed" mt={2}>{nom.type}</Text>
|
<Text size="xs" c="dimmed" mt={2}>{nom.type}</Text>
|
||||||
</Table.Td>
|
</Table.Td>
|
||||||
<Table.Td style={{ position: 'sticky', left: 350, background: 'var(--mantine-color-body)', zIndex: 1, borderRight: '2px solid var(--mantine-color-gray-3)', textAlign: 'center' }}>
|
<Table.Td style={{ position: 'sticky', left: 360, background: 'var(--mantine-color-body)', zIndex: 1, borderRight: '2px solid var(--mantine-color-gray-3)', textAlign: 'center' }}>
|
||||||
<Badge color={total > 0 ? 'blue' : 'gray'} variant={total > 0 ? 'filled' : 'light'}>
|
<Badge color={total > 0 ? 'blue' : 'gray'} variant={total > 0 ? 'filled' : 'light'}>
|
||||||
{total > 0 ? total : '-'}
|
{total > 0 ? total : '-'}
|
||||||
</Badge>
|
</Badge>
|
||||||
</Table.Td>
|
</Table.Td>
|
||||||
|
|
||||||
{/* Ячейки ввода */}
|
{filteredClients.map(c => {
|
||||||
{data.clients.map(c => {
|
|
||||||
const clientName = c.google_data.name;
|
const clientName = c.google_data.name;
|
||||||
const item = editableOrders[clientName]?.items?.find(i => i.nomenclature_name === nom.name);
|
const item = editableOrders[clientName]?.items?.find(i => i.nomenclature_name === nom.name);
|
||||||
return (
|
return (
|
||||||
|
|
@ -323,10 +372,9 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
|
|
||||||
{/* Отступы виртуализации (снизу) */}
|
|
||||||
{rowVirtualizer.getVirtualItems().length > 0 && (
|
{rowVirtualizer.getVirtualItems().length > 0 && (
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={data.clients.length + 3} style={{ height: rowVirtualizer.getTotalSize() - rowVirtualizer.getVirtualItems()[rowVirtualizer.getVirtualItems().length - 1].end }} />
|
<td colSpan={filteredClients.length + 3} style={{ height: rowVirtualizer.getTotalSize() - rowVirtualizer.getVirtualItems()[rowVirtualizer.getVirtualItems().length - 1].end }} />
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
</Table.Tbody>
|
</Table.Tbody>
|
||||||
|
|
@ -337,7 +385,6 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Выпадающее меню параметров (открывается по наведению)
|
|
||||||
function ClientSettingsPopover({ clientName, order, updateClientMeta, isLocked }: any) {
|
function ClientSettingsPopover({ clientName, order, updateClientMeta, isLocked }: any) {
|
||||||
return (
|
return (
|
||||||
<HoverCard
|
<HoverCard
|
||||||
|
|
@ -362,18 +409,20 @@ function ClientSettingsPopover({ clientName, order, updateClientMeta, isLocked }
|
||||||
size="xs"
|
size="xs"
|
||||||
disabled={isLocked}
|
disabled={isLocked}
|
||||||
data={['1-я', '2-я', '3-я']}
|
data={['1-я', '2-я', '3-я']}
|
||||||
value={order?.decade || '1-я'}
|
value={order?.decade || null}
|
||||||
onChange={v => updateClientMeta(clientName, 'decade', v)}
|
onChange={v => updateClientMeta(clientName, 'decade', v)}
|
||||||
comboboxProps={{ withinPortal: false }}
|
comboboxProps={{ withinPortal: false }}
|
||||||
|
clearable // 👈 Позволяет очистить выбор (крестик)
|
||||||
/>
|
/>
|
||||||
<Select
|
<Select
|
||||||
label="Доставка"
|
label="Доставка"
|
||||||
size="xs"
|
size="xs"
|
||||||
disabled={isLocked}
|
disabled={isLocked}
|
||||||
data={['Склад', 'Клиент']}
|
data={['Склад', 'Клиент']}
|
||||||
value={order?.delivery || 'Предоплата'}
|
value={order?.delivery || null}
|
||||||
onChange={v => updateClientMeta(clientName, 'delivery', v)}
|
onChange={v => updateClientMeta(clientName, 'delivery', v)}
|
||||||
comboboxProps={{ withinPortal: false }}
|
comboboxProps={{ withinPortal: false }}
|
||||||
|
clearable
|
||||||
/>
|
/>
|
||||||
</Group>
|
</Group>
|
||||||
<Group grow>
|
<Group grow>
|
||||||
|
|
@ -382,18 +431,20 @@ function ClientSettingsPopover({ clientName, order, updateClientMeta, isLocked }
|
||||||
size="xs"
|
size="xs"
|
||||||
disabled={isLocked}
|
disabled={isLocked}
|
||||||
data={['Предоплата', 'Отсрочка']}
|
data={['Предоплата', 'Отсрочка']}
|
||||||
value={order?.conditions || 'Стандарт'}
|
value={order?.conditions || null}
|
||||||
onChange={v => updateClientMeta(clientName, 'conditions', v)}
|
onChange={v => updateClientMeta(clientName, 'conditions', v)}
|
||||||
comboboxProps={{ withinPortal: false }}
|
comboboxProps={{ withinPortal: false }}
|
||||||
|
clearable
|
||||||
/>
|
/>
|
||||||
<Select
|
<Select
|
||||||
label="Оплата"
|
label="Оплата"
|
||||||
size="xs"
|
size="xs"
|
||||||
disabled={isLocked}
|
disabled={isLocked}
|
||||||
data={['Ф1-Ф1', 'Ф1-Ф2', 'Ф2-Ф1', 'Ф2-Ф2']}
|
data={['Ф1-Ф1', 'Ф1-Ф2', 'Ф2-Ф1', 'Ф2-Ф2']}
|
||||||
value={order?.payment_form || 'Ф1-Ф1'}
|
value={order?.payment_form || null}
|
||||||
onChange={v => updateClientMeta(clientName, 'payment_form', v)}
|
onChange={v => updateClientMeta(clientName, 'payment_form', v)}
|
||||||
comboboxProps={{ withinPortal: false }}
|
comboboxProps={{ withinPortal: false }}
|
||||||
|
clearable
|
||||||
/>
|
/>
|
||||||
</Group>
|
</Group>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue