hl-core 0.0.10-beta.30 → 0.0.10-beta.31

package/components/Pages/ProductConditions.vue

@@ -170,7 +170,7 @@
           :readonly="isDisabledInsStartDate"
           :clearable="!isDisabledInsStartDate"
           :label="$dataStore.t('labels.insuranceStartDate')"
-          :rules="formStore.lfb.add ? $rules.required : $rules.required.concat($rules.checkPastDate)"
+          :rules="$rules.required"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
         <base-form-input
@@ -312,55 +312,120 @@
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
         <base-animation>
-          <base-btn
-            v-if="formStore.applicationData.processCode === 19 && !isDisabled"
-            :text="$dataStore.t('buttons.copyToClient')"
-            class="mt-4 min-h-[60px]"
-            @click="copyRedirect"
-          />
+          <div
+            v-if="(formStore.applicationData.processCode === 19 || formStore.applicationData.processCode === 25) && !isDisabled"
+            :class="[$styles.blueBgLight]"
+            class="h-[52px] rounded-lg flex items-center justify-end px-2 gap-2 mt-4"
+          >
+            <base-btn class="max-w-[300px]" :text="$dataStore.t('buttons.copyToClient')" size="sm" @click="copyRedirect" />
+          </div>
         </base-animation>
-        <base-form-section :title="$dataStore.t('pension.compulsoryAmount&Prof')">
+        <base-form-section v-if="formStore.applicationData.statusCode === 'ActuaryForm' && isTask">
+          <base-content-block :class="[$styles.textSimple]">
+            <h5 class="text-center font-medium mb-4">{{ $dataStore.t('labels.contract') }}</h5>
+            <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
+              <span class="ml-2">Договор {{ formStore.applicationData.processCode === 19 || formStore.applicationData.processCode === 25 ? 'страхования' : 'возврата' }}</span>
+              <i
+                class="transition-all cursor-pointer mdi mdi-mdi-tray-arrow-down pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
+                :class="[$styles.greenTextHover]"
+                @click="
+                  $dataStore.generatePDFDocument(
+                    formStore.applicationData.processCode === 19 ? 'PA_Contract' : formStore.applicationData.processCode === 25 ? 'PAJ_Contract' : 'PA_RefundAgreement',
+                    '38',
+                  )
+                "
+              ></i>
+            </div>
+          </base-content-block>
+        </base-form-section>
+        <div v-if="formStore.applicationData.processCode === 25" class="flex items-center mt-[14px] h-[48px]">
+          <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
+            <div
+              class="h-full px-4 py-1 rounded-[8px] cursor-pointer flex items-center"
+              :class="[$styles.textSimple, !isSlavePensionForm ? `${$styles.blueBg} ${$styles.whiteText}` : '']"
+              @click="$router.replace({ query: { ...$route.query, which: undefined, upd: 'true' } })"
+            >
+              {{ !!formStore.applicationData.clientApp?.longName ? formStore.applicationData.clientApp?.longName : 'Страхователь' }}
+            </div>
+            <div
+              class="h-full px-4 py-1 rounded-[8px] cursor-pointer flex items-center"
+              :class="[$styles.textSimple, isSlavePensionForm ? `${$styles.blueBg} ${$styles.whiteText}` : '']"
+              @click="$router.replace({ query: { ...$route.query, which: 'slave', upd: 'true' } })"
+            >
+              {{ !!formStore.applicationData.slave.clientApp?.longName ? formStore.applicationData.slave.clientApp?.longName : 'Страхователь 2' }}
+            </div>
+          </div>
+        </div>
+        <base-form-section v-if="hasContragentData && contragentData">
+          <base-panel-input v-model="contragentData.gender" :readonly="true" :clearable="false" :label="$dataStore.t('form.gender')" />
+          <base-form-input v-model="contragentData.birthDate" :readonly="true" :clearable="false" :label="$dataStore.t('form.birthDate')" />
+          <base-panel-input
+            v-if="disabilityGroup"
+            v-model="disabilityGroup"
+            :value="disabilityGroup?.nameRu"
+            :readonly="true"
+            :clearable="false"
+            :label="$dataStore.t('pension.disabilityGroup')"
+          />
+        </base-form-section>
+        <base-form-section
+          v-if="formStore.applicationData.processCode !== 24"
+          :title="$dataStore.t('pension.compulsoryAmount&Prof')"
+          :class="[formStore.applicationData.processCode === 25 ? 'mt-0 rounded-tl-none' : '']"
+        >
           <base-form-input
-            v-model="pensionCalculationParams.compulsoryContractAmount"
-            :maska="$maska.numbers"
+            v-model="pensionForm.compulsoryContractAmount"
             :readonly="isDisabled || isEnpfSum"
             :clearable="!isDisabled && !isEnpfSum"
             :label="$dataStore.t('pension.compulsoryContractAmount')"
+            :rules="$dataStore.rules.sums"
+            :suffix="$constants.currencySymbols.kzt"
+            @input="onInputPension($event, 'compulsoryContractAmount')"
+            @onClear="onClearPension('compulsoryContractAmount')"
           />
           <base-form-input
-            v-model="pensionCalculationParams.compulsoryProfContractAmount"
-            :maska="$maska.numbers"
+            v-model="pensionForm.compulsoryProfContractAmount"
             :readonly="isDisabled || isEnpfSum"
             :clearable="!isDisabled && !isEnpfSum"
             :label="$dataStore.t('pension.compulsoryProfContractAmount')"
+            :rules="$dataStore.rules.sums"
+            :suffix="$constants.currencySymbols.kzt"
+            @input="onInputPension($event, 'compulsoryProfContractAmount')"
+            @onClear="onClearPension('compulsoryProfContractAmount')"
           />
           <base-animation>
             <base-form-input
-              v-if="pensionCalculationParams.compulsoryProfContractAmount && pensionCalculationParams.compulsoryProfContractAmount != 0"
+              v-if="pensionForm.compulsoryProfContractAmount && pensionForm.compulsoryProfContractAmount != 0"
               v-model="pensionForm.compulsoryProfMonthCount"
               :maska="$maska.numbers"
-              :readonly="isDisabled || isEnpfSum"
-              :clearable="!isDisabled && !isEnpfSum"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
               :label="$dataStore.t('pension.compulsoryProfMonthCount')"
             />
           </base-animation>
           <base-form-input
-            v-model="pensionCalculationParams.voluntaryContractAmount"
-            :maska="$maska.numbers"
+            v-model="pensionForm.voluntaryContractAmount"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$dataStore.t('pension.voluntaryContractAmount')"
+            :rules="$dataStore.rules.sums"
+            :suffix="$constants.currencySymbols.kzt"
+            @input="onInputPension($event, 'voluntaryContractAmount')"
+            @onClear="onClearPension('voluntaryContractAmount')"
           />
           <base-form-input
-            v-model="pensionCalculationParams.ownFundsRaisAmount"
-            :maska="$maska.numbers"
+            v-model="pensionForm.ownFundsRaisAmount"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$dataStore.t('pension.ownFundsRaisAmount')"
+            :rules="$dataStore.rules.sums"
+            :suffix="$constants.currencySymbols.kzt"
+            @input="onInputPension($event, 'ownFundsRaisAmount')"
+            @onClear="onClearPension('ownFundsRaisAmount')"
           />
         </base-form-section>
-        <base-form-section v-if="formStore.applicationData.processCode !== 2 && !isDisabled" :title="$dataStore.t('pension.companyName')">
-          <base-btn :text="$dataStore.t('buttons.add')" size="sm" :btn="$styles.blueBtn" @click="addTransferContract" />
+        <base-form-section v-if="formStore.applicationData.processCode !== 24" :title="$dataStore.t('pension.companyName')">
+          <base-btn v-if="!isDisabled" :text="$dataStore.t('buttons.add')" :disabled="isDisabled" size="sm" :btn="$styles.blueBtn" @click="addTransferContract" />
           <section v-for="(contract, index) in transferContracts" class="py-2">
             <base-panel-input
               v-model="contract.transferContractCompany"
@@ -374,27 +439,49 @@
               "
               @click="contractIndex = index"
             />
+            <div class="flex flex-col">
+              <base-form-input
+                v-model="contract.transferContractDate"
+                :maska="$maska.date"
+                :label="$dataStore.t('pension.contractDate')"
+                :readonly="isDisabled"
+                :clearable="!isDisabled"
+                :max-date="formatDate(transferMaxDate) ?? undefined"
+                :rules="$dataStore.rules.required.concat($dataStore.rules.birthDate)"
+                append-inner-icon="mdi mdi-calendar-blank-outline"
+              />
+              <span v-if="transferMaxDate && !isDisabled" class="px-3 font-light text-sm bg-white py-0 mt-[-5px]" style="color: #a0b3d8 !important"
+                >до {{ transferMaxDate }} включительно</span
+              >
+            </div>
+            <base-form-input v-model="contract.transferContractNumber" :label="$dataStore.t('pension.globalId')" :readonly="isDisabled" :clearable="!isDisabled" />
             <base-form-input
-              v-model="contract.transferContractDate"
-              :maska="$maska.date"
-              :label="$dataStore.t('pension.contractDate')"
+              v-model="contract.transferContractRegNumber"
+              :label="$dataStore.t('pension.transferRegNumber')"
+              :rules="$rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              append-inner-icon="mdi mdi-calendar-blank-outline"
             />
-            <base-form-input v-model="contract.transferContractNumber" :label="$dataStore.t('pension.globalId')" :readonly="isDisabled" :clearable="!isDisabled" />
-            <base-form-input v-model="contract.transferContractRegNumber" :label="$dataStore.t('pension.transferRegNumber')" :readonly="isDisabled" :clearable="!isDisabled" />
             <base-form-input
               v-model="contract.transferContractFirstPaymentDate"
               :maska="$maska.date"
               :label="$dataStore.t('pension.transferContractFirstPaymentDate')"
+              :rules="$dataStore.rules.required.concat($dataStore.rules.birthDate)"
               append-inner-icon="mdi mdi-calendar-blank-outline"
               :readonly="isDisabled"
               :clearable="!isDisabled"
             />
-            <base-form-input v-model="contract.transferContractAmount" :maska="$maska.numbers" :label="$dataStore.t('pension.transferContractAmount')" />
+            <base-form-input
+              v-model="contract.transferContractAmount"
+              :label="$dataStore.t('pension.transferContractAmount')"
+              :suffix="$constants.currencySymbols.kzt"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              @input="onInputPension($event, 'transferContractAmount', index)"
+              @onClear="onClearPension('transferContractAmount', index)"
+            />
             <base-form-toggle v-model="contract.transferContractIsOppv" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('pension.isOPPVTransfer')" />
-            <base-btn :text="$dataStore.t('buttons.delete')" size="sm" :btn="$styles.whiteBtn" @click="removeTransferContract(index)" />
+            <base-btn v-if="!isDisabled" :text="$dataStore.t('buttons.delete')" :disabled="isDisabled" size="sm" :btn="$styles.whiteBtn" @click="removeTransferContract(index)" />
           </section>
         </base-form-section>
         <base-form-section :title="$dataStore.t('pension.paymentTerms')">
@@ -402,9 +489,10 @@
             v-model="contractDate"
             :maska="$maska.date"
             :rules="!isDisabled ? $rules.required.concat($rules.date) : []"
-            :readonly="isDisabled"
+            :readonly="isDisabled || formStore.applicationData.processCode === 24 || isSlavePensionForm"
             :clearable="!isDisabled"
             :min-date="new Date()"
+            :max-date="formatDate(maxDate ?? '') ?? undefined"
             :label="$dataStore.t('pension.contractDate')"
             append-inner-icon="mdi mdi-calendar-blank-outline"
           />
@@ -423,8 +511,24 @@
           <base-form-input v-model="pensionForm.frequencyPayments" disabled :label="$dataStore.t('pension.frequencyPayments')" />
           <base-form-input v-model="pensionForm.periodPayments" disabled :label="$dataStore.t('pension.paymentPeriod')" />
           <base-form-input v-model="pensionForm.insuranceProgramType" disabled :label="$dataStore.t('pension.insuranceProgramType')" />
-          <base-form-input v-model="pensionAmount" readonly :maska="$maska.numbers" :label="$dataStore.t('pension.pensionAmount')" />
-          <base-form-input v-model="pensionForm.payment" readonly :maska="$maska.numbers" :label="$dataStore.t('pension.pensionPayment')" />
+          <base-form-input
+            v-if="formStore.applicationData.processCode === 25 && formStore.pensionApp?.slave?.amount"
+            :value="totalInsPremium"
+            :active="true"
+            :label="$dataStore.t('productConditionsForm.totalInsurancePremiumAmount')"
+            :disabled="$dataStore.isLoading"
+            readonly
+          />
+          <base-form-input
+            v-model="pensionForm.amount"
+            :value="$dataStore.getNumberWithSpaces(pensionForm.amount)"
+            @input="onInputPension($event, 'pensionAmount')"
+            @onClear="onClearPension('pensionAmount')"
+            @change="customPension = true"
+            :readonly="isDisabled || formStore.applicationData.processCode !== 25"
+            :label="$dataStore.t('pension.pensionAmount')"
+          />
+          <base-form-input :value="pensionPayment" :active="true" readonly :label="$dataStore.t('pension.pensionPayment')" />
         </base-form-section>
       </section>
       <base-form-section v-if="hasAnnuityPayments" :title="$dataStore.t('calculationAnnuityPayments')">
@@ -651,7 +755,7 @@
     <base-animation>
       <base-btn
         v-if="!isDisabled && $dataStore.isPension && isTask"
-        :text="$dataStore.t('buttons.save')"
+        :text="$dataStore.t('buttons.calculate')"
         :loading="$dataStore.isLoading"
         class="min-h-[60px]"
         type="submit"
@@ -747,6 +851,15 @@
 import { Member, Value, CountryValue, CalculatorForm, TransferContract } from '../../composables/classes';
 import type { Projects, AddCover, AddCoverAnswer } from '../../types';
 
+type PensionCalculation = {
+  compulsoryContractAmount: number | string | null;
+  voluntaryContractAmount: number | string | null;
+  ownFundsRaisAmount: number | string | null;
+  compulsoryProfContractAmount: number | string | null;
+  transferContractAmount: number | string | null;
+  transferContractCompany: number | string | null;
+};
+
 export default defineComponent({
   props: {
     isCalculator: {
@@ -786,14 +899,29 @@ export default defineComponent({
 
     const additionalTerms = ref<AddCover[]>([]);
 
-    const maxDate = ref();
+    const maxDate = ref<string | null>();
+    const transferMaxDate = ref();
     const dateOfBegin = ref();
-    const contractDate = ref();
-    const transferContractDate = ref();
-    const transferContractFirstPaymentDate = ref();
-    const guaranteedPeriodList = Array.from(Array(35), (e, i) => i + 1);
-    const pensionForm = formStore.applicationData?.pensionApp ?? undefined;
-    const isEnpfSum = (formStore.applicationData?.isEnpfSum ?? false) && useEnv().isProduction;
+    const contractDate = ref<string | null>();
+    const transferContractDate = ref<string | null>();
+    const transferContractFirstPaymentDate = ref<string | null>();
+    const guaranteedPeriodList = Array.from(Array(35), (_, i) => i + 1);
+    const isSlavePensionForm = computed(() => route.query.which === 'slave');
+    const pensionForm = computedWithControl(
+      () => formStore.pensionApp,
+      () => (route.query.which === 'slave' ? formStore.pensionApp?.slave : formStore.pensionApp ?? undefined),
+    );
+
+    const insuredForm = isSlavePensionForm.value
+      ? formStore.applicationData?.slave?.insuredApp && formStore.applicationData?.slave?.insuredApp[0]
+      : (formStore.applicationData?.insuredApp && Array.isArray(formStore.applicationData?.insuredApp) && formStore.applicationData?.insuredApp[0]) ?? undefined;
+    const disabilityGroup = computed(() => {
+      if (!!insuredForm.disabilityGroupId) {
+        const disabilityGroup = dataStore.disabilityGroups.find(i => i.id === insuredForm.disabilityGroupId);
+        return disabilityGroup;
+      }
+    });
+    const isEnpfSum = pensionForm.value?.isEnpfSum ?? false;
 
     const transferContracts = ref<TransferContract[]>([]);
     const contractsValue = ref<Value[]>([]);
@@ -803,6 +931,11 @@ export default defineComponent({
     const multiplePanelList = ref<CountryValue[]>([]);
     const calculatorForm = productConditionsForm.calculatorForm;
     const minInsSum = computed(() => formStore.lfb.clients && formStore.lfb.clients.reduce((min, item) => Math.min(min, item.insSum), Infinity));
+    const contragentData = ref<any>();
+    const customPension = ref<boolean>(false);
+    const transferSum = ref<number>(0);
+    const firstAmount = ref<boolean>(true);
+
     const isShownAdditionalTerms = computed(() => {
       if (whichProduct.value === 'gons') {
         return false;
@@ -1137,6 +1270,12 @@ export default defineComponent({
       }
       return false;
     });
+    const hasContragentData = computed(() => {
+      if (whichProduct.value === 'pensionannuitynew') {
+        return true;
+      }
+      return false;
+    });
     const isDisabledPaymentPeriod = computed(() => {
       if (whichProduct.value === 'gons' && productConditionsForm.currency.code === 'USD') {
         return true;
@@ -1150,28 +1289,29 @@ export default defineComponent({
       return constants.currencyList;
     });
 
-    const pensionCalculationParams = ref({
-      compulsoryContractAmount: pensionForm && pensionForm.compulsoryContractAmount && pensionForm.compulsoryContractAmount != 0 ? pensionForm.compulsoryContractAmount : null,
-      voluntaryContractAmount: pensionForm && pensionForm.voluntaryContractAmount && pensionForm.voluntaryContractAmount != 0 ? pensionForm.voluntaryContractAmount : null,
-      ownFundsRaisAmount: pensionForm && pensionForm.ownFundsRaisAmount && pensionForm.ownFundsRaisAmount != 0 ? pensionForm.ownFundsRaisAmount : null,
-      compulsoryProfContractAmount:
-        pensionForm && pensionForm.compulsoryProfContractAmount && pensionForm.compulsoryProfContractAmount != 0 ? pensionForm.compulsoryProfContractAmount : null,
-      transferContractAmount: pensionForm && pensionForm.transferContractAmount && pensionForm.transferContractAmount != 0 ? pensionForm.transferContractAmount : null,
-      transferContractCompany: pensionForm && pensionForm.transferContractCompany ? pensionForm.transferContractCompany : null,
-    });
-
-    const contractsAmount = computed(() => transferContracts.value?.reduce((accumulator, currentValue) => accumulator + currentValue.transferContractAmount, 0));
-
-    const pensionAmount = computed(() =>
-      pensionCalculationParams.value
-        ? (Number(pensionCalculationParams.value.compulsoryContractAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.voluntaryContractAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.ownFundsRaisAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.compulsoryProfContractAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.transferContractAmount) ?? 0) +
-          Number(contractsAmount.value)
-        : 0,
+    const totalInsPremium = computed(() =>
+      dataStore.getNumberWithSpaces(formatSpacedNumber(formStore.pensionApp?.amount) + formatSpacedNumber(formStore.pensionApp.slave?.amount)),
     );
+    const pensionPayment = computed(() => dataStore.getNumberWithSpaces(pensionForm.value.payment));
+
+    const getContragent = async () => {
+      const data = await dataStore.api.getContragentById(
+        Number(route.query.which !== 'slave' ? formStore.applicationData.clientApp.insisId : formStore.applicationData.slave.clientApp.insisId),
+      );
+      if (data && data.items.length != 0) {
+        contragentData.value = data.items[0];
+        contragentData.value.gender = contragentData.value.gender === 1 ? dataStore.t('pension.male') : dataStore.t('pension.female');
+        contragentData.value.birthDate = reformatDate(contragentData.value.birthDate);
+      }
+    };
+
+    const sumContractsAmount = (transferContracts: TransferContract[]) => {
+      if (!transferContracts || !transferContracts.length) return 0;
+      return transferContracts.reduce((accumulator, currentValue) => {
+        const transferAmount = structuredClone(toRaw(currentValue));
+        return accumulator + Number(String(transferAmount.transferContractAmount).replace(/\s/g, ''));
+      }, 0);
+    };
 
     const formatTermValue = (term: number) => {
       if (term !== null) {
@@ -1219,7 +1359,7 @@ export default defineComponent({
           transferContracts.value[contractIndex.value].transferContractCompany = item;
         } else {
           // @ts-ignore
-          pensionForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
+          pensionForm.value[currentPanel.value] = item.nameRu === null ? new Value() : item;
         }
       } else {
         // @ts-ignore
@@ -1489,6 +1629,42 @@ export default defineComponent({
       }
     };
 
+    const onInputPension = (event: Event, key: keyof PensionCalculation | 'pensionAmount', index?: number) => {
+      if (event.target && 'value' in event.target && event.target.value) {
+        const calcCheck = getNumber(event.target.value as string);
+        if (calcCheck) {
+          if (index !== undefined) {
+            transferContracts.value[index].transferContractAmount = dataStore.getNumberWithSpaces(event.target.value) as string;
+            transferSum.value = transferContracts.value.reduce((accumulator, { transferContractAmount }) => (accumulator += formatSpacedNumber(transferContractAmount)), 0);
+          } else if (key === 'pensionAmount') {
+            pensionForm.value.amount = dataStore.getNumberWithSpaces(event.target.value) ?? '0';
+          } else {
+            pensionForm.value[key] = dataStore.getNumberWithSpaces(event.target.value);
+          }
+        }
+      } else {
+        if (index !== undefined) {
+          transferContracts.value[index].transferContractAmount = 0;
+          transferSum.value = transferContracts.value.reduce((accumulator, { transferContractAmount }) => (accumulator += formatSpacedNumber(transferContractAmount)), 0);
+        }
+      }
+      if (key !== 'pensionAmount' && !customPension.value) {
+        if (firstAmount.value) {
+          firstAmount.value = false;
+          return;
+        }
+        pensionForm.value.amount =
+          dataStore.getNumberWithSpaces(
+            formatSpacedNumber(pensionForm.value.compulsoryContractAmount) +
+              formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount) +
+              formatSpacedNumber(pensionForm.value.ownFundsRaisAmount) +
+              formatSpacedNumber(pensionForm.value.transferContractAmount) +
+              formatSpacedNumber(pensionForm.value.voluntaryContractAmount) +
+              sumContractsAmount(transferContracts.value),
+          ) ?? '';
+      }
+    };
+
     const onInputFixInsSum = (event: Event) => {
       if (event.target && 'value' in event.target && event.target.value) {
         const calculatedFixInsSum = getNumber(event.target.value as string);
@@ -1513,6 +1689,16 @@ export default defineComponent({
       productConditionsForm.requestedSumInsuredInDollar = null;
     };
 
+    const onClearPension = (key: keyof PensionCalculation | 'pensionAmount', index?: number) => {
+      if (index) {
+        transferContracts.value[index].transferContractAmount = 0;
+      } else if (key === 'pensionAmount') {
+        pensionForm.value.amount = '0';
+      } else {
+        pensionForm.value[key] = null;
+      }
+    };
+
     const onClearSumDollar = () => {
       productConditionsForm.requestedSumInsured = null;
     };
@@ -1563,6 +1749,31 @@ export default defineComponent({
 
     const removeTransferContract = (index: number) => {
       transferContracts.value.splice(index, 1);
+      transferSum.value = transferContracts.value.reduce((accumulator, { transferContractAmount }) => (accumulator += formatSpacedNumber(transferContractAmount)), 0);
+    };
+
+    const prepareTransferContracts = (transferContracts: Array<TransferContract>) => {
+      const formatedContracts: Array<TransferContract> = [];
+      if (transferContracts && transferContracts.length) {
+        transferContracts.forEach(i => {
+          formatedContracts.push({
+            ...i,
+            transferContractDate: constants.regex.isoDate.test(i.transferContractDate) ? i.transferContractDate : formatDate(i.transferContractDate)?.toISOString() ?? '',
+            transferContractFirstPaymentDate: constants.regex.isoDate.test(i.transferContractFirstPaymentDate)
+              ? i.transferContractFirstPaymentDate
+              : formatDate(i.transferContractFirstPaymentDate)?.toISOString() ?? '',
+            // @ts-ignore
+            transferContractCompany:
+              typeof i.transferContractCompany !== 'string' && 'nameRu' in i.transferContractCompany ? String(i.transferContractCompany.nameRu) : i.transferContractCompany,
+            transferContractCompanyId:
+              // @ts-ignore
+              typeof i.transferContractCompany !== 'string' && 'ids' in i.transferContractCompany ? i.transferContractCompany.ids : i.transferContractCompanyId,
+            id: i.id ?? null,
+            transferContractAmount: String(i.transferContractAmount).replace(/\s/g, ''),
+          });
+        });
+      }
+      return formatedContracts;
     };
 
     const submitForm = async () => {
@@ -1585,36 +1796,104 @@ export default defineComponent({
               await dataStore.calculatePrice();
             }
           } else if (whichProduct.value === 'pensionannuitynew') {
-            const formatedContracts: Array<TransferContract> = [];
+            if (contractDate.value && maxDate.value && formatDate(contractDate.value) && formatDate(maxDate.value)) {
+              const invalidDate = (formatDate(contractDate.value) ?? new Date()) > (formatDate(maxDate.value) ?? new Date());
+              if (invalidDate) {
+                dataStore.showToaster('error', 'Дата заключения договора некорректна');
+                return;
+              }
+            }
             if (transferContracts.value && transferContracts.value.length) {
-              transferContracts.value.forEach((i, index) => {
-                const formatedContractDate = formatDate(transferContracts.value[index].transferContractDate);
-                const formatedFirstPaymentDate = formatDate(transferContracts.value[index].transferContractFirstPaymentDate);
-                const formatedNameRu = String(transferContracts.value[index].transferContractCompany?.nameRu);
-                formatedContracts.push({
-                  ...transferContracts.value[index],
-                  transferContractDate: formatedContractDate?.toISOString() ?? '',
-                  transferContractFirstPaymentDate: formatedFirstPaymentDate?.toISOString() ?? '',
-                  // @ts-ignore
-                  transferContractCompany: formatedNameRu,
-                  id: transferContracts.value[index].id ?? null,
-                });
+              transferContracts.value.forEach(i => {
+                if (formatDate(i.transferContractDate) != null && formatDate(transferMaxDate.value)) {
+                  const invalidDate = (formatDate(i.transferContractDate) ?? new Date()) > (formatDate(transferMaxDate.value) ?? new Date());
+                  if (invalidDate) {
+                    dataStore.showToaster('error', 'Дата заключения договора КСЖ некорректна');
+                    return;
+                  }
+                }
               });
             }
-            const data = {
-              ...pensionForm,
-              ...(pensionCalculationParams.value = {
-                ...pensionCalculationParams.value,
-                compulsoryContractAmount: Number(pensionCalculationParams.value.compulsoryContractAmount),
-                voluntaryContractAmount: Number(pensionCalculationParams.value.voluntaryContractAmount),
-                ownFundsRaisAmount: Number(pensionCalculationParams.value.ownFundsRaisAmount),
-                compulsoryProfContractAmount: Number(pensionCalculationParams.value.compulsoryProfContractAmount),
-                transferContractAmount: Number(pensionCalculationParams.value.transferContractAmount),
-                transferContractCompany: pensionForm?.transferContractCompany?.nameRu ?? '',
-              }),
-              transferContracts: formatedContracts,
+            if (!pensionForm.value.compulsoryProfContractAmount) pensionForm.value.compulsoryProfMonthCount = null;
+            const pensionData = {
+              ...pensionForm.value,
+              ...{
+                compulsoryContractAmount: formatSpacedNumber(pensionForm.value.compulsoryContractAmount),
+                voluntaryContractAmount: formatSpacedNumber(pensionForm.value.voluntaryContractAmount),
+                ownFundsRaisAmount: formatSpacedNumber(pensionForm.value.ownFundsRaisAmount),
+                compulsoryProfContractAmount: formatSpacedNumber(pensionForm.value.compulsoryProfContractAmount),
+                transferContractAmount: formatSpacedNumber(pensionForm.value.transferContractAmount),
+                transferContractCompany: pensionForm.value?.transferContractCompany?.nameRu ?? '',
+              },
+              amount: formatSpacedNumber(pensionForm.value.amount),
+              contractDate: formatDate(contractDate.value ?? ''),
             };
-            await dataStore.setApplication(data, true);
+            const data = isSlavePensionForm.value
+              ? {
+                  ...formStore.pensionApp,
+                  transferContracts: prepareTransferContracts(formStore.pensionApp.transferContracts),
+                  slave: pensionData,
+                  amount: formatSpacedNumber(formStore.pensionApp?.amount),
+                  compulsoryContractAmount: formatSpacedNumber(formStore.pensionApp?.compulsoryContractAmount),
+                  voluntaryContractAmount: formatSpacedNumber(formStore.pensionApp?.voluntaryContractAmount),
+                  ownFundsRaisAmount: formatSpacedNumber(formStore.pensionApp?.ownFundsRaisAmount),
+                  compulsoryProfContractAmount: formatSpacedNumber(formStore.pensionApp?.compulsoryProfContractAmount),
+                  transferContractAmount: formatSpacedNumber(formStore.pensionApp?.transferContractAmount),
+                  transferContractCompany: pensionForm.value?.transferContractCompany?.nameRu ?? '',
+                }
+              : {
+                  ...pensionData,
+                  transferContracts: prepareTransferContracts(transferContracts.value),
+                  slave: !!formStore.pensionApp?.slave
+                    ? {
+                        ...formStore.pensionApp?.slave,
+                        contractDate: pensionData.contractDate,
+                        amount: formatSpacedNumber(formStore.pensionApp?.slave?.amount),
+                        compulsoryContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.compulsoryContractAmount),
+                        voluntaryContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.voluntaryContractAmount),
+                        ownFundsRaisAmount: formatSpacedNumber(formStore.pensionApp?.slave?.ownFundsRaisAmount),
+                        compulsoryProfContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.compulsoryProfContractAmount),
+                        transferContractAmount: formatSpacedNumber(formStore.pensionApp?.slave?.transferContractAmount),
+                        transferContractCompany: pensionForm.value?.transferContractCompany?.nameRu ?? '',
+                      }
+                    : null,
+                };
+            if (!!data.slave) {
+              data.slave.transferContracts = prepareTransferContracts(isSlavePensionForm.value ? transferContracts.value : data.slave.transferContracts);
+              const difference = Math.abs(
+                formatSpacedNumber(formStore.pensionApp?.amount) + formatSpacedNumber(formStore.pensionApp?.slave?.amount) - formatSpacedNumber(pensionForm.value.amount),
+              );
+              if (customPension.value) {
+                isSlavePensionForm.value ? (data.slave.amount = formatSpacedNumber(pensionForm.value.amount)) : (data.amount = formatSpacedNumber(pensionForm.value.amount));
+                const customSum = sumPensionData(data) + sumPensionData(data.slave);
+                if (formatSpacedNumber(totalInsPremium.value) !== customSum) {
+                  return dataStore.showToaster('error', 'Cтраховая премия не соответсвует общей страховой премии');
+                }
+                if (!isSlavePensionForm.value) {
+                  data.slave.amount = difference;
+                } else {
+                  data.amount = difference;
+                }
+              } else {
+                const amount = isSlavePensionForm.value ? data.slave.amount : data.amount;
+                if (formatSpacedNumber(pensionForm.value.amount) != amount) {
+                  data.slave.amount = sumPensionData(data.slave);
+                  data.amount = sumPensionData(data);
+                }
+              }
+              const isParentValid = validatePensionForm(data, 'Заполните условия первого страхователя');
+              const isSlaveValid = validatePensionForm(data.slave, 'Заполните условия второго страхователя');
+              if (!isParentValid || !isSlaveValid) {
+                return;
+              }
+              await dataStore.setApplication(data, true);
+              customPension.value = false;
+            } else {
+              await dataStore.setApplication(data, true);
+            }
+            await dataStore.getApplicationData(String(route.params.taskId), false, false, false, true);
+            pensionForm.value.payment = formStore.applicationData.pensionApp?.payment ?? 0;
+            dateOfBegin.value = reformatDate(formStore.applicationData.pensionApp.dateOfBegin);
           } else {
             if (whichSum.value === 'requestedSumInsured') {
               productConditionsForm.insurancePremiumPerMonth = null;
@@ -1709,7 +1988,6 @@ export default defineComponent({
               }
             }
           }
-
           isCalculating.value = false;
         } else {
           const errors = document.querySelector('.v-input--error');
@@ -1733,7 +2011,26 @@ export default defineComponent({
       });
     };
 
+    const validatePensionForm = (data: any, text: string) => {
+      if (!data.amount || !data.guaranteedPeriod) {
+        dataStore.showToaster('error', text);
+        return false;
+      }
+      return true;
+    };
+
+    const sumPensionData = (data: any) => {
+      return (
+        formatSpacedNumber(data.ownFundsRaisAmount) +
+        formatSpacedNumber(data.voluntaryContractAmount) +
+        formatSpacedNumber(data.compulsoryContractAmount) +
+        formatSpacedNumber(data.compulsoryProfContractAmount) +
+        sumContractsAmount(data.transferContracts)
+      );
+    };
+
     onMounted(async () => {
+      if (hasContragentData.value) await getContragent();
       if (props.isCalculator === true) {
         if (dataStore.isCalculator) {
           clearFields();
@@ -1800,22 +2097,34 @@ export default defineComponent({
         );
       }
       if (whichProduct.value === 'pensionannuitynew') {
-        contractDate.value = reformatDate(formStore.applicationData.pensionApp.contractDate);
-        dateOfBegin.value = reformatDate(formStore.applicationData.pensionApp.dateOfBegin);
-        transferContractDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractDate);
-        transferContractFirstPaymentDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractFirstPaymentDate);
+        contractDate.value = reformatDate(pensionForm.value.contractDate ?? '');
+        dateOfBegin.value = reformatDate(pensionForm.value.dateOfBegin);
+        transferContractDate.value = reformatDate(pensionForm.value.transferContractDate);
+        transferContractFirstPaymentDate.value = reformatDate(pensionForm.value.transferContractFirstPaymentDate ?? '');
         maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 19);
-        if (transferContracts.value && transferContracts.value.length) {
-          transferContracts.value = pensionForm.transferContracts?.map((contract: TransferContract) => {
-            contract.transferContractDate = reformatDate(contract.transferContractDate)!;
-            contract.transferContractFirstPaymentDate = reformatDate(contract.transferContractFirstPaymentDate)!;
-            contract.transferContractCompany = { nameRu: contract.transferContractCompany } as any;
-            return contract;
+        if (!transferContracts.value.length && pensionForm.value.transferContracts && pensionForm.value.transferContracts.length) {
+          pensionForm.value.transferContracts.forEach((contract: TransferContract) => {
+            transferContracts.value.push({
+              ...contract,
+              transferContractDate: constants.regex.isoDate.test(contract.transferContractDate) ? reformatDate(contract.transferContractDate)! : contract.transferContractDate,
+              transferContractFirstPaymentDate: constants.regex.isoDate.test(contract.transferContractFirstPaymentDate)
+                ? reformatDate(contract.transferContractFirstPaymentDate)!
+                : contract.transferContractFirstPaymentDate,
+              transferContractCompany:
+                typeof contract.transferContractCompany === 'string' ? ({ nameRu: contract.transferContractCompany } as any) : contract.transferContractCompany,
+              transferContractAmount: dataStore.getNumberWithSpaces(contract.transferContractAmount) ?? '',
+            });
           });
         }
       }
     });
 
+    watch(
+      () => pensionForm.value?.amount,
+      val => {
+        if (val) pensionForm.value.amount = dataStore.getNumberWithSpaces(val);
+      },
+    );
     watch(
       () => productConditionsForm.amountOfInsurancePremium,
       val => {
@@ -1931,8 +2240,41 @@ export default defineComponent({
       );
     }
 
+    if (whichProduct.value === 'pensionannuitynew') {
+      watch(
+        () => pensionForm.value.guaranteedPeriod,
+        async () => {
+          if (formStore.applicationData.processCode === 24) {
+            await dataStore.reCalculateRefund(
+              Number(pensionForm.value.parentContractAmount),
+              Number(pensionForm.value.parentContractMainAmount),
+              pensionForm.value.guaranteedPeriod,
+              pensionForm.value.transferContractIsOppv,
+              pensionForm.value.compulsoryProfMonthCount ?? 0,
+            );
+          }
+        },
+      );
+      watch(
+        () => contractDate.value,
+        (val, oldVal) => {
+          if (val !== null && val !== undefined && val.length === 10 && oldVal != undefined && !isSlavePensionForm.value) {
+            const formattedContractDate = formatDate(val);
+            if (formattedContractDate) {
+              const transferMax = formattedContractDate;
+              transferMax.setFullYear(transferMax.getFullYear() - 2);
+              transferMax.setDate(transferMax.getDate() + 1);
+              transferMaxDate.value = reformatDate(String(transferMax));
+              formattedContractDate.setDate(formattedContractDate.getDate() + 20);
+              dateOfBegin.value = reformatDate(String(formattedContractDate));
+            }
+          }
+        },
+      );
+    }
+
     const copyRedirect = async () => {
-      const url = await dataStore.api.pensionannuityNew.getEnpfRedirectUrl(String(formStore.applicationData.processInstanceId));
+      const url = await dataStore.api.pensionannuityNew.getEnpfRedirectUrl(String(pensionForm.value.processInstanceId));
       dataStore.copyToClipboard(url.redirectUrl);
     };
 
@@ -1961,21 +2303,28 @@ export default defineComponent({
       subTermValue,
       panelCodeList,
       pensionForm,
+      insuredForm,
       dateOfBegin,
       contractDate,
       transferContractDate,
       transferContractFirstPaymentDate,
       enabled,
       maxDate,
+      transferMaxDate,
       guaranteedPeriodList,
       isEnpfSum,
       transferContracts,
       contractsValue,
       contractIndex,
+      contragentData,
+      customPension,
 
       // Computed
       isTask,
       isDisabled,
+      pensionPayment,
+      disabilityGroup,
+      totalInsPremium,
       isTermsDisabled,
       isUnderwriterForm,
       hasCurrencySymbols,
@@ -1992,6 +2341,7 @@ export default defineComponent({
       hasRequestedSumInsuredInDollar,
       hasInsurancePremiumPerMonthInDollar,
       hasCurrency,
+      hasContragentData,
       hasAdbMultiply,
       readonlyLifeAdditive,
       readonlyDisabilityMultiply,
@@ -2021,13 +2371,12 @@ export default defineComponent({
       isDisabledFixInsSum,
       defaultText,
       hasDeathInsFromNS,
-      pensionAmount,
-      pensionCalculationParams,
       hasDeathInsAnyReason,
       fromIndexPage,
       hasCoverPeriod,
       hasInsStartDate,
       hasInsEndDate,
+      isSlavePensionForm,
 
       // Rules
       coverPeriodRule,
@@ -2045,9 +2394,11 @@ export default defineComponent({
       onInputInsurancePremiumPerMonth,
       onInputInsurancePremiumPerMonthInDollar,
       onInputSum,
+      onInputPension,
       onInputSumDollar,
       toStatement,
       onClearSum,
+      onClearPension,
       onClearSumDollar,
       onClearPremium,
       onClearPremiumDollar,
@@ -2059,6 +2410,7 @@ export default defineComponent({
       pickSubTermValue,
       onInputFixInsSum,
       copyRedirect,
+      getContragent,
       addTransferContract,
       removeTransferContract,
     };