hl-core 0.0.9-beta.51 → 0.0.9-beta.53

package/api/base.api.ts

@@ -1039,4 +1039,15 @@ export class ApiClass {
       },
     });
   }
+
+  async uploadDigitalCertifijcate(data: any) {
+    return await this.axiosCall<any>({
+      method: Methods.POST,
+      url: '/File/api/Document/UploadDigitalCertifijcate',
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+      data: data,
+    });
+  }
 }

package/components/Pages/Documents.vue

@@ -1,8 +1,14 @@
 <template>
   <section :class="[$styles.scrollPage]">
+    <base-form-section v-if="isUnderwriterDocuments" title="Загрузить документы для Андеррайтинга" class="mx-[10px] mt-[14px]">
+      <base-file-input :readonly="isDisabled || documentLoading" @input.prevent="onUnderFiles($event)" @onClear="onClearUnderFiles()" />
+      <base-animation>
+        <base-btn v-if="underDocumentsList && underDocumentsList.length" :loading="documentLoading" text="Загрузить" size="sm" class="mt-3" @click="uploadUnderFiles" />
+      </base-animation>
+    </base-form-section>
     <section class="w-full px-[10px] pt-[14px] flex flex-col gap-2" v-if="formStore.signedDocumentList && formStore.signedDocumentList.length">
       <base-content-block
-        v-if="$dataStore.isInitiator() && $dataStore.controls.hasChooseSign && formStore.applicationData.statusCode === 'ContractSignedFrom'"
+        v-if="$dataStore.isInitiator() && !$dataStore.isPension && $dataStore.controls.hasChooseSign && formStore.applicationData.statusCode === 'ContractSignedFrom'"
         :class="[$styles.textSimple]"
       >
         <h5 class="text-center font-medium mb-4">{{ $dataStore.t('Contract') }}</h5>
@@ -25,10 +31,7 @@
         </div>
       </base-content-block>
     </section>
-    <div
-      v-if="(!formStore.signedDocumentList || !formStore.signedDocumentList.length) && !$dataStore.isPension"
-      class="h-[calc(90vh-70px)] flex flex-col items-center justify-center gap-6"
-    >
+    <div v-if="!formStore.signedDocumentList || !formStore.signedDocumentList.length" class="h-[calc(90vh-70px)] flex flex-col items-center justify-center gap-6">
       <svg xmlns="http://www.w3.org/2000/svg" width="125" height="131" viewBox="0 0 125 131" fill="none" class="cursor-help">
         <path
           fill-rule="evenodd"
@@ -48,30 +51,30 @@
       </svg>
       <p class="text-xl" :class="[$styles.mutedText]">{{ $dataStore.t('labels.noDocuments') }}</p>
     </div>
-    <section class="w-full px-[10px] pt-[14px] flex flex-col gap-2" v-if="$dataStore.isPension">
+    <section v-if="$dataStore.isPension && showContract" class="w-full px-[10px] pt-[14px] flex flex-col gap-2">
       <base-content-block :class="[$styles.textSimple]">
         <h5 class="text-center font-medium mb-4">{{ $dataStore.t('labels.statements') }}</h5>
         <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
-          <span class="ml-2">Заявления на {{ processCode == 1 ? 'страхование' : 'возврат' }}</span>
+          <span class="ml-2">Заявления на {{ processCode == 19 ? 'страхование' : 'возврат' }}</span>
           <i
             class="transition-all cursor-pointer mdi mdi-paperclip pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
             :class="[$styles.greenTextHover]"
-            @click="$dataStore.generatePDFDocument(processCode == 1 ? 'PA_Statement' : 'PA_RefundStatement', '37')"
+            @click="$dataStore.generatePDFDocument(processCode == 19 ? 'PA_Statement' : 'PA_RefundStatement', '37')"
           ></i>
         </div>
       </base-content-block>
       <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">Договор {{ processCode == 1 ? 'страхования' : 'возврата' }}</span>
+          <span class="ml-2">Договор {{ processCode == 19 ? 'страхования' : 'возврата' }}</span>
           <i
             class="transition-all cursor-pointer mdi mdi-paperclip pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
             :class="[$styles.greenTextHover]"
-            @click="$dataStore.generatePDFDocument(processCode == 1 ? 'PA_Contract' : 'PA_RefundAgreement', '38')"
+            @click="$dataStore.generatePDFDocument(processCode == 19 ? 'PA_Contract' : 'PA_RefundAgreement', '38')"
           ></i>
         </div>
       </base-content-block>
-      <base-content-block :class="[$styles.textSimple]" v-if="formStore.applicationData.statusCode !== 'StartForm' && processCode == 1">
+      <base-content-block :class="[$styles.textSimple]" v-if="formStore.applicationData.statusCode !== 'StartForm' && processCode == 19">
         <h5 class="text-center font-medium mb-4">{{ $dataStore.t('pension.complianceFinMonitoring') }}</h5>
         <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
           <span class="ml-2">{{ $dataStore.t('pension.complianceFinMonitoring') }}</span>
@@ -82,7 +85,7 @@
           ></i>
         </div>
       </base-content-block>
-      <base-content-block :class="[$styles.textSimple]" v-if="formStore.applicationData.statusCode === 'PreparationDossierForm' && processCode == 1">
+      <base-content-block :class="[$styles.textSimple]" v-if="formStore.applicationData.statusCode === 'PreparationDossierForm' && processCode == 19">
         <h5 class="text-center font-medium mb-4">{{ $dataStore.t('pension.dossierPA') }}</h5>
         <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
           <span class="ml-2">{{ $dataStore.t('pension.dossierPA') }}</span>
@@ -99,13 +102,9 @@
         <div :class="[$styles.flexColNav]">
           <base-btn :disabled="documentLoading" :loading="documentLoading" text="Открыть" @click="getFile('view')" />
           <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getFile('download')" />
-          <base-btn
-            v-if="$dataStore.isPension && $dataStore.isProcessEditable(formStore.applicationData.statusCode)"
-            :disabled="documentLoading"
-            :loading="documentLoading"
-            text="Удалить"
-            @click="deletionDialog = true"
-          />
+          <base-animation>
+            <base-btn v-if="canDeleteFiles" :disabled="documentLoading" :loading="documentLoading" text="Удалить" @click="deletionDialog = true" />
+          </base-animation>
         </div>
       </base-fade-transition>
     </Teleport>
@@ -123,6 +122,7 @@
 
 <script lang="ts">
 import { DocumentItem } from '../../composables/classes';
+import { uuid } from 'vue-uuid';
 
 export default defineComponent({
   setup() {
@@ -149,6 +149,18 @@ export default defineComponent({
       action: '',
       text: '',
     });
+    const underDocumentsList = ref<
+      {
+        file: File;
+        fileName: string;
+        identifier: string;
+        fileTypeId: string;
+        fileTypeCode: string;
+        fileTypeName: string;
+        processInstanceId: string;
+      }[]
+    >([]);
+
     const object_list = computed(() => Object.values(formStore.signedDocumentList));
     const unSignedList = computed(() => document_list.value.filter((doc: DocumentItem) => doc.signed === false || doc.signed === null));
     const document_list = computed(() =>
@@ -158,6 +170,24 @@ export default defineComponent({
         }
       }),
     );
+    const showContract = computed(
+      () => formStore.applicationData && (formStore.applicationData.statusCode === 'Completed' || formStore.applicationData.statusCode === 'PreparationDossierForm'),
+    );
+    const isUnderwriterDocuments = computed(
+      () =>
+        (dataStore.isAULETTI || dataStore.isAulettiParent) &&
+        dataStore.isInitiator() &&
+        formStore.applicationData &&
+        (formStore.applicationData.statusCode === 'StartForm' || formStore.applicationData.statusCode === 'EditForm'),
+    );
+    const canDeleteFiles = computed(() => {
+      const baseCondition = dataStore.isTask() && dataStore.isInitiator() && dataStore.isProcessEditable(formStore.applicationData.statusCode);
+      if (dataStore.isAULETTI || dataStore.isAulettiParent) {
+        return baseCondition && (currentDocument.value ? currentDocument.value.fileTypeCode === '46' : false);
+      }
+      if (dataStore.isPension) return baseCondition;
+      return false;
+    });
 
     const openPanel = async (document: DocumentItem) => {
       dataStore.rightPanel.title = document.fileTypeName!;
@@ -185,6 +215,48 @@ export default defineComponent({
       }
     };
 
+    const onUnderFiles = async (event: InputEvent) => {
+      if (event.target || event.dataTransfer) {
+        const files = event.target ? (event.target as HTMLInputElement).files : (event.dataTransfer as DataTransfer).files;
+        if (files !== null) {
+          const underDocumentType = dataStore.dicFileTypeList.find(i => i.code === '46');
+          Object.values(files).map(file => {
+            const uuidV4 = uuid.v4();
+            underDocumentsList.value.push({
+              file: file,
+              identifier: `${uuidV4}${file.name.substring(file.name.lastIndexOf('.'))}`,
+              processInstanceId: String(formStore.applicationData.processInstanceId),
+              fileTypeId: underDocumentType ? String(underDocumentType.id) : '',
+              fileTypeCode: underDocumentType ? String(underDocumentType.code) : '',
+              fileTypeName: underDocumentType ? String(underDocumentType.nameRu) : '',
+              fileName: file.name ? file.name : underDocumentType ? String(underDocumentType.nameRu) : '',
+            });
+          });
+        }
+      }
+    };
+
+    const onClearUnderFiles = () => {
+      underDocumentsList.value = [];
+    };
+
+    const uploadUnderFiles = async () => {
+      if (underDocumentsList.value) {
+        documentLoading.value = true;
+        await Promise.allSettled(
+          Object.values(underDocumentsList.value).map(async value => {
+            const formData = new FormData();
+            formData.append('file', value.file);
+            formData.append('fileData', JSON.stringify([{ ...value, file: undefined }]));
+            await dataStore.uploadFiles(formData, false);
+          }),
+        );
+        onClearUnderFiles();
+        await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
+        documentLoading.value = false;
+      }
+    };
+
     watch(
       () => document_list.value,
       () => {
@@ -243,15 +315,22 @@ export default defineComponent({
       signedContract,
       deletionDialog,
       processCode,
+      underDocumentsList,
 
       // Computed
       isDisabled,
+      showContract,
+      canDeleteFiles,
+      isUnderwriterDocuments,
 
       // Functions
-      openPanel,
       getFile,
-      onFileChange,
+      openPanel,
       deleteFile,
+      onFileChange,
+      onUnderFiles,
+      uploadUnderFiles,
+      onClearUnderFiles,
     };
   },
 });

package/components/Pages/MemberForm.vue

@@ -199,25 +199,23 @@
           :rules="$rules.required.concat($rules.numbers)"
         />
       </base-form-section>
-
       <base-form-section
         v-if="$dataStore.isPension && (whichForm === formStore.insuredFormKey || whichForm === formStore.beneficiaryFormKey)"
         :title="$dataStore.t('pension.disabilityInfo')"
       >
-        <base-form-toggle v-model="hasDisability" :title="$dataStore.t('pension.ifHasDisability')" :disabled="isDisabled" :has-border="false" />
+        <base-form-toggle v-model="member.isDisability" :title="$dataStore.t('pension.ifHasDisability')" :disabled="isDisabled" :has-border="false" />
         <base-animation>
-          <div class="flex flex-col gap-[1px]" v-if="hasDisability">
-            <base-panel-input
-              v-model="member.disabilityGroup"
-              :value="member.disabilityGroup?.nameRu"
-              :readonly="isDisabled"
-              :clearable="!isDisabled"
-              :label="$dataStore.t('pension.disabilityGroup')"
-              :rules="$rules.objectRequired"
-              append-inner-icon="mdi mdi-chevron-right"
-              @append="openPanel($dataStore.t('pension.disabilityGroup'), $dataStore.disabilityGroups, 'disabilityGroup', $dataStore.getDisabilityGroups)"
-            />
-          </div>
+          <base-panel-input
+            v-if="member.isDisability"
+            v-model="member.disabilityGroup"
+            :value="member.disabilityGroup?.nameRu"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :label="$dataStore.t('pension.disabilityGroup')"
+            :rules="$rules.objectRequired"
+            append-inner-icon="mdi mdi-chevron-right"
+            @append="openPanel($dataStore.t('pension.disabilityGroup'), $dataStore.disabilityGroups, 'disabilityGroup', $dataStore.getDisabilityGroups)"
+          />
         </base-animation>
       </base-form-section>
       <base-form-section :title="$dataStore.t('policyholdersRepresentative.PowerOfAttorney')" v-if="whichForm === formStore.policyholdersRepresentativeFormKey">
@@ -396,7 +394,7 @@
             <base-form-input v-model.trim="member.registrationMicroDistrict" :readonly="isDisabled" :clearable="!isDisabled" :label="$dataStore.t('form.MicroDistrict')" />
             <base-form-input
               v-model.trim="member.registrationStreet"
-              :rules="member.isInsuredUnderage ? [] : $rules.required"
+              :rules="member.isInsuredUnderage || $dataStore.isAULETTI || $dataStore.isAulettiParent ? [] : $rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.Street')"
@@ -758,7 +756,6 @@ export default {
 
     const currentPanelDeep = ref<string>();
     const currentPanelSubDeep = ref<string>();
-    const hasDisability = ref<boolean>(false);
 
     const memberSetting = computed(() => dataStore.members[memberStore.getMemberApplicationCode(whichForm.value)!]);
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
@@ -837,7 +834,7 @@ export default {
             return false;
         }
       };
-      return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
+      return dataStore.isAULETTI || dataStore.isAulettiParent ? false : dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
     const hasDocumentReader = computed(() => {
       return !!member.value.hasAgreement && !!isTask.value && (dataStore.isAULETTI || dataStore.isAulettiParent);
@@ -1362,7 +1359,7 @@ export default {
       if (whichForm.value == formStore.policyholderFormKey || (dataStore.isPension && whichForm.value == formStore.insuredFormKey)) {
         if (route.params.taskId === '0') {
           try {
-            const taskId = await dataStore.startApplication(member.value, dataStore.isPension ? (String(route.query.type) === 'joint' ? 4 : 1) : undefined);
+            const taskId = await dataStore.startApplication(member.value, dataStore.isPension ? (String(route.query.type) === 'joint' ? 4 : 19) : undefined);
             if (typeof taskId === 'string') {
               await dataStore.getApplicationData(taskId, false, false, false, false);
               remoteIsInsured.value = formStore.applicationData.clientApp.isInsured;
@@ -1426,7 +1423,7 @@ export default {
             ownFundsRaisAmount: 0,
             compulsoryProfContractAmount: 0,
           };
-          const isApplicationSaved = await dataStore.setApplication();
+          const isApplicationSaved = await dataStore.setApplication(formStore.applicationData.pensionApp);
           if (isApplicationSaved === false) return;
           dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
         }
@@ -1797,6 +1794,15 @@ export default {
           }
         },
       );
+      watch(
+        () => member.value.isDisability,
+        val => {
+          if (!val) member.value.disabilityGroup = new Value();
+        },
+        {
+          immediate: true,
+        },
+      );
     }
 
     return {
@@ -1824,7 +1830,6 @@ export default {
       selectedIndex,
       selectedFamilyMember,
       sameAddress,
-      hasDisability,
       isRelative,
       imageDataList,
       // Computed

package/components/Pages/ProductConditions.vue

@@ -9,7 +9,7 @@
         icon="mdi-alert text-[#FCB016]"
       ></base-message-block>
       <base-form-section
-        v-if="isUnderwriterRole && $dataStore.hasClientAnketa && $dataStore.isClientAnketaCondition && whichProduct !== 'pensionannuity'"
+        v-if="isUnderwriterRole && $dataStore.hasClientAnketa && $dataStore.isClientAnketaCondition && whichProduct !== 'pensionannuitynew'"
         :title="$dataStore.t('policyholderForm')"
       >
         <base-form-input
@@ -36,7 +36,7 @@
         <base-form-input v-model="formStore.policyholderForm.gender.nameRu" class="mb-4" :label="$dataStore.t('form.gender')" :readonly="true" />
       </base-form-section>
       <base-form-section
-        v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuity'"
+        v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuitynew'"
         :title="$dataStore.t('insuredForm')"
       >
         <div v-for="(insured, index) of formStore.insuredForm" :key="index">
@@ -49,7 +49,7 @@
         </div>
       </base-form-section>
       <base-form-section
-        v-if="isUnderwriterRole && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuity'"
+        v-if="isUnderwriterRole && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuitynew'"
         :title="$dataStore.t('recalculationInfo')"
       >
         <base-form-input
@@ -281,12 +281,11 @@
           @append="openPanel($dataStore.t('productConditionsForm.processGfot'), $dataStore.processGfot, 'processGfot', $dataStore.getProcessGfot)"
         />
       </base-form-section>
-      <section v-if="whichProduct === 'pensionannuity'">
+      <section v-if="whichProduct === 'pensionannuitynew'">
         <base-form-section :title="$dataStore.t('pension.compulsoryAmount&Prof')">
           <base-form-input
             v-model="pensionCalculationParams.compulsoryContractAmount"
             :maska="$maska.numbers"
-            :rules="$rules.required"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$dataStore.t('pension.compulsoryContractAmount')"
@@ -328,23 +327,43 @@
             v-model="pensionForm.transferContractCompany"
             :value="pensionForm.transferContractCompany?.nameRu"
             :label="$dataStore.t('pension.transferContractCompany')"
-            clearable
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
             append-inner-icon="mdi mdi-chevron-right"
-            @append="openPanel($dataStore.t('pension.transferContractCompany'), $dataStore.insuranceCompanies, 'insuranceCompanies', $dataStore.getInsuranceCompanies)"
+            @append="openPanel($dataStore.t('pension.transferContractCompany'), $dataStore.transferContractCompanies, 'transferContractCompany', $dataStore.getInsuranceCompanies)"
           />
           <base-form-input
-            v-model="pensionForm.transferContractDate"
+            v-model="transferContractDate"
             :maska="$maska.date"
             :label="$dataStore.t('pension.contractDate')"
+            :readonly="isDisabled"
             append-inner-icon="mdi mdi-calendar-blank-outline"
+            :clearable="!isDisabled"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required.concat($rules.date) : []"
           />
           <base-form-input
-            v-model="pensionForm.transferContractFirstPaymentDate"
+            v-model="pensionForm.transferContractNumber"
+            :label="$dataStore.t('pension.globalId')"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required : []"
+          />
+          <base-form-input
+            v-model="transferContractFirstPaymentDate"
             :maska="$maska.date"
             :label="$dataStore.t('pension.transferContractFirstPaymentDate')"
             append-inner-icon="mdi mdi-calendar-blank-outline"
+            :readonly="isDisabled"
+            :clearable="!isDisabled"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required.concat($rules.date) : []"
+          />
+          <base-form-input
+            v-model="pensionCalculationParams.transferContractAmount"
+            :maska="$maska.numbers"
+            :label="$dataStore.t('pension.transferContractAmount')"
+            :rules="pensionForm.transferContractCompany?.ids ? $rules.required : []"
           />
-          <base-form-input v-model="pensionForm.transferContractAmount" :maska="$maska.numbers" :label="$dataStore.t('pension.transferContractAmount')" />
+          <base-form-toggle v-model="pensionForm.transferContractIsOppv" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('pension.isOPPVTransfer')" />
         </base-form-section>
         <base-form-section :title="$dataStore.t('pension.paymentTerms')">
           <base-form-input
@@ -703,14 +722,16 @@ export default defineComponent({
     const enabled = 'включено';
 
     const additionalTerms = ref<AddCover[]>([]);
-    const ksj = ref(new Value());
+
     const maxDate = ref();
     const dateOfBegin = ref();
     const contractDate = ref();
-    const guaranteedPeriodList = ref();
-    const isMultiplePanelOpen = ref<boolean>(false);
+    const transferContractDate = ref();
+    const transferContractFirstPaymentDate = ref();
+    const guaranteedPeriodList = Array.from(Array(35), (e, i) => i + 1);
     const pensionForm = formStore.applicationData?.pensionApp ?? undefined;
 
+    const isMultiplePanelOpen = ref<boolean>(false);
     const multiplePanelValue = ref<CountryValue>(new CountryValue());
     const multiplePanelList = ref<CountryValue[]>([]);
     const calculatorForm = productConditionsForm.calculatorForm;
@@ -950,7 +971,7 @@ export default defineComponent({
       return isDisabled.value;
     });
     const hasDefault = computed(() => {
-      if (whichProduct.value === 'lifetrip' || whichProduct.value === 'pensionannuity') {
+      if (whichProduct.value === 'lifetrip' || whichProduct.value === 'pensionannuitynew') {
         return false;
       }
       return true;
@@ -1007,6 +1028,7 @@ export default defineComponent({
       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,
     });
 
     const pensionAmount = computed(() =>
@@ -1014,7 +1036,8 @@ export default defineComponent({
         ? (Number(pensionCalculationParams.value.compulsoryContractAmount) ?? 0) +
           (Number(pensionCalculationParams.value.voluntaryContractAmount) ?? 0) +
           (Number(pensionCalculationParams.value.ownFundsRaisAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.compulsoryProfContractAmount) ?? 0)
+          (Number(pensionCalculationParams.value.compulsoryProfContractAmount) ?? 0) +
+          (Number(pensionCalculationParams.value.transferContractAmount) ?? 0)
         : 0,
     );
 
@@ -1055,6 +1078,9 @@ export default defineComponent({
       if (whichProduct.value === 'lifetrip') {
         // @ts-ignore
         calculatorForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
+      } else if (whichProduct.value === 'pensionannuitynew') {
+        // @ts-ignore
+        pensionForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
       } else {
         // @ts-ignore
         productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
@@ -1403,7 +1429,7 @@ export default defineComponent({
             } else {
               await dataStore.calculatePrice();
             }
-          } else if (whichProduct.value === 'pensionannuity') {
+          } else if (whichProduct.value === 'pensionannuitynew') {
             if (
               pensionCalculationParams.value &&
               pensionCalculationParams.value.compulsoryProfContractAmount &&
@@ -1414,17 +1440,21 @@ export default defineComponent({
               dataStore.showToaster('error', 'Минимальное число дней уплаты ОППВ должно быть больше 60');
               return;
             }
-            Object.assign(
-              pensionForm,
-              (pensionCalculationParams.value = {
+            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),
               }),
-            );
-            await dataStore.setApplication(true);
+              transferContractCompany: pensionForm.transferContractCompany?.nameRu ?? null,
+              transferContractDate: transferContractDate.value ? formatDate(transferContractDate.value) : null,
+              transferContractFirstPaymentDate: transferContractFirstPaymentDate.value ? formatDate(transferContractFirstPaymentDate.value) : null,
+            };
+            await dataStore.setApplication(data, true);
           } else {
             if (whichSum.value === 'requestedSumInsured') {
               productConditionsForm.insurancePremiumPerMonth = null;
@@ -1548,7 +1578,7 @@ export default defineComponent({
         if (dataStore.isCalculator) {
           clearFields();
         }
-        if (whichProduct.value !== 'lifetrip' && whichProduct.value !== 'pensionannuity') {
+        if (whichProduct.value !== 'lifetrip' && whichProduct.value !== 'pensionannuitynew') {
           if (
             (dataStore.isCalculator || route.params.taskId === '0') &&
             productConditionsForm.requestedSumInsured === null &&
@@ -1603,11 +1633,12 @@ export default defineComponent({
           }, 0),
         );
       }
-      if (whichProduct.value === 'pensionannuity') {
+      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);
         maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 1);
-        guaranteedPeriodList.value = Array.from(Array(35), (e, i) => i + 1);
       }
     });
 
@@ -1719,7 +1750,8 @@ export default defineComponent({
       pensionForm,
       dateOfBegin,
       contractDate,
-      ksj,
+      transferContractDate,
+      transferContractFirstPaymentDate,
       enabled,
       maxDate,
       guaranteedPeriodList,