From c08f7149a178e4bac49661aa337218a5fdb7e331 Mon Sep 17 00:00:00 2001
From: Veronika Tsygankova <veronika.amilonn@gmail.com>
Date: Thu, 12 Nov 2026 09:15:31 +0300
Subject: [PATCH] =?UTF-8?q?[AURORA-2014]=20-=20=D0=A0=D0=B0=D1=81=D1=85?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=20=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D0=BC=D0=B8=20=D0=B2=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B5=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D0=B8,=20?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BD=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B5=20=D0=93=D0=9A=20=D0=B8=20=D0=BE=D0=BA=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- добавлен разделить над футером в модальном окне
- в Блоках «Консолидация» и «Организация» добавлена обводка
- модальное окно корректировок переведено на использование AppModal
---
 web/src/components/AppModal/AppModal.css                  | 4 +++-
 web/src/layouts/ConsolidationsList.tsx                    | 2 ++
 web/src/widgets/CorrectionTable/CorrectionEditorModal.tsx | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/src/components/AppModal/AppModal.css b/web/src/components/AppModal/AppModal.css
index 89f0369..c92cbb3 100644
--- a/web/src/components/AppModal/AppModal.css
+++ b/web/src/components/AppModal/AppModal.css
@@ -7,7 +7,9 @@
 	padding: 16px !important;
 }
 .appModal .ant-modal-footer {
-	padding: 0px 16px 16px 16px !important;
+	margin-top: 0 !important;
+	padding: 16px !important;
+	border-top: 1px solid #f0f0f0 !important;
 }
 .appModal .ant-modal-header {
 	border-bottom: 1px solid #f0f0f0 !important;
diff --git a/web/src/layouts/ConsolidationsList.tsx b/web/src/layouts/ConsolidationsList.tsx
index 9ea8fe4..07e1aaa 100644
--- a/web/src/layouts/ConsolidationsList.tsx
+++ b/web/src/layouts/ConsolidationsList.tsx
@@ -93,6 +93,7 @@ export function ConsolidationPage() {
 						flexDirection: 'column',
 						minHeight: 0,
 						borderRadius: 12,
+						border: '1px solid #e4e7ec',
 					}}>
 					{/* после «Взять в работу» перечитываем и панель «Организации»: в ней «Ответственный» */}
 					<ConsoleTableWidget onVersionLocked={() => setReloadKey((k) => k + 1)} />
@@ -108,6 +109,7 @@ export function ConsolidationPage() {
 						flexDirection: 'column',
 						minHeight: 0,
 						borderRadius: 12,
+						border: '1px solid #e4e7ec',
 					}}>
 					<ConsoleLegalEntitiesTable reloadKey={reloadKey} onDrawerOpen={setPanelEntity} />
 				</div>
diff --git a/web/src/widgets/CorrectionTable/CorrectionEditorModal.tsx b/web/src/widgets/CorrectionTable/CorrectionEditorModal.tsx
index 4a55e00..7dad1fb 100644
--- a/web/src/widgets/CorrectionTable/CorrectionEditorModal.tsx
+++ b/web/src/widgets/CorrectionTable/CorrectionEditorModal.tsx
@@ -1,8 +1,9 @@
 // Окно «Корректировка операции»: исходные строки ОСВ и распределение корректировки по двум сторонам агрегата, живой контроль,
 // комментарий. Правки статей и комментария пишутся в черновик (localStorage); действия со строками ОСВ уходят на сервер сразу.
-import { Alert, App, Button, Input, Modal } from 'antd';
+import { Alert, App, Button, Input } from 'antd';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { useCurrentUser } from '../../auth/MeContext';
+import { AppModal } from '../../components/AppModal/AppModal';
 import { allocate, saveCorrection } from '../../services/api/corrections';
 import type { CorrectionAggregateOut, CorrectionEntryOut, CorrectionTableOut, Side, UnallocatedEntryOut } from '../../types/corrections';
 import { AllocationPicker } from './AllocationPicker';
@@ -277,7 +278,7 @@ export function CorrectionEditorModal({ versionId, table, aggregateKey, editable
 	const hint = editable ? null : readOnlyHint(table.read_only_reason);
 
 	return (
-		<Modal
+		<AppModal
 			open
 			title='Корректировка операции'
 			width={1100}
@@ -399,6 +400,6 @@ export function CorrectionEditorModal({ versionId, table, aggregateKey, editable
 					onClose={() => setPickerSide(null)}
 				/>
 			)}
-		</Modal>
+		</AppModal>
 	);
 }
-- 
2.47.2