From 3ab20c9514edcd07083802b27357532c28372cfd Mon Sep 17 00:00:00 2001 From: Veronika Smirnova Date: Thu, 24 Jul 2025 13:02:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BF=D1=80=D0=BE=D1=89=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20?= =?UTF-8?q?FulfillmentDetailedGoodsTab,=20FulfillmentDetailedSuppliesTab?= =?UTF-8?q?=20=D0=B8=20FulfillmentGoodsTab:=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B7=D0=B2=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=BA,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87?= =?UTF-8?q?=D0=B8=D0=BA=D0=B8=20=D0=BA=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE=D0=B4=D0=B5=D0=B9?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20=D1=81=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=BC.?= =?UTF-8?q?=20=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D1=8B=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=B8=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B0?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=83=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D1=81=D1=82=D0=B2=D0=B0=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fulfillment-detailed-goods-tab.tsx | 78 ++++-------------- .../fulfillment-detailed-supplies-tab.tsx | 80 ++++--------------- .../fulfillment-goods-tab.tsx | 71 +++------------- 3 files changed, 44 insertions(+), 185 deletions(-) diff --git a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-goods-tab.tsx b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-goods-tab.tsx index 525f5e1..197e4f5 100644 --- a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-goods-tab.tsx +++ b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-goods-tab.tsx @@ -5,8 +5,6 @@ import { Card } from "@/components/ui/card"; import { Button } from "@/components/ui/button"; import { Badge } from "@/components/ui/badge"; import { - ChevronDown, - ChevronRight, Calendar, Package, MapPin, @@ -439,21 +437,12 @@ export function FulfillmentDetailedGoodsTab() { return ( {/* Уровень 1: Основная строка поставки ФФ */} - + toggleSupplyExpansion(supply.id)} + >
- #{supply.number} @@ -525,23 +514,12 @@ export function FulfillmentDetailedGoodsTab() { const isRouteExpanded = expandedRoutes.has(route.id); return ( - + toggleRouteExpansion(route.id)} + >
- Маршрут ФФ @@ -636,23 +614,12 @@ export function FulfillmentDetailedGoodsTab() { ); return ( - + toggleSellerExpansion(seller.id)} + >
- Селлер ФФ @@ -726,25 +693,12 @@ export function FulfillmentDetailedGoodsTab() { expandedProducts.has(product.id); return ( - + toggleProductExpansion(product.id)} + >
- Товар ФФ diff --git a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-supplies-tab.tsx b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-supplies-tab.tsx index da73458..abfb20d 100644 --- a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-supplies-tab.tsx +++ b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-detailed-supplies-tab.tsx @@ -7,8 +7,6 @@ import { Badge } from "@/components/ui/badge"; import { StatsCard } from "../../supplies/ui/stats-card"; import { StatsGrid } from "../../supplies/ui/stats-grid"; import { - ChevronDown, - ChevronRight, Calendar, MapPin, Building2, @@ -429,21 +427,12 @@ export function FulfillmentDetailedSuppliesTab() { return ( {/* Основная строка поставки расходников ФФ детально */} - + toggleSupplyExpansion(supply.id)} + >
- #{supply.number} @@ -499,23 +488,12 @@ export function FulfillmentDetailedSuppliesTab() { const isRouteExpanded = expandedRoutes.has(route.id); return ( - + toggleRouteExpansion(route.id)} + >
- Маршрут ФФ @@ -602,25 +580,12 @@ export function FulfillmentDetailedSuppliesTab() { expandedSuppliers.has(supplier.id); return ( - + toggleSupplierExpansion(supplier.id)} + >
- Поставщик ФФ @@ -697,25 +662,12 @@ export function FulfillmentDetailedSuppliesTab() { ); return ( - + toggleConsumableExpansion(consumable.id)} + >
- Расходник ФФ diff --git a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx index 96a72df..d186051 100644 --- a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx +++ b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx @@ -26,8 +26,6 @@ import { Hash, Package2, Boxes, - ChevronDown, - ChevronRight, Store, Building2, Clock, @@ -816,7 +814,10 @@ export function FulfillmentGoodsTab() { >
{/* Компактный блок с названием магазина */} -
+
toggleSellerExpansion(supply.seller.id)} + >
@@ -844,6 +845,7 @@ export function FulfillmentGoodsTab() { rel="noopener noreferrer" className="p-1 bg-blue-500/20 rounded hover:bg-blue-500/30 transition-colors" title="Написать в Telegram" + onClick={(e) => e.stopPropagation()} > e.stopPropagation()} >
-
@@ -1099,26 +1088,9 @@ export function FulfillmentGoodsTab() {

Маршрут

-
-

- {route.routeName} -

- -
+

+ {route.routeName} +

{/* Откуда */} @@ -1219,28 +1191,9 @@ export function FulfillmentGoodsTab() {

Поставщик

-
-

- {supplier.name} -

- -
+

+ {supplier.name} +

{/* ИНН */}