From c7f91468c6f7101f833ba56a7954bbf334626a0a Mon Sep 17 00:00:00 2001 From: Bivekich Date: Thu, 24 Jul 2025 15:16:23 +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=20CreateConsumablesSupplyPage=20=D0=B8=20SuppliesD?= =?UTF-8?q?ashboard=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BB=D1=83=D1=87=D1=88?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8.=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=BE=D0=BA=20=D1=81=D0=B5=D0=BB=D0=BB?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D1=81=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B?= =?UTF-8?q?=D1=82=D0=BE=D0=B9=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=BE?= =?UTF-8?q?=D0=B9=20"=D0=A0=D0=B0=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8".=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=B0?= =?UTF-8?q?=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B0=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0=20defaultSubTab=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=20FulfillmentSuppliesTab.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplies/create-consumables-supply-page.tsx | 4 ++-- .../fulfillment-supplies-tab.tsx | 15 +++++++++++++-- src/components/supplies/supplies-dashboard.tsx | 14 ++++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/components/supplies/create-consumables-supply-page.tsx b/src/components/supplies/create-consumables-supply-page.tsx index 26ecbcb..6bb12c9 100644 --- a/src/components/supplies/create-consumables-supply-page.tsx +++ b/src/components/supplies/create-consumables-supply-page.tsx @@ -256,8 +256,8 @@ export function CreateConsumablesSupplyPage() { setProductSearchQuery(""); setSearchQuery(""); - // Перенаправляем на страницу поставок селлера - router.push("/supplies"); + // Перенаправляем на страницу поставок селлера с открытой вкладкой "Расходники" + router.push("/supplies?tab=consumables"); } else { toast.error( result.data?.createSupplyOrder?.message || diff --git a/src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx b/src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx index de769e6..ee04623 100644 --- a/src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx +++ b/src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx @@ -1,14 +1,25 @@ "use client"; -import React, { useState } from "react"; +import React, { useState, useEffect } from "react"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { FulfillmentGoodsTab } from "./fulfillment-goods-tab"; import { RealSupplyOrdersTab } from "./real-supply-orders-tab"; import { PvzReturnsTab } from "./pvz-returns-tab"; -export function FulfillmentSuppliesTab() { +interface FulfillmentSuppliesTabProps { + defaultSubTab?: string; +} + +export function FulfillmentSuppliesTab({ defaultSubTab }: FulfillmentSuppliesTabProps) { const [activeSubTab, setActiveSubTab] = useState("goods"); + // Устанавливаем активную подвкладку при получении defaultSubTab + useEffect(() => { + if (defaultSubTab) { + setActiveSubTab(defaultSubTab); + } + }, [defaultSubTab]); + return (
{ + const tab = searchParams.get('tab'); + if (tab === 'consumables') { + setActiveTab('fulfillment'); // Устанавливаем основную вкладку "Поставки на ФФ" + } + }, [searchParams]); + return (
@@ -83,7 +93,7 @@ export function SuppliesDashboard() {
- +