Добавлен функционал для отображения счетчика поставок, требующих одобрения, в компоненте SuppliesDashboard. Реализован GraphQL запрос для получения данных оPendingSuppliesCount, обновлены соответствующие компоненты и резолверы. Добавлены уведомления о количестве ожидающих заказов и заявок на партнерство.

2025-07-28 10:44:31 +03:00
parent ec39cc81fd
commit 17c929b507
5 changed files with 105 additions and 4 deletions
--- a/src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx
+++ b/src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx
@ -10,10 +10,12 @@ import { useAuth } from "@/hooks/useAuth";

 interface FulfillmentSuppliesTabProps {
  defaultSubTab?: string;
+  pendingSupplyOrders?: number;
 }

 export function FulfillmentSuppliesTab({
  defaultSubTab,
+  pendingSupplyOrders = 0,
 }: FulfillmentSuppliesTabProps) {
  const [activeSubTab, setActiveSubTab] = useState("goods");
  const { user } = useAuth();
@ -45,9 +47,14 @@ export function FulfillmentSuppliesTab({
          </TabsTrigger>
          <TabsTrigger
            value="supplies"
-            className="data-[state=active]:bg-white/20 data-[state=active]:text-white text-white/60 px-3 sm:px-4"
+            className={`data-[state=active]:bg-white/20 data-[state=active]:text-white text-white/60 px-3 sm:px-4 relative ${pendingSupplyOrders > 0 ? 'animate-pulse' : ''}`}
          >
            Расходники
+            {pendingSupplyOrders > 0 && (
+              <div className="absolute -top-1 -right-1 w-5 h-5 bg-blue-500 rounded-full flex items-center justify-center text-xs font-bold text-white">
+                {pendingSupplyOrders}
+              </div>
+            )}
          </TabsTrigger>
          <TabsTrigger
            value="returns"
--- a/src/components/supplies/supplies-dashboard.tsx
+++ b/src/components/supplies/supplies-dashboard.tsx
@ -3,10 +3,13 @@
 import React, { useState, useEffect } from "react";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Button } from "@/components/ui/button";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 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 { useQuery } from "@apollo/client";
+import { Plus, Package, Wrench, ChevronDown, AlertTriangle } from "lucide-react";
+import { GET_PENDING_SUPPLIES_COUNT } from "@/graphql/queries";
 import { FulfillmentSuppliesTab } from "./fulfillment-supplies/fulfillment-supplies-tab";
 import { MarketplaceSuppliesTab } from "./marketplace-supplies/marketplace-supplies-tab";
 import {
@ -21,6 +24,16 @@ export function SuppliesDashboard() {
  const searchParams = useSearchParams();
  const [activeTab, setActiveTab] = useState("fulfillment");

+  // Загружаем счетчик поставок, требующих одобрения
+  const { data: pendingData } = useQuery(GET_PENDING_SUPPLIES_COUNT, {
+    pollInterval: 30000, // Обновляем каждые 30 секунд
+    fetchPolicy: 'cache-first',
+    errorPolicy: 'ignore',
+  });
+
+  const pendingCount = pendingData?.pendingSuppliesCount;
+  const hasPendingItems = pendingCount && pendingCount.total > 0;
+
  // Автоматически открываем нужную вкладку при загрузке
  useEffect(() => {
    const tab = searchParams.get("tab");
@ -36,6 +49,19 @@ export function SuppliesDashboard() {
        className={`flex-1 ${getSidebarMargin()} px-2 py-2 overflow-hidden transition-all duration-300`}
      >
        <div className="h-full">
+          {/* Уведомляющий баннер */}
+          {hasPendingItems && (
+            <Alert className="mb-4 bg-blue-500/20 border-blue-400/30 text-blue-300 animate-pulse">
+              <AlertTriangle className="h-4 w-4" />
+              <AlertDescription>
+                У вас есть {pendingCount.total} элемент{pendingCount.total > 1 ? (pendingCount.total < 5 ? 'а' : 'ов') : ''}, требующ{pendingCount.total > 1 ? 'их' : 'ий'} одобрения:
+                {pendingCount.supplyOrders > 0 && ` ${pendingCount.supplyOrders} заказ${pendingCount.supplyOrders > 1 ? (pendingCount.supplyOrders < 5 ? 'а' : 'ов') : ''} поставок`}
+                {pendingCount.incomingRequests > 0 && pendingCount.supplyOrders > 0 && ', '}
+                {pendingCount.incomingRequests > 0 && ` ${pendingCount.incomingRequests} заявк${pendingCount.incomingRequests > 1 ? (pendingCount.incomingRequests < 5 ? 'и' : '') : 'а'} на партнерство`}
+              </AlertDescription>
+            </Alert>
+          )}
+
          {/* Главные вкладки с кнопкой создания */}
          <Tabs
            value={activeTab}
@ -43,13 +69,18 @@ export function SuppliesDashboard() {
            className="w-full h-full flex flex-col"
          >
            <div className="flex items-center justify-between mb-1 flex-wrap gap-2">
-              <TabsList className="grid grid-cols-2 bg-white/10 backdrop-blur border-white/20 w-fit text-sm">
+              <TabsList className={`grid grid-cols-2 bg-white/10 backdrop-blur border-white/20 w-fit text-sm ${hasPendingItems ? 'ring-2 ring-blue-400/50' : ''}`}>
                <TabsTrigger
                  value="fulfillment"
-                  className="data-[state=active]:bg-gradient-to-r data-[state=active]:from-purple-500 data-[state=active]:to-pink-500 data-[state=active]:text-white text-white/60 px-3 sm:px-6"
+                  className={`data-[state=active]:bg-gradient-to-r data-[state=active]:from-purple-500 data-[state=active]:to-pink-500 data-[state=active]:text-white text-white/60 px-3 sm:px-6 relative ${pendingCount?.supplyOrders > 0 ? 'animate-pulse' : ''}`}
                >
                  <span className="hidden sm:inline">Поставки на ФФ</span>
                  <span className="sm:hidden">ФФ</span>
+                  {pendingCount?.supplyOrders > 0 && (
+                    <div className="absolute -top-1 -right-1 w-5 h-5 bg-blue-500 rounded-full flex items-center justify-center text-xs font-bold text-white">
+                      {pendingCount.supplyOrders}
+                    </div>
+                  )}
                </TabsTrigger>
                <TabsTrigger
                  value="marketplace"
@ -108,6 +139,7 @@ export function SuppliesDashboard() {
                    ? "supplies"
                    : undefined
                }
+                pendingSupplyOrders={pendingCount?.supplyOrders || 0}
              />
            </TabsContent>

--- a/src/graphql/queries.ts
+++ b/src/graphql/queries.ts
@ -836,4 +836,14 @@ export const GET_SUPPLY_ORDERS = gql`
      }
    }
  }
+`;
+
+export const GET_PENDING_SUPPLIES_COUNT = gql`
+  query GetPendingSuppliesCount {
+    pendingSuppliesCount {
+      supplyOrders
+      incomingRequests
+      total
+    }
+  }
 `;
--- a/src/graphql/resolvers.ts
+++ b/src/graphql/resolvers.ts
@ -772,6 +772,49 @@ export const resolvers = {
      });
    },

+    // Счетчик поставок, требующих одобрения
+    pendingSuppliesCount: async (_: unknown, __: unknown, context: Context) => {
+      if (!context.user) {
+        throw new GraphQLError("Требуется авторизация", {
+          extensions: { code: "UNAUTHENTICATED" },
+        });
+      }
+
+      const currentUser = await prisma.user.findUnique({
+        where: { id: context.user.id },
+        include: { organization: true },
+      });
+
+      if (!currentUser?.organization) {
+        throw new GraphQLError("У пользователя нет организации");
+      }
+
+      // Считаем заказы поставок со статусом PENDING где мы поставщики или получатели
+      const pendingSupplyOrders = await prisma.supplyOrder.count({
+        where: {
+          status: "PENDING",
+          OR: [
+            { partnerId: currentUser.organization.id }, // Заказы где мы - поставщик (нужно подтвердить)
+            { fulfillmentCenterId: currentUser.organization.id }, // Заказы где мы - получатель ФФ (нужно подтвердить)
+          ],
+        },
+      });
+
+      // Считаем входящие заявки на партнерство со статусом PENDING
+      const pendingIncomingRequests = await prisma.counterpartyRequest.count({
+        where: {
+          receiverId: currentUser.organization.id,
+          status: "PENDING",
+        },
+      });
+
+      return {
+        supplyOrders: pendingSupplyOrders,
+        incomingRequests: pendingIncomingRequests,
+        total: pendingSupplyOrders + pendingIncomingRequests,
+      };
+    },
+
    // Логистика организации
    myLogistics: async (_: unknown, __: unknown, context: Context) => {
      if (!context.user) {
--- a/src/graphql/typedefs.ts
+++ b/src/graphql/typedefs.ts
@ -43,6 +43,9 @@ export const typeDefs = gql`
    # Заказы поставок расходников
    supplyOrders: [SupplyOrder!]!

+    # Счетчик поставок, требующих одобрения
+    pendingSuppliesCount: PendingSuppliesCount!
+
    # Логистика организации
    myLogistics: [Logistics!]!

@ -579,6 +582,12 @@ export const typeDefs = gql`
    quantity: Int!
  }

+  type PendingSuppliesCount {
+    supplyOrders: Int!
+    incomingRequests: Int!
+    total: Int!
+  }
+
  type SupplyOrderProcessInfo {
    role: String! # Роль организации в процессе (SELLER, FULFILLMENT, LOGIST)
    supplier: String! # Название поставщика