Merge remote-tracking branch 'origin/master'

ui/src/pages/statementofaccount.vue

@@ -240,13 +240,13 @@
 
           <!-- Detay tablosu -->
           <q-tr
-            v-if="props.row._type === 'data' && expandedRows[props.row.belge_no]"
+            v-if="props.row._type === 'data' && expandedRows[getRowExpandKey(props.row)]"
             class="sub-row"
           >
             <q-td colspan="100%">
               <q-table
-                :rows="detailStore.getDetailsByBelge(props.row.belge_no)"
-                :columns="detailColumns(props.row.belge_no)"
+                :rows="detailStore.getDetailsByRowKey(getRowExpandKey(props.row))"
+                :columns="detailColumns(getRowExpandKey(props.row))"
                 row-key="Urun_Kodu"
                 flat
                 dense
@@ -387,8 +387,8 @@ function buildColumns(data) {
 
 const columns = computed(() => buildColumns(statementheaderStore.headers))
 
-function detailColumns(belgeNo) {
-  const details = detailStore.getDetailsByBelge(belgeNo)
+function detailColumns(rowOrBelgeNo) {
+  const details = detailStore.getDetailsByRowKey(rowOrBelgeNo)
   return buildColumns(details)
 }
 
@@ -417,33 +417,57 @@ async function onFilterClick() {
     excludeopening: excludeOpening.value
   })
 
-  await detailStore.loadDetails({
-    accountCode: selectedCari.value,
-    startDate: dateFrom.value,
-    endDate: dateTo.value,
-    parislemler: selectedMonType.value
-  })
 }
 
 /* Grup satırları için özel rowKey */
 const rowKeyFn = (row) =>
-  row._type === 'group' ? `grp-${row.para_birimi}` : row.belge_no
+  row._type === 'group' ? `grp-${row.para_birimi}` : getRowExpandKey(row)
+
+function getRowExpandKey (row) {
+  return [
+    String(row?.belge_no || '').trim(),
+    String(row?.belge_tarihi || '').trim(),
+    String(row?.para_birimi || '').trim(),
+    String(row?.islem_tipi || '').trim(),
+    String(row?.cari_kod || '').trim()
+  ].join('|')
+}
 
 /* Detay açma sadece expand kontrolü */
-function toggleRowDetails(row) {
+async function toggleRowDetails(row) {
   if (row._type === 'group') return
-  expandedRows.value[row.belge_no] = !expandedRows.value[row.belge_no]
+  const key = getRowExpandKey(row)
+  const next = !expandedRows.value[key]
+  expandedRows.value[key] = next
+
+  if (!next) return
+  if (!row?.belge_no || String(row.belge_no).trim() === 'Baslangic_devir') return
+  if (detailStore.hasDetailsByRowKey(key)) return
+
+  await detailStore.loadDetails({
+    accountCode: selectedCari.value,
+    belgeNo: row.belge_no,
+    rowKey: key
+  })
 }
 
 /* Tüm detayları aç/kapat */
-function toggleAllDetails() {
+async function toggleAllDetails() {
   allDetailsOpen.value = !allDetailsOpen.value
   if (allDetailsOpen.value) {
+    const dataRows = []
     for (const row of statementheaderStore.headers) {
       if (row.belge_no) {
-        expandedRows.value[row.belge_no] = true
+        const key = getRowExpandKey(row)
+        expandedRows.value[key] = true
+        dataRows.push(row)
       }
     }
+    await detailStore.preloadForRows({
+      accountCode: selectedCari.value,
+      rows: dataRows,
+      getRowKey: getRowExpandKey
+    })
   } else {
     expandedRows.value = {}
   }

ui/src/stores/statementdetailStore.js

@@ -4,15 +4,16 @@ import api from 'src/services/api'
 
 export const useStatementdetailStore = defineStore('statementdetail', {
   state: () => ({
-    details: [],
+    detailsByRow: {},
+    detailsByBelge: {},
     loading: false,
     error: null
   }),
 
   actions: {
-    async loadDetails ({ accountCode, startDate, endDate, parislemler }) {
+    async loadDetails ({ accountCode, belgeNo, rowKey }) {
       if (!accountCode) {
-        this.error = 'Geçerli bir cari kod seçilmedi.'
+        this.error = 'Gecerli bir cari kod secilmedi.'
         return
       }
 
@@ -20,46 +21,74 @@ export const useStatementdetailStore = defineStore('statementdetail', {
       this.error = null
 
       try {
-        // ✅ Params (arrayFormat=repeat global)
-        const params = {
-          startdate: startDate,
-          enddate: endDate
+        const normalizedBelgeNo = String(belgeNo || '').trim()
+        const params = { belgeno: normalizedBelgeNo }
+
+        if (this.detailsByBelge[normalizedBelgeNo]) {
+          const keyCached = String(rowKey || '').trim()
+          if (keyCached) {
+            this.detailsByRow[keyCached] = this.detailsByBelge[normalizedBelgeNo]
+          }
+          return
         }
 
-        if (Array.isArray(parislemler) && parislemler.length > 0) {
-          params.parislemler = parislemler.filter(
-            p => p !== undefined && p !== null && p !== ''
-          )
-        }
-
-        // 🔐 TOKEN + SERIALIZER + ERROR HANDLING OTOMATİK
         const res = await api.get(
-          `/statements/${accountCode}/details`,
+          `/statements/${encodeURIComponent(accountCode)}/details`,
           { params }
         )
 
-        this.details = res.data || []
-
+        const key = String(rowKey || '').trim()
+        const rows = Array.isArray(res.data) ? res.data : []
+        if (normalizedBelgeNo) {
+          this.detailsByBelge[normalizedBelgeNo] = rows
+        }
+        if (key) {
+          this.detailsByRow[key] = rows
+        }
       } catch (err) {
-        console.error('❌ Details yüklenemedi:', err)
+        console.error('Details yuklenemedi:', err)
         this.error =
           err?.data?.message ||
           err?.message ||
-          'Detaylar yüklenemedi'
+          'Detaylar yuklenemedi'
       } finally {
         this.loading = false
       }
     },
 
-    getDetailsByBelge (belgeNo) {
-      const needle = String(belgeNo || '').trim()
-      return this.details.filter(
-        d => String(d.belge_ref_numarasi || '').trim() === needle
-      )
+    hasDetailsByRowKey (rowKey) {
+      const key = String(rowKey || '').trim()
+      return Array.isArray(this.detailsByRow[key])
+    },
+
+    getDetailsByRowKey (rowKey) {
+      const key = String(rowKey || '').trim()
+      return this.detailsByRow[key] || []
+    },
+
+    async preloadForRows ({ accountCode, rows, getRowKey }) {
+      const tasks = []
+
+      for (const row of rows || []) {
+        const belgeNo = String(row?.belge_no || '').trim()
+        if (!belgeNo || belgeNo === 'Baslangic_devir') continue
+
+        const rowKey = String(getRowKey(row) || '').trim()
+        if (!rowKey) continue
+        if (this.hasDetailsByRowKey(rowKey)) continue
+
+        tasks.push(
+          this.loadDetails({ accountCode, belgeNo, rowKey })
+        )
+      }
+
+      if (tasks.length === 0) return
+      await Promise.all(tasks)
     },
 
     reset () {
-      this.details = []
+      this.detailsByRow = {}
+      this.detailsByBelge = {}
       this.loading = false
       this.error = null
     }