From 922add04ef35ae4abbe032e651ad038ce236837c Mon Sep 17 00:00:00 2001 From: tsygankoviva Date: Mon, 14 Sep 2026 17:50:04 +0300 Subject: [PATCH] =?UTF-8?q?new-rows:=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B2=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../versions/0027_expense_items_update.py | 15 + .../sql/0027_expense_items_update.sql | 231 +++++ .../RealtimeTable/constants/FORM_1/AHR.js | 46 + .../constants/FORM_1/AHR_P_NO_LOCAL.js | 46 + .../RealtimeTable/constants/FORM_1/CAP.js | 46 + .../constants/FORM_1/CAP_NO_LOCAL.js | 46 + .../RealtimeTable/constants/FORM_1/OPER.js | 46 + .../RealtimeTable/constants/FORM_4/AHR.js | 48 ++ .../RealtimeTable/constants/FORM_4/CAP.js | 48 ++ .../RealtimeTable/constants/FORM_4/OPER.js | 48 ++ .../constants/FORM_4/STRUCTURE.js | 803 +++++++++++++++++- 11 files changed, 1422 insertions(+), 1 deletion(-) create mode 100644 api/alembic/versions/0027_expense_items_update.py create mode 100644 api/alembic/versions/sql/0027_expense_items_update.sql diff --git a/api/alembic/versions/0027_expense_items_update.py b/api/alembic/versions/0027_expense_items_update.py new file mode 100644 index 0000000..a21a895 --- /dev/null +++ b/api/alembic/versions/0027_expense_items_update.py @@ -0,0 +1,15 @@ +from sql_migration import run_sql_file_migration + + +revision = "0027" +down_revision = "0026" +branch_labels = None +depends_on = None + + +def upgrade() -> None: + run_sql_file_migration("0027_expense_items_update.sql") + + +def downgrade() -> None: + pass diff --git a/api/alembic/versions/sql/0027_expense_items_update.sql b/api/alembic/versions/sql/0027_expense_items_update.sql new file mode 100644 index 0000000..459b7f8 --- /dev/null +++ b/api/alembic/versions/sql/0027_expense_items_update.sql @@ -0,0 +1,231 @@ +-- Исправление справочника статей расходов по файлу "статьи расходов.docx". + +-- Лист АХР. +-- 1. Решить вопрос с лишним разделом. +delete from v3.expense_item_form_type +where expense_item_id in (70, 469) + and form_type_code in ('FORM_1', 'FORM_2', 'FORM_4'); + +-- 2. Заменить коды разделов. +update v3.expense_item set item_id = '1.14.4' where id = 71; +update v3.expense_item set item_id = '1.14.5' where id = 72; +update v3.expense_item set item_id = '1.14.6' where id = 73; +update v3.expense_item set item_id = '1.14.7' where id = 74; + +insert into v3.expense_item_form_type (expense_item_id, form_type_code) +values (74, 'FORM_2') +on conflict (expense_item_id, form_type_code) do nothing; + +-- 3. Исправить parent_id. +with moved(id, parent_id) as ( + values + (273, 11), (274, 11), (275, 11), (276, 11), (277, 11), + (278, 11), (279, 11), (280, 11), (281, 11), (282, 11), + (283, 11), (284, 11), (285, 11), (286, 11), (287, 11), + (288, 11), (289, 11), (290, 11), (291, 11), (292, 11), + (446, 60), + (447, 61), (448, 61), (449, 61), (450, 61), (451, 61), (452, 61), + (453, 62), (454, 62), (455, 62), (456, 62), + (477, 75), (478, 75) +) +update v3.expense_item ei +set parent_id = moved.parent_id +from moved +where ei.id = moved.id; + +-- 4. Дозаполнить существующие статьи и добавить отсутствующие. +with source(id, section_code, item_id, num_group_id, name, sheet, direction, parent_id, depth) as ( + values + (776, 'AHR', 'R061041005', '401140089', 'ГСМ', 'AHR', 'Support', 16, 3), + (777, 'AHR', 'R061046005', '209720092', 'Ремонт: АТС', 'AHR', 'Support', 21, 3), + (778, 'AHR', 'R061061001', '211120115', 'Физическая охр.ОН', 'AHR', 'Support', 32, 3), + (779, 'AHR', 'R061062001', '211220116', 'Пультовая охр.ОН', 'AHR', 'Support', 33, 3), + (780, 'AHR', 'R061064000', '211420118', 'Охр.имущ. п/транс-ке', 'AHR', 'Support', 35, 3), + (781, 'AHR', 'R061065003', '211520119', 'Пультовая охр.УС', 'AHR', 'Support', 36, 3), + (782, 'AHR', 'R061066009', '210220105', 'ТО/эксп_обор.сис охр', 'AHR', 'Support', 37, 3), + (783, 'AHR', 'R061067009', '210920113', 'Ремонт:обор.сис охр', 'AHR', 'Support', 38, 3), + (784, 'AHR', 'R061071000', '401440097', 'Бумага', 'AHR', 'Support', 41, 3), + (785, 'AHR', 'R061072000', '401540098', 'Канцтовары', 'AHR', 'Support', 42, 3), + (786, 'AHR', 'R061073000', '401640099', 'Архивный короб', 'AHR', 'Support', 43, 3), + (787, 'AHR', 'R061091000', '212720132', 'Аудиторские услуги', 'AHR', 'Support', 53, 3), + (788, 'AHR', 'R061093000', '212920134', 'Рейтинговые услуги', 'AHR', 'Support', 55, 3), + (789, 'AHR', 'R061095001', '213120140', 'Оценка ОН', 'AHR', 'Support', 57, 3), + (790, 'AHR', 'R061096000', '213220141', 'Оценка пр активов', 'AHR', 'Support', 58, 3), + (791, 'AHR', 'R061097000', '213320142', 'Исслед и разработки', 'AHR', 'Support', 59, 3), + (792, 'AHR', 'R061146000', '402540095', 'СИЗ для персонала', 'AHR', 'Support', 72, 3), + (793, 'AHR', 'R061151019', '215820170', 'Комм усл и сод_НВНОД', 'AHR', 'Support', 76, 3), + (794, 'AHR', 'R061152019', '215920171', 'Ремонт_НВНОД', 'AHR', 'Support', 77, 3), + (795, 'AHR', 'R061153019', '216020172', 'Охрана_НВНОД', 'AHR', 'Support', 78, 3), + (796, 'AHR', 'R061154019', '216120173', 'Орг торгов_НВНОД', 'AHR', 'Support', 79, 3), + (797, 'AHR', 'R061155019', '216320175', 'Оценка объект_НВНОД', 'AHR', 'Support', 80, 3) +) +update v3.expense_item ei +set section_code = source.section_code, + item_id = source.item_id, + num_group_id = source.num_group_id, + name = source.name, + sheet = source.sheet, + direction = source.direction, + parent_id = source.parent_id, + depth = source.depth +from source +where ei.id = source.id; + +insert into v3.expense_item (id, section_code, item_id, num_group_id, name, sheet, direction, parent_id, depth) +select 799, 'AHR', 'R061061001', '211120115', 'Коммунальные услуги', 'AHR', 'Support', 24, 3 +where not exists (select 1 from v3.expense_item where id = 799); + +with source(expense_item_id, form_type_code) as ( + values + (776, 'FORM_1'), (776, 'FORM_2'), (777, 'FORM_1'), (777, 'FORM_2'), + (778, 'FORM_1'), (778, 'FORM_2'), (779, 'FORM_1'), (779, 'FORM_2'), + (780, 'FORM_1'), (780, 'FORM_2'), (781, 'FORM_1'), (781, 'FORM_2'), + (782, 'FORM_1'), (782, 'FORM_2'), (783, 'FORM_1'), (783, 'FORM_2'), + (784, 'FORM_1'), (784, 'FORM_2'), (785, 'FORM_1'), (785, 'FORM_2'), + (786, 'FORM_1'), (786, 'FORM_2'), (787, 'FORM_1'), (787, 'FORM_2'), + (788, 'FORM_1'), (788, 'FORM_2'), (789, 'FORM_1'), (789, 'FORM_2'), + (790, 'FORM_1'), (790, 'FORM_2'), (791, 'FORM_1'), (791, 'FORM_2'), + (792, 'FORM_1'), (792, 'FORM_2'), (793, 'FORM_1'), (793, 'FORM_2'), + (794, 'FORM_1'), (794, 'FORM_2'), (795, 'FORM_1'), (795, 'FORM_2'), + (796, 'FORM_1'), (796, 'FORM_2'), (797, 'FORM_1'), (797, 'FORM_2'), + (799, 'FORM_2') +) +insert into v3.expense_item_form_type (expense_item_id, form_type_code) +select expense_item_id, form_type_code +from source +on conflict (expense_item_id, form_type_code) do nothing; + +-- 5. Проверить лишние привязки ПД. +delete from v3.expense_item_form_type +where form_type_code = 'FORM_4' + and ( + expense_item_id in (347, 461, 469) + or expense_item_id between 748 and 759 + or expense_item_id between 761 and 765 + or expense_item_id between 767 and 774 + ); + +-- Лист КВП. +-- 1. Исправить parent_id. +with moved(id, parent_id) as ( + values + (538, 508), (539, 508), (540, 508), (541, 508), (542, 508), + (543, 508), (544, 508), (545, 508), (546, 508), (547, 508), + (548, 508), (549, 508), (550, 508), (551, 508), (552, 508), + (553, 508), (554, 508), (555, 508), (556, 508), (557, 508), + (558, 508), (559, 508), (560, 508), (561, 508), (562, 508), + (563, 508), (564, 508), (565, 508), (566, 508), (567, 508), + (568, 508), (569, 508), (570, 508), (571, 508), (572, 508), + (573, 508), (574, 508), (575, 508), (576, 508), (577, 508), + (578, 509), + (579, 510), (580, 510), (581, 510), (582, 510), (583, 510), + (584, 510), (585, 510), + (586, 511), (587, 511), (588, 511), (589, 511), (590, 511), + (591, 511), + (592, 512), (593, 512), (594, 512), (595, 512), (596, 512), + (597, 512), (598, 512), (599, 512), (600, 512), (601, 512), + (602, 512), (603, 512), (604, 512), (605, 512), (606, 512), + (607, 512), (608, 512), (609, 512), (610, 512), (611, 512), + (612, 512), (613, 512), (614, 512), (615, 512), (616, 512), + (617, 512), (618, 512), (619, 512), (620, 512), (621, 512), + (622, 512), (623, 512), (624, 512), (625, 512), (626, 512), + (627, 512), (628, 512), (629, 512), (630, 512), (631, 512), + (632, 512), (633, 512), (634, 512), (635, 512), (636, 512), + (637, 512), (638, 512), (639, 512), (640, 512), (641, 512), + (642, 512), (643, 512), (644, 512), (645, 512), (646, 512), + (647, 512), (648, 512), (649, 512), (650, 512), (651, 512), + (652, 513), (653, 513), (654, 513), (655, 513), (656, 513), + (657, 513), (658, 513), (659, 513), (660, 513), (661, 513), + (662, 513), (663, 513), (664, 513), (665, 513), (666, 513), + (667, 513), (668, 513), (669, 513), + (675, 517), + (676, 518), (677, 518), (678, 518), (679, 518), (680, 518), + (681, 519), (682, 519), (683, 519), (684, 519), (685, 519), + (686, 519), (687, 519), (688, 519), (689, 519), (690, 519), + (691, 519), (692, 519), + (693, 520), (694, 520), + (695, 521), (696, 521), (697, 521), + (698, 522), (699, 522), (700, 522), + (701, 523), (702, 523), (703, 523), + (704, 524), (705, 524), (706, 524), + (707, 525) +) +update v3.expense_item ei +set parent_id = moved.parent_id +from moved +where ei.id = moved.id; + +-- 2. Дозаполнить существующую статью. +update v3.expense_item +set section_code = 'CAP', + item_id = 'R063085003', + num_group_id = '220330004', + name = 'Перевозка_УС', + sheet = 'CAP', + direction = 'Support', + parent_id = 516, + depth = 3 +where id = 798; + +insert into v3.expense_item_form_type (expense_item_id, form_type_code) +values (798, 'FORM_1'), (798, 'FORM_2') +on conflict (expense_item_id, form_type_code) do nothing; + +-- Лист Операц. +-- 1. Решить вопрос с лишним разделом. +delete from v3.expense_item_form_type +where expense_item_id = 718 + and form_type_code in ('FORM_1', 'FORM_2', 'FORM_4'); + +-- 2. Заменить коды разделов. +update v3.expense_item set item_id = '4.04.6' where id = 719; +update v3.expense_item set item_id = '4.04.7' where id = 720; +update v3.expense_item set item_id = '4.04.8' where id = 721; +update v3.expense_item set item_id = '4.04.9' where id = 722; +update v3.expense_item set item_id = '4.04.10' where id = 723; +update v3.expense_item set item_id = '4.04.11' where id = 724; +update v3.expense_item set item_id = '4.04.12' where id = 725; +update v3.expense_item set item_id = '4.04.13' where id = 726; +update v3.expense_item set item_id = '4.04.14' where id = 727; + +insert into v3.expense_item_form_type (expense_item_id, form_type_code) +values (727, 'FORM_2') +on conflict (expense_item_id, form_type_code) do nothing; + + +-- 3. Добавить отсутствующие статьи. +insert into v3.expense_item (id, section_code, item_id, num_group_id, name, sheet, direction, parent_id, depth) +values + (800, 'OPER', 'R064040033', '402740198', 'Бланки сбер книжекМЦ', 'OPER', 'Support', 715, 3), + (801, 'OPER', 'R064040044', '222420186', 'Изгот банк карт', 'OPER', 'Support', 717, 3), + (802, 'OPER', 'R064040036', '222620188', 'Госпошл', 'OPER', 'Support', 719, 3), + (803, 'OPER', 'R064040038', '223320190', 'Услуги', 'OPER', 'Support', 720, 3), + (804, 'OPER', 'R064040039', null, 'Нотариальные', 'OPER', 'Support', 721, 3), + (805, 'OPER', 'R064040040', null, 'Штрафы', 'OPER', 'Support', 722, 3), + (806, 'OPER', 'R064040041', null, 'Списание недостач', 'OPER', 'Support', 723, 3), + (807, 'OPER', 'R064040042', null, 'Списание дебиторки', 'OPER', 'Support', 724, 3), + (808, 'OPER', 'R064040043', null, 'Передача активов', 'OPER', 'Support', 725, 3) +on conflict (id) do nothing; + +with source(expense_item_id, form_type_code) as ( + values + (745, 'FORM_2'), + (800, 'FORM_1'), (800, 'FORM_2'), (801, 'FORM_1'), (801, 'FORM_2'), + (802, 'FORM_1'), (802, 'FORM_2'), (803, 'FORM_1'), (803, 'FORM_2'), + (804, 'FORM_1'), (804, 'FORM_2'), (805, 'FORM_1'), (805, 'FORM_2'), + (806, 'FORM_1'), (806, 'FORM_2'), (807, 'FORM_1'), (807, 'FORM_2'), + (808, 'FORM_1'), (808, 'FORM_2') +) +insert into v3.expense_item_form_type (expense_item_id, form_type_code) +select expense_item_id, form_type_code +from source +on conflict (expense_item_id, form_type_code) do nothing; + +-- 5. Проверить лишние привязки ПД. +delete from v3.expense_item_form_type +where form_type_code = 'FORM_4' + and expense_item_id in (736, 745); + +select setval('v3.expense_item_id_seq', greatest((select max(id) from v3.expense_item), 808)); +refresh materialized view v3.mv_expense_item_tree; + diff --git a/web/src/components/RealtimeTable/constants/FORM_1/AHR.js b/web/src/components/RealtimeTable/constants/FORM_1/AHR.js index 43d16aa..37aeb0f 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/AHR.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/AHR.js @@ -434,6 +434,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2026_perenos_v_3_kv_26_summa_tys_rub_bez_nds': { color_type: redColumn, accessorKey: '2_kvartal_2026_perenos_v_3_kv_26_summa_tys_rub_bez_nds', @@ -554,6 +558,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2026_perenos_v_4_kv_26_summa_tys_rub_bez_nds': { color_type: redColumn, accessorKey: '3_kvartal_2026_perenos_v_4_kv_26_summa_tys_rub_bez_nds', @@ -2482,6 +2490,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (без НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 260, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2026_skorr_plan_2_kv_26', @@ -3008,6 +3035,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (без НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 260, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2026_skorr_plan_3_kv_26', 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 550920e..78136d7 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 @@ -434,6 +434,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_bez_nds': { color_type: redColumn, accessorKey: '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_bez_nds', @@ -554,6 +558,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_bez_nds': { color_type: redColumn, accessorKey: '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_bez_nds', @@ -2595,6 +2603,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (без НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 260, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2024_skorr_plan_2_kv_24', @@ -3159,6 +3186,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (без НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 260, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2024_skorr_plan_3_kv_24', diff --git a/web/src/components/RealtimeTable/constants/FORM_1/CAP.js b/web/src/components/RealtimeTable/constants/FORM_1/CAP.js index 28a7b2f..ace94ae 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/CAP.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/CAP.js @@ -430,6 +430,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_s_uchetom_ndc': { color_type: redColumn, accessorKey: '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_s_uchetom_ndc', @@ -554,6 +558,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_s_uchetom_ndc': { color_type: redColumn, accessorKey: '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_s_uchetom_ndc', @@ -2491,6 +2499,25 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (с учётом НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 310, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2024_skorr_plan_2_kv_24', @@ -3020,6 +3047,25 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (с учётом НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 310, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2024_skorr_plan_3_kv_24', 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 c3caeb0..45af1f6 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 @@ -430,6 +430,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_s_uchetom_ndc': { color_type: redColumn, accessorKey: '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_s_uchetom_ndc', @@ -554,6 +558,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_s_uchetom_ndc': { color_type: redColumn, accessorKey: '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_s_uchetom_ndc', @@ -2596,6 +2604,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (с учётом НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 310, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2024_skorr_plan_2_kv_24', @@ -3179,6 +3206,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (с учётом НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 310, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2024_skorr_plan_3_kv_24', diff --git a/web/src/components/RealtimeTable/constants/FORM_1/OPER.js b/web/src/components/RealtimeTable/constants/FORM_1/OPER.js index b4eb05b..7ceda72 100644 --- a/web/src/components/RealtimeTable/constants/FORM_1/OPER.js +++ b/web/src/components/RealtimeTable/constants/FORM_1/OPER.js @@ -426,6 +426,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_s_uchetom_ndc': { color_type: redColumn, accessorKey: '2_kvartal_2024_perenos_v_3_kv_24_summa_tys_rub_s_uchetom_ndc', @@ -550,6 +554,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_s_uchetom_ndc': { color_type: redColumn, accessorKey: '3_kvartal_2024_perenos_v_4_kv_24_summa_tys_rub_s_uchetom_ndc', @@ -2476,6 +2484,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (с учётом НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 310, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 2 кв. {year:short}', @@ -3005,6 +3032,25 @@ export const config = { }, }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2024_kommentariy_adj', + columns: [ + { + header: 'Сумма, тыс. руб. (с учётом НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 310, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF66', + color: '#000000', + }, + }, + }, { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2024_skorr_plan_3_kv_24', diff --git a/web/src/components/RealtimeTable/constants/FORM_4/AHR.js b/web/src/components/RealtimeTable/constants/FORM_4/AHR.js index 2b42790..86e18c2 100644 --- a/web/src/components/RealtimeTable/constants/FORM_4/AHR.js +++ b/web/src/components/RealtimeTable/constants/FORM_4/AHR.js @@ -430,6 +430,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2026_perenos_v_3_kv_26_summa_bez_nds': { color_type: redColumn, accessorKey: '2_kvartal_2026_perenos_v_3_kv_26_summa_bez_nds', @@ -550,6 +554,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2026_perenos_v_4_kv_26_summa_bez_nds': { color_type: redColumn, accessorKey: '3_kvartal_2026_perenos_v_4_kv_26_summa_bez_nds', @@ -2558,6 +2566,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2026_skorr_plan_2_kv_26', @@ -3086,6 +3114,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2026_skorr_plan_3_kv_26', diff --git a/web/src/components/RealtimeTable/constants/FORM_4/CAP.js b/web/src/components/RealtimeTable/constants/FORM_4/CAP.js index 97e3460..2d90cc3 100644 --- a/web/src/components/RealtimeTable/constants/FORM_4/CAP.js +++ b/web/src/components/RealtimeTable/constants/FORM_4/CAP.js @@ -430,6 +430,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2026_perenos_v_3_kv_26_summa_bez_nds': { color_type: redColumn, accessorKey: '2_kvartal_2026_perenos_v_3_kv_26_summa_bez_nds', @@ -550,6 +554,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2026_perenos_v_4_kv_26_summa_bez_nds': { color_type: redColumn, accessorKey: '3_kvartal_2026_perenos_v_4_kv_26_summa_bez_nds', @@ -2556,6 +2564,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2026_skorr_plan_2_kv_26', @@ -3083,6 +3111,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2026_skorr_plan_3_kv_26', diff --git a/web/src/components/RealtimeTable/constants/FORM_4/OPER.js b/web/src/components/RealtimeTable/constants/FORM_4/OPER.js index d72604d..77695b6 100644 --- a/web/src/components/RealtimeTable/constants/FORM_4/OPER.js +++ b/web/src/components/RealtimeTable/constants/FORM_4/OPER.js @@ -430,6 +430,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q2.adj_reserve', }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, '2_kvartal_2026_perenos_v_3_kv_26_summa_bez_nds': { color_type: redColumn, accessorKey: '2_kvartal_2026_perenos_v_3_kv_26_summa_bez_nds', @@ -550,6 +554,10 @@ export const config = { color_type: yellowColumn, accessorKey: 'data.q3.adj_reserve', }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, '3_kvartal_2026_perenos_v_4_kv_26_summa_bez_nds': { color_type: redColumn, accessorKey: '3_kvartal_2026_perenos_v_4_kv_26_summa_bez_nds', @@ -2555,6 +2563,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: 'Скорректированный план 2 кв. {year:short}', accessorKey: '2_kvartal_2026_skorr_plan_2_kv_26', @@ -3082,6 +3110,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: 'Скорректированный план 3 кв. {year:short}', accessorKey: '3_kvartal_2026_skorr_plan_3_kv_26', diff --git a/web/src/components/RealtimeTable/constants/FORM_4/STRUCTURE.js b/web/src/components/RealtimeTable/constants/FORM_4/STRUCTURE.js index 87efa11..ed53ad0 100644 --- a/web/src/components/RealtimeTable/constants/FORM_4/STRUCTURE.js +++ b/web/src/components/RealtimeTable/constants/FORM_4/STRUCTURE.js @@ -8,7 +8,768 @@ import { } from "../columnColors"; export const config = { config: { - colors: {}, + colors: { + 'data.header.section_code': { + color_type: greenColumn, + accessorKey: 'data.header.section_code', + }, + 'data.header.item_id': { + color_type: greenColumn, + accessorKey: 'data.header.item_id', + }, + 'data.header.num_group': { + color_type: greenColumn, + accessorKey: 'data.header.num_group', + }, + 'data.header.name': { + color_type: greenColumn, + accessorKey: 'data.header.name', + }, + 'data.header.internal_order': { + color_type: greenColumn, + accessorKey: 'data.header.internal_order', + }, + 'data.plan.q1': { + color_type: greenColumn, + accessorKey: 'data.plan.q1', + }, + 'data.plan.q2': { + color_type: greenColumn, + accessorKey: 'data.plan.q2', + }, + 'data.plan.q3': { + color_type: greenColumn, + accessorKey: 'data.plan.q3', + }, + 'data.plan.q4': { + color_type: greenColumn, + accessorKey: 'data.plan.q4', + }, + 'data.plan.year': { + color_type: greenColumn, + accessorKey: 'data.plan.year', + }, + 'data.plan.comment': { + color_type: greenColumn, + accessorKey: 'data.plan.comment', + }, + 'data.contract_summary.amount': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.amount', + }, + 'data.contract_summary.counterparty': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.counterparty', + }, + 'data.contract_summary.deadline': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.deadline', + }, + 'data.contract_summary.comment': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.comment', + }, + 'data.contract_summary.future_payments_y1': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.future_payments_y1', + }, + 'data.contract_summary.future_payments_y2': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.future_payments_y2', + }, + 'data.contract_summary.other_ssp_amount': { + color_type: greenColumn, + accessorKey: 'data.contract_summary.other_ssp_amount', + }, + 'data.allocation.contract_ref': { + color_type: greenColumn, + accessorKey: 'data.allocation.contract_ref', + }, + 'data.allocation.allocation_purpose': { + color_type: greenColumn, + accessorKey: 'data.allocation.allocation_purpose', + }, + 'data.seq_dfip.q1': { + color_type: greenColumn, + accessorKey: 'data.seq_dfip.q1', + }, + 'data.seq_dfip.q2': { + color_type: greenColumn, + accessorKey: 'data.seq_dfip.q2', + }, + 'data.seq_dfip.q3': { + color_type: greenColumn, + accessorKey: 'data.seq_dfip.q3', + }, + 'data.seq_dfip.q4': { + color_type: greenColumn, + accessorKey: 'data.seq_dfip.q4', + }, + 'data.seq_dfip.year': { + color_type: greenColumn, + accessorKey: 'data.seq_dfip.year', + }, + 'data.seq_dfip.justification': { + color_type: greenColumn, + accessorKey: 'data.seq_dfip.justification', + }, + 'data.reserve.q1': { + color_type: greenColumn, + accessorKey: 'data.reserve.q1', + }, + 'data.reserve.q2': { + color_type: greenColumn, + accessorKey: 'data.reserve.q2', + }, + 'data.reserve.q3': { + color_type: greenColumn, + accessorKey: 'data.reserve.q3', + }, + 'data.reserve.q4': { + color_type: greenColumn, + accessorKey: 'data.reserve.q4', + }, + 'data.reserve.year': { + color_type: greenColumn, + accessorKey: 'data.reserve.year', + }, + 'data.reserve.justification': { + color_type: greenColumn, + accessorKey: 'data.reserve.justification', + }, + 'data.approved.q1': { + color_type: greenColumn, + accessorKey: 'data.approved.q1', + }, + 'data.approved.q2': { + color_type: greenColumn, + accessorKey: 'data.approved.q2', + }, + 'data.approved.q3': { + color_type: greenColumn, + accessorKey: 'data.approved.q3', + }, + 'data.approved.q4': { + color_type: greenColumn, + accessorKey: 'data.approved.q4', + }, + 'data.approved.year': { + color_type: greenColumn, + accessorKey: 'data.approved.year', + }, + 'data.collegial.amount': { + color_type: orangeColumn, + accessorKey: 'data.collegial.amount', + }, + 'data.collegial.protocol_reference': { + color_type: orangeColumn, + accessorKey: 'data.collegial.protocol_reference', + }, + field_kollegialnye_organy_field: { + color_type: orangeColumn, + accessorKey: 'field_kollegialnye_organy_field', + }, + 'data.collegial.note': { + color_type: orangeColumn, + accessorKey: 'data.collegial.note', + }, + field_field_field: { + color_type: whiteColumn, + accessorKey: 'field_field_field', + }, + 'data.ckk.ceiling': { + color_type: orangeColumn, + accessorKey: 'data.ckk.ceiling', + }, + 'data.ckk.expenses_q1': { + color_type: orangeColumn, + accessorKey: 'data.ckk.expenses_q1', + }, + 'data.ckk.expenses_q2': { + color_type: orangeColumn, + accessorKey: 'data.ckk.expenses_q2', + }, + 'data.ckk.expenses_q3': { + color_type: orangeColumn, + accessorKey: 'data.ckk.expenses_q3', + }, + 'data.ckk.expenses_q4': { + color_type: orangeColumn, + accessorKey: 'data.ckk.expenses_q4', + }, + 'data.ckk.rf_schedule': { + color_type: orangeColumn, + accessorKey: 'data.ckk.rf_schedule', + }, + 'data.ckk.delivery_deadline': { + color_type: orangeColumn, + accessorKey: 'data.ckk.delivery_deadline', + }, + 'data.ckk.procurement_plan': { + color_type: orangeColumn, + accessorKey: 'data.ckk.procurement_plan', + }, + 'data.ckk.procurement_method': { + color_type: orangeColumn, + accessorKey: 'data.ckk.procurement_method', + }, + 'data.ckk.comment': { + color_type: orangeColumn, + accessorKey: 'data.ckk.comment', + }, + 'data.contract.counterparty': { + color_type: orangeColumn, + accessorKey: 'data.contract.counterparty', + }, + 'data.contract.reference': { + color_type: orangeColumn, + accessorKey: 'data.contract.reference', + }, + 'data.contract.addenda': { + color_type: orangeColumn, + accessorKey: 'data.contract.addenda', + }, + 'data.contract.subject': { + color_type: orangeColumn, + accessorKey: 'data.contract.subject', + }, + 'data.contract.currency': { + color_type: orangeColumn, + accessorKey: 'data.contract.currency', + }, + 'data.contract.ceiling': { + color_type: orangeColumn, + accessorKey: 'data.contract.ceiling', + }, + 'data.contract.expenses_q1': { + color_type: orangeColumn, + accessorKey: 'data.contract.expenses_q1', + }, + 'data.contract.expenses_q2': { + color_type: orangeColumn, + accessorKey: 'data.contract.expenses_q2', + }, + 'data.contract.expenses_q3': { + color_type: orangeColumn, + accessorKey: 'data.contract.expenses_q3', + }, + 'data.contract.expenses_q4': { + color_type: orangeColumn, + accessorKey: 'data.contract.expenses_q4', + }, + 'data.contract.rf_schedule': { + color_type: orangeColumn, + accessorKey: 'data.contract.rf_schedule', + }, + 'data.contract.vat_rate': { + color_type: orangeColumn, + accessorKey: 'data.contract.vat_rate', + }, + 'data.contract.exchange_rate': { + color_type: orangeColumn, + accessorKey: 'data.contract.exchange_rate', + }, + 'data.contract.amount_foreign': { + color_type: orangeColumn, + accessorKey: 'data.contract.amount_foreign', + }, + 'data.contract.deadline': { + color_type: orangeColumn, + accessorKey: 'data.contract.deadline', + }, + 'data.contract.scheme': { + color_type: orangeColumn, + accessorKey: 'data.contract.scheme', + }, + 'data.contract.act': { + color_type: orangeColumn, + accessorKey: 'data.contract.act', + }, + 'data.contract.comment': { + color_type: orangeColumn, + accessorKey: 'data.contract.comment', + }, + 'data.q1.adj_current': { + color_type: yellowColumn, + accessorKey: 'data.q1.adj_current', + }, + 'data.q1.adj_ssp': { + color_type: yellowColumn, + accessorKey: 'data.q1.adj_ssp', + }, + 'data.q1.adj_rf': { + color_type: yellowColumn, + accessorKey: 'data.q1.adj_rf', + }, + 'data.q1.adj_reserve': { + color_type: yellowColumn, + accessorKey: 'data.q1.adj_reserve', + }, + '1_kvartal_2026_perenos_vo_2_kv_26_summa_tys_rub_bez_nds': { + color_type: redColumn, + accessorKey: '1_kvartal_2026_perenos_vo_2_kv_26_summa_tys_rub_bez_nds', + }, + 'data.q1.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q1.adj_comment', + }, + 'data.q1.corrected_plan': { + color_type: yellowColumn, + accessorKey: 'data.q1.corrected_plan', + }, + '1_kvartal_2026_field_field': { + color_type: whiteColumn, + accessorKey: '1_kvartal_2026_field_field', + }, + 'data.q1.pay_date': { + color_type: blueColumn, + accessorKey: 'data.q1.pay_date', + }, + 'data.q1.pay_amount': { + color_type: blueColumn, + accessorKey: 'data.q1.pay_amount', + }, + 'data.q1.pay_ho': { + color_type: blueColumn, + accessorKey: 'data.q1.pay_ho', + }, + 'data.q1.pay_rf': { + color_type: blueColumn, + accessorKey: 'data.q1.pay_rf', + }, + 'data.q1.pay_comment': { + color_type: blueColumn, + accessorKey: 'data.q1.pay_comment', + }, + 'data.q1.pay_act': { + color_type: blueColumn, + accessorKey: 'data.q1.pay_act', + }, + 'data.q1.booking': { + color_type: orangeColumn, + accessorKey: 'data.q1.booking', + }, + 'data.q1.actual_m1': { + color_type: greenColumn, + accessorKey: 'data.q1.actual_m1', + }, + 'data.q1.actual_m2': { + color_type: greenColumn, + accessorKey: 'data.q1.actual_m2', + }, + 'data.q1.actual_m3': { + color_type: greenColumn, + accessorKey: 'data.q1.actual_m3', + }, + 'data.q1.actual_quarter': { + color_type: greenColumn, + accessorKey: 'data.q1.actual_quarter', + }, + 'data.q1.residual_after_booking': { + color_type: orangeColumn, + accessorKey: 'data.q1.residual_after_booking', + }, + 'data.q1.residual_after_actual': { + color_type: greenColumn, + accessorKey: 'data.q1.residual_after_actual', + }, + 'data.q1.transfer_q2': { + color_type: redColumn, + accessorKey: 'data.q1.transfer_q2', + }, + 'data.q1.transfer_q3': { + color_type: redColumn, + accessorKey: 'data.q1.transfer_q3', + }, + 'data.q1.transfer_q4': { + color_type: redColumn, + accessorKey: 'data.q1.transfer_q4', + }, + 'data.q1.transfer_econ': { + color_type: redColumn, + accessorKey: 'data.q1.transfer_econ', + }, + 'data.q1.total': { + color_type: redColumn, + accessorKey: 'data.q1.total', + }, + 'data.q2.target_change': { + color_type: redColumn, + accessorKey: 'data.q2.target_change', + }, + 'data.q2.base_correction': { + color_type: redColumn, + accessorKey: 'data.q2.base_correction', + }, + 'data.q2.revision_inc': { + color_type: redColumn, + accessorKey: 'data.q2.revision_inc', + }, + 'data.q2.revision_seq': { + color_type: redColumn, + accessorKey: 'data.q2.revision_seq', + }, + 'data.q2.revision_comment': { + color_type: redColumn, + accessorKey: 'data.q2.revision_comment', + }, + 'data.q2.new_plan': { + color_type: yellowColumn, + accessorKey: 'data.q2.new_plan', + }, + '2_kvartal_2026_field_field': { + color_type: whiteColumn, + accessorKey: '2_kvartal_2026_field_field', + }, + 'data.q2.adj_current': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_current', + }, + 'data.q2.adj_ssp': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_ssp', + }, + 'data.q2.adj_rf': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_rf', + }, + 'data.q2.adj_reserve': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_reserve', + }, + 'data.q2.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q2.adj_comment', + }, + '2_kvartal_2026_perenos_v_3_kv_26_summa_tys_rub_bez_nds': { + color_type: redColumn, + accessorKey: '2_kvartal_2026_perenos_v_3_kv_26_summa_tys_rub_bez_nds', + }, + 'data.q2.corrected_plan': { + color_type: yellowColumn, + accessorKey: 'data.q2.corrected_plan', + }, + 'data.q2.pay_date': { + color_type: blueColumn, + accessorKey: 'data.q2.pay_date', + }, + 'data.q2.pay_amount': { + color_type: blueColumn, + accessorKey: 'data.q2.pay_amount', + }, + 'data.q2.pay_ho': { + color_type: blueColumn, + accessorKey: 'data.q2.pay_ho', + }, + 'data.q2.pay_rf': { + color_type: blueColumn, + accessorKey: 'data.q2.pay_rf', + }, + 'data.q2.pay_comment': { + color_type: blueColumn, + accessorKey: 'data.q2.pay_comment', + }, + 'data.q2.pay_act': { + color_type: blueColumn, + accessorKey: 'data.q2.pay_act', + }, + 'data.q2.booking': { + color_type: orangeColumn, + accessorKey: 'data.q2.booking', + }, + 'data.q2.actual_m1': { + color_type: greenColumn, + accessorKey: 'data.q2.actual_m1', + }, + 'data.q2.actual_m2': { + color_type: greenColumn, + accessorKey: 'data.q2.actual_m2', + }, + 'data.q2.actual_m3': { + color_type: greenColumn, + accessorKey: 'data.q2.actual_m3', + }, + 'data.q2.actual_quarter': { + color_type: greenColumn, + accessorKey: 'data.q2.actual_quarter', + }, + 'data.q2.residual_after_booking': { + color_type: orangeColumn, + accessorKey: 'data.q2.residual_after_booking', + }, + 'data.q2.residual_after_actual': { + color_type: greenColumn, + accessorKey: 'data.q2.residual_after_actual', + }, + 'data.q2.transfer_q3': { + color_type: redColumn, + accessorKey: 'data.q2.transfer_q3', + }, + 'data.q2.transfer_q4': { + color_type: redColumn, + accessorKey: 'data.q2.transfer_q4', + }, + 'data.q2.transfer_econ': { + color_type: redColumn, + accessorKey: 'data.q2.transfer_econ', + }, + 'data.q2.total': { + color_type: redColumn, + accessorKey: 'data.q2.total', + }, + 'data.q3.target_change': { + color_type: redColumn, + accessorKey: 'data.q3.target_change', + }, + 'data.q3.base_correction': { + color_type: redColumn, + accessorKey: 'data.q3.base_correction', + }, + 'data.q3.revision_inc': { + color_type: redColumn, + accessorKey: 'data.q3.revision_inc', + }, + 'data.q3.revision_seq': { + color_type: redColumn, + accessorKey: 'data.q3.revision_seq', + }, + 'data.q3.revision_comment': { + color_type: redColumn, + accessorKey: 'data.q3.revision_comment', + }, + 'data.q3.new_plan': { + color_type: yellowColumn, + accessorKey: 'data.q3.new_plan', + }, + '3_kvartal_2026_field_field': { + color_type: whiteColumn, + accessorKey: '3_kvartal_2026_field_field', + }, + 'data.q3.adj_current': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_current', + }, + 'data.q3.adj_ssp': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_ssp', + }, + 'data.q3.adj_rf': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_rf', + }, + 'data.q3.adj_reserve': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_reserve', + }, + 'data.q3.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q3.adj_comment', + }, + '3_kvartal_2026_perenos_v_4_kv_26_summa_tys_rub_bez_nds': { + color_type: redColumn, + accessorKey: '3_kvartal_2026_perenos_v_4_kv_26_summa_tys_rub_bez_nds', + }, + 'data.q3.corrected_plan': { + color_type: yellowColumn, + accessorKey: 'data.q3.corrected_plan', + }, + 'data.q3.pay_date': { + color_type: blueColumn, + accessorKey: 'data.q3.pay_date', + }, + 'data.q3.pay_amount': { + color_type: blueColumn, + accessorKey: 'data.q3.pay_amount', + }, + 'data.q3.pay_ho': { + color_type: blueColumn, + accessorKey: 'data.q3.pay_ho', + }, + 'data.q3.pay_rf': { + color_type: blueColumn, + accessorKey: 'data.q3.pay_rf', + }, + 'data.q3.pay_comment': { + color_type: blueColumn, + accessorKey: 'data.q3.pay_comment', + }, + 'data.q3.pay_act': { + color_type: blueColumn, + accessorKey: 'data.q3.pay_act', + }, + 'data.q3.booking': { + color_type: orangeColumn, + accessorKey: 'data.q3.booking', + }, + 'data.q3.actual_m1': { + color_type: greenColumn, + accessorKey: 'data.q3.actual_m1', + }, + 'data.q3.actual_m2': { + color_type: greenColumn, + accessorKey: 'data.q3.actual_m2', + }, + 'data.q3.actual_m3': { + color_type: greenColumn, + accessorKey: 'data.q3.actual_m3', + }, + 'data.q3.actual_quarter': { + color_type: greenColumn, + accessorKey: 'data.q3.actual_quarter', + }, + 'data.q3.residual_after_booking': { + color_type: orangeColumn, + accessorKey: 'data.q3.residual_after_booking', + }, + 'data.q3.residual_after_actual': { + color_type: greenColumn, + accessorKey: 'data.q3.residual_after_actual', + }, + 'data.q3.transfer_q4': { + color_type: redColumn, + accessorKey: 'data.q3.transfer_q4', + }, + 'data.q3.transfer_econ': { + color_type: redColumn, + accessorKey: 'data.q3.transfer_econ', + }, + 'data.q3.total': { + color_type: redColumn, + accessorKey: 'data.q3.total', + }, + 'data.q4.target_change': { + color_type: redColumn, + accessorKey: 'data.q4.target_change', + }, + 'data.q4.base_correction': { + color_type: redColumn, + accessorKey: 'data.q4.base_correction', + }, + 'data.q4.revision_inc': { + color_type: redColumn, + accessorKey: 'data.q4.revision_inc', + }, + 'data.q4.revision_seq': { + color_type: redColumn, + accessorKey: 'data.q4.revision_seq', + }, + 'data.q4.revision_comment': { + color_type: redColumn, + accessorKey: 'data.q4.revision_comment', + }, + 'data.q4.adj_comment': { + color_type: yellowColumn, + accessorKey: 'data.q4.adj_comment', + }, + 'data.q4.new_plan': { + color_type: yellowColumn, + accessorKey: 'data.q4.new_plan', + }, + '4_kvartal_2026_field_field': { + color_type: whiteColumn, + accessorKey: '4_kvartal_2026_field_field', + }, + 'data.q4.adj_current': { + color_type: yellowColumn, + accessorKey: 'data.q4.adj_current', + }, + 'data.q4.adj_ssp': { + color_type: yellowColumn, + accessorKey: 'data.q4.adj_ssp', + }, + 'data.q4.adj_rf': { + color_type: yellowColumn, + accessorKey: 'data.q4.adj_rf', + }, + 'data.q4.adj_reserve': { + color_type: yellowColumn, + accessorKey: 'data.q4.adj_reserve', + }, + 'data.q4.corrected_plan': { + color_type: yellowColumn, + accessorKey: 'data.q4.corrected_plan', + }, + 'data.q4.pay_date': { + color_type: blueColumn, + accessorKey: 'data.q4.pay_date', + }, + 'data.q4.pay_amount': { + color_type: blueColumn, + accessorKey: 'data.q4.pay_amount', + }, + 'data.q4.pay_ho': { + color_type: blueColumn, + accessorKey: 'data.q4.pay_ho', + }, + 'data.q4.pay_rf': { + color_type: blueColumn, + accessorKey: 'data.q4.pay_rf', + }, + 'data.q4.pay_comment': { + color_type: blueColumn, + accessorKey: 'data.q4.pay_comment', + }, + 'data.q4.pay_act': { + color_type: blueColumn, + accessorKey: 'data.q4.pay_act', + }, + 'data.q4.booking': { + color_type: orangeColumn, + accessorKey: 'data.q4.booking', + }, + 'data.q4.actual_m1': { + color_type: greenColumn, + accessorKey: 'data.q4.actual_m1', + }, + 'data.q4.actual_m2': { + color_type: greenColumn, + accessorKey: 'data.q4.actual_m2', + }, + 'data.q4.actual_m3': { + color_type: greenColumn, + accessorKey: 'data.q4.actual_m3', + }, + 'data.q4.actual_quarter': { + color_type: greenColumn, + accessorKey: 'data.q4.actual_quarter', + }, + 'data.q4.actual_spod': { + color_type: greenColumn, + accessorKey: 'data.q4.actual_spod', + }, + 'data.q4.residual_after_booking': { + color_type: orangeColumn, + accessorKey: 'data.q4.residual_after_booking', + }, + 'data.q4.residual_after_actual': { + color_type: greenColumn, + accessorKey: 'data.q4.residual_after_actual', + }, + '4_kvartal_2026_zakrytie_4_go_kvartala_field': { + color_type: redColumn, + accessorKey: '4_kvartal_2026_zakrytie_4_go_kvartala_field', + }, + 'data.q4.transfer_econ': { + color_type: redColumn, + accessorKey: 'data.q4.transfer_econ', + }, + 'data.q4.total': { + color_type: redColumn, + accessorKey: 'data.q4.total', + }, + 'data.totals.fact_year': { + color_type: greenColumn, + accessorKey: 'data.totals.fact_year', + }, + field_field_field_3: { + color_type: whiteColumn, + accessorKey: 'field_field_field_3', + }, + field_summa_oplaty_field: { + color_type: blueColumn, + accessorKey: 'field_summa_oplaty_field', + }, + }, columns: [ { header: "", @@ -1836,6 +2597,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '2_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q2.adj_comment', + columnLetter: 'DP', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: "Скорректированный план 2 кв. {year:short}", accessorKey: "2_kvartal_2026_skorr_plan_2_kv_26", @@ -2365,6 +3146,26 @@ export const config = { }, }, + { + header: 'Комментарий', + accessorKey: '3_kvartal_2026_kommentariy_adj', + columns: [ + { + header: 'Сумма (без НДС)', + accessorKey: 'data.q3.adj_comment', + columnLetter: 'EY', + size: 150, + filterFn: 'contains', + }, + ], + muiTableHeadCellProps: { + sx: { + backgroundColor: '#FFFF99', + color: '#000000', + }, + }, + }, + { header: "Скорректированный план 3 кв. {year:short}", accessorKey: "3_kvartal_2026_skorr_plan_3_kv_26",