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 && ( { 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; jurId?: string; + outsideGroup?: boolean; }; // Ошибки сервера, относящиеся к одному полю, показываем у этого поля @@ -26,7 +27,7 @@ const FIELD_BY_ERROR_CODE: Record = { CRM_ID_EXISTS: 'crm_id', }; -export const CatalogueJurForm: React.FC = ({ open, onCancel, onOk, jurId }) => { +export const CatalogueJurForm: React.FC = ({ open, onCancel, onOk, jurId, outsideGroup = false }) => { const [form] = Form.useForm(); const notification = useNotificationApi(); const [initialDataLoading, setInitialDataLoading] = useState(false); @@ -67,7 +68,9 @@ export const CatalogueJurForm: React.FC = ({ 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 = ({ open, onCancel, onOk, jurId } - placeholder='Поиск по ГК, CRM ID или РФ' + placeholder='Поиск по ЮЛ или ИНН' value={rawQuery} onChange={(e) => setRawQuery(e.target.value)} style={{ maxWidth: 320 }}