aurora-(1636, 1693): обновление справочника гк и юл и исправлена фильтрация юл без гк #201

Merged
aep merged 7 commits from feat/companyGroupUpdate into main 2026-10-28 16:29:39 +03:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 9338f7bd73 - Show all commits

View File

@ -17,7 +17,7 @@ export const ArchiveCompanyGroupModal: React.FC<Props> = ({ open, onCancel, onOk
onOk={onOk}
okText='Подтвердить'
cancelText='Отмена'
okButtonProps={{ danger: true }}
okButtonProps={isArchived ? undefined : { danger: true }}
confirmLoading={loading}
centered>
<p style={{ margin: 0, color: '#595959' }}>Группа компании будет {isArchived ? 'разархивированна' : 'архивированна'}</p>

View File

@ -3,7 +3,7 @@ import Text from 'antd/es/typography/Text';
import Title from 'antd/es/typography/Title';
import { useAppSelector } from '../../store/store';
import { pluralRu } from '../../utils/labels';
import { DeleteOutlined, EditOutlined, EllipsisOutlined, HistoryOutlined } from '@ant-design/icons';
import { CheckCircleOutlined, DeleteOutlined, EditOutlined, EllipsisOutlined, HistoryOutlined } from '@ant-design/icons';
import { useNavigate } from 'react-router-dom';
interface CompanyGroupHeaderI {
@ -34,9 +34,9 @@ export const CompanyGroupHeader = ({ setEditFormOpen, setDeleteConfirmOpen }: Co
},
{
key: 'delete',
icon: <DeleteOutlined />,
icon: activeCompanyGroup?.is_archived ? <CheckCircleOutlined /> : <DeleteOutlined />,
label: activeCompanyGroup?.is_archived ? 'Разархивировать' : 'Архивировать',
danger: true,
danger: activeCompanyGroup?.is_archived ? false : true,
onClick: () => {
setDeleteConfirmOpen(true);
},