@redneckz/wildless-cms-uni-blocks 0.14.877 → 0.14.878

package/mobile/src/retail/utils/calculateInputs.ts

@@ -49,7 +49,7 @@ export const checkCondition = ({ condition }: FieldRetailDef, getValue: GetValue
   });
 
 const checkConsentPfrFlg = ({ name }: FieldRetailDef, getValue: GetValue) =>
-  name === 'snils' && isSnilsRequired(getValue);
+  name === 'snils' && !getValue('snils') && isSnilsRequired(getValue);
 
 const isSnilsRequired = (getValue: GetValue) =>
   getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

package/mobile/src/retail/utils/updateOrganizationFields.ts

@@ -31,7 +31,7 @@ export const updateOrganizationFields = (
   };
 
   for (const fieldName in organizationData) {
-    organizationData[fieldName] && field?.(fieldName)?.onChange?.(organizationData[fieldName]);
+    field?.(fieldName)?.onChange?.(organizationData[fieldName]);
   }
 };
 

package/mobile/src/retail/validator/getLimitedBirthdayValidation.ts

@@ -9,7 +9,8 @@ const limitedBirthdayValidationData: Record<ProductType, LimitedBirthdayValidati
   },
   creditCard: {
     minAge: 21,
-    errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+    maxAge: 73,
+    errorMessage: 'Допустимый возраст заёмщика - от 21 до 73 лет',
   },
   debitCard: {
     minAge: 18,

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -5,7 +5,12 @@ import { type FieldRetailDef } from '../model/RetailFormContent';
 import { calculateInputs } from '../utils/calculateInputs';
 import { getLimitedBirthdayValidation } from './getLimitedBirthdayValidation';
 import { validatorObj } from './validatorObj';
-import { passportValidator } from './validators';
+import {
+  dateRegistrationValidator,
+  generalSeniorityValidator,
+  passportValidator,
+  workBeginDateValidator,
+} from './validators';
 
 type getRetailFormValidatorProps = {
   formState: LeadFormState;
@@ -24,4 +29,7 @@ export const getRetailFormValidator = ({
     ...validatorObj,
     limitedBirthday: getLimitedBirthdayValidation(productType),
     dulIssueDate: passportValidator(formState.limitedBirthday as Date),
+    generalSeniority: generalSeniorityValidator(formState.lastJobExperience as string),
+    beginDate: workBeginDateValidator(formState.limitedBirthday as Date),
+    participantDateRegistration: dateRegistrationValidator(formState.limitedBirthday as Date),
   })(formState);

package/mobile/src/retail/validator/validatorObj.ts

@@ -13,9 +13,6 @@ import {
   jobNumberValidator,
   lengthStringValidator,
   nameRetailValidator,
-  notLaterDateValidator,
-  numberValidator,
-  serieValidator,
   snilsValidator,
 } from './validators';
 
@@ -45,11 +42,9 @@ const validatorRetailObj: Record<string, Validator> = {
   organizationPhone: phoneValidator('Укажите номер телефона'),
   organizationName: defaultValidator('Укажите наименование организации'),
   legalForm: defaultValidator('Укажите ОПФ'),
-  generalSeniority: jobNumberValidator('Укажите количество лет стажа'),
   lastJobExperience: jobNumberValidator('Укажите стаж на последнем месте работы'),
   experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
   jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
-  beginDate: notLaterDateValidator('Укажите дату заключения трудового договора'),
   addressFact: addressDaDataValidator(),
   addressRegistration: addressDaDataValidator(),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
@@ -67,20 +62,17 @@ const validatorRetailObj: Record<string, Validator> = {
   familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
   children: lengthStringValidator(2, 'Укажите количество детей'),
   dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
-  totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
-  expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
   snils: snilsValidator('Некорректный номер СНИЛС'),
   conscription: defaultValidator(),
   armyIdFlg: agreementValidator,
-  dulSerie: serieValidator('Укажите серию паспорта'),
-  dulNumber: numberValidator('Укажите номер паспорта'),
-  dulSubdivisionCode: numberValidator('Укажите код подразделения'),
+  dulSerie: lengthStringValidator(4, 'Укажите серию паспорта', true),
+  dulNumber: lengthStringValidator(6, 'Укажите номер паспорта', true),
+  dulSubdivisionCode: lengthStringValidator(7, 'Укажите код подразделения', true),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
-  participantDateRegistration: notLaterDateValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
   wages: defaultValidator(),
-  mandatoryPayments: defaultValidator(),
+  mandatoryPayments: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
   bankruptcyFlg: defaultValidator(),
   shareholderFlg: defaultValidator(),
   legalEntityName: defaultValidator(),

package/mobile/src/retail/validator/validators.ts

@@ -37,10 +37,17 @@ export const nameRetailValidator = (errorMsg?: string) =>
 export const jobNumberValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 
-export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
-  validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(
-    errorMsg ?? ERROR_MESSAGE,
-  );
+export const lengthStringValidator = (
+  inputLength: number,
+  errorMsg?: string,
+  isFixLength?: boolean,
+) =>
+  validator(
+    (_) =>
+      typeof _ === 'string' &&
+      _.length >= 1 &&
+      (isFixLength ? _.length === inputLength : _.length <= inputLength),
+  )(errorMsg ?? ERROR_MESSAGE);
 
 const limitedBirthdayValidate =
   ({ minAge, maxAge }: LimitedBirthdayValidationParams) =>
@@ -67,20 +74,7 @@ export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams
   validator(limitedBirthdayValidate(params))(params.errorMessage);
 
 export const passportValidator = (birthDate?: Date) =>
-  validator((_) => {
-    if (_ && birthDate) {
-      return (
-        _.getTime() >=
-        new Date(
-          birthDate?.getFullYear() + 14,
-          birthDate?.getMonth(),
-          birthDate?.getDate(),
-        ).getTime()
-      );
-    }
-
-    return false;
-  })('Укажите дату выдачи паспорта');
+  validateDateFromBirth(14, birthDate)('Укажите дату выдачи паспорта');
 
 export const deliveryDateValidator = (errorMsg: string) =>
   validator((_) => _?.getTime() >= new Date().getTime())(errorMsg);
@@ -88,18 +82,12 @@ export const deliveryDateValidator = (errorMsg: string) =>
 export const notLaterDateValidator = (errorMsg: string) =>
   validator((_) => _?.getTime() <= new Date().getTime())(errorMsg);
 
-export const numberValidator = (errorMsg: string) =>
-  validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
-
-export const serieValidator = (errorMsg: string) =>
-  validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
-
 const snilsValidate = (snils: string) => {
-  const snl = String(snils).replace(/[^0-9]+/g, '');
-  if (snl.length === 11) {
+  const _snils = String(snils).replace(/[^0-9]+/g, '');
+  if (_snils.length === 11 && _snils !== '00000000000') {
     let checksum = 0;
     for (let i = 0; i < 9; i++) {
-      checksum += parseInt(snl.charAt(i)) * (9 - i);
+      checksum += parseInt(_snils.charAt(i)) * (9 - i);
     }
     if (checksum > 101) {
       checksum = checksum % 101;
@@ -108,10 +96,41 @@ const snilsValidate = (snils: string) => {
       checksum = 0;
     }
 
-    return checksum === parseInt(snl.slice(9));
+    return checksum === parseInt(_snils.slice(9));
   }
 
   return false;
 };
 
 export const snilsValidator = (errorMsg: string) => validator(snilsValidate)(errorMsg);
+
+export const generalSeniorityValidator = (lastJobExperience: string) =>
+  validator(
+    (_) =>
+      typeof _ === 'string' &&
+      /^[0-9]{1,2}$/g.test(_) &&
+      (!lastJobExperience || Number(_) >= Number(lastJobExperience)),
+  )('Укажите количество лет стажа');
+
+export const workBeginDateValidator = (birthDate?: Date) =>
+  validateDateFromBirth(18, birthDate)('Укажите дату заключения трудового договора');
+
+export const dateRegistrationValidator = (birthDate?: Date) =>
+  validateDateFromBirth(0, birthDate)('Укажите дату регистрации');
+
+export const validateDateFromBirth = (age: number, birthDate?: Date) =>
+  validator((_) => {
+    if (_ && birthDate) {
+      const currentDate = _.getTime();
+      const minDate = new Date(
+        birthDate?.getFullYear() + age,
+        birthDate?.getMonth(),
+        birthDate?.getDate(),
+      ).getTime();
+      const maxDate = new Date().getTime();
+
+      return currentDate >= minDate && currentDate <= maxDate;
+    }
+
+    return false;
+  });

package/mobile/src/ui-kit/Input/renderErrorText.tsx

@@ -1,7 +1,7 @@
 import { Text } from '../Text/Text';
 
 export const renderErrorText = (error: string | undefined) => (
-  <div className="h-6">
+  <div className="min-h-6">
     {error ? (
       <Text size="text-xs" font="font-light" color="text-error">
         {error}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.877",
+  "version": "0.14.878",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/retail/adaptors/getPersonalInfoData.tsx

@@ -37,7 +37,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     dulIssuedBy,
     dulNumber,
     dulSerie,
-    dulSubdivisionCode,
+    dulSubdivisionCode: dulSubdivisionCode?.replace('-', ''),
     educationLevelCd: education,
     registrationDate: participantDateRegistration
       ? formatDate(participantDateRegistration, true)

package/src/retail/api/dadataHints/dadataHints.ts

@@ -2,19 +2,29 @@ import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType
 
 const DEFAULT_HINTS_COUNT = 10;
 
-const defaultResponseItemHandler = (item?: DaDataSuggestion): string => item?.value || '';
+const defaultResponseItemHandler = (item?: DaDataSuggestion) => ({
+  value: item?.value || '',
+});
 
 const getResponseHandler =
-  (itemHandler: (item?: DaDataSuggestion) => string) =>
+  (
+    itemHandler: (item?: DaDataSuggestion) => {
+      value: string;
+      additionalValue?: string;
+    },
+    responseFilter?: (item?: DaDataSuggestion) => boolean,
+  ) =>
   (response: { suggestions: Array<DaDataSuggestion> }) => {
     const responseData: Array<DaDataSuggestion> = response?.suggestions || [];
+    const filteredData = responseFilter ? responseData.filter(responseFilter) : responseData;
 
-    return responseData.map((item) => {
-      const value = itemHandler(item);
+    return filteredData.map((item) => {
+      const data = itemHandler(item);
 
       return {
         ...item,
-        processedValue: value,
+        processedValue: data.value,
+        additionalValue: data.additionalValue,
       };
     });
   };
@@ -26,8 +36,9 @@ export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaData
     queryPrefix,
     requestData = {},
     responseItemHandler = defaultResponseItemHandler,
+    responseFilter,
   } = options;
-  const responseHandler = getResponseHandler(responseItemHandler);
+  const responseHandler = getResponseHandler(responseItemHandler, responseFilter);
   const queryPrefixValue = queryPrefix ? `${queryPrefix}, ` : '';
   const combinedQuery = `${queryPrefixValue}${query}`;
 

package/src/retail/api/dadataHints/dadataHintsType.ts

@@ -1,11 +1,11 @@
 import { type Nullable } from '@redneckz/uni-jsx/lib/utils/ts/Nullable';
-import { type HintOption } from './hintsListsOptions';
 
 export interface DaDataSuggestion {
   value: string;
   unrestricted_value: string;
   data: DaDataResponseItem;
   processedValue: string;
+  additionalValue?: string;
 }
 
 type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
@@ -74,6 +74,13 @@ export interface ListRequestOption {
   url: string;
   query?: string;
   queryPrefix?: string;
-  requestData?: HintOption['requestData'];
-  responseItemHandler?: (item?: DaDataSuggestion) => string;
+  requestData?: {
+    parts?: string[];
+    gender?: string;
+  };
+  responseItemHandler?: (item?: DaDataSuggestion) => {
+    value: string;
+    additionalValue?: string;
+  };
+  responseFilter?: (item?: DaDataSuggestion) => boolean;
 }

package/src/retail/api/dadataHints/hintsListsOptions.ts

@@ -1,4 +1,4 @@
-import { type DaDataSuggestion } from './dadataHintsType';
+import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType';
 
 const NAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/fio',
@@ -34,23 +34,39 @@ const PASSPORT_FMS_HINTS_LIST_OPTIONS = {
 
 const PASSPORT_CODE_HINTS_LIST_OPTIONS = {
   url: 'suggest/fms_unit',
-  responseItemHandler: (item?: DaDataSuggestion) => item?.data?.code?.replace('-', '') || '',
+  responseItemHandler: (item?: DaDataSuggestion) => ({
+    value: item?.data?.code || '',
+    additionalValue: item?.data?.name,
+  }),
 };
 
 const ORGANIZATION_NAME_HINTS_LIST_OPTIONS = {
   url: 'suggest/party',
+  responseItemHandler: (item?: DaDataSuggestion) => {
+    const inn = item?.data?.inn;
+    const address = item?.data?.address?.value || '';
+    const additionalValue = address ? `${inn} ${address}` : inn;
+
+    return {
+      value: item?.value || '',
+      additionalValue,
+    };
+  },
 };
 
 const ORGANIZATION_INN_HINTS_LIST_OPTIONS = {
   url: 'suggest/party',
-  responseItemHandler: (item?: DaDataSuggestion) => item?.data?.inn || '',
+  responseItemHandler: (item?: DaDataSuggestion) => ({
+    value: item?.data?.inn || '',
+  }),
 };
 
 const ADDRESS_HINTS_LIST_OPTIONS = {
   url: 'suggest/address',
+  responseFilter: (item?: DaDataSuggestion) => Boolean(item?.data?.postal_code),
 };
 
-export type HintsListOptions = Record<string, HintOption>;
+export type HintsListOptions = Record<string, ListRequestOption>;
 
 export const hintsListsOptions: HintsListOptions = {
   name: NAME_HINTS_LIST_OPTIONS,
@@ -66,12 +82,3 @@ export const hintsListsOptions: HintsListOptions = {
   organizationAddress: ADDRESS_HINTS_LIST_OPTIONS,
   addressCourier: ADDRESS_HINTS_LIST_OPTIONS,
 };
-
-export type HintOption = {
-  url: string;
-  requestData?: {
-    parts?: string[];
-    gender?: string;
-  };
-  responseItemHandler?: (item?: DaDataSuggestion) => string;
-};

package/src/retail/components/DaDataInputControl/DaDataInputControl.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { type InputProps } from '../../../ui-kit/Input/InputProps';
 import { InputWrapper } from '../../../ui-kit/Input/InputWrapper';
@@ -20,6 +21,7 @@ export const DaDataInputControl = JSX<DaDataInputProps>(
     name = '',
     daDataQueryPrefix,
     dadata = false,
+    type,
     ...rest
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
@@ -33,10 +35,22 @@ export const DaDataInputControl = JSX<DaDataInputProps>(
       onDaDataChange,
     });
 
+    const handleChange = useCallback(
+      (e?: string) => {
+        let formattedValue = e ?? '';
+
+        if (type === 'number') {
+          formattedValue = formattedValue.replace(/^0+(?=\d)/, '');
+        }
+        onChange?.(formattedValue);
+      },
+      [onChange],
+    );
+
     return (
       <InputWrapper
         value={value}
-        onChange={onChange}
+        onChange={handleChange}
         inputRef={inputRef}
         isOpen={isOpen}
         onOpen={open}

package/src/retail/components/DaDataInputControl/InputPopup.tsx

@@ -47,13 +47,16 @@ export const InputPopup = JSX<InputPopupProps>(({ options, container, onChange }
       {options?.map((item, key) => (
         <div
           key={key.toString()}
-          className={style('flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative', {
+          className={style('px-m py-xs cursor-pointer hover:bg-main-divider relative', {
             'bg-main-divider': listItemActive === key,
           })}
           role="listitem"
           onMouseDown={() => onChange(item)}
         >
-          <span className="min-h-6">{item.processedValue}</span>
+          <p>{item.processedValue}</p>
+          {item.additionalValue ? (
+            <p className="text-xs text-secondary-text">{item.additionalValue}</p>
+          ) : null}
         </div>
       ))}
     </div>

package/src/retail/components/DaDataInputControl/useInputPopup.tsx

@@ -57,6 +57,7 @@ export function useInputPopup({
       const result = await getDaDataHints({
         url: defaultHintsListOptions.url,
         responseItemHandler: defaultHintsListOptions.responseItemHandler,
+        responseFilter: defaultHintsListOptions.responseFilter,
         requestData: {
           ...defaultHintsListOptions?.requestData,
         },

package/src/retail/components/Fields/BirthPlaceField.tsx

@@ -6,6 +6,7 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 export const BirthPlaceField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
     label="Место рождения"
+    maxLength={100}
     {...field(input?.name ?? '')}
     {...input}
     disabled={isEsiaAuthorize(field, input)}

package/src/retail/components/Fields/ChildrenField.tsx

@@ -7,6 +7,7 @@ export const ChildrenField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Количество детей до 18 лет"
     placeholder="Введите значение"
     isInteger={true}
+    type="number"
     {...field(input?.name ?? '')}
     {...input}
   />

package/src/retail/components/Fields/CodeWordField.tsx

@@ -3,5 +3,10 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const CodeWordField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl label="Кодовое слово" {...field(input?.name ?? '')} {...input} />
+  <DaDataInputControl
+    label="Кодовое слово"
+    maxLength={20}
+    {...field(input?.name ?? '')}
+    {...input}
+  />
 ));

package/src/retail/components/Fields/DependentsField.tsx

@@ -8,6 +8,7 @@ export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="За исключением детей до 18 лет"
     isInteger={true}
     maxLength={2}
+    type="number"
     {...field(input?.name ?? '')}
     {...input}
   />

package/src/retail/components/Fields/DulIssueDateField.tsx

@@ -17,6 +17,7 @@ export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
       {...field(input?.name ?? '')}
       disabled={isEsiaAuthorize(field, input)}
       minDate={startDulIssueDate}
+      maxDate={new Date()}
     />
   );
 });

package/src/retail/components/Fields/DulIssuedByField.tsx

@@ -10,13 +10,14 @@ export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
     field('dulSubdivisionCode');
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    changeDulSubdivisionCode?.(item?.data?.code?.replace('-', ''));
+    changeDulSubdivisionCode?.(item?.data?.code);
   }, []);
 
   return (
     <DaDataInputControl
       disabled={isEsiaAuthorize(field, input)}
       label="Кем выдан"
+      maxLength={200}
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}

package/src/retail/components/Fields/DulSubdivisionCodeField.tsx

@@ -1,23 +1,41 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { normalizeWithMask } from '../../../utils/normalizeWithMask';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
+const MAX_LENGTH = 7;
+
 export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input }) => {
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
   }, []);
 
+  const handleChange = useCallback((v: string) => {
+    const formattedValue = v.replace(/[^\d-]/g, '');
+
+    formattedValue.length <= MAX_LENGTH &&
+      field?.('dulSubdivisionCode')?.onChange?.(normalizeWithMask(formattedValue, '___-___'));
+  }, []);
+
+  useEffect(() => {
+    const value = field?.('dulSubdivisionCode')?.value as string;
+
+    if (value) {
+      handleChange(value);
+    }
+  }, []);
+
   return (
     <DaDataInputControl
       disabled={isEsiaAuthorize(field, input)}
       label="Код подразделения"
-      isInteger={true}
-      maxLength={6}
       {...input}
       {...field(input?.name ?? '')}
+      placeholder="___-___"
+      onChange={handleChange}
       onDaDataChange={onDaDataChange}
     />
   );

package/src/retail/components/Fields/EmailField.tsx

@@ -2,6 +2,11 @@ import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const EmailField = JSX<CustomFieldProps>(({ field, input }) => {
-  return <DaDataInputControl label="Электронная почта" {...field(input?.name ?? '')} {...input} />;
-});
+export const EmailField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DaDataInputControl
+    label="Электронная почта"
+    maxLength={50}
+    {...field(input?.name ?? '')}
+    {...input}
+  />
+));

package/src/retail/components/Fields/Experience5YearsField.tsx

@@ -17,8 +17,8 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
 
   return (
     <DaDataInputControl
-      label="Стаж"
-      placeholder="За последние 5 лет"
+      label="Стаж за последние 5 лет"
+      placeholder="Количество лет"
       type="number"
       {...field(input?.name ?? '')}
       {...input}

package/src/retail/components/Fields/FamilyMembersField.tsx

@@ -7,8 +7,8 @@ export const FamilyMembersField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field(input?.name ?? '');
   const familyStatusKey = field('familyStatus')?.value?.key;
   const adultsCount = familyStatusKey === 'MARRIED' ? 2 : 1;
-  const childrenCount = Number(field('children')?.value);
-  const dependentsCount = Number(field('dependents')?.value);
+  const childrenCount = Number(field('children')?.value || 0);
+  const dependentsCount = Number(field('dependents')?.value || 0);
   const totalCount = adultsCount + childrenCount + dependentsCount;
 
   useEffect(() => {

package/src/retail/components/Fields/GeneralSeniorityField.tsx

@@ -1,16 +1,33 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Общий стаж"
-    type="number"
-    maxLength={2}
-    placeholder="Количество лет"
-    {...field(input?.name ?? '')}
-    {...input}
-    disabled={isEsiaAuthorize(field, input)}
-  />
-));
+export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => {
+  const [errorDate, setErrorDate] = useState('');
+  const lastJobExperience = Number(field('lastJobExperience')?.value);
+  const currentDate = Number(field('generalSeniority')?.value);
+
+  useEffect(() => {
+    setErrorDate(
+      currentDate && currentDate < lastJobExperience
+        ? 'Укажите не меньше, чем число в поле «Стаж на последнем рабочем месте»'
+        : '',
+    );
+  }, [lastJobExperience, currentDate]);
+
+  return (
+    <DaDataInputControl
+      label="Общий стаж"
+      type="number"
+      maxLength={2}
+      placeholder="Количество лет"
+      isInteger={true}
+      {...field(input?.name ?? '')}
+      {...input}
+      error={errorDate || field('generalSeniority')?.error}
+      disabled={isEsiaAuthorize(field, input)}
+    />
+  );
+});

package/src/retail/components/Fields/JobsNumberField.tsx

@@ -7,6 +7,7 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
     label="Количество мест работы за последние 5 лет"
     placeholder="Количество мест"
+    type="number"
     isInteger={true}
     maxLength={2}
     {...field(input?.name ?? '')}