Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-06 10:56:53 +03:00
parent 9097b5af2d
commit 9e534e9a34
18 changed files with 2204 additions and 2015 deletions

View File

@@ -2,96 +2,104 @@
<q-page v-if="canReadFinance" class="q-px-md q-pb-md page-col statement-page">
<q-slide-transition>
<div
v-show="!filtersCollapsed"
class="local-filter-bar compact-filter q-pa-sm q-mb-xs"
>
<div class="row q-col-gutter-sm items-end">
<div class="col-12 col-md-4">
<q-select
v-model="selectedCari"
:options="filteredOptions"
label="Cari kod / isim"
filled
dense
clearable
use-input
input-debounce="300"
@filter="filterCari"
emit-value
map-options
:loading="accountStore.loading"
option-value="value"
option-label="label"
behavior="menu"
:keep-selected="true"
/>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-input
v-model="dateFrom"
label="Tarih aralığı - başlangıç"
filled
dense
clearable
readonly
>
<template #append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-date
v-model="dateFrom"
mask="YYYY-MM-DD"
locale="tr-TR"
:options="isValidFromDate"
/>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-input
v-model="dateTo"
label="Tarih aralığı - bitiş"
filled
dense
clearable
readonly
>
<template #append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-date
v-model="dateTo"
mask="YYYY-MM-DD"
locale="tr-TR"
:options="isValidToDate"
/>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-select
v-model="selectedMonType"
:options="monetaryTypeOptions"
label="Parasal İşlem Tipi"
emit-value
map-options
filled
dense
/>
</div>
<div class="col-auto">
<q-btn color="primary" icon="filter_alt" label="Filtrele" @click="onFilterClick" />
</div>
<div class="col-auto">
<q-btn flat color="grey-8" icon="restart_alt" label="Sıfırla" @click="resetFilters" />
<div
v-show="!filtersCollapsed"
class="local-filter-bar compact-filter q-pa-sm q-mb-xs"
>
<div class="row q-col-gutter-sm items-end">
<div class="col-12 col-md-4">
<q-select
v-model="selectedCari"
:options="filteredOptions"
label="Cari kod / isim"
filled
dense
clearable
use-input
input-debounce="300"
@filter="filterCari"
emit-value
map-options
:loading="accountStore.loading"
option-value="value"
option-label="label"
behavior="menu"
:keep-selected="true"
/>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-input
v-model="dateFrom"
label="Tarih aralığı - başlangıç"
filled
dense
clearable
readonly
>
<template #append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-date
v-model="dateFrom"
mask="YYYY-MM-DD"
locale="tr-TR"
:options="isValidFromDate"
/>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-input
v-model="dateTo"
label="Tarih aralığı - bitiş"
filled
dense
clearable
readonly
>
<template #append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-date
v-model="dateTo"
mask="YYYY-MM-DD"
locale="tr-TR"
:options="isValidToDate"
/>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-select
v-model="selectedMonType"
:options="monetaryTypeOptions"
label="Parasal İşlem Tipi"
emit-value
map-options
filled
dense
/>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-toggle
v-model="excludeOpening"
label="Devir bakiyesiz listele"
color="primary"
dense
/>
</div>
<div class="col-auto">
<q-btn color="primary" icon="filter_alt" label="Filtrele" @click="onFilterClick" />
</div>
<div class="col-auto">
<q-btn flat color="grey-8" icon="restart_alt" label="Sıfırla" @click="resetFilters" />
</div>
</div>
</div>
</div>
</q-slide-transition>
<!-- Tablo Alanı -->
@@ -358,6 +366,7 @@ const monetaryTypeOptions = [
{ label: '1-3 r hesap', value: ['1', '3'] }
]
const selectedMonType = ref(monetaryTypeOptions[0].value)
const excludeOpening = ref(false)
/* Expand kontrolü */
const expandedRows = ref({})
@@ -404,7 +413,8 @@ async function onFilterClick() {
enddate: dateTo.value,
accountcode: selectedCari.value,
langcode: 'TR',
parislemler: selectedMonType.value
parislemler: selectedMonType.value,
excludeopening: excludeOpening.value
})
await detailStore.loadDetails({
@@ -454,6 +464,7 @@ function resetFilters() {
dateFrom.value = ''
dateTo.value = ''
selectedMonType.value = monetaryTypeOptions[0].value
excludeOpening.value = false
statementheaderStore.headers = []
detailStore.reset()
}
@@ -715,4 +726,3 @@ async function CurrheadDownload() {
}
}
</style>