diff --git a/src/pages/OrdersPage.tsx b/src/pages/OrdersPage.tsx index 4a5ae6d..f3c3e15 100644 --- a/src/pages/OrdersPage.tsx +++ b/src/pages/OrdersPage.tsx @@ -58,6 +58,9 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void const [selectedBranch, setSelectedBranch] = useState(null); const [showOnlyWithOrders, setShowOnlyWithOrders] = useState(false); + const [showOnlyWithoutOrders, setShowOnlyWithoutOrders] = useState(false); + const [hideEmptyRows, setHideEmptyRows] = useState(false); + const tableContainerRef = useRef(null); // Логика Аналитика @@ -223,26 +226,47 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void return Array.from(new Set(data.clients.map(c => c.google_data.branch).filter(Boolean))) as string[]; }, [data?.clients]); - const filteredNom = useMemo(() => { - if (!data?.nomenclatures) return []; - 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; - return matchSearch && matchType; - }); - }, [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; + const hasOrders = (editableOrders[c.google_data.name]?.items?.length ?? 0) > 0; + + if (showOnlyWithOrders && !hasOrders) return false; + if (showOnlyWithoutOrders && hasOrders) return false; + + return matchName && matchBranch; }); - }, [data?.clients, clientSearchQuery, selectedBranch, showOnlyWithOrders, editableOrders]); + }, [data?.clients, clientSearchQuery, selectedBranch, showOnlyWithOrders, showOnlyWithoutOrders, editableOrders]); + + const filteredNom = useMemo(() => { + if (!data?.nomenclatures) return []; + + const searchWords = searchQuery.toLowerCase().trim().split(/\s+/).filter(Boolean); + + return data.nomenclatures.map((n, idx) => ({ ...n, originalIndex: idx + 1 })).filter(n => { + const nomNameLower = n.name.toLowerCase(); + + const matchSearch = + n.originalIndex.toString() === searchQuery.trim() || + (searchWords.length === 0 || searchWords.every(word => nomNameLower.includes(word))); + + const matchType = selectedType ? n.type === selectedType : true; + + let matchNotEmpty = true; + if (hideEmptyRows) { + // Строка не пустая, если хотя бы у одного ВИДИМОГО клиента количество > 0 + matchNotEmpty = filteredClients.some(c => { + const item = editableOrders[c.google_data.name]?.items?.find(i => i.nomenclature_name === n.name); + return (item?.quantity ?? 0) > 0; + }); + } + + return matchSearch && matchType && matchNotEmpty; + }); + }, [data?.nomenclatures, searchQuery, selectedType, hideEmptyRows, editableOrders, filteredClients]); const getTotalForNom = useCallback((nomName: string) => { let total = 0; @@ -307,6 +331,12 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void clearable size="sm" /> + setHideEmptyRows(e.currentTarget.checked)} + /> Найдено: {filteredNom.length} @@ -334,7 +364,19 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void label="Только с заказами" size="sm" checked={showOnlyWithOrders} - onChange={(e) => setShowOnlyWithOrders(e.currentTarget.checked)} + onChange={(e) => { + setShowOnlyWithOrders(e.currentTarget.checked); + if (e.currentTarget.checked) setShowOnlyWithoutOrders(false); + }} + /> + { + setShowOnlyWithoutOrders(e.currentTarget.checked); + if (e.currentTarget.checked) setShowOnlyWithOrders(false); + }} />