Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-03 01:11:19 +03:00
parent a4f4c2457f
commit ecf3a8bd07
4 changed files with 177 additions and 138 deletions

View File

@@ -1,6 +1,6 @@
<template>
<q-page v-if="canReadFinance" class="q-px-md q-pb-md q-pt-xs page-col statement-page">
<div class="filter-sticky compact-filter q-pa-sm q-mb-xs">
<q-page v-if="canReadFinance" class="q-px-md q-pb-md page-col statement-page">
<div 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-5">
<q-select
@@ -55,23 +55,6 @@
<div class="table-scroll">
<div class="sticky-bar row justify-end items-center q-pa-sm bg-grey-1">
<q-btn-dropdown
v-if="canExportFinance"
flat
color="red"
icon="picture_as_pdf"
label="Yazdır"
class="q-mr-sm"
>
<q-list style="min-width: 220px">
<q-item clickable v-close-popup @click="downloadAgingPDF">
<q-item-section class="text-primary">
Detaylı Yaşlandırma Ekstresi Yazdır
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
<q-btn
flat
color="secondary"
@@ -96,6 +79,16 @@
:loading="agingStore.loading"
:table-style="{ tableLayout: 'fixed', width: '100%' }"
>
<template #top-right>
<q-btn
color="red"
text-color="white"
icon="picture_as_pdf"
label="Detaylı PDF Yazdır"
@click="downloadAgingPDF"
/>
</template>
<template #header="props">
<q-tr :props="props" class="header-row">
<q-th v-for="col in props.cols" :key="col.name" :props="props">{{ col.label }}</q-th>
@@ -446,6 +439,8 @@ async function downloadAgingPDF () {
display: flex;
flex-direction: column;
overflow: hidden;
margin-top: 0 !important;
padding-top: 56px !important;
}
.table-scroll {
@@ -456,6 +451,14 @@ async function downloadAgingPDF () {
flex-direction: column;
}
.statement-page .local-filter-bar {
position: sticky !important;
top: 0 !important;
z-index: 980 !important;
margin-top: 0 !important;
padding-top: 0 !important;
}
.compact-filter {
border: 1px solid rgba(0, 0, 0, 0.12);
border-radius: 8px;

View File

@@ -1,87 +1,75 @@
<template>
<q-page v-if="canReadFinance" class="q-pa-md page-col statement-page">
<q-page v-if="canReadFinance" class="q-px-md q-pb-md page-col statement-page">
<!-- Cari Kod / İsim (sabit) -->
<div class="filter-sticky">
<q-select
v-model="selectedCari"
:options="filteredOptions"
label="Cari kod / isim"
filled
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>
<!-- Filtre Alanı -->
<div class="filter-collapsible">
<div class="row items-center justify-between q-pa-sm bg-grey-2">
<div class="text-subtitle1">Filtreler</div>
<q-btn
dense flat round
:icon="filtersOpen ? 'expand_less' : 'expand_more'"
@click="filtersOpen = !filtersOpen"
/>
</div>
<q-slide-transition>
<div v-show="filtersOpen" class="q-pa-md bg-grey-1">
<!-- Tarih Aralığı -->
<div class="row q-col-gutter-sm q-mb-md">
<div class="col-12 col-sm-6">
<q-input
v-model="dateFrom"
label="Tarih aralığı - başlangıç"
filled 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">
<q-input
v-model="dateTo"
label="Tarih aralığı - bitiş"
filled 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>
<!-- Parasal İşlem Tipi -->
<div 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"
@@ -89,31 +77,16 @@
emit-value
map-options
filled
class="q-mb-md"
dense
/>
<!-- Filtre / Sıfırla Butonları -->
<div class="row q-col-gutter-md items-center">
<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>
</q-slide-transition>
<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>
<!-- Tablo Alanı -->
@@ -478,8 +451,6 @@ function formatAmount(n) {
}).format(n)
}
const filtersOpen = ref(true)
/* Kolon gizle/göster */
const visibleColumns = ref([])
const showLeftCols = ref(true)
@@ -599,6 +570,22 @@ async function CurrheadDownload() {
display: flex;
flex-direction: column;
overflow: hidden;
margin-top: 0 !important;
padding-top: 56px !important;
}
.statement-page .local-filter-bar {
position: sticky !important;
top: 0 !important;
z-index: 980 !important;
margin-top: 0 !important;
padding-top: 0 !important;
}
.compact-filter {
border: 1px solid rgba(0, 0, 0, 0.12);
border-radius: 8px;
background: #fafafa;
}
.table-scroll {