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

исправленно отображение архивация разархивации гк

Browse Source
This commit is contained in:
Grog 2026-10-27 17:11:45 +03:00
parent c64975241b
commit 9338f7bd73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx
View File

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