From a111356a16ffd9f3300c041afe82b2f9f8b7ebab Mon Sep 17 00:00:00 2001 From: Bivekich Date: Thu, 24 Jul 2025 16:26:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D1=8B=20CreateFulfillmentConsumablesSupplyPage=20=D0=B8?= =?UTF-8?q?=20FulfillmentSuppliesTab:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BE=D0=BA=20=D1=81=20=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D0=B4=D0=BA=D0=BE=D0=B9=20"=D0=9D=D0=B0=D1=88=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B8=D0=BA=D0=B8".?= =?UTF-8?q?=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20URL=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5.=20=D0=9E?= =?UTF-8?q?=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B2=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D0=B4=D0=BE=D0=BA=20=D1=81=20=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20URL.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...te-fulfillment-consumables-supply-page.tsx | 4 ++-- .../fulfillment-supplies-tab.tsx | 23 +++++++++++++++++-- .../supplies/direct-supply-creation.tsx | 6 ++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/components/fulfillment-supplies/create-fulfillment-consumables-supply-page.tsx b/src/components/fulfillment-supplies/create-fulfillment-consumables-supply-page.tsx index 81d0f13..0798b03 100644 --- a/src/components/fulfillment-supplies/create-fulfillment-consumables-supply-page.tsx +++ b/src/components/fulfillment-supplies/create-fulfillment-consumables-supply-page.tsx @@ -244,8 +244,8 @@ export function CreateFulfillmentConsumablesSupplyPage() { setProductSearchQuery(""); setSearchQuery(""); - // Перенаправляем на страницу поставок фулфилмента - router.push("/fulfillment-supplies"); + // Перенаправляем на страницу поставок фулфилмента с активной вкладкой "Наши расходники" + router.push("/fulfillment-supplies?tab=detailed-supplies"); } else { toast.error( result.data?.createSupplyOrder?.message || diff --git a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx index 38aefd5..7faba5a 100644 --- a/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx +++ b/src/components/fulfillment-supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx @@ -1,6 +1,7 @@ "use client"; -import { useState } from "react"; +import { useState, useEffect } from "react"; +import { useSearchParams, useRouter } from "next/navigation"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Package, Wrench, RotateCcw, Building2 } from "lucide-react"; @@ -13,13 +14,31 @@ import { FulfillmentConsumablesOrdersTab } from "./fulfillment-consumables-order import { FulfillmentDetailedSuppliesTab } from "./fulfillment-detailed-supplies-tab"; export function FulfillmentSuppliesTab() { + const router = useRouter(); + const searchParams = useSearchParams(); const [activeTab, setActiveTab] = useState("goods"); + // Проверяем URL параметр при загрузке + useEffect(() => { + const tabParam = searchParams.get("tab"); + if (tabParam && ["goods", "detailed-supplies", "consumables", "returns"].includes(tabParam)) { + setActiveTab(tabParam); + } + }, [searchParams]); + + // Обновляем URL при смене вкладки + const handleTabChange = (newTab: string) => { + setActiveTab(newTab); + const currentPath = window.location.pathname; + const newUrl = `${currentPath}?tab=${newTab}`; + router.replace(newUrl); + }; + return (
diff --git a/src/components/supplies/direct-supply-creation.tsx b/src/components/supplies/direct-supply-creation.tsx index ea20e33..93963b0 100644 --- a/src/components/supplies/direct-supply-creation.tsx +++ b/src/components/supplies/direct-supply-creation.tsx @@ -672,7 +672,7 @@ export function DirectSupplyCreation({ {/* НОВЫЙ БЛОК СОЗДАНИЯ ПОСТАВКИ */} {/* Первая строка */} -
+
{/* 1. Модуль выбора даты */}
{/* Вторая строка */} -
+
{/* 5. Цена товаров */}