diff --git a/src/module/cekilisler/components/form/FormPiyangoOnay.vue b/src/module/cekilisler/components/form/FormPiyangoOnay.vue index 2c8c75d..ef7aa68 100644 --- a/src/module/cekilisler/components/form/FormPiyangoOnay.vue +++ b/src/module/cekilisler/components/form/FormPiyangoOnay.vue @@ -55,16 +55,7 @@ diff --git a/src/module/cekilisler/service/piyangoOnayService.ts b/src/module/cekilisler/service/piyangoOnayService.ts index 5d51997..31d685e 100644 --- a/src/module/cekilisler/service/piyangoOnayService.ts +++ b/src/module/cekilisler/service/piyangoOnayService.ts @@ -55,5 +55,48 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => { piyangoOnayValidationStore.isFormValid = true } } - return { SaveOnayDurum } + + const SaveOnayDurumPanel = async () => { + if (piyangoOnayValidationStore.FormPanelCheck()) { + let form: any + let dataForm = new FormData() + + if (piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId !== 4) { + piyangoOnayStore.piyangoPanelOnayForm.izinSayisi = '' + piyangoOnayStore.piyangoPanelOnayForm.izinTarihi = '' + piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi = '' + } + dataForm.append( + 'onayDurumuIslemTipiId', + piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId + ) + dataForm.append('id', piyangoOnayStore.piyangoPanelOnayForm.id) + dataForm.append('onayCekilisId', String(piyangoStore.selectedLottery)) + dataForm.append('kisiId', String(usersStore.userId)) + dataForm.append('file', piyangoOnayStore.piyangoPanelOnayForm.file) + dataForm.append('aciklama', piyangoOnayStore.piyangoPanelOnayForm.aciklama) + dataForm.append('izinSayisi', piyangoOnayStore.piyangoPanelOnayForm.izinSayisi) + dataForm.append('izinTarihi', piyangoOnayStore.piyangoPanelOnayForm.izinTarihi) + dataForm.append( + 'izinAciklamasi', + piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi + ) + + form = await dataStore.dataPut( + 'OnayDurumu/' + piyangoOnayStore.piyangoPanelOnayForm.id, + { + data: dataForm, + headers: { 'Content-Type': 'multipart/form-data' }, + toast: { toast: 'Onay durumu başarıyla kaydedildi', type: 'success' } + } + ) + + if (form !== 'errorfalse') { + piyangoOnayStore.refreshList = true + } + } else { + piyangoOnayValidationStore.isPanelFormValid = true + } + } + return { SaveOnayDurum, SaveOnayDurumPanel } }) diff --git a/src/module/cekilisler/stores/piyangoOnayStore.ts b/src/module/cekilisler/stores/piyangoOnayStore.ts index fed42f3..7f0f4b8 100644 --- a/src/module/cekilisler/stores/piyangoOnayStore.ts +++ b/src/module/cekilisler/stores/piyangoOnayStore.ts @@ -18,10 +18,13 @@ export const usePiyangoOnayStore = defineStore('piyangoOnayStore', () => { izinAciklamasi: '' }) const piyangoOnayForm = reactive>({}) + const piyangoPanelOnayForm = reactive>({}) const piyangoOnaySafeForm = reactive>({}) const isUpdate = ref(false) const refreshList = ref(false) const loaded = ref(false) + const onayPanelLoaded = ref(false) + const onayFormPanel = ref(false) const ResetForm = () => { Object.assign(piyangoOnayForm, piyangoOnayBaseForm) @@ -30,10 +33,13 @@ export const usePiyangoOnayStore = defineStore('piyangoOnayStore', () => { return { piyangoOnayBaseForm, piyangoOnayForm, + piyangoPanelOnayForm, piyangoOnaySafeForm, isUpdate, refreshList, loaded, + onayPanelLoaded, + onayFormPanel, ResetForm } }) diff --git a/src/module/cekilisler/validation/piyangoOnayValidationStore.ts b/src/module/cekilisler/validation/piyangoOnayValidationStore.ts index 4c30af4..2bd1b1b 100644 --- a/src/module/cekilisler/validation/piyangoOnayValidationStore.ts +++ b/src/module/cekilisler/validation/piyangoOnayValidationStore.ts @@ -12,6 +12,8 @@ export const usePiyangoOnayValidationStore = defineStore( const formChanged = ref(false) const isFormValid = ref(true) const invalidTexts = reactive>({}) + const isPanelFormValid = ref(true) + const invalidTextsPanel = reactive>({}) const FormCheck = (): boolean => { Object.assign(invalidTexts, {}) @@ -40,11 +42,41 @@ export const usePiyangoOnayValidationStore = defineStore( return isFormValid.value } + const FormPanelCheck = (): boolean => { + Object.assign(invalidTextsPanel, {}) + + validationStore.IsFieldEmpty( + piyangoOnayStore.piyangoPanelOnayForm, + invalidTextsPanel, + 'onayDurumuIslemTipiId', + 'Bir işlem tipi seçmelisinz.' + ) + if (piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === 4) { + validationStore.IsFieldEmpty( + piyangoOnayStore.piyangoPanelOnayForm, + invalidTextsPanel, + 'izinSayisi', + 'İzin sayı no girmelisiniz.' + ) + validationStore.IsFieldEmpty( + piyangoOnayStore.piyangoPanelOnayForm, + invalidTextsPanel, + 'izinTarihi', + 'İzin tarihi seçmelisiniz.' + ) + } + isPanelFormValid.value = Object.keys(invalidTextsPanel).length === 0 + return isPanelFormValid.value + } + return { formChanged, isFormValid, + isPanelFormValid, invalidTexts, - FormCheck + invalidTextsPanel, + FormCheck, + FormPanelCheck } } ) diff --git a/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue b/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue index 3423045..22ffc52 100644 --- a/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue +++ b/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue @@ -79,7 +79,7 @@ {{ globalStore.toTrLocale( - Number(piyangoIkramiyeStore.totalIkramiyeValue) + calculatedKdv + Number(calculatedOran) + Number(calculatedKdv) ) }}