From c7a8eb2e3e80b9f544b3a47bc0a07c68e1ecd6db Mon Sep 17 00:00:00 2001 From: PotapovaA Date: Tue, 23 Jun 2026 11:25:59 +0300 Subject: [PATCH] =?UTF-8?q?fix=20=D1=84=D0=BE=D1=80=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RealtimeTable/constants/FORM_1/AHR.js | 30 +++++++++++++------ .../constants/FORM_1/AHR_P_NO_LOCAL.js | 4 +-- .../RealtimeTable/constants/FORM_1/CAP.js | 30 +++++++++++++------ .../constants/FORM_1/CAP_NO_LOCAL.js | 4 +-- .../RealtimeTable/constants/FORM_1/OPER.js | 29 +++++++++++++----- .../RealtimeTable/constants/FORM_2/CAP.js | 6 ++-- .../RealtimeTable/constants/FORM_2/OPER.js | 6 ++-- 7 files changed, 73 insertions(+), 36 deletions(-) diff --git a/web/src/components/RealtimeTable/constants/FORM_1/AHR.js b/web/src/components/RealtimeTable/constants/FORM_1/AHR.js index 7e6ca25..d69503e 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/AHR.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/AHR.js @@ -996,7 +996,7 @@ export const config = { }, }, { - header: "Платежив 2027 году", + header: "Платежи в 2027 году", accessorKey: "data.contract_summary.future_y1", columnLetter: "R", size: 190, @@ -1009,7 +1009,7 @@ export const config = { }, }, { - header: "Платежив 2028 году", + header: "Платежи в 2028 году", accessorKey: "data.contract_summary.future_y2", columnLetter: "S", size: 190, @@ -3423,13 +3423,6 @@ export const config = { size: 260, filterFn: "contains", }, - { - header: "Сумма, тыс руб. (без НДС)", - accessorKey: "data.q4.adj_comment", - columnLetter: "GG", - size: 250, - filterFn: "contains", - }, ], muiTableHeadCellProps: { sx: { @@ -3558,6 +3551,25 @@ export const config = { }, }, }, + { + header: "Комментарий", + accessorKey: "4_kvartal_2024_kommentariy", + columns: [ + { + header: "Сумма, тыс руб. (с учетом НДC)", + accessorKey: "data.q4.adj_comment", + columnLetter: "GG", + size: 300, + filterFn: "contains", + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: "#FFFF66", + color: "#000000", + }, + }, + }, { header: "Платеж и предоставление акта", accessorKey: "4_kvartal_2026_platezh_i_predostavlenie_akta", diff --git a/web/src/components/RealtimeTable/constants/FORM_1/AHR_P_NO_LOCAL.js b/web/src/components/RealtimeTable/constants/FORM_1/AHR_P_NO_LOCAL.js index 160c5e5..9697114 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/AHR_P_NO_LOCAL.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/AHR_P_NO_LOCAL.js @@ -984,7 +984,7 @@ } }, { - "header":"Платежив 2025 году", + "header":"Платежи в 2025 году", "accessorKey":"data.contract_summary.future_y1", "columnLetter":"R", "size":190, @@ -997,7 +997,7 @@ } }, { - "header":"Платежив 2026 году", + "header":"Платежи в 2026 году", "accessorKey":"data.contract_summary.future_y2", "columnLetter":"S", "size":190, diff --git a/web/src/components/RealtimeTable/constants/FORM_1/CAP.js b/web/src/components/RealtimeTable/constants/FORM_1/CAP.js index 1d34f23..b684d6b 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/CAP.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/CAP.js @@ -1007,7 +1007,7 @@ export const config = { }, }, { - header: "Платежив 2025 году", + header: "Платежи в 2025 году", accessorKey: "data.contract_summary.future_y1", columnLetter: "R", size: 190, @@ -1020,7 +1020,7 @@ export const config = { }, }, { - header: "Платежив 2026 году", + header: "Платежи в 2026 году", accessorKey: "data.contract_summary.future_y2", columnLetter: "S", size: 190, @@ -3440,13 +3440,6 @@ export const config = { size: 310, filterFn: "contains", }, - { - header: "Сумма, тыс руб. (с учетом НДC)", - accessorKey: "data.q4.adj_comment", - columnLetter: "GG", - size: 300, - filterFn: "contains", - }, ], muiTableHeadCellProps: { sx: { @@ -3576,6 +3569,25 @@ export const config = { }, }, }, + { + header: "Комментарий", + accessorKey: "4_kvartal_2024_kommentariy", + columns: [ + { + header: "Сумма, тыс руб. (с учетом НДC)", + accessorKey: "data.q4.adj_comment", + columnLetter: "GG", + size: 300, + filterFn: "contains", + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: "#FFFF66", + color: "#000000", + }, + }, + }, { header: "Платеж и предоставление акта", diff --git a/web/src/components/RealtimeTable/constants/FORM_1/CAP_NO_LOCAL.js b/web/src/components/RealtimeTable/constants/FORM_1/CAP_NO_LOCAL.js index 139de9c..4faec02 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/CAP_NO_LOCAL.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/CAP_NO_LOCAL.js @@ -1004,7 +1004,7 @@ } }, { - "header":"Платежив 2025 году", + "header":"Платежи в 2025 году", "accessorKey":"data.contract_summary.future_y1", "columnLetter":"R", "size":190, @@ -1017,7 +1017,7 @@ } }, { - "header":"Платежив 2026 году", + "header":"Платежи в 2026 году", "accessorKey":"data.contract_summary.future_y2", "columnLetter":"S", "size":190, diff --git a/web/src/components/RealtimeTable/constants/FORM_1/OPER.js b/web/src/components/RealtimeTable/constants/FORM_1/OPER.js index c7abcd6..439bde7 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/OPER.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/OPER.js @@ -1003,7 +1003,7 @@ export const config = { }, }, { - header: "Платежив 2025 году", + header: "Платежи в 2025 году", accessorKey: "data.contract_summary.future_y1", columnLetter: "R", size: 190, @@ -3424,13 +3424,6 @@ export const config = { size: 310, filterFn: "contains", }, - { - header: "Сумма, тыс руб. (с учетом НДC)", - accessorKey: "data.q4.adj_comment", - columnLetter: "GG", - size: 300, - filterFn: "contains", - }, ], muiTableHeadCellProps: { sx: { @@ -3560,6 +3553,26 @@ export const config = { }, }, }, + { + header: "Комментарий", + accessorKey: "4_kvartal_2024_kommentariy", + columns: [ + + { + header: "Сумма, тыс руб. (с учетом НДC)", + accessorKey: "data.q4.adj_comment", + columnLetter: "GG", + size: 300, + filterFn: "contains", + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: "#FFFF66", + color: "#000000", + }, + }, + }, { header: "Платеж и предоставление акта", diff --git a/web/src/components/RealtimeTable/constants/FORM_2/CAP.js b/web/src/components/RealtimeTable/constants/FORM_2/CAP.js index cd2f607..87d30cb 100644 --- a/web/src/components/RealtimeTable/constants/FORM_2/CAP.js +++ b/web/src/components/RealtimeTable/constants/FORM_2/CAP.js @@ -1346,7 +1346,7 @@ } }, { - "header":"Платежив 2027 году", + "header":"Платежи в 2027 году", "accessorKey":"data.contract_summary.future_y1", "columnLetter":"R", "size":190, @@ -1359,7 +1359,7 @@ } }, { - "header":"Платежив 2028 году", + "header":"Платежи в 2028 году", "accessorKey":"data.contract_summary.future_y2", "columnLetter":"S", "size":190, @@ -1425,7 +1425,7 @@ "header":"", "accessorKey":"data.allocation.property", "columnLetter":"W", - "size":150, + "size":200, "filterFn":"contains" } ] diff --git a/web/src/components/RealtimeTable/constants/FORM_2/OPER.js b/web/src/components/RealtimeTable/constants/FORM_2/OPER.js index 42f7f57..02b4e23 100644 --- a/web/src/components/RealtimeTable/constants/FORM_2/OPER.js +++ b/web/src/components/RealtimeTable/constants/FORM_2/OPER.js @@ -1347,7 +1347,7 @@ export const config = { }, }, { - header: "Платежив 2027 году", + header: "Платежи в 2027 году", accessorKey: "data.contract_summary.future_y1", columnLetter: "R", size: 190, @@ -1360,7 +1360,7 @@ export const config = { }, }, { - header: "Платежив 2028 году", + header: "Платежи в 2028 году", accessorKey: "data.contract_summary.future_y2", columnLetter: "S", size: 190, @@ -1427,7 +1427,7 @@ export const config = { header: "", accessorKey: "data.allocation.property", columnLetter: "W", - size: 150, + size: 200, filterFn: "contains", }, ],