hl-core 0.0.10-beta.23 → 0.0.10-beta.25

package/api/base.api.ts

@@ -984,25 +984,41 @@ export class ApiClass {
         url: `${this.pensionannuityNew.base}/GetEnpfRedirectUrl?id=${id}`,
       });
     },
-    setEnpfSharedId: async (sharedId: string, infoId: string) => {
+    setEnpfSharedId: async (sharedId: string, infoId: string, isProd: boolean) => {
       return await this.axiosCall<void>({
         method: Methods.POST,
-        baseURL: getStrValuePerEnv('efoBaseApi'),
+        baseURL: isProd === false ? getStrValuePerEnv('efoBaseApi').replace('kz/efo', 'kz/test/efo') : getStrValuePerEnv('efoBaseApi'),
         url: `${this.pensionannuityNew.base}/SetEnpfSharedId/${sharedId}/${infoId}`,
       });
     },
+    calcParentContractSums: async (data: any) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/CalcParentContractSums`,
+        data: data,
+      });
+    },
+    reCalculateRefund: async (data: any) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/ReCalculateRefund`,
+        data: data,
+      });
+    },
   };
 
   externalServices = {
     base: '/externalservices',
-    onlineAccess: async (data: { iinBin: string; documentType: string }) => {
-      return await this.axiosCall<void>({
+    getOnlineAccess: async (data: { iinBin: string; documentType: string }) => {
+      return await this.axiosCall<{ code: string; message: string }>({
         method: Methods.POST,
         url: `${this.externalServices.base}/api/ExternalServices/GetOnlineAccess`,
         data: data,
       });
     },
-    digitalDocuments: async (data: { iin: string; processInstanceId: string; code: string }) => {
+    getDigitalDocuments: async (data: { iin: string; processInstanceId: string; code: string }) => {
       return await this.axiosCall<void>({
         method: Methods.POST,
         url: `${this.externalServices.base}/api/ExternalServices/DigitalDocuments`,
@@ -1085,6 +1101,16 @@ export class ApiClass {
         },
       });
     },
+    getFileNew: async (id: string) => {
+      return await this.axiosCall({
+        method: Methods.GET,
+        url: `${this.file.base}/api/GeneralSign/DownloadFile/${id}`,
+        responseType: 'arraybuffer',
+        headers: {
+          'Content-Type': 'application/pdf',
+        },
+      });
+    },
     deleteFile: async (data: any) => {
       return await this.axiosCall<void>({
         method: Methods.POST,
@@ -1131,5 +1157,12 @@ export class ApiClass {
         data: data,
       });
     },
+    setActualEnpf: async (data: { processId: string; isOnlineEnpfAgreement: boolean }) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/GeneralSign/SetActualEnpfAgreement`,
+        data: data,
+      });
+    },
   };
 }

package/components/Pages/Anketa.vue

@@ -273,7 +273,7 @@ export default defineComponent({
     const currentSecond = ref<AnketaSecond>();
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
-    const isFirstPanelOnRight = dataStore.isUnderwriter() && !useEnv().isProduction;
+    const isFirstPanelOnRight = dataStore.isUnderwriter();
 
     const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as 'insured' | 'policyholder') : 'insured'));
     const isSecondRequired = computed(() => dataStore.controls.isSecondAnketaRequired);

package/components/Pages/Documents.vue

@@ -202,8 +202,8 @@ import type { Base, FileActions } from '../../types';
 
 export default defineComponent({
   setup() {
-    type DigitalDocNames = 'Удостоверение личности' | 'Паспорт';
-    type DigitalDocTypes = 'IdentityCard' | 'Passport';
+    type DigitalDocNames = 'Удостоверение личности' | 'Паспорт' | 'Вид на жительство иностранного гражданина';
+    type DigitalDocTypes = 'IdentityCard' | 'Passport' | 'Vnzh';
 
     const route = useRoute();
     const dataStore = useDataStore();
@@ -224,10 +224,11 @@ export default defineComponent({
     const documentType = ref<DigitalDocNames | null>(null);
     const otpCode = ref<string>('');
     const currentIin = ref<string>('');
-    const deleteFilesId = ['1', '2', '46'];
+    const deleteFilesId = ['1', '2', '4', '46'];
     const documentItems: Array<{ title: DigitalDocNames; value: DigitalDocTypes }> = [
       { title: 'Удостоверение личности', value: 'IdentityCard' },
       { title: 'Паспорт', value: 'Passport' },
+      { title: 'Вид на жительство иностранного гражданина', value: 'Vnzh' },
     ];
     const signedContract = reactive<{
       processInstanceId: string | number;
@@ -293,7 +294,7 @@ export default defineComponent({
     const policyholderForm = computed(() => formStore.policyholderForm as Base.Document.Digital);
     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 documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2'].includes(String(i.fileTypeCode))));
+    const documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2', '4'].includes(String(i.fileTypeCode))));
 
     const openPanel = async (document: DocumentItem) => {
       dataStore.rightPanel.title = document.fileTypeName!;
@@ -414,7 +415,7 @@ 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')) {
+        if (hasDigitalDocuments.value && (currentDocument.value.fileTypeCode === '1' || currentDocument.value.fileTypeCode === '2' || currentDocument.value.fileTypeCode === '4')) {
           getDigitalDocs();
         }
       }
@@ -426,7 +427,7 @@ export default defineComponent({
         return;
       }
       documentLoading.value = true;
-      const response = await dataStore.onlineAccess(currentIin.value, String(documentType.value));
+      const response = await dataStore.getOnlineAccess(currentIin.value, String(documentType.value));
       if (response) {
         dataStore.showToaster('success', dataStore.t('toaster.successOtp'), 3000);
       }
@@ -434,12 +435,16 @@ export default defineComponent({
     };
 
     const getDigitalDocument = async () => {
+      if (!documentType.value) {
+        dataStore.showToaster('error', 'Выберите тип документа', 3000);
+        return;
+      }
       if (!otpCode.value) {
         dataStore.showToaster('error', 'Введите код подтверждения', 3000);
         return;
       }
       documentLoading.value = true;
-      const response = await dataStore.digitalDocuments(currentIin.value, String(formStore.applicationData.processInstanceId), otpCode.value);
+      const response = await dataStore.getDigitalDocuments(currentIin.value, String(formStore.applicationData.processInstanceId), otpCode.value);
       if (response) {
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
         getDigitalDocs();
@@ -455,7 +460,9 @@ export default defineComponent({
     const findCommonDocs = (members: Base.Document.Digital[]) => {
       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'));
+        const matchingDoc = formStore.signedDocumentList.find(
+          doc => doc.iin === String(member.iin).replaceAll('-', '') && (doc.fileTypeCode === '1' || doc.fileTypeCode === '2' || doc.fileTypeCode === '4'),
+        );
         if (matchingDoc) commonDocs.push(matchingDoc);
       }
       return commonDocs;

package/components/Pages/MemberForm.vue

@@ -828,7 +828,8 @@ export default {
     const memberStore = useMemberStore();
     const whichForm = computed(() => route.query.tab as keyof typeof StoreMembers);
     const whichIndex = computed(() => route.query.i as string);
-    const getMember = (whichForm: keyof typeof StoreMembers, whichIndex?: string) => memberStore.getMemberFromStore(whichForm, Number((whichIndex ? whichIndex : '0') as string))!;
+    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 isPanelOpen = ref<boolean>(false);
@@ -843,7 +844,7 @@ 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 isNonResident = computed(() => !useEnv().isProduction && dataStore.isPension && member.value.signOfResidency?.ids === '500011.2');
     const familyDialog = ref<boolean>(false);
     const deletionDialog = ref<boolean>(false);
     const documentChooseDialog = ref<boolean>(false);
@@ -869,7 +870,9 @@ export default {
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value));
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
-    const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
+    const isIinPhoneDisabled = computed(() =>
+      dataStore.isPension ? !!member.value.hasAgreement && member.value.phoneNumber && member.value.phoneNumber.length == 11 && !!member.value.iin : member.value.hasAgreement,
+    );
     const isFromGBD = computed(() => !!member.value.gosPersonData);
     const gbdDocuments = computed(() => {
       if (hasGBDFLDocSelection && !!member.value.gosPersonData && !!member.value.gosPersonData.documents) {
@@ -896,6 +899,7 @@ export default {
           case formStore.policyholdersRepresentativeFormKey:
             return route.params.taskId !== '0';
           default:
+            if (route.query.tab === 'slaveInsuredForm') return true;
             return false;
         }
       };
@@ -1082,12 +1086,13 @@ export default {
         case formStore.policyholderFormKey:
           return route.params.taskId === '0';
         case formStore.insuredFormKey:
-          if (dataStore.isPension && formStore.applicationData.processCode === 19) return route.params.taskId === '0';
           return route.query.id === '0';
         case formStore.policyholdersRepresentativeFormKey:
         case formStore.beneficiaryFormKey:
         case formStore.beneficialOwnerFormKey:
           return route.query.id === '0';
+        default:
+          if (dataStore.isPension && formStore.applicationData.processCode === 2 && route.query.tab === 'slaveInsuredForm') return true;
       }
     };
     const otpCondition = computed(() => {
@@ -1522,6 +1527,7 @@ export default {
     };
 
     const getContragentClick = async (contragent: ContragentType) => {
+      isButtonLoading.value = true;
       await dataStore.serializeContragentData(member.value, contragent);
       fioChooseDialog.value = false;
       isButtonLoading.value = false;
@@ -1665,17 +1671,40 @@ export default {
           }
         }
       }
-      if (whichForm.value === formStore.insuredFormKey) {
+      if (whichForm.value === formStore.insuredFormKey || memberFromApplicaiton.processInstanceId === formStore.applicationData.slave?.processInstanceId) {
         wasInsuredAction.value = true;
         if (dataStore.isPension) {
-          formStore.applicationData.pensionApp = {
-            ...formStore.applicationData.pensionApp,
-            account: member.value.bankInfo.iik,
-            bankBik: member.value.bankInfo.bik,
-            bankBin: member.value.bankInfo.bankName.ids,
-            bankId: member.value.bankInfo.bankName.id,
-            bankName: member.value.bankInfo.bankName.nameRu,
-          };
+          if (route.query.tab === 'slaveInsuredForm') {
+            formStore.applicationData.slave.pensionApp = {
+              ...formStore.applicationData.slave.pensionApp,
+              account: member.value.bankInfo.iik,
+              bankBik: member.value.bankInfo.bik,
+              bankBin: member.value.bankInfo.bankName.ids,
+              bankId: member.value.bankInfo.bankName.id,
+              bankName: member.value.bankInfo.bankName.nameRu,
+              guaranteedPeriod: formStore.applicationData.slave.pensionApp.guaranteedPeriod ?? 0,
+              amount: formStore.applicationData.slave.pensionApp.amount ?? 0,
+              compulsoryContractAmount: formStore.applicationData.slave.pensionApp.compulsoryContractAmount ?? 0,
+              voluntaryContractAmount: formStore.applicationData.slave.pensionApp.voluntaryContractAmount ?? 0,
+              ownFundsRaisAmount: formStore.applicationData.slave.pensionApp.ownFundsRaisAmount ?? 0,
+              compulsoryProfContractAmount: formStore.applicationData.slave.pensionApp.compulsoryProfContractAmount ?? 0,
+            };
+          } else {
+            formStore.applicationData.pensionApp = {
+              ...formStore.applicationData.pensionApp,
+              account: member.value.bankInfo.iik,
+              bankBik: member.value.bankInfo.bik,
+              bankBin: member.value.bankInfo.bankName.ids,
+              bankId: member.value.bankInfo.bankName.id,
+              bankName: member.value.bankInfo.bankName.nameRu,
+              guaranteedPeriod: formStore.applicationData.pensionApp.guaranteedPeriod ?? 0,
+              amount: formStore.applicationData.pensionApp.amount ?? 0,
+              compulsoryContractAmount: formStore.applicationData.pensionApp.compulsoryContractAmount ?? 0,
+              voluntaryContractAmount: formStore.applicationData.pensionApp.voluntaryContractAmount ?? 0,
+              ownFundsRaisAmount: formStore.applicationData.pensionApp.ownFundsRaisAmount ?? 0,
+              compulsoryProfContractAmount: formStore.applicationData.pensionApp.compulsoryProfContractAmount ?? 0,
+            };
+          }
           const data = {
             ...formStore.applicationData.pensionApp,
             transferContractCompany: formStore.applicationData.pensionApp.transferContractCompany?.nameRu ?? null,
@@ -1683,6 +1712,7 @@ export default {
           const isApplicationSaved = await dataStore.setApplication(data);
           if (isApplicationSaved === false) return;
           dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
+          await dataStore.saveMember(member.value, 'Client', memberFromApplicaiton);
         }
       }
       await router.replace({
@@ -1770,7 +1800,7 @@ export default {
                   isSubmittingForm.value = false;
                   return;
                 }
-                if (formStore.applicationData.pensionApp) {
+                if (formStore.applicationData.pensionApp && whichForm.value === 'insuredForm') {
                   formStore.applicationData.pensionApp.account = member.value.bankInfo.iik;
                   formStore.applicationData.pensionApp.bankBik = member.value.bankInfo.bik;
                   formStore.applicationData.pensionApp.bankBin = member.value.bankInfo.bin;
@@ -1791,7 +1821,7 @@ export default {
                 isSubmittingForm.value = false;
                 return;
               }
-              if (formStore.applicationData.pensionApp) {
+              if (formStore.applicationData.pensionApp && whichForm.value === 'insuredForm') {
                 formStore.applicationData.pensionApp.account = member.value.bankInfo.iik;
                 formStore.applicationData.pensionApp.bankBik = member.value.bankInfo.bik;
                 formStore.applicationData.pensionApp.bankBin = member.value.bankInfo.bin;
@@ -1977,12 +2007,10 @@ export default {
           member.value.documentDate = reformatDate(userDocument.issueDate);
           member.value.documentExpire = reformatDate(userDocument.expireDate);
         }
-
         // const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
         // if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
       }
       await setDefaultValues();
-      if (Number(formStore.applicationData.processCode) === 4) dataStore.members.insuredApp.isMultiple = true;
       if (hasWorkPositionDict && member.value.positionCode === null) member.value.jobPosition = null;
     };
     onMounted(async () => {
@@ -2032,7 +2060,7 @@ export default {
     );
 
     const onIinInput = () => {
-      if (!!member.value.iin && member.value.iin.length === useMask().iin.length && memberSetting.value.isMultiple === true) {
+      if (!!member.value.iin && member.value.iin.length === useMask().iin.length && memberSetting.value?.isMultiple === true) {
         const alreadyInStatement = formStore[whichForm.value as MultipleMember].findIndex((i: Member) => i.iin === member.value.iin);
         if (alreadyInStatement !== -1 && alreadyInStatement !== Number(whichIndex.value)) {
           dataStore.showToaster('error', dataStore.t('toaster.hasAlreadyMember'), 3000);
@@ -2096,15 +2124,17 @@ export default {
       );
     }
     if (dataStore.isPension) {
-      watch(
-        () => member.value.bankInfo.bankName,
-        val => {
-          if (val) {
-            member.value.bankInfo.bik = val.code as string;
-            member.value.bankInfo.bin = reformatIin(val.ids as string);
-          }
-        },
-      );
+      if (member.value.bankInfo) {
+        watch(
+          () => member.value.bankInfo.bankName,
+          val => {
+            if (val) {
+              member.value.bankInfo.bik = val.code as string;
+              member.value.bankInfo.bin = reformatIin(val.ids as string);
+            }
+          },
+        );
+      }
       watch(
         () => member.value.isDisability,
         val => {