Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-09 13:19:14 +03:00
parent 6df18ed14d
commit 0d303f0c0f
12 changed files with 382 additions and 280 deletions

View File

@@ -78,12 +78,8 @@ export const useAccountAgingBalanceStore = defineStore('accountAgingBalance', {
const islemTipiOk =
!state.filters.islemTipi.length ||
state.filters.islemTipi.some((t) => {
if (t === 'prbr_1_2') return bak12 !== 0
if (t === 'prbr_1_3') return bak13 !== 0
if (t === 'usd_1_2') return usd12 !== 0
if (t === 'try_1_2') return try12 !== 0
if (t === 'usd_1_3') return usd13 !== 0
if (t === 'try_1_3') return try13 !== 0
if (t === '1_2') return bak12 !== 0 || usd12 !== 0 || try12 !== 0
if (t === '1_3') return bak13 !== 0 || usd13 !== 0 || try13 !== 0
return false
})

View File

@@ -92,12 +92,8 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
const islemTipiOk =
!state.filters.islemTipi.length ||
state.filters.islemTipi.some((t) => {
if (t === 'prbr_1_2') return bak12 !== 0
if (t === 'prbr_1_3') return bak13 !== 0
if (t === 'usd_1_2') return usd12 !== 0
if (t === 'try_1_2') return try12 !== 0
if (t === 'usd_1_3') return usd13 !== 0
if (t === 'try_1_3') return try13 !== 0
if (t === '1_2') return bak12 !== 0 || usd12 !== 0 || try12 !== 0
if (t === '1_3') return bak13 !== 0 || usd13 !== 0 || try13 !== 0
return false
})
@@ -194,7 +190,15 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
const { data } = await api.get('/finance/customer-balances', {
params: {
selected_date: this.filters.selectedDate,
cari_search: String(this.filters.cariSearch || '').trim()
cari_search: String(this.filters.cariSearch || '').trim(),
cari_ilk_grup: (this.filters.cariIlkGrup || []).join(','),
piyasa: (this.filters.piyasa || []).join(','),
temsilci: (this.filters.temsilci || []).join(','),
risk_durumu: (this.filters.riskDurumu || []).join(','),
islem_tipi: (this.filters.islemTipi || []).join(','),
ulke: (this.filters.ulke || []).join(','),
il: (this.filters.il || []).join(','),
ilce: (this.filters.ilce || []).join(',')
}
})
this.rows = Array.isArray(data) ? data : []