Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-03-03 13:45:15 +03:00
parent 008eeb3e5f
commit 337364b259
4 changed files with 178 additions and 19 deletions

View File

@@ -28,7 +28,7 @@ export const useAccountAgingBalanceStore = defineStore('accountAgingBalance', {
cariIlkGrupOptions: (state) => uniqueOptions(state.rows, 'cari_ilk_grup'),
piyasaOptions: (state) => uniqueOptions(state.rows, 'piyasa'),
temsilciOptions: (state) => uniqueOptions(state.rows, 'temsilci'),
riskDurumuOptions: (state) => uniqueOptions(state.rows, 'risk_durumu'),
riskDurumuOptions: (state) => uniqueOptions(state.rows, 'risk_durumu', { includeDash: true }),
ulkeOptions: (state) => uniqueOptions(state.rows, 'ozellik05'),
ilOptions: (state) => uniqueOptions(state.rows, 'il'),
ilceOptions: (state) => uniqueOptions(state.rows, 'ilce'),
@@ -45,7 +45,7 @@ export const useAccountAgingBalanceStore = defineStore('accountAgingBalance', {
const matchMulti = (selectedSet, value) => {
if (!selectedSet.size) return true
const normalized = normalizeText(value)
if (!normalized) return true
if (!normalized) return selectedSet.has('-')
return selectedSet.has(normalized)
}
@@ -239,17 +239,24 @@ export const useAccountAgingBalanceStore = defineStore('accountAgingBalance', {
const excludedCariIlkGrup = new Set([normalizeText('transfer'), normalizeText('perakende'), normalizeText('dtf')])
this.filters.cariIlkGrup = this.cariIlkGrupOptions.map(o => o.value).filter(v => !excludedCariIlkGrup.has(normalizeText(v)))
const excludedRisk = new Set([normalizeText('avukat'), normalizeText('orta risk'), normalizeText('yuksek risk')])
this.filters.riskDurumu = this.riskDurumuOptions.map(o => o.value).filter(v => !excludedRisk.has(normalizeText(v)))
this.filters.riskDurumu = []
}
}
})
function uniqueOptions (rows, field) {
function uniqueOptions (rows, field, opts = {}) {
const includeDash = !!opts.includeDash
const set = new Set()
if (includeDash) set.add('-')
for (const r of rows) {
const v = String(r[field] || '').trim()
if (v) set.add(v)
if (v) {
set.add(v)
continue
}
if (includeDash) {
set.add('-')
}
}
return Array.from(set).sort((a, b) => a.localeCompare(b, 'tr')).map(v => ({ label: v, value: v }))
}

View File

@@ -28,7 +28,7 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
cariIlkGrupOptions: (state) => uniqueOptions(state.rows, 'cari_ilk_grup'),
piyasaOptions: (state) => uniqueOptions(state.rows, 'piyasa'),
temsilciOptions: (state) => uniqueOptions(state.rows, 'temsilci'),
riskDurumuOptions: (state) => uniqueOptions(state.rows, 'risk_durumu'),
riskDurumuOptions: (state) => uniqueOptions(state.rows, 'risk_durumu', { includeDash: true }),
ulkeOptions: (state) => uniqueOptions(state.rows, 'ozellik05'),
ilOptions: (state) => uniqueOptions(state.rows, 'il'),
ilceOptions: (state) => uniqueOptions(state.rows, 'ilce'),
@@ -45,7 +45,7 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
const matchMulti = (selectedSet, value) => {
if (!selectedSet.size) return true
const normalized = normalizeText(value)
if (!normalized) return true
if (!normalized) return selectedSet.has('-')
return selectedSet.has(normalized)
}
@@ -254,23 +254,24 @@ export const useCustomerBalanceListStore = defineStore('customerBalanceList', {
.map(o => o.value)
.filter(v => !excludedCariIlkGrup.has(normalizeText(v)))
const excludedRisk = new Set([
normalizeText('avukat'),
normalizeText('orta risk'),
normalizeText('yuksek risk')
])
this.filters.riskDurumu = this.riskDurumuOptions
.map(o => o.value)
.filter(v => !excludedRisk.has(normalizeText(v)))
this.filters.riskDurumu = []
}
}
})
function uniqueOptions (rows, field) {
function uniqueOptions (rows, field, opts = {}) {
const includeDash = !!opts.includeDash
const set = new Set()
if (includeDash) set.add('-')
for (const r of rows) {
const v = String(r[field] || '').trim()
if (v) set.add(v)
if (v) {
set.add(v)
continue
}
if (includeDash) {
set.add('-')
}
}
return Array.from(set)