hl-core 0.0.10-beta.3 → 0.0.10-beta.30

package/components/Pages/MemberForm.vue

@@ -68,51 +68,56 @@
           v-model="member.phoneNumber"
           :label="$dataStore.t('form.phoneNumber')"
           :maska="$maska.phone"
-          :readonly="!!isDisabled || !!isIinPhoneDisabled"
-          :clearable="!isDisabled"
+          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!isDataFromGov"
+          :clearable="!isDisabled && !isIinPhoneDisabled && !isDataFromGov"
           :append-inner-icon="otpCondition ? `${$dataStore.isPension ? 'mdi-message-text' : 'mdi mdi-phone-message'}` : ''"
           @append="openCustomPanel('otp')"
           @keyup.enter.prevent="otpCondition ? openCustomPanel('otp') : null"
           :rules="phoneRule"
         />
-        <base-form-input
-          v-model="member.iin"
-          :label="$dataStore.t('form.iin')"
-          :maska="$maska.iin"
-          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin"
-          :clearable="!isDisabled"
-          :append-inner-icon="hasMemberSearch ? (hasDocumentReader ? 'mdi mdi-credit-card-scan-outline' : 'mdi mdi-magnify') : ''"
-          @append="searchMember"
-          @input="onIinInput"
-          :rules="$rules.required.concat($rules.iinRight)"
-        />
+        <base-animation>
+          <base-form-input
+            v-if="!isNonResident"
+            v-model="member.iin"
+            :label="$dataStore.t('form.iin')"
+            :maska="$maska.iin"
+            :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin || !!isDataFromGov"
+            :clearable="!isDisabled && !isIinPhoneDisabled && !member.parsedDocument?.iin && !isDataFromGov"
+            :append-inner-icon="hasMemberSearch || !isNonResident ? (hasDocumentReader ? 'mdi mdi-credit-card-scan-outline' : 'mdi mdi-magnify') : ''"
+            @append="searchMember"
+            @input="onIinInput"
+            :rules="isNonResident ? [] : $rules.required.concat($rules.iinRight)"
+          />
+        </base-animation>
         <base-form-input
           v-model.trim="member.lastName"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.lastName"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.lastName"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.lastName"
           :label="$dataStore.t('form.lastName')"
           :rules="$rules.required.concat($rules.cyrillic)"
         />
         <base-form-input
           v-model.trim="member.firstName"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.firstName"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.firstName"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.firstName"
           :label="$dataStore.t('form.firstName')"
           :rules="$rules.required.concat($rules.cyrillic)"
+          :append-inner-icon="isNonResident ? 'mdi mdi-magnify' : ''"
+          @append="searchMember"
         />
         <base-form-input
           v-if="hasMiddleName"
           v-model.trim="member.middleName"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.middleName"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.middleName"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.middleName"
           :label="$dataStore.t('form.middleName')"
           :rules="$rules.cyrillicNonRequired"
         />
         <base-form-input
           v-if="$dataStore.isLifetrip"
           v-model.trim="member.lastNameLat"
-          :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :label="$dataStore.t('form.lastNameLat')"
           :rules="$rules.required.concat($rules.latin)"
           :hint="$dataStore.t('labels.checkWithDoc')"
@@ -120,16 +125,16 @@
         <base-form-input
           v-if="$dataStore.isLifetrip"
           v-model.trim="member.firstNameLat"
-          :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :label="$dataStore.t('form.firstNameLat')"
           :rules="$rules.required.concat($rules.latin)"
           :hint="$dataStore.t('labels.checkWithDoc')"
         />
         <base-form-input
           v-model="member.birthDate"
-          :readonly="isDisabled || isFromGBD || !!member.parsedDocument?.birthDate"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.birthDate"
+          :clearable="!isDisabled && !isDataFromGov && !member.parsedDocument?.birthDate"
           :label="$dataStore.t('form.birthDate')"
           :rules="birthDateRule"
           :maska="$maska.date"
@@ -161,8 +166,8 @@
         <base-panel-input
           v-model="member.gender"
           :value="member.gender?.nameRu"
-          :readonly="isDisabled || isFromGBD"
-          :clearable="!isDisabled && !isFromGBD"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :label="$dataStore.t('form.gender')"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
@@ -347,7 +352,7 @@
         />
         <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)">
+      <base-form-section :title="$dataStore.t('form.placeRegistration')">
         <base-form-toggle v-if="hasSameAddressToggle" v-model="sameAddress" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('form.sameAddress')" />
         <base-panel-input
           v-model="member.registrationCountry"
@@ -415,7 +420,7 @@
             />
             <base-form-input
               v-model.trim="member.registrationNumberHouse"
-              :rules="$rules.required"
+              :rules="[...$rules.required, $rules.lengthLimit(member.registrationNumberHouse, 10)]"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.NumberHouse')"
@@ -447,7 +452,7 @@
           @append="openPanel($dataStore.t('form.Region'), [], 'birthRegion', $dataStore.getRegions)"
         /> -->
       </base-form-section>
-      <base-form-section :title="$dataStore.t('form.documentData')" v-if="$dataStore.hasDocumentSection(whichForm)">
+      <base-form-section :title="$dataStore.t('form.documentData')">
         <base-panel-input
           v-if="gbdDocuments && gbdDocuments.length"
           value="Список документов из ГБДФЛ"
@@ -461,8 +466,8 @@
           v-model="member.documentType"
           :value="member.documentType?.nameRu"
           :label="$dataStore.t('form.documentType')"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || isDataFromGov"
+          :clearable="!isDisabled && !isDataFromGov"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.documentType'), [], 'documentType', $dataStore.getDocumentTypes)"
@@ -470,8 +475,8 @@
         <base-form-input
           v-model.trim="member.documentNumber"
           :label="$dataStore.t('form.documentNumber')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentNumber"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentNumber || isDataFromGov"
+          :clearable="!isDisabled && !member.parsedDocument?.documentNumber && !isDataFromGov"
           :rules="$rules.required"
         />
         <!-- <base-file-input v-if="!memberDocument" :disabled="isDisabled" :clearable="!isDisabled" @input="attachFile($event)" />
@@ -483,17 +488,42 @@
           v-model="member.documentIssuers"
           :value="member.documentIssuers?.nameRu"
           :label="$dataStore.t('form.documentIssuers')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssuer || isDataFromGov"
+          :clearable="!isDisabled && !member.parsedDocument?.documentIssuer && !isDataFromGov"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.documentIssuers'), [], 'documentIssuers', $dataStore.getDocumentIssuers)"
         />
+        <base-animation>
+          <div v-if="hasIssuerOther" class="flex flex-col gap-[1px]">
+            <base-form-input
+              v-model="member.documentIssuers.issuerOtherName"
+              :label="$dataStore.t('form.issuerOtherName')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="$rules.required.concat($rules.onlySymbols)"
+            />
+            <base-form-input
+              v-model="member.documentIssuers.issuerOtherNameOrig"
+              :label="$dataStore.t('form.issuerOtherNameOrig')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="$rules.required"
+            />
+            <base-form-input
+              v-model="member.documentIssuers.issuerOtherNameRu"
+              :label="$dataStore.t('form.issuerOtherNameRu')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="$rules.required.concat($rules.cyrillic)"
+            />
+          </div>
+        </base-animation>
         <base-form-input
           v-model="member.documentDate"
           :label="$dataStore.t('form.documentDate')"
-          :readonly="isDisabled || !!member.parsedDocument?.documentIssueDate"
-          :clearable="!isDisabled"
+          :readonly="isDisabled || !!member.parsedDocument?.documentIssueDate || isDataFromGov"
+          :clearable="!isDisabled && !member.parsedDocument?.documentIssueDate && !isDataFromGov"
           :rules="$rules.required.concat($rules.date)"
           :maska="$maska.date"
           append-inner-icon="mdi mdi-calendar-blank-outline"
@@ -503,8 +533,8 @@
             v-if="member.documentType.ids !== 'SBI'"
             v-model="member.documentExpire"
             :label="$dataStore.t('form.documentExpire')"
-            :readonly="isDisabled || !!member.parsedDocument?.documentExpireDate"
-            :clearable="!isDisabled"
+            :readonly="isDisabled || !!member.parsedDocument?.documentExpireDate || isDataFromGov"
+            :clearable="!isDisabled && !member.parsedDocument?.documentExpireDate && !isDataFromGov"
             :rules="$rules.required.concat($rules.date)"
             :maska="$maska.date"
             append-inner-icon="mdi mdi-calendar-blank-outline"
@@ -623,24 +653,27 @@
           :disabled="isDisabled"
           :clearable="!isDisabled"
           icon="mdi-paperclip"
-          @input="attachFile($event, '1')"
+          @input="attachAdditionalFile($event, '1')"
           :rules="$rules.required"
+          @onClear="clearAdditionalFile('1')"
         />
         <base-file-input
           :label="$dataStore.t('form.bankStatement')"
           :disabled="isDisabled"
           :clearable="!isDisabled"
           icon="mdi-paperclip"
-          @input="attachFile($event, '10')"
+          @input="attachAdditionalFile($event, '10')"
           :rules="$rules.required"
+          @onClear="clearAdditionalFile('10')"
         />
         <base-file-input
           :label="$dataStore.t('pension.ENPFnote')"
           :disabled="isDisabled"
           :clearable="!isDisabled"
           icon="mdi-paperclip"
-          @input="attachFile($event, '8')"
+          @input="attachAdditionalFile($event, '8')"
           :rules="$rules.required"
+          @onClear="clearAdditionalFile('8')"
         />
       </base-form-section>
       <base-form-section :title="$dataStore.t('form.contactsData')" v-if="$dataStore.hasContactSection(whichForm)">
@@ -678,6 +711,7 @@
         <base-btn v-if="hasGBDFL" :loading="isButtonLoading" :text="$dataStore.t('buttons.fromGBDFL')" @click="getContragentFromGBDFL" />
         <base-btn v-if="hasInsis" :loading="isButtonLoading" :text="$dataStore.t('buttons.fromInsis')" @click="getContragent" />
         <base-btn v-if="hasGKB" :loading="isButtonLoading" :text="$dataStore.t('buttons.fromGKB')" @click="getFamilyInfo" />
+        <base-btn v-if="isNonResident" :loading="isButtonLoading" :text="$dataStore.t('buttons.searchByFio')" @click="getContragent" />
         <base-form-section v-if="hasDocumentReader" class="!mt-0">
           <base-file-input
             :disabled="isDisabled"
@@ -702,18 +736,16 @@
     </Teleport>
     <Teleport v-if="isOtpPanelOpen && !member.hasAgreement" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
-        <base-fade-transition>
-          <base-rounded-input
-            v-if="otpCondition && member.otpTokenId"
-            v-model="member.otpCode"
-            :label="$dataStore.t('form.otpCode')"
-            :maska="$maska.otp"
-            :append-inner-icon="hasOtp ? 'mdi-cellphone-message text-[17px]' : ''"
-            hide-details
-            @keyup.enter.prevent="hasOtp ? checkOtp() : null"
-            @input="onOtpCodeInput"
-          />
-        </base-fade-transition>
+        <base-animation>
+          <div v-if="otpCondition && member.otpTokenId" class="flex flex-col">
+            <base-form-section class="mt-0 py-2">
+              <base-otp-input v-model="member.otpCode" :length="4" @keyup.enter.prevent="hasOtp && checkOtp()" @input="onOtpCodeInput" />
+            </base-form-section>
+            <span class="text-center cursor-pointer mt-2" :class="[$styles.mutedText]" @click="sendOtp(false)"
+              >Не получили код? <span class="underline underline-offset-2">Отправить код заново</span></span
+            >
+          </div>
+        </base-animation>
         <base-btn v-if="!member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.sendOtp')" @click="sendOtp(false)" />
         <base-btn v-if="member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.check')" @click="checkOtp()" />
       </div>
@@ -721,12 +753,12 @@
     <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')"
+          v-model.trim="searchQuery"
+          label="Выполните поиск должностей"
           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'"
+          :rules="[searchQuery.length < 4 ? $dataStore.t('rules.searchQueryLen', { len: 4 }) : true]"
+          append-inner-icon="mdi mdi-magnify"
           @append="searchPositions"
         />
         <base-animation>
@@ -783,6 +815,27 @@
         <base-list-empty class="w-full" v-else @click="documentChooseDialog = false" />
       </template>
     </base-dialog>
+    <base-dialog
+      v-model="fioChooseDialog"
+      :title="$dataStore.t('pension.contragentSelect')"
+      :icon="{ mdi: 'format-list-bulleted-type', color: '#A0B3D8' }"
+      actions="fioChooseDialog"
+      :persistent="false"
+    >
+      <template #actions>
+        <v-list lines="two" v-if="contragents && contragents.length" class="w-full !py-0">
+          <v-list-item v-for="person of contragents" :key="person.id" @click="getContragentClick(person)">
+            <v-list-item-title :class="[$styles.greenText, $styles.textTitle]">
+              {{ person.longName }}
+            </v-list-item-title>
+            <v-list-item-subtitle :class="[$styles.textSimple]">
+              {{ reformatDate(person.birthDate) }} - {{ person.genderName }} - Рег: {{ reformatDate(person.registrationDate) }}
+            </v-list-item-subtitle>
+          </v-list-item>
+        </v-list>
+        <base-list-empty class="w-full" v-else @click="fioChooseDialog = false" />
+      </template>
+    </base-dialog>
   </section>
   <base-scroll-buttons @up="scrollForm('up')" @down="scrollForm('down')" />
 </template>
@@ -790,7 +843,8 @@
 <script lang="ts">
 import { Value, DocumentItem, Member } from '../../composables/classes';
 import { uuid } from 'vue-uuid';
-import { StoreMembers, Enums } from '../../types/enum';
+import { StoreMembers, CoreEnums } from '../../types/enum';
+import type { Api, ContragentType, Dicts, ESBDValidationType, FileActions, MultipleMember } from '../../types';
 
 export default {
   setup() {
@@ -817,9 +871,12 @@ export default {
     const isPositionPanelOpen = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const isChangingMember = ref<boolean>(false);
+    const isNonResident = computed(() => !useEnv().isProduction && dataStore.isPension && member.value.signOfResidency.ids === '500011.2');
+    const isDataFromGov = computed(() => member.value.verifyType === 'GBDFL' || member.value.verifyType === 'ESBD' || !!member.value.gosPersonData);
     const familyDialog = ref<boolean>(false);
     const deletionDialog = ref<boolean>(false);
     const documentChooseDialog = ref<boolean>(false);
+    const fioChooseDialog = ref<boolean>(false);
     const selectedIndex = ref<number>(0);
     const sameAddress = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
@@ -830,6 +887,9 @@ export default {
     const fileData = ref<{ file: any }>();
     const imageDataList = ref<string[]>([]);
     const isRelative = ref<boolean>(false);
+    const additionalDocuments = ref<any[]>([]);
+    const requiredDocuments = ref<string[]>(['10']);
+    const contragents = ref<ContragentType[]>([]);
 
     const currentPanelDeep = ref<string>();
     const currentPanelSubDeep = ref<string>();
@@ -839,7 +899,6 @@ export default {
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value));
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
     const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
-    const isFromGBD = computed(() => !!member.value.gosPersonData);
     const gbdDocuments = computed(() => {
       if (hasGBDFLDocSelection && !!member.value.gosPersonData && !!member.value.gosPersonData.documents) {
         const documents = Array.isArray(member.value.gosPersonData.documents.document)
@@ -901,7 +960,7 @@ export default {
       };
       return dataStore.isAULETTI || dataStore.isAulettiParent ? false : dataStore.controls.hasGBDFL && perMemberCondition();
     });
-    const hasGBDFLDocSelection = dataStore.isLifetrip && whichForm.value === formStore.policyholderFormKey;
+    const hasGBDFLDocSelection = dataStore.isLifetrip;
     const hasInsis = computed(() => dataStore.controls.hasInsis);
     const hasGKB = computed(() => {
       const perMemberCondition = () => {
@@ -972,7 +1031,8 @@ export default {
         (whichForm.value === formStore.beneficiaryFormKey && member.value.iin !== formStore.policyholderForm.iin) ||
         (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage),
     );
-    const hasWorkPositionDict = !useEnv().isProduction && dataStore.isBaiterek && dataStore.isEfoParent;
+    const hasWorkPositionDict = dataStore.isBaiterek;
+    const hasIssuerOther = computed(() => !useEnv().isProduction && member.value.documentIssuers && member.value.documentIssuers.nameRu === 'Другое');
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
@@ -1051,7 +1111,6 @@ export default {
         case formStore.policyholderFormKey:
           return route.params.taskId === '0';
         case formStore.insuredFormKey:
-          if (dataStore.isPension) return route.params.taskId === '0';
           return route.query.id === '0';
         case formStore.policyholdersRepresentativeFormKey:
         case formStore.beneficiaryFormKey:
@@ -1084,6 +1143,10 @@ export default {
     };
 
     const searchPositions = async () => {
+      if (searchQuery.value.length < 4) {
+        dataStore.showToaster('error', dataStore.t('rules.searchQueryLen', { len: 4 }));
+        return;
+      }
       if (!isDisabled.value) {
         isPanelLoading.value = true;
         positionsList.value = await dataStore.getWorkPosition(searchQuery.value);
@@ -1122,6 +1185,7 @@ export default {
         isPositionPanelOpen.value = false;
       }
       if (type === 'workPosition') {
+        dataStore.rightPanel.title = dataStore.t('form.jobPosition');
         isPositionPanelOpen.value = true;
         isOtpPanelOpen.value = false;
         isDocumentOpen.value = false;
@@ -1251,12 +1315,49 @@ export default {
       }
     };
 
-    const attachFile = (event: InputEvent, code?: string) => {
+    const uploadAdditionalFiles = async (processInstanceId: string | number) => {
+      const formData = new FormData();
+      const information: any = [];
+      const uuidV4 = uuid.v4();
+      if (additionalDocuments.value) {
+        Object.values(additionalDocuments.value).map((value: any) => {
+          formData.append('file', value);
+          const ext = value.name.substring(value.name.lastIndexOf('.'));
+          const selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.code === value.code);
+          information.push({
+            identifier: `${uuidV4}${ext}`,
+            iin: member.value.iin ? member.value.iin.replaceAll('-', '') : null,
+            processInstanceId: processInstanceId,
+            fileTypeCode: selectedDocument ? selectedDocument.code : null,
+            fileTypeId: selectedDocument ? selectedDocument.id : null,
+            fileName: value.name,
+          });
+        });
+        formData.append('fileData', JSON.stringify(information));
+        await dataStore.uploadFiles(formData, false);
+      }
+    };
+
+    const attachFile = (event: InputEvent) => {
       if (event.target) {
-        fileData.value = code ? { file: (event.target as HTMLInputElement).files } : { file: (event.target as HTMLInputElement).files };
+        fileData.value = { file: (event.target as HTMLInputElement).files };
       } else {
         if (event.dataTransfer) {
-          fileData.value = code ? { file: (event.dataTransfer as DataTransfer).files } : { file: (event.dataTransfer as DataTransfer).files };
+          fileData.value = { file: (event.dataTransfer as DataTransfer).files };
+        }
+      }
+    };
+
+    const attachAdditionalFile = (event: InputEvent, code: string) => {
+      if (event.target) {
+        const files = (event.target as HTMLInputElement).files;
+        if (files && files.length && files[0]) {
+          if (files[0].type !== 'application/pdf') {
+            return dataStore.showToaster('error', dataStore.t('toaster.onlyPDF'), 6000);
+          }
+          const file = Object.assign(files[0]);
+          file.code = code;
+          additionalDocuments.value.push(file);
         }
       }
     };
@@ -1325,7 +1426,7 @@ export default {
           if (parsedDocument.middleName) member.value.middleName = parsedDocument.middleName;
           if (parsedDocument.fullName) member.value.longName = parsedDocument.fullName;
           if (parsedDocument.documentName && parsedDocument.documentName.startsWith('Kazakhstan - Id Card')) {
-            const documentType = dataStore.documentTypes.find((i: Value) => i.ids === Enums.Insis.DocTypes['1UDL']);
+            const documentType = dataStore.documentTypes.find((i: Value) => i.ids === CoreEnums.Insis.DocTypes['1UDL']);
             if (documentType) member.value.documentType = documentType;
           }
           if (!!parsedDocument.documentIssuer) {
@@ -1429,7 +1530,9 @@ export default {
 
     const selectGbdDocument = (document: Api.GBD.Document) => {
       if (document) {
-        const documentType = dataStore.documentTypes.find((i: Value) => i.ids === Object.keys(Enums.GBD.DocTypes)[Object.values(Enums.GBD.DocTypes).indexOf(document.type.code)]);
+        const documentType = dataStore.documentTypes.find(
+          (i: Value) => i.ids === Object.keys(CoreEnums.GBD.DocTypes)[Object.values(CoreEnums.GBD.DocTypes).indexOf(document.type.code)],
+        );
         if (documentType) member.value.documentType = documentType;
         const documentNumber = document.number;
         if (documentNumber) member.value.documentNumber = documentNumber;
@@ -1446,21 +1549,45 @@ export default {
       isSearchOpen.value = false;
     };
 
+    const getContragentClick = async (contragent: ContragentType) => {
+      await dataStore.serializeContragentData(member.value, contragent);
+      fioChooseDialog.value = false;
+      isButtonLoading.value = false;
+      dataStore.rightPanel.open = false;
+      isSearchOpen.value = false;
+    };
+
     const getContragent = async () => {
-      if (member.value.hasAgreement !== true) {
-        dataStore.showToaster('error', dataStore.t('toaster.needAgreement'), 3000);
-        dataStore.rightPanel.open = false;
-        isSearchOpen.value = false;
-        return;
-      }
-      if (!member.value.iin || member.value.iin.length !== useMask().iin.length) {
-        dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: 'ИИН' }), 5000);
-        dataStore.rightPanel.open = false;
-        isSearchOpen.value = false;
-        return;
+      if (isNonResident.value) {
+        if (!member.value.lastName || !member.value.firstName) {
+          dataStore.showToaster('error', 'Заполните поля Имя и Фамилия', 3000);
+          dataStore.rightPanel.open = false;
+          isSearchOpen.value = false;
+          return;
+        }
+      } else {
+        if (member.value.hasAgreement !== true) {
+          dataStore.showToaster('error', dataStore.t('toaster.needAgreement'), 3000);
+          dataStore.rightPanel.open = false;
+          isSearchOpen.value = false;
+          return;
+        }
+        if (!member.value.iin || member.value.iin.length !== useMask().iin.length) {
+          dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: 'ИИН' }), 5000);
+          dataStore.rightPanel.open = false;
+          isSearchOpen.value = false;
+          return;
+        }
       }
       isButtonLoading.value = true;
-      await dataStore.getContragent(member.value, false);
+      if (isNonResident.value) {
+        const response = await dataStore.getContragent(member.value, false);
+        if (response) contragents.value = response.items;
+        else dataStore.showToaster('error', 'Не найдено совпадений', 3000);
+        fioChooseDialog.value = true;
+      } else {
+        await dataStore.getContragent(member.value, false);
+      }
       isButtonLoading.value = false;
       dataStore.rightPanel.open = false;
       isSearchOpen.value = false;
@@ -1523,6 +1650,26 @@ export default {
         if (fileData.value && fileData.value.file) {
           await uploadFile(formStore.applicationData.processInstanceId);
         }
+        if (additionalDocuments.value && additionalDocuments.value.length) {
+          if (
+            (!formStore.applicationData.isEnpfSum && formStore.applicationData?.pensionApp.transferContracts && formStore.applicationData?.pensionApp.transferContracts.length) ||
+            (formStore.applicationData?.pensionApp.compulsoryProfMonthCount && formStore.applicationData?.pensionApp.compulsoryProfMonthCount >= 60)
+          )
+            requiredDocuments.value.push('8');
+          if (isNonResident.value) requiredDocuments.value.push('1');
+          if (requiredDocuments.value && requiredDocuments.value.length != 0) {
+            const hasAllDocs = requiredDocuments.value.every(fileCode => {
+              const result = additionalDocuments.value.map(i => i.code).indexOf(fileCode) !== -1;
+              if (!result) {
+                const missingFile = dataStore.dicFileTypeList.find((i: Value) => i.code === fileCode);
+                dataStore.showToaster('error', `Необходимо вложить ${missingFile?.nameRu}`, 8000);
+              }
+              return result;
+            });
+            if (!hasAllDocs) return;
+          }
+          await uploadAdditionalFiles(formStore.applicationData.processInstanceId);
+        }
       }
       const memberFromApplicaiton = memberStore.getMemberFromApplication(whichForm.value, whichIndex.value ? Number(whichIndex.value) : undefined);
       if (typeof member.value.id !== 'number' || (typeof member.value.id === 'number' && member.value.id > 0 === false)) {
@@ -1556,12 +1703,6 @@ export default {
             bankBin: member.value.bankInfo.bankName.ids,
             bankId: member.value.bankInfo.bankName.id,
             bankName: member.value.bankInfo.bankName.nameRu,
-            guaranteedPeriod: 0,
-            amount: 0,
-            compulsoryContractAmount: 0,
-            voluntaryContractAmount: 0,
-            ownFundsRaisAmount: 0,
-            compulsoryProfContractAmount: 0,
           };
           const data = {
             ...formStore.applicationData.pensionApp,
@@ -1569,7 +1710,9 @@ export default {
           };
           const isApplicationSaved = await dataStore.setApplication(data);
           if (isApplicationSaved === false) return;
-          dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
+          if (formStore.applicationData.pensionApp.amount && formStore.applicationData.pensionApp.amount !== 0)
+            dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
+          await dataStore.saveMember(member.value, 'Client', memberFromApplicaiton);
         }
       }
       await router.replace({
@@ -1608,6 +1751,7 @@ export default {
         }
       }
       if (member.value.hasAgreement !== true) {
+        if (isNonResident.value) return true;
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'));
         return false;
       }
@@ -1622,8 +1766,12 @@ export default {
           isSubmittingForm.value = true;
           const docType = member.value.documentType.ids;
           if (
+            !isNonResident.value &&
             member.value.gotFromInsis === true &&
-            (docType === Enums.Insis.DocTypes['1UDL'] || docType === Enums.Insis.DocTypes.SBI || docType === Enums.Insis.DocTypes.PS || docType === Enums.Insis.DocTypes.VNZ)
+            (docType === CoreEnums.Insis.DocTypes['1UDL'] ||
+              docType === CoreEnums.Insis.DocTypes.SBI ||
+              docType === CoreEnums.Insis.DocTypes.PS ||
+              docType === CoreEnums.Insis.DocTypes.VNZ)
           ) {
             dataStore.isLoading = true;
             const docTypeCodes = {
@@ -1665,6 +1813,23 @@ export default {
               dataStore.isLoading = false;
               dataStore.showToaster('error', errorMessage, 5000);
             }
+          } else if (isNonResident.value) {
+            if (member.value.bankInfo.iik.length === useMask().iik.length) {
+              const isValidIik = await dataStore.checkAccountNumber(member.value.bankInfo.iik);
+              if (isValidIik === false) {
+                dataStore.showToaster('error', dataStore.t('error.notValidIik'));
+                member.value.bankInfo.iik = '';
+                isSubmittingForm.value = false;
+                return;
+              }
+              if (formStore.applicationData.pensionApp) {
+                formStore.applicationData.pensionApp.account = member.value.bankInfo.iik;
+                formStore.applicationData.pensionApp.bankBik = member.value.bankInfo.bik;
+                formStore.applicationData.pensionApp.bankBin = member.value.bankInfo.bin;
+                formStore.applicationData.pensionApp.bankId = member.value.bankInfo.bankName.id;
+              }
+            }
+            const hasMemberSaved = await saveMember();
           } else {
             member.value.gotFromInsis = true;
             const hasMemberSaved = await saveMember();
@@ -1807,6 +1972,13 @@ export default {
       deletionDialog.value = false;
     };
 
+    const clearAdditionalFile = (code: string) => {
+      const index = additionalDocuments.value.indexOf(additionalDocuments.value.find((i: any) => i.code == code));
+      if (index > -1) {
+        additionalDocuments.value.splice(index, 1);
+      }
+    };
+
     const onInit = async () => {
       // if (route.params.taskId === '0' || (route.params.taskId !== '0' && dataStore.isProcessEditable(formStore.applicationData.statusCode))) {
       //   await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
@@ -1823,9 +1995,9 @@ export default {
         if (dataStore.isLifetrip) {
           const documentByPriority = (() => {
             if (whichForm.value !== formStore.policyholderFormKey || formStore.isPolicyholderInsured === true) {
-              return member.value.documentsList.find(i => i.type === Enums.Insis.DocTypes.PS);
+              return member.value.documentsList.find(i => i.type === CoreEnums.Insis.DocTypes.PS);
             }
-            return member.value.documentsList.find(i => i.type === Enums.Insis.DocTypes['1UDL']);
+            return member.value.documentsList.find(i => i.type === CoreEnums.Insis.DocTypes['1UDL']);
           })();
           const userDocument = documentByPriority ? documentByPriority : member.value.documentsList[0];
           const documentType = dataStore.documentTypes.find((i: Value) => i.ids === userDocument.type);
@@ -1932,13 +2104,14 @@ export default {
       watch(
         () => member.value.age,
         val => {
-          if (val && Number(val) >= 18) {
-            if (member.value.hasAgreement !== true) {
+          if (val) {
+            if (Number(val) >= 18 && member.value.hasAgreement !== true) {
               member.value.hasAgreement = false;
+            } else {
+              member.value.hasAgreement = true;
             }
-          } else {
-            member.value.hasAgreement = true;
           }
+
           member.value.isInsuredUnderage = Number(val) >= 18 ? false : true;
         },
         { immediate: true },
@@ -1999,11 +2172,13 @@ export default {
       familyDialog,
       deletionDialog,
       documentChooseDialog,
+      fioChooseDialog,
       selectedIndex,
       selectedFamilyMember,
       sameAddress,
       isRelative,
       imageDataList,
+      contragents,
       // Computed
       whichForm,
       whichIndex,
@@ -2013,7 +2188,6 @@ export default {
       isDisabled,
       isTask,
       isIinPhoneDisabled,
-      isFromGBD,
       showSaveButton,
       hasGBDFL,
       hasInsis,
@@ -2025,10 +2199,13 @@ export default {
       hasInsurancePay,
       hasSignOfIPDL,
       hasSameAddressToggle,
+      hasIssuerOther,
       hasMemberSearch,
       hasWorkPositionDict,
       gbdDocuments,
       hasGBDFLDocSelection,
+      isNonResident,
+      isDataFromGov,
 
       // Rules
       ageRule,
@@ -2048,6 +2225,7 @@ export default {
       getContragentFromGBDFL,
       getContragent,
       attachFile,
+      attachAdditionalFile,
       attachDocumentReader,
       getDocumentReader,
       getFile,
@@ -2062,6 +2240,8 @@ export default {
       searchPositions,
       selectGbdDocument,
       pickPosition,
+      clearAdditionalFile,
+      getContragentClick,
     };
   },
 };