diff --git a/web/src/index.css b/web/src/index.css
index f4fdb65..bd75d66 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -156,3 +156,8 @@ body {
font-family: "Geist", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif;
margin: 0px;
}
+
+/* Подписи полей во всех формах полужирные */
+.ant-form-item-label > label {
+ font-weight: 600;
+}
diff --git a/web/src/index.tsx b/web/src/index.tsx
index 83b74ef..ee73778 100644
--- a/web/src/index.tsx
+++ b/web/src/index.tsx
@@ -50,7 +50,7 @@ createRoot(rootElement).render(
},
Form: {
labelFontSize: 12,
- labelColor: '#667085',
+ labelColor: '#101828',
},
},
}}>
diff --git a/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css
index 6c551ff..75a25c7 100644
--- a/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css
+++ b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.css
@@ -1,9 +1,67 @@
-.ant-tabs-tab-active {
- background-color: #ecfdf3 !important;
+.catalogue-company-group-tabs {
+ padding-top: 8px;
+}
+
+.ant-tabs-nav {
+ margin: 0 !important;
+}
+
+.ant-tabs-nav-list {
+ gap: 8px;
}
.ant-tabs-tab {
padding: 8px 12px !important;
- margin: 10px 0 0 0 !important;
+ margin: 0 !important;
border-radius: 8px !important;
+ display: flex;
+ align-items: center;
}
+
+.ant-tabs-tab-active {
+ background-color: #ecfdf3 !important;
+}
+
+.ant-tabs-tab-btn {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ line-height: 1;
+ color: #667085 !important;
+}
+
+.ant-tabs-tab-active .ant-tabs-tab-btn {
+ color: #166534 !important;
+ font-weight: 600;
+}
+
+.ant-tabs-ink-bar {
+ display: none !important;
+}
+
+.catalogue-company-group-tabs__label {
+ display: inline-flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.catalogue-company-group-tabs__count {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ min-width: 20px;
+ height: 20px;
+ padding: 0 6px;
+ border-radius: 50%;
+ background-color: #f0f2f5;
+ color: #667085;
+ font-size: 12px;
+ line-height: 1;
+ font-weight: 500;
+}
+
+.ant-tabs-tab-active .catalogue-company-group-tabs__count {
+ background-color: transparent;
+ color: #166534;
+ font-weight: 600;
+}
\ No newline at end of file
diff --git a/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx
index b6f770b..712d8c8 100644
--- a/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx
+++ b/web/src/widgets/CatalogueCompanyGroup/CatalogueCompanyGroupTabs/CatalogueCompanyGroupTabs.tsx
@@ -11,22 +11,34 @@ interface CatalogueCompanyGroupTabsI {
export type CatalogueCompanyGroupTabKey = 'legal_entities' | 'gsk' | 'gsz';
+const TabLabel = ({ title, count }: { title: string; count: number }) => (
+
+ {title}
+ {count}
+
+);
+
export const CatalogueCompanyGroupTabs = ({ activeTab, setActiveTab, gskData, gszData }: CatalogueCompanyGroupTabsI) => {
const activeCompanyGroup = useAppSelector((state) => state.catalogue_jur.activeCompanyGroup);
return (
setActiveTab(key as CatalogueCompanyGroupTabKey)}
- tabBarStyle={{ margin: 0, marginBottom: 0 }}
- style={{ marginBottom: 0 }}
items={[
{
key: 'legal_entities',
- label: `ЮЛ ${activeCompanyGroup?.legal_entities_count ?? 0}`,
+ label: ,
+ },
+ {
+ key: 'gsk',
+ label: ,
+ },
+ {
+ key: 'gsz',
+ label: ,
},
- { key: 'gsk', label: `ГСК ${gskData?.length ?? 0}` },
- { key: 'gsz', label: `ГСЗ ${gszData?.length ?? 0}` },
]}
/>
);
diff --git a/web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx b/web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx
index 7be6ee9..8197075 100644
--- a/web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx
+++ b/web/src/widgets/CatalogueJur/CatalogueJurTable/config.tsx
@@ -39,7 +39,7 @@ export const catalogueJurConfig: TableConfig = {
title: 'Тип',
features: { multiselect: true, sort: true },
render: (val) => {
- const preset = val === 'ЮЛ' ? TAG_PRESETS.orange : TAG_PRESETS.purple;
+ const preset = val === 'ЮЛ' ? TAG_PRESETS.purple : TAG_PRESETS.orange;
return ;
},
},
diff --git a/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx b/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx
index b796691..4e6bc39 100644
--- a/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx
+++ b/web/src/widgets/RelatedGroup/RelatedGroupForm/RelatedGroupForm.tsx
@@ -111,7 +111,7 @@ export const RelatedGroupForm: React.FC = ({ open, onCancel, onOk, relate
loading={initialDataLoading}
confirmLoading={confirmLoading}>