hl-core 0.0.10-beta.50 → 0.0.10-beta.51

package/api/base.api.ts

@@ -285,6 +285,13 @@ export class ApiClass {
     });
   }
 
+  async getProcessDividendPeriods(processCode: string | number) {
+    return await this.axiosCall<Value[]>({
+      method: Methods.GET,
+      url: `/Arm/api/Dictionary/ProcessDividendPeriod/${processCode}`,
+    });
+  }
+
   async getContragentById(id: number) {
     return await this.axiosCall<Types.GetContragentResponse>({
       method: Methods.GET,
@@ -705,10 +712,10 @@ export class ApiClass {
     });
   }
 
-  async getContractIdByNumber(insuranceTypeEnum: number, policyNo: string) {
+  async getGlobalIdByNumber(insuranceTypeEnum: number, policyNo: string) {
     return await this.axiosCall<number>({
       method: Methods.GET,
-      url: `/Ekk/api/PolicyInsis/GetContractIDbyNumber`,
+      url: `/Ekk/api/PolicyInsis/GetGlobalIDbyNumber`,
       params: {
         insuranceTypeEnum,
         policyNo,
@@ -1132,6 +1139,17 @@ export class ApiClass {
         data: data,
       });
     },
+    getDividendSchedule: async (processInstanceId: string | number) => {
+      return await this.axiosCall<{
+        scheduleDividend: Value[] | null;
+        scheduleDividend2: Value[] | null;
+      }>({
+        method: Methods.GET,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/GetDividendSchedule`,
+        params: { processInstanceId: processInstanceId },
+      });
+    },
   };
 
   externalServices = {

package/components/Dialog/FamilyDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-list lines="two" v-if="formStore.birthInfos && formStore.birthInfos.length" class="w-full !py-0">
+  <v-list lines="two" v-if="(formStore.birthInfos && formStore.birthInfos.length) || $dataStore.isGons" class="w-full !py-0">
     <v-list-item
       @click="$emit('reset')"
       :append-icon="selected && Object.keys(selected).length === 0 ? `mdi-radiobox-marked ${$styles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
@@ -10,7 +10,11 @@
       v-for="familyMember of formStore.birthInfos"
       :key="familyMember.childIIN"
       @click="$emit('selectFamilyMember', familyMember)"
-      :append-icon="familyMember && selected && selected.childIIN === familyMember.childIIN ? `mdi-radiobox-marked ${$styles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
+      :append-icon="
+        familyMember && selected && typeof selected === 'object' && selected.childIIN === familyMember.childIIN
+          ? `mdi-radiobox-marked ${$styles.greenText}`
+          : 'mdi-radiobox-blank text-[#636363]'
+      "
     >
       <v-list-item-title :class="[$styles.greenText, $styles.textTitle]">{{
         `${familyMember.childSurName} ${familyMember.childName} ${familyMember.childPatronymic ? familyMember.childPatronymic : ''}`
@@ -20,6 +24,13 @@
         >{{ ` ${$reformatIin(familyMember.childIIN!)}` }}</v-list-item-subtitle
       >
     </v-list-item>
+    <v-list-item
+      v-if="$dataStore.isGons"
+      @click="$emit('addChild')"
+      :append-icon="selected && selected === $dataStore.t('form.addBeneficiary') ? `mdi-radiobox-marked ${$styles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
+    >
+      <v-list-item-title :class="[$styles.greenText, $styles.textTitle]">{{ $dataStore.t('form.addBeneficiary') }}</v-list-item-title>
+    </v-list-item>
   </v-list>
   <base-list-empty class="w-full" v-else />
 </template>
@@ -30,10 +41,10 @@ import type { Api } from '../../types';
 export default defineComponent({
   props: {
     selected: {
-      type: Object as PropType<Api.GKB.BirthInfo>,
+      type: [Object, String] as PropType<Api.GKB.BirthInfo | string>,
     },
   },
-  emits: ['selectFamilyMember', 'reset'],
+  emits: ['selectFamilyMember', 'reset', 'addChild'],
   setup() {
     const formStore = useFormStore();
     return {

package/components/Pages/Documents.vue

@@ -125,6 +125,15 @@
             :loading="$dataStore.isLoading"
             @input="uploadAdditionalFile($event, '50', member.iin)"
           />
+          <base-file-input
+            v-if="
+              formStore.signedDocumentList.filter(i => i.fileTypeCode === '29' && i.iin === String(member.iin).replaceAll('-', '')).length !==
+              formStore.requiredDocuments.filter(i => i.code === '29' && i.iin === String(member.iin).replaceAll('-', '')).length
+            "
+            :label="$dataStore.t('pension.KSJagreement')"
+            :loading="$dataStore.isLoading"
+            @input.prevent="uploadAdditionalFile($event, '29', member.iin)"
+          />
         </base-form-section>
       </div>
     </section>
@@ -300,7 +309,7 @@ export default defineComponent({
     const documentType = ref<DigitalDocNames | null>(null);
     const otpCode = ref<string>('');
     const currentIin = ref<string>('');
-    const deleteFilesId = ['1', '2', '4', '46'];
+    const deleteFilesId = ['1', '2', '3', '4', '46'];
     const documentItems: Array<{ title: DigitalDocNames; value: DigitalDocTypes }> = [
       { title: 'Удостоверение личности', value: 'IdentityCard' },
       { title: 'Паспорт', value: 'Passport' },
@@ -377,7 +386,7 @@ export default defineComponent({
     const insuredFiltered = computed(() => formStore.insuredForm.filter(i => i.iin !== formStore.policyholderForm.iin) as Base.Document.Digital[]);
     const beneficiaryFiltered = computed(() => formStore.beneficiaryForm.filter(i => i.iin !== formStore.policyholderForm.iin) as Base.Document.Digital[]);
     const slaveInsuredForm = computed(() => formStore.slaveInsuredForm as Base.Document.Digital);
-    const documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2', '4'].includes(String(i.fileTypeCode))));
+    const documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2', '3', '4'].includes(String(i.fileTypeCode))));
     const jointMembers = ref<Member[]>([formStore.insuredForm[0]]);
 
     const openPanel = async (document: DocumentItem) => {
@@ -499,7 +508,13 @@ export default defineComponent({
         dataStore.rightPanel.open = false;
         dataStore.panelAction = null;
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
-        if (hasDigitalDocuments.value && (currentDocument.value.fileTypeCode === '1' || currentDocument.value.fileTypeCode === '2' || currentDocument.value.fileTypeCode === '4')) {
+        if (
+          hasDigitalDocuments.value &&
+          (currentDocument.value.fileTypeCode === '1' ||
+            currentDocument.value.fileTypeCode === '2' ||
+            currentDocument.value.fileTypeCode === '3' ||
+            currentDocument.value.fileTypeCode === '4')
+        ) {
           getDigitalDocs();
         }
       }
@@ -545,7 +560,8 @@ export default defineComponent({
       let commonDocs: IDocument[] = [];
       for (let member of members) {
         const matchingDoc = formStore.signedDocumentList.find(
-          doc => doc.iin === String(member.iin).replaceAll('-', '') && (doc.fileTypeCode === '1' || doc.fileTypeCode === '2' || doc.fileTypeCode === '4'),
+          doc =>
+            doc.iin === String(member.iin).replaceAll('-', '') && (doc.fileTypeCode === '1' || doc.fileTypeCode === '2' || doc.fileTypeCode === '3' || doc.fileTypeCode === '4'),
         );
         if (matchingDoc) commonDocs.push(matchingDoc);
       }

package/components/Pages/MemberForm.vue

@@ -64,6 +64,16 @@
           :title="$dataStore.t('isInsuredUnderage')"
           :has-border="false"
         />
+        <base-panel-input
+          v-if="whichForm === formStore.beneficiaryFormKey && $dataStore.isGons"
+          v-model="member.chooseChild"
+          :value="member.chooseChild"
+          :label="$dataStore.t('form.chooseChild')"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="searchMember($dataStore.t('form.chooseChild'))"
+        />
         <base-form-input
           v-model="member.phoneNumber"
           :label="$dataStore.t('form.phoneNumber')"
@@ -166,8 +176,8 @@
         <base-panel-input
           v-model="member.gender"
           :value="member.gender?.nameRu"
-          :readonly="isDisabled || isDataFromGov"
-          :clearable="!isDisabled && !isDataFromGov"
+          :readonly="isDisabled || isDataFromGov || !isChooseChild"
+          :clearable="(!isDisabled && !isDataFromGov) || !!isChooseChild"
           :label="$dataStore.t('form.gender')"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -188,12 +198,12 @@
           v-if="hasRelationDegree"
           v-model="member.relationDegree"
           :value="member.relationDegree?.nameRu"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !isChooseChild"
+          :clearable="!isDisabled || !!isChooseChild"
           :label="$dataStore.t('form.relations')"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
-          @append="openPanel($dataStore.t('form.relations'), [], 'relationDegree', $dataStore.getRelationTypes)"
+          @append="openPanel($dataStore.t('form.relations'), filteredRelationsData, 'relationDegree')"
         />
         <base-form-input
           v-if="whichForm === formStore.beneficiaryFormKey"
@@ -769,7 +779,7 @@
     />
     <base-dialog v-model="familyDialog" :subtitle="$dataStore.t('dialog.familyMember')" :icon="{ mdi: 'hand-pointing-up' }" actions="familyDialog">
       <template #actions>
-        <base-family-dialog :selected="selectedFamilyMember" @selectFamilyMember="selectFamilyMember" @reset="closeFamilyDialog(true)" />
+        <base-family-dialog :selected="selectedFamilyMember" @selectFamilyMember="selectFamilyMember" @reset="closeFamilyDialog(true)" @addChild="addChild" />
       </template>
     </base-dialog>
     <base-dialog v-model="documentChooseDialog" :subtitle="$dataStore.t('labels.chooseDoc')" :icon="{ mdi: 'file-document-outline' }" actions="documentChooseDialog">
@@ -831,7 +841,7 @@ export default {
     const getMember = (whichForm: keyof typeof StoreMembers | 'slaveInsuredForm', whichIndex?: string) =>
       memberStore.getMemberFromStore(whichForm, Number((whichIndex ? whichIndex : '0') as string))!;
     const member = ref(getMember(whichForm.value, whichIndex.value));
-    const selectedFamilyMember = ref<Api.GKB.BirthInfo>({});
+    const selectedFamilyMember = ref<Api.GKB.BirthInfo | string>({});
     const isPanelOpen = ref<boolean>(false);
     const memberDocument = ref<DocumentItem>();
     const isButtonLoading = ref<boolean>(false);
@@ -862,13 +872,17 @@ export default {
     const isRelative = ref<boolean>(false);
     const additionalDocuments = ref<any[]>([]);
     const contragents = ref<ContragentType[]>([]);
-
+    const filteredRelationsData = ref<Value[]>(dataStore.relations);
     const currentPanelDeep = ref<string>();
     const currentPanelSubDeep = ref<string>();
-
     const memberSetting = computed(() => dataStore.members[memberStore.getMemberApplicationCode(whichForm.value)!]);
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value));
+    const isChooseChild = computed(() => {
+      if (dataStore.isGons) return member.value.chooseChild === dataStore.t('form.addBeneficiary');
+      return true;
+    });
+
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
     const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
     const gbdDocuments = computed(() => {
@@ -1104,10 +1118,10 @@ export default {
       return getOtpConditionByMember();
     });
 
-    const searchMember = async () => {
+    const searchMember = async (title: string = hasDocumentReader.value ? 'Получение данных со скана документа' : 'Поиск контрагента') => {
       if (!isDisabled.value) {
         dataStore.panelAction = null;
-        dataStore.rightPanel.title = hasDocumentReader.value ? 'Получение данных со скана документа' : 'Поиск контрагента';
+        dataStore.rightPanel.title = title;
         dataStore.rightPanel.open = true;
         isSearchOpen.value = true;
         isDocumentOpen.value = false;
@@ -1431,6 +1445,9 @@ export default {
         if (formStore.birthInfos.length !== 0) {
           familyDialog.value = true;
         }
+        if (formStore.birthInfos.length === 0 && dataStore.isGons) {
+          familyDialog.value = true;
+        }
       } else {
         familyDialog.value = true;
       }
@@ -1446,10 +1463,23 @@ export default {
       isButtonLoading.value = false;
       dataStore.rightPanel.open = false;
       isSearchOpen.value = false;
+      if (dataStore.isGons) {
+        member.value.chooseChild = '';
+      }
+    };
+
+    const addChild = () => {
+      member.value.resetMember();
+      familyDialog.value = false;
+      selectedFamilyMember.value = dataStore.t('form.addBeneficiary');
+      isButtonLoading.value = false;
+      dataStore.rightPanel.open = false;
+      isSearchOpen.value = false;
+      member.value.chooseChild = dataStore.t('form.addBeneficiary');
     };
 
     const selectFamilyMember = (familyMember: Api.GKB.BirthInfo) => {
-      if (selectedFamilyMember.value && selectedFamilyMember.value.childIIN === familyMember.childIIN) {
+      if (selectedFamilyMember.value && typeof selectedFamilyMember.value === 'object' && selectedFamilyMember.value.childIIN === familyMember.childIIN) {
         selectedFamilyMember.value = {};
       } else {
         selectedFamilyMember.value = familyMember;
@@ -1458,6 +1488,19 @@ export default {
         member.value.lastName = selectedFamilyMember.value.childSurName!;
         member.value.middleName = selectedFamilyMember.value.childPatronymic ?? '';
         member.value.birthDate = reformatDate(selectedFamilyMember.value.childBirthDate!);
+        member.value.gender = dataStore.gender.find(i => {
+          if (typeof selectedFamilyMember.value === 'object') {
+            return i.id === selectedFamilyMember.value.childGender;
+          }
+        })!;
+        member.value.relationDegree = dataStore.relations.find(i => {
+          if (typeof selectedFamilyMember.value === 'object') {
+            return selectedFamilyMember.value.childGender === 1 ? i.nameRu === 'Сын' : i.nameRu === 'Дочь';
+          }
+        })!;
+        if (dataStore.isGons) {
+          member.value.chooseChild = `${selectedFamilyMember.value.childSurName} ${selectedFamilyMember.value.childName} ${selectedFamilyMember.value.childPatronymic ? selectedFamilyMember.value.childPatronymic : ''}`;
+        }
       }
       familyDialog.value = false;
       isButtonLoading.value = false;
@@ -2029,6 +2072,22 @@ export default {
       },
     );
 
+    if (dataStore.isGons) {
+      watch(
+        () => member.value.chooseChild,
+        val => {
+          if (val === dataStore.t('form.addBeneficiary')) {
+            const idsToFind = ['14', '15', '21', '20', '24', '25', '27'];
+            const filteredData = dataStore.relations.filter(item => idsToFind.includes(item.ids as string));
+            filteredRelationsData.value = filteredData;
+          } else {
+            filteredRelationsData.value = dataStore.relations;
+          }
+        },
+        { immediate: true },
+      );
+    }
+
     watch(
       () => member.value.registrationProvince,
       (val, oldVal) => {
@@ -2175,6 +2234,8 @@ export default {
       isRelative,
       imageDataList,
       contragents,
+      filteredRelationsData,
+
       // Computed
       whichForm,
       whichIndex,
@@ -2202,6 +2263,7 @@ export default {
       hasGBDFLDocSelection,
       isNonResident,
       isDataFromGov,
+      isChooseChild,
 
       // Rules
       ageRule,
@@ -2210,6 +2272,7 @@ export default {
       birthDateRule,
 
       // Functions
+      addChild,
       searchMember,
       openPanel,
       openCustomPanel,

package/components/Pages/ProductConditions.vue

@@ -466,14 +466,15 @@
                 :readonly="isDisabled"
                 :clearable="!isDisabled"
                 :max-date="formatDate(transferMaxDate) ?? undefined"
-                :rules="$dataStore.rules.required.concat($dataStore.rules.birthDate)"
+                :rules="$dataStore.rules.required.concat(checkTransferContractDate)"
                 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.transferContractNumber" :label="$dataStore.t('pension.globalId')" :readonly="isDisabled" :clearable="!isDisabled"
             <base-form-input
               v-model="contract.transferContractRegNumber"
               :label="$dataStore.t('pension.transferRegNumber')"
@@ -481,6 +482,7 @@
               :readonly="isDisabled"
               :clearable="!isDisabled"
             />
+            -->
             <base-form-input
               v-model="contract.transferContractFirstPaymentDate"
               :maska="$maska.date"
@@ -500,7 +502,22 @@
               @onClear="onClearPension('transferContractAmount', index)"
             />
             <base-form-toggle v-model="contract.transferContractIsOppv" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('pension.isOPPVTransfer')" />
-            <base-btn v-if="!isDisabled" :text="$dataStore.t('buttons.delete')" :disabled="isDisabled" size="sm" :btn="$styles.whiteBtn" @click="removeTransferContract(index)" />
+            <base-form-input
+              v-if="contract.transferContractIsOppv"
+              v-model="contract.transferContractMonthCount"
+              :disabled="$dataStore.isLoading"
+              :rules="$rules.required.concat($rules.notZero, $rules.numbers)"
+              :label="$dataStore.t('pension.compulsoryProfMonthCount')"
+            />
+            <base-btn
+              v-if="!isDisabled"
+              class="mt-3"
+              :text="$dataStore.t('buttons.delete')"
+              :disabled="isDisabled"
+              size="sm"
+              :btn="$styles.redBtn"
+              @click="removeTransferContract(index)"
+            />
           </section>
         </base-form-section>
         <base-form-section :title="$dataStore.t('pension.paymentTerms')">
@@ -519,7 +536,7 @@
           <base-form-input v-model="dateOfBegin" :maska="$maska.date" readonly :label="$dataStore.t('pension.paymentsDate')" append-inner-icon="mdi mdi-calendar-blank-outline" />
           <base-rounded-select
             v-model="pensionForm.guaranteedPeriod"
-            class="pension-guaranteed-period"
+            class="pension-round-toggle"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :rules="$rules.notZero"
@@ -527,6 +544,18 @@
             :items="guaranteedPeriodList"
             :hide-details="true"
           />
+          <base-rounded-select
+            v-if="dividendPeriods"
+            v-model="pensionForm.dividendId"
+            class="pension-round-toggle"
+            :readonly="isDisabled"
+            :rules="$rules.notZero"
+            :label="$dataStore.t('pension.dividendPeriod')"
+            item-title="nameRu"
+            item-value="id"
+            :items="dividendPeriods"
+            :hide-details="true"
+          />
           <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')" />
@@ -803,6 +832,40 @@
       </base-animation>
       <base-btn class="min-h-[60px]" :text="$dataStore.t('buttons.calcPremium')" type="submit" @click.prevent="underwriterCalculate('premium')" :loading="isCalculating" />
     </div>
+    <base-fade-transition>
+      <base-form-section :title="$dataStore.t('pension.dividendsGraph')" v-if="dividendSchedules.scheduleDividend" class="grid-table">
+        <div class="flex justify-between rounded-t-[8px] border-b-[1px]" :class="[$styles.blueBg, $styles.whiteText]">
+          <span class="h-full">#</span>
+          <span class="h-full">{{ $dataStore.t('pension.dividendDate') }}</span>
+          <span class="h-full grow">{{ $dataStore.t('pension.dividendAmount') }}</span>
+        </div>
+        <v-virtual-scroll :items="dividendSchedules.scheduleDividend" height="300">
+          <template v-slot:default="{ item, index }">
+            <div class="flex justify-between border-b-[1px]" :class="[$styles.whiteBg, $styles.textSimple, $styles.rounded]">
+              <span class="h-full">{{ index + 1 }}</span>
+              <span class="h-full">{{ reformatDate(item.date) }}</span>
+              <span class="h-full grow">{{ $dataStore.getNumberWithSpaces(item.amount) }}</span>
+            </div>
+          </template>
+        </v-virtual-scroll>
+      </base-form-section>
+      <base-form-section :title="$dataStore.t('pension.dividendsGraph') + ' 2'" v-if="dividendSchedules.scheduleDividend2" class="grid-table">
+        <div class="flex justify-between rounded-t-[8px] border-b-[1px]" :class="[$styles.blueBg, $styles.whiteText]">
+          <span class="h-full">#</span>
+          <span class="h-full">{{ $dataStore.t('pension.dividendDate') }}</span>
+          <span class="h-full grow">{{ $dataStore.t('pension.dividendAmount') }}</span>
+        </div>
+        <v-virtual-scroll :items="dividendSchedules.scheduleDividend2" height="300">
+          <template v-slot:default="{ item, index }">
+            <div class="flex justify-between border-b-[1px]" :class="[$styles.whiteBg, $styles.textSimple, $styles.rounded]">
+              <span class="h-full">{{ index + 1 }}</span>
+              <span class="h-full">{{ reformatDate(item.date) }}</span>
+              <span class="h-full grow">{{ $dataStore.getNumberWithSpaces(item.amount) }}</span>
+            </div>
+          </template>
+        </v-virtual-scroll>
+      </base-form-section>
+    </base-fade-transition>
     <Teleport v-if="isPanelOpen" to="#right-panel-actions">
       <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input v-model.trim="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
@@ -923,12 +986,37 @@ export default defineComponent({
     const additionalTerms = ref<AddCover[]>([]);
 
     const maxDate = ref<string | null>();
-    const transferMaxDate = ref();
     const dateOfBegin = ref();
     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 dividendPeriods = ref<Value[] | null>(null);
+
+    const dividendSchedules = ref(<
+      {
+        scheduleDividend: any[] | null;
+        scheduleDividend2: any[] | null;
+      }
+    >{
+      scheduleDividend: null,
+      scheduleDividend2: null,
+    });
+    const transferMaxDate = computed({
+      get() {
+        if (contractDate.value) {
+          var maxDate = structuredClone(formatDate(contractDate.value))!;
+          maxDate.setFullYear(maxDate.getFullYear() - 2);
+          maxDate.setDate(maxDate.getDate() + 1);
+          return reformatDate(String(maxDate))!;
+        } else {
+          return '';
+        }
+      },
+      set(newValue) {
+        return newValue;
+      },
+    });
     const isSlavePensionForm = computed(() => route.query.which === 'slave');
     const pensionForm = computedWithControl(
       () => formStore.pensionApp,
@@ -960,6 +1048,18 @@ export default defineComponent({
     const firstAmount = ref<boolean>(true);
     const isHalykBank = formStore.lfb.policyholder.clientData.iin.replace(/-/g, '') === '940140000385';
 
+    const checkTransferContractDate = (val: any) => {
+      if (val) {
+        if (new Date(formatDate(transferMaxDate.value)!.valueOf() - formatDate(val)!.valueOf()).getUTCFullYear() - 1970 < 0) {
+          return dataStore.t('rules.invalidtransferContractDate');
+        } else {
+          return true;
+        }
+      } else {
+        return true;
+      }
+    };
+
     const isShownAdditionalTerms = computed(() => {
       if (whichProduct.value === 'gons') {
         return false;
@@ -1836,6 +1936,7 @@ export default defineComponent({
 
     const addTransferContract = () => {
       transferContracts.value.push(new TransferContract());
+      transferContracts.value[transferContracts.value.length - 1].transferContractDate = transferMaxDate.value;
     };
 
     const removeTransferContract = (index: number) => {
@@ -1992,6 +2093,7 @@ export default defineComponent({
             }
             await dataStore.getApplicationData(String(route.params.taskId), false, false, false, true);
             dateOfBegin.value = reformatDate(formStore.applicationData.pensionApp.dateOfBegin);
+            dividendSchedules.value = await dataStore.getDividendSchedule();
           } else {
             if (whichSum.value === 'requestedSumInsured') {
               productConditionsForm.insurancePremiumPerMonth = null;
@@ -2208,6 +2310,10 @@ export default defineComponent({
           transferContractDate.value = reformatDate(pensionForm.value.transferContractDate);
           transferContractFirstPaymentDate.value = reformatDate(pensionForm.value.transferContractFirstPaymentDate ?? '');
           maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 19);
+          dividendPeriods.value = await dataStore.getProcessDividendPeriods();
+          if (pensionForm.value.dividendId) {
+            dividendSchedules.value = await dataStore.getDividendSchedule();
+          }
           if (!transferContracts.value.length && pensionForm.value.transferContracts && pensionForm.value.transferContracts.length) {
             pensionForm.value.transferContracts.forEach((contract: TransferContract) => {
               transferContracts.value.push({
@@ -2372,15 +2478,12 @@ export default defineComponent({
           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));
             }
           }
         },
+        { immediate: true },
       );
     }
 
@@ -2499,6 +2602,8 @@ export default defineComponent({
       hasInsStartDate,
       hasInsEndDate,
       isSlavePensionForm,
+      dividendPeriods,
+      dividendSchedules,
 
       // Rules
       fixInsSumRule,
@@ -2537,13 +2642,32 @@ export default defineComponent({
       getContragent,
       addTransferContract,
       removeTransferContract,
+      checkTransferContractDate,
     };
   },
 });
 </script>
 
 <style>
-.pension-guaranteed-period .v-field {
+.pension-round-toggle .v-field {
   border: none !important;
 }
+.grid-table > div > span {
+  padding-left: 24px;
+  border-right: 1px solid #fff;
+  display: flex;
+  align-items: center;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  min-width: 15%;
+}
+.v-virtual-scroll__item > div > span {
+  padding-left: 24px;
+  border-right: 1px solid #fff;
+  display: flex;
+  align-items: center;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  min-width: 15%;
+}
 </style>

package/components/Panel/PanelHandler.vue

@@ -41,7 +41,7 @@
     <div v-if="isScansDocuments" :class="[$styles.flexColNav]">
       <div v-if="isNewSign">
         <div class="flex flex-col gap-2">
-          <base-btn v-for="file in signingFiles" :text="`Скачать ${file.fileName}`" :loading="$dataStore.isButtonsLoading" @click="getDocNew(file)" />
+          <base-btn v-for="file in getFilesDownloadButtons" :text="`Скачать ${file.fileName}`" :loading="$dataStore.isButtonsLoading" @click="getDocNew(file)" />
           <base-form-section class="mt-4 flex flex-col !gap-2" :title="$dataStore.t('clients.attachScansSignDocs')">
             <base-file-input v-for="file in signingFiles" :label="`Вложить ${file.fileName}`" @input.prevent="onFileChangeScansNew($event, file)" @onClear="onClearFileNew(file)" />
           </base-form-section>
@@ -60,6 +60,13 @@
       </div>
       <base-btn :text="$dataStore.t('buttons.sign')" :loading="$dataStore.isButtonsLoading || loading" @click="isNewSign ? sendFilesNew() : sendFiles()" />
       <base-btn :text="$dataStore.t('buttons.cancel')" :btn="$styles.whiteBtn" @click="isScansDocuments = false" />
+      <base-btn
+        v-if="isOnlineEnpf === false && $dataStore.isPension && formStore.applicationData.statusCode === 'AttachAppContractForm'"
+        class="mt-[2rem]"
+        :text="$dataStore.t('buttons.send')"
+        :loading="loading"
+        @click="$dataStore.panelAction = constants.actions.signed"
+      />
     </div>
     <div v-if="isQr" :class="[$styles.flexColNav]">
       <base-form-section :title="''">
@@ -302,6 +309,13 @@ export default defineComponent({
     const scansFiles = ref<any[]>([]);
     const isAllPaperSigned = computed(() => formStore.signatories.every((person: any) => person.fileDatas.every((file: any) => file.isSigned === true && file.signedType === 2)));
     const processCode = formStore.applicationData.processCode;
+    const getFilesDownloadButtons = computed(() => {
+      if (isOnlineEnpf.value === false && dataStore.isPension && formStore.applicationData.statusCode === 'ContractSignedFrom') {
+        return signingFiles.value.filter(i => i.fileType === 6);
+      } else {
+        return signingFiles.value;
+      }
+    });
 
     const openSmsPanel = (signInfo: Types.SignUrlType) => {
       if (signInfo) {
@@ -1017,6 +1031,7 @@ export default defineComponent({
       inSigningOrder,
       isNewSign,
       hasEpayPay,
+      getFilesDownloadButtons,
     };
   },
 });

package/composables/classes.ts

@@ -497,6 +497,7 @@ export class Member extends Person {
   bankInfo: BankInfoClass;
   transferContractCompany: Value;
   digitalDocument: IDocument | null;
+  chooseChild: string | null;
   identityDocument: {
     documentType: Value;
     documentNumber: string | null;
@@ -571,6 +572,7 @@ export class Member extends Person {
     confirmDocTypeKz = null,
     confirmDocTypeRod = null,
     isNotary = false,
+    chooseChild = null,
   ) {
     super(id, type, iin, longName, lastName, firstName, middleName, birthDate, gender, genderName, birthPlace, age);
     this.documentsList = [];
@@ -642,6 +644,7 @@ export class Member extends Person {
     this.bankInfo = new BankInfoClass();
     this.transferContractCompany = new Value();
     this.digitalDocument = null;
+    this.chooseChild = chooseChild;
     this.identityDocument = {
       documentType: new Value(),
       documentNumber: null,

package/composables/constants.ts

@@ -66,6 +66,7 @@ export const constants = Object.freeze({
     Statuses.WaitingInsurancePremiumForm,
   ],
   rejectApplicationStatuses: [
+    Statuses.EditForm,
     Statuses.StartForm,
     Statuses.DsoUsnsForm,
     Statuses.AccountantForm,

package/composables/index.ts

@@ -840,6 +840,7 @@ export class RoleController {
   isUpk = () => this.isRole(constants.roles.UPK);
   isUrp = () => this.isRole(constants.roles.URP);
   isUsns = () => this.isRole(constants.roles.USNS);
+  isUsnsHead = () => this.isRole(constants.roles.UsnsHead);
   isAccountant = () => this.isRole(constants.roles.Accountant);
   isDrn = () => this.isRole(constants.roles.DRNSJ);
   isSupport = () => this.isRole(constants.roles.Support);
@@ -888,6 +889,7 @@ export class RoleController {
       toDSO:
         this.isDsuio() ||
         this.isActuary() ||
+        this.isUsnsHead() ||
         this.isHeadOfDso() ||
         this.isAccountant() ||
         this.isUSNSACCINS() ||
@@ -931,6 +933,7 @@ export class RoleController {
         this.isURAP() ||
         this.isTravelAgent() ||
         this.isHR() ||
+        this.isUsnsHead() ||
         baseAccessRoles,
     };
   };

package/locales/ru.json

@@ -150,7 +150,9 @@
     "errorOsns": "По данному БИН на дату заключения заявления не найден договор ОСНС. Просим проверить БИН Страхователя.",
     "needDigDoc": "Нужно получить цифровой документ {text}",
     "needToRecalc": "Дата оплаты не совпадает с датой договора, нажмите «Перерасчет» и отправьте клиенту новый QR для подписания.",
-    "notDigDoc": "Выданный документ не найден"
+    "notDigDoc": "Выданный документ не найден",
+    "siblingRelationDoc": "Необходимо вложить документы, подтверждающие родственные связи между Страхователем и Выгодоприобретателем.\nВ случае, если степень родства Выгодоприобретателя выбрано:\n Полнородный брат/сестра или Неполнородный брат/сестра - Необходимо вложить 2 документа: Свидетельство о рождении Выгодоприобретателя и Свидетельство о рождении Страхователя",
+    "grandchildRelationDoc": "Необходимо вложить документы, подтверждающие родственные связи между Страхователем и Выгодоприобретателем.\nВ случае, если степень родства Выгодоприобретателя выбрано:\n Внук/Внучка - Необходимо вложить 2 документа: Свидетельство о рождении Выгодоприобретателя и Свидетельство о рождении родителя (который является ребенком страхователя) Выгодоприобретателя"
   },
   "notSignedContract": "Неподписанный Договор",
   "Contract": "Договор страхования",
@@ -251,7 +253,7 @@
     "recalc": "Перерасчет",
     "conclude": "Заключить",
     "agree": "Согласен",
-    "disagree": "Не согласен",
+    "disagree": "Не согласен"
   },
   "dialog": {
     "title": "Подтверждение",
@@ -438,7 +440,7 @@
     "fixInsSum": "Фиксированная сумма",
     "amountRefunded": "Сумма к возврату",
     "amountPaid": "Сумма к доплате",
-    "franchise": "Франшиза",
+    "franchise": "Франшиза"
   },
   "calculatorForm": {
     "selectedCountries": "Выбранные страны",
@@ -590,7 +592,7 @@
     "KSJagreement": "Договор с другой КСЖ",
     "ENPFnote": "Выписка из ЕНПФ",
     "getDataENPF": "Получить данные с ЕНПФ",
-    "compulsoryProfMonthCount": "Количество месяцев уплаты ОППВ (не менее 60 месяцев)",
+    "compulsoryProfMonthCount": "Количество месяцев уплаты ОППВ",
     "insuredIIN": "ИИН «Страхователя»",
     "ifHasRelationBeneficiary": "Включите, если у Страхователя есть Родственные связи с Выгодоприобретателем",
     "complianceFinMonitoring": "Приложение 6/ПОДФТ",
@@ -609,7 +611,11 @@
     "fileError": "Ошибка прикрепления файла",
     "parentContractNextPay": "Возврат с учетом очередной выплаты",
     "parentContractNextPayDate": "Очередная выплата по графику",
-    "oppvPaymentCertificate": "Справка о количество взносов за счет ОППВ"
+    "oppvPaymentCertificate": "Справка о количество взносов за счет ОППВ",
+    "dividendPeriod": "Периодичность выплаты дивидендов",
+    "dividendsGraph": "График страховых дивидендов",
+    "dividendDate": "Дата выплаты",
+    "dividendAmount": "Размер периодичной страхового дивиденда (тенге)"
   },
   "agent": {
     "currency": "Валюта",
@@ -1036,7 +1042,10 @@
     "deathInsAnyReason": "Смерть Застрахованного по любой причине",
     "mark": "Признак",
     "signerData": "Данные Подписанта",
-    "individualOwnerData": "Данные владельца ИП"
+    "individualOwnerData": "Данные владельца ИП",
+    "chooseChild": "Выберите ребёнка",
+    "addChild": "Добавить ребёнка",
+    "addBeneficiary": "Добавить выгодоприобретателя"
   },
   "bankDetailsForm": {
     "title": "Банковские реквизиты",
@@ -1212,5 +1221,4 @@
   "coverageFrom": "Период действия с",
   "coverageTo": "Период действия до",
   "recoveredFrom": "Восстановлен с"
-
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.50",
+  "version": "0.0.10-beta.51",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -390,19 +390,19 @@ export const useDataStore = defineStore('data', {
       try {
         const queryData = isNonResident
           ? {
-              firstName: member.firstName ?? '',
-              lastName: member.lastName ?? '',
-              middleName: member.middleName ?? '',
-              iin: '',
-              birthDate: member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
-            }
+            firstName: member.firstName ?? '',
+            lastName: member.lastName ?? '',
+            middleName: member.middleName ?? '',
+            iin: '',
+            birthDate: member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
+          }
           : {
-              firstName: '',
-              lastName: '',
-              middleName: '',
-              iin: member.iin ? member.iin.replace(/-/g, '') : '',
-              birthDate: '',
-            };
+            firstName: '',
+            lastName: '',
+            middleName: '',
+            iin: member.iin ? member.iin.replace(/-/g, '') : '',
+            birthDate: '',
+          };
         const contragentResponse = await this.api.getContragent(queryData);
         if (contragentResponse.totalItems > 0) {
           if (contragentResponse.items.length === 1) {
@@ -931,7 +931,9 @@ export const useDataStore = defineStore('data', {
           isTerror: member.isTerror,
           isIpdlCompliance: null,
           isTerrorCompliance: null,
+          fromService: this.isGons && whichMember === 'Beneficiary' ? (member.chooseChild === 'Добавить выгодоприобретателя' ? false : true) : true,
         };
+
         if (this.isPension && memberFromApplicaiton && memberFromApplicaiton.processInstanceId === this.formStore.applicationData.slave?.processInstanceId) {
           data.processInstanceId = this.formStore.applicationData.slave.processInstanceId;
         }
@@ -1654,11 +1656,11 @@ export const useDataStore = defineStore('data', {
       return n === null
         ? null
         : n
-            .toLocaleString('ru', {
-              maximumFractionDigits: 2,
-              minimumFractionDigits: 2,
-            })
-            .replace(/,/g, '.');
+          .toLocaleString('ru', {
+            maximumFractionDigits: 2,
+            minimumFractionDigits: 2,
+          })
+          .replace(/,/g, '.');
     },
     async getTaskList(
       search: string = '',
@@ -1694,8 +1696,8 @@ export const useDataStore = defineStore('data', {
           groupCode: groupCode,
           processCodes: this.isEFO
             ? Object.values(constants.products).filter(
-                i => i !== constants.products.pensionannuity && i !== constants.products.pensionannuityrefund && i !== constants.products.pensionannuityjoint,
-              )
+              i => i !== constants.products.pensionannuity && i !== constants.products.pensionannuityrefund && i !== constants.products.pensionannuityjoint,
+            )
             : [constants.products.baiterek],
         };
         if (byOneProcess !== null) {
@@ -1706,9 +1708,9 @@ export const useDataStore = defineStore('data', {
           processInstanceId === null
             ? query
             : {
-                ...query,
-                processInstanceId: processInstanceId,
-              },
+              ...query,
+              processInstanceId: processInstanceId,
+            },
         );
         if (needToReturn) {
           this.isLoading = false;
@@ -2105,6 +2107,21 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
+    async getDividendSchedule() {
+      this.isLoading = true;
+      try {
+        const response = await this.api.pensionannuityNew.getDividendSchedule(this.formStore.applicationData.processInstanceId);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+        return {
+          "scheduleDividend": null,
+          "scheduleDividend2": null
+        };
+      } finally {
+        this.isLoading = false;
+      }
+    },
     async calcParentContractSums(closeContractCompanyCode: string, closeContractCompanyName: string, isContractClosed: boolean) {
       this.isLoading = true;
       try {
@@ -2396,6 +2413,9 @@ export const useDataStore = defineStore('data', {
               const relationDegree = this.relations.find((i: Value) => i.ids == each.relationId);
               this.formStore.beneficiaryForm[index].relationDegree = relationDegree ? relationDegree : new Value();
               this.formStore.beneficiaryForm[index].percentageOfPayoutAmount = each.percentage;
+              if (this.isGons) {
+                this.formStore.beneficiaryForm[index].chooseChild = each.fromService === false ? 'Добавить выгодоприобретателя' : each.longName;
+              }
               if (this.isLiferenta || this.isBolashak) {
                 const insurancePay = this.insurancePay.find((i: Value) => i.id == each.beneficiaryInsurancePayId);
                 this.formStore.beneficiaryForm[index].insurancePay = insurancePay ? insurancePay : new Value();
@@ -3257,6 +3277,27 @@ export const useDataStore = defineStore('data', {
           return ErrorHandler(err);
         }
       }
+      if (this.isGons) {
+        const { relationDegree } = this.formStore.beneficiaryForm[0];
+        const siblingRelationIds = ['14', '15', '24', '25'];
+        const grandchildRelationIds = ['20', '21'];
+        let hasSiblingRelationId = siblingRelationIds.includes(String(relationDegree?.ids));
+        let hasGrandchildRelationId = grandchildRelationIds.includes(String(relationDegree?.ids));
+        const hasRelationDoc = this.formStore.signedDocumentList.filter(i => i.fileTypeCode === '46' || i.fileTypeCode === '53').length >= 2;
+
+        if (hasSiblingRelationId && !hasRelationDoc) {
+          this.isLoading = false;
+          hasSiblingRelationId = false;
+          this.showToaster('error', this.t('toaster.siblingRelationDoc'), 3000);
+          return false;
+        }
+        if (hasGrandchildRelationId && !hasRelationDoc) {
+          this.isLoading = false;
+          hasGrandchildRelationId = false;
+          this.showToaster('error', this.t('toaster.grandchildRelationDoc'), 3000);
+          return false;
+        }
+      }
       return true;
     },
     validateAnketa(whichSurvey: 'surveyByHealthBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBase' | 'surveyByCriticalBasePolicyholder') {
@@ -3306,62 +3347,62 @@ export const useDataStore = defineStore('data', {
               await Promise.allSettled([
                 this.getQuestionList('health', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByHealthBase'),
                 this.isClientAnketaCondition &&
-                  this.getQuestionList(
-                    'health',
-                    this.formStore.applicationData.processInstanceId,
-                    this.formStore.applicationData.clientApp.id,
-                    'surveyByHealthBasePolicyholder',
-                    'policyholder',
-                  ),
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'policyholder',
+                ),
                 ,
               ]);
               this.isClientAnketaCondition
                 ? await Promise.allSettled([
-                    ...this.formStore.surveyByHealthBase!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-                    }),
-                    ...this.formStore.surveyByHealthBasePolicyholder!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
-                    }),
-                  ])
+                  ...this.formStore.surveyByHealthBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByHealthBasePolicyholder!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
+                  }),
+                ])
                 : await Promise.allSettled(
-                    this.formStore.surveyByHealthBase!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-                    }),
-                  );
+                  this.formStore.surveyByHealthBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                );
             } else {
               await Promise.allSettled([
                 this.getQuestionList('health', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByHealthBase'),
                 this.getQuestionList('critical', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByCriticalBase'),
                 this.isClientAnketaCondition &&
-                  this.getQuestionList(
-                    'health',
-                    this.formStore.applicationData.processInstanceId,
-                    this.formStore.applicationData.clientApp.id,
-                    'surveyByHealthBasePolicyholder',
-                    'policyholder',
-                  ),
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'policyholder',
+                ),
               ]);
               this.isClientAnketaCondition
                 ? await Promise.allSettled([
-                    ...this.formStore.surveyByHealthBase!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-                    }),
-                    ...this.formStore.surveyByCriticalBase!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
-                    }),
-                    ...this.formStore.surveyByHealthBasePolicyholder!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
-                    }),
-                  ])
+                  ...this.formStore.surveyByHealthBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByCriticalBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
+                  }),
+                  ...this.formStore.surveyByHealthBasePolicyholder!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
+                  }),
+                ])
                 : await Promise.allSettled([
-                    ...this.formStore.surveyByHealthBase!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-                    }),
-                    ...this.formStore.surveyByCriticalBase!.body.map(async question => {
-                      await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
-                    }),
-                  ]);
+                  ...this.formStore.surveyByHealthBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByCriticalBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
+                  }),
+                ]);
             }
             if (this.validateAnketa('surveyByHealthBase')) {
               let hasCriticalAndItsValid = null;
@@ -3640,8 +3681,8 @@ export const useDataStore = defineStore('data', {
         const validDocument = this.isLifetrip
           ? filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS)
           : filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes['1UDL']) ??
-            filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.VNZ) ??
-            filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS);
+          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.VNZ) ??
+          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS);
         if (validDocument) {
           const documentType = this.documentTypes.find(
             (i: Value) => i.ids === Object.keys(CoreEnums.GBD.DocTypes)[Object.values(CoreEnums.GBD.DocTypes).indexOf(validDocument.type.code)],
@@ -3710,11 +3751,9 @@ export const useDataStore = defineStore('data', {
       try {
         (Object.keys(local) as Array<keyof GroupMember>).forEach(key => {
           if (key === 'actualAddress' || key === 'legalAddress') {
-            const address = `${checkForNull(local[key].country.nameRu)}, ${checkForNull(local[key].state.nameRu)},${
-              local[key].region.nameRu ? ` ${local[key].region.nameRu},` : ''
-            } ${checkForNull(local[key].regionType.nameRu)} ${checkForNull(local[key].city.nameRu)},${local[key].square ? ` квартал ${local[key].square},` : ''}${
-              local[key].microdistrict ? ` мкр ${local[key].microdistrict},` : ''
-            } ул. ${checkForNull(local[key].street)}, д. ${checkForNull(local[key].houseNumber)}`;
+            const address = `${checkForNull(local[key].country.nameRu)}, ${checkForNull(local[key].state.nameRu)},${local[key].region.nameRu ? ` ${local[key].region.nameRu},` : ''
+              } ${checkForNull(local[key].regionType.nameRu)} ${checkForNull(local[key].city.nameRu)},${local[key].square ? ` квартал ${local[key].square},` : ''}${local[key].microdistrict ? ` мкр ${local[key].microdistrict},` : ''
+              } ул. ${checkForNull(local[key].street)}, д. ${checkForNull(local[key].houseNumber)}`;
             local[key].longName = address;
             local[key].longNameKz = address;
           }
@@ -4161,6 +4200,16 @@ export const useDataStore = defineStore('data', {
         return null;
       }
     },
+    async getProcessDividendPeriods() {
+      try {
+        if (!this.processCode) return null;
+        const response = await this.api.getProcessDividendPeriods(this.processCode);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+        return null;
+      }
+    },
     async checkIIN(iin: string) {
       try {
         const response = await this.api.checkIIN(iin);

package/types/enum.ts

@@ -125,6 +125,7 @@ export enum Roles {
   URAP = 'URAP',
   TravelAgent = 'TravelAgent',
   HR = 'HR',
+  UsnsHead = 'UsnsHead',
 }
 
 export enum Statuses {
@@ -151,6 +152,7 @@ export enum Statuses {
   JuristForm = 'JuristForm',
   AccountantForm = 'AccountantForm',
   HeadManagerForm = 'HeadManagerForm',
+  DeferredContract = 'DeferredContract',
 }
 
 export enum MemberCodes {

package/types/index.ts

@@ -905,6 +905,7 @@ export namespace Api {
       zagsCode?: string;
       zagsNameKZ?: string;
       zagsNameRU?: string;
+      childGender?: number;
     };
   }