Merge remote-tracking branch 'origin/master'

ui/src/pages/AgingCustomerBalancelist.go.vue

@@ -690,7 +690,25 @@ const metricDefs = {
   try_1_3: { name: 'tl_bakiye_1_3', label: '1_3 TRY_BAKIYE', field: 'tl_bakiye_1_3', align: 'center', sortable: true, sort: (a, b) => toNumericSortValue(a) - toNumericSortValue(b) }
 }
 
-const selectedMetricKeys = computed(() => [...Object.keys(metricDefs)])
+const selectedMetricKeys = computed(() => {
+  const selected = (store.filters.islemTipi || [])
+    .map(v => String(v).trim())
+    .filter(Boolean)
+
+  if (selected.length === 0) {
+    return [...Object.keys(metricDefs)]
+  }
+
+  const show12 = selected.includes('1_2')
+  const show13 = selected.includes('1_3')
+
+  return Object.keys(metricDefs).filter((key) => {
+    if (!show12 && !show13) return true
+    if (key.endsWith('_1_2')) return show12
+    if (key.endsWith('_1_3')) return show13
+    return true
+  })
+})
 
 const summaryColumns = computed(() => ([
   { name: 'expand', label: '', field: 'expand', align: 'center', sortable: false },

ui/src/pages/CustomerBalanceList.vue

@@ -592,7 +592,25 @@ const metricDefs = {
   try_1_3: { name: 'tl_bakiye_1_3', label: '1_3 TRY_BAKIYE', field: 'tl_bakiye_1_3', align: 'center', sortable: true, sort: (a, b) => toNumericSortValue(a) - toNumericSortValue(b) }
 }
 
-const selectedMetricKeys = computed(() => Object.keys(metricDefs))
+const selectedMetricKeys = computed(() => {
+  const selected = (store.filters.islemTipi || [])
+    .map(v => String(v).trim())
+    .filter(Boolean)
+
+  if (selected.length === 0) {
+    return Object.keys(metricDefs)
+  }
+
+  const show12 = selected.includes('1_2')
+  const show13 = selected.includes('1_3')
+
+  return Object.keys(metricDefs).filter((key) => {
+    if (!show12 && !show13) return true
+    if (key.endsWith('_1_2')) return show12
+    if (key.endsWith('_1_3')) return show13
+    return true
+  })
+})
 
 const summaryColumns = computed(() => ([
   { name: 'expand', label: '', field: 'expand', align: 'center', sortable: false },