diff --git a/src/components/global/ListTableContent.vue b/src/components/global/ListTableContent.vue index 06f094f..18f05fe 100644 --- a/src/components/global/ListTableContent.vue +++ b/src/components/global/ListTableContent.vue @@ -468,9 +468,32 @@ fileName = 'export.xlsx' } + // Export için parametreleri hazırla + let exportParams: Record = {} + + // Sıralama parametrelerini ekle + if (localSort.value.sortColumn !== undefined) { + exportParams.sortColumn = localSort.value.sortColumn + if (localSort.value.sortOrder !== undefined && localSort.value.sortOrder !== '') + exportParams.sortOrder = localSort.value.sortOrder + } + + // Arama parametresini ekle + if (localQuery.value !== '') { + exportParams.searchString = localQuery.value + } + + // Filtre parametrelerini ekle + if (filters()) { + Object.keys(filterParams).forEach((f, k) => { + exportParams['Filters[' + f + ']'] = filterParams[f].op + filterParams[f].val + }) + } + // Axios ile dosya indirme - interceptor otomatik olarak token ekleyecek try { const response = await axios.get(exportUrl, { + params: exportParams, responseType: 'blob' }) diff --git a/src/module/cekilisler/components/form/FormPiyangoOnayLog.vue b/src/module/cekilisler/components/form/FormPiyangoOnayLog.vue index c2b598b..09c95c9 100644 --- a/src/module/cekilisler/components/form/FormPiyangoOnayLog.vue +++ b/src/module/cekilisler/components/form/FormPiyangoOnayLog.vue @@ -36,7 +36,7 @@ } }, { - name: 'islemYapanKullanici.email', + name: 'islemYapanKullanici', title: 'Kişi', sort: true, style: { width: '20%' } diff --git a/src/module/cekilisler/service/piyangoOnayService.ts b/src/module/cekilisler/service/piyangoOnayService.ts index 31d685e..e1f153a 100644 --- a/src/module/cekilisler/service/piyangoOnayService.ts +++ b/src/module/cekilisler/service/piyangoOnayService.ts @@ -66,10 +66,7 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => { piyangoOnayStore.piyangoPanelOnayForm.izinTarihi = '' piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi = '' } - dataForm.append( - 'onayDurumuIslemTipiId', - piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId - ) + dataForm.append('onayDurumuIslemTipiId', piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId) dataForm.append('id', piyangoOnayStore.piyangoPanelOnayForm.id) dataForm.append('onayCekilisId', String(piyangoStore.selectedLottery)) dataForm.append('kisiId', String(usersStore.userId))