diff --git a/src/app/fulfillment-supplies/page.tsx b/src/app/fulfillment-supplies/page.tsx
index f86db01..30c66ce 100644
--- a/src/app/fulfillment-supplies/page.tsx
+++ b/src/app/fulfillment-supplies/page.tsx
@@ -1,10 +1,10 @@
-import { AuthGuard } from "@/components/auth-guard"
-import { FulfillmentSuppliesDashboard } from "@/components/fulfillment-supplies/fulfillment-supplies-dashboard"
+import { AuthGuard } from "@/components/auth-guard";
+import { FulfillmentSuppliesDashboard } from "@/components/fulfillment-supplies/fulfillment-supplies-dashboard";
export default function FulfillmentSuppliesPage() {
return (
- )
-}
\ No newline at end of file
+ );
+}
diff --git a/src/app/logistics/page.tsx b/src/app/logistics/page.tsx
new file mode 100644
index 0000000..023949e
--- /dev/null
+++ b/src/app/logistics/page.tsx
@@ -0,0 +1,10 @@
+import { AuthGuard } from "@/components/auth-guard";
+import { LogisticsDashboard } from "@/components/logistics/logistics-dashboard";
+
+export default function LogisticsPage() {
+ return (
+
+
+
+ );
+}
diff --git a/src/components/dashboard/sidebar.tsx b/src/components/dashboard/sidebar.tsx
index 9b46382..6992dd0 100644
--- a/src/components/dashboard/sidebar.tsx
+++ b/src/components/dashboard/sidebar.tsx
@@ -83,11 +83,22 @@ export function Sidebar() {
}
const handleSuppliesClick = () => {
- // Для фулфилмент кабинетов используем новый роут
- if (user?.organization?.type === 'FULFILLMENT') {
- router.push('/fulfillment-supplies')
- } else {
- router.push('/supplies')
+ // Для каждого типа кабинета свой роут
+ switch (user?.organization?.type) {
+ case 'FULFILLMENT':
+ router.push('/fulfillment-supplies')
+ break
+ case 'SELLER':
+ router.push('/supplies')
+ break
+ case 'WHOLESALE':
+ router.push('/supplies')
+ break
+ case 'LOGIST':
+ router.push('/logistics')
+ break
+ default:
+ router.push('/supplies')
}
}
@@ -103,7 +114,7 @@ export function Sidebar() {
const isServicesActive = pathname.startsWith('/services')
const isWarehouseActive = pathname.startsWith('/warehouse')
const isEmployeesActive = pathname.startsWith('/employees')
- const isSuppliesActive = pathname.startsWith('/supplies') || pathname.startsWith('/fulfillment-supplies')
+ const isSuppliesActive = pathname.startsWith('/supplies') || pathname.startsWith('/fulfillment-supplies') || pathname.startsWith('/logistics')
const isPartnersActive = pathname.startsWith('/partners')
return (
@@ -270,8 +281,8 @@ export function Sidebar() {
)}
- {/* Поставки - для селлеров и фулфилмент */}
- {(user?.organization?.type === 'SELLER' || user?.organization?.type === 'FULFILLMENT') && (
+ {/* Мои поставки - для селлеров */}
+ {user?.organization?.type === 'SELLER' && (
+ )}
+
+ {/* Входящие поставки - для фулфилмент */}
+ {user?.organization?.type === 'FULFILLMENT' && (
+
+ )}
+
+ {/* Отгрузки - для оптовиков */}
+ {user?.organization?.type === 'WHOLESALE' && (
+
+ )}
+
+ {/* Перевозки - для логистов */}
+ {user?.organization?.type === 'LOGIST' && (
+
)}
diff --git a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx
new file mode 100644
index 0000000..21bb77c
--- /dev/null
+++ b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-goods-tab.tsx
@@ -0,0 +1,280 @@
+"use client";
+
+import { useState } from "react";
+import { Card } from "@/components/ui/card";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Badge } from "@/components/ui/badge";
+import {
+ Package,
+ Plus,
+ Search,
+ Filter,
+ TrendingUp,
+ AlertCircle,
+ Calendar,
+ Eye,
+} from "lucide-react";
+
+// Мок данные для товаров
+const mockGoodsSupplies = [
+ {
+ id: "1",
+ productName: "Смартфон iPhone 15",
+ sku: "IPH15-128-BLK",
+ seller: "TechStore LLC",
+ quantity: 50,
+ expectedDate: "2024-01-15",
+ status: "planned",
+ totalValue: 2500000,
+ warehouse: "Склад А1",
+ },
+ {
+ id: "2",
+ productName: "Ноутбук MacBook Air",
+ sku: "MBA-M2-256-SLV",
+ seller: "Apple Reseller",
+ quantity: 25,
+ expectedDate: "2024-01-12",
+ status: "in-transit",
+ totalValue: 3750000,
+ warehouse: "Склад Б2",
+ },
+ {
+ id: "3",
+ productName: "Наушники AirPods Pro",
+ sku: "APP-2GEN-WHT",
+ seller: "Audio World",
+ quantity: 100,
+ expectedDate: "2024-01-10",
+ status: "delivered",
+ totalValue: 2800000,
+ warehouse: "Склад А1",
+ },
+];
+
+export function FulfillmentGoodsTab() {
+ const [searchTerm, setSearchTerm] = useState("");
+ const [statusFilter, setStatusFilter] = useState("all");
+
+ const formatCurrency = (amount: number) => {
+ return new Intl.NumberFormat("ru-RU", {
+ style: "currency",
+ currency: "RUB",
+ minimumFractionDigits: 0,
+ }).format(amount);
+ };
+
+ const formatDate = (dateString: string) => {
+ return new Date(dateString).toLocaleDateString("ru-RU", {
+ day: "2-digit",
+ month: "2-digit",
+ year: "numeric",
+ });
+ };
+
+ const getStatusBadge = (status: string) => {
+ const statusConfig = {
+ planned: {
+ color: "text-blue-300 border-blue-400/30",
+ label: "Запланировано",
+ },
+ "in-transit": {
+ color: "text-yellow-300 border-yellow-400/30",
+ label: "В пути",
+ },
+ delivered: {
+ color: "text-green-300 border-green-400/30",
+ label: "Доставлено",
+ },
+ "in-processing": {
+ color: "text-purple-300 border-purple-400/30",
+ label: "Обрабатывается",
+ },
+ };
+
+ const config =
+ statusConfig[status as keyof typeof statusConfig] || statusConfig.planned;
+
+ return (
+
+ {config.label}
+
+ );
+ };
+
+ const filteredSupplies = mockGoodsSupplies.filter((supply) => {
+ const matchesSearch =
+ supply.productName.toLowerCase().includes(searchTerm.toLowerCase()) ||
+ supply.sku.toLowerCase().includes(searchTerm.toLowerCase()) ||
+ supply.seller.toLowerCase().includes(searchTerm.toLowerCase());
+
+ const matchesStatus =
+ statusFilter === "all" || supply.status === statusFilter;
+
+ return matchesSearch && matchesStatus;
+ });
+
+ const getTotalValue = () => {
+ return filteredSupplies.reduce((sum, supply) => sum + supply.totalValue, 0);
+ };
+
+ const getTotalQuantity = () => {
+ return filteredSupplies.reduce((sum, supply) => sum + supply.quantity, 0);
+ };
+
+ return (
+
+ {/* Статистика с кнопкой */}
+
+
+
+
+
+
+
Поставок
+
+ {filteredSupplies.length}
+
+
+
+
+
+
+
+
+
+
+
Стоимость
+
+ {formatCurrency(getTotalValue())}
+
+
+
+
+
+
+
+
+
Товаров
+
+ {getTotalQuantity()}
+
+
+
+
+
+
+
+
+ {/* Фильтры */}
+
+
+
+ setSearchTerm(e.target.value)}
+ className="glass-input pl-10 text-white placeholder:text-white/40"
+ />
+
+
+
+
+
+ {/* Список поставок */}
+
+
+ {filteredSupplies.map((supply) => (
+
+
+
+
+
+ {supply.productName}
+
+ {getStatusBadge(supply.status)}
+
+
+
+
+
+
Селлер
+
{supply.seller}
+
+
+
Количество
+
+ {supply.quantity} шт.
+
+
+
+
Ожидается
+
+ {formatDate(supply.expectedDate)}
+
+
+
+
+
+
+
+ Склад:{" "}
+ {supply.warehouse}
+
+
+ Стоимость:{" "}
+
+ {formatCurrency(supply.totalValue)}
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+
+
+
+
+ Товары
+
+
+
+ Расходники селлеров
+
+
+
+ Возвраты с ПВЗ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* Статистика с кнопкой */}
+
+
+
+
+
+
+
+
+
Возвратов
+
+ {filteredReturns.length}
+
+
+
+
+
+
+
+
+
Ожидает сбора
+
+ {getPendingCount()}
+
+
+
+
+
+
+
+
+
+
+
Стоимость
+
+ {formatCurrency(getTotalValue())}
+
+
+
+
+
+
+
+
+
+
+
Товаров
+
+ {getTotalQuantity()}
+
+
+
+
+
+
+
+
+ {/* Фильтры */}
+
+
+
+ setSearchTerm(e.target.value)}
+ className="glass-input pl-10 text-white placeholder:text-white/40"
+ />
+
+
+
+
+
+ {/* Список возвратов */}
+
+
+ {filteredReturns.map((returnItem) => (
+
+
+
+
+
+ {returnItem.productName}
+
+ {getStatusBadge(returnItem.status)}
+ {getReasonBadge(returnItem.reason)}
+
+
+
+
+
SKU
+
{returnItem.sku}
+
+
+
Селлер
+
{returnItem.seller}
+
+
+
Количество
+
+ {returnItem.quantity} шт.
+
+
+
+
Дата возврата
+
+ {formatDate(returnItem.returnDate)}
+
+
+
+
+
+
+
+ ПВЗ:{" "}
+
+ {returnItem.pvzAddress}
+
+
+
+
+
+
+ Оценочная стоимость:{" "}
+
+ {formatCurrency(returnItem.estimatedValue)}
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+ {/* Статистика с кнопкой */}
+
+
+
+
+
+
+
+
+
Поставок
+
+ {filteredMaterials.length}
+
+
+
+
+
+
+
+
+
+
+
Стоимость
+
+ {formatCurrency(getTotalValue())}
+
+
+
+
+
+
+
+
+
Единиц
+
+ {getTotalQuantity().toLocaleString()}
+
+
+
+
+
+
+
+
+ {/* Фильтры */}
+
+
+
+ setSearchTerm(e.target.value)}
+ className="glass-input pl-10 text-white placeholder:text-white/40"
+ />
+
+
+
+
+
+ {/* Список материалов */}
+
+
+ {filteredMaterials.map((material) => (
+
+
+
+
+
+ {material.materialName}
+
+ {getStatusBadge(material.status)}
+
+
+
+
+
Селлер
+
{material.seller}
+
+
+
Категория
+
{material.category}
+
+
+
Количество
+
+ {material.quantity.toLocaleString()} шт.
+
+
+
+
Ожидается
+
+ {formatDate(material.expectedDate)}
+
+
+
+
+
+
+
+ Цена за ед.:{" "}
+
+ {formatCurrency(material.unitPrice)}
+
+
+
+ Общая стоимость:{" "}
+
+ {formatCurrency(material.totalValue)}
+
+
+
+
+
+
+
+ Назначение:{" "}
+ {material.purpose}
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+
+
+
+
+ W
+
+ Wildberries
+
+
+
+ O
+
+ Ozon
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* Статистика с кнопкой */}
+
+
+
+
+
+
+
Поставок
+
+ {filteredSupplies.length}
+
+
+
+
+
+
+
+
+
+
+
Стоимость
+
+ {formatCurrency(getTotalValue())}
+
+
+
+
+
+
+
+
+
Товаров
+
+ {getTotalItems()}
+
+
+
+
+
+
+
+
+
Коробок
+
+ {getTotalBoxes()}
+
+
+
+
+
+
+
+
+ {/* Фильтры */}
+
+
+
+ setSearchTerm(e.target.value)}
+ className="glass-input pl-10 text-white placeholder:text-white/40"
+ />
+
+
+
+
+
+ {/* Список поставок */}
+
+
+ {filteredSupplies.map((supply) => (
+
+
+
+
+
+ O
+
+
+ {supply.supplyId}
+
+ {getStatusBadge(supply.status)}
+
+
+
+
+
Склад Ozon
+
{supply.warehouse}
+
+
+
Дата доставки
+
+
+ {formatDate(supply.deliveryDate)}
+
+
+
+
Товаров / Коробок
+
+ {supply.totalItems} / {supply.totalBoxes}
+
+
+
+
Стоимость
+
+ {formatCurrency(supply.estimatedValue)}
+
+
+
+
+ {/* Список товаров в поставке */}
+
+
+ Товары в поставке:
+
+
+ {supply.products.map((product, index) => (
+
+ {product.name}
+
+ {product.quantity} шт. ×{" "}
+ {formatCurrency(product.price)}
+
+
+ ))}
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+ {/* Статистика с кнопкой */}
+
+
+
+
+
+
+
Поставок
+
+ {filteredSupplies.length}
+
+
+
+
+
+
+
+
+
+
+
Стоимость
+
+ {formatCurrency(getTotalValue())}
+
+
+
+
+
+
+
+
+
Товаров
+
+ {getTotalItems()}
+
+
+
+
+
+
+
+
+
Коробок
+
+ {getTotalBoxes()}
+
+
+
+
+
+
+
+
+ {/* Фильтры */}
+
+
+
+ setSearchTerm(e.target.value)}
+ className="glass-input pl-10 text-white placeholder:text-white/40"
+ />
+
+
+
+
+
+ {/* Список поставок */}
+
+
+ {filteredSupplies.map((supply) => (
+
+
+
+
+
+ W
+
+
+ {supply.supplyId}
+
+ {getStatusBadge(supply.status)}
+
+
+
+
+
Склад WB
+
{supply.warehouse}
+
+
+
Дата доставки
+
+
+ {formatDate(supply.deliveryDate)}
+
+
+
+
Товаров / Коробок
+
+ {supply.totalItems} / {supply.totalBoxes}
+
+
+
+
Стоимость
+
+ {formatCurrency(supply.estimatedValue)}
+
+
+
+
+ {/* Список товаров в поставке */}
+
+
+ Товары в поставке:
+
+
+ {supply.products.map((product, index) => (
+
+ {product.name}
+
+ {product.quantity} шт. ×{" "}
+ {formatCurrency(product.price)}
+
+
+ ))}
+
+
+
+
+
+
+
+
+ ))}
+
+
+
- {/* Компактный заголовок */}
-
-
-
- Расходники
-
-
-
-
- {/* Компактная статистика */}
-
-
-
+ {/* Статистика с кнопкой заказа */}
+
+
+
+
@@ -197,8 +182,8 @@ export function MaterialsSuppliesTab() {
-
-
+
+
@@ -209,8 +194,8 @@ export function MaterialsSuppliesTab() {
-
-
+
+
@@ -221,17 +206,28 @@ export function MaterialsSuppliesTab() {
-
-
-
-
+
+
+
+
+
+
+
Низкий остаток
+
{getLowStockCount()}
+
-
Низкий остаток
-
{getLowStockCount()}
-
-
+
+
+
+
+
+ {/* Заголовок */}
+
+
Поставки
+
+ Управление поставками товаров и расходников
+
+
+
+ {/* Основная навигация */}
+
+
+
+
+
+ Поставки товаров
+
+
+
+ Поставки расходников
+
+
+
+ {/* Поставки товаров */}
+
+
+
+
+
+ Наш фулфилмент
+
+
+
+ Маркетплейсы
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* Поставки расходников */}
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* Заголовок */}
+
+
+
Перевозки
+
+ Управление логистическими маршрутами
+
+
+
+
+
+ {/* Статистика */}
+
+
+
+
+
+
+
+
Всего маршрутов
+
+ {mockLogistics.length}
+
+
+
+
+
+
+
+
+
+
+
В пути
+
+ {getInTransitCount()}
+
+
+
+
+
+
+
+
+
Доставлено
+
+ {getDeliveredCount()}
+
+
+
+
+
+
+
+
+
+
+
Выручка
+
+ {formatCurrency(getTotalRevenue())}
+
+
+
+
+
+ {/* Список маршрутов */}
+
+
+
+ Активные маршруты
+
+
+ {mockLogistics.map((route) => (
+
+
+
+
+
+ {route.routeNumber}
+
+ {getStatusBadge(route.status)}
+
+
+
+
+
+
+
+
+ {route.from}
+
+
+ {route.fromAddress}
+
+
+
+
+
+
+
+ {route.to}
+
+
+ {route.toAddress}
+
+
+
+
+
+
+
+
+
+
+ {route.distance} • {route.estimatedTime}
+
+
+
+
+
+
+
+ Создано: {formatDate(route.createdDate)}
+
+
+ {formatCurrency(route.price)}
+
+
+
+
+ ))}
+
+
+
+