hl-core 0.0.9-beta.52 → 0.0.9-beta.54

package/api/base.api.ts

@@ -959,13 +959,6 @@ export class ApiClass {
     });
   }
 
-  async getDocument(id: string) {
-    return await this.axiosCall<any>({
-      method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/GetDocument/${id}`,
-    });
-  }
-
   async uploadXml(data: any) {
     return await this.axiosCall<void>({
       url: `/File/api/Document/UploadXml`,
@@ -1050,4 +1043,18 @@ export class ApiClass {
       data: data,
     });
   }
+
+  async getDocumentsByEdsXmlId(edsXmlId: string) {
+    return await this.axiosCall<any>({
+      method: Methods.GET,
+      url: `/File/api/Sign/GetDocumentsByEdsXmlId/${edsXmlId}`,
+    })
+  }
+
+  async checkSign(id: string) {
+    return await this.axiosCall<SignedState>({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/CheckSign/${id}`,
+    });
+  }
 }

package/components/Form/ManagerAttachment.vue

@@ -8,6 +8,7 @@
         <v-expansion-panel-text class="border-t-[1px] no-padding">
           <v-form ref="vForm" class="flex flex-col divide-y">
             <base-panel-input
+              v-if="isSaleChanellShown"
               class="pl-1 pt-1"
               v-model="formStore.SaleChanellPolicy"
               :value="formStore.SaleChanellPolicy?.nameRu"
@@ -19,6 +20,7 @@
               @append="openPanel('SaleChanellPolicy', $dataStore.t('form.salesChanell'))"
             />
             <base-panel-input
+              v-if="isRegionShown"
               class="pl-1 pt-1"
               v-model="formStore.RegionPolicy"
               :value="formStore.RegionPolicy?.nameRu"
@@ -30,6 +32,7 @@
               @append="openPanel('RegionPolicy', $dataStore.t('form.Region'))"
             />
             <base-panel-input
+              v-if="isManagerShown"
               class="pl-1 pt-1"
               v-model="formStore.ManagerPolicy"
               :value="formStore.ManagerPolicy?.nameRu"
@@ -41,6 +44,7 @@
               @append="openPanel('ManagerPolicy', $dataStore.t('form.manager'))"
             />
             <base-panel-input
+              v-if="isAgentShown"
               class="pl-1 pt-1"
               v-model="formStore.AgentData"
               :value="formStore.AgentData?.fullName"
@@ -134,22 +138,37 @@ export default defineComponent({
         (route.params.taskId !== '0' && (!dataStore.isProcessEditable(formStore.applicationData.statusCode) || !dataStore.isTask())),
     );
     const isSaleChanellReadonly = computed(() => {
-      if (dataStore.isGons) return isReadonly.value || !dataStore.isServiceManager();
+      if (dataStore.isGons) return isReadonly.value && dataStore.isServiceManager();
       return isReadonly.value;
     });
     const isRegionReadonly = computed(() => {
-      if (dataStore.isGons) return isReadonly.value || !dataStore.isServiceManager();
+      if (dataStore.isGons) return isReadonly.value && (dataStore.isServiceManager() || dataStore.isAgent());
       return isReadonly.value;
     });
     const isManagerReadonly = computed(() => {
-      if (dataStore.isGons) return isReadonly.value || !dataStore.isServiceManager();
+      if (dataStore.isGons) return isReadonly.value && dataStore.isServiceManager();
       return isReadonly.value;
     });
     const isAgentReadonly = computed(() => {
-      if (dataStore.isGons || dataStore.isPension) return isReadonly.value || !dataStore.isAgent();
+      if (dataStore.isGons || dataStore.isPension) return isReadonly.value && dataStore.isServiceManager();
       return isReadonly.value;
     });
-
+    const isSaleChanellShown = computed(() => {
+      if (dataStore.isGons) return dataStore.isServiceManager();
+      return true;
+    });
+    const isRegionShown = computed(() => {
+      if (dataStore.isGons) return dataStore.isServiceManager() || dataStore.isAgent();
+      return true;
+    });
+    const isManagerShown = computed(() => {
+      if (dataStore.isGons) return dataStore.isServiceManager();
+      return true;
+    });
+    const isAgentShown = computed(() => {
+      if (dataStore.isGons || dataStore.isPension) return dataStore.isServiceManager();
+      return true;
+    });
     const openPanel = async (currentDict: ManagerAttachmentFiels, title: string) => {
       searchQuery.value = '';
       if (dataStore.isTask() && !props.disabled) {
@@ -204,7 +223,9 @@ export default defineComponent({
       () => formStore.RegionPolicy,
       (val, oldVal) => {
         if (val.ids !== oldVal.ids) {
-          formStore.ManagerPolicy = new Value();
+          if (!dataStore.isGons) {
+            formStore.ManagerPolicy = new Value();
+          }
         }
       },
     );
@@ -244,7 +265,10 @@ export default defineComponent({
       isRegionReadonly,
       isManagerReadonly,
       isAgentReadonly,
-
+      isSaleChanellShown,
+      isRegionShown,
+      isManagerShown,
+      isAgentShown,
       // Functions
       openPanel,
       searchAgent,

package/components/Pages/Documents.vue

@@ -1,5 +1,11 @@
 <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.isPension && $dataStore.controls.hasChooseSign && formStore.applicationData.statusCode === 'ContractSignedFrom'"
@@ -25,10 +31,7 @@
         </div>
       </base-content-block>
     </section>
-    <div
-      v-if="(!formStore.signedDocumentList || !formStore.signedDocumentList.length)"
-      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"
@@ -52,26 +55,26 @@
       <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(() =>
@@ -161,6 +173,21 @@ 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!;
@@ -188,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,
       () => {
@@ -246,16 +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

@@ -460,7 +460,7 @@
           v-model="member.documentIssuers"
           :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer"
+          :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -1359,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;

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,7 +281,7 @@
           @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"
@@ -383,6 +383,7 @@
             class="pension-guaranteed-period"
             :readonly="isDisabled"
             :clearable="!isDisabled"
+            :rules="$rules.notZero"
             :label="$dataStore.t('pension.guaranteedPeriod')"
             :items="guaranteedPeriodList"
             :hide-details="true"
@@ -971,7 +972,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;
@@ -1078,7 +1079,7 @@ export default defineComponent({
       if (whichProduct.value === 'lifetrip') {
         // @ts-ignore
         calculatorForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
-      } else if (whichProduct.value === 'pensionannuity') {
+      } else if (whichProduct.value === 'pensionannuitynew') {
         // @ts-ignore
         pensionForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
       } else {
@@ -1429,7 +1430,7 @@ export default defineComponent({
             } else {
               await dataStore.calculatePrice();
             }
-          } else if (whichProduct.value === 'pensionannuity') {
+          } else if (whichProduct.value === 'pensionannuitynew') {
             if (
               pensionCalculationParams.value &&
               pensionCalculationParams.value.compulsoryProfContractAmount &&
@@ -1578,7 +1579,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 &&
@@ -1633,7 +1634,7 @@ 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);

package/components/Panel/PanelHandler.vue

@@ -34,7 +34,13 @@
       <base-btn :text="$dataStore.t('buttons.sendElectronically')" :disabled="isElectronicDisabled" :loading="loading" @click="handleSignAction('electronic')" />
       <base-btn :text="$dataStore.t('buttons.generatePrintedForms')" :disabled="isScansDisabled" :loading="loading" @click="handleSignAction('scans')" />
       <base-btn :text="$dataStore.t('buttons.sendEgovMob')" :disabled="isQrDisabled" :loading="loading" @click="handleSignAction('qr')" />
-      <base-btn v-if="$dataStore.isPension" :text="$dataStore.t('buttons.signWithSignature')" :loading="loading" @click="handleSignAction('signature')" />
+      <base-btn
+        v-if="$dataStore.isPension"
+        :text="$dataStore.t('buttons.signWithSignature')"
+        :disabled="isSignatureDisabled"
+        :loading="loading"
+        @click="handleSignAction('signature')"
+      />
       <base-btn
         v-if="$dataStore.isPension"
         :text="$dataStore.t('buttons.signWithSignatureXML')"
@@ -48,17 +54,19 @@
     </div>
     <div v-if="isScansDocuments" :class="[$styles.flexColNav]">
       <div v-if="$dataStore.isPension">
-        <div v-if="processCode == 1">
-          <div v-if="formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson' || formStore.applicationData.statusCode === 'ContractSignedFrom'">
+        <div v-if="processCode == 19">
+          <div v-if="formStore.applicationData.statusCode === 'HeadManagerForm' || formStore.applicationData.statusCode === 'ContractSignedFrom'">
             <base-btn :text="$dataStore.t('buttons.downloadContract')" :loading="$dataStore.isButtonsLoading" @click="$dataStore.generatePDFDocument('PA_Contract', '38')" />
             <base-form-section class="mt-4 flex flex-col !gap-2" :title="$dataStore.t('clients.attachScansSignDocs')">
               <base-file-input :label="$dataStore.t('labels.attachContract')" @input.prevent="onFileChangeScans($event, 'pa_contract')" @onClear="onClearFile('pa_contract')" />
             </base-form-section>
           </div>
-          <div v-else>
+          <div v-else class="flex flex-col gap-2">
             <base-btn :text="$dataStore.t('buttons.downloadStatement')" :loading="$dataStore.isButtonsLoading" @click="$dataStore.generatePDFDocument('PA_Statement', '37')" />
+            <base-btn :text="$dataStore.t('buttons.downloadAgreement')" :loading="$dataStore.isButtonsLoading" @click="$dataStore.generatePDFDocument('Agreement', '19')" />
             <base-form-section class="mt-4 flex flex-col !gap-2" :title="$dataStore.t('clients.attachScansSignDocs')">
               <base-file-input :label="$dataStore.t('labels.attachStatement')" @input.prevent="onFileChangeScans($event, 'pa_statement')" @onClear="onClearFile('pa_statement')" />
+              <base-file-input :label="$dataStore.t('labels.attachAgreement')" @input.prevent="onFileChangeScans($event, 'agreement')" @onClear="onClearFile('agreement')" />
             </base-form-section>
           </div>
         </div>
@@ -88,7 +96,7 @@
           </base-form-section>
         </div>
       </div>
-      <div v-else>
+      <div :class="[$styles.flexColNav]" v-else>
         <base-btn :text="$dataStore.t('buttons.downloadStatement')" @click="downloadTemplate(constants.documentTypes.statement, 'docx')" />
         <base-btn :text="$dataStore.t('buttons.downloadContract')" @click="downloadTemplate(constants.documentTypes.contract, 'doc')" />
         <base-btn :text="$dataStore.t('buttons.downloadApplication')" @click="downloadTemplate(constants.documentTypes.application1, 'vnd.ms-excel')" />
@@ -277,7 +285,7 @@ export default defineComponent({
           (pensionForm.compulsoryProfContractAmount && pensionForm.compulsoryProfContractAmount !== 0) ||
           (pensionForm.voluntaryContractAmount && pensionForm.voluntaryContractAmount !== 0)),
     );
-    const consentGiven = computed(() => !!formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed && needsAgreement.value);
+    const consentGiven = computed(() => !!formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed);
     const affiliationDocument = computed(() => formStore.signedDocumentList.find((file: DocumentItem) => file.fileTypeName === 'Решение АС'));
     const affiliationData = ref<{
       processInstanceId: string | number;
@@ -324,7 +332,7 @@ export default defineComponent({
 
     const onFileChangeScans = async (
       event: InputEvent,
-      type: 'statement' | 'pa_statement' | 'pa_refundstatement' | 'contract' | 'pa_contract' | 'pa_refundagreement' | 'app' | 'attorney',
+      type: 'statement' | 'pa_statement' | 'pa_refundstatement' | 'contract' | 'pa_contract' | 'pa_refundagreement' | 'app' | 'attorney' | 'agreement',
     ) => {
       if (event.target) {
         const files = (event.target as HTMLInputElement).files;
@@ -344,13 +352,15 @@ export default defineComponent({
       }
     };
 
-    const onClearFile = async (type: 'statement' | 'pa_statement' | 'pa_refundstatement' | 'contract' | 'pa_contract' | 'pa_refundagreement' | 'app' | 'attorney') => {
+    const onClearFile = async (
+      type: 'statement' | 'pa_statement' | 'pa_refundstatement' | 'contract' | 'pa_contract' | 'pa_refundagreement' | 'app' | 'attorney' | 'agreement',
+    ) => {
       const doc = await selectedDocument(type);
       const result = scansFiles.value.filter(i => JSON.parse(i.fileData)[0].fileTypeCode !== doc.code);
       scansFiles.value = result;
     };
 
-    const selectedDocument = (type: 'statement' | 'pa_statement' | 'pa_refundstatement' | 'contract' | 'pa_contract' | 'pa_refundagreement' | 'app' | 'attorney') => {
+    const selectedDocument = (type: 'statement' | 'pa_statement' | 'pa_refundstatement' | 'contract' | 'pa_contract' | 'pa_refundagreement' | 'app' | 'attorney' | 'agreement') => {
       let selectedDocument: any;
       if (type === 'statement') {
         selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.code === '32');
@@ -376,11 +386,20 @@ export default defineComponent({
       if (type === 'attorney') {
         selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.code === '34');
       }
+      if (type === 'agreement') {
+        selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.code === '19');
+      }
       return selectedDocument;
     };
 
     const sendFiles = async () => {
-      if (dataStore.isPension ? scansFiles.value.length !== 1 : scansFiles.value.length !== 4) {
+      if (
+        dataStore.isPension
+          ? formStore.applicationData.statusCode === 'ContractSignedFrom'
+            ? scansFiles.value.length !== 1
+            : scansFiles.value.length !== 2
+          : scansFiles.value.length !== 4
+      ) {
         dataStore.showToaster('warning', dataStore.t('toaster.notAllDocumentsAttached'));
         return;
       }
@@ -542,44 +561,39 @@ export default defineComponent({
       return true;
     });
     const isElectronicDisabled = computed(() => {
-      if (dataStore.isGons) {
+      if (dataStore.isGons || dataStore.isLifeBusiness || dataStore.isGns || dataStore.isPension) {
         return true;
       }
-      if (formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson') {
-        return true;
-      }
-      if (needsAgreement.value) {
-        if (!consentGiven.value && dataStore.isPension) {
-          return true;
-        }
-      }
       return false;
     });
     const isScansDisabled = computed(() => {
       if (dataStore.isGons) {
         return true;
       }
-      if (needsAgreement.value) {
-        if (!consentGiven.value && dataStore.isPension && formStore.applicationData.statusCode !== 'ContractSignedFrom') {
-          return true;
-        }
+      if (!consentGiven.value && dataStore.isPension) {
+        return true;
       }
       return false;
     });
     const isQrDisabled = computed(() => {
-      if (needsAgreement.value) {
-        if (!consentGiven.value && dataStore.isPension) {
-          return true;
-        }
-      }
-      if (dataStore.isLifeBusiness || dataStore.isGns) {
-        return false;
+      if (dataStore.isPension) {
+        return !!needsAgreement.value && !consentGiven.value;
       }
       return true;
     });
     const isQrXmlDisabled = computed(() => {
-      if (consentGiven.value && needsAgreement.value) {
-        return false;
+      if (dataStore.isPension) {
+        if (consentGiven.value && needsAgreement.value) {
+          return false;
+        }
+      }
+      return true;
+    });
+    const isSignatureDisabled = computed(() => {
+      if (dataStore.isPension) {
+        if (!consentGiven.value) {
+          return false;
+        }
       }
       return true;
     });
@@ -654,7 +668,7 @@ export default defineComponent({
     };
 
     const startConnection = async (uuid: string, groupId?: string) => {
-      connection.value = new HubConnectionBuilder().withUrl(`https://test-sign.halyklife.kz/qrhub/${uuid}`).withAutomaticReconnect().build();
+      connection.value = new HubConnectionBuilder().withUrl(`${getStrValuePerEnv('qrHubUrl')}/${uuid}`).withAutomaticReconnect().build();
       try {
         await connection.value.start();
         console.log('SignalR connection started.');
@@ -671,7 +685,7 @@ export default defineComponent({
             await stopConnection();
           } else {
             console.log('message from SignalR', message);
-            if (message.signed) {
+            if (message.signed === true) {
               isQrLoading.value = false;
               qrUrl.value = '';
               isQr.value = false;
@@ -690,6 +704,10 @@ export default defineComponent({
                 dataStore.showToaster('success', dataStore.t('pension.consentGiven'), 3000);
               }
               await stopConnection();
+            } else {
+              if (message.error) {
+                dataStore.showToaster('error', message.error, 3000);
+              }
             }
           }
         });
@@ -831,6 +849,7 @@ export default defineComponent({
       isScansDisabled,
       isQrDisabled,
       isQrXmlDisabled,
+      isSignatureDisabled,
       choosePayActions,
       consentGiven,
       needsAgreement,

package/composables/classes.ts

@@ -1590,6 +1590,11 @@ export class PhysGroupClass extends BaseGroupClass {
   placeOfBirth: Value;
   workDetails: { workplace: string; position: string; jobDuties: string };
   hasContactPerson: boolean;
+  authorityDetails: {
+    basis: Value;
+    documentNumber: string | null;
+    date: string | null;
+  };
   constructor() {
     super();
     this.lastName = '';
@@ -1600,16 +1605,17 @@ export class PhysGroupClass extends BaseGroupClass {
     this.placeOfBirth = new Value();
     this.workDetails = { workplace: '', position: '', jobDuties: '' };
     this.hasContactPerson = false;
+    this.authorityDetails = {
+      basis: new Value(),
+      documentNumber: null,
+      date: null,
+    };
   }
 }
 
 export class GroupMember extends PhysGroupClass {
   isLeader: boolean;
-  authorityDetails: {
-    basis: Value;
-    documentNumber: string | null;
-    date: string | null;
-  };
+
   typeOfEconomicActivity: Value;
   activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
   beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
@@ -1619,11 +1625,6 @@ export class GroupMember extends PhysGroupClass {
     super();
     // Client
     this.isLeader = false;
-    this.authorityDetails = {
-      basis: new Value(),
-      documentNumber: null,
-      date: null,
-    };
     this.typeOfEconomicActivity = new Value();
     this.activityTypes = [];
     this.beneficalOwnerQuest = [

package/composables/constants.ts

@@ -17,6 +17,7 @@ export const constants = Object.freeze({
     amuletlife: 15,
     gns: 16,
     prepensionannuity: 18,
+    pensionannuitynew: 19,
   },
   amlProducts: {
     checkcontragent: 1,
@@ -25,37 +26,44 @@ export const constants = Object.freeze({
   extractedProducts: ['dso', 'uu'],
   editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm, Statuses.InputDataForm],
   documentsLinkVisibleStatuses: [
-    Statuses.DocumentsSignedFrom,
-    Statuses.DocumentsSignedClientFrom,
+    Statuses.Completed,
     Statuses.UnderwriterForm,
+    Statuses.DocumentsSignedFrom,
     Statuses.AffilationResolutionForm,
-    Statuses.Completed,
+    Statuses.DocumentsSignedClientFrom,
     Statuses.InsurancePremiumOnlinePaid,
   ],
   returnStatementStatuses: [
-    Statuses.DocumentsSignedFrom,
-    Statuses.DocumentsSignedClientFrom,
-    Statuses.ContractSignedFrom,
-    Statuses.WaitingInsurancePremiumForm,
-    Statuses.UnderwriterForm,
     Statuses.ApproveForm,
     Statuses.ActuaryForm,
-    Statuses.ControllerDpForm,
     Statuses.DsoUsnsForm,
     Statuses.AccountantForm,
+    Statuses.UnderwriterForm,
+    Statuses.ControllerDpForm,
+    Statuses.ContractSignedFrom,
+    Statuses.DocumentsSignedFrom,
+    Statuses.DocumentsSignedClientFrom,
+    Statuses.WaitingInsurancePremiumForm,
   ],
   cancelApplicationStatuses: [
-    Statuses.StartForm,
     Statuses.EditForm,
+    Statuses.StartForm,
+    Statuses.ContractSignedFrom,
     Statuses.EditBeneficiaryForm,
-    Statuses.WaitingInsurancePremiumForm,
     Statuses.DocumentsSignedFrom,
+    Statuses.AttachAppContractForm,
+    Statuses.PreparationDossierForm,
     Statuses.DocumentsSignedClientFrom,
+    Statuses.WaitingInsurancePremiumForm,
+  ],
+  rejectApplicationStatuses: [
+    Statuses.StartForm,
+    Statuses.DsoUsnsForm,
+    Statuses.AccountantForm,
+    Statuses.HeadManagerForm,
     Statuses.ContractSignedFrom,
     Statuses.AttachAppContractForm,
-    Statuses.PreparationDossierForm,
   ],
-  rejectApplicationStatuses: [Statuses.StartForm, Statuses.AttachAppContractForm, Statuses.DsoUsnsForm, Statuses.AccountantForm, Statuses.ContractSignedByAuthorizedPerson, Statuses.ContractSignedFrom],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],
   roles: Roles,
   actions: Actions,

package/composables/index.ts

@@ -341,6 +341,7 @@ export const getLastDayOfMonth = (year: number, month: number) => {
 };
 
 type WhichValuePerEnv =
+  | 'qrHubUrl'
   | 'qrGenUrl'
   | 'qrXmlGenUrl'
   | 'gatewayApiUrl'
@@ -358,6 +359,11 @@ export const getStrValuePerEnv = (which: WhichValuePerEnv) => {
       [key in EnvModes]: string;
     };
   } = {
+    qrHubUrl: {
+      production: 'https://prod-sign.halyklife.kz/qrhub',
+      development: 'https://test-sign.halyklife.kz/qrhub',
+      test: 'https://test-sign.halyklife.kz/qrhub',
+    },
     qrGenUrl: {
       production: 'https://prod-sign.halyklife.kz/EgovQrCms',
       development: 'https://test-sign.halyklife.kz/EgovQrCms',

package/locales/ru.json

@@ -218,6 +218,7 @@
     "fromKGD": "КГД",
     "generatePrintedForms": "Сформировать печатные формы",
     "downloadStatement": "Скачать заявление",
+    "downloadAgreement": "Скачать согласие",
     "downloadApplication": "Скачать приложение №1",
     "downloadPowerOfAttorney": "Скачать доверенность",
     "downloadPARefundStatement": "Скачать заявление на страхование возврат в ЕНПФ ПА",
@@ -445,7 +446,8 @@
     "dateCreated": "Дата начала",
     "factEndDate": "Дата завершения",
     "decision": "Статус",
-    "userFullName": "Исполнитель"
+    "userFullName": "Исполнитель",
+    "stage":"Этап"
   },
   "aml": {
     "contractSignDate": "Дата заключение контракта",
@@ -805,6 +807,7 @@
     "inDetails": "Подробно",
     "attachContract": "Вложить договор",
     "attachStatement": "Вложить заявление",
+    "attachAgreement": "Вложить согласие",
     "attachApplication": "Вложить приложение №1",
     "attachPowerOfAttorney": "Вложить доверенность",
     "noDocuments": "Нет документов для просмотра",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.52",
+  "version": "0.0.9-beta.54",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -28,8 +28,8 @@
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calc && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd halykkazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd gns && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuity && yarn typecheck && cd .. && cd prepensionannuity && yarn typecheck && cd .. && cd core",
-    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calc && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd halykkazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd gns && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuity && yarn && cd .. && cd prepensionannuity && yarn && cd .. && cd core",
+    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calc && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd halykkazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd gns && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuitynew && yarn typecheck && cd .. && cd prepensionannuity && yarn typecheck && cd .. && cd core",
+    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calc && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd halykkazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd gns && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuitynew && yarn && cd .. && cd prepensionannuity && yarn && cd .. && cd core",
     "update:core": "git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main",
     "update:aml": "cd ../../aml/aml && yarn && cd ../checkcontract && yarn && cd ../checkcontragent && yarn && cd.. && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd ../efo/core",
     "update:lka": "cd .. && cd lka && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",

package/store/data.store.ts

@@ -51,7 +51,7 @@ export const useDataStore = defineStore('data', {
     isGons: state => state.product === 'gons',
     isKazyna: state => state.product === 'halykkazyna',
     isDas: state => state.product === 'daskamkorlyk',
-    isPension: state => state.product === 'pensionannuity',
+    isPension: state => state.product === 'pensionannuitynew',
     isAmulet: state => state.product === 'amuletlife',
     isGns: state => state.product === 'gns',
     isCalculator: state => state.product === 'calculator',
@@ -256,6 +256,12 @@ export const useDataStore = defineStore('data', {
     isAdjuster() {
       return this.isRole(constants.roles.Adjuster);
     },
+    isDsoDirector() {
+      return this.isRole(constants.roles.DsoDirector);
+    },
+    isAccountantDirector() {
+      return this.isRole(constants.roles.AccountantDirector);
+    },
     isProcessEditable(statusCode?: keyof typeof Statuses) {
       const getEditibleStatuses = () => {
         const defaultStatuses = constants.editableStatuses;
@@ -1618,8 +1624,8 @@ export const useDataStore = defineStore('data', {
           delete query.processCodes;
           query.processCode = byOneProcess;
         }
-        if (byOneProcess === 1) {
-          query.processCodes = [1, 2, 4];
+        if (byOneProcess === 19) {
+          query.processCodes = [19, 2, 4];
           delete query.processCode;
         }
         const taskList = await this.api.getTaskList(
@@ -2511,7 +2517,7 @@ export const useDataStore = defineStore('data', {
                 return [
                   {
                     processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                    name: this.processCode == 1 ? 'PA_Statement' : 'PA_RefundStatement',
+                    name: this.processCode == 19 ? 'PA_Statement' : 'PA_RefundStatement',
                     format: 'pdf',
                   },
                   {
@@ -2521,7 +2527,7 @@ export const useDataStore = defineStore('data', {
                   },
                 ];
               }
-            case 'ContractSignedByAuthorizedPerson':
+            case 'HeadManagerForm':
               return [
                 {
                   processInstanceId: String(this.formStore.applicationData.processInstanceId),
@@ -2531,6 +2537,11 @@ export const useDataStore = defineStore('data', {
               ];
             default:
               return [
+                {
+                  processInstanceId: String(this.formStore.applicationData.processInstanceId),
+                  name: 'Agreement',
+                  format: 'pdf',
+                },
                 {
                   processInstanceId: String(this.formStore.applicationData.processInstanceId),
                   name: 'Statement',
@@ -2548,19 +2559,20 @@ export const useDataStore = defineStore('data', {
           return signData;
         } else if (type === 'signature') {
           const ncaLayerClient = new NCALayerClient();
+          const formTemplate = new FormData();
+          formTemplate.append('format', 'pdf');
+          formTemplate.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
           let activeTokens;
           try {
             await ncaLayerClient.connect();
             activeTokens = await ncaLayerClient.getActiveTokens();
             const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
-            if (this.formStore.applicationData.statusCode === 'ContractSignedByAuthorizedPerson') {
+            if (this.formStore.applicationData.statusCode === 'HeadManagerForm') {
               const document = await this.generatePDFDocument('PAEnpf_Agreement', '40', 'pdf');
               const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-              const formData = new FormData();
+              const formData = formTemplate;
               formData.append('base64EncodedSignature', base64EncodedSignature);
-              formData.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
               formData.append('name', 'PAEnpf_Agreement');
-              formData.append('format', 'pdf');
               try {
                 await this.api.uploadDigitalCertifijcate(formData);
                 await this.handleTask('accept', String(this.formStore.applicationTaskId));
@@ -2571,11 +2583,9 @@ export const useDataStore = defineStore('data', {
             } else if (this.formStore.applicationData.statusCode === 'ContractSignedFrom') {
               const document = await this.generatePDFDocument('PA_Contract', '38', 'pdf');
               const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-              const formData = new FormData();
+              const formData = formTemplate;
               formData.append('base64EncodedSignature', base64EncodedSignature);
-              formData.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
               formData.append('name', 'PA_Contract');
-              formData.append('format', 'pdf');
               try {
                 await this.api.uploadDigitalCertifijcate(formData);
                 await this.handleTask('accept', String(this.formStore.applicationTaskId));
@@ -2584,31 +2594,48 @@ export const useDataStore = defineStore('data', {
                 return;
               }
             } else {
-              const agreementXml = await this.getDocument(this.formStore.applicationData.processInstanceId as string);
-              const wnd = window.open('about:blank', '', '_blank');
-              wnd?.document.write(agreementXml as any);
-              const signedAgreement = await ncaLayerClient.signXml(storageType, agreementXml, 'SIGNATURE', '');
-              const document = {
-                processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                name: 'PAEnpf_Agreement',
-                format: 'xml',
-              };
-              const signData = await this.api.signXml([document]);
-              const data = new FormData();
-              data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
-              data.append('xmlData', signedAgreement);
-              data.append('name', 'PAEnpf_Agreement');
-              data.append('format', 'xml');
-              data.append('EdsXmlId', signData.data);
-              await this.api.uploadXml(data);
-              await this.getSignedDocList(this.formStore.applicationData.processInstanceId);
+              if (!!this.formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed) {
+                const statement = await this.generatePDFDocument('PA_Statement', '37', 'pdf');
+                const statementSignature = await ncaLayerClient.basicsSignCMS(storageType, statement, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
+                const statementData = formTemplate;
+                statementData.append('base64EncodedSignature', statementSignature);
+                statementData.append('name', 'PA_Statement');
+                await this.api.uploadDigitalCertifijcate(statementData);
+                const agreement = await this.generatePDFDocument('Agreement', '19', 'pdf');
+                const agreementSignature = await ncaLayerClient.basicsSignCMS(storageType, agreement, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
+                const agreementData = formTemplate;
+                agreementData.append('base64EncodedSignature', agreementSignature);
+                agreementData.append('name', 'Agreement');
+                await this.api.uploadDigitalCertifijcate(agreementData);
+                await this.handleTask('accept', String(this.formStore.applicationTaskId));
+              } else {
+                const document = {
+                  processInstanceId: String(this.formStore.applicationData.processInstanceId),
+                  name: 'PAEnpf_Agreement',
+                  format: 'xml',
+                };
+                const signData = await this.api.signXml([document]);
+                const agreementXml = await this.api.getDocumentsByEdsXmlId(signData.data);
+                const wnd = window.open('about:blank', '', '_blank');
+                wnd?.document.write(agreementXml.data.document.documentXml);
+                const signedAgreement = await ncaLayerClient.signXml(storageType, agreementXml.data.document.documentXml, 'SIGNATURE', '');
+                const data = new FormData();
+                data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
+                data.append('xmlData', signedAgreement);
+                data.append('name', 'PAEnpf_Agreement');
+                data.append('format', 'xml');
+                data.append('EdsXmlId', signData.data);
+                await this.api.uploadXml(data);
+                await this.getSignedDocList(this.formStore.applicationData.processInstanceId);
+                this.showToaster('success', this.t('pension.consentGiven'), 3000);
+              }
             }
           } catch (error) {
             this.showToaster('error', String(error));
             return;
           }
         } else {
-          if (this.processCode === 1 || this.processCode === 2 || this.processCode === 3) {
+          if (this.processCode === 19 || this.processCode === 2 || this.processCode === 4) {
             const result = await this.api.signBts(data);
             if (result.code === 0) this.formStore.signUrls = result.data;
           } else {
@@ -2642,7 +2669,7 @@ export const useDataStore = defineStore('data', {
             link.setAttribute('download', 'Договор страхования.pdf');
             break;
           case constants.documentTypes.application1:
-            link.setAttribute('download', 'Приложение №1.xls');
+            link.setAttribute('download', 'Приложение №1.pdf');
             break;
           case constants.documentTypes.questionnaireInsured:
             link.setAttribute('download', 'Анкета Застрахованного.docx');
@@ -3383,7 +3410,6 @@ export const useDataStore = defineStore('data', {
     },
     async startApplicationV2(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
-      if (!policyholder.clientData.iin) return false;
       this.preparePersonData(policyholder);
       keyDeleter(policyholder as PolicyholderClass, [
         'clientData.beneficalOwnerQuest',
@@ -3460,7 +3486,7 @@ export const useDataStore = defineStore('data', {
         this.formStore.lfb.policyholder.clientData.iin = reformatIin(clientData.iin);
         this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
-        this.formStore.lfb.policyholder.clientData.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
+        this.formStore.lfb.policyholder.clientData.authoritedPerson.authorityDetails.date = reformatDate(clientData.authoritedPerson.authorityDetails.date);
         this.formStore.lfb.policyholder.clientData.authoritedPerson.birthDate = reformatDate(clientData.authoritedPerson.birthDate) ?? '';
         this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.issuedOn = reformatDate(clientData.authoritedPerson.identityDocument.issuedOn) ?? '';
         this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.validUntil = reformatDate(clientData.authoritedPerson.identityDocument.validUntil) ?? '';
@@ -3493,8 +3519,8 @@ export const useDataStore = defineStore('data', {
         if (accidentIncidents && accidentIncidents.length) {
           this.formStore.lfb.accidentIncidents = accidentIncidents;
           this.formStore.lfb.accidentIncidents.forEach(incident => {
-            incident.amount = incident.amount === 0 ? null : incident.amount;
-            incident.count = incident.count === 0 ? null : incident.count;
+            incident.amount = incident.amount === 0 ? '' : incident.amount;
+            incident.count = incident.count === 0 ? '' : incident.count;
           });
         }
 
@@ -3521,7 +3547,12 @@ export const useDataStore = defineStore('data', {
     },
     async saveAccidentIncidents(data: AccidentIncidents[]) {
       try {
-        const response = await this.api.saveAccidentIncidents(this.formStore.applicationData.processInstanceId, data);
+        const dataCopy = JSON.parse(JSON.stringify(data));
+        for (const incident of dataCopy) {
+          incident.count = !!incident.count ? incident.count : 0;
+          incident.amount = incident.amount ? incident.amount : 0;
+        }
+        const response = await this.api.saveAccidentIncidents(this.formStore.applicationData.processInstanceId, dataCopy);
         return response;
       } catch (err) {
         return ErrorHandler(err);
@@ -3610,6 +3641,7 @@ export const useDataStore = defineStore('data', {
           iin: reformatIin(client.iin),
           insSum: client.insuredPolicyData.insSum,
           premium: client.insuredPolicyData.premium,
+          premiumWithLoad: client.insuredPolicyData.premiumWithLoad,
           hasAttachedFile: client.hasAttachedFile,
         };
       });
@@ -3744,14 +3776,6 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async getDocument(id: string) {
-      try {
-        const response = await this.api.getDocument(id);
-        return response;
-      } catch (err) {
-        return ErrorHandler(err);
-      }
-    },
     async generateShortLink(url: string) {
       try {
         const response = await this.api.generateShortLink({
@@ -3863,7 +3887,9 @@ export const useDataStore = defineStore('data', {
           this.isBranchDirector() ||
           this.isUSNSACCINS() ||
           this.isDsuio() ||
-          this.isAdjuster(),
+          this.isAdjuster() ||
+          this.isDsoDirector() ||
+          this.isAccountantDirector(),
       };
     },
   },

package/types/enum.ts

@@ -95,6 +95,8 @@ export enum Roles {
   USNSACCINS = 'USNSACCINS',
   Dsuio = 'Dsuio',
   Adjuster = 'Adjuster',
+  DsoDirector = 'DsoDirector',
+  AccountantDirector = 'AccountantDirector',
 }
 
 export enum Statuses {
@@ -119,7 +121,7 @@ export enum Statuses {
   ActuaryForm = 'ActuaryForm',
   DsoUsnsForm = 'DsoUsnsForm',
   AccountantForm = 'AccountantForm',
-  ContractSignedByAuthorizedPerson = 'ContractSignedByAuthorizedPerson',
+  HeadManagerForm = 'HeadManagerForm',
 }
 
 export enum MemberCodes {

package/types/index.ts

@@ -25,7 +25,7 @@ declare global {
     | 'daskamkorlyk'
     | 'amuletlife'
     | 'gns'
-    | 'pensionannuity'
+    | 'pensionannuitynew'
     | 'dso'
     | 'uu'
     | 'auletti'
@@ -291,6 +291,7 @@ declare global {
     birthDate: string;
     insSum: number;
     premium?: number;
+    premiumWithLoad?: number;
     position?: string;
     lifeMultiply?: number;
     lifeAdditive?: number;
@@ -715,8 +716,8 @@ declare global {
     coverTypeId: string | null;
     coverTypeName: string | null;
     coverTypeCode: number | null;
-    count: number | null;
-    amount: number | null;
+    count: number | string;
+    amount: number | string;
     shortDescription: string | null;
   };
 
@@ -754,4 +755,11 @@ declare global {
   };
 
   type ResponseStructure<T> = { code: 0; message: 'OK'; data: T };
+
+  type SignedState = {
+    isOnline: boolean;
+    signValue: number;
+    signName: string;
+    code: string;
+  };
 }