k

src/components/Dnd/CreateDealForm/CreateDealFrom.tsx

@@ -7,6 +7,7 @@ import ClientAutocomplete from "../../Selects/ClientAutocomplete/ClientAutocompl
 import {DateTimePicker} from "@mantine/dates";
 import ShippingWarehouseAutocomplete
     from "../../Selects/ShippingWarehouseAutocomplete/ShippingWarehouseAutocomplete.tsx";
+import BaseMarketplaceSelect from "../../Selects/BaseMarketplaceSelect/BaseMarketplaceSelect.tsx";
 
 type Props = {
     onSubmit: (quickDeal: QuickDeal) => void
@@ -20,7 +21,12 @@ const CreateDealFrom: FC<Props> = ({onSubmit, onCancel}) => {
             clientAddress: '',
             comment: '',
             acceptanceDate: new Date(),
-            shippingWarehouse: ''
+            shippingWarehouse: '',
+            baseMarketplace: {
+                key: "",
+                iconUrl: "",
+                name: ""
+            }
         }
     });
     return (
@@ -37,7 +43,7 @@ const CreateDealFrom: FC<Props> = ({onSubmit, onCancel}) => {
             }}>
                 <div className={styles['inputs']}>
                     <TextInput
-                        placeholder={'Название'}
+                        placeholder={'Название сделки'}
                         {...form.getInputProps('name')}
                     />
                 </div>
@@ -45,6 +51,13 @@ const CreateDealFrom: FC<Props> = ({onSubmit, onCancel}) => {
                     <ClientAutocomplete
                         nameRestProps={form.getInputProps('clientName')}
                     />
+                </div>
+                <div className={styles['inputs']}>
+                    <BaseMarketplaceSelect
+                        rightSection={<></>}
+                        placeholder={"Базовый маркетплейс"}
+                        {...form.getInputProps("baseMarketplace")}
+                    />
                     <ShippingWarehouseAutocomplete
                         {...form.getInputProps('shippingWarehouse')}
                         placeholder={'Склад отгрузки'}

src/components/Dnd/DealSummaryCard/DealSummaryCard.module.css

@@ -11,7 +11,6 @@
     padding-top: rem(5);
     padding-bottom: rem(5);
     font-size: var(--mantine-font-size-sm);
-    flex: 1;
     flex-wrap: wrap;
 
     @mixin light {
@@ -20,14 +19,21 @@
     @mixin dark {
         background-color: var(--mantine-color-dark-5);
     }
+
+}
+
+.flex-row-left {
+    flex: 1;
 }
 
 .flex-row {
+
     display: flex;
     flex-direction: column;
     justify-content: space-between;
 }
 
 .flex-row-right {
+
     align-items: flex-end;
 }

src/components/Dnd/DealSummaryCard/DealSummaryCard.tsx

@@ -2,7 +2,7 @@ import {FC} from "react";
 import {DealService, DealSummary} from "../../../client";
 import styles from './DealSummaryCard.module.css';
 
-import {Text} from '@mantine/core';
+import {ActionIcon, Text, Image} from '@mantine/core';
 import classNames from "classnames";
 import {useDealPageContext} from "../../../pages/LeadsPage/contexts/DealPageContext.tsx";
 
@@ -36,7 +36,7 @@ const DealSummaryCard: FC<Props> = ({dealSummary}) => {
     }
     return (
         <div onClick={() => onDealSummaryClick()} className={styles['container']}>
-            <div className={styles['flex-row']}>
+            <div className={classNames(styles['flex-row'], styles["flex-row-left"])}>
                 <div className={styles['flex-item']}>
                     <Text size={"sm"} c={"gray.6"}>
                         Клиент: {dealSummary.clientName}
@@ -53,9 +53,9 @@ const DealSummaryCard: FC<Props> = ({dealSummary}) => {
             </div>
             <div className={classNames(styles['flex-row'], styles['flex-row-right'])}>
                 <div className={styles['flex-item']}>
-                    <Text size={"sm"} c={"gray.6"}>
-                        {/*Создана: {new Date(dealSummary.changedAt).toLocaleString('ru-RU')}*/}
-                    </Text>
+                    <ActionIcon  variant={"transparent"}>
+                        <Image src={dealSummary.baseMarketplace?.iconUrl || ""}/>
+                    </ActionIcon>
                 </div>
                 <div className={styles['flex-item']}>
                     <Text size={"sm"} c={getDeadlineTextColor(dealSummary.deadline)}>