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

package/components/Input/FormInput.vue

@@ -40,6 +40,8 @@
         :model-value="modelValue"
         :min-date="minDate"
         :max-date="maxDate"
+        :min="minDate"
+        :max="maxDate"
         @update:modelValue="$emit('update:modelValue', $event)"
       />
     </template>

package/components/Menu/MenuNav.vue

@@ -38,6 +38,7 @@
         <div v-if="$dataStore.buttons && $dataStore.buttons.length" class="flex flex-col gap-[10px] justify-self-end absolute bottom-5 lg:bottom-[10%] w-full pr-4">
           <div v-for="(item, index) of $dataStore.buttons" :key="index">
             <transition enter-active-class="animate__animated animate__fadeIn animate__faster" leave-active-class="animate__animated animate__fadeOut animate__faster">
+              <!-- @vue-ignore -->
               <base-btn
                 v-if="$dataStore.filters.show(item)"
                 :text="item.title!"

package/components/Pages/Documents.vue

@@ -6,6 +6,18 @@
         <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]" v-if="$dataStore.isPension && formStore.hasRepresentative">
+      <base-content-block :class="[$styles.textSimple]">
+        <div :class="[$styles.whiteBg, $styles.rounded]" class="p-2 h-12 flex items-center relative">
+          <span class="ml-2">{{ $dataStore.t('policyholdersRepresentative.informationDoc') }}</span>
+          <i
+            class="transition-all cursor-pointer mdi mdi-tray-arrow-down pl-2 mr-3 border-l-[1px] text-xl absolute right-0"
+            :class="[$styles.greenTextHover]"
+            @click="$dataStore.generatePDFDocument('All_Spokesman', '24', 'pdf')"
+          ></i>
+        </div>
+      </base-content-block>
+    </section>
     <section
       v-if="$dataStore.isPension && (showContract || formStore.applicationData.statusCode === 'PreparationDossierForm')"
       class="w-full px-[10px] pt-[14px] flex flex-col gap-2"
@@ -80,6 +92,22 @@
         </div>
       </base-content-block>
     </section>
+    <section class="w-full px-[10px] pt-[14px]" v-if="$dataStore.isPension && formStore.hasRepresentative">
+      <base-form-section
+        v-if="!formStore.signedDocumentList.find(i => i.fileTypeCode === '16')"
+        :title="$dataStore.t('policyholdersRepresentative.powerOfAttorneyDoc')"
+        class="mt-[14px] d-flex"
+      >
+        <base-file-input :loading="$dataStore.isLoading" @input="uploadAdditionalFile($event, '16')" />
+      </base-form-section>
+      <base-form-section
+        v-if="!formStore.signedDocumentList.find(i => i.fileTypeCode === '24')"
+        :title="$dataStore.t('policyholdersRepresentative.informationDoc')"
+        class="mt-[14px] d-flex"
+      >
+        <base-file-input :loading="$dataStore.isLoading" @input="uploadAdditionalFile($event, '24')" />
+      </base-form-section>
+    </section>
     <section v-if="requiredSign">
       <div v-for="(member, index) in jointMembers.filter(i => memberHasDocumentsToSign(i.iin))" :key="index">
         <base-form-section :title="`${member.firstName} ${member.lastName}`" class="mx-[10px] mt-[14px] d-flex">

package/components/Pages/MemberForm.vue

@@ -274,8 +274,9 @@
           :label="$dataStore.t('form.documentDate')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="$rules.date"
+          :rules="$rules.date.concat($rules.checkPastOrToday)"
           :maska="$maska.date"
+          :max-date="getToday()"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
         <base-form-input
@@ -283,8 +284,9 @@
           :label="$dataStore.t('form.documentExpire')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="$rules.date"
+          :rules="$rules.date.concat($rules.checkTodayOrFuture)"
           :maska="$maska.date"
+          :min-date="getToday()"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
         <base-form-input v-model.trim="member.migrationCard" :label="$dataStore.t('policyholdersRepresentative.numberVisa')" />
@@ -882,6 +884,9 @@ export default {
       if (dataStore.isGons) return member.value.chooseChild === dataStore.t('form.addBeneficiary');
       return true;
     });
+    const getToday = (): Date => {
+      return new Date(new Date().setHours(0, 0, 0, 0));
+    };
 
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
     const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
@@ -2272,6 +2277,7 @@ export default {
       birthDateRule,
 
       // Functions
+      getToday,
       addChild,
       searchMember,
       openPanel,

package/components/Pages/ProductConditions.vue

@@ -56,7 +56,7 @@
         </div>
       </base-form-section>
       <base-form-section
-        v-if="isUnderwriterRole && whichProduct !== 'pensionannuitynew' && whichProduct !== 'balam' && whichProduct !== 'tumar'"
+        v-if="isUnderwriterRole && whichProduct !== 'pensionannuitynew' && whichProduct !== 'balam' && whichProduct !== 'borrower' && whichProduct !== 'tumar'"
         :title="$dataStore.t('recalculationInfo')"
       >
         <base-form-input
@@ -487,8 +487,9 @@
               v-model="contract.transferContractFirstPaymentDate"
               :maska="$maska.date"
               :label="$dataStore.t('pension.transferContractFirstPaymentDate')"
-              :rules="$dataStore.rules.required.concat($dataStore.rules.birthDate)"
+              :rules="[...$rules.required, $rules.validateAfterContractDate(contract.transferContractFirstPaymentDate, contract.transferContractDate)]"
               append-inner-icon="mdi mdi-calendar-blank-outline"
+              :min-date="formatDate(contract.transferContractDate) ?? undefined"
               :readonly="isDisabled"
               :clearable="!isDisabled"
             />

package/components/Panel/PanelHandler.vue

@@ -85,7 +85,7 @@
         :class="[$styles.blueBgLight]"
         class="rounded-lg p-4"
       >
-        <base-form-toggle v-model="isOnlineEnpf" title="Онлайн подписание согласия для ЕНПФ" :has-border="false" @clicked="setActualEnpf" />
+        <base-form-toggle v-model="isOnlineEnpf" title="Онлайн подписание согласия для ЕНПФ" :disabled="isOnlineEnpfDisabled" :has-border="false" @clicked="setActualEnpf" />
       </div>
       <div :class="[$styles.blueBgLight]" class="rounded-lg p-4">
         <v-expansion-panels v-if="formStore.signatories.length" variant="accordion" :multiple="false">
@@ -316,6 +316,7 @@ export default defineComponent({
         return signingFiles.value;
       }
     });
+    const isOnlineEnpfDisabled = computed(() => (dataStore.isPension && formStore.hasRepresentative ? true : false));
 
     const openSmsPanel = (signInfo: Types.SignUrlType) => {
       if (signInfo) {
@@ -1031,6 +1032,7 @@ export default defineComponent({
       inSigningOrder,
       isNewSign,
       hasEpayPay,
+      isOnlineEnpfDisabled,
       getFilesDownloadButtons,
     };
   },

package/composables/constants.ts

@@ -20,6 +20,7 @@ export const constants = Object.freeze({
     pensionannuitynew: 19,
     halykkazynaap: 20,
     balam: 21,
+    borrower: 40,
     halykkazynaapsms: 23,
     pensionannuityrefundnew: 24,
     pensionannuityjointnew: 25,
@@ -31,7 +32,7 @@ export const constants = Object.freeze({
     checkcontragent: 1,
     checkcontract: 2,
   },
-  extractedProducts: ['dso', 'uu', 'lka'],
+  extractedProducts: ['dso', 'uu', 'lka', 'reinsurance'],
   editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm, Statuses.InputDataForm],
   documentsLinkVisibleStatuses: [
     Statuses.Completed,

package/composables/index.ts

@@ -264,7 +264,7 @@ export const policyholderToBeneficialOwner = (isPolicyholderBeneficialOwner: boo
     beneficialOwner.citizenship = policyholder.clientData.authoritedPerson.citizenship;
     beneficialOwner.birthDate = policyholder.clientData.authoritedPerson.birthDate;
     beneficialOwner.gender = policyholder.clientData.authoritedPerson.gender;
-    beneficialOwner.resident = policyholder.clientData.resident;
+    beneficialOwner.resident = policyholder.clientData.authoritedPerson.resident;
     beneficialOwner.taxResidentCountry = policyholder.clientData.taxResidentCountry;
     beneficialOwner.economySectorCode = policyholder.clientData.economySectorCode;
     beneficialOwner.identityDocument.issuedOn = policyholder.clientData.authoritedPerson.identityDocument.issuedOn;
@@ -840,7 +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);
+  isNotAccumulativeSanctionerUSNS = () => this.isRole(constants.roles.NotAccumulativeSanctionerUSNS);
   isAccountant = () => this.isRole(constants.roles.Accountant);
   isDrn = () => this.isRole(constants.roles.DRNSJ);
   isSupport = () => this.isRole(constants.roles.Support);
@@ -866,6 +866,7 @@ export class RoleController {
   isURAP = () => this.isRole(constants.roles.URAP);
   isTravelAgent = () => this.isRole(constants.roles.TravelAgent);
   isHR = () => this.isRole(constants.roles.HR);
+  isReInsurer = () => this.isRole(constants.roles.ReInsurer);
   hasAccess = () => {
     const baseAccessRoles = this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn() || this.isDsuioOrv();
     return {
@@ -886,14 +887,16 @@ export class RoleController {
         this.isArchivist() ||
         this.isSecurity() ||
         baseAccessRoles,
+      toReinsurance: this.isReInsurer() || this.isAdjuster() || this.isHeadAdjuster() || baseAccessRoles,
       toDSO:
+        this.isUsns() ||
         this.isDsuio() ||
         this.isActuary() ||
-        this.isUsnsHead() ||
         this.isHeadOfDso() ||
         this.isAccountant() ||
         this.isUSNSACCINS() ||
         this.isDsoDirector() ||
+        this.isNotAccumulativeSanctionerUSNS() ||
         this.isServiceManager() ||
         this.isUSNSsanctioner() ||
         this.isAccountantDirector() ||
@@ -933,7 +936,8 @@ export class RoleController {
         this.isURAP() ||
         this.isTravelAgent() ||
         this.isHR() ||
-        this.isUsnsHead() ||
+        this.isNotAccumulativeSanctionerUSNS() ||
+        this.isReInsurer() ||
         baseAccessRoles,
     };
   };

package/locales/ru.json

@@ -152,7 +152,8 @@
     "needToRecalc": "Дата оплаты не совпадает с датой договора, нажмите «Перерасчет» и отправьте клиенту новый QR для подписания.",
     "notDigDoc": "Выданный документ не найден",
     "siblingRelationDoc": "Необходимо вложить документы, подтверждающие родственные связи между Страхователем и Выгодоприобретателем.\nВ случае, если степень родства Выгодоприобретателя выбрано:\n Полнородный брат/сестра или Неполнородный брат/сестра - Необходимо вложить 2 документа: Свидетельство о рождении Выгодоприобретателя и Свидетельство о рождении Страхователя",
-    "grandchildRelationDoc": "Необходимо вложить документы, подтверждающие родственные связи между Страхователем и Выгодоприобретателем.\nВ случае, если степень родства Выгодоприобретателя выбрано:\n Внук/Внучка - Необходимо вложить 2 документа: Свидетельство о рождении Выгодоприобретателя и Свидетельство о рождении родителя (который является ребенком страхователя) Выгодоприобретателя"
+    "grandchildRelationDoc": "Необходимо вложить документы, подтверждающие родственные связи между Страхователем и Выгодоприобретателем.\nВ случае, если степень родства Выгодоприобретателя выбрано:\n Внук/Внучка - Необходимо вложить 2 документа: Свидетельство о рождении Выгодоприобретателя и Свидетельство о рождении родителя (который является ребенком страхователя) Выгодоприобретателя",
+    "missingDocuments": "Необходимо вложить документы доверенность представителя и сведения о представителе"
   },
   "notSignedContract": "Неподписанный Договор",
   "Contract": "Договор страхования",
@@ -906,6 +907,7 @@
     "agePrePensionInsured": "Пороговое значение по возрасту с 55 по 63",
     "checkDate": "Укажите корректную дату",
     "searchQueryLen": "Поиск должности должен осуществляться по запросу не менее чем из {len} символов",
+    "validateAfterContractDate": "Дата должна быть больше Даты заключения договора",
     "fixInsSumLimit": "Фиксированная сумма не должна превышать {sum}тг",
     "lengthLimit": "Превышен лимит символов. Введите текст длиной не более {len} символов"
   },
@@ -922,7 +924,9 @@
     "numberVisa": "Номер миграционный карточки",
     "numberLicense": "Номер лицензии",
     "confirmAuthority": "Лицо, подписавшего документ, подтверждающий полномочия, -Нотариус?",
-    "documentIssuers": "Наименование органа, выдавшего документ"
+    "documentIssuers": "Наименование органа, выдавшего документ",
+    "powerOfAttorneyDoc": "Доверенность представителя",
+    "informationDoc": "Сведения о представителе"
   },
   "payment": {
     "method": "Способ оплаты",

package/package.json

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

package/store/data.store.ts

@@ -66,6 +66,7 @@ export const useDataStore = defineStore('data', {
     isCritical: state => state.product === 'criticalillness',
     isBalam: state => state.product === 'balam',
     isTumar: state => state.product === 'tumar',
+    isBorrower: state => state.product === 'borrower',
     isDSO: state => state.product === 'dso',
     isUU: state => state.product === 'uu',
     hasClientAnketa: state => Array.isArray(state.formStore.additionalInsuranceTerms) && state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10),
@@ -390,19 +391,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) {
@@ -1656,11 +1657,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 = '',
@@ -1696,8 +1697,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) {
@@ -1708,9 +1709,9 @@ export const useDataStore = defineStore('data', {
           processInstanceId === null
             ? query
             : {
-              ...query,
-              processInstanceId: processInstanceId,
-            },
+                ...query,
+                processInstanceId: processInstanceId,
+              },
         );
         if (needToReturn) {
           this.isLoading = false;
@@ -2115,8 +2116,8 @@ export const useDataStore = defineStore('data', {
       } catch (err) {
         ErrorHandler(err);
         return {
-          "scheduleDividend": null,
-          "scheduleDividend2": null
+          scheduleDividend: null,
+          scheduleDividend2: null,
         };
       } finally {
         this.isLoading = false;
@@ -3298,6 +3299,14 @@ export const useDataStore = defineStore('data', {
           return false;
         }
       }
+      if (this.isPension && this.formStore.hasRepresentative) {
+        const requiredIds = ['16', '24'];
+
+        const missingDocuments = requiredIds.filter(id => !this.formStore.signedDocumentList.some(i => i.fileTypeCode === id));
+        if (missingDocuments.length > 0) {
+          this.showToaster('error', this.t('toaster.missingDocuments'), 3000);
+        }
+      }
       return true;
     },
     validateAnketa(whichSurvey: 'surveyByHealthBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBase' | 'surveyByCriticalBasePolicyholder') {
@@ -3347,62 +3356,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;
@@ -3681,8 +3690,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)],
@@ -3751,9 +3760,11 @@ 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;
           }
@@ -4288,7 +4299,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     hasJobSection(whichForm: keyof typeof StoreMembers) {
-      if (this.isLifetrip || this.isPension || this.isBalam || this.isTumar) return false;
+      if (this.isLifetrip || this.isPension || this.isBalam || this.isBorrower || this.isTumar) return false;
       switch (whichForm) {
         case this.formStore.beneficiaryFormKey:
         case this.formStore.beneficialOwnerFormKey:
@@ -4318,6 +4329,7 @@ export const useDataStore = defineStore('data', {
       if (!this.isPension || Number(this.formStore.applicationData.processCode) === 24) return false;
       switch (whichForm) {
         case 'beneficiaryForm':
+        case 'policyholdersRepresentativeForm':
           return false;
         default:
           return true;

package/store/rules.ts

@@ -250,6 +250,24 @@ export const rules = {
       }
     },
   ],
+  checkPastOrToday: [
+    (v: any) => {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      const selectedDate = new Date(formatDate(v)!);
+      selectedDate.setHours(0, 0, 0, 0);
+      return selectedDate <= today || t('rules.checkDate');
+    },
+  ],
+  checkTodayOrFuture: [
+    (v: any) => {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      const selectedDate = new Date(formatDate(v)!);
+      selectedDate.setHours(0, 0, 0, 0);
+      return selectedDate >= today || t('rules.checkDate');
+    },
+  ],
   twoDayBeforeTodayDate: [
     (v: any) => {
       const now = new Date();
@@ -304,4 +322,16 @@ export const rules = {
     }
     return t('rules.lengthLimit', { len: limit });
   },
+  validateAfterContractDate(v: any, date: any) {
+    const parseDate = (str: string): Date => {
+      const [day, month, year] = str.split('.');
+      return new Date(Number(year), Number(month) - 1, Number(day));
+    };
+    const inputDate = parseDate(v);
+    const limitDate = parseDate(date);
+    if (inputDate < limitDate) {
+      return t('rules.validateAfterContractDate');
+    }
+    return true;
+  },
 };

package/types/enum.ts

@@ -125,7 +125,8 @@ export enum Roles {
   URAP = 'URAP',
   TravelAgent = 'TravelAgent',
   HR = 'HR',
-  UsnsHead = 'UsnsHead',
+  NotAccumulativeSanctionerUSNS = 'NotAccumulativeSanctionerUSNS',
+  ReInsurer = 'ReInsurer'
 }
 
 export enum Statuses {

package/types/index.ts

@@ -32,6 +32,7 @@ export type Projects =
   | 'lka-auletti'
   | 'prepensionannuity'
   | 'balam'
+  | 'borrower'
   | 'criticalillness'
   | 'tumar';
 export type MemberKeys = keyof ReturnType<typeof useFormStore>;