diff --git a/src/webparts/requestPortal/forms/RecruitingHire/load.ts b/src/webparts/requestPortal/forms/RecruitingHire/load.ts index dfba7e7..f12c7c6 100644 --- a/src/webparts/requestPortal/forms/RecruitingHire/load.ts +++ b/src/webparts/requestPortal/forms/RecruitingHire/load.ts @@ -18,7 +18,7 @@ function parseJsonArray(raw: unknown): T[] { const SCALAR_FIELDS: (keyof IFormData)[] = [ 'Phone', 'HireType', 'HireReplacedEmployee', 'Project', 'ProjectId', 'ProjectCode', 'HireCandidateName', 'HireHireDate', 'Position', 'WorkKind', - 'Department', 'DepartmentId', 'SiteLocation', 'PpeHeight', 'PpeClothingSize', 'PpeShoeSize', 'ProbationPeriod', + 'Department', 'SiteLocation', 'PpeHeight', 'PpeClothingSize', 'PpeShoeSize', 'ProbationPeriod', 'SalaryProbation', 'SalaryAfterProbation', 'WorkSchedule', 'WorkScheduleOther', 'AgencyName', 'AgencyTerms', 'SelectionRequestId', 'SelectionRequestListId', 'SelectionRequestCode' diff --git a/src/webparts/requestPortal/forms/RecruitingHire/model.ts b/src/webparts/requestPortal/forms/RecruitingHire/model.ts index 4fd8822..22eea77 100644 --- a/src/webparts/requestPortal/forms/RecruitingHire/model.ts +++ b/src/webparts/requestPortal/forms/RecruitingHire/model.ts @@ -43,16 +43,8 @@ export interface IFormData { HireHireDate: string; Position: string; WorkKind: string; - /** - * Подразделение по справочнику (Dictionary/Departments, см. - * shared/dictionary/DepartmentPicker) — как в WorkplaceSetup/RecruitingSelection: - * ручной выбор, чисто информационное, на маршрут согласования НЕ влияет. - * Заменило прежнее свободнотекстовое поле «Отдел / участок» (колонка SiteName - * в SP осталась в схеме нетронутой — просто больше не используется формой). - */ + /** Отдел/Участок — свободный текст, чисто информационное, на маршрут согласования не влияет. */ Department: string; - /** Id отдела из справочника; '' — если введён вручную без выбора из списка. */ - DepartmentId: string; SiteLocation: string; // СИЗ PpeHeight: string; @@ -96,7 +88,6 @@ export const EMPTY_DATA: IFormData = { Position: '', WorkKind: '', Department: '', - DepartmentId: '', SiteLocation: '', PpeHeight: '', PpeClothingSize: '', diff --git a/src/webparts/requestPortal/forms/RecruitingHire/sections/CandidateSection.tsx b/src/webparts/requestPortal/forms/RecruitingHire/sections/CandidateSection.tsx index bba23f7..10291ff 100644 --- a/src/webparts/requestPortal/forms/RecruitingHire/sections/CandidateSection.tsx +++ b/src/webparts/requestPortal/forms/RecruitingHire/sections/CandidateSection.tsx @@ -1,9 +1,8 @@ import * as React from 'react'; import { CollapseSection, FormField, TextInput } from '../../../shared/ui'; -import { DepartmentPicker } from '../../../shared/dictionary'; import { ISectionProps } from '../model'; -export const CandidateSection: React.FC = ({ data, set, context }) => ( +export const CandidateSection: React.FC = ({ data, set }) => ( set('HireCandidateName', v)} /> @@ -17,16 +16,8 @@ export const CandidateSection: React.FC = ({ data, set, context } set('WorkKind', v)} /> - - { - set('Department', name); - set('DepartmentId', id); - }} - /> + + set('Department', v)} /> set('SiteLocation', v)} /> diff --git a/src/webparts/requestPortal/forms/RecruitingSelection/sections/ConditionsSection.tsx b/src/webparts/requestPortal/forms/RecruitingSelection/sections/ConditionsSection.tsx index 5eddbdc..39677a7 100644 --- a/src/webparts/requestPortal/forms/RecruitingSelection/sections/ConditionsSection.tsx +++ b/src/webparts/requestPortal/forms/RecruitingSelection/sections/ConditionsSection.tsx @@ -1,46 +1,84 @@ -import * as React from 'react'; -import { CollapseSection, FormField, TextInput, TextArea, MoneyInput, Toggle, Select, PeopleField, PeopleFieldMulti } from '../../../shared/ui'; -import { MultiChoiceField } from './MultiChoiceField'; +import * as React from "react"; +import { + CollapseSection, + FormField, + TextInput, + TextArea, + MoneyInput, + Toggle, + Select, + PeopleField, + PeopleFieldMulti, +} from "../../../shared/ui"; +import { MultiChoiceField } from "./MultiChoiceField"; import { ISectionProps, PERSON_PLACEHOLDER, OTHER_VALUE, WORK_SCHEDULE_OPTIONS, WORK_HOURS_OPTIONS, - WORKPLACE_PROVISION_OPTIONS -} from '../model'; + WORKPLACE_PROVISION_OPTIONS, +} from "../model"; -export const ConditionsSection: React.FC = ({ data, set, context }) => ( +export const ConditionsSection: React.FC = ({ + data, + set, + context, +}) => ( - set('RateProbation', v)} /> + set("RateProbation", v)} + /> set('RateAfterProbation', v)} + onChange={(v) => set("RateAfterProbation", v)} /> -