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

Merge pull request 'aurora-1799 отображение ошибки в случае выбора только дт или кт в таблице' (#207) from fix/chessTable into main

Browse Source
This commit is contained in:
aep 2026-10-29 20:40:28 +03:00
commit da5cb9c222
31 changed files with 210 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
web/src/layouts/CatalogueGroups.tsx
View File

@ -22,16 +22,19 @@ import type { CatalogueJurFormProps } from '../types/catalogueJur/catalogueJur';
import type { CompanyGroupFormProps } from '../types/companyGroups/companyGroups'; import type { CompanyGroupFormProps } from '../types/companyGroups/companyGroups';
import type { CreateEntityKind, RelatedGroupFormType } from '../types/relatedGroup/relatedGroup'; import type { CreateEntityKind, RelatedGroupFormType } from '../types/relatedGroup/relatedGroup';
import { useNotificationApi } from '../utils/useNotification'; import { useNotificationApi } from '../utils/useNotification';
import { ArchiveCompanyGroupModal } from '../widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal'; import { ArchiveCompanyGroupModal } from '../widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal';
import { CataloguGroupTabs, type CatalogueGroupTabKey } from '../widgets/CataloguGroupTabs/CataloguGroupTabs'; import { CompanyGroupHeader } from '../widgets/CatalogueCompanyGroup/CatalogueCompanyGroupHeader/CatalogueCompanyGroupHeader';
import { CompanyGroupHeader } from '../widgets/CatalogueGroupHeader/CatalogueGroupHeader'; import {
import { CatalogueJurForm } from '../widgets/CatalogueJurForm/CatalogueJurForm'; type CatalogueCompanyGroupTabKey,
import { CatalogueJurTable } from '../widgets/CatalogueJurTable/CatalogueJurTable'; CatalogueCompanyGroupTabs,
import { CompanyGroupForm } from '../widgets/CompanyGroupForm/CompanyGroupForm'; } from '../widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs';
import { CompanyGroupsList } from '../widgets/CompanyGroupsList/CompanyGroupsList'; import { CompanyGroupForm } from '../widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm';
import { CompanyGroupsList } from '../widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList';
import { CatalogueJurForm } from '../widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm';
import { CatalogueJurTable } from '../widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable';
import { CreateEntityPickerModal } from '../widgets/CreateEntityPickerModal/CreateEntityPickerModal'; import { CreateEntityPickerModal } from '../widgets/CreateEntityPickerModal/CreateEntityPickerModal';
import { RelatedGroupForm } from '../widgets/RelatedGroupForm/RelatedGroupForm'; import { RelatedGroupForm } from '../widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm';
import { RelatedGroupTable } from '../widgets/RelatedGroupTable/RelatedGroupTable'; import { RelatedGroupTable } from '../widgets/RelatedGroup/RelatedGroupTable/RelatedGroupTable';
export function CatalogueGroup() { export function CatalogueGroup() {
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
@ -45,7 +48,7 @@ export function CatalogueGroup() {
const [companyGroupEditFormOpen, setCompanyGroupEditFormOpen] = useState(false); const [companyGroupEditFormOpen, setCompanyGroupEditFormOpen] = useState(false);
const [companyGroupDeleteOpen, setCompanyGroupDeleteOpen] = useState(false); const [companyGroupDeleteOpen, setCompanyGroupDeleteOpen] = useState(false);
const [companyGroupDeleteLoading, setCompanyGroupDeleteLoading] = useState(false); const [companyGroupDeleteLoading, setCompanyGroupDeleteLoading] = useState(false);
const [activeTab, setActiveTab] = useState<CatalogueGroupTabKey>('legal_entities'); const [activeTab, setActiveTab] = useState<CatalogueCompanyGroupTabKey>('legal_entities');
const [gskData, setGskData] = useState<RelatedGroupOut[]>([]); const [gskData, setGskData] = useState<RelatedGroupOut[]>([]);
const [gszData, setGszData] = useState<RelatedGroupOut[]>([]); const [gszData, setGszData] = useState<RelatedGroupOut[]>([]);
const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup); const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup);
@ -201,7 +204,12 @@ export function CatalogueGroup() {
<CatalogueJurTable <CatalogueJurTable
outside_group={false} outside_group={false}
tabsComponent={ tabsComponent={
<CataloguGroupTabs activeTab={activeTab} setActiveTab={(val) => setActiveTab(val)} gskData={gskData} gszData={gszData} /> <CatalogueCompanyGroupTabs
activeTab={activeTab}
setActiveTab={(val) => setActiveTab(val)}
gskData={gskData}
gszData={gszData}
/>
} }
/> />
)} )}
@ -211,7 +219,12 @@ export function CatalogueGroup() {
data={activeTab === 'gsz' ? gszData : gskData} data={activeTab === 'gsz' ? gszData : gskData}
getData={() => getRelatedGroupsHandler()} getData={() => getRelatedGroupsHandler()}
tabsComponent={ tabsComponent={
<CataloguGroupTabs activeTab={activeTab} setActiveTab={(val) => setActiveTab(val)} gskData={gskData} gszData={gszData} /> <CatalogueCompanyGroupTabs
activeTab={activeTab}
setActiveTab={(val) => setActiveTab(val)}
gskData={gskData}
gszData={gszData}
/>
} }
loading={relatedGroupLoading} loading={relatedGroupLoading}
/> />

4
web/src/layouts/CatalogueJur.tsx
View File

@ -6,8 +6,8 @@ import { createCatalogueJur } from '../services/api/directories/catalogue_jur';
import { getCatalogueJurThunk } from '../store/slices/catalogueJurSlice/thunks'; import { getCatalogueJurThunk } from '../store/slices/catalogueJurSlice/thunks';
import { useAppDispatch, useAppSelector } from '../store/store'; import { useAppDispatch, useAppSelector } from '../store/store';
import type { CatalogueJurFormProps } from '../types/catalogueJur/catalogueJur'; import type { CatalogueJurFormProps } from '../types/catalogueJur/catalogueJur';
import { CatalogueJurForm } from '../widgets/CatalogueJurForm/CatalogueJurForm'; import { CatalogueJurForm } from '../widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm';
import { CatalogueJurTable } from '../widgets/CatalogueJurTable/CatalogueJurTable'; import { CatalogueJurTable } from '../widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable';
export function CatalogueJur() { export function CatalogueJur() {
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();

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

@ -13,9 +13,9 @@ import type { VersionCard } from '../types/consolidations/version_members';
import { CONS_STATUS_LABEL, canChangeStatus, consStatusDescription, isLockedBy } from '../utils/consolidations'; import { CONS_STATUS_LABEL, canChangeStatus, consStatusDescription, isLockedBy } from '../utils/consolidations';
import { quarterShortLabel } from '../utils/labels'; import { quarterShortLabel } from '../utils/labels';
import { statusColorMapping } from '../widgets/ConsoleTable/consts'; import { statusColorMapping } from '../widgets/ConsoleTable/consts';
import { ChessContent } from '../widgets/ConsolidatedChessContent/ConsolidatedChessContent';
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 ChangeStatusModal from '../widgets/StatusChangeModal/ChangeStatusModal'; import ChangeStatusModal from '../widgets/StatusChangeModal/ChangeStatusModal';
function ReportContent() { function ReportContent() {

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

@ -1,7 +1,7 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import PageTitle from '../components/PageTitle'; import PageTitle from '../components/PageTitle';
import { useAppSelector } from '../store/store'; import { useAppSelector } from '../store/store';
import { CompanyGroupsTable } from '../widgets/CompanyGroupsTable/CompanyGroupsTable'; import { CompanyGroupsTable } from '../widgets/CatalogueCompanyGroup/CompanyGroupsTable/CompanyGroupsTable';
export function GroupsLayout() { export function GroupsLayout() {
const totalGroupsNum = useAppSelector((state) => state.company_groups.total_groups); const totalGroupsNum = useAppSelector((state) => state.company_groups.total_groups);

17
web/src/utils/chessMatrixMode.test.ts Normal file
View File

@ -0,0 +1,17 @@
import { describe, expect, it } from 'vitest';
import { chessMatrixMode } from './chessMatrixMode';
describe('chessMatrixMode', () => {
it('фильтры пусты — полная матрица', () => {
expect(chessMatrixMode([], [])).toBe('all');
});
it('выбраны Дт и Кт — ручной расчёт', () => {
expect(chessMatrixMode(['62'], ['60'])).toBe('manual');
});
it('только Дт — одна сторона', () => {
expect(chessMatrixMode(['62'], [])).toBe('half');
});
it('только Кт — одна сторона', () => {
expect(chessMatrixMode([], ['60'])).toBe('half');
});
});

16
web/src/utils/chessMatrixMode.ts Normal file
View File

@ -0,0 +1,16 @@
/**
* Режим запроса шахматки по фильтрам счетов:
* - `all` — фильтры пусты, берём полную матрицу;
* - `manual` — выбраны и Дт, и Кт, считаем по выбранным счетам;
* - `half` — выбрана только одна сторона: запрос не шлём, показываем подсказку.
*/
export type ChessMatrixMode = 'all' | 'manual' | 'half';
/** Текст для состояния «выбрана одна сторона» — в таблице и у фильтров один и тот же (openspec intercompany-matrix-ui). */
export const CHESS_HALF_FILTER_HINT = 'Для расчёта по счетам выберите счета и в Дт, и в Кт';
export const chessMatrixMode = (debit: readonly string[], credit: readonly string[]): ChessMatrixMode => {
if (debit.length > 0 && credit.length > 0) return 'manual';
if (debit.length === 0 && credit.length === 0) return 'all';
return 'half';
};

0
web/src/widgets/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx → web/src/widgets/CatalogueCompanyGroup/ArchiveCompanyGroupModal/ArchiveCompanyGroupModal.tsx
View File

4
web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx → web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupHeader/CatalogueCompanyGroupHeader.tsx
View File

@ -3,8 +3,8 @@ import { Button, Dropdown, Space } from 'antd';
import Text from 'antd/es/typography/Text'; import Text from 'antd/es/typography/Text';
import Title from 'antd/es/typography/Title'; import Title from 'antd/es/typography/Title';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { useAppSelector } from '../../store/store'; import { useAppSelector } from '../../../store/store';
import { pluralRu } from '../../utils/labels'; import { pluralRu } from '../../../utils/labels';
interface CompanyGroupHeaderI { interface CompanyGroupHeaderI {
setDeleteConfirmOpen: (el: boolean) => void; setDeleteConfirmOpen: (el: boolean) => void;

0
web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.css → web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css
View File

18
web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.tsx → web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx
View File

@ -1,23 +1,23 @@
import { Tabs } from 'antd'; import { Tabs } from 'antd';
import { useAppSelector } from '../../store/store'; import { useAppSelector } from '../../../store/store';
import type { RelatedGroupOut } from '../../types/api'; import type { RelatedGroupOut } from '../../../types/api';
import './CataloguGroupTabs.css'; import './CatalogueCompanyGroupTabs.css';
interface CataloguGroupTabsI { interface CatalogueCompanyGroupTabsI {
activeTab: CatalogueGroupTabKey; activeTab: CatalogueCompanyGroupTabKey;
setActiveTab: (val: CatalogueGroupTabKey) => void; setActiveTab: (val: CatalogueCompanyGroupTabKey) => void;
gskData: RelatedGroupOut[]; gskData: RelatedGroupOut[];
gszData: RelatedGroupOut[]; gszData: RelatedGroupOut[];
} }
export type CatalogueGroupTabKey = 'legal_entities' | 'gsk' | 'gsz'; export type CatalogueCompanyGroupTabKey = 'legal_entities' | 'gsk' | 'gsz';
export const CataloguGroupTabs = ({ activeTab, setActiveTab, gskData, gszData }: CataloguGroupTabsI) => { export const CatalogueCompanyGroupTabs = ({ activeTab, setActiveTab, gskData, gszData }: CatalogueCompanyGroupTabsI) => {
const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup); const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup);
return ( return (
<Tabs <Tabs
activeKey={activeTab} activeKey={activeTab}
onChange={(key) => setActiveTab(key as CatalogueGroupTabKey)} onChange={(key) => setActiveTab(key as CatalogueCompanyGroupTabKey)}
tabBarStyle={{ margin: 0, marginBottom: 0 }} tabBarStyle={{ margin: 0, marginBottom: 0 }}
style={{ marginBottom: 0 }} style={{ marginBottom: 0 }}
items={[ items={[

12
web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx → web/src/widgets/CatalogueCompanyGroup/CompanyGroupForm/CompanyGroupForm.tsx
View File

@ -1,12 +1,12 @@
import { Col, Form, Input, Modal, Row, Select } from 'antd'; import { Col, Form, Input, Modal, Row, Select } from 'antd';
import type React from 'react'; import type React from 'react';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { useMe } from '../../auth/useMe'; import { useMe } from '../../../auth/useMe';
import { fetchOneCompanyGroup } from '../../services/api/directories/company_groups'; import { fetchOneCompanyGroup } from '../../../services/api/directories/company_groups';
import type { CompanyGroupFormProps } from '../../types/companyGroups/companyGroups'; import type { CompanyGroupFormProps } from '../../../types/companyGroups/companyGroups';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
import { loadOffices } from '../Admin/UsersTable'; import { loadOffices } from '../../Admin/UsersTable';
type Props = { type Props = {
open: boolean; open: boolean;

0
web/src/widgets/CompanyGroupsList/CompanyGroupsList.css → web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.css
View File

12
web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx → web/src/widgets/CatalogueCompanyGroup/CompanyGroupsList/CompanyGroupsList.tsx
View File

@ -1,12 +1,12 @@
import { FolderOpenOutlined, SearchOutlined } from '@ant-design/icons'; import { FolderOpenOutlined, SearchOutlined } from '@ant-design/icons';
import { Checkbox, Empty, Input, List, Spin, Tag, Typography } from 'antd'; import { Checkbox, Empty, Input, List, Spin, Tag, Typography } from 'antd';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
import { useVirtualList } from '../../hooks/useVirtualList'; import { useVirtualList } from '../../../hooks/useVirtualList';
import { setActiveCompanyGroup } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; import { setActiveCompanyGroup } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice';
import { setIsGettingArchive } from '../../store/slices/companyGroupsSlice/companyGroupsSlice'; import { setIsGettingArchive } from '../../../store/slices/companyGroupsSlice/companyGroupsSlice';
import { visibleCompanyGroups } from '../../store/slices/companyGroupsSlice/selectors'; import { visibleCompanyGroups } from '../../../store/slices/companyGroupsSlice/selectors';
import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks';
import { useAppDispatch, useAppSelector } from '../../store/store'; import { useAppDispatch, useAppSelector } from '../../../store/store';
const { Text } = Typography; const { Text } = Typography;

10
web/src/widgets/CompanyGroupsTable/CompanyGroupsTable.tsx → web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/CompanyGroupsTable.tsx
View File

@ -3,11 +3,11 @@ import { Button, Input, Space, Tooltip } from 'antd';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import { useEffect, useMemo } from 'react'; import { useEffect, useMemo } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../components/GenericTable'; import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../../components/GenericTable';
import { useTableFilters } from '../../components/GenericTable/useTableFilters'; import { useTableFilters } from '../../../components/GenericTable/useTableFilters';
import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks';
import { useAppDispatch, useAppSelector } from '../../store/store'; import { useAppDispatch, useAppSelector } from '../../../store/store';
import type { ICompanyGroup } from '../../types/companyGroups/companyGroups'; import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups';
import { groupsConfig } from './config'; import { groupsConfig } from './config';
export function CompanyGroupsTable() { export function CompanyGroupsTable() {

4
web/src/widgets/CompanyGroupsTable/config.tsx → web/src/widgets/CatalogueCompanyGroup/CompanyGroupsTable/config.tsx
View File

@ -1,5 +1,5 @@
import type { TableConfig } from '../../components/GenericTable'; import type { TableConfig } from '../../../components/GenericTable';
import type { ICompanyGroup } from '../../types/companyGroups/companyGroups'; import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups';
export const groupsConfig: TableConfig<ICompanyGroup> = { export const groupsConfig: TableConfig<ICompanyGroup> = {
rowKey: 'id', rowKey: 'id',

16
web/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx → web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx
View File

@ -1,14 +1,14 @@
import { Col, Form, Input, Modal, Row, Select } from 'antd'; import { Col, Form, Input, Modal, Row, Select } from 'antd';
import type React from 'react'; import type React from 'react';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { fetchOneCatalogueJur } from '../../services/api/directories/catalogue_jur'; import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur';
import { fetchRelatedGroups } from '../../services/api/directories/company_groups'; import { fetchRelatedGroups } from '../../../services/api/directories/company_groups';
import { useAppSelector } from '../../store/store'; import { useAppSelector } from '../../../store/store';
import type { RelatedGroupOut } from '../../types/api'; import type { RelatedGroupOut } from '../../../types/api';
import type { CatalogueJurFormProps } from '../../types/catalogueJur/catalogueJur'; import type { CatalogueJurFormProps } from '../../../types/catalogueJur/catalogueJur';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
import { loadOffices } from '../Admin/UsersTable'; import { loadOffices } from '../../Admin/UsersTable';
type Props = { type Props = {
open: boolean; open: boolean;

12
web/src/widgets/MoveCatalogueJurForm/MoveCatalogueJurForm.tsx → web/src/widgets/CatalogueJur/CatalogueJurMoveForm/CatalogueJurMoveForm.tsx
View File

@ -3,12 +3,12 @@ import FormItem from 'antd/es/form/FormItem';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import type React from 'react'; import type React from 'react';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { fetchOneCatalogueJur } from '../../services/api/directories/catalogue_jur'; import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur';
import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks';
import { useAppDispatch, useAppSelector } from '../../store/store'; import { useAppDispatch, useAppSelector } from '../../../store/store';
import type { MoveCatalogueJurProps } from '../../types/catalogueJur/catalogueJur'; import type { MoveCatalogueJurProps } from '../../../types/catalogueJur/catalogueJur';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
type FormValues = { type FormValues = {
name: string; name: string;

25
web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx → web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx
View File

@ -11,26 +11,25 @@ import { Button, Checkbox, Dropdown, Input, Space } from 'antd';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import { type ReactNode, useEffect, useMemo, useState } from 'react'; import { type ReactNode, useEffect, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../components/GenericTable'; import { ColumnSettings, DataTable, useFilteredRows, useTableFilters, useVisibleColumns } from '../../../components/GenericTable';
import { useTableFilters } from '../../components/GenericTable/useTableFilters'; import { editCatalogueJur, moveCatalogueJur, withdrawCatalogueJur } from '../../../services/api/directories/catalogue_jur';
import { editCatalogueJur, moveCatalogueJur, withdrawCatalogueJur } from '../../services/api/directories/catalogue_jur'; import { setIsGettingArchive, setRelatedGroupFilter } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice';
import { setIsGettingArchive, setRelatedGroupFilter } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; import { getCatalogueJurThunk } from '../../../store/slices/catalogueJurSlice/thunks';
import { getCatalogueJurThunk } from '../../store/slices/catalogueJurSlice/thunks'; import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks';
import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { useAppDispatch, useAppSelector } from '../../../store/store';
import { useAppDispatch, useAppSelector } from '../../store/store';
import { import {
type CatalogueJurFormProps, type CatalogueJurFormProps,
type ICatalogueJur, type ICatalogueJur,
type MoveCatalogueJurProps, type MoveCatalogueJurProps,
type WithdrawCatalogueJurProps, type WithdrawCatalogueJurProps,
toCatalogueJurRow, toCatalogueJurRow,
} from '../../types/catalogueJur/catalogueJur'; } from '../../../types/catalogueJur/catalogueJur';
import { pluralRu } from '../../utils/labels'; import { pluralRu } from '../../../utils/labels';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
import { CatalogueJurForm } from '../CatalogueJurForm/CatalogueJurForm'; import { CatalogueJurForm } from '../CatalogueJurForm/CatalogueJurForm';
import { MoveCatalogueJurForm } from '../MoveCatalogueJurForm/MoveCatalogueJurForm'; import { MoveCatalogueJurForm } from '../CatalogueJurMoveForm/CatalogueJurMoveForm';
import { WithdrawCatalogueJurForm } from '../WithdrawCatalogueJurForm/WithdrawCatalogueJurForm'; import { WithdrawCatalogueJurForm } from '../CatalogueJurWithdrawForm/CatalogueJurWithdrawForm';
import { catalogueJurConfig, companyGroupJurConfig } from './config'; import { catalogueJurConfig, companyGroupJurConfig } from './config';
interface CatalogueJurTableI { interface CatalogueJurTableI {

8
web/src/widgets/CatalogueJurTable/config.tsx → web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx
View File

@ -1,7 +1,7 @@
import type { TableConfig } from '../../components/GenericTable'; import type { TableConfig } from '../../../components/GenericTable';
import { TableTag } from '../../components/TableTag/TableTag'; import { TableTag } from '../../../components/TableTag/TableTag';
import { TAG_PRESETS } from '../../components/TableTag/presets'; import { TAG_PRESETS } from '../../../components/TableTag/presets';
import type { ICatalogueJur } from '../../types/catalogueJur/catalogueJur'; import type { ICatalogueJur } from '../../../types/catalogueJur/catalogueJur';
/** ЮЛ вне ГК (монозаёмщики): в ГСК/ГСЗ они не входят, колонок членства нет. */ /** ЮЛ вне ГК (монозаёмщики): в ГСК/ГСЗ они не входят, колонок членства нет. */
export const catalogueJurConfig: TableConfig<ICatalogueJur> = { export const catalogueJurConfig: TableConfig<ICatalogueJur> = {

8
web/src/widgets/WithdrawCatalogueJurForm/WithdrawCatalogueJurForm.tsx → web/src/widgets/CatalogueJur/CatalogueJurWithdrawForm/CatalogueJurWithdrawForm.tsx
View File

@ -4,10 +4,10 @@ import TextArea from 'antd/es/input/TextArea';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import type React from 'react'; import type React from 'react';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { fetchOneCatalogueJur } from '../../services/api/directories/catalogue_jur'; import { fetchOneCatalogueJur } from '../../../services/api/directories/catalogue_jur';
import type { WithdrawCatalogueJurProps } from '../../types/catalogueJur/catalogueJur'; import type { WithdrawCatalogueJurProps } from '../../../types/catalogueJur/catalogueJur';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
interface FormValues extends WithdrawCatalogueJurProps { interface FormValues extends WithdrawCatalogueJurProps {
name: string; name: string;

32
web/src/widgets/ConsolidatedChessContent/ConsolidatedChessContent.tsx → web/src/widgets/ConsolidationChess/ConsolidationChessContent/ConsolidatedChessContent.tsx
View File

@ -2,7 +2,7 @@ import { DownloadOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@a
import { Button, ConfigProvider } from 'antd'; import { Button, ConfigProvider } from 'antd';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useCallback, useEffect, useMemo, useRef, 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 { import {
exportChessConsolidationsResult, exportChessConsolidationsResult,
exportChessTableAll, exportChessTableAll,
@ -10,11 +10,12 @@ import {
fetchChessConsolidations, fetchChessConsolidations,
fetchChessConsolidationsManual, fetchChessConsolidationsManual,
fetchChessConsolidationsResult, fetchChessConsolidationsResult,
} from '../../services/api/intercompanyMatrix'; } from '../../../services/api/intercompanyMatrix';
import type { IntercompanyMatrixResponse, IntercompanyMatrixResultResponse } from '../../types/api'; import type { IntercompanyMatrixResponse, IntercompanyMatrixResultResponse } from '../../../types/api';
import type { VersionCard } from '../../types/consolidations/version_members'; import type { VersionCard } from '../../../types/consolidations/version_members';
import { saveBlob, xlsxFilename } from '../../utils/download'; import { chessMatrixMode } from '../../../utils/chessMatrixMode';
import { useNotificationApi } from '../../utils/useNotification'; import { saveBlob, xlsxFilename } from '../../../utils/download';
import { useNotificationApi } from '../../../utils/useNotification';
import { ConsolidationChessFormatTableFilter } from '../ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter'; import { ConsolidationChessFormatTableFilter } from '../ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter';
import { ConsolidationChessResTable } from '../ConsolidationChessResTable/ConsolidationChessResTable'; import { ConsolidationChessResTable } from '../ConsolidationChessResTable/ConsolidationChessResTable';
import { ConsolidationChessTable } from '../ConsolidationChessTable/ConsolidationChessTable'; import { ConsolidationChessTable } from '../ConsolidationChessTable/ConsolidationChessTable';
@ -72,18 +73,15 @@ export const ChessContent = ({ card }: { card: VersionCard | null }) => {
return () => document.removeEventListener('fullscreenchange', handleFullscreenChange); return () => document.removeEventListener('fullscreenchange', handleFullscreenChange);
}, []); }, []);
const isHalfFiltered = (debit.length > 0 && credit.length === 0) || (debit.length === 0 && credit.length > 0); const matrixMode = chessMatrixMode(debit, credit);
const isHalfFiltered = matrixMode === 'half';
const loadData = useCallback( const loadData = useCallback(
async (vId: string, dIds: string[], cIds: string[], isActual: () => boolean) => { async (vId: string, dIds: string[], cIds: string[], isActual: () => boolean) => {
if (isHalfFiltered) {
notification.info({ description: 'Для сравнений по Дт и Кт нужно заполнить оба фильтра' });
return;
}
setLoading(true); setLoading(true);
try { try {
let res: IntercompanyMatrixResponse; let res: IntercompanyMatrixResponse;
if (dIds?.length && cIds?.length) { if (chessMatrixMode(dIds, cIds) === 'manual') {
res = await fetchChessConsolidationsManual(vId, { debit_account_ids: dIds, credit_account_ids: cIds }); res = await fetchChessConsolidationsManual(vId, { debit_account_ids: dIds, credit_account_ids: cIds });
} else { } else {
res = await fetchChessConsolidations(vId); res = await fetchChessConsolidations(vId);
@ -101,7 +99,7 @@ export const ChessContent = ({ card }: { card: VersionCard | null }) => {
} }
} }
}, },
[notification, isHalfFiltered], [notification],
); );
const loadResData = useCallback( const loadResData = useCallback(
async (vid: string) => { async (vid: string) => {
@ -128,7 +126,7 @@ export const ChessContent = ({ card }: { card: VersionCard | null }) => {
} }
setMatrixExportLoading(true); setMatrixExportLoading(true);
try { try {
if (debit?.length && credit?.length) { if (matrixMode === 'manual') {
const { blob, filename } = await exportChessTableManual(version_id, { debit_account_ids: debit, credit_account_ids: credit }); const { blob, filename } = await exportChessTableManual(version_id, { debit_account_ids: debit, credit_account_ids: credit });
saveBlob(blob, filename ?? xlsxFilename('Шахматка', versionInfo)); saveBlob(blob, filename ?? xlsxFilename('Шахматка', versionInfo));
} else { } else {
@ -171,7 +169,8 @@ export const ChessContent = ({ card }: { card: VersionCard | null }) => {
}, [data, companies]); }, [data, companies]);
useEffect(() => { useEffect(() => {
if (!version_id) return; // выбрана только одна сторона Дт/Кт — запрос не шлём, таблица показывает подсказку
if (!version_id || isHalfFiltered) return;
let isMounted = true; let isMounted = true;
const isActual = () => isMounted; const isActual = () => isMounted;
@ -182,7 +181,7 @@ export const ChessContent = ({ card }: { card: VersionCard | null }) => {
isMounted = false; isMounted = false;
setLoading(false); setLoading(false);
}; };
}, [version_id, debit, credit, loadData]); }, [version_id, debit, credit, isHalfFiltered, loadData]);
useEffect(() => { useEffect(() => {
if (!version_id) return; if (!version_id) return;
@ -217,6 +216,7 @@ export const ChessContent = ({ card }: { card: VersionCard | null }) => {
decimals={decimals} decimals={decimals}
units={units} units={units}
isFullscreen={isChessFullscreen} isFullscreen={isChessFullscreen}
isHalfFiltered={isHalfFiltered}
toolbar={ toolbar={
<div <div
style={{ style={{

0
web/src/widgets/ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter.tsx → web/src/widgets/ConsolidationChess/ConsolidationChessFormatTableFilter/ConsolidationChessFormatTableFilter.tsx
View File

6
web/src/widgets/ConsolidationChessResTable/ConsolidatedChessResTable.css → web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidatedChessResTable.css
View File

@ -1,11 +1,11 @@
.chessTable .ant-table-summary { .chessResTable .ant-table-summary {
border-end-end-radius: 8px !important; border-end-end-radius: 8px !important;
border-end-start-radius: 8px !important; border-end-start-radius: 8px !important;
} }
.chessTable .ant-table-cell-fix { .chessResTable .ant-table-cell-fix {
background-color: #f8fafc !important; background-color: #f8fafc !important;
} }
.chessTable .resRow { .chessResTable .resRow {
background-color: #e6f4ea !important ; background-color: #e6f4ea !important ;
} }

8
web/src/widgets/ConsolidationChessResTable/ConsolidationChessResTable.tsx → web/src/widgets/ConsolidationChess/ConsolidationChessResTable/ConsolidationChessResTable.tsx
View File

@ -2,10 +2,10 @@ import { Table, Typography } from 'antd';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import type React from 'react'; import type React from 'react';
import { useMemo } from 'react'; import { useMemo } from 'react';
import type { IntercompanyMatrixResultResponse, MatrixResCell } from '../../types/api'; import type { IntercompanyMatrixResultResponse, MatrixResCell } from '../../../types/api';
import './ConsolidatedChessResTable.css'; import './ConsolidatedChessResTable.css';
import { chessTableCellFormatValue } from '../../utils/chessTableCellFormatValue'; import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue';
import { sumAmounts } from '../../utils/money'; import { sumAmounts } from '../../../utils/money';
const { Text } = Typography; const { Text } = Typography;
@ -81,7 +81,7 @@ export const ConsolidationChessResTable: React.FC<ConsolidationChessResTableI> =
return ( return (
<Table<MatrixResCell> <Table<MatrixResCell>
className='chessTable' className='chessResTable'
dataSource={data?.articles || []} dataSource={data?.articles || []}
columns={columns} columns={columns}
rowKey='code' rowKey='code'

4
web/src/widgets/ConsolidationChessTable/ConsolidatedChessTable.css → web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidatedChessTable.css
View File

@ -16,3 +16,7 @@
.chessTable .resRow { .chessTable .resRow {
background-color: #e6f4ea !important ; background-color: #e6f4ea !important ;
} }
.chessTable.customHeight .ant-table-container {
min-height: 550px;
}

52
web/src/widgets/ConsolidationChessTable/ConsolidationChessTable.tsx → web/src/widgets/ConsolidationChess/ConsolidationChessTable/ConsolidationChessTable.tsx
View File

@ -3,10 +3,11 @@ import { Table, Tooltip, Typography } from 'antd';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import type React from 'react'; import type React from 'react';
import { useMemo } from 'react'; import { useMemo } from 'react';
import type { IntercompanyMatrixResponse, MatrixCell, MatrixCompany } from '../../types/api'; import type { IntercompanyMatrixResponse, MatrixCell, MatrixCompany } from '../../../types/api';
import './ConsolidatedChessTable.css'; import './ConsolidatedChessTable.css';
import { chessTableCellFormatValue } from '../../utils/chessTableCellFormatValue'; import { CHESS_HALF_FILTER_HINT } from '../../../utils/chessMatrixMode';
import { sumAmounts } from '../../utils/money'; import { chessTableCellFormatValue } from '../../../utils/chessTableCellFormatValue';
import { sumAmounts } from '../../../utils/money';
const { Text } = Typography; const { Text } = Typography;
@ -17,6 +18,7 @@ interface ConsolidationChessTableI {
units: string; units: string;
toolbar?: React.ReactNode; toolbar?: React.ReactNode;
isFullscreen?: boolean; isFullscreen?: boolean;
isHalfFiltered?: boolean;
} }
type TotalRow = { type TotalRow = {
@ -32,6 +34,7 @@ export const ConsolidationChessTable: React.FC<ConsolidationChessTableI> = ({
units, units,
toolbar, toolbar,
isFullscreen = false, isFullscreen = false,
isHalfFiltered = false,
}) => { }) => {
const matrixData = useMemo(() => { const matrixData = useMemo(() => {
if (!data?.cells) return {}; if (!data?.cells) return {};
@ -116,13 +119,13 @@ export const ConsolidationChessTable: React.FC<ConsolidationChessTableI> = ({
return totalRow as MatrixCompany; return totalRow as MatrixCompany;
}, [data?.companies, matrixData]); }, [data?.companies, matrixData]);
const scrollY = isFullscreen ? 'calc(100vh - 150px)' : 436; const scrollY = isFullscreen ? 'calc(100vh - 200px)' : 436;
return ( return (
<Table<MatrixCompany> <Table<MatrixCompany>
className='chessTable' className={isHalfFiltered && !isFullscreen ? 'chessTable customHeight' : 'chessTable'}
dataSource={data?.companies || []} dataSource={isHalfFiltered ? [] : data?.companies || []}
columns={columns} columns={isHalfFiltered ? [] : columns}
rowKey='id' rowKey='id'
pagination={false} pagination={false}
loading={loading} loading={loading}
@ -130,26 +133,35 @@ export const ConsolidationChessTable: React.FC<ConsolidationChessTableI> = ({
size='small' size='small'
bordered bordered
title={() => toolbar} title={() => toolbar}
locale={{
emptyText: isHalfFiltered ? (
<div style={{ padding: '40px 0', color: '#8c8c8c', fontSize: 16 }}>{CHESS_HALF_FILTER_HINT}</div>
) : (
'Нет данных'
),
}}
summary={() => { summary={() => {
if (!totalRowData) return null; if (!totalRowData) return null;
return ( return (
<Table.Summary fixed> <Table.Summary fixed>
<Table.Summary.Row className='resRow'> {!isHalfFiltered && (
<Table.Summary.Cell className='resRow' index={0} align='left'> <Table.Summary.Row className='resRow'>
<div style={{ backgroundColor: '#e6f4ea', width: '100%', height: '100%' }}> <Table.Summary.Cell className='resRow' index={0} align='left'>
<Text strong>Итого</Text> <div style={{ backgroundColor: '#e6f4ea', width: '100%', height: '100%' }}>
</div> <Text strong>Итого</Text>
</Table.Summary.Cell>
{data?.companies.map((company, index) => (
<Table.Summary.Cell className='resRow' key={company.id} index={index + 1} align='right'>
<div>
<Text strong>{chessTableCellFormatValue((totalRowData as TotalRow)[company.id], units, decimals) || '—'}</Text>
</div> </div>
</Table.Summary.Cell> </Table.Summary.Cell>
))}
</Table.Summary.Row> {data?.companies.map((company, index) => (
<Table.Summary.Cell className='resRow' key={company.id} index={index + 1} align='right'>
<div>
<Text strong>{chessTableCellFormatValue((totalRowData as TotalRow)[company.id], units, decimals) || '—'}</Text>
</div>
</Table.Summary.Cell>
))}
</Table.Summary.Row>
)}
</Table.Summary> </Table.Summary>
); );
}} }}

14
web/src/widgets/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx → web/src/widgets/ConsolidationChess/ConsolidationChessTableFilter/ConsolidationChessTableFilter.tsx
View File

@ -1,11 +1,12 @@
import { Button, Select, Space } from 'antd'; import { Button, Select, Space } from 'antd';
import type React from 'react'; import type React from 'react';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { ApiError, api } from '../../api/client'; import { ApiError, api } from '../../../api/client';
import { type OptionType, TreeFilterDropdown } from '../../components/TreeFilterDropdown/TreeFilterDropdown'; import { type OptionType, TreeFilterDropdown } from '../../../components/TreeFilterDropdown/TreeFilterDropdown';
import type { Account, MatrixCompany, Quarter } from '../../types/api'; import type { Account, MatrixCompany, Quarter } from '../../../types/api';
import { quarterShortLabel } from '../../utils/labels'; import { CHESS_HALF_FILTER_HINT, chessMatrixMode } from '../../../utils/chessMatrixMode';
import { useNotificationApi } from '../../utils/useNotification'; import { quarterShortLabel } from '../../../utils/labels';
import { useNotificationApi } from '../../../utils/useNotification';
interface ConsolidationChessTableFilterI { interface ConsolidationChessTableFilterI {
companies: string[]; companies: string[];
@ -109,7 +110,8 @@ export const ConsolidationChessTableFilter: React.FC<ConsolidationChessTableFilt
loadAccounts(); loadAccounts();
}, [notification]); }, [notification]);
const warningBlock = <span style={{ color: '#d46b08', fontSize: 13 }}>Выберите счета по Дт и Кт для фильтрации</span>; const warningBlock =
chessMatrixMode(debit, credit) === 'half' ? <span style={{ color: '#d46b08', fontSize: 13 }}>{CHESS_HALF_FILTER_HINT}</span> : null;
return ( return (
<Space size='middle' wrap> <Space size='middle' wrap>

0
web/src/widgets/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx → web/src/widgets/RelatedGroup/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx
View File

12
web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx → web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx
View File

@ -3,12 +3,12 @@ import FormItem from 'antd/es/form/FormItem';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import type React from 'react'; import type React from 'react';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { fetchRelatedGroup } from '../../services/api/directories/company_groups'; import { fetchRelatedGroup } from '../../../services/api/directories/company_groups';
import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks';
import { useAppDispatch, useAppSelector } from '../../store/store'; import { useAppDispatch, useAppSelector } from '../../../store/store';
import type { RelatedGroupFormType } from '../../types/relatedGroup/relatedGroup'; import type { RelatedGroupFormType } from '../../../types/relatedGroup/relatedGroup';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
type Props = { type Props = {
open: boolean; open: boolean;

14
web/src/widgets/RelatedGroupTable/RelatedGroupTable.tsx → web/src/widgets/RelatedGroup/RelatedGroupTable/RelatedGroupTable.tsx
View File

@ -2,13 +2,13 @@ import { DeleteOutlined, EditOutlined, EllipsisOutlined } from '@ant-design/icon
import { Button, Dropdown, Space } from 'antd'; import { Button, Dropdown, Space } from 'antd';
import type { ColumnsType } from 'antd/es/table'; import type { ColumnsType } from 'antd/es/table';
import { type ReactNode, useMemo, useState } from 'react'; import { type ReactNode, useMemo, useState } from 'react';
import { ApiError } from '../../api/client'; import { ApiError } from '../../../api/client';
import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../components/GenericTable'; import { ColumnSettings, DataTable, useFilteredRows, useVisibleColumns } from '../../../components/GenericTable';
import { useTableFilters } from '../../components/GenericTable/useTableFilters'; import { useTableFilters } from '../../../components/GenericTable/useTableFilters';
import { deleteRelatedGroup, editRelatedGroup } from '../../services/api/directories/related-groups'; import { deleteRelatedGroup, editRelatedGroup } from '../../../services/api/directories/related-groups';
import type { RelatedGroupOut } from '../../types/api'; import type { RelatedGroupOut } from '../../../types/api';
import type { RelatedGroupFormType } from '../../types/relatedGroup/relatedGroup'; import type { RelatedGroupFormType } from '../../../types/relatedGroup/relatedGroup';
import { useNotificationApi } from '../../utils/useNotification'; import { useNotificationApi } from '../../../utils/useNotification';
import { DeleteRelatedGroupModal } from '../DeleteRelatedGroupModal/DeleteRelatedGroupModal'; import { DeleteRelatedGroupModal } from '../DeleteRelatedGroupModal/DeleteRelatedGroupModal';
import { RelatedGroupForm } from '../RelatedGroupForm/RelatedGroupForm'; import { RelatedGroupForm } from '../RelatedGroupForm/RelatedGroupForm';
import { relateGroupConfig } from './config'; import { relateGroupConfig } from './config';

8
web/src/widgets/RelatedGroupTable/config.tsx → web/src/widgets/RelatedGroup/RelatedGroupTable/config.tsx
View File

@ -1,9 +1,9 @@
import { VerticalAlignTopOutlined } from '@ant-design/icons'; import { VerticalAlignTopOutlined } from '@ant-design/icons';
import { Button } from 'antd'; import { Button } from 'antd';
import type { TableConfig } from '../../components/GenericTable'; import type { TableConfig } from '../../../components/GenericTable';
import { setRelatedGroupFilter } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; import { setRelatedGroupFilter } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice';
import { store } from '../../store/store'; import { store } from '../../../store/store';
import type { RelatedGroupOut } from '../../types/api'; import type { RelatedGroupOut } from '../../../types/api';
export const relateGroupConfig: TableConfig<RelatedGroupOut> = { export const relateGroupConfig: TableConfig<RelatedGroupOut> = {
rowKey: 'id', rowKey: 'id',
searchableKeys: ['code', 'crm_id', 'name', 'members_count', 'created_date'], searchableKeys: ['code', 'crm_id', 'name', 'members_count', 'created_date'],