Merge branch 'main' of https://gittea.biveki.ru/Sfera/sfera

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 ||

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 (
     <div className="h-full overflow-hidden">
       <Tabs

src/components/supplies/supplies-dashboard.tsx

@@ -1,10 +1,11 @@
 "use client";
 
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Button } from "@/components/ui/button";
 import { Sidebar } from "@/components/dashboard/sidebar";
 import { useSidebar } from "@/hooks/useSidebar";
+import { useSearchParams } from "next/navigation";
 import { Plus, Package, Wrench, ChevronDown } from "lucide-react";
 import { FulfillmentSuppliesTab } from "./fulfillment-supplies/fulfillment-supplies-tab";
 import { MarketplaceSuppliesTab } from "./marketplace-supplies/marketplace-supplies-tab";
@@ -17,8 +18,17 @@ import {
 
 export function SuppliesDashboard() {
   const { getSidebarMargin } = useSidebar();
+  const searchParams = useSearchParams();
   const [activeTab, setActiveTab] = useState("fulfillment");
 
+  // Автоматически открываем нужную вкладку при загрузке
+  useEffect(() => {
+    const tab = searchParams.get('tab');
+    if (tab === 'consumables') {
+      setActiveTab('fulfillment'); // Устанавливаем основную вкладку "Поставки на ФФ"
+    }
+  }, [searchParams]);
+
   return (
     <div className="h-screen flex overflow-hidden">
       <Sidebar />
@@ -83,7 +93,7 @@ export function SuppliesDashboard() {
             </div>
 
             <TabsContent value="fulfillment" className="mt-0 flex-1 overflow-hidden">
-              <FulfillmentSuppliesTab />
+              <FulfillmentSuppliesTab defaultSubTab={searchParams.get('tab') === 'consumables' ? 'supplies' : undefined} />
             </TabsContent>
 
             <TabsContent value="marketplace" className="mt-0 flex-1 overflow-hidden">