From edd5008120a9f774cd2ec7d4de90ca93ae243ecb Mon Sep 17 00:00:00 2001
From: "gorbenko.pavel" <gorbenko.pavel@tansu.kz>
Date: Tue, 27 Oct 2026 14:44:46 +0500
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=8F=D0=B2=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=BE=D0=BF=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=82=D1=83=20=D0=B7=D0=B0=D0=BD=D0=B8=D0=BC=D0=B0=D1=8E?=
 =?UTF-8?q?=D1=82=20=D0=B2=D1=81=D1=8E=20=D1=88=D0=B8=D1=80=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=83=20=D1=81=D0=B5=D0=BA=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Тело CollapseSection из ui-kit уже сетка в две колонки, а поля были
завёрнуты ещё в один FormGrid и попадали в половину первой колонки.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 .../forms/PaymentRequest/sections/AmountsSection.tsx     | 8 +++-----
 .../forms/PaymentRequest/sections/BasisSection.tsx       | 9 ++++-----
 .../forms/PaymentRequest/sections/PaymentSection.tsx     | 6 +++---
 .../PaymentRequest/sections/PaymentSections.module.scss  | 6 ++++++
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/webparts/requestPortal/forms/PaymentRequest/sections/AmountsSection.tsx b/src/webparts/requestPortal/forms/PaymentRequest/sections/AmountsSection.tsx
index 24a3527..95ba1b1 100644
--- a/src/webparts/requestPortal/forms/PaymentRequest/sections/AmountsSection.tsx
+++ b/src/webparts/requestPortal/forms/PaymentRequest/sections/AmountsSection.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import styles from './PaymentSections.module.scss';
-import { FormGrid, FormField, TextInput, TextArea } from '../../../shared/ui';
+import { FormField, TextInput, TextArea } from '../../../shared/ui';
 import { formatAmount, overLimitAmount, previousPaymentsTotal } from '../amounts';
 import { ISectionProps } from '../model';
 import { AmountInput } from './AmountInput';
@@ -15,7 +15,6 @@ export const AmountsSection: React.FC<ISectionProps> = ({ data, set }) => {
 
   return (
     <>
-      <FormGrid>
         <FormField label="Общая сумма" htmlFor="TotalAmount">
           <AmountInput id="TotalAmount" value={data.TotalAmount} onChange={(v) => set('TotalAmount', v)} />
         </FormField>
@@ -42,11 +41,10 @@ export const AmountsSection: React.FC<ISectionProps> = ({ data, set }) => {
         <FormField label="Комментарий" htmlFor="Comment" full>
           <TextArea id="Comment" value={data.Comment} onChange={(v) => set('Comment', v)} rows={2} />
         </FormField>
-      </FormGrid>
 
-      <h4>Заявки на оплату по этому основанию</h4>
+      <h4 className={styles.fullRow}>Заявки на оплату по этому основанию</h4>
       {data.PreviousPayments.length === 0 ? (
-        <div className={styles.empty}>Ранее заявок на оплату по этому основанию не было.</div>
+        <div className={`${styles.empty} ${styles.fullRow}`}>Ранее заявок на оплату по этому основанию не было.</div>
       ) : (
         <div className={styles.tableWrap}>
           <table className={styles.table}>
diff --git a/src/webparts/requestPortal/forms/PaymentRequest/sections/BasisSection.tsx b/src/webparts/requestPortal/forms/PaymentRequest/sections/BasisSection.tsx
index 9f88178..fc027b7 100644
--- a/src/webparts/requestPortal/forms/PaymentRequest/sections/BasisSection.tsx
+++ b/src/webparts/requestPortal/forms/PaymentRequest/sections/BasisSection.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { Alert, FormGrid, FormField, Select, ISelectOption } from '../../../shared/ui';
+import { Alert, FormField, Select, ISelectOption } from '../../../shared/ui';
+import styles from './PaymentSections.module.scss';
 import { ICompany, ProjectPicker, getCompanies } from '../../../shared/dictionary';
 import { BASIS_OPTIONS, BasisKind, ISectionProps } from '../model';
 import { IBasisSelection } from '../useBasisSelection';
@@ -43,7 +44,6 @@ export const BasisSection: React.FC<IBasisSectionProps> = ({ data, patch, contex
 
   return (
     <>
-    <FormGrid>
       <FormField label="Основание" htmlFor="BasisKind" required>
         <Select id="BasisKind" value={data.BasisKind} onChange={handleKindChange} options={KIND_OPTIONS} />
       </FormField>
@@ -80,9 +80,8 @@ export const BasisSection: React.FC<IBasisSectionProps> = ({ data, patch, contex
           placeholder="Выберите компанию…"
         />
       </FormField>
-    </FormGrid>
-    {basis.loading && <Alert variant="info">Загружаем данные основания…</Alert>}
-    {basis.error && <Alert variant="err">{basis.error}</Alert>}
+    {basis.loading && <div className={styles.fullRow}><Alert variant="info">Загружаем данные основания…</Alert></div>}
+    {basis.error && <div className={styles.fullRow}><Alert variant="err">{basis.error}</Alert></div>}
     </>
   );
 };
diff --git a/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSection.tsx b/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSection.tsx
index 1081b09..b16381c 100644
--- a/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSection.tsx
+++ b/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSection.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import styles from './PaymentSections.module.scss';
-import { FormGrid, FormField, TextInput, TextArea } from '../../../shared/ui';
+import { FormField, TextInput, TextArea } from '../../../shared/ui';
 import {
   DictionaryPicker,
   getCashFlowGroups,
@@ -25,7 +25,7 @@ export const PaymentSection: React.FC<ISectionProps> = ({ data, set, patch, cont
   const accountFilter = { companyId: data.CompanyId, projectId: data.ProjectId };
 
   return (
-    <FormGrid>
+    <>
       <FormField label="Банковский счёт" htmlFor="BankAccountName" required>
         <DictionaryPicker
           id="BankAccountName"
@@ -99,6 +99,6 @@ export const PaymentSection: React.FC<ISectionProps> = ({ data, set, patch, cont
       <FormField label="Условия оплаты" htmlFor="PaymentTerms">
         <TextArea id="PaymentTerms" value={data.PaymentTerms} onChange={(v) => set('PaymentTerms', v)} rows={2} />
       </FormField>
-    </FormGrid>
+    </>
   );
 };
diff --git a/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSections.module.scss b/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSections.module.scss
index 71eb9dc..5523301 100644
--- a/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSections.module.scss
+++ b/src/webparts/requestPortal/forms/PaymentRequest/sections/PaymentSections.module.scss
@@ -102,3 +102,9 @@
   color: $gray-500;
   font-size: $fs-sm;
 }
+
+// Тело CollapseSection из ui-kit — сетка в две колонки; всё не-поле растягиваем на обе.
+.fullRow {
+  grid-column: 1 / -1;
+  min-width: 0;
+}