hl-core 0.0.10-beta.20 → 0.0.10-beta.21

package/api/base.api.ts

@@ -182,7 +182,7 @@ export class ApiClass {
   async getContragent(queryData: Types.GetContragentRequest) {
     return await this.axiosCall<Types.GetContragentResponse>({
       method: Methods.GET,
-      url: `/Ekk/api/Contragentinsis/Contragent?Iin=${queryData.iin}&FirstName=${queryData.firstName}&LastName=${queryData.lastName}&MiddleName=${queryData.middleName}`,
+      url: `/Ekk/api/Contragentinsis/Contragent?Iin=${queryData.iin}&FirstName=${queryData.firstName}&LastName=${queryData.lastName}&MiddleName=${queryData.middleName}&BirthDate=${queryData.birthDate ?? ''}`,
     });
   }
 
@@ -299,17 +299,6 @@ export class ApiClass {
     });
   }
 
-  async getFile(id: string) {
-    return await this.axiosCall({
-      method: Methods.GET,
-      url: `/File/api/Data/DownloadFile/${id}`,
-      responseType: 'arraybuffer',
-      headers: {
-        'Content-Type': 'application/pdf',
-      },
-    });
-  }
-
   async getDicFileTypeList() {
     return await this.axiosCall<Value[]>({
       method: Methods.GET,
@@ -453,25 +442,6 @@ export class ApiClass {
     });
   }
 
-  async deleteFile(data: any) {
-    return await this.axiosCall<void>({
-      method: Methods.POST,
-      url: '/File/api/Data/DeleteFiles',
-      data: data,
-    });
-  }
-
-  async uploadFiles(data: any) {
-    return await this.axiosCall({
-      method: Methods.POST,
-      url: '/File/api/Data/UploadFiles',
-      headers: {
-        'Content-Type': 'multipart/form-data',
-      },
-      data: data,
-    });
-  }
-
   async sendTask(data: Types.SendTask) {
     return await this.axiosCall<void>({
       method: Methods.POST,
@@ -530,39 +500,6 @@ export class ApiClass {
     });
   }
 
-  async signDocument(data: Types.SignDataType[]) {
-    return await this.axiosCall<Types.SignUrlType[]>({
-      method: Methods.POST,
-      url: '/File/api/Document/SignBts',
-      data: data,
-    });
-  }
-
-  async signQR(data: Types.SignDataType[]) {
-    return await this.axiosCall<Types.ResponseStructure<any>>({
-      method: Methods.POST,
-      url: '/File/api/Sign/SignQr',
-      data: data,
-    });
-  }
-
-  async generateDocument(data: Types.SignDataType) {
-    return await this.axiosCall<void>({
-      method: Methods.POST,
-      url: '/File/api/Document/Generate',
-      responseType: 'arraybuffer',
-      data: data,
-    });
-  }
-
-  async getSignedDocList(data: { processInstanceId: string | number }) {
-    return await this.axiosCall<IDocument[]>({
-      method: Methods.POST,
-      url: '/File/api/Data/List',
-      data: data,
-    });
-  }
-
   async calculateWithoutApplication(data: Types.RecalculationDataType, product: string | undefined | null = this.productUrl) {
     return await this.axiosCall<Types.RecalculationResponseType>({
       method: Methods.POST,
@@ -966,30 +903,6 @@ export class ApiClass {
     });
   }
 
-  async uploadXml(data: any) {
-    return await this.axiosCall<void>({
-      url: `/File/api/Document/UploadXml`,
-      method: Methods.POST,
-      data: data,
-    });
-  }
-
-  async signXml(data: any) {
-    return await this.axiosCall<Types.ResponseStructure<any>>({
-      url: `/File/api/Sign/SignXml`,
-      method: Methods.POST,
-      data: data,
-    });
-  }
-
-  async signBts(data: any) {
-    return await this.axiosCall<Types.ResponseStructure<Types.SignUrlType[]>>({
-      url: `/File/api/Sign/SignBts`,
-      method: Methods.POST,
-      data: data,
-    });
-  }
-
   async generateShortLink(data: Types.Api.GenerateShortLink.Request) {
     return await this.axiosCall<Types.Api.GenerateShortLink.Response>({
       url: '/notification/shorteners',
@@ -1038,28 +951,6 @@ export class ApiClass {
     });
   }
 
-  async uploadDigitalCertifijcate(data: any) {
-    return await this.axiosCall<any>({
-      method: Methods.POST,
-      url: '/File/api/Document/UploadDigitalCertifijcate',
-      headers: {
-        'Content-Type': 'multipart/form-data',
-      },
-      data: data,
-    });
-  }
-
-  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,
@@ -1068,13 +959,6 @@ export class ApiClass {
     });
   }
 
-  async getDocumentsByEdsXmlId(edsXmlId: string) {
-    return await this.axiosCall<Types.ResponseStructure<any>>({
-      method: Methods.GET,
-      url: `/File/api/Sign/GetDocumentsByEdsXmlId/${edsXmlId}`,
-    });
-  }
-
   async checkSign(id: string) {
     return await this.axiosCall<Types.SignedState>({
       method: Methods.POST,
@@ -1091,23 +975,23 @@ export class ApiClass {
     });
   }
 
-  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}`,
-    });
-  }
+  pensionannuityNew = {
+    base: '/pensionannuityNew',
+    getEnpfRedirectUrl: async (id: string) => {
+      return await this.axiosCall<{ redirectUrl: string }>({
+        method: Methods.POST,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/GetEnpfRedirectUrl?id=${id}`,
+      });
+    },
+    setEnpfSharedId: async (sharedId: string, infoId: string) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        baseURL: getStrValuePerEnv('efoBaseApi'),
+        url: `${this.pensionannuityNew.base}/SetEnpfSharedId/${sharedId}/${infoId}`,
+      });
+    },
+  };
 
   externalServices = {
     base: '/externalservices',
@@ -1126,4 +1010,126 @@ export class ApiClass {
       });
     },
   };
+
+  file = {
+    base: '/File',
+    uploadFilesNew: async (groupId: string, data: any) => {
+      return await this.axiosCall({
+        method: Methods.POST,
+        url: `${this.file.base}/api/GeneralSign/UploadPaper/${groupId}`,
+        headers: {
+          'Content-Type': 'multipart/form-data',
+        },
+        data: data,
+      });
+    },
+    generalGetFile: async (groupId: string, documentSignType: number) => {
+      return await this.axiosCall<any>({
+        method: Methods.GET,
+        url: `${this.file.base}/api/GeneralSign/Group/${groupId}/${documentSignType} `,
+        responseType: documentSignType === 5 ? 'json' : 'arraybuffer',
+      });
+    },
+    generalSign: async (data: Types.Api.Sign.New.GeneralResponse) => {
+      return await this.axiosCall<Types.Api.Sign.New.Response>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/GeneralSign/Sign`,
+        data: data,
+      });
+    },
+    generateSign: async (data: Types.Api.Sign.New.Request) => {
+      return await this.axiosCall<Types.Api.Sign.New.GeneralResponse[]>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/GeneralSign/GenerateSign`,
+        data: data,
+      });
+    },
+    uploadDigitalCertificateNca: async (groupId: string, data: any) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/GeneralSign/UploadNClayer/${groupId}`,
+        headers: {
+          'Content-Type': 'multipart/form-data',
+        },
+        data: data,
+      });
+    },
+    uploadXml: async (data: any) => {
+      return await this.axiosCall<void>({
+        url: `${this.file.base}/api/GeneralSign/UploadXml`,
+        method: Methods.POST,
+        data: data,
+      });
+    },
+    signXml: async (data: any) => {
+      return await this.axiosCall<Types.ResponseStructure<any>>({
+        url: `${this.file.base}/api/Sign/SignXml`,
+        method: Methods.POST,
+        data: data,
+      });
+    },
+    signBts: async (data: any) => {
+      return await this.axiosCall<Types.ResponseStructure<Types.SignUrlType[]>>({
+        url: `${this.file.base}/api/Sign/SignBts`,
+        method: Methods.POST,
+        data: data,
+      });
+    },
+    getFile: async (id: string) => {
+      return await this.axiosCall({
+        method: Methods.GET,
+        url: `${this.file.base}/api/Data/DownloadFile/${id}`,
+        responseType: 'arraybuffer',
+        headers: {
+          'Content-Type': 'application/pdf',
+        },
+      });
+    },
+    deleteFile: async (data: any) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/Data/DeleteFiles`,
+        data: data,
+      });
+    },
+    uploadFiles: async (data: any) => {
+      return await this.axiosCall({
+        method: Methods.POST,
+        url: `${this.file.base}/api/Data/UploadFiles`,
+        headers: {
+          'Content-Type': 'multipart/form-data',
+        },
+        data: data,
+      });
+    },
+    signDocument: async (data: Types.SignDataType[]) => {
+      return await this.axiosCall<Types.SignUrlType[]>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/Document/SignBts`,
+        data: data,
+      });
+    },
+    signQR: async (data: Types.SignDataType[]) => {
+      return await this.axiosCall<Types.ResponseStructure<any>>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/Sign/SignQr`,
+        data: data,
+      });
+    },
+    generateDocument: async (data: Types.SignDataType) => {
+      return await this.axiosCall<void>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/Document/Generate`,
+        responseType: 'arraybuffer',
+        data: data,
+      });
+    },
+    getSignedDocList: async (data: { processInstanceId: string | number }) => {
+      return await this.axiosCall<IDocument[]>({
+        method: Methods.POST,
+        url: `${this.file.base}/api/Data/List`,
+        data: data,
+      });
+    },
+  };
 }

package/components/Dialog/Dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-dialog class="base-dialog" :model-value="Boolean(modelValue)" @update:modelValue="$emit('update:modelValue', $event)" :persistent="true">
+  <v-dialog class="base-dialog" :model-value="Boolean(modelValue)" @update:modelValue="$emit('update:modelValue', $event)" :persistent="persistent">
     <v-card class="self-center w-full sm:w-4/4 md:w-2/3 lg:w-[35%] xl:w-[500px] rounded-lg !p-[36px]">
       <div class="flex sm:flex-row flex-col place-items-center sm:place-items-start">
         <div class="h-20 w-20 place-items-start pt-1">
@@ -44,6 +44,10 @@ export default defineComponent({
       type: Boolean as PropType<boolean | null>,
       default: false,
     },
+    persistent: {
+      type: Boolean as PropType<boolean>,
+      default: true,
+    },
     title: {
       type: String,
       default() {

package/components/Form/ManagerAttachment.vue

@@ -155,19 +155,16 @@ export default defineComponent({
       return isReadonly.value;
     });
     const isSaleChanellShown = computed(() => {
-      if (dataStore.isGons) return dataStore.isServiceManager();
       return true;
     });
     const isRegionShown = computed(() => {
-      if (dataStore.isGons) return dataStore.isServiceManager() || dataStore.isAgent();
       return true;
     });
     const isManagerShown = computed(() => {
-      if (dataStore.isGons) return dataStore.isServiceManager();
       return true;
     });
     const isAgentShown = computed(() => {
-      if (dataStore.isGons || dataStore.isPension) return dataStore.isServiceManager();
+      if (dataStore.isPension) return dataStore.isServiceManager();
       return true;
     });
     const openPanel = async (currentDict: ManagerAttachmentFiels, title: string) => {

package/components/Input/RoundedSelect.vue

@@ -150,6 +150,8 @@ export default defineComponent({
   border: 1px solid #dadada;
   box-shadow: none;
   font-size: 14px;
+  padding-top: 6px;
+  padding-bottom: 4px;
 }
 .rounded-select .v-field--error {
   border-color: #ff5449;