Sfera/sfera-new
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлено новое поле fulfillmentCenterId в модель SupplyOrder и соответствующий реляционный объект fulfillmentCenter для улучшения обработки заказов. Обновлены компоненты FulfillmentSuppliesTab и RealSupplyOrdersTab для интеграции нового функционала. Оптимизированы стили и структура кода для повышения удобства использования.

Browse Source
This commit is contained in:
Bivekich
2025-07-24 15:10:58 +03:00
parent 74fb071552
commit c6b1b15c80
11 changed files with 481 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/supplies/fulfillment-supplies/fulfillment-goods-tab.tsx
View File

@ -313,7 +313,7 @@ export function FulfillmentGoodsTab() {
};
return (
<div className="space-y-6">
<div className="h-full flex flex-col space-y-6">
{/* Статистика товаров ФФ */}
<StatsGrid>
<StatsCard
@ -369,8 +369,8 @@ export function FulfillmentGoodsTab() {
</StatsGrid>
{/* Таблица поставок товаров ФФ */}
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden">
<div className="overflow-x-auto">
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden flex-1 flex flex-col">
<div className="overflow-auto flex-1">
<table className="w-full">
<thead>
<tr className="border-b border-white/20">

10
src/components/supplies/fulfillment-supplies/fulfillment-supplies-tab.tsx
View File

@ -10,11 +10,11 @@ export function FulfillmentSuppliesTab() {
const [activeSubTab, setActiveSubTab] = useState("goods");
return (
<div className="h-full">
<div className="h-full overflow-hidden">
<Tabs
value={activeSubTab}
onValueChange={setActiveSubTab}
className="w-full h-full flex flex-col"
className="w-full h-full flex flex-col overflow-hidden"
>
{/* Подвкладки для ФФ */}
<TabsList className="grid grid-cols-3 bg-white/5 backdrop-blur border-white/10 mb-4 w-fit">
@ -38,15 +38,15 @@ export function FulfillmentSuppliesTab() {
</TabsTrigger>
</TabsList>
<TabsContent value="goods" className="mt-0 flex-1">
<TabsContent value="goods" className="mt-0 flex-1 overflow-hidden">
<FulfillmentGoodsTab />
</TabsContent>
<TabsContent value="supplies" className="mt-0 flex-1">
<TabsContent value="supplies" className="mt-0 flex-1 overflow-hidden">
<RealSupplyOrdersTab />
</TabsContent>
<TabsContent value="returns" className="mt-0 flex-1">
<TabsContent value="returns" className="mt-0 flex-1 overflow-hidden">
<PvzReturnsTab />
</TabsContent>
</Tabs>

6
src/components/supplies/fulfillment-supplies/pvz-returns-tab.tsx
View File

@ -318,7 +318,7 @@ export function PvzReturnsTab() {
};
return (
<div className="space-y-6">
<div className="h-full flex flex-col space-y-6">
{/* Статистика возвратов с ПВЗ */}
<StatsGrid>
<StatsCard
@ -369,8 +369,8 @@ export function PvzReturnsTab() {
</StatsGrid>
{/* Таблица возвратов с ПВЗ */}
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden">
<div className="overflow-x-auto">
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden flex-1 flex flex-col">
<div className="overflow-auto flex-1">
<table className="w-full">
<thead>
<tr className="border-b border-white/20">

6
src/components/supplies/fulfillment-supplies/real-supply-orders-tab.tsx
View File

@ -165,7 +165,7 @@ export function RealSupplyOrdersTab() {
}
return (
<div className="space-y-6">
<div className="h-full flex flex-col space-y-6">
{/* Статистика заказов расходников */}
<StatsGrid>
<StatsCard
@ -219,8 +219,8 @@ export function RealSupplyOrdersTab() {
</div>
</Card>
) : (
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden">
<div className="overflow-x-auto">
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden flex-1 flex flex-col">
<div className="overflow-auto flex-1">
<table className="w-full">
<thead>
<tr className="border-b border-white/20">

4
src/components/supplies/supplies-dashboard.tsx
View File

@ -82,11 +82,11 @@ export function SuppliesDashboard() {
</DropdownMenu>
</div>
<TabsContent value="fulfillment" className="mt-0 flex-1">
<TabsContent value="fulfillment" className="mt-0 flex-1 overflow-hidden">
<FulfillmentSuppliesTab />
</TabsContent>
<TabsContent value="marketplace" className="mt-0 flex-1">
<TabsContent value="marketplace" className="mt-0 flex-1 overflow-hidden">
<MarketplaceSuppliesTab />
</TabsContent>
</Tabs>