From 1a3fed537fa9710e6e1e0e372ac288cec514fad8 Mon Sep 17 00:00:00 2001
From: Veronika Tsygankova <veronika.amilonn@gmail.com>
Date: Thu, 5 Nov 2026 14:35:58 +0300
Subject: [PATCH] =?UTF-8?q?[AURORA-1970]:=20=D0=A1=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=B8:=20=D1=81=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B2=20=D0=93=D0=A1=D0=9A/=D0=93=D0=A1=D0=97=20?=
 =?UTF-8?q?=D0=B8=20=D1=80=D0=B5=D0=B5=D1=81=D1=82=D1=80=20=C2=AB=D0=AE?=
 =?UTF-8?q?=D0=9B=20=D0=B2=D0=BD=D0=B5=20=D0=93=D0=9A=C2=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layouts/CatalogueJur.tsx                       |  1 +
 .../slices/catalogueJurSlice/catalogueJurSlice.ts      |  6 +++++-
 .../CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx |  9 ++++++---
 .../CatalogueJurTable/CatalogueJurTable.tsx            | 10 ++++++++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/web/src/layouts/CatalogueJur.tsx b/web/src/layouts/CatalogueJur.tsx
index 537dd33..6c01029 100644
--- a/web/src/layouts/CatalogueJur.tsx
+++ b/web/src/layouts/CatalogueJur.tsx
@@ -45,6 +45,7 @@ export function CatalogueJur() {
 			{createFormOpen && (
 				<CatalogueJurForm
 					open={createFormOpen}
+					outsideGroup={outside_group}
 					onCancel={() => {
 						setCreateFormOpen(false);
 					}}
diff --git a/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts b/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts
index 7abf90b..2f8cb32 100644
--- a/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts
+++ b/web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts
@@ -29,6 +29,10 @@ const catalogueJurSlice = createSlice({
 			state.activeCompanyGroup = action.payload;
 			state.relatedGroupFilter = null;
 		},
+		resetRows(state) {
+			state.raw_rows = [];
+			state.total_groups = 0;
+		},
 	},
 	extraReducers: (builder) => {
 		builder
@@ -54,5 +58,5 @@ const catalogueJurSlice = createSlice({
 	},
 });
 
-export const { setIsGettingArchive, setRelatedGroupFilter, setActiveCompanyGroup } = catalogueJurSlice.actions;
+export const { setIsGettingArchive, setRelatedGroupFilter, setActiveCompanyGroup, resetRows } = catalogueJurSlice.actions;
 export default catalogueJurSlice.reducer;
diff --git a/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx
index afce0b8..9c338b6 100644
--- a/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx
+++ b/web/src/widgets/CatalogueJur/CatalogueJurForm/CatalogueJurForm.tsx
@@ -16,6 +16,7 @@ type Props = {
 	onCancel: () => void;
 	onOk: (values: CatalogueJurFormProps) => void | Promise<void>;
 	jurId?: string;
+	outsideGroup?: boolean;
 };
 
 // Ошибки сервера, относящиеся к одному полю, показываем у этого поля
@@ -26,7 +27,7 @@ const FIELD_BY_ERROR_CODE: Record<string, keyof CatalogueJurFormProps> = {
 	CRM_ID_EXISTS: 'crm_id',
 };
 
-export const CatalogueJurForm: React.FC<Props> = ({ open, onCancel, onOk, jurId }) => {
+export const CatalogueJurForm: React.FC<Props> = ({ open, onCancel, onOk, jurId, outsideGroup = false }) => {
 	const [form] = Form.useForm<CatalogueJurFormProps>();
 	const notification = useNotificationApi();
 	const [initialDataLoading, setInitialDataLoading] = useState(false);
@@ -67,7 +68,9 @@ export const CatalogueJurForm: React.FC<Props> = ({ open, onCancel, onOk, jurId
 			} finally {
 				setInitialDataLoading(false);
 			}
-		} else {
+		} else if (!outsideGroup) {
+			// Создание из карточки ГК: подставляем выбранную ГК. В «ЮЛ вне ГК» не подставляем —
+			// выбранная ГК остаётся в сторе после ухода со страницы «ГК и организации».
 			form.setFieldsValue({
 				company_group_id: activeCompanyGroup?.id ?? undefined,
 			});
@@ -253,7 +256,7 @@ export const CatalogueJurForm: React.FC<Props> = ({ open, onCancel, onOk, jurId
 					<Col span={12}>
 						<Form.Item name='company_group_id' label='ГК'>
 							<Select
-								disabled={!!jurId}
+								disabled={!!jurId || outsideGroup}
 								allowClear
 								placeholder='— не указан —'
 								options={companyGroupOptions}
diff --git a/web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx b/web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx
index 1a0e884..cb55a5d 100644
--- a/web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx
+++ b/web/src/widgets/CatalogueJur/CatalogueJurTable/CatalogueJurTable.tsx
@@ -14,7 +14,7 @@ import { useNavigate } from 'react-router-dom';
 import { ApiError } from '../../../api/client';
 import { ColumnSettings, DataTable, useFilteredRows, useTableFilters, useVisibleColumns } from '../../../components/GenericTable';
 import { editCatalogueJur, moveCatalogueJur, withdrawCatalogueJur } from '../../../services/api/directories/catalogue_jur';
-import { setIsGettingArchive, setRelatedGroupFilter } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice';
+import { resetRows, setIsGettingArchive, setRelatedGroupFilter } from '../../../store/slices/catalogueJurSlice/catalogueJurSlice';
 import { getCatalogueJurThunk } from '../../../store/slices/catalogueJurSlice/thunks';
 import { getCompanyGroupsThunk } from '../../../store/slices/companyGroupsSlice/thunks';
 import { useAppDispatch, useAppSelector } from '../../../store/store';
@@ -136,6 +136,12 @@ export function CatalogueJurTable({ outside_group, tabsComponent }: CatalogueJur
 		}
 	}, [isGettingArchive, activeCompanyGroup, outside_group]);
 
+	useEffect(() => {
+		return () => {
+			dispatch(resetRows());
+		};
+	}, [dispatch]);
+
 	const extraColumns: ColumnsType<ICatalogueJur> = useMemo(
 		() => [
 			{
@@ -213,7 +219,7 @@ export function CatalogueJurTable({ outside_group, tabsComponent }: CatalogueJur
 					<Input
 						allowClear
 						prefix={<SearchOutlined />}
-						placeholder='Поиск по ГК, CRM ID или РФ'
+						placeholder='Поиск по ЮЛ или ИНН'
 						value={rawQuery}
 						onChange={(e) => setRawQuery(e.target.value)}
 						style={{ maxWidth: 320 }}