From 630a616bf17e3d31cd38757f184fb47cbed8fae4 Mon Sep 17 00:00:00 2001 From: Grog Date: Mon, 26 Oct 2026 14:14:50 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/App.css | 2 +- web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts | 4 ++-- web/src/store/slices/catalogueJurSlice/types.ts | 2 +- web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts | 2 +- web/src/types/api.ts | 2 +- web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx | 2 +- web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx | 2 +- web/src/widgets/RelatedGroupTable/config.tsx | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/src/App.css b/web/src/App.css index facf75a..4f7a3bb 100644 --- a/web/src/App.css +++ b/web/src/App.css @@ -3,4 +3,4 @@ color: #1f5f35 !important; box-shadow: inset 0 0 0 1px #2ea64b38 !important; border-radius: 999px !important; -} \ No newline at end of file +} diff --git a/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts b/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts index d381927..8662ee1 100644 --- a/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts +++ b/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts @@ -1,8 +1,8 @@ import { type PayloadAction, createSlice } from '@reduxjs/toolkit'; import type { RelatedGroupOut } from '../../../types/api'; +import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; import { getCatalogueJurThunk } from './thunks'; import type { CatalogueJurSliceType } from './types'; -import { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; const initialState: CatalogueJurSliceType = { raw_rows: [], @@ -26,7 +26,7 @@ const catalogueJurSlice = createSlice({ }, setActiveCompanyGroup(state, action: PayloadAction) { state.activeCompanyGroup = action.payload; - state.relatedGroupFilter = null + state.relatedGroupFilter = null; }, }, extraReducers: (builder) => { diff --git a/web/src/store/slices/catalogueJurSlice/types.ts b/web/src/store/slices/catalogueJurSlice/types.ts index 53b8cac..7227c33 100644 --- a/web/src/store/slices/catalogueJurSlice/types.ts +++ b/web/src/store/slices/catalogueJurSlice/types.ts @@ -1,6 +1,6 @@ import type { RelatedGroupOut } from '../../../types/api'; import type { ICatalogueJur } from '../../../types/catalogueJur/catalogueJur'; -import { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; +import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; export interface CatalogueJurSliceType { total_groups: number; diff --git a/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts b/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts index ce86dad..c56a483 100644 --- a/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts +++ b/web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts @@ -1,4 +1,4 @@ -import { createSlice } from '@reduxjs/toolkit'; +import { createSlice } from '@reduxjs/toolkit'; import { getCompanyGroupsThunk } from './thunks'; import type { CompanyGroupSliceType } from './types'; diff --git a/web/src/types/api.ts b/web/src/types/api.ts index 410a74c..d304177 100644 --- a/web/src/types/api.ts +++ b/web/src/types/api.ts @@ -375,7 +375,7 @@ export interface ConsolidationCreate { export interface RelatedGroupOut { id: string; code: string; - crm_id:string, + crm_id: string; company_group_id: string; kind: 'gsk' | 'gsz'; name: string; diff --git a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx b/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx index 8a86ddb..47d0caf 100644 --- a/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx +++ b/web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx @@ -2,9 +2,9 @@ import { FolderOpenOutlined, SearchOutlined } from '@ant-design/icons'; import { Empty, Input, List, Spin, Tag, Typography } from 'antd'; import { useEffect, useMemo, useState } from 'react'; import { useVirtualList } from '../../hooks/useVirtualList'; +import { setActiveCompanyGroup } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; import { getCompanyGroupsThunk } from '../../store/slices/companyGroupsSlice/thunks'; import { useAppDispatch, useAppSelector } from '../../store/store'; -import { setActiveCompanyGroup } from '../../store/slices/catalogueJurSlice/catalogueJurSlice'; const { Text } = Typography; diff --git a/web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx b/web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx index ec63a23..84deb75 100644 --- a/web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx +++ b/web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx @@ -109,7 +109,7 @@ export const RelatedGroupForm: React.FC = ({ open, onCancel, onOk, relate loading={initialDataLoading} confirmLoading={confirmLoading}>
- + diff --git a/web/src/widgets/RelatedGroupTable/config.tsx b/web/src/widgets/RelatedGroupTable/config.tsx index 5fb57ee..c4b72af 100644 --- a/web/src/widgets/RelatedGroupTable/config.tsx +++ b/web/src/widgets/RelatedGroupTable/config.tsx @@ -39,7 +39,7 @@ export const relateGroupConfig: TableConfig = { key: 'created_date', title: 'Дата создания', render: (val) => { - return val ? new Date(val as string).toLocaleDateString('ru-RU') : '—'; + return val ? new Date(val as string).toLocaleDateString('ru-RU') : '—'; }, }, ],