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

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

Browse Source
This commit is contained in:
Grog 2026-10-26 14:14:50 +03:00
parent daec128fc3
commit 630a616bf1
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/App.css
View File

@ -3,4 +3,4 @@
color: #1f5f35 !important; color: #1f5f35 !important;
box-shadow: inset 0 0 0 1px #2ea64b38 !important; box-shadow: inset 0 0 0 1px #2ea64b38 !important;
border-radius: 999px !important; border-radius: 999px !important;
} }

4
web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts
View File

@ -1,8 +1,8 @@
import { type PayloadAction, createSlice } from '@reduxjs/toolkit'; import { type PayloadAction, createSlice } from '@reduxjs/toolkit';
import type { RelatedGroupOut } from '../../../types/api'; import type { RelatedGroupOut } from '../../../types/api';
import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups';
import { getCatalogueJurThunk } from './thunks'; import { getCatalogueJurThunk } from './thunks';
import type { CatalogueJurSliceType } from './types'; import type { CatalogueJurSliceType } from './types';
import { ICompanyGroup } from '../../../types/companyGroups/companyGroups';
const initialState: CatalogueJurSliceType = { const initialState: CatalogueJurSliceType = {
raw_rows: [], raw_rows: [],
@ -26,7 +26,7 @@ const catalogueJurSlice = createSlice({
}, },
setActiveCompanyGroup(state, action: PayloadAction<ICompanyGroup | null>) { setActiveCompanyGroup(state, action: PayloadAction<ICompanyGroup | null>) {
state.activeCompanyGroup = action.payload; state.activeCompanyGroup = action.payload;
state.relatedGroupFilter = null state.relatedGroupFilter = null;
}, },
}, },
extraReducers: (builder) => { extraReducers: (builder) => {

2
web/src/store/slices/catalogueJurSlice/types.ts
View File

@ -1,6 +1,6 @@
import type { RelatedGroupOut } from '../../../types/api'; import type { RelatedGroupOut } from '../../../types/api';
import type { ICatalogueJur } from '../../../types/catalogueJur/catalogueJur'; import type { ICatalogueJur } from '../../../types/catalogueJur/catalogueJur';
import { ICompanyGroup } from '../../../types/companyGroups/companyGroups'; import type { ICompanyGroup } from '../../../types/companyGroups/companyGroups';
export interface CatalogueJurSliceType { export interface CatalogueJurSliceType {
total_groups: number; total_groups: number;

2
web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts
View File

@ -1,4 +1,4 @@
import { createSlice } from '@reduxjs/toolkit'; import { createSlice } from '@reduxjs/toolkit';
import { getCompanyGroupsThunk } from './thunks'; import { getCompanyGroupsThunk } from './thunks';
import type { CompanyGroupSliceType } from './types'; import type { CompanyGroupSliceType } from './types';

2
web/src/types/api.ts
View File

@ -375,7 +375,7 @@ export interface ConsolidationCreate {
export interface RelatedGroupOut { export interface RelatedGroupOut {
id: string; id: string;
code: string; code: string;
crm_id:string, crm_id: string;
company_group_id: string; company_group_id: string;
kind: 'gsk' | 'gsz'; kind: 'gsk' | 'gsz';
name: string; name: string;

2
web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx
View File

@ -2,9 +2,9 @@ import { FolderOpenOutlined, SearchOutlined } from '@ant-design/icons';
import { Empty, Input, List, Spin, Tag, Typography } from 'antd'; import { 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 { 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 { setActiveCompanyGroup } from '../../store/slices/catalogueJurSlice/catalogueJurSlice';
const { Text } = Typography; const { Text } = Typography;

2
web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx
View File

@ -109,7 +109,7 @@ export const RelatedGroupForm: React.FC<Props> = ({ open, onCancel, onOk, relate
loading={initialDataLoading} loading={initialDataLoading}
confirmLoading={confirmLoading}> confirmLoading={confirmLoading}>
<Form form={form} layout='vertical'> <Form form={form} layout='vertical'>
<FormItem name='crm_id' label='ID в CRM' > <FormItem name='crm_id' label='ID в CRM'>
<Input /> <Input />
</FormItem> </FormItem>
<FormItem name='name' label='Наименование' rules={[{ required: true, message: 'Укажите наименование' }]}> <FormItem name='name' label='Наименование' rules={[{ required: true, message: 'Укажите наименование' }]}>

2
web/src/widgets/RelatedGroupTable/config.tsx
View File

@ -39,7 +39,7 @@ export const relateGroupConfig: TableConfig<RelatedGroupOut> = {
key: 'created_date', key: 'created_date',
title: 'Дата создания', title: 'Дата создания',
render: (val) => { render: (val) => {
return val ? new Date(val as string).toLocaleDateString('ru-RU') : '—'; return val ? new Date(val as string).toLocaleDateString('ru-RU') : '—';
}, },
}, },
], ],