From 877ecb4f980be8c9455bcd102290ae4f67ebd99c Mon Sep 17 00:00:00 2001 From: PotapovaA Date: Tue, 18 Aug 2026 13:40:53 +0300 Subject: [PATCH] fix --- web/src/pages/ProjectPages/SummaryPage.jsx | 3 ++- web/src/pages/ProjectPages/columns.js | 3 ++- web/src/pages/ProjectPages/components/EditModal/EditModal.jsx | 4 ++-- web/src/pages/ProjectPages/constants.js | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/src/pages/ProjectPages/SummaryPage.jsx b/web/src/pages/ProjectPages/SummaryPage.jsx index 453a7f3..7802348 100644 --- a/web/src/pages/ProjectPages/SummaryPage.jsx +++ b/web/src/pages/ProjectPages/SummaryPage.jsx @@ -446,7 +446,8 @@ const SummaryPage = () => { border: '1px solid #e0e0e0', borderRadius: '0 0 1rem 1rem', overflow: 'hidden', - height: '35vh', + height: '100%', + minHeight: 0, display: 'flex', flexDirection: 'column', }, diff --git a/web/src/pages/ProjectPages/columns.js b/web/src/pages/ProjectPages/columns.js index d65bbcd..87ee8bd 100644 --- a/web/src/pages/ProjectPages/columns.js +++ b/web/src/pages/ProjectPages/columns.js @@ -1,7 +1,7 @@ import { Box, IconButton, Tooltip } from '@mui/material'; import { Back, EditPenSvg, TrashSvg } from '../../components/common/icons/icons'; import StatusBadge from './components/StatusBadge/StatusBadge'; -import { DEVELOMENT_BLOCK } from './constants'; +import { DEVELOMENT_BLOCK, FUNDING_BY_DECISION } from './constants'; export const createFirstColumns = (handlers) => { const { onDelete, onEdit, onNavigate, orgUnitNames = {} } = handlers; @@ -72,6 +72,7 @@ export const createFirstColumns = (handlers) => { accessorKey: 'funding_by_ko_decision', header: 'Финансирование по решению КО', size: 150, + Cell: ({ cell }) => FUNDING_BY_DECISION.find((v) => v[0] === cell.getValue())?.[1] || '-', }, { accessorKey: 'year', diff --git a/web/src/pages/ProjectPages/components/EditModal/EditModal.jsx b/web/src/pages/ProjectPages/components/EditModal/EditModal.jsx index f15a9d7..542dd60 100644 --- a/web/src/pages/ProjectPages/components/EditModal/EditModal.jsx +++ b/web/src/pages/ProjectPages/components/EditModal/EditModal.jsx @@ -2,7 +2,7 @@ import CloseIcon from '@mui/icons-material/Close'; import { Box, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, MenuItem, TextField, Typography } from '@mui/material'; import React from 'react'; import { DangerOutlinedButton, PrimaryButton } from '../../../../components/common/Buttons/Buttons'; -import { DEVELOMENT_BLOCK } from '../../constants'; +import { DEVELOMENT_BLOCK, FUNDING_BY_DECISION } from '../../constants'; const EditModal = ({ open, onClose, rowData, onSave, isSaving = false, orgUnitNames = {} }) => { const [formData, setFormData] = React.useState(rowData || {}); @@ -39,7 +39,7 @@ const EditModal = ({ open, onClose, rowData, onSave, isSaving = false, orgUnitNa { key: 'placement_type', label: 'Размещение', options: ['Собственность', 'Аренда', 'Субаренда'] }, { key: 'staff_count', label: 'Количество сотрудников', type: 'number', valueType: 'number' }, { key: 'total_area', label: 'Общая площадь', type: 'number', valueType: 'number' }, - { key: 'funding_by_ko_decision', label: 'Финансирование по решению КО', options: [['prrs_budget', 'Бюджет ПРРС'], ['bank_reserve', 'Резерв Банка']] }, + { key: 'funding_by_ko_decision', label: 'Финансирование по решению КО', options: FUNDING_BY_DECISION }, { key: 'krf_decision_date', label: 'Дата решения КРФ', type: 'date' }, { key: 'fk_decision_date', label: 'Дата решения ФК', type: 'date' }, { key: 'board_decision_date', label: 'Дата решения Правления', type: 'date' }, diff --git a/web/src/pages/ProjectPages/constants.js b/web/src/pages/ProjectPages/constants.js index 75096e9..f8a8c56 100644 --- a/web/src/pages/ProjectPages/constants.js +++ b/web/src/pages/ProjectPages/constants.js @@ -1 +1,3 @@ -export const DEVELOMENT_BLOCK = [['out_of_base_plan', 'Вне базового плана'], ['carryover', 'Переходящий'], ['additional_funding', 'Дополнительное финансирование']] \ No newline at end of file +export const DEVELOMENT_BLOCK = [['out_of_base_plan', 'Вне базового плана'], ['carryover', 'Переходящий'], ['additional_funding', 'Дополнительное финансирование']] + +export const FUNDING_BY_DECISION = [['prrs_budget', 'Бюджет ПРРС'], ['bank_reserve', 'Резерв Банка']]; \ No newline at end of file -- 2.47.2