From 58cd065977d26fd547bbfd8a4242d18ddc2fb6de Mon Sep 17 00:00:00 2001 From: burakovec Date: Fri, 26 Sep 2025 14:20:23 +0300 Subject: [PATCH] =?UTF-8?q?formmuhasebeayarlar=C4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/content/LotteryStates.vue | 2 +- .../cekilisler/stores/piyangoIkramiyeStore.ts | 2 + .../FormMuhasebePiyangoBilgileriDisplay.vue | 38 +++++++++---------- .../components/form/FormMuhasebeAyarlari.vue | 4 +- .../muhasebeSettingsValidationStore.ts | 12 +++--- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/module/cekilisler/components/content/LotteryStates.vue b/src/module/cekilisler/components/content/LotteryStates.vue index bd2a2a5..d38112b 100644 --- a/src/module/cekilisler/components/content/LotteryStates.vue +++ b/src/module/cekilisler/components/content/LotteryStates.vue @@ -50,7 +50,7 @@
- Başvuru onaylanmıştır. + Başvuruya izin verildi.
Başvuru uygun görülmemiştir. diff --git a/src/module/cekilisler/stores/piyangoIkramiyeStore.ts b/src/module/cekilisler/stores/piyangoIkramiyeStore.ts index 4e67720..83c6547 100644 --- a/src/module/cekilisler/stores/piyangoIkramiyeStore.ts +++ b/src/module/cekilisler/stores/piyangoIkramiyeStore.ts @@ -31,6 +31,7 @@ export const usePiyangoIkramiyeStore = defineStore('piyangoIkramiyeStore', () => const refreshList = ref(false) const ikramiyePanel = ref(false) const loaded = ref(false) + const totalIkramiyeValue = ref(0) const totalIkramiyeValues = reactive>({ yedekTalihliAdedi: 'toplamyedektalihli', @@ -69,6 +70,7 @@ export const usePiyangoIkramiyeStore = defineStore('piyangoIkramiyeStore', () => ikramiyePanel, loaded, totalIkramiyeValues, + totalIkramiyeValue, ResetForm, CalculateToplamDeger } diff --git a/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue b/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue index 50ecd38..3348746 100644 --- a/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue +++ b/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue @@ -56,9 +56,7 @@ Toplam İkramiye Bedeli: {{ - globalStore.toTrLocale( - Number(piyangoIkramiyeStore.totalIkramiyeValues.toplamDeger) - ) + globalStore.toTrLocale(Number(piyangoIkramiyeStore.totalIkramiyeValue)) }} @@ -72,10 +70,7 @@ Toplam Bedel: {{ - globalStore.toTrLocale( - Number(piyangoIkramiyeStore.totalIkramiyeValues.toplamDeger) + - calculatedKdv - ) + globalStore.toTrLocale(Number(piyangoIkramiyeStore.totalIkramiyeValue) + calculatedKdv) }} @@ -135,7 +130,7 @@ const calculatedBasvuruKdv = computed( () => (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) * - Number(muhasebeSettingsStore.muhasebeSettingsForm.BasvuruBedeliKdvOrani)) / + Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) / 100 ) @@ -183,20 +178,28 @@ izinBedelOranlari.value = data } } + const GetIkramiyeTotalValues = async () => { + console.log(piyangoStore,"piyangoStore") + let data = await dataStore.dataGet('Ikramiye/Cekilis/' + piyangoStore.selectedLottery) + if (data !== 'errorfalse') { + piyangoIkramiyeStore.totalIkramiyeValue = data.toplamdeger + } + } const BasvuruBedeliDialog = () => { + console.log(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) + console.log(calculatedBasvuruKdv.value) + console.log(Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) + calculatedBasvuruKdv.value) dialogStore.CreateDialog({ title: 'Başvuru Bedelini Muhasebeleştir', id: 'basvurubedelimuhasebelestir', - contentHtml: ` + contentHtml: `
- + - + @@ -204,10 +207,7 @@ @@ -244,6 +244,7 @@ const OpenIzinBedeliModal = async () => { await GetIzinBedelOranlari() + await GetIkramiyeTotalValues() showIzinBedeliModal.value = true selectedOran.value = null selectedOranId.value = null @@ -270,8 +271,7 @@ selectedOran.value = null } - calculatedKdv.value = - (Number(piyangoIkramiyeStore.totalIkramiyeValues) * Number(selectedOran!)) / 100 + calculatedKdv.value = (Number(piyangoIkramiyeStore.totalIkramiyeValue) * Number(selectedOran.value)) / 100 } const IzinBedeliMuhasebelestir = async () => { diff --git a/src/module/muhasebe/components/form/FormMuhasebeAyarlari.vue b/src/module/muhasebe/components/form/FormMuhasebeAyarlari.vue index ac90da3..8c71f8b 100644 --- a/src/module/muhasebe/components/form/FormMuhasebeAyarlari.vue +++ b/src/module/muhasebe/components/form/FormMuhasebeAyarlari.vue @@ -18,8 +18,8 @@ 100 + Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani) > 100 ) { isFormValid.value = false - invalidTexts['BasvuruBedeliKdvOrani'] = + invalidTexts['basvuruBedeliKdvOrani'] = 'Lütfen 0-100 arasında bir değer giriniz.' } else { - delete invalidTexts['BasvuruBedeliKdvOrani'] + delete invalidTexts['basvuruBedeliKdvOrani'] } } validationStore.IsFieldEmpty(
Başvuru Bedeli:${globalStore.toTrLocale( - muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli - )} ₺${globalStore.toTrLocale(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli)} ₺
KDV %20):KDV (%${muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani}): ${globalStore.toTrLocale(calculatedBasvuruKdv.value)}
Toplam Bedel: - ${globalStore.toTrLocale( - Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) + - calculatedBasvuruKdv.value - )} + ${globalStore.toTrLocale(Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) + calculatedBasvuruKdv.value)}