M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-03-04 15:25:12 +03:00
parent f40fa0ed18
commit b1150c5ef7
2 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
ui/src/pages/OrderEntry.vue
View File

@@ -29,6 +29,7 @@
:options="filteredCariOptions"
label="Cari Seçimi"
filled
dense
use-input
input-debounce="300"
emit-value
@@ -98,8 +99,44 @@
/>
</div>
<!-- 🔹 Cari Bilgi Satırı (2. Satır) -->
<div
v-if="cariInfo"
v-show="!filterBarCollapsed"
class="col-12 row q-col-gutter-md q-mt-xs cari-info-bar"
>
<div class="col-3">
<q-input
:model-value="cariInfo.Musteri_Temsilcisi || '-'"
label="Müşteri Temsilcisi"
filled dense readonly
/>
</div>
<div class="col-3">
<q-input
:model-value="cariInfo.Musteri_Ana_Grubu || '-'"
label="Ana Grup"
filled dense readonly
/>
</div>
<div class="col-3">
<q-input
:model-value="cariInfo.Piyasa || '-'"
label="Piyasa"
filled dense readonly
/>
</div>
<div class="col-3">
<q-input
:model-value="cariInfo.Ulke || '-'"
label="Ülke"
filled dense readonly
/>
</div>
</div>
<!-- 💰 TOPLAM TUTAR + KDV -->
<div class="col-12 row q-col-gutter-sm q-mt-xs items-center">
<div v-show="!filterBarCollapsed" class="col-12 row q-col-gutter-sm q-mt-xs items-center">
<!-- 💰 Toplam Tutar -->
<div class="col-3">
<q-input
@@ -172,7 +209,7 @@
</div>
<!-- 📝 Sipariş Genel Açıklaması (filter bar altında) -->
<div class="filter-bar-desc q-mt-sm">
<div v-show="!filterBarCollapsed" class="filter-bar-desc q-mt-sm">
<q-input
v-model="form.Description"
type="textarea"
@@ -187,47 +224,18 @@
:readonly="isViewOnly"
/>
</div>
<!-- 🔹 Cari Bilgi Barı -->
<q-slide-transition>
<div
v-if="cariInfo"
class="row q-col-gutter-md q-mt-xs cari-info-bar"
>
<div class="col-3">
<q-input
:model-value="cariInfo.Musteri_Temsilcisi || '-'"
label="Müşteri Temsilcisi"
filled dense readonly
/>
</div>
<div class="col-3">
<q-input
:model-value="cariInfo.Musteri_Ana_Grubu || '-'"
label="Ana Grup"
filled dense readonly
/>
</div>
<div class="col-3">
<q-input
:model-value="cariInfo.Piyasa || '-'"
label="Piyasa"
filled dense readonly
/>
</div>
<div class="col-3">
<q-input
:model-value="cariInfo.Ulke || '-'"
label="Ülke"
filled dense readonly
/>
</div>
</div>
</q-slide-transition>
<!-- 🔹 Save Toolbar -->
<div class="save-toolbar">
<div class="text-subtitle2 text-weight-bold">Sipariş Formu</div>
<div>
<q-btn
flat
color="grey-7"
class="q-ml-sm"
:label="filterBarCollapsed ? 'FİLTREYİ GENİŞLET' : 'FİLTREYİ DARALT'"
:icon="filterBarCollapsed ? 'expand_more' : 'expand_less'"
@click="toggleFilterBarCollapsed"
/>
<q-btn
flat
color="grey-7"
@@ -807,6 +815,15 @@ const formatDate = formatDateDisplay
const showEditor = ref(false)
const compactGridHeader = ref(false)
const filterBarCollapsed = ref(false)
function toggleFilterBarCollapsed () {
filterBarCollapsed.value = !filterBarCollapsed.value
nextTick(() => {
updateStickyVars()
measureHeaderGap()
})
}
@@ -3191,7 +3208,10 @@ function updateStickyVars() {
try {
const root = document.documentElement
const headerH = document.querySelector('.q-header')?.offsetHeight || 56
const filterH = document.querySelector('.filter-bar')?.offsetHeight || 72
const filterMainH = document.querySelector('.filter-bar')?.offsetHeight || 0
const filterDescH = document.querySelector('.filter-bar-desc')?.offsetHeight || 0
const cariInfoH = document.querySelector('.cari-info-bar')?.offsetHeight || 0
const filterH = filterMainH + filterDescH + cariInfoH
const saveH = document.querySelector('.save-toolbar')?.offsetHeight || 52
const totalSticky = headerH + filterH + saveH
@@ -3200,7 +3220,7 @@ function updateStickyVars() {
root.style.setProperty('--save-h', `${saveH}px`)
root.style.setProperty('--sticky-total', `${totalSticky}px`)
console.log(`📐 Sticky vars → header:${headerH}, filter:${filterH}, save:${saveH}`)
console.log(`📐 Sticky vars → header:${headerH}, filterMain:${filterMainH}, filterDesc:${filterDescH}, cariInfo:${cariInfoH}, filterTotal:${filterH}, save:${saveH}`)
} catch (err) {
console.warn('⚠️ updateStickyVars hata:', err)
}