AURORA-1671: исправления по функционалу ГК и ЮЛ #179
@ -3,4 +3,4 @@
|
||||
color: #1f5f35 !important;
|
||||
box-shadow: inset 0 0 0 1px #2ea64b38 !important;
|
||||
border-radius: 999px !important;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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<ICompanyGroup | null>) {
|
||||
state.activeCompanyGroup = action.payload;
|
||||
state.relatedGroupFilter = null
|
||||
state.relatedGroupFilter = null;
|
||||
},
|
||||
},
|
||||
extraReducers: (builder) => {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { createSlice } from '@reduxjs/toolkit';
|
||||
import { createSlice } from '@reduxjs/toolkit';
|
||||
import { getCompanyGroupsThunk } from './thunks';
|
||||
import type { CompanyGroupSliceType } from './types';
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -109,7 +109,7 @@ export const RelatedGroupForm: React.FC<Props> = ({ open, onCancel, onOk, relate
|
||||
loading={initialDataLoading}
|
||||
confirmLoading={confirmLoading}>
|
||||
<Form form={form} layout='vertical'>
|
||||
<FormItem name='crm_id' label='ID в CRM' >
|
||||
<FormItem name='crm_id' label='ID в CRM'>
|
||||
<Input />
|
||||
</FormItem>
|
||||
<FormItem name='name' label='Наименование' rules={[{ required: true, message: 'Укажите наименование' }]}>
|
||||
|
||||
@ -39,7 +39,7 @@ export const relateGroupConfig: TableConfig<RelatedGroupOut> = {
|
||||
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') : '—';
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user