diff --git a/src/client/models/ClientSchema.ts b/src/client/models/ClientSchema.ts index a1eea8f..27d8828 100644 --- a/src/client/models/ClientSchema.ts +++ b/src/client/models/ClientSchema.ts @@ -7,6 +7,7 @@ import type { ClientDetailsSchema } from './ClientDetailsSchema'; export type ClientSchema = { id: number; name: string; + companyName: string; barcodeTemplate?: (BarcodeTemplateSchema | null); details?: (ClientDetailsSchema | null); }; diff --git a/src/pages/ClientsPage/components/ClientsTable/columns.tsx b/src/pages/ClientsPage/components/ClientsTable/columns.tsx index a1ef567..550e87f 100644 --- a/src/pages/ClientsPage/components/ClientsTable/columns.tsx +++ b/src/pages/ClientsPage/components/ClientsTable/columns.tsx @@ -26,8 +26,12 @@ export const useClientsTableColumns = () => { header: "ИНН" }, { - accessorKey:"barcodeTemplate.name", - header:"Шаблон штрихкодов" + accessorKey: "companyName", + header: "Название компании" + }, + { + accessorKey: "barcodeTemplate.name", + header: "Шаблон штрихкодов" } ], []); } diff --git a/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx b/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx index c6a25d4..879c160 100644 --- a/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx +++ b/src/pages/ClientsPage/modals/ClientFormModal/ClientFormModal.tsx @@ -15,24 +15,15 @@ const ClientFormModal = ({ }: ContextModalProps) => { const isEditing = 'onChange' in innerProps; - const initialValues: ClientSchema = isEditing ? { - id: innerProps.element.id, - name: innerProps.element.name, - details: { - telegram: innerProps.element.details?.telegram, - phoneNumber: innerProps.element.details?.phoneNumber, - email: innerProps.element.details?.email, - inn: innerProps.element.details?.inn - }, - barcodeTemplate: innerProps.element.barcodeTemplate - } : { + const initialValues: ClientSchema = isEditing ? innerProps.element : { id: -1, name: '', + companyName: '', details: { telegram: '', phoneNumber: '', email: '', - inn: undefined + inn: undefined, } } const form = useForm({ @@ -90,6 +81,10 @@ const ClientFormModal = ({ placeholder={"Введите ИНН"} {...form.getInputProps('details.inn')} /> +