diff --git a/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx b/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx index 48e4c39..8c0ee42 100644 --- a/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx +++ b/src/app/deals/drawers/DealEditorDrawer/DealEditorDrawer.tsx @@ -38,7 +38,6 @@ const DealEditorDrawer: FC> = ({ display: "flex", flexDirection: "column", padding: isMobile ? 0 : "var(--mantine-spacing-xs)", - height: "100vh", }, header: { paddingBlock: 0, diff --git a/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx b/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx index e9b5491..855097d 100644 --- a/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx +++ b/src/app/deals/drawers/DealEditorDrawer/components/DealEditorBody.tsx @@ -62,7 +62,8 @@ const DealEditorBody: FC = props => { { return ( - - + gap={"sm"} + mah={"90vh"}> + + + gap={"sm"}> {dealServicesList.dealServices.map(dealService => ( { /> ))} - + diff --git a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTitle.tsx b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTitle.tsx index f7eae14..44e4c1c 100644 --- a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTitle.tsx +++ b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTitle.tsx @@ -1,10 +1,9 @@ -import { rem, Title } from "@mantine/core"; +import { Title } from "@mantine/core"; const DealServicesTitle = () => ( + w={"100%"}> Общие услуги ); diff --git a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTotalLabel.tsx b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTotalLabel.tsx index befa109..74b794e 100644 --- a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTotalLabel.tsx +++ b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/DealServicesTotalLabel.tsx @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { rem, Title } from "@mantine/core"; +import { Title } from "@mantine/core"; import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext"; const DealServicesTotalLabel = () => { @@ -16,9 +16,9 @@ const DealServicesTotalLabel = () => { return ( - Итог: {total}₽ + Итог: {total.toFixed(2)}₽ ); }; diff --git a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/ServicesActions.tsx b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/ServicesActions.tsx index a86a385..d5bf112 100644 --- a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/ServicesActions.tsx +++ b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/DealServicesTable/components/ServicesActions.tsx @@ -1,4 +1,4 @@ -import { Button, Flex, rem } from "@mantine/core"; +import { Button, Flex } from "@mantine/core"; import { modals } from "@mantine/modals"; import { addKitToDeal, ServicesKitSchema } from "@/lib/client"; import { useFulfillmentBaseContext } from "@/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/contexts/FulfillmentBaseContext"; @@ -48,8 +48,7 @@ const ServicesActions = () => { return (