RSHB/DFiP_Budget_planing
9
0
Fork 0
Code Issues 22 Pull Requests 19 Actions Packages Projects Releases Wiki Activity

Merge pull request 'поправила доступ для исполнителй дфипа, отсупы для смет и - вместо 0 в SummaryTable (проекты)' (#161) from fix-style-front into test

Browse Source 
Reviewed-on: #161
This commit is contained in:
PotapovaA 2026-09-16 12:16:27 +03:00
commit 6c61d11733
3 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/components/HeaderMenu/HeaderSwitch.jsx
View File

@ -68,7 +68,7 @@ export function HeaderSwitch() {
</div> </div>
<span>Задачи</span> <span>Задачи</span>
</StyledNavLink> </StyledNavLink>
{(user.is_executor_rf || user.role_id === ROLES_NAME_ID.admin || user.role_id === ROLES_NAME_ID.executor_durrs) && {(user.is_executor_rf || user.role_id === ROLES_NAME_ID.admin || user.role_id === ROLES_NAME_ID.executor_durrs || user.role_id === ROLES_NAME_ID.executor_dfip) &&
<StyledNavLink to='/projects' className={location.pathname.startsWith(projectsPaths) ? 'active' : ''}> <StyledNavLink to='/projects' className={location.pathname.startsWith(projectsPaths) ? 'active' : ''}>
<div className='img'> <div className='img'>
@ -95,7 +95,7 @@ export function HeaderSwitch() {
<span>Администрирование</span> <span>Администрирование</span>
</StyledNavLink> </StyledNavLink>
)} )}
{(user.is_executor_rf || user.role_id === ROLES_NAME_ID.admin) && {(user.is_executor_rf || user.role_id === ROLES_NAME_ID.admin || user.role_id === ROLES_NAME_ID.executor_dfip) &&
<StyledNavLink to='/dicts-navigator' className={location.pathname.startsWith(dictPaths) ? 'active' : ''}> <StyledNavLink to='/dicts-navigator' className={location.pathname.startsWith(dictPaths) ? 'active' : ''}>
<div className='img'> <div className='img'>
<DictSvg fill={location.pathname.startsWith(dictPaths) ? '#258141' : '#99A1AF'} /> <DictSvg fill={location.pathname.startsWith(dictPaths) ? '#258141' : '#99A1AF'} />

2
web/src/components/RealtimeTable/Cell/Cell/Cell.jsx
View File

@ -141,7 +141,7 @@ const CellComponent = ({ cell, row, column, onClick, globalFilter, columnFilter,
const isLocked = useCellLock(cellKey); const isLocked = useCellLock(cellKey);
const isVspDropdown = column?.columnDef?.editType === 'vsp_dropdown'; const isVspDropdown = column?.columnDef?.editType === 'vsp_dropdown';
const nameIndent = column.id === 'data.header.name' ? 8 + row.depth * 16 : 8; const nameIndent = column.id === 'data.header.name' || column.id === 'data.name' ? 8 + row.depth * 16 : 8;
const { rawValue, displayValue, isNumeric } = useMemo(() => { const { rawValue, displayValue, isNumeric } = useMemo(() => {
const value = cell.getValue(); const value = cell.getValue();

93
web/src/pages/ProjectPages/columns.js
View File

@ -210,25 +210,25 @@ export const secondColumns = [
accessorKey: 'data.financing.ahr', accessorKey: 'data.financing.ahr',
header: 'АХР', header: 'АХР',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.financing.ahr_limit', accessorKey: 'data.financing.ahr_limit',
header: 'АХР лимит', header: 'АХР лимит',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.financing.ahr_current', accessorKey: 'data.financing.ahr_current',
header: 'АХР текущие', header: 'АХР текущие',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.financing.kv', accessorKey: 'data.financing.kv',
header: 'кв.', header: 'кв.',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -240,25 +240,25 @@ export const secondColumns = [
accessorKey: 'data.base_q1.ahr', accessorKey: 'data.base_q1.ahr',
header: 'АХР', header: 'АХР',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.base_q1.ahr_limit', accessorKey: 'data.base_q1.ahr_limit',
header: 'АХР лимит', header: 'АХР лимит',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.base_q1.ahr_current', accessorKey: 'data.base_q1.ahr_current',
header: 'АХР текущие', header: 'АХР текущие',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.base_q1.kv', accessorKey: 'data.base_q1.kv',
header: 'кв.', header: 'кв.',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -270,25 +270,25 @@ export const secondColumns = [
accessorKey: 'data.corrected_q2.ahr', accessorKey: 'data.corrected_q2.ahr',
header: 'АХР', header: 'АХР',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q2.ahr_limit', accessorKey: 'data.corrected_q2.ahr_limit',
header: 'АХР лимит', header: 'АХР лимит',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q2.ahr_current', accessorKey: 'data.corrected_q2.ahr_current',
header: 'АХР текущие', header: 'АХР текущие',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q2.kv', accessorKey: 'data.corrected_q2.kv',
header: 'кв.', header: 'кв.',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -300,25 +300,25 @@ export const secondColumns = [
accessorKey: 'data.corrected_q3.ahr', accessorKey: 'data.corrected_q3.ahr',
header: 'АХР', header: 'АХР',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q3.ahr_limit', accessorKey: 'data.corrected_q3.ahr_limit',
header: 'АХР лимит', header: 'АХР лимит',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q3.ahr_current', accessorKey: 'data.corrected_q3.ahr_current',
header: 'АХР текущие', header: 'АХР текущие',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q3.kv', accessorKey: 'data.corrected_q3.kv',
header: 'кв.', header: 'кв.',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -330,25 +330,25 @@ export const secondColumns = [
accessorKey: 'data.corrected_q4.ahr', accessorKey: 'data.corrected_q4.ahr',
header: 'АХР', header: 'АХР',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q4.ahr_limit', accessorKey: 'data.corrected_q4.ahr_limit',
header: 'АХР лимит', header: 'АХР лимит',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q4.ahr_current', accessorKey: 'data.corrected_q4.ahr_current',
header: 'АХР текущие', header: 'АХР текущие',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.corrected_q4.kv', accessorKey: 'data.corrected_q4.kv',
header: 'кв.', header: 'кв.',
size: 100, size: 100,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -363,19 +363,19 @@ export const secondColumns = [
accessorKey: 'data.actual_ahr.q1.ahr', accessorKey: 'data.actual_ahr.q1.ahr',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q1.ahr_limit', accessorKey: 'data.actual_ahr.q1.ahr_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q1.ahr_current', accessorKey: 'data.actual_ahr.q1.ahr_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -386,19 +386,19 @@ export const secondColumns = [
accessorKey: 'data.actual_ahr.q2.ahr', accessorKey: 'data.actual_ahr.q2.ahr',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q2.ahr_limit', accessorKey: 'data.actual_ahr.q2.ahr_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q2.ahr_current', accessorKey: 'data.actual_ahr.q2.ahr_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -409,19 +409,19 @@ export const secondColumns = [
accessorKey: 'data.actual_ahr.q3.ahr', accessorKey: 'data.actual_ahr.q3.ahr',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q3.ahr_limit', accessorKey: 'data.actual_ahr.q3.ahr_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q3.ahr_current', accessorKey: 'data.actual_ahr.q3.ahr_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -432,19 +432,19 @@ export const secondColumns = [
accessorKey: 'data.actual_ahr.q4.ahr', accessorKey: 'data.actual_ahr.q4.ahr',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q4.ahr_limit', accessorKey: 'data.actual_ahr.q4.ahr_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_ahr.q4.ahr_current', accessorKey: 'data.actual_ahr.q4.ahr_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -461,19 +461,19 @@ export const secondColumns = [
accessorKey: 'data.actual_kv.q1.kv', accessorKey: 'data.actual_kv.q1.kv',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q1.kv_limit', accessorKey: 'data.actual_kv.q1.kv_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q1.kv_current', accessorKey: 'data.actual_kv.q1.kv_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -484,19 +484,19 @@ export const secondColumns = [
accessorKey: 'data.actual_kv.q2.kv', accessorKey: 'data.actual_kv.q2.kv',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q2.kv_limit', accessorKey: 'data.actual_kv.q2.kv_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q2.kv_current', accessorKey: 'data.actual_kv.q2.kv_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -507,19 +507,19 @@ export const secondColumns = [
accessorKey: 'data.actual_kv.q3.kv', accessorKey: 'data.actual_kv.q3.kv',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q3.kv_limit', accessorKey: 'data.actual_kv.q3.kv_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q3.kv_current', accessorKey: 'data.actual_kv.q3.kv_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -530,19 +530,19 @@ export const secondColumns = [
accessorKey: 'data.actual_kv.q4.kv', accessorKey: 'data.actual_kv.q4.kv',
header: 'Фактические расходы', header: 'Фактические расходы',
size: 120, size: 120,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q4.kv_limit', accessorKey: 'data.actual_kv.q4.kv_limit',
header: 'Лимит', header: 'Лимит',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
{ {
accessorKey: 'data.actual_kv.q4.kv_current', accessorKey: 'data.actual_kv.q4.kv_current',
header: 'Текущие', header: 'Текущие',
size: 80, size: 80,
Cell: ({ cell }) => formatNumber(cell.getValue()), Cell: ({ cell }) => formatSummaryNumber(cell.getValue()),
}, },
], ],
}, },
@ -565,3 +565,8 @@ const formatNumber = (value) => {
const number = Number(value); const number = Number(value);
return Number.isNaN(number) ? value : number.toLocaleString('ru-RU'); return Number.isNaN(number) ? value : number.toLocaleString('ru-RU');
}; };
const formatSummaryNumber = (value) => {
if (value !== null && value !== undefined && value !== '' && Number(value) === 0) return '-';
return formatNumber(value);
};