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

package/api/base.api.ts

@@ -11,6 +11,14 @@ export class ApiClass {
     return data;
   }
 
+  async getProjectConfig() {
+    return await this.axiosCall<Utils.ProjectConfig>({
+      method: Methods.GET,
+      baseURL: getStrValuePerEnv('gatewayApiUrl'),
+      url: `/application/front/${import.meta.env.VITE_PARENT_PRODUCT === 'auletti' ? `auletti-${import.meta.env.VITE_PRODUCT}` : import.meta.env.VITE_PRODUCT}`,
+    });
+  }
+
   async loginUser(data: { login: string; password: string; numAttempt: number }) {
     return await this.axiosCall<{ refreshToken: string; accessToken: string }>({
       method: Methods.POST,
@@ -19,6 +27,13 @@ export class ApiClass {
     });
   }
 
+  async checkToken() {
+    return await this.axiosCall<void>({
+      method: Methods.POST,
+      url: '/identity/api/Account/CheckToken',
+    });
+  }
+
   async getNewAccessToken({ refreshToken, accessToken }: { refreshToken: string; accessToken: string }) {
     return await this.axiosCall<{ refreshToken: string; accessToken: string }>({
       method: Methods.POST,
@@ -433,8 +448,7 @@ export class ApiClass {
     return await this.axiosCall<void>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SetApplicationData`,
-      data,
-      responseType: 'blob',
+      data: data,
     });
   }
 
@@ -524,7 +538,7 @@ export class ApiClass {
   }
 
   async signQR(data: SignDataType[]) {
-    return await this.axiosCall({
+    return await this.axiosCall<ResponseStructure<any>>({
       method: Methods.POST,
       url: '/File/api/Sign/SignQr',
       data: data,
@@ -910,14 +924,6 @@ export class ApiClass {
     });
   }
 
-  async setApplicationData(data: SetApplicationRequest) {
-    return await this.axiosCall({
-      method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/SetApplicationData`,
-      data: data,
-    });
-  }
-
   async calculate(processInstanceId: string) {
     return await this.axiosCall({
       method: Methods.POST,
@@ -968,7 +974,7 @@ export class ApiClass {
   }
 
   async signXml(data: any) {
-    return await this.axiosCall<any>({
+    return await this.axiosCall<ResponseStructure<any>>({
       url: `/File/api/Sign/SignXml`,
       method: Methods.POST,
       data: data,
@@ -1044,11 +1050,30 @@ export class ApiClass {
     });
   }
 
-  async getDocumentsByEdsXmlId(edsXmlId: string) {
+  async uploadDigitalCertificatePensionAnnuityNew(data: any) {
     return await this.axiosCall<any>({
+      method: Methods.POST,
+      url: '/File/api/Document/UploadDigitalCertificatePensionAnnuityNew',
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+      data: data,
+    });
+  }
+
+  async startRejectedApplication(data: any) {
+    return await this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/StartRejectedApplication`,
+      data: data,
+    });
+  }
+
+  async getDocumentsByEdsXmlId(edsXmlId: string) {
+    return await this.axiosCall<ResponseStructure<any>>({
       method: Methods.GET,
       url: `/File/api/Sign/GetDocumentsByEdsXmlId/${edsXmlId}`,
-    })
+    });
   }
 
   async checkSign(id: string) {
@@ -1057,4 +1082,31 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/CheckSign/${id}`,
     });
   }
+
+  async getWorkPosition(search: string) {
+    return await this.axiosCall<Dicts.WorkPosition[]>({
+      method: Methods.POST,
+      baseURL: getStrValuePerEnv('efoBaseApi'),
+      url: '/dictionary/Dictionary/WorkPosition',
+      data: { search },
+    });
+  }
+
+  async getEnpfRedirectUrl(id: string) {
+    return await this.axiosCall<{ redirectUrl: string }>({
+      method: Methods.POST,
+      // TODO
+      baseURL: 'https://products.halyklife.kz/test/efo/api',
+      url: `/pensionannuityNew/GetEnpfRedirectUrl?id=${id}`,
+    });
+  }
+
+  async setEnpfSharedId(sharedId: string, infoId: string) {
+    return await this.axiosCall<void>({
+      method: Methods.POST,
+      // TODO
+      baseURL: 'https://products.halyklife.kz/test/efo/api',
+      url: `/pensionannuityNew/SetEnpfSharedId/${sharedId}/${infoId}`,
+    });
+  }
 }

package/api/interceptors.ts

@@ -1,4 +1,4 @@
-import { AxiosError, AxiosInstance } from 'axios';
+import { AxiosError, type AxiosInstance } from 'axios';
 
 export default function (axios: AxiosInstance) {
   axios.interceptors.request.use(

package/components/Form/FormData.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts">
-import { ComputedRefWithControl } from '@vueuse/core';
+import { type ComputedRefWithControl } from '@vueuse/core';
 import { FormBlock } from '../../composables/fields';
 
 export default defineComponent({
@@ -69,7 +69,7 @@ export default defineComponent({
       required: true,
     },
     animation: {
-      type: String as PropType<VuetifyAnimations>,
+      type: String as PropType<Utils.VuetifyAnimations>,
       required: false,
     },
   },

package/components/Layout/SettingsPanel.vue

@@ -9,11 +9,15 @@
       <v-text-field v-model="$dataStore.user.fullName" :readonly="true" hide-details variant="plain" :label="$dataStore.user.roles?.join(', ')" />
       <i class="mdi mdi-account-outline text-2xl text-[#A0B3D8]"></i
     ></base-panel-item>
-    <base-panel-item v-if="$dataStore.isEFO && $dataStore.accessToken && $dataStore.hasAccess().toLKA" @click="changeBridge('lka', $dataStore.accessToken)" class="cursor-pointer">
+    <base-panel-item
+      v-if="$dataStore.accessToken && (($dataStore.isEFO && $dataStore.hasAccess().toLKA) || ($dataStore.isAULETTI && $dataStore.hasAccess().toLKA_A))"
+      @click="changeBridge('lka', $dataStore.accessToken)"
+      class="cursor-pointer"
+    >
       {{ $dataStore.t('labels.lkaLong') }}
       <i class="mdi mdi-chevron-right text-2xl text-[#A0B3D8]"></i
     ></base-panel-item>
-    <base-panel-item v-if="$dataStore.isLKA && $dataStore.accessToken" @click="changeBridge('efo', $dataStore.accessToken)" class="cursor-pointer">
+    <base-panel-item v-if="($dataStore.isLKA || $dataStore.isLKA_A) && $dataStore.accessToken" @click="changeBridge('efo', $dataStore.accessToken)" class="cursor-pointer">
       {{ $dataStore.t('labels.efoLong') }}
       <i class="mdi mdi-web text-2xl text-[#A0B3D8]"></i
     ></base-panel-item>
@@ -38,8 +42,10 @@
       {{ $dataStore.t('buttons.logout') }}
       <i class="mdi mdi-logout text-xl"></i>
     </base-panel-item>
-    <div v-if="$dataStore.settings.open && 'version' in pkg && pkg.version" class="absolute bottom-2 w-full flex items-center justify-center opacity-30 text-sm">
-      <p>{{ pkg.version }}</p>
+    <div v-if="$dataStore.settings.open" class="absolute bottom-4 w-full flex flex-col items-center opacity-30 text-sm">
+      <p v-if="'version' in pkg && pkg.version">{{ pkg.version }}</p>
+      <p v-if="commitVersion">{{ `Current: #${commitVersion}` }}</p>
+      <p v-if="$dataStore.projectConfig">{{ `Latest: #${$dataStore.projectConfig.version}` }}</p>
     </div>
     <base-dialog
       v-model="dialogSignOut"
@@ -60,6 +66,7 @@ import pkg from '../../package.json';
 const dialogSignOut = ref(false);
 const dataStore = useDataStore();
 const router = useRouter();
+const commitVersion = String(import.meta.env.VITE_COMMIT_VERSION ?? '');
 
 const handleFontSize = (action: 'increase' | 'decrease') => {
   if (action === 'increase' && dataStore.fontSize < 24) dataStore.fontSize += 2;
@@ -77,7 +84,7 @@ const logoutUser = async () => {
 };
 
 const hasHistory = computed(() => {
-  return !dataStore.isLKA;
+  return !dataStore.isLKA && !dataStore.isLKA_A;
 });
 
 const hasFAQ = computed(() => router.hasRoute('FAQ') && !dataStore.isAULETTI && !dataStore.isAulettiParent);

package/components/Menu/MenuNav.vue

@@ -55,7 +55,7 @@
 
 <script lang="ts">
 import { MenuItem } from '../../composables/classes';
-import { RouteLocationNormalized } from 'vue-router';
+import { type RouteLocationNormalized } from 'vue-router';
 
 export default defineComponent({
   props: {

package/components/Pages/Anketa.vue

@@ -32,7 +32,7 @@
           class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
         >
           <base-form-text-section v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'Y')" :key="index">
-            <base-fade-transition>
+            <base-animation>
               <div
                 v-if="question.first.answerName === 'Да' && question.second"
                 :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
@@ -41,16 +41,16 @@
               >
                 {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
               </div>
-            </base-fade-transition>
+            </base-animation>
             <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
               {{ question.first.name }}
-              <base-fade-transition>
+              <base-animation>
                 <i
                   v-if="question.first.answerName === 'Да' && question.second && question.second.length"
                   class="mdi mdi-chevron-right text-2xl cursor-pointer"
                   @click="openFirstPanel(question)"
                 ></i>
-              </base-fade-transition>
+              </base-animation>
             </span>
             <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
               <v-radio-group
@@ -89,7 +89,7 @@
                 <v-radio label="Нет" value="Нет" />
               </v-radio-group>
             </div>
-            <base-fade-transition>
+            <base-animation>
               <div v-if="question.first.answerName === 'Да'" :class="[$styles.whiteText, $styles.textSimple]">
                 <base-form-input
                   v-model="question.first.answerText"
@@ -98,7 +98,7 @@
                   :rules="$rules.required"
                 />
               </div>
-            </base-fade-transition>
+            </base-animation>
           </base-form-text-section>
         </section>
       </v-form>
@@ -127,14 +127,26 @@
         @submit="submitSecondaryForm"
       >
         <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
-          <base-form-input
-            v-if="question.definedAnswers === 'N'"
-            v-model="question.answerText"
-            class="border-t-[1px] border-t-[#F3F6FC]"
-            :placeholder="$dataStore.t('labels.inputText')"
-            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-            :rules="isSecondRequired ? $rules.required : []"
-          />
+          <div v-if="question.definedAnswers === 'N'">
+            <base-form-input
+              v-if="question.answerType === 'T' || question.answerType === 'N'"
+              v-model="question.answerText"
+              class="border-t-[1px] border-t-[#F3F6FC]"
+              :placeholder="$dataStore.t('labels.inputText')"
+              :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+              :rules="isSecondRequired ? $rules.required : []"
+            />
+            <base-form-input
+              v-if="question.answerType === 'D'"
+              v-model="question.answerText"
+              class="border-t-[1px] border-t-[#F3F6FC]"
+              :placeholder="$dataStore.t('form.date')"
+              :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+              :rules="isSecondRequired ? $rules.date : []"
+              :maska="$maska.date"
+              append-inner-icon="mdi mdi-calendar-blank-outline"
+            />
+          </div>
           <base-panel-input
             v-else
             :class="[$styles.textTitle, $styles.greenText]"
@@ -220,6 +232,11 @@ export default defineComponent({
           }
           if (formStore[whichSurvey.value] && formStore[whichSurvey.value]?.body) {
             formStore[whichSurvey.value]?.body.forEach(question => {
+              if (question.first.definedAnswers === 'Y' && question.first.answerName?.match(new RegExp('Да', 'i')) && question.second && question.second.length) {
+                question.second.forEach(second => {
+                  if (second.answerType === 'D') second.answerText = formatDate(String(second.answerText))!.toISOString();
+                });
+              }
               if (question.first.definedAnswers === 'Y' && question.first.answerName?.match(new RegExp('Нет', 'i')) && question.second && question.second.length) {
                 question.second.forEach(second => {
                   if (second.definedAnswers === 'N') {
@@ -240,6 +257,13 @@ export default defineComponent({
           if (typeof anketaToken === 'string') {
             formStore[whichSurvey.value]!.id = anketaToken;
           }
+          await dataStore.getQuestionList(
+            surveyType.value,
+            formStore.applicationData.processInstanceId,
+            whichMember.value === 'insured' ? formStore.applicationData.insuredApp[0].id : formStore.applicationData.clientApp.id,
+            whichSurvey.value,
+            whichMember.value,
+          );
           isButtonLoading.value = false;
         } else {
           const errors = document.querySelector('.v-input--error');

package/components/Pages/Documents.vue

@@ -31,7 +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="noDocuments" 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"
@@ -171,18 +171,24 @@ export default defineComponent({
       }),
     );
     const showContract = computed(
-      () => formStore.applicationData && (formStore.applicationData.statusCode === 'Completed' || formStore.applicationData.statusCode === 'PreparationDossierForm'),
+      () =>
+        formStore.applicationData &&
+        (formStore.applicationData.statusCode === 'Completed' || formStore.applicationData.statusCode === 'PreparationDossierForm' || dataStore.isActuary()),
     );
+    const noDocuments = computed(() => {
+      if (dataStore.isPension) return !showContract.value;
+      return !formStore.signedDocumentList || !formStore.signedDocumentList.length;
+    });
     const isUnderwriterDocuments = computed(
       () =>
-        (dataStore.isAULETTI || dataStore.isAulettiParent) &&
+        (dataStore.isBaiterek || dataStore.isBolashak || dataStore.isLiferenta || dataStore.isKazyna || dataStore.isAmulet || dataStore.isGons) &&
         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) {
+      if (dataStore.isBaiterek || dataStore.isBolashak || dataStore.isLiferenta || dataStore.isKazyna || dataStore.isAmulet || dataStore.isGons) {
         return baseCondition && (currentDocument.value ? currentDocument.value.fileTypeCode === '46' : false);
       }
       if (dataStore.isPension) return baseCondition;
@@ -320,6 +326,7 @@ export default defineComponent({
       // Computed
       isDisabled,
       showContract,
+      noDocuments,
       canDeleteFiles,
       isUnderwriterDocuments,
 

package/components/Pages/MemberForm.vue

@@ -199,10 +199,7 @@
           :rules="$rules.required.concat($rules.numbers)"
         />
       </base-form-section>
-      <base-form-section
-        v-if="$dataStore.isPension && (whichForm === formStore.insuredFormKey || whichForm === formStore.beneficiaryFormKey)"
-        :title="$dataStore.t('pension.disabilityInfo')"
-      >
+      <base-form-section v-if="$dataStore.isPension && whichForm === formStore.insuredFormKey" :title="$dataStore.t('pension.disabilityInfo')">
         <base-form-toggle v-model="member.isDisability" :title="$dataStore.t('pension.ifHasDisability')" :disabled="isDisabled" :has-border="false" />
         <base-animation>
           <base-panel-input
@@ -330,7 +327,24 @@
       </base-form-section>
       <base-form-section v-if="$dataStore.hasJobSection(whichForm)" :title="$dataStore.t('form.jobData')">
         <base-form-input v-model.trim="member.job" :label="$dataStore.t('form.job')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
-        <base-form-input v-model.trim="member.jobPosition" :label="$dataStore.t('form.jobPosition')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
+        <base-form-input
+          v-if="hasWorkPositionDict"
+          v-model.trim="member.jobPosition"
+          :label="$dataStore.t('form.jobPosition')"
+          :readonly="isDisabled || member.positionCode !== 'other'"
+          :clearable="!isDisabled"
+          :rules="$rules.required"
+          append-inner-icon="mdi-chevron-right"
+          @click="openCustomPanel('workPosition')"
+        />
+        <base-form-input
+          v-else
+          v-model.trim="member.jobPosition"
+          :label="$dataStore.t('form.jobPosition')"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="$rules.required"
+        />
         <base-form-input v-model.trim="member.jobPlace" :label="$dataStore.t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
       </base-form-section>
       <base-form-section :title="$dataStore.t('form.placeRegistration')" v-if="$dataStore.hasPlaceSection(whichForm)">
@@ -460,7 +474,7 @@
           v-model="member.documentIssuers"
           :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
-          :readonly="isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer"
           :clearable="!isDisabled"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -695,6 +709,44 @@
         <base-btn v-if="member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.check')" @click="checkOtp()" />
       </div>
     </Teleport>
+    <Teleport v-if="isPositionPanelOpen" to="#right-panel-actions">
+      <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
+        <base-rounded-input
+          v-model="searchQuery"
+          :label="$dataStore.t('labels.search')"
+          class="w-full p-2"
+          :hide-details="searchQuery.length >= 4"
+          :rules="[searchQuery.length < 4 ? $dataStore.t('rules.searchQueryLen', { len: '4' }) : true]"
+          :append-inner-icon="searchQuery.length < 4 ? '' : 'mdi mdi-magnify'"
+          @append="searchPositions"
+        />
+        <base-animation>
+          <div v-if="positionsList && positionsList.length && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
+            <base-panel-select-item
+              :text="$dataStore.t('form.notChosen')"
+              :selected="member.positionCode === null"
+              @click="
+                member.jobPosition = null;
+                member.positionCode = null;
+              "
+            />
+            <base-panel-select-item
+              v-for="(item, index) of positionsList"
+              :key="index"
+              :text="(item.workPositionName as string)"
+              :selected="item.workPositionCode === member.positionCode"
+              @click="
+                member.jobPosition = item.workPositionName;
+                member.positionCode = item.workPositionCode;
+              "
+            />
+          </div>
+        </base-animation>
+        <base-animation>
+          <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
+        </base-animation>
+      </div>
+    </Teleport>
     <base-dialog
       v-model="deletionDialog"
       :title="$dataStore.t('dialog.confirmDelete')"
@@ -740,6 +792,7 @@ export default {
     const isSearchOpen = ref<boolean>(false);
     const isDocumentOpen = ref<boolean>(false);
     const isOtpPanelOpen = ref<boolean>(false);
+    const isPositionPanelOpen = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const isChangingMember = ref<boolean>(false);
     const familyDialog = ref<boolean>(false);
@@ -748,6 +801,7 @@ export default {
     const sameAddress = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
     const panelList = ref<Value[]>([]);
+    const positionsList = ref<Dicts.WorkPosition[]>([]);
     const currentPanel = ref<keyof typeof member.value>();
     const searchQuery = ref<string>('');
     const fileData = ref<{ file: any }>();
@@ -881,6 +935,7 @@ export default {
       return true;
     });
     const hasSameAddressToggle = computed(() => whichForm.value === formStore.beneficiaryFormKey && member.value.iin !== formStore.policyholderForm.iin);
+    const hasWorkPositionDict = computed(() => !useEnv().isProduction && dataStore.isBaiterek && dataStore.isEfoParent);
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
@@ -985,6 +1040,17 @@ export default {
         isDocumentOpen.value = false;
         isOtpPanelOpen.value = false;
         isPanelOpen.value = false;
+        isPositionPanelOpen.value = false;
+      } else {
+        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
+      }
+    };
+
+    const searchPositions = async () => {
+      if (!isDisabled.value) {
+        isPanelLoading.value = true;
+        positionsList.value = await dataStore.getWorkPosition(searchQuery.value);
+        isPanelLoading.value = false;
       } else {
         dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
       }
@@ -994,7 +1060,7 @@ export default {
       vForm.value.scrollTo({ top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' });
     };
 
-    const openCustomPanel = (type: 'document' | 'otp' = 'document') => {
+    const openCustomPanel = (type: 'document' | 'otp' | 'workPosition' = 'document') => {
       dataStore.panelAction = null;
       if (type === 'document' && memberDocument.value) {
         dataStore.rightPanel.title = memberDocument.value.fileTypeName!;
@@ -1002,6 +1068,7 @@ export default {
         isSearchOpen.value = false;
         isPanelOpen.value = false;
         isOtpPanelOpen.value = false;
+        isPositionPanelOpen.value = false;
       }
       if (type === 'otp') {
         dataStore.rightPanel.title = dataStore.t('form.otpCode');
@@ -1009,6 +1076,14 @@ export default {
         isDocumentOpen.value = false;
         isSearchOpen.value = false;
         isPanelOpen.value = false;
+        isPositionPanelOpen.value = false;
+      }
+      if (type === 'workPosition') {
+        isPositionPanelOpen.value = true;
+        isOtpPanelOpen.value = false;
+        isDocumentOpen.value = false;
+        isSearchOpen.value = false;
+        isPanelOpen.value = false;
       }
       dataStore.rightPanel.open = true;
     };
@@ -1018,6 +1093,7 @@ export default {
         isSearchOpen.value = false;
         isDocumentOpen.value = false;
         isOtpPanelOpen.value = false;
+        isPositionPanelOpen.value = false;
         // Feature
         // const notAllowedToChange = ['gender', 'documentType', 'documentIssuers'];
         // if (member.value.gotFromInsis === false && notAllowedToChange.includes(key)) {
@@ -1211,8 +1287,8 @@ export default {
           }
           if (!!parsedDocument.documentIssuer) {
             if (
-              parsedDocument.documentIssuer === 'МИНИСТЕРСТВО ВНУТРЕННИХ ДЕЛ РК' ||
-              parsedDocument.documentIssuer === 'ҚР ІШКІ ІСТЕР МИНИСТРЛІГІ' ||
+              /МИНИСТЕРСТВО ВНУТРЕННИХ ДЕЛ( РК| РҚ)?/gi.test(parsedDocument.documentIssuer) ||
+              /(КР |ҚР )?ІШКІ ІСТЕР МИНИСТРЛІГІ/gi.test(parsedDocument.documentIssuer) ||
               /ҚАЗАҚСТАН/gi.test(parsedDocument.documentIssuer) ||
               /КАЗАХСТАН/gi.test(parsedDocument.documentIssuer)
             ) {
@@ -1423,7 +1499,11 @@ export default {
             ownFundsRaisAmount: 0,
             compulsoryProfContractAmount: 0,
           };
-          const isApplicationSaved = await dataStore.setApplication(formStore.applicationData.pensionApp);
+          const data = {
+            ...formStore.applicationData.pensionApp,
+            transferContractCompany: formStore.applicationData.pensionApp.transferContractCompany?.nameRu ?? null,
+          };
+          const isApplicationSaved = await dataStore.setApplication(data);
           if (isApplicationSaved === false) return;
           dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
         }
@@ -1677,6 +1757,7 @@ export default {
       }
       await setDefaultValues();
       if (Number(formStore.applicationData.processCode) === 4) dataStore.members.insuredApp.isMultiple = true;
+      if (hasWorkPositionDict.value && member.value.positionCode === null) member.value.jobPosition = null;
     };
     onMounted(async () => {
       await onInit();
@@ -1747,6 +1828,7 @@ export default {
           isDocumentOpen.value = false;
           isSearchOpen.value = false;
           isOtpPanelOpen.value = false;
+          isPositionPanelOpen.value = false;
           dataStore.panelAction = null;
           currentPanelDeep.value = '';
           currentPanelSubDeep.value = '';
@@ -1815,6 +1897,7 @@ export default {
       isSearchOpen,
       isDocumentOpen,
       isOtpPanelOpen,
+      isPositionPanelOpen,
       isPanelLoading,
       isButtonLoading,
       isSubmittingForm,
@@ -1822,6 +1905,7 @@ export default {
       otpSending,
       panelValue,
       panelList,
+      positionsList,
       searchQuery,
       Value,
       memberDocument,
@@ -1854,6 +1938,7 @@ export default {
       hasSignOfIPDL,
       hasSameAddressToggle,
       hasMemberSearch,
+      hasWorkPositionDict,
 
       // Rules
       ageRule,
@@ -1884,6 +1969,7 @@ export default {
       onOtpCodeInput,
       deleteMember,
       selectMember,
+      searchPositions,
     };
   },
 };