From 42e91bc875f39706cc43e67c229094e8ab06a677 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Fri, 13 Nov 2026 17:35:56 +0300 Subject: [PATCH] Added market stage bage --- src/pages/OrdersPage.tsx | 108 +++++++++++++++++++++++++++------------ src/types/orders.ts | 2 + 2 files changed, 76 insertions(+), 34 deletions(-) diff --git a/src/pages/OrdersPage.tsx b/src/pages/OrdersPage.tsx index 2b9547b..07e34a6 100644 --- a/src/pages/OrdersPage.tsx +++ b/src/pages/OrdersPage.tsx @@ -8,7 +8,7 @@ import { modals } from '@mantine/modals' import { IconDeviceFloppy, IconSettings, IconSearch, IconFilter, IconUserSearch, IconRefresh, IconArrowLeft, - IconPaperclip, IconSend + IconPaperclip, IconSend, IconInfoCircle } from '@tabler/icons-react' import { useVirtualizer } from '@tanstack/react-virtual' import { useNavigate, useParams } from 'react-router-dom' @@ -506,40 +506,80 @@ export default function OrdersPage({ onError }: { onError: (msg: string) => void - - {!isReadOnly && ( - isSupplementaryMode ? ( - <> - }>Режим доп. заказов - {draftSavedAt && ( - - Локальный черновик:
- {formatMSKTime(draftSavedAt)} (МСК) -
- )} - - - - ) : ( - <> - {draftSavedAt && ( - - Локальный черновик:
- {formatMSKTime(draftSavedAt)} (МСК) -
- )} - - - - ) + {/* --- ИЗМЕНЕНИЯ ЗДЕСЬ: Обернули кнопки и информацию о рынке в Stack --- */} + + + {!isReadOnly && ( + isSupplementaryMode ? ( + <> + }>Режим доп. заказов + {draftSavedAt && ( + + Локальный черновик:
+ {formatMSKTime(draftSavedAt)} (МСК) +
+ )} + + + + ) : ( + <> + {draftSavedAt && ( + + Локальный черновик:
+ {formatMSKTime(draftSavedAt)} (МСК) +
+ )} + + + + ) + )} +
+ + {/* БЛОК С ИНФОРМАЦИЕЙ О РЫНКЕ */} + {data.settings?.market_stage && ( + + + + + Ситуация на рынке + + + {data.settings.market_stage} + + + {data.settings.market_stage_comment && ( + + {data.settings.market_stage_comment} + + )} + )} -
+ diff --git a/src/types/orders.ts b/src/types/orders.ts index 4431434..257298f 100644 --- a/src/types/orders.ts +++ b/src/types/orders.ts @@ -15,6 +15,8 @@ export interface MonthlyOrderSetting { month?: number year?: number deadline_date: string | null + market_stage: string | null + market_stage_comment: string | null assembly_time_days: number }