RSHB/arm-core
9
0
Fork 0
Code Issues 26 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

форматирование

Browse Source
This commit is contained in:
Grog 2026-11-06 08:52:33 +03:00
parent 29a630c5e5
commit 67899fc963
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/layouts/ConsolidationReportPage.tsx
View File

@ -16,8 +16,8 @@ import { statusColorMapping } from '../widgets/ConsoleTable/consts';
import { OsvTabs } from '../widgets/ConsolidatedOsv/OsvTabs'; import { OsvTabs } from '../widgets/ConsolidatedOsv/OsvTabs';
import { OsvContent } from '../widgets/ConsolidatedOsvContent/ConsolidatedOsvContent'; import { OsvContent } from '../widgets/ConsolidatedOsvContent/ConsolidatedOsvContent';
import { ChessContent } from '../widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent'; import { ChessContent } from '../widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent';
import { CorrectionContent } from '../widgets/CorrectionTable/CorrectionContent';
import { GoodwillContent } from '../widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent'; import { GoodwillContent } from '../widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent';
import { CorrectionContent } from '../widgets/CorrectionTable/CorrectionContent';
import ChangeStatusModal from '../widgets/StatusChangeModal/ChangeStatusModal'; import ChangeStatusModal from '../widgets/StatusChangeModal/ChangeStatusModal';
function ReportContent() { function ReportContent() {

2
web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx
View File

@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { ApiError } from '../../../api/client'; import { ApiError } from '../../../api/client';
import { ConsolidationFormatTableFilter } from '../../../components/ConsolidationFormatTableFilter/ConsolidationFormatTableFilter'; import { ConsolidationFormatTableFilter } from '../../../components/ConsolidationFormatTableFilter/ConsolidationFormatTableFilter';
import { useFullscreen } from '../../../hooks/useFullScreen';
import { import {
exportChessConsolidationsResult, exportChessConsolidationsResult,
exportChessTableAll, exportChessTableAll,
@ -20,7 +21,6 @@ import { useNotificationApi } from '../../../utils/useNotification';
import { ConsolidationChessResTable } from '../ConsolidationChessResTable/ConsolidationChessResTable'; import { ConsolidationChessResTable } from '../ConsolidationChessResTable/ConsolidationChessResTable';
import { ConsolidationChessTable } from '../ConsolidationChessTable/ConsolidationChessTable'; import { ConsolidationChessTable } from '../ConsolidationChessTable/ConsolidationChessTable';
import { ConsolidationChessTableFilter } from '../ConsolidationChessTableFilter/ConsolidationChessTableFilter'; import { ConsolidationChessTableFilter } from '../ConsolidationChessTableFilter/ConsolidationChessTableFilter';
import { useFullscreen } from '../../../hooks/useFullScreen';
export const ChessContent = ({ card }: { card: VersionCard | null }) => { export const ChessContent = ({ card }: { card: VersionCard | null }) => {
const { version_id } = useParams<{ version_id: string }>(); const { version_id } = useParams<{ version_id: string }>();

2
web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillContent/ConsolidationGoodwillContent.tsx
View File

@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { ConsolidationFormatTableFilter } from '../../../components/ConsolidationFormatTableFilter/ConsolidationFormatTableFilter'; import { ConsolidationFormatTableFilter } from '../../../components/ConsolidationFormatTableFilter/ConsolidationFormatTableFilter';
import { type ColumnDef, ColumnSettings, useVisibleColumns } from '../../../components/GenericTable'; import { type ColumnDef, ColumnSettings, useVisibleColumns } from '../../../components/GenericTable';
import { useFullscreen } from '../../../hooks/useFullScreen';
import { exportGoodwillTable, fetchGoodwillTable, saveGoodwillRow } from '../../../services/api/goodwill'; import { exportGoodwillTable, fetchGoodwillTable, saveGoodwillRow } from '../../../services/api/goodwill';
import type { VersionCard } from '../../../types/consolidations/version_members'; import type { VersionCard } from '../../../types/consolidations/version_members';
import type { GoodwillRow, GoodwillRowPayload, GoodwillTableResponse, GoodwillTreeRow } from '../../../types/goodwill/goodwill'; import type { GoodwillRow, GoodwillRowPayload, GoodwillTableResponse, GoodwillTreeRow } from '../../../types/goodwill/goodwill';
@ -11,7 +12,6 @@ import { saveBlob, xlsxFilename } from '../../../utils/download';
import { useNotificationApi } from '../../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
import { ConsolidationGoodwillTable } from '../ConsolidationGoodwillTable/ConsolidationGoodwillTable'; import { ConsolidationGoodwillTable } from '../ConsolidationGoodwillTable/ConsolidationGoodwillTable';
import { getGoodwillColumns } from '../ConsolidationGoodwillTable/config'; import { getGoodwillColumns } from '../ConsolidationGoodwillTable/config';
import { useFullscreen } from '../../../hooks/useFullScreen';
// #TODO --- ТЕСТОВЫЕ ДАННЫЕ --- // #TODO --- ТЕСТОВЫЕ ДАННЫЕ ---
// const MOCK_DATA: GoodwillTableResponse = { // const MOCK_DATA: GoodwillTableResponse = {

2
web/src/widgets/ConsolidationGoodwill/ConsolidationGoodwillTable/ConsolidationGoodwillTable.tsx
View File

@ -5,8 +5,8 @@ import { useMemo } from 'react';
import type { GoodwillRow, GoodwillTableResponse, GoodwillTreeRow } from '../../../types/goodwill/goodwill'; import type { GoodwillRow, GoodwillTableResponse, GoodwillTreeRow } from '../../../types/goodwill/goodwill';
import './ConsolidationGoodwillTable.css'; import './ConsolidationGoodwillTable.css';
import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue'; import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue';
import { getGoodwillColumns } from './config';
import { sumAmounts } from '../../../utils/money'; import { sumAmounts } from '../../../utils/money';
import { getGoodwillColumns } from './config';
const { Text } = Typography; const { Text } = Typography;

4
web/src/widgets/CorrectionTable/CorrectionContent.tsx
View File

@ -4,6 +4,7 @@ import { Button, ConfigProvider, Spin, notification as antdNotification } from '
import { type ReactNode, useEffect, useMemo, useRef, useState } from 'react'; import { type ReactNode, useEffect, useMemo, useRef, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../api/client';
import { useVisibleColumns } from '../../components/GenericTable/useVisibleColumns'; import { useVisibleColumns } from '../../components/GenericTable/useVisibleColumns';
import { useFullscreen } from '../../hooks/useFullScreen';
import { allocate, exportCorrectionTable } from '../../services/api/corrections'; import { allocate, exportCorrectionTable } from '../../services/api/corrections';
import type { VersionCard } from '../../types/consolidations/version_members'; import type { VersionCard } from '../../types/consolidations/version_members';
import type { AllocationIn } from '../../types/corrections'; import type { AllocationIn } from '../../types/corrections';
@ -16,7 +17,6 @@ import { COLUMN_DEFS, type ColKey, type ColShape } from './columns';
import { errorOutcome, readOnlyHint } from './readOnly'; import { errorOutcome, readOnlyHint } from './readOnly';
import { EMPTY_FILTERS, type TableFilters, aggregateKey, buildRows, filterTable, lineOptions, visibleTotals } from './tableModel'; import { EMPTY_FILTERS, type TableFilters, aggregateKey, buildRows, filterTable, lineOptions, visibleTotals } from './tableModel';
import { useCorrectionTable } from './useCorrectionTable'; import { useCorrectionTable } from './useCorrectionTable';
import { useFullscreen } from '../../hooks/useFullScreen';
const LOAD_ERROR_KEY = 'corrections-load-error'; const LOAD_ERROR_KEY = 'corrections-load-error';
@ -70,7 +70,7 @@ export function CorrectionContent({ versionId, card = null }: Props) {
// ушли с вкладки — уведомление об ошибке закрываем, оно относится к этому экрану // ушли с вкладки — уведомление об ошибке закрываем, оно относится к этому экрану
useEffect(() => () => notification.destroy(LOAD_ERROR_KEY), [notification]); useEffect(() => () => notification.destroy(LOAD_ERROR_KEY), [notification]);
const { ref: tableRef, isFullscreen: isFullscreen, toggle: toggleFullscreen } = useFullscreen<HTMLDivElement>(); const { ref: tableRef, isFullscreen, toggle: toggleFullscreen } = useFullscreen<HTMLDivElement>();
const download = async () => { const download = async () => {
setExporting(true); setExporting(true);