Add PiyangoDetay component "Çekiliş Tutanağı" tab. Import new TabPiyangoCekilisTutanagi component and enhance tab list structure for improved user navigation.

- gereksiz paketler package.json dan silindi
- Kullanılmayan quill dosyaları silindi

Configs.ts

@@ -0,0 +1,23 @@
+// build olurken bazı klasorlerin ayri script olarak kaydedilmesi
+export const TEMPLATE_CHUNK_GROUPS: Record<string, (RegExp | string)[]> = {
+  store: [/\/src\/stores\//],
+  //lott: [/\/src\/module\/cekilisler\//],
+  //user: [/\/src\/module\/kullanicilar\//],
+  //cust: [/\/src\/module\/uyeler\//],
+  //acc: [/\/src\/module\/muhasebe\//],
+  //site: [/\/src\/module\/site-yonetimi\//],
+  //aut: [/\/src\/module\/auth\//]
+}
+
+// id -> group_name
+export function SetTemplateGroup(id: string): string | undefined {
+  const cleanId = id.split('?')[0]
+  for (const [group, pats] of Object.entries(TEMPLATE_CHUNK_GROUPS)) {
+    if (
+      pats.some((p) => (typeof p === 'string' ? cleanId.includes(p) : p.test(cleanId)))
+    ) {
+      return group
+    }
+  }
+  return undefined
+}

package.json

@@ -21,8 +21,6 @@
     "jquery": "^3.7.1",
     "parchment": "^3.0.0",
     "pinia": "^2.1.7",
-    "quill": "^2.0.3",
-    "quill-image-resize-module": "^3.0.0",
     "summernote": "^0.9.1",
     "uuid": "^11.1.0",
     "vue": "^3.4.29",

public/web.config

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Handle History Mode and custom 404/500" stopProcessing="true">
+          <match url="(.*)" />
+          <conditions logicalGrouping="MatchAll">
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+          </conditions>
+          <action type="Rewrite" url="/" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>

sql_query_updated.sql

@@ -0,0 +1,166 @@
+SELECT        c.Id, c.PiyangoId, c.Baslik, ISNULL(c.CreateDate, '0001-01-01') AS OlusturmaTarihi, MIN(ISNULL(cb.BaslangicTarihi, '0001-01-01')) AS BaslangicTarihi, MIN(ISNULL(cb.BitisTarihi, '0001-01-01')) AS BitisTarihi, 
+
+                         /* DÜZENLEYEN (mevcut)*/ COALESCE (NULLIF (d .DernekUnvan, ''), NULLIF (d .GercekTicariUnvan, ''), NULLIF (d .kamuUnvan, ''), NULLIF (d .SirketUnvan, ''), NULLIF (d .TuzelUnvan, ''), LTRIM(RTRIM(COALESCE (d .GercekAdi, 
+
+                         '') + ' ' + COALESCE (d .GercekSoyadi, ''))), iblist.IrtibatAdSoyad, 'Bilinmiyor') AS Duzenleyen, ISNULL(d .Id, 0) AS DuzenleyenId, 
+                         
+                         /* MÜDÜRLÜK (yeni - 2. başlık)*/ 
+                         CASE 
+                            WHEN odlast.Mudurluk = 1 THEN '1 No''lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü'
+                            WHEN odlast.Mudurluk = 2 THEN '2 No''lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü'
+                            WHEN odlast.Mudurluk = 3 THEN '3 No''lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü'
+                            ELSE ISNULL(birim.BirimAdi, '')
+                         END AS Mudurluk,
+                         
+                         MIN(cy.Deger) AS CekilisYontemi, MIN(cb.CekilisYontemiId) AS CekilisYontemiId, MIN(cb.KatilimciListesiTeslimYontemiId) AS KatilimciListesiTeslimYontemiId, MIN(klt.Deger) AS KatilimciListesiTeslimYontemi, ik.Ikramiyeler, 
+
+                         ISNULL(odlast.OnayDurumuIslemTipiId, 0) AS DurumId, ISNULL(odlast.IslemTipi, 'Yeni Piyango') AS Durum, MIN(ISNULL(cb.CekilisTarihi, '0001-01-01')) AS CekilisTarihi, ap.AmacAdi AS piyangoamac, 
+
+                         c.amacpiyangoId AS piyangoAmacId, ISNULL(oc.OnayVerecekKisi1Id, 0) AS OnayVerecekKisi1Id, ISNULL(oc.OnayVerecekKisi2Id, 0) AS OnayVerecekKisi2Id, ISNULL(oc.OnayVerecekKisi3Id, 0) AS OnayVerecekKisi3Id, 
+
+                         c.izinBedelNo, c.BasvuruBedelNo, c.izinBedeliDurum, c.basvuruBedeliDurum, c.baglisirketId, /* Atanmis (mevcut)*/ CASE WHEN ISNULL(oc.OnayVerecekKisi1Id, 0) > 0 OR
+
+                         ISNULL(oc.OnayVerecekKisi2Id, 0) > 0 OR
+
+                         ISNULL(oc.OnayVerecekKisi3Id, 0) > 0 THEN CAST(1 AS BIT) ELSE CAST(0 AS BIT) END AS Atanmis, ISNULL(atananlar.AlananIsimler, '') AS Atananlar, /* ARACI FİRMA (yeni - 5. başlık)*/ CASE WHEN EXISTS
+
+                             (SELECT        1
+
+                               FROM            AspNetUserRoles ur INNER JOIN
+
+                                                         AspNetRoles r ON ur.RoleId = r.Id
+
+                               WHERE        ur.UserId = d .ParentUserId AND r.Name = 'AraciFirma') THEN COALESCE (NULLIF (parentUser.DernekUnvan, ''), NULLIF (parentUser.GercekTicariUnvan, ''), NULLIF (parentUser.kamuUnvan, ''), 
+
+                         NULLIF (parentUser.SirketUnvan, ''), NULLIF (parentUser.TuzelUnvan, ''), LTRIM(RTRIM(COALESCE (parentUser.GercekAdi, '') + ' ' + COALESCE (parentUser.GercekSoyadi, ''))), '') ELSE '' END AS AraciFirma, 
+
+                         /* İZİN TARİHİ (yeni - 7. başlık)*/ odlast.IzinTarihi AS IzinTarihi, /* İZİN SAYISI (yeni - 8. başlık)*/ odlast.IzinSayisi AS IzinSayisi, 
+
+                         /* ÇEKİLİŞ GÖREVLİSİ (yeni - 12. başlık)*/ 
+                         CASE 
+                            WHEN odlast.CekilisGorevlisi = 1 THEN 'Antalya Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 2 THEN 'Gaziantep Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 3 THEN 'Aksaray Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 4 THEN 'Kadıköy Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 5 THEN 'Karşıyaka Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 6 THEN 'Muğla Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 7 THEN 'Trabzon Şube Müdürlüğü'
+                            WHEN odlast.CekilisGorevlisi = 8 THEN 'Noter'
+                            WHEN odlast.CekilisGorevlisi = 9 THEN 'Başkanlık Personeli'
+                            ELSE COALESCE (LTRIM(RTRIM(COALESCE (personel.GercekAdi, '') + ' ' + COALESCE (personel.GercekSoyadi, ''))), LTRIM(RTRIM(COALESCE (birimSefi.GercekAdi, '') + ' ' + COALESCE (birimSefi.GercekSoyadi, ''))), '')
+                         END AS CekilisGorevlisi,
+                         
+                         /* GAZETE İLAN TARİHİ (yeni - 13. başlık)*/ MIN(cb.ilantarihi) AS GazeteIlanTarihi, /* GAZETE ADI (yeni - 14. başlık)*/ MIN(cb.ilanEdilecekGazete) 
+
+                         AS GazeteAdi, /* KDV Oranı = 0.20 (sabit)*/ CASE WHEN ikramiyeTutar.ToplamTutar IS NOT NULL AND izinBedelOrani.Oran IS NOT NULL THEN CAST((ikramiyeTutar.ToplamTutar * izinBedelOrani.Oran / 100.0) 
+
+                         * 1.20 AS DECIMAL(18, 2)) ELSE NULL END AS IzinBedeliTutari, /* İKRAMİYE TUTARI (yeni - 16. başlık)*/ ISNULL(ikramiyeTutar.ToplamTutar, 0) AS IkramiyeTutari, 
+
+                         /* TEMİNAT TARİHİ (yeni - 17. başlık)*/ ts .TeminantDate AS TeminatTarihi, /* TEMİNAT SAYISI (yeni - 18. başlık)*/ ts .TeminantNo AS TeminatSayisi, /* TEMİNAT BANKASI (yeni - 19. başlık)*/ ts .BankName AS TeminatBankasi, 
+
+                         /* TEMİNAT TUTARI (yeni - 20. başlık)*/ ts .Amount AS TeminatTutari, /* T. PARA CİNSİ (yeni - 21. başlık)*/ ISNULL(paraBirimi.ParaBirimiSembol, '') AS ParaBirimiSembol, 
+
+                         /* T. İADE TARİHİ (yeni - 22. başlık)*/ ts .RefundDate AS TeminatIadeTarihi, /* T. İADE SAYISI (yeni - 23. başlık)*/ ts .RefundCount AS TeminatIadeSayisi
+
+FROM            Cekilisler c LEFT JOIN
+
+                         CekilisBilgiler cb ON cb.CekilisId = c.Id LEFT JOIN
+
+                         AspNetUsers d ON d .Id = c.DuzenleyenId LEFT JOIN
+
+                         Birimler birim ON birim.Id = d .BirimId /* MÜDÜRLÜK için*/ LEFT JOIN
+
+                         AspNetUsers parentUser ON parentUser.Id = d .ParentUserId /* ARACI FİRMA için*/ LEFT JOIN
+
+                         AspNetUsers personel ON personel.Id = c.PersonelId /* ÇEKİLİŞ GÖREVLİSİ için*/ LEFT JOIN
+
+                         AspNetUsers birimSefi ON birimSefi.Id = c.BirimSefiId /* ÇEKİLİŞ GÖREVLİSİ için*/ LEFT JOIN
+
+                         PiyangoAmacs ap ON ap.Id = c.amacpiyangoId LEFT JOIN
+
+                         OnayCekilisler oc ON oc.CekilisId = c.Id LEFT JOIN
+
+                         CekilisYontemleri cy ON cb.CekilisYontemiId = cy.Id LEFT JOIN
+
+                         KatilimciListesiTeslimYontemleri klt ON cb.KatilimciListesiTeslimYontemiId = klt.Id /* APPLY ile son OnayDurumu (İZİN TARİHİ, İZİN SAYISI, MÜDÜRLÜK ve ÇEKİLİŞ GÖREVLİSİ dahil)*/ OUTER APPLY
+
+                             (SELECT        TOP 1 od.OnayDurumuIslemTipiId, od.IslemTipi, od.IzinTarihi, od.IzinSayisi, od.Mudurluk, od.CekilisGorevlisi
+
+                               FROM            OnayCekilisler oc2 INNER JOIN
+
+                                                         OnayDurumlari od ON oc2.Id = od.OnayCekilisId
+
+                               WHERE        oc2.CekilisId = c.Id
+
+                               ORDER BY od.Tarih DESC) odlast /* APPLY ile ikramiyeler string*/ OUTER APPLY
+
+                             (SELECT        STUFF
+
+                                                             ((SELECT        ', ' + i2.Marka + ' ' + i2.Model
+
+                                                                 FROM            Ikramiyeler i2
+
+                                                                 WHERE        i2.CekilisId = c.Id FOR XML PATH(''), TYPE ).value('.', 'NVARCHAR(MAX)'), 1, 2, '')) ik(Ikramiyeler) /* APPLY ile ikramiye tutarı toplamı*/ OUTER APPLY
+
+                                                             (SELECT        SUM(i3.BirimFiyat * i3.AsilTalihliAdedi) AS ToplamTutar
+
+                                                               FROM            Ikramiyeler i3
+
+                                                               WHERE        i3.CekilisId = c.Id) ikramiyeTutar /* APPLY ile aktif izin bedel oranı (ilk aktif oran)*/ OUTER APPLY
+
+                                                             (SELECT        TOP 1 ibo.Oran
+
+                                                               FROM            IzinBedelOranlari ibo
+
+                                                               WHERE        ibo.Aktif = 1
+
+                                                               ORDER BY ibo.Id) izinBedelOrani /* APPLY ile para birimi sembolü (ilk ikramiyenin para birimi)*/ OUTER APPLY
+
+                                                             (SELECT        TOP 1 pb.ParaBirimiSembol
+
+                                                               FROM            Ikramiyeler i4 LEFT JOIN
+
+                                                                                         ParaBirimleri pb ON pb.Id = i4.ParaBirimiId
+
+                                                               WHERE        i4.CekilisId = c.Id AND pb.ParaBirimiSembol IS NOT NULL
+
+                                                               ORDER BY i4.Id) paraBirimi /* APPLY ile irtibat bilgileri string*/ OUTER APPLY
+
+                                                             (SELECT        STUFF
+
+                                                                                             ((SELECT        ', ' + ib2.AdSoyad
+
+                                                                                                 FROM            IrtibatBilgiler ib2
+
+                                                                                                 WHERE        ib2.CekilisId = c.Id FOR XML PATH(''), TYPE ).value('.', 'NVARCHAR(MAX)'), 1, 2, '')) iblist(IrtibatAdSoyad) /* APPLY ile atanan kullanıcı isimleri*/ OUTER APPLY
+
+                                                                                             (SELECT        STUFF
+
+                                                                                                                             ((SELECT        ', ' + u.GercekAdi + ' ' + u.GercekSoyadi
+
+                                                                                                                                 FROM            AspNetUsers u
+
+                                                                                                                                 WHERE        u.Id IN (ISNULL(oc.OnayVerecekKisi1Id, 0), ISNULL(oc.OnayVerecekKisi2Id, 0), ISNULL(oc.OnayVerecekKisi3Id, 0)) FOR XML PATH(''), TYPE ).value('.', 
+
+                                                                                                                                                          'NVARCHAR(MAX)'), 1, 2, '')) atananlar(AlananIsimler) /* APPLY ile teminat bilgileri (son teminat kaydı)*/ OUTER APPLY
+
+                                                                                                                             (SELECT        TOP 1 ts2.TeminantDate, ts2.TeminantNo, ts2.BankName, ts2.Amount, ts2.RefundDate, ts2.RefundCount
+
+                                                                                                                               FROM            TeminantStates ts2
+
+                                                                                                                               WHERE        ts2.CekilisId = c.Id
+
+                                                                                                                               ORDER BY ts2.Id DESC) ts
+
+                                                                                               GROUP BY c.Id, c.PiyangoId, c.Baslik, c.CreateDate, d .DernekUnvan, d .GercekTicariUnvan, d .kamuUnvan, d .SirketUnvan, d .TuzelUnvan, d .GercekAdi, d .GercekSoyadi, d .Id, d .ParentUserId, 
+
+                                                                                                                         birim.BirimAdi, ap.AmacAdi, c.amacpiyangoId, oc.OnayVerecekKisi1Id, oc.OnayVerecekKisi2Id, oc.OnayVerecekKisi3Id, c.izinBedelNo, c.BasvuruBedelNo, c.izinBedeliDurum, 
+
+                                                                                                                         c.basvuruBedeliDurum, c.baglisirketId, ik.Ikramiyeler, iblist.IrtibatAdSoyad, odlast.OnayDurumuIslemTipiId, odlast.IslemTipi, odlast.IzinTarihi, odlast.IzinSayisi, 
+
+                                                                                                                         atananlar.AlananIsimler, personel.GercekAdi, personel.GercekSoyadi, birimSefi.GercekAdi, birimSefi.GercekSoyadi, parentUser.DernekUnvan, parentUser.GercekTicariUnvan, 
+
+                                                                                                                         parentUser.kamuUnvan, parentUser.SirketUnvan, parentUser.TuzelUnvan, parentUser.GercekAdi, parentUser.GercekSoyadi, ikramiyeTutar.ToplamTutar, izinBedelOrani.Oran, 
+
+                                                                                                                         paraBirimi.ParaBirimiSembol, ts .TeminantDate, ts .TeminantNo, ts .BankName, ts .Amount, ts .RefundDate, ts .RefundCount, odlast.Mudurluk, odlast.CekilisGorevlisi;
+

src/assets/images/icons.svg

@@ -251,4 +251,14 @@
             d="M14.3272 17.4867H5.66513C5.33609 17.4867 5.07048 17.7574 5.07048 18.0928C5.07048 18.4281 5.33609 18.6989 5.66513 18.6989H14.3232C14.6522 18.6989 14.9179 18.4281 14.9179 18.0928C14.9179 17.7574 14.6522 17.4867 14.3232 17.4867H14.3272Z"
         />
     </symbol>
+    <symbol id="eyeclose" viewBox="0 0 59 22">
+        <path
+            d="M56.61,11.89l2.55-1.57L52.83.03l-2.55,1.57h0s-11.76,7.25-11.76,7.25c-.94.58-1.91,1.05-2.91,1.43l-2.61.74v.02c-2.43.5-4.94.45-7.36-.14l-1.2-.34c-1.28-.41-2.53-.98-3.72-1.71L7.68.82h0s-1.35-.82-1.35-.82L0,10.28l2.55,1.57,4.76-7.73,6.18,3.81-4.79,7.77,2.55,1.57,4.79-7.77,3.09,1.9c1.15.71,2.35,1.28,3.58,1.74l-2.48,8.78,2.89.82,2.48-8.76c1.32.27,2.66.41,4.01.41,1.41,0,2.82-.16,4.2-.46l2.46,8.7,2.89-.82-2.48-8.75c1.16-.44,2.3-.99,3.39-1.66l3.12-1.92,4.79,7.77,2.55-1.57-4.79-7.77,6.08-3.75,4.75,7.72Z" />
+    </symbol>
+    <symbol id="eye" viewBox="0 0 51 24">
+        <path
+            d="M25.59,24.58c-3.62,0-7.24-.99-10.47-2.98L0,12.29,15.11,2.98c6.46-3.98,14.48-3.98,20.94,0l15.11,9.31-15.11,9.31c-3.23,1.99-6.85,2.98-10.47,2.98ZM5.72,12.29l10.97,6.75c5.49,3.38,12.31,3.38,17.8,0l10.97-6.75-10.97-6.75c-5.49-3.38-12.31-3.38-17.8,0l-10.97,6.75Z" />
+        <path
+            d="M25.59,21.71c-5.19,0-9.42-4.23-9.42-9.42S20.39,2.87,25.59,2.87s9.42,4.23,9.42,9.42-4.23,9.42-9.42,9.42ZM25.59,5.87c-3.54,0-6.42,2.88-6.42,6.42s2.88,6.42,6.42,6.42,6.42-2.88,6.42-6.42-2.88-6.42-6.42-6.42Z" />
+    </symbol>
 </svg>

src/assets/style/default.css

@@ -454,6 +454,7 @@ label {
   flex-wrap: wrap;
   width: 100%;
   padding: 2px;
+  position: relative;
 }
 
 label>span {
@@ -726,6 +727,99 @@ svg {
   background-color: #f1f1f1;
 }
 
+/* İşlem durumu badge stilleri - basit ve kompakt */
+.islem-status-badge {
+  display: inline-block;
+  padding: 4px 10px;
+  color: #fff;
+  border-radius: 12px;
+  font-size: 0.875em;
+  font-weight: 500;
+  white-space: nowrap;
+  line-height: 1.4;
+}
+
+.form-select-list-item .islem-status-badge {
+  display: inline-block;
+  width: auto;
+}
+
+.form-select-activator .islem-status-badge {
+  display: inline-block;
+  width: auto;
+}
+
+/* Her durum için benzersiz canlı renkler */
+.islem-status-coral {
+  background: #e74c3c;
+}
+.islem-status-amber {
+  background: #f39c12;
+}
+.islem-status-sky {
+  background: #3498db;
+}
+.islem-status-rose {
+  background: #e91e63;
+}
+.islem-status-pink {
+  background: #ec407a;
+}
+.islem-status-slate {
+  background: #607d8b;
+  color: #fff;
+}
+.islem-status-emerald {
+  background: #27ae60;
+}
+.islem-status-red {
+  background: #c0392b;
+}
+.islem-status-salmon {
+  background: #e67e22;
+}
+.islem-status-mint {
+  background: #2ecc71;
+}
+.islem-status-peach {
+  background: #ff9800;
+}
+.islem-status-yellow {
+  background: #f1c40f;
+  color: #333;
+}
+.islem-status-teal {
+  background: #1abc9c;
+}
+.islem-status-cyan {
+  background: #00bcd4;
+}
+.islem-status-orange {
+  background: #ff5722;
+}
+.islem-status-blue {
+  background: #2196f3;
+}
+.islem-status-gold {
+  background: #ffc107;
+  color: #333;
+}
+.islem-status-lavender {
+  background: #9c27b0;
+}
+.islem-status-violet {
+  background: #673ab7;
+}
+.islem-status-crimson {
+  background: #d32f2f;
+}
+.islem-status-indigo {
+  background: #3f51b5;
+}
+.islem-status-default {
+  background: #757575;
+}
+
 /* login */
 .login-w {
   min-width: 100%;
@@ -2161,7 +2255,7 @@ section {
   }
 
   .panel-wrapper {
-    max-width: 480px;
+    max-width: 600px;
   }
 
   .panel-wrapper.panel-wide {
@@ -2174,7 +2268,7 @@ section {
   }
 
   .panel-wrapper.panel-right.showme {
-    left: calc(100% - 480px);
+    left: calc(100% - 600px);
   }
 
   .panel-wrapper.panel-right.panel-wide.showme {

src/components/DashPiyangoListe.vue

@@ -67,7 +67,7 @@
   const router = useRouter()
 
   const props = defineProps<{
-    tableData: Record<string, any>
+    tableData: Record<string, any>[]
     lineFunction?: Function
     title?: string
     listText?: string
@@ -97,16 +97,36 @@
   }
 
   const goToListWithFilter = () => {
-    const query: Record<string, any> = {}
-    
-    // Filtre parametrelerini query'ye ekle
-    if (props.filterParams) {
-      Object.assign(query, props.filterParams)
+    try {
+      const query: Record<string, any> = {}
+      
+      // Filtre parametrelerini query'ye ekle (Filters[...] formatına dönüştür)
+      if (props.filterParams && typeof props.filterParams === 'object') {
+        Object.keys(props.filterParams).forEach((key) => {
+          const value = props.filterParams![key]
+          if (value !== undefined && value !== null && value !== '') {
+            // Değer zaten operatör içeriyorsa olduğu gibi kullan, yoksa '=' ekle
+            let filterValue = String(value)
+            // Eğer değer zaten operatör içermiyorsa '=' ekle
+            if (!filterValue.match(/^[<>=]/)) {
+              filterValue = '=' + filterValue
+            }
+            // Query parametresine string olarak ekle (Vue Router array'leri yanlış serialize ediyor)
+            query[`Filters[${key}]`] = filterValue
+          }
+        })
+      }
+      
+      router.push({
+        path: '/piyangolar/piyango-listesi',
+        query: query
+      })
+    } catch (error) {
+      console.error('goToListWithFilter hatası:', error)
+      // Hata durumunda filtre olmadan yönlendir
+      router.push({
+        path: '/piyangolar/piyango-listesi'
+      })
     }
-    
-    router.push({
-      path: '/piyangolar/piyango-listesi',
-      query: query
-    })
   }
 </script>

src/components/global/DataTablePagination.vue

@@ -71,6 +71,10 @@
       if (Number(pageNumber.value) < totalPage()) pageNumber.value++
     }
     localPagination.value.pageNumber = pageNumber.value
+    IfRouteUsing()
+    emit('update:pagination', localPagination.value)
+  }
+  const IfRouteUsing = () => {
     if (props.isUseRoute) {
       router.push({
         query: {
@@ -79,16 +83,13 @@
         }
       })
     }
-    emit('update:pagination', localPagination.value)
   }
-
   const InputPageControl = (e: Event) => {
     if (Number((e.target as HTMLInputElement).value) < 1)
       (e.target as HTMLInputElement).value = '1'
     if (Number((e.target as HTMLInputElement).value) > totalPage())
       (e.target as HTMLInputElement).value = String(totalPage())
     pageNumber.value = Number((e.target as HTMLInputElement).value)
-
     if ((e as KeyboardEvent).key === 'Enter') getPage()
   }
   const PageNumberFocus = (e: Event) => {
@@ -96,6 +97,7 @@
   }
   const getPage = () => {
     localPagination.value.pageNumber = pageNumber.value
+    IfRouteUsing()
     emit('update:pagination', localPagination.value)
   }
   const SetPageNumber = () => {
@@ -104,6 +106,8 @@
         localPagination.value.pageNumber = pageNumber.value = Number(
           route.query.pageNumber
         )
+      } else {
+        localPagination.value.pageNumber = pageNumber.value = 1
       }
     }
   }

src/components/global/FormInput.vue

@@ -11,7 +11,7 @@
         </span>
         <input
           :value="modelValue"
-          :type="type"
+          :type="inputType"
           :placeholder="placeholder"
           :disabled="disabled"
           @input="OnInput"
@@ -22,12 +22,24 @@
           @keyup="OnKeyUp"
           :class="[
             invalidText !== undefined && invalidText !== '' ? 'invalid' : '',
-            iclass || ''
+            iclass || '',
+            isPasswordVisible || props.type === 'password' ? 'password-visible' : ''
           ]"
           :min="min"
           :max="max"
           :minlength="minlength"
           :maxlength="maxlength" />
+        <i
+          class="ico-c ico-password-visible"
+          v-if="props.type === 'password'"
+          @click="PasswordVisibleToggle">
+          <svg>
+            <use
+              :href="
+                '/src/assets/images/icons.svg#' + (isPasswordVisible ? 'eye' : 'eyeclose')
+              "></use>
+          </svg>
+        </i>
         <span
           class="form-item-alert"
           v-if="InvalidMessages.length > 0 && InvalidMessages !== ''">
@@ -82,9 +94,18 @@
     'keydown',
     'keyup'
   ])
-  const localValue = ref<any>()
+  const isPasswordVisible = ref<boolean>(false)
   const InvalidMessageText = reactive<Record<string, any>>({})
 
+  const inputType = computed(() => {
+    if (props.type !== 'password') {
+      return props.type
+    } else {
+      if (isPasswordVisible.value) return 'text'
+      else return 'password'
+    }
+  })
+
   const InvalidMessages = computed<string>(() => {
     let text = ''
     Object.keys(InvalidMessageText).forEach((k: string, i: number) => {
@@ -138,7 +159,9 @@
     emit('update:modelValue', (e.target as HTMLInputElement).value)
     emit('keyup', e)
   }
-  
+  const PasswordVisibleToggle = () => {
+    if (props.type === 'password') isPasswordVisible.value = !isPasswordVisible.value
+  }
   watch(
     () => props.invalidText,
     () => {
@@ -151,3 +174,16 @@
     }
   )
 </script>
+<style scoped>
+  .ico-password-visible {
+    position: absolute;
+    right: 8px;
+    top: 32px;
+    min-width: 32px;
+    min-height: 32px;
+    cursor: pointer;
+  }
+  .password-visible {
+    padding: 8px 40px 8px 8px;
+  }
+</style>

src/components/global/FormQuill.vue

@@ -1,210 +0,0 @@
-<template>
-  <div :class="['form-item', half ? 'form-item-half' : '', elclass || '']">
-    <span class="form-item-title" v-if="title !== undefined && title !== ''">
-      {{ title }}
-    </span>
-    <slot name="input">
-      <label>
-        <span v-if="label !== undefined && label !== ''">
-          {{ label }}
-          <i v-if="required" class="form-item-alert">*</i>
-        </span>
-        <div :ref="'quillContainer' + rnd"></div>
-        <span
-          class="form-item-alert"
-          v-if="InvalidMessages.length > 0 && InvalidMessages !== ''">
-          {{ InvalidMessages }}
-        </span>
-        <span
-          class="form-item-description"
-          v-if="description !== undefined && description !== ''">
-          {{ description }}
-        </span>
-      </label>
-    </slot>
-  </div>
-</template>
-<script setup lang="ts">
-  import { ref, reactive, computed, onMounted, useTemplateRef, watch } from 'vue'
-  import Quill from 'quill'
-  import 'quill/dist/quill.snow.css'
-
-  declare const window: any
-
-  window.Quill = Quill
-
-  export interface Props {
-    label?: string
-    disabled?: boolean
-    modelValue: string
-    half?: boolean
-    title?: string
-    invalidText?: string
-    description?: string
-    placeholder?: string
-    required?: boolean
-    maxlength?: string
-    minlength?: string
-    iclass?: string
-    elclass?: string
-    modelKey?: string
-  }
-  const props = withDefaults(defineProps<Props>(), {
-    disabled: false,
-    half: false,
-    required: false,
-    placeholder: ''
-  })
-
-  const emit = defineEmits(['update:modelValue', 'change', 'text-change'])
-  const rnd = ref<number>(Number(Math.random() * 10000000))
-
-  const toolbar = ref<any[]>([
-    [{ font: [] }, { size: [] }],
-    ['bold', 'italic', 'underline', 'strike'],
-    [{ color: [] }, { background: [] }],
-    [{ script: 'super' }, { script: 'sub' }],
-    [{ header: '1' }, { header: '2' }, 'blockquote'],
-    [{ list: 'ordered' }, { list: 'bullet' }, { indent: '-1' }, { indent: '+1' }],
-    [{ align: [] }],
-    ['link', 'image', 'video'],
-    ['clean']
-  ])
-
-  const options = reactive<Record<string, any>>({
-    theme: 'snow',
-    modules: {
-      toolbar: toolbar.value,
-      imageResize: {
-        modules: ['Resize', 'DisplaySize', 'Toolbar']
-      }
-    },
-    placeholder: props.placeholder,
-    readOnly: false,
-    debug: false
-  })
-
-  const QuillImageResize = ref<any>()
-
-  const editor = useTemplateRef<any>('quillContainer' + rnd.value)
-  const quill = ref<Quill | null>(null)
-
-  const localValue = ref<string>(props.modelValue)
-
-  const InvalidMessageText = ref<Record<string, any>>({})
-  const InvalidMessages = computed(() => {
-    let text = ''
-    Object.keys(InvalidMessageText.value).forEach((k: string, i: number) => {
-      text += InvalidMessageText.value[k] + ', '
-    })
-    return text
-  })
-
-  const OnTextChange = (e: any) => {
-    if (props.minlength !== undefined) {
-      if (localValue.value.length < Number(props.minlength)) {
-        InvalidMessageText.value.minlength = `Girdiğiniz bilgi en az ${props.minlength} karakter uzunluğunda olmalı`
-      } else {
-        delete InvalidMessageText.value.minlength
-      }
-    }
-
-    if (quill.value !== null) {
-      localValue.value = quill.value!.container.querySelector('.ql-editor')!.innerHTML
-    }
-
-    emit('update:modelValue', localValue.value)
-    emit('change', e)
-  }
-
-  const InitializeEditor = async () => {
-    await setupQuillEditor()
-    SetContent()
-    RegisterEditorEventListeners()
-  }
-
-  const SetContent = () => {
-    if (props.modelValue) quill.value!.root.innerHTML = props.modelValue
-  }
-
-  const setupQuillEditor = async () => {
-    //let Parchment = Quill.import('parchment')
-
-    window.Quill.imports.parchment.Attributor.Style =
-      window.Quill.imports.parchment.StyleAttributor
-
-    //@ts-ignore
-    QuillImageResize.value = await import('quill-image-resize-module')
-
-    quill.value = new Quill(editor.value, options) as Quill
-    ;(quill.value!.getModule('toolbar') as Record<
-      string,
-      any
-    >)!.container.addEventListener('mousedown', (e: Event) => {
-      e.preventDefault()
-    })
-    ;(quill.value!.getModule('toolbar') as Record<
-      string,
-      any
-    >)!.container.addEventListener('click', (e: Event) => {
-      if ((e.target as HTMLElement).className !== 'ql-image') e.preventDefault()
-    })
-  }
-
-  const RegisterEditorEventListeners = () => {
-    quill.value!.on('text-change', OnTextChange)
-    quill.value!.on('editor-change', OnTextChange)
-    //image resize imaja tıklandığını anlamıyor.
-    quill.value!.root.addEventListener('mouseover', OnMouseOver, false)
-    ListenForEditorEvent('text-change')
-  }
-  const ListenForEditorEvent = (type: any) => {
-    quill.value!.on(type, (...args) => {
-      emit(type, ...args)
-    })
-  }
-
-  const OnMouseOver = (e: Event) => {
-    if (
-      (e.target as HTMLElement)!.firstChild &&
-      ((e.target as HTMLElement)!.firstChild as HTMLElement)!.tagName &&
-      ((e.target as HTMLElement)!.firstChild as HTMLElement)!.tagName.toUpperCase() ===
-        'IMG'
-    ) {
-      ;(e.target as HTMLElement)!.classList.add('remove-click-p')
-      ;((e.target as HTMLElement)!.firstChild as HTMLElement)!.classList.add(
-        'add-click-img'
-      )
-    }
-  }
-
-  onMounted(async () => {
-    InitializeEditor()
-  })
-
-  watch(
-    () => props.invalidText,
-    () => {
-      if (props.invalidText !== undefined && props.invalidText !== '') {
-        InvalidMessageText.value.invalid = props.invalidText
-      } else {
-        delete InvalidMessageText.value.invalid
-      }
-    }
-  )
-</script>
-<style>
-  .ql-toolbar {
-    width: 100%;
-  }
-  .ql-container {
-    width: 100%;
-    min-height: 120px;
-  }
-  .remove-click-p {
-    pointer-events: none;
-  }
-  .add-click-img {
-    pointer-events: all;
-  }
-</style>

src/components/global/ListTableContent.vue

@@ -61,7 +61,7 @@
             @click="exportPanel = !exportPanel"
             icon="export" />
           <icon-button
-            v-if="filterable()"
+            v-if="filterable"
             classList="ico-section ico-section-header-btn"
             @click="OpenFilterPanel"
             icon="filter" />
@@ -85,7 +85,7 @@
       page === 'list' ? 'section-content section-inner' : '',
       page === 'form' ? 'form-part-content' : ''
     ]">
-    <div class="list-filter-wrapper" v-if="filters() || searched">
+    <div class="list-filter-wrapper" v-if="haveFilter || searched">
       <h4>Filtreler ve Arama</h4>
       <div class="list-filter-content">
         <template v-if="localQuery !== ''">
@@ -97,14 +97,21 @@
             <span class="list-filter-close" @click="RemoveSearch"></span>
           </div>
         </template>
-        <template v-for="(filter, k) in filterParams">
-          <div class="list-filter-item" data-filter="durum-onaylanmis">
-            <strong>{{ filter.title }}:</strong>
-            <span>
-              {{ filter.text || filter.val }} {{ filter.op === '=' ? '' : filter.op }}
-            </span>
-            <span class="list-filter-close" @click="RemoveFilterKey(k as string)"></span>
-          </div>
+        <template v-for="(filterA, index) in filterParams" :key="index">
+          <template v-for="(filter, filterIndex) in filterA.values" :key="filterIndex">
+            <div
+              class="list-filter-item"
+              data-filter="durum-onaylanmis"
+              v-if="filterA.filter && (filter.text !== '' || filter.val !== '')">
+              <strong>{{ filterA.title }}:</strong>
+              <span>
+                {{ filter.text || filter.val }} {{ filter.op === '=' ? '' : filter.op }}
+              </span>
+              <span
+                class="list-filter-close"
+                @click="RemoveFilterKey(index, filterIndex)"></span>
+            </div>
+          </template>
         </template>
       </div>
     </div>
@@ -127,10 +134,7 @@
 
   <panel-wrapper v-if="filterPanel" v-model="filterPanel" :panel-title="'Filtreleme'">
     <template #panelContent>
-      <panel-filter
-        :filterHead="tableHeader"
-        v-model:filterParams="localFilterParams"
-        :isUseRoute="isUseRoute" />
+      <panel-filter :filterHead="tableHeader" :filterParams="localFilterParams" />
     </template>
     <template #footerButton>
       <div class="button-c button-save" @click="FilterData">Filtrele</div>
@@ -260,11 +264,10 @@
   const localTotalRecord = ref<string | number>(0)
   if (props.totalRecord !== undefined) localTotalRecord.value = props.totalRecord
 
-  const localFilterParams = ref<Record<string, any>>({})
-  const filterParams = reactive<Record<string, any>>({})
+  const localFilterParams = ref<Record<string, any>[]>([])
+  const filterParams = ref<Record<string, any>[]>([])
 
   const OpenFilterPanel = () => {
-    Object.assign(localFilterParams.value, filterParams)
     filterPanel.value = true
   }
 
@@ -273,28 +276,74 @@
       if (dest[keys] === undefined) delete source[keys]
     })
   }
+  const CreateFilterData = () => {
+    props.tableHeader.forEach((d: Record<string, any>, ind: number) => {
+      if (d.filter !== undefined) {
+        const filterKey = d.filter.filterId || d.name
+        const filterItem: Record<string, any> = {}
+        const firstVal: Record<string, any> = {}
+        const secondVal: Record<string, any> = {}
 
-  const FilterData = async () => {
-    Object.keys(filterParams).forEach((k) => {
-      delete filterParams[k]
-    })
-    Object.assign(filterParams, localFilterParams.value)
-    EqualObjects(filterParams, localFilterParams.value)
+        filterItem.title = d.title
+        filterItem.type = d.filter.type
+        filterItem.between = d.filter.between || false
+        filterItem.range = d.filter.range || false
+        filterItem.key = filterKey
+        filterItem.filter = false
+        filterItem.hIndex = ind
+        filterItem.values = []
 
-    if (props.isUseRoute) {
-      Object.keys(route.query).forEach((k) => {
-        if (k.includes('Filters[')) delete route.query[k]
-      })
-      const q = {
-        query: {
-          ...route.query
+        const opKey =
+          d.filter.type === 'date'
+            ? d.filter.between !== undefined && d.filter.between
+              ? '>'
+              : '='
+            : '='
+        firstVal.op = opKey
+        firstVal.val = ''
+        firstVal.text = ''
+        filterItem.values.push(firstVal)
+        if (d.filter.between !== undefined && d.filter.between) {
+          secondVal.op = '<'
+          secondVal.val = ''
+          secondVal.text = ''
+          filterItem.values.push(secondVal)
         }
+
+        localFilterParams.value.push(filterItem)
       }
-      Object.keys(filterParams).forEach((f, k) => {
-        q.query['Filters[' + f + ']'] = filterParams[f].op + filterParams[f].val
+    })
+  }
+
+  const AddParamsToObject = (obj: Record<string, any>) => {
+    filterParams.value.forEach((filter, index) => {
+      if (filter.filter) {
+        const key = 'Filters[' + filter.key + ']'
+        if (obj[key] === undefined) obj[key] = [] as string[]
+        filter.values.forEach((val: Record<string, any>, vIndex: number) => {
+          if (val.val !== '') {
+            ;(obj[key] as string[]).push(val.op + val.val)
+          }
+        })
+      }
+    })
+  }
+  const ResetFilterQueries = async () => {
+    if (props.isUseRoute) {
+      const newQuery: Record<string, any> = {
+        ...route.query
+      }
+      Object.keys(newQuery).forEach((q) => {
+        if (q.includes('Filters[')) delete newQuery[q]
       })
-      router.push(q)
+      await router.replace({ query: newQuery })
+      AddParamsToObject(newQuery)
+      await router.push({ query: newQuery })
     }
+  }
+  const FilterData = async () => {
+    filterParams.value = JSON.parse(JSON.stringify(localFilterParams.value))
+    ResetFilterQueries()
     setTimeout(async () => {
       await GetLocalData()
       filterPanel.value = false
@@ -306,23 +355,32 @@
       (props.addAction as Function)()
   }
 
-  const filterable = () => {
-    return props.tableHeader.filter((e) => e.hasOwnProperty('filter')).length > 0
-  }
+  const filterable = computed(() =>
+    props.tableHeader.some((obj: Record<string, any>) => obj.filter !== undefined)
+  )
 
-  const filters = (): boolean => {
-    return Object.keys(filterParams).length > 0
-  }
+  const haveFilter = computed(() =>
+    filterParams.value.some((obj: Record<string, any>) => obj.filter)
+  )
 
-  const RemoveFilterKey = (k: string) => {
-    delete localFilterParams.value[k]
-    delete filterParams[k]
+  const RemoveFilterKey = (index: number, fIndex: number) => {
     const query: Record<string, any> = { ...route.query }
-    Object.keys(query).forEach((q) => {
-      if (q.includes(k)) delete query[q]
-    })
-    router.push({ query: query })
-    GetLocalData()
+
+    filterParams.value[index].values[fIndex].val = ''
+    filterParams.value[index].values[fIndex].text = ''
+
+    const allEmpty: boolean = filterParams.value[index].values.every(
+      (obj: Record<string, any>) => obj.val === ''
+    )
+    if (allEmpty) filterParams.value[index].filter = false
+
+    localFilterParams.value = JSON.parse(JSON.stringify(filterParams.value))
+
+    ResetFilterQueries()
+    setTimeout(async () => {
+      await GetLocalData()
+      filterPanel.value = false
+    }, 50)
   }
   const RemoveSearch = () => {
     localQuery.value = ''
@@ -396,52 +454,76 @@
 
   const RouteFilterControl = () => {
     if (props.isUseRoute) {
-      const q = { ...route.query }
-      localFilterParams.value = {}
-      Object.keys(filterParams).forEach((k) => {
-        delete filterParams[k]
-      })
       filterChanging.value = true
       if (Object.keys(route.query).length > 0) {
         Object.keys(route.query).forEach((key) => {
           if (key.includes('Filters[')) {
             const newKey = key.match(/(?<=\[)[^\]]+(?=\])/)![0]
-            filterParams[newKey] = {}
-            localFilterParams.value[newKey] = {}
 
-            filterParams[newKey].op = (route.query[key]! as string).charAt(0)
-            localFilterParams.value[newKey].op = (route.query[key]! as string).charAt(0)
+            localFilterParams.value.forEach((filter: Record<string, any>) => {
+              if (filter.key === newKey) {
+                if (!filter.filter) {
+                  const isArray = Array.isArray(route.query[key])
+                  if (isArray) {
+                    ;(route.query[key]! as string[]).forEach((val, ind) => {
+                      filter.values[ind].op = (route.query[key]! as string[])[ind].charAt(
+                        0
+                      )
+                      filter.values[ind].val = (route.query[key]! as string[])[ind].slice(
+                        1
+                      )
+                      if (filter.type === 'select') {
+                        const filterData = props.tableHeader[filter.hIndex].filter!.data
+                        if (filterData && Array.isArray(filterData)) {
+                          const forText = filterData.find(
+                            (o: Record<string, any>) =>
+                              String(
+                                o[props.tableHeader[filter.hIndex].filter!.listVal]
+                              ) === String(filter.values[ind].val)
+                          )
+                          if (forText) {
+                            filter.values[ind].text =
+                              forText[props.tableHeader[filter.hIndex].filter!.listText]
+                          } else {
+                            filter.values[ind].text = filter.values[ind].val
+                          }
+                        } else {
+                          filter.values[ind].text = filter.values[ind].val
+                        }
+                      }
+                    })
+                  } else {
+                    filter.values[0].op = (route.query[key] as string).charAt(0)
+                    filter.values[0].val = (route.query[key] as string).slice(1)
 
-            filterParams[newKey].val = (route.query[key]! as string).slice(1)
-            localFilterParams.value[newKey].val = (route.query[key]! as string).slice(1)
+                    if (filter.type === 'select') {
+                      const filterData = props.tableHeader[filter.hIndex].filter!.data
+                      if (filterData && Array.isArray(filterData)) {
+                        const forText = filterData.find(
+                          (o: Record<string, any>) =>
+                            String(o[props.tableHeader[filter.hIndex].filter!.listVal]) ===
+                            String(filter.values[0].val)
+                        )
+                        if (forText) {
+                          filter.values[0].text =
+                            forText[props.tableHeader[filter.hIndex].filter!.listText]
+                        } else {
+                          filter.values[0].text = filter.values[0].val
+                        }
+                      } else {
+                        filter.values[0].text = filter.values[0].val
+                      }
+                    }
+                  }
+                  filter.filter = true
+                }
+              }
+            })
           }
         })
-      }
 
-      props.tableHeader.forEach((head: Record<string, any>) => {
-        if (head.filter !== undefined) {
-          Object.keys(filterParams).forEach((key) => {
-            if (
-              (head.filter.filterId !== undefined && key === head.filter.filterId) ||
-              key === head.name
-            ) {
-              filterParams[key].title = head.title
-              localFilterParams.value[key].title = head.title
-              if (
-                head.filter.type === 'select' &&
-                head.filter.data !== undefined &&
-                head.filter.data.length > 0
-              ) {
-                const forText = head.filter.data.find((o: Record<string, any>) => {
-                  return String(o[head.filter.listVal]) === String(filterParams[key].val)
-                })
-                filterParams[key].text = forText[head.filter.listText]
-                localFilterParams.value[key].text = forText[head.filter.listText]
-              }
-            }
-          })
-        }
-      })
+        filterParams.value = JSON.parse(JSON.stringify(localFilterParams.value))
+      }
       nextTick(() => {
         filterChanging.value = false
       })
@@ -468,9 +550,28 @@
         fileName = 'export.xlsx'
       }
 
+      // Export için parametreleri hazırla
+      let exportParams: Record<string, any> = {}
+
+      // Sıralama parametrelerini ekle
+      if (localSort.value.sortColumn !== undefined) {
+        exportParams.sortColumn = localSort.value.sortColumn
+        if (localSort.value.sortOrder !== undefined && localSort.value.sortOrder !== '')
+          exportParams.sortOrder = localSort.value.sortOrder
+      }
+
+      // Arama parametresini ekle
+      if (localQuery.value !== '') {
+        exportParams.searchString = localQuery.value
+      }
+
+      // Filtre parametrelerini ekle
+      if (haveFilter.value) AddParamsToObject(exportParams)
+
       // Axios ile dosya indirme - interceptor otomatik olarak token ekleyecek
       try {
         const response = await axios.get(exportUrl, {
+          params: exportParams,
           responseType: 'blob'
         })
 
@@ -515,10 +616,8 @@
 
       var filterparam: Record<string, any> = {}
 
-      if (filters()) {
-        Object.keys(filterParams).forEach((f, k) => {
-          filterparam['Filters[' + f + ']'] = filterParams[f].op + filterParams[f].val
-        })
+      if (haveFilter.value) {
+        AddParamsToObject(filterparam)
         Object.assign(apiData.params, filterparam)
       }
       let dt = await dataStore.dataGet(props.apiList as string, apiData)
@@ -564,7 +663,7 @@
         let el: HTMLInputElement = document.getElementById(
           'listsearch' + rnd.value
         ) as HTMLInputElement
-        el.focus
+        el.focus()
         el.select()
       }, 50)
     }
@@ -591,41 +690,17 @@
     mobileButtons.value = false
   }
 
-  // Filtre başlığını almak için yardımcı fonksiyon
-  const getFilterTitle = (key: string): string => {
-    const filterTitles: Record<string, string> = {
-      'durumId': 'Durum',
-      'piyangoAmacId': 'Piyango Amacı',
-      'cekilisYontemiId': 'Çekiliş Yöntemi'
-    }
-    return filterTitles[key] || key
-  }
-
   onBeforeMount(() => {
     if (globalStore.screenWidth >= globalStore.breakPoints.tabletp)
       mobileButtons.value = true
+
+    CreateFilterData()
     RoutePageControl()
     RouteSortControl()
     RouteSearchControl()
     RouteFilterControl()
 
-    // URL query parametrelerini kontrol et ve filtreleri uygula (ilk istekten önce)
-    if (Object.keys(route.query).length > 0) {
-      Object.keys(route.query).forEach(key => {
-        const value = route.query[key]
-        if (value && typeof value === 'string') {
-          // Filtre parametresini filterParams'a ekle
-          filterParams[key] = {
-            val: value,
-            op: '=',
-            title: getFilterTitle(key)
-          }
-        }
-      })
-    }
-
     if (props.apiList !== undefined) GetLocalData()
-
     window.addEventListener('resize', Resize)
   })
 
@@ -655,14 +730,6 @@
       }
     }
   )
-  watch(
-    () => localPagination.value.pageNumber,
-    () => {
-      if (!pageNumberChanging.value) {
-        GetLocalData()
-      }
-    }
-  )
   watch(
     () => props.refresh,
     () => {

src/components/global/PanelFilter.vue

@@ -1,107 +1,104 @@
 <template>
-  <template v-for="(filter, i) in filterHead">
-    <template v-if="filter.filter !== undefined">
-      <template v-if="filter.filter.type === 'datetime-local'">
-        <div class="panel-content-item">
-          <form-date
-            v-model="localFilterData[filter.name]"
-            :label="filter.title"
-            @change="UpdateFilter(filter)" />
-          <form-select
-            v-if="filter.filter.range !== undefined && filter.filter.range"
-            :listData="filterOperator"
-            v-model="localFilterData[filter.name + 'op']"
-            @change="UpdateFilter(filter)" />
-        </div>
-      </template>
-      <template v-if="filter.filter.type === 'date'">
-        <div class="panel-content-item">
-          <form-date
-            type="date"
-            v-model="localFilterData[filter.name]"
-            :label="filter.title"
-            @change="UpdateFilter(filter)" />
-          <form-select
-            v-if="filter.filter.range !== undefined && filter.filter.range"
-            :listData="filterOperator"
-            v-model="localFilterData[filter.name + 'op']"
-            @change="UpdateFilter(filter)" />
-        </div>
-      </template>
-      <template v-if="filter.filter.type === 'text'">
-        <div class="panel-content-item">
-          <form-input
-            v-model="localFilterData[filter.name]"
-            :label="filter.title"
-            @change="UpdateFilter(filter)" />
-          <form-select
-            v-if="filter.filter.range !== undefined && filter.filter.range"
-            :listData="filterOperator"
-            v-model="localFilterData[filter.name + 'op']"
-            @change="UpdateFilter(filter)" />
-        </div>
-      </template>
-      <template v-if="filter.filter.type === 'select'">
-        <div class="panel-content-item">
-          <form-select
-            :listData="filter.filter.data"
-            :listText="filter.filter.listText"
-            :listVal="filter.filter.listVal"
-            :extraData="filter"
-            :label="filter.title"
-            v-model="localFilterData[filter.filter.filterId || filter.name] as number"
-            @change="UpdateFilterSelect"
-            clearable />
-        </div>
-      </template>
+  <template v-for="(filter, i) in localFilterParams">
+    <template v-if="filter.type === 'datetime-local'">
+      <div class="panel-content-item">
+        <form-date
+          v-model="filter.values[0].val"
+          :label="
+            filter.title +
+            (filter.between !== undefined && filter.between ? ' (Başlangıç)' : '')
+          "
+          @change="UpdateFilter(filter, 0)" />
+        <form-select
+          v-if="filter.range !== undefined && filter.range"
+          :listData="filterOperator"
+          v-model="filter.values[0].op"
+          @change="UpdateFilter(filter, 0)"
+          label="Operator" />
+        <form-date
+          v-if="filter.between !== undefined && filter.between"
+          v-model="filter.values[1].val"
+          :label="
+            filter.title +
+            (filter.between !== undefined && filter.between ? ' (Bitiş)' : '')
+          "
+          @change="UpdateFilter(filter, 1)" />
+      </div>
+    </template>
+    <template v-if="filter.type === 'date'">
+      <div class="panel-content-item">
+        <form-date
+          type="date"
+          v-model="filter.values[0].val"
+          :label="
+            filter.title +
+            (filter.between !== undefined && filter.between ? ' (Başlangıç)' : '')
+          "
+          @change="UpdateFilter(filter, 0)" />
+        <form-select
+          v-if="filter.range !== undefined && filter.range"
+          :listData="filterOperator"
+          v-model="filter.values[0].op"
+          @change="UpdateFilter(filter, 0)"
+          label="Operator" />
+        <form-date
+          v-if="filter.between !== undefined && filter.between"
+          type="date"
+          v-model="filter.values[1].val"
+          :label="
+            filter.title +
+            (filter.between !== undefined && filter.between ? ' (Bitiş)' : '')
+          "
+          @change="UpdateFilter(filter, 1)" />
+      </div>
+    </template>
+    <template v-if="filter.type === 'text'">
+      <div class="panel-content-item">
+        <form-input
+          v-model="filter.values[0].val"
+          :label="filter.title"
+          @change="UpdateFilter(filter, 0)" />
+        <form-select
+          v-if="filter.range !== undefined && filter.range"
+          :listData="filterOperator"
+          v-model="filter.values[0].op"
+          @change="UpdateFilter(filter, 0)"
+          label="Operator" />
+      </div>
+    </template>
+    <template v-if="filter.type === 'select'">
+      <div class="panel-content-item">
+        <form-select
+          :listData="filterHead[filter.hIndex].filter.data"
+          :listText="filterHead[filter.hIndex].filter.listText"
+          :listVal="filterHead[filter.hIndex].filter.listVal"
+          :extraData="{ f: filter, k: filterHead[filter.hIndex].filter.listText }"
+          :label="filter.title"
+          v-model="filter.values[0].val"
+          @change="UpdateFilterSelect"
+          clearable />
+      </div>
     </template>
   </template>
 </template>
 <script setup lang="ts">
-  import { ref, reactive, onBeforeMount, nextTick } from 'vue'
-  import { useRouter, useRoute } from 'vue-router'
-  const router = useRouter()
-  const route = useRoute()
+  import { ref } from 'vue'
 
   const props = defineProps<{
-    filterHead: Record<string, any>
-    filterParams: Record<string, any>
-    isUseRoute?: boolean
+    filterHead: Record<string, any>[]
+    filterParams: Record<string, any>[]
   }>()
 
   const emit = defineEmits(['update:filterParams'])
-
-  const localFilterData = reactive<Record<string, any>>({})
-  const localFilterParams = reactive<Record<string, any>>(
-    Object.assign(props.filterParams)
-  )
+  const localFilterParams = ref<Record<string, any>[]>(props.filterParams)
   const filterOperator = ref<string[]>(['=', '<', '>'])
 
-  const createFilterData = () => {
-    props.filterHead.forEach((d: Record<string, any>) => {
-      if (d.filter !== undefined) {
-        let filterKey = d.filter.filterId || d.name
-        localFilterData[filterKey] = ''
-        localFilterData[filterKey + 'op'] = '='
-      }
-    })
-
-    Object.keys(localFilterParams).forEach((k, i) => {
-      localFilterData[k] = localFilterParams[k].val
-      localFilterData[k + 'op'] = localFilterParams[k].op
-    })
-  }
-
-  const UpdateFilter = (k: Record<string, any>) => {
-    let filterKey = k.filter.filterId || k.name
-    if (localFilterData[filterKey] !== '') {
-      localFilterParams[filterKey] = {}
-      localFilterParams[filterKey].val = localFilterData[filterKey]
-      localFilterParams[filterKey].op = localFilterData[filterKey + 'op']
-      localFilterParams[filterKey].title = k.title
-    } else delete localFilterParams[filterKey]
-
-    emit('update:filterParams', localFilterParams)
+  const UpdateFilter = (filter: Record<string, any>, index: number) => {
+    const allEmpty: boolean = filter.values.every(
+      (obj: Record<string, any>) => obj.val === ''
+    )
+    if (filter.values[index].val === '') filter.values[index].text = ''
+    filter.filter = !allEmpty
   }
   const UpdateFilterSelect = (
     e: Event,
@@ -109,20 +106,13 @@
     d: Record<string, any>,
     ext: Record<string, any>
   ) => {
-    let filterKey = ext.filter.filterId || ext.name
-    if (v !== '' && v !== null && localFilterData[filterKey] !== '') {
-      localFilterParams[filterKey] = {}
-      localFilterParams[filterKey].val = localFilterData[filterKey]
-      localFilterParams[filterKey].op = localFilterData[filterKey + 'op']
-      localFilterParams[filterKey].title = ext.title
-      localFilterParams[filterKey].text = d[ext.filter.listText]
+    if (v !== '' && v !== null) {
+      ext.f.values[0].val = v
+      ext.f.values[0].text = d[ext.k]
+      ext.f.filter = true
     } else {
-      delete localFilterParams[filterKey]
+      ext.f.filter = false
+      ext.f.values[0].text = ''
     }
-    emit('update:filterParams', localFilterParams)
   }
-
-  onBeforeMount(() => {
-    createFilterData()
-  })
 </script>

src/components/global/Tabs.vue

@@ -32,7 +32,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, computed, onMounted, onBeforeMount, watch } from 'vue'
+  import { ref, computed, onMounted, onBeforeMount, watch, nextTick } from 'vue'
   import { useGlobalStore } from '@/stores/globalStore'
   const globalStore = useGlobalStore()
   import { useRouter, useRoute } from 'vue-router'
@@ -85,8 +85,10 @@
       currentTab.value = Number(d)
     }
     if (props.isUseRoute) {
-      router.push({
-        params: { ...route.params, tabid: props.tabList[currentTab.value].id }
+      nextTick(() => {
+        router.push({
+          params: { ...route.params, tabid: props.tabList[currentTab.value].id }
+        })
       })
     }
     CalculateNavPosition()

src/components/global/index.ts

@@ -5,7 +5,6 @@ import FormInput from './FormInput.vue'
 import FormDate from './FormDate.vue'
 import FormFile from './FormFile.vue'
 import FormTextarea from './FormTextarea.vue'
-import FormQuill from './FormQuill.vue'
 import FormSummer from './FormSummer.vue'
 import FormSelect from './FormSelect.vue'
 import FormRadio from './FormRadio.vue'
@@ -25,7 +24,6 @@ export {
   FormDate,
   FormFile,
   FormTextarea,
-  FormQuill,
   FormSummer,
   FormSelect,
   FormRadio,

src/init/axios-init.ts

@@ -5,6 +5,23 @@ import router from '@/router'
 axios.defaults.baseURL = import.meta.env.VITE_API_URL
 //axios.defaults.timeout = 2000;
 axios.defaults.headers['Content-Type'] = 'application/json; charset=utf-8'
+//Filtrelerde aynı key birden fazla parametre array ile eklendiğinde url oluştururken [] ekleyerek oluşturmasını engellemek için serializer eklendi
+axios.defaults.paramsSerializer = (params) => {
+  const queryParts: string[] = []
+
+  for (const key in params) {
+    const value = params[key]
+    if (Array.isArray(value)) {
+      value.forEach((v) => {
+        queryParts.push(`${key}=${encodeURIComponent(v)}`)
+      })
+    } else if (value !== undefined && value !== null) {
+      queryParts.push(`${key}=${encodeURIComponent(value)}`)
+    }
+  }
+
+  return queryParts.join('&')
+}
 import { useDataStore } from '@/stores/dataStore'
 
 // İstek Öncesinde Çalışacak Bir Fonksiyon

src/module/cekilisler/components/TabPiyangoCekilisTutanagi.vue

@@ -0,0 +1,19 @@
+<template>
+  <form-piyango-cekilis-tutanagi-display
+    v-if="
+      usersStore.isPanelUser ||
+      (piyangoStore.lotteryApprove !== 0 &&
+        piyangoStore.lotteryApprove !== 3 &&
+        piyangoStore.lotteryApprove !== 8)
+    " />
+  <form-piyango-cekilis-tutanagi v-else />
+</template>
+<script setup lang="ts">
+  import { useUsersStore } from '@/stores/usersStore'
+  const usersStore = useUsersStore()
+  import { usePiyangoStore } from '../stores/piyangoStore'
+  const piyangoStore = usePiyangoStore()
+  import FormPiyangoCekilisTutanagi from './form/FormPiyangoCekilisTutanagi.vue'
+  import FormPiyangoCekilisTutanagiDisplay from './display/FormPiyangoCekilisTutanagiDisplay.vue'
+</script>
+

src/module/cekilisler/components/display/FormPiyangoCekilisTutanagiDisplay.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="form-part">
+    <div class="form-part-title">
+      <h4>Çekiliş Tutanağı</h4>
+      <div class="form-part-title-buttons">
+        <icon-button
+          v-if="usersStore.isPanelUser"
+          icon="plus"
+          class="ico-section ico-section-header-btn"
+          @click="AddNewDocument" />
+      </div>
+    </div>
+    <div class="form-part-content" v-if="cekilisTutanagiStore.loaded">
+      <template v-if="cekilisTutanagiStore.cekilisTutanagiList.length > 0">
+        <template v-for="(file, i) in cekilisTutanagiStore.cekilisTutanagiList">
+          <file-list-item
+            :editable="false"
+            :data="file"
+            title="dokumanAdi"
+            :filePath="file.url">
+            <template #actionButtons v-if="usersStore.isPanelUser">
+              <i
+                class="ico-c ico-btn ico-section back-grad-alert"
+                @click.stop="DeleteDocumentPop(file)">
+                <svg><use href="/src/assets/images/icons.svg#trash"></use></svg>
+              </i>
+            </template>
+          </file-list-item>
+        </template>
+      </template>
+      <template v-else>
+        <div class="form-inner-comment" v-if="usersStore.isPanelUser">
+          Eklenmiş dosya bulunamadı.
+        </div>
+        <div class="form-inner-comment" v-else>
+          Eklenmiş dosya bulunamadı.
+        </div>
+      </template>
+    </div>
+  </div>
+  <panel-wrapper
+    v-if="cekilisTutanagiStore.documentPanel"
+    v-model="cekilisTutanagiStore.documentPanel"
+    panel-title="Doküman Ekle">
+    <template #panelContent>
+      <panel-piyango-cekilis-tutanagi />
+    </template>
+    <template #footerButton>
+      <div class="button-c button-save" @click="cekilisTutanagiService.SaveDocument">
+        Ekle
+      </div>
+    </template>
+  </panel-wrapper>
+</template>
+<script setup lang="ts">
+  import { ref, onBeforeMount } from 'vue'
+
+  import PanelPiyangoCekilisTutanagi from '../panel/PanelPiyangoCekilisTutanagi.vue'
+  import PanelWrapper from '@/components/PanelWrapper.vue'
+
+  import { useUsersStore } from '@/stores/usersStore'
+  const usersStore = useUsersStore()
+  import { usePiyangoCekilisTutanagiStore } from '../../stores/piyangoCekilisTutanagiStore'
+  const cekilisTutanagiStore = usePiyangoCekilisTutanagiStore()
+  import { usePiyangoCekilisTutanagiService } from '../../service/piyangoCekilisTutanagiService'
+  const cekilisTutanagiService = usePiyangoCekilisTutanagiService()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
+  import { useDataStore } from '@/stores/dataStore'
+  const dataStore = useDataStore()
+
+  const AddNewDocument = () => {
+    cekilisTutanagiStore.ResetForm()
+    cekilisTutanagiStore.isUpdate = false
+    cekilisTutanagiStore.documentPanel = true
+  }
+
+  const DeleteDocumentPop = (data: Record<string, any>) => {
+    dialogStore.CreateDialog({
+      title: 'Doküman Sil',
+      id: 'deletedoc',
+      content: 'Dokümanı silmek istediğinize emin misiniz? Bu işlem geri alınamaz.',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Doküman Sil',
+          type: 'alert',
+          function: () => DeleteDocument(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteDocument = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('CekilisTutanak/' + id)
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deletedoc')
+      await cekilisTutanagiService.GetDocumentList()
+    }
+  }
+
+  onBeforeMount(async () => {
+    await cekilisTutanagiService.GetDocumentList()
+  })
+</script>
+

src/module/cekilisler/components/form/FormPiyangoCekilisTutanagi.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="form-part">
+    <div class="form-part-title">
+      <h4>Çekiliş Tutanağı</h4>
+      <div class="form-part-title-buttons">
+        <icon-button
+          v-if="!usersStore.isPanelUser"
+          icon="plus"
+          class="ico-section ico-section-header-btn"
+          @click="AddNewDocument" />
+      </div>
+    </div>
+    <div class="form-part-content" v-if="cekilisTutanagiStore.loaded">
+      <template v-if="cekilisTutanagiStore.cekilisTutanagiList.length > 0">
+        <template v-for="(file, i) in cekilisTutanagiStore.cekilisTutanagiList">
+          <file-list-item
+            :data="file"
+            title="dokumanAdi"
+            :filePath="file.url"
+            :editable="false" />
+        </template>
+      </template>
+      <template v-else>
+        <div class="form-inner-comment">
+          <span>
+            Eklenmiş dosya bulunamadı. Üstteki butonu kullanarak dosya ekleyebilirsiniz.
+          </span>
+        </div>
+      </template>
+    </div>
+  </div>
+  <panel-wrapper
+    v-if="cekilisTutanagiStore.documentPanel"
+    v-model="cekilisTutanagiStore.documentPanel"
+    panel-title="Doküman Ekle">
+    <template #panelContent>
+      <panel-piyango-cekilis-tutanagi />
+    </template>
+    <template #footerButton>
+      <div class="button-c button-save" @click="cekilisTutanagiService.SaveDocument">
+        Ekle
+      </div>
+    </template>
+  </panel-wrapper>
+</template>
+<script setup lang="ts">
+  import { ref, onBeforeMount } from 'vue'
+
+  import PanelPiyangoCekilisTutanagi from '../panel/PanelPiyangoCekilisTutanagi.vue'
+  import PanelWrapper from '@/components/PanelWrapper.vue'
+
+  import { useUsersStore } from '@/stores/usersStore'
+  const usersStore = useUsersStore()
+  import { usePiyangoStore } from '../../stores/piyangoStore'
+  const piyangoStore = usePiyangoStore()
+  import { usePiyangoCekilisTutanagiStore } from '../../stores/piyangoCekilisTutanagiStore'
+  const cekilisTutanagiStore = usePiyangoCekilisTutanagiStore()
+  import { usePiyangoCekilisTutanagiService } from '../../service/piyangoCekilisTutanagiService'
+  const cekilisTutanagiService = usePiyangoCekilisTutanagiService()
+
+  const AddNewDocument = () => {
+    cekilisTutanagiStore.ResetForm()
+    cekilisTutanagiStore.isUpdate = false
+    cekilisTutanagiStore.documentPanel = true
+  }
+
+  onBeforeMount(async () => {
+    await cekilisTutanagiService.GetDocumentList()
+  })
+</script>
+

src/module/cekilisler/components/form/FormPiyangoOnay.vue

@@ -18,16 +18,27 @@
         listVal="islemId"
         v-model="piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId"
         required
-        :invalidText="piyangoOnayValidationStore.invalidTexts.onayDurumuIslemTipiId" />
-      <template v-if="piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === 4">
-        <form-input
-          modelKey="izinSayisi"
-          v-model="piyangoOnayStore.piyangoOnayForm.izinSayisi"
-          required
-          label="İzin Sayı No"
-          placeholder="İzin Sayı No"
-          :invalidText="piyangoOnayValidationStore.invalidTexts.izinSayisi"
-          @keyup="OnKeyup" />
+        :invalidText="piyangoOnayValidationStore.invalidTexts.onayDurumuIslemTipiId">
+        <template #option="{ optionData }">
+          <span 
+            v-if="optionData && optionData.tipAdi" 
+            class="islem-status-badge" 
+            :class="piyangoStore.GetIslemStatusClass(optionData.tipAdi)">
+            {{ optionData.tipAdi }}
+          </span>
+          <span v-else>{{ optionData?.tipAdi || optionData }}</span>
+        </template>
+        <template #activator="{ activatorData }">
+          <span 
+            v-if="activatorData && activatorData.tipAdi" 
+            class="islem-status-badge" 
+            :class="piyangoStore.GetIslemStatusClass(activatorData.tipAdi)">
+            {{ activatorData.tipAdi }}
+          </span>
+          <span v-else>Lütfen Seçim Yapınız</span>
+        </template>
+      </form-select>
+      <template v-if="showIzinFields">
         <form-date
           type="date"
           required
@@ -36,12 +47,50 @@
           label="İzin Tarihi"
           :invalidText="piyangoOnayValidationStore.invalidTexts.izinTarihi"
           @change="OnKeyup" />
+        <form-input
+          modelKey="izinSayisi"
+          v-model="piyangoOnayStore.piyangoOnayForm.izinSayisi"
+          required
+          label="İzin Sayısı"
+          placeholder="İzin Sayısı"
+          :invalidText="piyangoOnayValidationStore.invalidTexts.izinSayisi"
+          @keyup="OnKeyup" />
         <form-textarea
           v-model="piyangoOnayStore.piyangoOnayForm.izinAciklamasi"
           :invalidText="piyangoOnayValidationStore.invalidTexts.izinAciklamasi"
           label="İzin Açıklaması"
           @keyup="OnKeyup" />
       </template>
+      <template v-if="showIzinVerildiFields">
+        <form-select
+          label="Müdürlük"
+          :listData="mudurlukListesi"
+          listText="name"
+          listVal="id"
+          v-model="piyangoOnayStore.piyangoOnayForm.mudurlukId"
+          required
+          :invalidText="piyangoOnayValidationStore.invalidTexts.mudurlukId"
+          @change="OnKeyup" />
+        <form-select
+          label="Çekiliş Görevlisi"
+          :listData="cekilisGorevlisiListesi"
+          listText="name"
+          listVal="id"
+          v-model="piyangoOnayStore.piyangoOnayForm.cekilisGorevlisiId"
+          required
+          :invalidText="piyangoOnayValidationStore.invalidTexts.cekilisGorevlisiId"
+          @change="OnKeyup" />
+      </template>
+      <form-select
+        v-if="showKapsamDisiSebebi"
+        label="Kapsam Dışı Sebebi"
+        :listData="kapsamDisiSebepListesi"
+        listText="name"
+        listVal="id"
+        v-model="piyangoOnayStore.piyangoOnayForm.kapsamDisiSebebi"
+        required
+        :invalidText="piyangoOnayValidationStore.invalidTexts.kapsamDisiSebebi"
+        @change="OnKeyup" />
       <form-file
         v-model="piyangoOnayStore.piyangoOnayForm.file"
         elclass="panel-documents-item"
@@ -55,7 +104,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { onBeforeMount } from 'vue'
+  import { onBeforeMount, computed, ref } from 'vue'
   import { usePiyangoOnayStore } from '../../stores/piyangoOnayStore'
   const piyangoOnayStore = usePiyangoOnayStore()
   import { usePiyangoOnayValidationStore } from '../../validation/piyangoOnayValidationStore'
@@ -66,6 +115,62 @@
   const piyangoDataStore = usePiyangoDataStore()
   import { usePiyangoServices } from '../../service/piyangoServices'
   const piyangoServices = usePiyangoServices()
+  import { usePiyangoStore } from '../../stores/piyangoStore'
+  const piyangoStore = usePiyangoStore()
+
+  const kapsamDisiId = computed<number | null>(() => {
+    const kapsamDisi = piyangoDataStore.piyangoOnayDurumlari.find(
+      (item: Record<string, any>) => item.tipAdi === 'Kapsam Dışı'
+    )
+    return kapsamDisi ? kapsamDisi.islemId : null
+  })
+
+  const showIzinFields = computed<boolean>(() => {
+    return (
+      piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === 4 ||
+      piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === kapsamDisiId.value
+    )
+  })
+
+  const showIzinVerildiFields = computed<boolean>(() => {
+    return (
+      piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === 4
+    )
+  })
+
+  const showKapsamDisiSebebi = computed<boolean>(() => {
+    return piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === kapsamDisiId.value
+  })
+
+  const kapsamDisiSebepListesi = ref<Record<string, any>[]>([
+    { id: '2/a', name: '2/a' },
+    { id: '2/b', name: '2/b' },
+    { id: '2/c', name: '2/c' },
+    { id: '2/ç', name: '2/ç' },
+    { id: '2/d', name: '2/d' },
+    { id: '2/e', name: '2/e' },
+    { id: '2/f', name: '2/f' },
+    { id: '2/g', name: '2/g' },
+    { id: 'Diğer', name: 'Diğer' }
+  ])
+
+  const cekilisGorevlisiListesi = ref<Record<string, any>[]>([
+    { id: 1, name: 'Antalya Şube Müdürlüğü' },
+    { id: 2, name: 'Gaziantep Şube Müdürlüğü' },
+    { id: 3, name: 'Aksaray Şube Müdürlüğü' },
+    { id: 4, name: 'Kadıköy Şube Müdürlüğü' },
+    { id: 5, name: 'Karşıyaka Şube Müdürlüğü' },
+    { id: 6, name: 'Muğla Şube Müdürlüğü' },
+    { id: 7, name: 'Trabzon Şube Müdürlüğü' },
+    { id: 8, name: 'Noter' },
+    { id: 9, name: 'Başkanlık Personeli' }
+  ])
+
+  const mudurlukListesi = ref<Record<string, any>[]>([
+    { id: 1, name: '1 No\'lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü' },
+    { id: 2, name: '2 No\'lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü' },
+    { id: 3, name: '3 No\'lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü' }
+  ])
 
   const OnKeyup = () => {
     piyangoOnayValidationStore.formChanged = true

src/module/cekilisler/components/form/FormPiyangoOnayDurum.vue

@@ -8,7 +8,8 @@
     :apiList="'OnayDurumu/GetSonOnayDurumlariList/' + piyangoStore.selectedLottery"
     apiText="Piyango Onay Log Listesi"
     page="form"
-    :refresh="piyangoOnayStore.refreshList" />
+    :refresh="piyangoOnayStore.refreshList"
+    :rowActions="rowActions" />
   <panel-wrapper
     v-if="piyangoOnayStore.onayFormPanel"
     v-model="piyangoOnayStore.onayFormPanel"
@@ -40,6 +41,10 @@
   const piyangoStore = usePiyangoStore()
   import { usePiyangoDataStore } from '../../stores/piyangoDataStore'
   const piyangoDataStore = usePiyangoDataStore()
+  import { useDialogStore } from '@/components/global/dialogStore'
+  const dialogStore = useDialogStore()
+  import { useDataStore } from '@/stores/dataStore'
+  const dataStore = useDataStore()
 
   const loaded = ref<boolean>(false)
 
@@ -47,6 +52,24 @@
     return piyangoDataStore.piyangoOnayDurumlari
   })
 
+  const mudurlukListesi = ref<Record<string, any>[]>([
+    { id: 1, name: '1 No\'lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü' },
+    { id: 2, name: '2 No\'lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü' },
+    { id: 3, name: '3 No\'lu Özel Çekilişler İzin ve Takip Şubesi Müdürlüğü' }
+  ])
+
+  const cekilisGorevlisiListesi = ref<Record<string, any>[]>([
+    { id: 1, name: 'Antalya Şube Müdürlüğü' },
+    { id: 2, name: 'Gaziantep Şube Müdürlüğü' },
+    { id: 3, name: 'Aksaray Şube Müdürlüğü' },
+    { id: 4, name: 'Kadıköy Şube Müdürlüğü' },
+    { id: 5, name: 'Karşıyaka Şube Müdürlüğü' },
+    { id: 6, name: 'Muğla Şube Müdürlüğü' },
+    { id: 7, name: 'Trabzon Şube Müdürlüğü' },
+    { id: 8, name: 'Noter' },
+    { id: 9, name: 'Başkanlık Personeli' }
+  ])
+
   const tableHeader = ref<Record<string, any>[]>([
     {
       name: 'tarih',
@@ -59,7 +82,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -72,6 +95,11 @@
       name: 'onayDurumuIslemTipiAdi',
       title: 'İşlem',
       sort: true,
+      computeHtml: (v: Record<string, any>): string => {
+        const statusName = v.onayDurumuIslemTipiAdi || ''
+        const statusClass = piyangoStore.GetIslemStatusClass(statusName)
+        return `<span class='islem-status-badge ${statusClass}'>${statusName}</span>`
+      },
       filter: {
         type: 'select',
         data: piyangoOnayDurumlari,
@@ -100,19 +128,95 @@
     },
     {
       name: 'izinTarihi',
-      title: 'İzin Tarihi'
+      title: 'İzin Tarihi',
+      compute: (v: Record<string, any>): string => {
+        return v.izinTarihi === null || v.izinTarihi === undefined || v.izinTarihi === ''
+          ? ''
+          : dateStore.dateFormat({ pattern: 'dd-mm-yy', date: v.izinTarihi })
+      }
     },
     {
       name: 'izinAciklamasi',
       title: 'İzin Açıklaması'
     },
+    {
+      name: 'kapsamDisiSebebi',
+      title: 'Kapsam Dışı Sebebi'
+    },
+    {
+      name: 'mudurluk',
+      title: 'Müdürlük',
+      compute: (v: Record<string, any>): string => {
+        if (v.mudurluk === null || v.mudurluk === undefined || v.mudurluk === '') {
+          return ''
+        }
+        const mudurluk = mudurlukListesi.value.find((item: Record<string, any>) => item.id === v.mudurluk)
+        return mudurluk ? mudurluk.name : ''
+      }
+    },
+    {
+      name: 'cekilisGorevlisi',
+      title: 'Çekiliş Görevlisi',
+      compute: (v: Record<string, any>): string => {
+        if (v.cekilisGorevlisi === null || v.cekilisGorevlisi === undefined || v.cekilisGorevlisi === '') {
+          return ''
+        }
+        const gorevli = cekilisGorevlisiListesi.value.find((item: Record<string, any>) => item.id === v.cekilisGorevlisi)
+        return gorevli ? gorevli.name : ''
+      }
+    },
   ])
 
   const EditOnay = (d: Record<string, any>) => {
-    Object.assign(piyangoOnayStore.piyangoPanelOnayForm, d)
+    Object.assign(piyangoOnayStore.piyangoPanelOnayForm, {
+      ...piyangoOnayStore.piyangoOnayBaseForm,
+      ...d,
+      izinAciklamasi: d.izinAciklamasi != null ? d.izinAciklamasi : '',
+      kapsamDisiSebebi: d.kapsamDisiSebebi != null ? d.kapsamDisiSebebi : null,
+      mudurlukId: d.mudurluk != null ? d.mudurluk : null,
+      cekilisGorevlisiId: d.cekilisGorevlisi != null ? d.cekilisGorevlisi : null
+    })
     piyangoOnayStore.onayFormPanel = true
   }
 
+  const DeleteRowPop = (data: Record<string, any>, i: number) => {
+    dialogStore.CreateDialog({
+      title: 'Onay Durumu Sil',
+      id: 'deleteonaydurumu',
+      content: 'Onay durumunu silmek istediğinize emin misiniz?',
+      closeText: 'Vazgeç',
+      buttons: [
+        {
+          label: 'Sil',
+          type: 'alert',
+          function: () => DeleteRow(data.id)
+        }
+      ]
+    })
+  }
+
+  const DeleteRow = async (id: number | string) => {
+    var dt = await dataStore.dataDelete('OnayDurumu/' + id, {
+      toast: { toast: 'Onay durumu başarıyla silindi', type: 'success' }
+    })
+
+    if (dt !== 'errorfalse') {
+      dialogStore.CloseDialog('deleteonaydurumu')
+      piyangoOnayStore.refreshList = false
+      setTimeout(() => {
+        piyangoOnayStore.refreshList = true
+      }, 10)
+    }
+  }
+
+  const rowActions = ref<Record<string, any>[]>([
+    {
+      text: 'Sil',
+      class: 'alert',
+      action: DeleteRowPop
+    }
+  ])
+
   onBeforeMount(async () => {
     loaded.value = true
   })

src/module/cekilisler/components/form/FormPiyangoOnayLog.vue

@@ -32,11 +32,11 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
-      name: 'islemYapanKullanici.email',
+      name: 'islemYapanKullanici',
       title: 'Kişi',
       sort: true,
       style: { width: '20%' }

src/module/cekilisler/components/panel/PanelPiyangoCekilisTutanagi.vue

@@ -0,0 +1,21 @@
+<template>
+  <form-input
+    v-model="cekilisTutanagiStore.cekilisTutanagiForm.dokumanAdi"
+    label="Dosya Başlığı"
+    modelKey="dokumanAdi"
+    minlength="2"
+    :invalidText="cekilisTutanagiValidationStore.invalidTexts.dokumanAdi" />
+  <form-file
+    v-model="cekilisTutanagiStore.cekilisTutanagiForm.dosya"
+    elclass="panel-documents-item"
+    :invalidText="cekilisTutanagiValidationStore.invalidTexts.dosya" />
+</template>
+<script setup lang="ts">
+  import { useValidationStore } from '@/stores/validationStore'
+  const validationStore = useValidationStore()
+  import { usePiyangoCekilisTutanagiStore } from '../../stores/piyangoCekilisTutanagiStore'
+  const cekilisTutanagiStore = usePiyangoCekilisTutanagiStore()
+  import { usePiyangoCekilisTutanagiValidationStore } from '../../validation/piyangoCekilisTutanagiValidationStore'
+  const cekilisTutanagiValidationStore = usePiyangoCekilisTutanagiValidationStore()
+</script>
+

src/module/cekilisler/components/panel/PanelPiyangoDosyaKapamaIkramiye.vue

@@ -108,6 +108,9 @@
   }
 
   const OnIkramiyeChanged = (e: Event, val: any, item: Record<string, any>) => {
+
+    piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.ikramiyeId = item.id
+
     piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.tahhutEdilenIkramiye = `
     ${item.cinsi}, ${item.marka}, ${item.model}, (${item.asilTalihliAdedi} adet)
     `

src/module/cekilisler/components/panel/PanelPiyangoOnay.vue

@@ -7,16 +7,27 @@
       listVal="islemId"
       v-model="piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId"
       required
-      :invalidText="piyangoOnayValidationStore.invalidTextsPanel.onayDurumuIslemTipiId" />
-    <template v-if="piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === 4">
-      <form-input
-        modelKey="izinSayisi"
-        v-model="piyangoOnayStore.piyangoPanelOnayForm.izinSayisi"
-        required
-        label="İzin Sayı No"
-        placeholder="İzin Sayı No"
-        :invalidText="piyangoOnayValidationStore.invalidTextsPanel.izinSayisi"
-        @keyup="OnKeyup" />
+      :invalidText="piyangoOnayValidationStore.invalidTextsPanel.onayDurumuIslemTipiId">
+      <template #option="{ optionData }">
+        <span 
+          v-if="optionData && optionData.tipAdi" 
+          class="islem-status-badge" 
+          :class="piyangoStore.GetIslemStatusClass(optionData.tipAdi)">
+          {{ optionData.tipAdi }}
+        </span>
+        <span v-else>{{ optionData?.tipAdi || optionData }}</span>
+      </template>
+      <template #activator="{ activatorData }">
+        <span 
+          v-if="activatorData && activatorData.tipAdi" 
+          class="islem-status-badge" 
+          :class="piyangoStore.GetIslemStatusClass(activatorData.tipAdi)">
+          {{ activatorData.tipAdi }}
+        </span>
+        <span v-else>Lütfen Seçim Yapınız</span>
+      </template>
+    </form-select>
+    <template v-if="showIzinFields">
       <form-date
         type="date"
         required
@@ -25,12 +36,30 @@
         label="İzin Tarihi"
         :invalidText="piyangoOnayValidationStore.invalidTextsPanel.izinTarihi"
         @change="OnKeyup" />
+      <form-input
+        modelKey="izinSayisi"
+        v-model="piyangoOnayStore.piyangoPanelOnayForm.izinSayisi"
+        required
+        label="İzin Sayısı"
+        placeholder="İzin Sayısı"
+        :invalidText="piyangoOnayValidationStore.invalidTextsPanel.izinSayisi"
+        @keyup="OnKeyup" />
       <form-textarea
         v-model="piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi"
         :invalidText="piyangoOnayValidationStore.invalidTextsPanel.izinAciklamasi"
         label="İzin Açıklaması"
         @keyup="OnKeyup" />
     </template>
+    <form-select
+      v-if="showKapsamDisiSebebi"
+      label="Kapsam Dışı Sebebi"
+      :listData="kapsamDisiSebepListesi"
+      listText="name"
+      listVal="id"
+      v-model="piyangoOnayStore.piyangoPanelOnayForm.kapsamDisiSebebi"
+      required
+      :invalidText="piyangoOnayValidationStore.invalidTextsPanel.kapsamDisiSebebi"
+      @change="OnKeyup" />
     <form-file
       v-model="piyangoOnayStore.piyangoPanelOnayForm.file"
       elclass="panel-documents-item"
@@ -43,7 +72,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { onBeforeMount } from 'vue'
+  import { onBeforeMount, computed, ref } from 'vue'
   import { usePiyangoOnayStore } from '../../stores/piyangoOnayStore'
   const piyangoOnayStore = usePiyangoOnayStore()
   import { usePiyangoOnayValidationStore } from '../../validation/piyangoOnayValidationStore'
@@ -52,6 +81,38 @@
   const piyangoDataStore = usePiyangoDataStore()
   import { usePiyangoServices } from '../../service/piyangoServices'
   const piyangoServices = usePiyangoServices()
+  import { usePiyangoStore } from '../../stores/piyangoStore'
+  const piyangoStore = usePiyangoStore()
+
+  const kapsamDisiId = computed<number | null>(() => {
+    const kapsamDisi = piyangoDataStore.piyangoOnayDurumlari.find(
+      (item: Record<string, any>) => item.tipAdi === 'Kapsam Dışı'
+    )
+    return kapsamDisi ? kapsamDisi.islemId : null
+  })
+
+  const showIzinFields = computed<boolean>(() => {
+    return (
+      piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === 4 ||
+      piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === kapsamDisiId.value
+    )
+  })
+
+  const showKapsamDisiSebebi = computed<boolean>(() => {
+    return piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === kapsamDisiId.value
+  })
+
+  const kapsamDisiSebepListesi = ref<Record<string, any>[]>([
+    { id: '2/a', name: '2/a' },
+    { id: '2/b', name: '2/b' },
+    { id: '2/c', name: '2/c' },
+    { id: '2/ç', name: '2/ç' },
+    { id: '2/d', name: '2/d' },
+    { id: '2/e', name: '2/e' },
+    { id: '2/f', name: '2/f' },
+    { id: '2/g', name: '2/g' },
+    { id: 'Diğer', name: 'Diğer' }
+  ])
 
   const OnKeyup = () => {
     piyangoOnayValidationStore.formChanged = true

src/module/cekilisler/components/panel/PanelPiyangoTeminatDurumuDisplay.vue

@@ -34,14 +34,14 @@
         :invalidText="piyangoTeminatValidationStore.invalidTexts.refundCount" />
       <form-file
         v-model="piyangoTeminatStore.piyangoTeminatFormData.refundDocumentUrl"
-        label='Klasör Arşiv'
+        label='İade Yazısı'
         elclass="panel-documents-item"
         :invalidText="piyangoTeminatValidationStore.invalidTexts.refundDocumentUrl"
         @change="OnKeyup" />
       <form-input
         modelKey="refundDescription"
         v-model="piyangoTeminatStore.piyangoTeminatFormData.refundDescription"
-        label="İade Açıklama"
+        label="Klasör Arşiv No"
         @keyup="OnKeyup"  />
     </template>
 

src/module/cekilisler/service/piyangoCekilisTutanagiService.ts

@@ -0,0 +1,71 @@
+import { defineStore } from 'pinia'
+import { useDataStore } from '@/stores/dataStore'
+import { usePiyangoStore } from '../stores/piyangoStore'
+import { usePiyangoCekilisTutanagiStore } from '../stores/piyangoCekilisTutanagiStore'
+import { usePiyangoCekilisTutanagiValidationStore } from '../validation/piyangoCekilisTutanagiValidationStore'
+
+export const usePiyangoCekilisTutanagiService = defineStore('piyangoCekilisTutanagiService', () => {
+  const dataStore = useDataStore()
+  const piyangoStore = usePiyangoStore()
+  const cekilisTutanagiStore = usePiyangoCekilisTutanagiStore()
+  const cekilisTutanagiValidationStore = usePiyangoCekilisTutanagiValidationStore()
+
+  const GetDocumentList = async () => {
+    cekilisTutanagiStore.cekilisTutanagiList.splice(
+      0,
+      cekilisTutanagiStore.cekilisTutanagiList.length
+    )
+
+    let dt = await dataStore.dataGet('CekilisTutanak/Cekilis/' + piyangoStore.selectedLottery, {
+      params: {
+        pageSize: 50
+      }
+    })
+    
+    if (dt !== 'errorfalse') {
+      const dataList = Array.isArray(dt) ? dt : (dt.data || [])
+      cekilisTutanagiStore.cekilisTutanagiList.splice(
+        0,
+        cekilisTutanagiStore.cekilisTutanagiList.length,
+        ...dataList
+      )      
+    }
+    setTimeout(() => {
+      cekilisTutanagiStore.loaded = true
+    }, 30)
+  }
+
+  const SaveDocument = async () => {
+    if (cekilisTutanagiValidationStore.FormCheck()) {
+      const formData = new FormData()
+      formData.append('dosya', cekilisTutanagiStore.cekilisTutanagiForm.dosya)
+      formData.append('dokumanAdi', cekilisTutanagiStore.cekilisTutanagiForm.dokumanAdi)
+      formData.append('cekilisId', String(piyangoStore.selectedLottery))
+      let dt: any
+
+      if (!cekilisTutanagiStore.isUpdate) {
+        dt = await dataStore.dataPost('CekilisTutanak', {
+          data: formData,
+          headers: { 'Content-Type': 'multipart/form-data' }
+        })
+      } else {
+        dt = await dataStore.dataPut(
+          'CekilisTutanak/' + cekilisTutanagiStore.cekilisTutanagiForm.id,
+          {
+            data: formData,
+            headers: { 'Content-Type': 'multipart/form-data' }
+          }
+        )
+      }
+      if (dt !== 'errorfalse') {
+        await GetDocumentList()
+        cekilisTutanagiStore.documentPanel = false
+        cekilisTutanagiStore.isUpdate = false
+      }
+    } else {
+      cekilisTutanagiValidationStore.isFormValid = true
+    }
+  }
+  return { GetDocumentList, SaveDocument }
+})
+

src/module/cekilisler/service/piyangoKatilimciService.ts

@@ -62,7 +62,6 @@ export const usePiyangoKatilimciService = defineStore('piyangoKatilimciService',
 
   const KatilimciFileUpload = async () => {
     if (piyangoKatilimciValidationStore.FileFormCheck()) {
-      console.log('Katilimci File Upload')
       const formData = new FormData()
       formData.append('excelFile', piyangoKatilimciStore.piyangoKatilimciFileFormData.excelFile)
       let dt: any

src/module/cekilisler/service/piyangoOnayService.ts

@@ -4,6 +4,7 @@ import { usePiyangoStore } from '../stores/piyangoStore'
 import { usePiyangoOnayStore } from '../stores/piyangoOnayStore'
 import { usePiyangoOnayValidationStore } from '../validation/piyangoOnayValidationStore'
 import { useUsersStore } from '@/stores/usersStore'
+import { usePiyangoDataStore } from '../stores/piyangoDataStore'
 
 export const usePiyangoOnayService = defineStore('piyangoOnayService', () => {
   const dataStore = useDataStore()
@@ -11,6 +12,18 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => {
   const piyangoOnayStore = usePiyangoOnayStore()
   const piyangoOnayValidationStore = usePiyangoOnayValidationStore()
   const usersStore = useUsersStore()
+  const piyangoDataStore = usePiyangoDataStore()
+
+  const getKapsamDisiId = (): number | null => {
+    const kapsamDisi = piyangoDataStore.piyangoOnayDurumlari.find(
+      (item: Record<string, any>) => item.tipAdi === 'Kapsam Dışı'
+    )
+    return kapsamDisi ? kapsamDisi.islemId : null
+  }
+
+  const shouldKeepIzinFields = (islemTipiId: number | null): boolean => {
+    return islemTipiId === 4 || islemTipiId === getKapsamDisiId()
+  }
 
   const SaveOnayDurum = async () => {
     if (piyangoOnayValidationStore.FormCheck()) {
@@ -18,11 +31,18 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => {
       let form: any
       let dataForm = new FormData()
 
-      if (piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId !== 4) {
+      if (!shouldKeepIzinFields(piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId)) {
         piyangoOnayStore.piyangoOnayForm.izinSayisi = ''
         piyangoOnayStore.piyangoOnayForm.izinTarihi = ''
         piyangoOnayStore.piyangoOnayForm.izinAciklamasi = ''
       }
+      if (piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId !== getKapsamDisiId()) {
+        piyangoOnayStore.piyangoOnayForm.kapsamDisiSebebi = null
+      }
+      if (piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId !== 4) {
+        piyangoOnayStore.piyangoOnayForm.mudurlukId = null
+        piyangoOnayStore.piyangoOnayForm.cekilisGorevlisiId = null
+      }
       dataForm.append(
         'onayDurumuIslemTipiId',
         piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId
@@ -30,10 +50,33 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => {
       dataForm.append('onayCekilisId', String(piyangoStore.selectedLottery))
       dataForm.append('kisiId', String(usersStore.userId))
       dataForm.append('file', piyangoOnayStore.piyangoOnayForm.file)
-      dataForm.append('aciklama', piyangoOnayStore.piyangoOnayForm.aciklama)
-      dataForm.append('izinSayisi', piyangoOnayStore.piyangoOnayForm.izinSayisi)
-      dataForm.append('izinTarihi', piyangoOnayStore.piyangoOnayForm.izinTarihi)
-      dataForm.append('izinAciklamasi', piyangoOnayStore.piyangoOnayForm.izinAciklamasi)
+      dataForm.append('aciklama', piyangoOnayStore.piyangoOnayForm.aciklama || '')
+      dataForm.append('izinSayisi', piyangoOnayStore.piyangoOnayForm.izinSayisi || '')
+      dataForm.append('izinTarihi', piyangoOnayStore.piyangoOnayForm.izinTarihi || '')
+      dataForm.append(
+        'izinAciklamasi',
+        piyangoOnayStore.piyangoOnayForm.izinAciklamasi != null
+          ? String(piyangoOnayStore.piyangoOnayForm.izinAciklamasi)
+          : ''
+      )
+      dataForm.append(
+        'kapsamDisiSebebi',
+        piyangoOnayStore.piyangoOnayForm.kapsamDisiSebebi != null
+          ? String(piyangoOnayStore.piyangoOnayForm.kapsamDisiSebebi)
+          : ''
+      )
+      dataForm.append(
+        'mudurluk',
+        piyangoOnayStore.piyangoOnayForm.mudurlukId != null
+          ? String(piyangoOnayStore.piyangoOnayForm.mudurlukId)
+          : ''
+      )
+      dataForm.append(
+        'cekilisGorevlisi',
+        piyangoOnayStore.piyangoOnayForm.cekilisGorevlisiId != null
+          ? String(piyangoOnayStore.piyangoOnayForm.cekilisGorevlisiId)
+          : ''
+      )
 
       form = await dataStore.dataPost('OnayDurumu/', {
         data: dataForm,
@@ -61,25 +104,33 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => {
       let form: any
       let dataForm = new FormData()
 
-      if (piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId !== 4) {
+      if (!shouldKeepIzinFields(piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId)) {
         piyangoOnayStore.piyangoPanelOnayForm.izinSayisi = ''
         piyangoOnayStore.piyangoPanelOnayForm.izinTarihi = ''
         piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi = ''
       }
-      dataForm.append(
-        'onayDurumuIslemTipiId',
-        piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId
-      )
+      if (piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId !== getKapsamDisiId()) {
+        piyangoOnayStore.piyangoPanelOnayForm.kapsamDisiSebebi = null
+      }
+      dataForm.append('onayDurumuIslemTipiId', piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId)
       dataForm.append('id', piyangoOnayStore.piyangoPanelOnayForm.id)
       dataForm.append('onayCekilisId', String(piyangoStore.selectedLottery))
       dataForm.append('kisiId', String(usersStore.userId))
       dataForm.append('file', piyangoOnayStore.piyangoPanelOnayForm.file)
-      dataForm.append('aciklama', piyangoOnayStore.piyangoPanelOnayForm.aciklama)
-      dataForm.append('izinSayisi', piyangoOnayStore.piyangoPanelOnayForm.izinSayisi)
-      dataForm.append('izinTarihi', piyangoOnayStore.piyangoPanelOnayForm.izinTarihi)
+      dataForm.append('aciklama', piyangoOnayStore.piyangoPanelOnayForm.aciklama || '')
+      dataForm.append('izinSayisi', piyangoOnayStore.piyangoPanelOnayForm.izinSayisi || '')
+      dataForm.append('izinTarihi', piyangoOnayStore.piyangoPanelOnayForm.izinTarihi || '')
       dataForm.append(
         'izinAciklamasi',
-        piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi
+        piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi != null
+          ? String(piyangoOnayStore.piyangoPanelOnayForm.izinAciklamasi)
+          : ''
+      )
+      dataForm.append(
+        'kapsamDisiSebebi',
+        piyangoOnayStore.piyangoPanelOnayForm.kapsamDisiSebebi != null
+          ? String(piyangoOnayStore.piyangoPanelOnayForm.kapsamDisiSebebi)
+          : ''
       )
 
       form = await dataStore.dataPut(
@@ -92,7 +143,11 @@ export const usePiyangoOnayService = defineStore('piyangoOnayService', () => {
       )
 
       if (form !== 'errorfalse') {
-        piyangoOnayStore.refreshList = true
+        piyangoOnayStore.refreshList = false
+        setTimeout(() => {
+          piyangoOnayStore.refreshList = true
+        }, 10)
+        piyangoOnayStore.onayFormPanel = false
       }
     } else {
       piyangoOnayValidationStore.isPanelFormValid = true

src/module/cekilisler/service/signalrService.ts

@@ -12,7 +12,7 @@ export const connectToHub = async () => {
 
   connection = new signalR.HubConnectionBuilder()
     .withUrl(import.meta.env.VITE_SOCKET_URL, {
-      withCredentials: true,
+      withCredentials: false,
       skipNegotiation: true,  // WebSocket kullanırken negotiation atlanabilir
       transport: signalR.HttpTransportType.WebSockets
     })

src/module/cekilisler/stores/piyangoCekilisTutanagiStore.ts

@@ -0,0 +1,37 @@
+import { defineStore } from 'pinia'
+import { ref, reactive } from 'vue'
+import { usePiyangoStore } from './piyangoStore'
+
+export const usePiyangoCekilisTutanagiStore = defineStore('piyangoCekilisTutanagiStore', () => {
+  const piyangoStore = usePiyangoStore()
+
+  const cekilisTutanagiList = ref<Record<string, any>[]>([])
+  const cekilisTutanagiBaseForm = reactive<Record<string, any>>({
+    dosya: null,
+    cekilisId: piyangoStore.selectedLottery,
+    dokumanAdi: ''
+  })
+  const cekilisTutanagiForm = reactive<Record<string, any>>({})
+  const cekilisTutanagiSafeForm = reactive<Record<string, any>>({})
+  const isUpdate = ref<boolean>(false)
+  const refreshList = ref<boolean>(false)
+  const documentPanel = ref<boolean>(false)
+  const loaded = ref<boolean>(false)
+
+  const ResetForm = () => {
+    Object.assign(cekilisTutanagiForm, cekilisTutanagiBaseForm)
+  }
+  
+  return {
+    cekilisTutanagiList,
+    cekilisTutanagiBaseForm,
+    cekilisTutanagiForm,
+    cekilisTutanagiSafeForm,
+    isUpdate,
+    refreshList,
+    documentPanel,
+    loaded,
+    ResetForm
+  }
+})
+

src/module/cekilisler/stores/piyangoDosyaKapamaStore.ts

@@ -2,10 +2,13 @@ import { defineStore } from 'pinia'
 import { ref, reactive } from 'vue'
 import { useGlobalStore } from '@/stores/globalStore'
 import { usePiyangoStore } from './piyangoStore'
+import { useUsersStore } from '@/stores/usersStore'
+
 
 export const usePiyangoDosyaKapamaStore = defineStore('piyangoDosyaKapamaStore', () => {
   const globalStore = useGlobalStore()
   const piyangoStore = usePiyangoStore()
+  const usersStore = useUsersStore()
 
   const baseDosyaKapamaData = reactive<Record<string, any>>({
     katilimSekli: '',
@@ -49,6 +52,8 @@ export const usePiyangoDosyaKapamaStore = defineStore('piyangoDosyaKapamaStore',
     teslimEdilenIkramiye: '',
     alinmayanIkramiye: '',
     aciklama: '',
+    duzenleyenId: usersStore.userId,
+    ikramiyeId:'',
     cekilisId: piyangoStore.selectedLottery
   })
   const dosyaKapamaData = reactive<Record<string, any>>({})

src/module/cekilisler/stores/piyangoOnayStore.ts

@@ -15,7 +15,10 @@ export const usePiyangoOnayStore = defineStore('piyangoOnayStore', () => {
     file: '',
     izinSayisi: '',
     izinTarihi: '',
-    izinAciklamasi: ''
+    izinAciklamasi: '',
+    kapsamDisiSebebi: null,
+    mudurlukId: null,
+    cekilisGorevlisiId: null
   })
   const piyangoOnayForm = reactive<Record<string, any>>({})
   const piyangoPanelOnayForm = reactive<Record<string, any>>({})

src/module/cekilisler/stores/piyangoStore.ts

@@ -131,13 +131,41 @@ export const usePiyangoStore = defineStore('piyangoStore', () => {
     Object.assign(lotteryData, baseLotteryData)
   }
 
+  const GetIslemStatusClass = (statusName: string | undefined): string => {
+    if (!statusName) {
+      return 'islem-status-default'
+    }
+    // Her duruma benzersiz canlı renkler atanıyor
+    const statusMap: Record<string, string> = {
+      'Bilgi/Belge Eksik/Yanlış': 'islem-status-coral',
+      'Üzerinde Çalışılıyor': 'islem-status-amber',
+      'Başvuru İşleme Alındı': 'islem-status-sky',
+      'Başvuru Uygun Görülmedi': 'islem-status-rose',
+      'İzin Öncesi İptal': 'islem-status-pink',
+      'Kapsam Dışı': 'islem-status-slate',
+      'İzin Verildi': 'islem-status-emerald',
+      'Ceza Verildi': 'islem-status-red',
+      'İzin Sonrası İptal': 'islem-status-salmon',
+      'Kampanya Olumlu Bitti': 'islem-status-mint',
+      'Mükerrer Başvuru': 'islem-status-peach',
+      'Bekliyor': 'islem-status-yellow',
+      'Onaylandı': 'islem-status-teal',
+      'Katılımcı Listesi Yüklendi': 'islem-status-cyan',
+      'Düzenleme Bekliyor': 'islem-status-orange',
+      'Ön Kayıt Kabul Edildi': 'islem-status-blue',
+      'Yardım Amaçlı Piyango Son Onay': 'islem-status-gold',
+      'İnceleme Bekleniyor': 'islem-status-lavender',
+      'Yeni Piyango': 'islem-status-violet',
+      'Başvuru Reddedildi': 'islem-status-crimson',
+      'Değişiklik Talep Ediliyor': 'islem-status-indigo'
+    }
+    return statusMap[statusName] || 'islem-status-default'
+  }
+
   const LoterryStatusClass = (d: any): string => {
-    let cls = lotteryStatusTypes.value.filter((v) => {
-      return v.name === d
-    })
-    if (cls !== undefined && cls !== null && cls.length !== 0)
-      return 'back-grad-' + cls[0].class
-    else return 'back-grad-waiting'
+    // Yeni renk sistemini kullan, ama back-grad sınıfı ekle (geriye dönük uyumluluk için)
+    const statusClass = GetIslemStatusClass(d)
+    return 'islem-status-badge ' + statusClass
   }
 
   const SetLotteryControlData = (data: Record<string, any>) => {
@@ -181,6 +209,7 @@ export const usePiyangoStore = defineStore('piyangoStore', () => {
     ResetLotteryData,
     ResetLotteryContent,
     LoterryStatusClass,
+    GetIslemStatusClass,
     SetLotteryControlData
   }
 })

src/module/cekilisler/validation/piyangoCekilisTutanagiValidationStore.ts

@@ -0,0 +1,45 @@
+import { defineStore } from 'pinia'
+import { ref, reactive } from 'vue'
+import { useValidationStore } from '@/stores/validationStore'
+import { usePiyangoCekilisTutanagiStore } from '../stores/piyangoCekilisTutanagiStore'
+
+export const usePiyangoCekilisTutanagiValidationStore = defineStore(
+  'piyangoCekilisTutanagiValidationStore',
+  () => {
+    const cekilisTutanagiStore = usePiyangoCekilisTutanagiStore()
+    const validationStore = useValidationStore()
+
+    const formChanged = ref<boolean>(false)
+    const isFormValid = ref<boolean>(true)
+    const invalidTexts = reactive<Record<string, any>>({})
+
+    const FormCheck = (): boolean => {
+      Object.assign(invalidTexts, {})
+
+      validationStore.IsFieldEmpty(
+        cekilisTutanagiStore.cekilisTutanagiForm,
+        invalidTexts,
+        'dokumanAdi',
+        'Döküman için bir başlık belirtmelisiniz.'
+      )
+
+      validationStore.IsFieldEmpty(
+        cekilisTutanagiStore.cekilisTutanagiForm,
+        invalidTexts,
+        'dosya',
+        'Bir döküman eklemelisiniz.'
+      )
+
+      isFormValid.value = Object.keys(invalidTexts).length === 0
+      return isFormValid.value
+    }
+
+    return {
+      formChanged,
+      isFormValid,
+      invalidTexts,
+      FormCheck
+    }
+  }
+)
+

src/module/cekilisler/validation/piyangoOnayValidationStore.ts

@@ -1,13 +1,15 @@
 import { defineStore } from 'pinia'
-import { ref, reactive } from 'vue'
+import { ref, reactive, computed } from 'vue'
 import { useValidationStore } from '@/stores/validationStore'
 import { usePiyangoOnayStore } from '../stores/piyangoOnayStore'
+import { usePiyangoDataStore } from '../stores/piyangoDataStore'
 
 export const usePiyangoOnayValidationStore = defineStore(
   'piyangoOnayValidationStore',
   () => {
     const validationStore = useValidationStore()
     const piyangoOnayStore = usePiyangoOnayStore()
+    const piyangoDataStore = usePiyangoDataStore()
 
     const formChanged = ref<boolean>(false)
     const isFormValid = ref<boolean>(true)
@@ -15,6 +17,17 @@ export const usePiyangoOnayValidationStore = defineStore(
     const isPanelFormValid = ref<boolean>(true)
     const invalidTextsPanel = reactive<Record<string, any>>({})
 
+    const kapsamDisiId = computed<number | null>(() => {
+      const kapsamDisi = piyangoDataStore.piyangoOnayDurumlari.find(
+        (item: Record<string, any>) => item.tipAdi === 'Kapsam Dışı'
+      )
+      return kapsamDisi ? kapsamDisi.islemId : null
+    })
+
+    const shouldValidateIzinFields = (islemTipiId: number | null): boolean => {
+      return islemTipiId === 4 || islemTipiId === kapsamDisiId.value
+    }
+
     const FormCheck = (): boolean => {
       Object.assign(invalidTexts, {})
 
@@ -24,12 +37,12 @@ export const usePiyangoOnayValidationStore = defineStore(
         'onayDurumuIslemTipiId',
         'Bir işlem tipi seçmelisinz.'
       )
-      if (piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === 4) {
+      if (shouldValidateIzinFields(piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId)) {
         validationStore.IsFieldEmpty(
           piyangoOnayStore.piyangoOnayForm,
           invalidTexts,
           'izinSayisi',
-          'İzin sayı no girmelisiniz.'
+          'İzin sayısı girmelisiniz.'
         )
         validationStore.IsFieldEmpty(
           piyangoOnayStore.piyangoOnayForm,
@@ -38,6 +51,28 @@ export const usePiyangoOnayValidationStore = defineStore(
           'İzin tarihi seçmelisiniz.'
         )
       }
+      if (piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === 4) {
+        validationStore.IsFieldEmpty(
+          piyangoOnayStore.piyangoOnayForm,
+          invalidTexts,
+          'mudurlukId',
+          'Müdürlük seçmelisiniz.'
+        )
+        validationStore.IsFieldEmpty(
+          piyangoOnayStore.piyangoOnayForm,
+          invalidTexts,
+          'cekilisGorevlisiId',
+          'Çekiliş görevlisi seçmelisiniz.'
+        )
+      }
+      if (piyangoOnayStore.piyangoOnayForm.onayDurumuIslemTipiId === kapsamDisiId.value) {
+        validationStore.IsFieldEmpty(
+          piyangoOnayStore.piyangoOnayForm,
+          invalidTexts,
+          'kapsamDisiSebebi',
+          'Kapsam dışı sebebi seçmelisiniz.'
+        )
+      }
       isFormValid.value = Object.keys(invalidTexts).length === 0
       return isFormValid.value
     }
@@ -51,12 +86,12 @@ export const usePiyangoOnayValidationStore = defineStore(
         'onayDurumuIslemTipiId',
         'Bir işlem tipi seçmelisinz.'
       )
-      if (piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === 4) {
+      if (shouldValidateIzinFields(piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId)) {
         validationStore.IsFieldEmpty(
           piyangoOnayStore.piyangoPanelOnayForm,
           invalidTextsPanel,
           'izinSayisi',
-          'İzin sayı no girmelisiniz.'
+          'İzin sayısı girmelisiniz.'
         )
         validationStore.IsFieldEmpty(
           piyangoOnayStore.piyangoPanelOnayForm,
@@ -65,6 +100,14 @@ export const usePiyangoOnayValidationStore = defineStore(
           'İzin tarihi seçmelisiniz.'
         )
       }
+      if (piyangoOnayStore.piyangoPanelOnayForm.onayDurumuIslemTipiId === kapsamDisiId.value) {
+        validationStore.IsFieldEmpty(
+          piyangoOnayStore.piyangoPanelOnayForm,
+          invalidTextsPanel,
+          'kapsamDisiSebebi',
+          'Kapsam dışı sebebi seçmelisiniz.'
+        )
+      }
       isPanelFormValid.value = Object.keys(invalidTextsPanel).length === 0
       return isPanelFormValid.value
     }

src/module/cekilisler/views/PiyangoDetay.vue

@@ -13,6 +13,7 @@
         <tab-piyango-bilgileri v-else />
       </template>
       <template #katilim-listesi><tab-piyango-katilimci-listesi /></template>
+      <template #cekilis-tutanagi><tab-piyango-cekilis-tutanagi /></template>
       <template #talihliler><tab-piyango-talihli-listesi /></template>
       <template #itiraz-sikayet><tab-piyango-itiraz /></template>
       <template #piyango-loglari><tab-piyango-loglari /></template>
@@ -54,6 +55,7 @@
   import TabPiyangoLoglari from '@/module/cekilisler/components/TabPiyangoLoglari.vue'
   import TabPiyangoKatilimciListesi from '@/module/cekilisler/components/TabPiyangoKatilimciListesi.vue'
   import TabPiyangoTalihliListesi from '@/module/cekilisler/components/TabPiyangoTalihliListesi.vue'
+  import TabPiyangoCekilisTutanagi from '@/module/cekilisler/components/TabPiyangoCekilisTutanagi.vue'
   import TabPiyangoBilgileri from '@/module/cekilisler/components/TabPiyangoBilgileri.vue'
   import TabPiyangoBilgileriDisplay from '../components/TabPiyangoBilgileriDisplay.vue'
   import TabPiyangoItiraz from '@/module/cekilisler/components/TabPiyangoItiraz.vue'
@@ -75,11 +77,15 @@
         usersStore.isPanelUser) &&
       piyangoStore.lotteryPurposeId !== 3
     ) {
+      
       tabList.value.push(
         { text: 'Katılım Listesi', id: 'katilim-listesi' },
+        { text: 'Çekiliş Tutanağı', id: 'cekilis-tutanagi' },
         { text: 'Talihliler', id: 'talihliler' },
         { text: 'İtiraz/Şikayet', id: 'itiraz-sikayet' }
       )
+    } else {
+      tabList.value.push({ text: 'Çekiliş Tutanağı', id: 'cekilis-tutanagi' })
     }
     if (usersStore.isPanelUser) {
       tabList.value.push(
@@ -89,6 +95,7 @@
     }
     tabList.value.push({ text: 'Onay Durumu', id: 'onay-durumu' })
 
+
     if (piyangoStore.lotteryApprove !== 0 && piyangoStore.lotteryPurposeId !== 3) {
       tabList.value.push({ text: 'Teminat Listesi', id: 'teminat-listesi' })
     }

src/module/cekilisler/views/PiyangoListe.vue

@@ -1,6 +1,6 @@
 <template>
   <AdminLayout>
-    <Breadcrumb currentPageText="Piyango Listesi" go="/"/>
+    <Breadcrumb currentPageText="Piyango Listesi" go="/" />
     <div
       class="form-inner-comment waiting-d"
       v-if="!usersStore.isPanelUser && usersStore.userApproveId !== 4">
@@ -17,14 +17,13 @@
         listText="Piyango"
         :addRoute="addApiControl"
         :apiList="apiList"
-        apiText="Piyango Listesi" 
-        isUseRoute/>
+        apiText="Piyango Listesi"
+        isUseRoute />
     </section>
   </AdminLayout>
 </template>
 <script setup lang="ts">
-  import { ref, computed, onBeforeMount, onMounted } from 'vue'
-  import { useRoute } from 'vue-router'
+  import { ref, computed, onBeforeMount } from 'vue'
 
   import AdminLayout from '@/layouts/AdminLayout.vue'
   import { useDateStore } from '@/stores/dateStore'
@@ -32,6 +31,8 @@
   const dateStore = useDateStore()
   import { useUsersStore } from '@/stores/usersStore'
   const usersStore = useUsersStore()
+  import { useGlobalStore } from '@/stores/globalStore'
+  const globalStore = useGlobalStore()
   import { usePiyangoStore } from '../stores/piyangoStore'
   const piyangoStore = usePiyangoStore()
   import { usePiyangoDataStore } from '../stores/piyangoDataStore'
@@ -40,7 +41,6 @@
   const piyangoServices = usePiyangoServices()
 
   import router from '@/router'
-  const route = useRoute()
 
   const loaded = ref<boolean>(false)
   const apiList = ref<string>('')
@@ -70,129 +70,297 @@
   const tableHeader = computed<Record<string, any>[]>(() => {
     let header: Record<string, any>[] = []
 
+    // 1. PİYANGO ID
     header.push({
       name: 'piyangoId',
-      title: 'Piyango Id',
+      title: 'Piyango ID',
       sort: true,
       style: { width: '10%' }
     })
 
-
-    if (usersStore.isAraciFirma || usersStore.isPanelUser) {
-      header.push({ name: 'duzenleyen', title: 'Düzenleyen' })
-    }
-
-    header.push(
-      {
-        name: 'baslik',
-        title: 'Başlık',
-        sort: true,
-        style: { width: '15%' }
+    // 2. MÜDÜRLÜK
+    header.push({
+      name: 'mudurluk',
+      title: 'Müdürlük',
+      compute: (v: Record<string, any>): string => {
+        return v.mudurluk || ''
       },
-      {
-        name: 'piyangoamac',
-        title: 'Piyango Amacı',
-        sort: true,
-        filter: {
-          type: 'select',
-          data: piyangoAmaclari.value,
-          listVal: 'id',
-          listText: 'amacAdi',
-          filterId: 'piyangoAmacId'
-        }
-      },
-      {
-        name: 'olusturmaTarihi',
-        title: 'Oluşturulma Tarihi',
-        compute: (v: Record<string, any>): string => {
-          return dateStore.dateFormat({ date: v.olusturmaTarihi })
-        },
-        sort: true,
-        filter: {
-          type: 'date',
-          range: true
-        }
+      filter: {
+        type: 'text'
       }
-    )
+    })
 
-    if (usersStore.isVakifDernek || usersStore.isPanelUser) {
+    // 3. PİYANGO AMACI
+    header.push({
+      name: 'piyangoamac',
+      title: 'Piyango Amacı',
+      sort: true,
+      filter: {
+        type: 'select',
+        data: piyangoAmaclari.value,
+        listVal: 'id',
+        listText: 'amacAdi',
+        filterId: 'piyangoAmacId'
+      }
+    })
+
+    // 4. DÜZENLEYEN (koşullu)
+    if (usersStore.isAraciFirma || usersStore.isPanelUser) {
       header.push({
-        name: 'cekilisTarihi',
-        title: 'Çekiliş Tarihi',
-        compute: (v: Record<string, any>): string => {
-          if(v.piyangoAmacId === 3) return ''
-          else return dateStore.dateFormat({ date: v.cekilisTarihi })
-        },
-        sort: true,
+        name: 'duzenleyen',
+        title: 'Düzenleyen',
         filter: {
-          type: 'date',
-          range: true
+          type: 'text'
         }
       })
     }
-    if (!usersStore.isVakifDernek || usersStore.isPanelUser) {
-      header.push(
-        {
-          name: 'baslangicTarihi',
-          title: 'Başlangıç Tarihi',
-          compute: (v: Record<string, any>): string => {
-            if (v.baslangicTarihi.includes('0001-')) return ''
-            else return dateStore.dateFormat({ date: v.baslangicTarihi })
-          },
-          sort: true,
-          filter: {
-            type: 'date',
-            range: true
-          }
-        },
-        {
-          name: 'bitisTarihi',
-          title: 'Bitis Tarihi',
-          compute: (v: Record<string, any>): string => {
-            if (v.bitisTarihi.includes('0001-')) return ''
-            else return dateStore.dateFormat({ date: v.bitisTarihi })
-          },
-          sort: true,
-          filter: {
-            type: 'date',
-            range: true
-          }
-        }
-      )
-    }
 
-    header.push(
-      {
-        name: 'cekilisYontemi',
-        title: 'Çekiliş Yöntemi',
-        sort: true,
-        filter: {
-          type: 'select',
-          data: cekilisYontemleri.value,
-          listVal: 'id',
-          listText: 'deger',
-          filterId: 'cekilisYontemiId'
-        }
+    // 5. ARACI FİRMA
+    header.push({
+      name: 'araciFirma',
+      title: 'Araci Firma',
+      compute: (v: Record<string, any>): string => {
+        return v.araciFirma || ''
       },
-      { name: 'ikramiyeler', title: 'İkramiyeler', style: { width: '15%' } },
-      {
-        name: 'durum',
-        title: 'Durum',
-        style: { width: '10%' },
-        computeHtml: (v: Record<string, any>): string => {
-          return `<span class="back-grad ${piyangoStore.LoterryStatusClass(v.durum)}">
-                ${v.durum}
-              </span>`
-        },
-        filter: {
-          type: 'select',
-          data: piyangoOnayDurumlari.value,
-          listVal: 'id',
-          listText: 'tipAdi',
-          filterId: 'durumId'
-        }
+      filter: {
+        type: 'text'
       }
-    )
+    })
+
+    // 6. DURUM
+    header.push({
+      name: 'durum',
+      title: 'Durum',
+      style: { width: '10%' },
+      computeHtml: (v: Record<string, any>): string => {
+        return `<span class="${piyangoStore.LoterryStatusClass(v.durum)}">
+              ${v.durum}
+            </span>`
+      },
+      filter: {
+        type: 'select',
+        data: piyangoOnayDurumlari.value,
+        listVal: 'id',
+        listText: 'tipAdi',
+        filterId: 'durumId'
+      }
+    })
+
+    // 7. İZİN TARİHİ
+    header.push({
+      name: 'izinTarihi',
+      title: 'İzin Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.izinTarihi || v.izinTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.izinTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 8. İZİN SAYISI
+    header.push({
+      name: 'izinSayisi',
+      title: 'İzin Sayısı',
+      compute: (v: Record<string, any>): string => {
+        return v.izinSayisi || ''
+      },
+      sort: true,
+      filter: {
+        type: 'text',
+        range: true
+      }
+    })
+
+    // 9. BAŞLANGIÇ TARİHİ
+    header.push({
+      name: 'baslangicTarihi',
+      title: 'Başlangıç Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.baslangicTarihi || v.baslangicTarihi.includes('0001-')) return ''
+        return dateStore.dateFormat({ date: v.baslangicTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 10. BİTİŞ TARİHİ
+    header.push({
+      name: 'bitisTarihi',
+      title: 'Bitiş Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.bitisTarihi || v.bitisTarihi.includes('0001-')) return ''
+        return dateStore.dateFormat({ date: v.bitisTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 11. ÇEKİLİŞ TARİHİ
+    header.push({
+      name: 'cekilisTarihi',
+      title: 'Çekiliş Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.cekilisTarihi || v.cekilisTarihi.includes('0001-')) return ''
+        if (v.piyangoAmacId === 3) return ''
+        return dateStore.dateFormat({ date: v.cekilisTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 12. ÇEKİLİŞ GÖREVLİSİ
+    header.push({
+      name: 'cekilisGorevlisi',
+      title: 'Çekiliş Görevlisi',
+      compute: (v: Record<string, any>): string => {
+        return v.cekilisGorevlisi || ''
+      },
+      filter: {
+        type: 'text'
+      }
+    })
+
+    // 13. GAZETE İLAN TARİHİ
+    header.push({
+      name: 'gazeteIlanTarihi',
+      title: 'Gazete İlan Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.gazeteIlanTarihi || v.gazeteIlanTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.gazeteIlanTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 14. GAZETE ADI
+    header.push({
+      name: 'gazeteAdi',
+      title: 'Gazete Adı',
+      compute: (v: Record<string, any>): string => {
+        return v.gazeteAdi || ''
+      }
+    })
+
+    // 15. İZİN BEDELİ
+    header.push({
+      name: 'izinBedeliTutari',
+      title: 'İzin Bedeli',
+      compute: (v: Record<string, any>): string => {
+        if (v.izinBedeliTutari === null || v.izinBedeliTutari === undefined) return ''
+        return globalStore.toTrLocale(v.izinBedeliTutari)
+      },
+      sort: true
+    })
+
+    // 16. İKRAMİYE TUTARI
+    header.push({
+      name: 'ikramiyeTutari',
+      title: 'İkramiye Tutarı',
+      compute: (v: Record<string, any>): string => {
+        if (v.ikramiyeTutari === null || v.ikramiyeTutari === undefined) return ''
+        return globalStore.toTrLocale(v.ikramiyeTutari)
+      },
+      sort: true
+    })
+
+    // 17. TEMİNAT TARİHİ
+    header.push({
+      name: 'teminatTarihi',
+      title: 'Teminat Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.teminatTarihi || v.teminatTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.teminatTarihi })
+      },
+      sort: true
+    })
+
+    // 18. TEMİNAT SAYISI
+    header.push({
+      name: 'teminatSayisi',
+      title: 'Teminat Sayısı',
+      compute: (v: Record<string, any>): string => {
+        return v.teminatSayisi || ''
+      },
+      sort: true
+    })
+
+    // 19. TEMİNAT BANKASI
+    header.push({
+      name: 'teminatBankasi',
+      title: 'Teminat Bankası',
+      compute: (v: Record<string, any>): string => {
+        return v.teminatBankasi || ''
+      }
+    })
+
+    // 20. TEMİNAT TUTARI
+    header.push({
+      name: 'teminatTutari',
+      title: 'Teminat Tutarı',
+      compute: (v: Record<string, any>): string => {
+        if (v.teminatTutari === null || v.teminatTutari === undefined) return ''
+        return globalStore.toTrLocale(v.teminatTutari)
+      },
+      sort: true
+    })
+
+    // 21. T. PARA CİNSİ
+    header.push({
+      name: 'paraBirimiSembol',
+      title: 'T. Para Cinsi',
+      compute: (v: Record<string, any>): string => {
+        return v.paraBirimiSembol || ''
+      }
+    })
+
+    // 22. T. İADE TARİHİ
+    header.push({
+      name: 'teminatIadeTarihi',
+      title: 'T. İade Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.teminatIadeTarihi || v.teminatIadeTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.teminatIadeTarihi })
+      },
+      sort: true
+    })
+
+    // 23. T. İADE SAYISI
+    header.push({
+      name: 'teminatIadeSayisi',
+      title: 'T. İade Sayısı',
+      compute: (v: Record<string, any>): string => {
+        return v.teminatIadeSayisi || ''
+      },
+      sort: true
+    })
+
+    // 24. İKRAMİYELER
+    header.push({
+      name: 'ikramiyeler',
+      title: 'İkramiyeler',
+      style: { width: '15%' },
+      compute: (v: Record<string, any>): string => {
+        return v.ikramiyeler || ''
+      }
+    })
+
+    // Panel User için ek sütunlar
     if (usersStore.isPanelUser) {
       header.push({
         name: 'atanmis',
@@ -200,17 +368,15 @@
         computeHtml: (v: Record<string, any>): string => {
           if (v.atanmis) {
             return `<strong class="back-grad back-grad-sevk-ok">
-                ${v.atananlar}
-              </strong>`
+              ${v.atananlar}
+            </strong>`
           } else {
             return `<span class="back-grad back-grad-sevk">
-                Sevk Edilmemiş</span>`
+              Sevk Edilmemiş</span>`
           }
         }
       })
-    }
 
-    if (usersStore.isPanelUser) {
       header.push({
         name: 'basvuruBedelNo',
         title: 'Muhasebeleştirme Durumu',
@@ -218,22 +384,23 @@
           let durum = ''
           if (v.basvuruBedelNo !== null) {
             durum += `<strong">Başvuru Bedel No: </strong>
-                ${v.basvuruBedelNo}<br>`
+              ${v.basvuruBedelNo}<br>`
           }
           if (v.izinBedelNo !== null) {
             durum += `<strong">İzin Bedel No: </strong>
-                ${v.izinBedelNo}`
+              ${v.izinBedelNo}`
           }
           return durum
         }
       })
     }
+
     return header
   })
 
   // tablodan herhangi bir satır tıklayınca çalısır
   const OpenPiyango = (row: any) => {
-    router.push('detay/' + row.id+'/piyango-bilgileri')
+    router.push('detay/' + row.id + '/piyango-bilgileri')
   }
 
   onBeforeMount(async () => {
@@ -243,13 +410,4 @@
 
     loaded.value = true
   })
-
-  onMounted(() => {
-    // URL query parametrelerini kontrol et ve filtreleri uygula
-    if (route.query.durumId) {
-      // Filtre parametresini ListTableContent bileşenine iletmek için
-      // Bu parametre otomatik olarak ListTableContent tarafından işlenecek
-      console.log('Durum filtresi uygulanıyor:', route.query.durumId)
-    }
-  })
 </script>

src/module/kullanicilar/components/TabKullaniciYetkiliPiyangolar.vue

@@ -78,7 +78,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -90,7 +90,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -102,7 +102,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -114,7 +114,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -134,7 +134,7 @@
       name: 'durum',
       title: 'Durum',
       computeHtml: (v: Record<string, any>): string => {
-        return `<span class='back-grad ${piyangoStore.LoterryStatusClass(v.durum)}'>
+        return `<span class='${piyangoStore.LoterryStatusClass(v.durum)}'>
                 ${v.durum}
               </span>`
       },

src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue

@@ -217,7 +217,6 @@
     }
   }
   const GetIkramiyeTotalValues = async () => {
-    console.log(piyangoStore, 'piyangoStore')
     let data = await dataStore.dataGet('Ikramiye/Cekilis/' + piyangoStore.selectedLottery +'?pageNumber=0')
     //todo:page 0
     if (data !== 'errorfalse') {
@@ -281,7 +280,6 @@
     })
   }
   const BasvuruBedeliMuhasebelestir = async () => {
-    console.log('basvuru bedeli muhasebelestir')
     let data = await dataStore.dataGet(
       'MuhasebeSettings/BasvuruBedeli/' + piyangoStore.selectedLottery
     )

src/module/muhasebe/views/MuhasebePiyangoListesi.vue

@@ -24,6 +24,8 @@
   const dateStore = useDateStore()
   import { useUsersStore } from '@/stores/usersStore'
   const usersStore = useUsersStore()
+  import { useGlobalStore } from '@/stores/globalStore'
+  const globalStore = useGlobalStore()
   import { usePiyangoStore } from '@/module/cekilisler/stores/piyangoStore'
   const piyangoStore = usePiyangoStore()
   import { usePiyangoDataStore } from '@/module/cekilisler/stores/piyangoDataStore'
@@ -50,156 +52,310 @@
   const tableHeader = computed<Record<string, any>[]>(() => {
     let header: Record<string, any>[] = []
 
+    // 1. PİYANGO ID
+    header.push({
+      name: 'piyangoId',
+      title: 'Piyango ID',
+      sort: true,
+      style: { width: '10%' }
+    })
+
+    // 2. MÜDÜRLÜK
+    header.push({
+      name: 'mudurluk',
+      title: 'Müdürlük',
+      compute: (v: Record<string, any>): string => {
+        return v.mudurluk || ''
+      }
+    })
+
+    // 3. PİYANGO AMACI
+    header.push({
+      name: 'piyangoamac',
+      title: 'Piyango Amacı',
+      sort: true,
+      filter: {
+        type: 'select',
+        data: piyangoAmaclari.value,
+        listVal: 'id',
+        listText: 'amacAdi',
+        filterId: 'piyangoAmacId'
+      }
+    })
+
+    // 4. DÜZENLEYEN (koşullu)
     if (usersStore.isAraciFirma || usersStore.isPanelUser) {
       header.push({ name: 'duzenleyen', title: 'Düzenleyen' })
     }
 
-    header.push(
-      {
-        name: 'piyangoId',
-        title: 'Piyango ID',
-        sort: true,
-        style: { width: '10%' }
+    // 5. ARACI FİRMA
+    header.push({
+      name: 'araciFirma',
+      title: 'Araci Firma',
+      compute: (v: Record<string, any>): string => {
+        return v.araciFirma || ''
+      }
+    })
+
+    // 6. DURUM
+    header.push({
+      name: 'durum',
+      title: 'Durum',
+      style: { width: '10%' },
+      computeHtml: (v: Record<string, any>): string => {
+        return `<span class="${piyangoStore.LoterryStatusClass(v.durum)}">
+              ${v.durum}
+            </span>`
       },
-      {
-        name: 'baslik',
-        title: 'Başlık',
-        sort: true,
-        style: { width: '15%' }
+      filter: {
+        type: 'select',
+        data: piyangoOnayDurumlari.value,
+        listVal: 'id',
+        listText: 'tipAdi',
+        filterId: 'durumId'
+      }
+    })
+
+    // 7. İZİN TARİHİ
+    header.push({
+      name: 'izinTarihi',
+      title: 'İzin Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.izinTarihi || v.izinTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.izinTarihi })
       },
-      {
-        name: 'piyangoamac',
-        title: 'Piyango Amacı',
-        sort: true,
-        filter: {
-          type: 'select',
-          data: piyangoAmaclari.value,
-          listVal: 'id',
-          listText: 'amacAdi',
-          filterId: 'piyangoAmacId'
-        }
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 8. İZİN SAYISI
+    header.push({
+      name: 'izinSayisi',
+      title: 'İzin Sayısı',
+      compute: (v: Record<string, any>): string => {
+        return v.izinSayisi || ''
       },
-      {
-        name: 'olusturmaTarihi',
-        title: 'Oluşturulma Tarihi',
-        compute: (v: Record<string, any>): string => {
-          return dateStore.dateFormat({ date: v.olusturmaTarihi })
-        },
-        sort: true,
-        filter: {
-          type: 'date',
-          range: true
+      sort: true
+    })
+
+    // 9. BAŞLANGIÇ TARİHİ
+    header.push({
+      name: 'baslangicTarihi',
+      title: 'Başlangıç Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.baslangicTarihi || v.baslangicTarihi.includes('0001-')) return ''
+        return dateStore.dateFormat({ date: v.baslangicTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 10. BİTİŞ TARİHİ
+    header.push({
+      name: 'bitisTarihi',
+      title: 'Bitiş Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.bitisTarihi || v.bitisTarihi.includes('0001-')) return ''
+        return dateStore.dateFormat({ date: v.bitisTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 11. ÇEKİLİŞ TARİHİ
+    header.push({
+      name: 'cekilisTarihi',
+      title: 'Çekiliş Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.cekilisTarihi || v.cekilisTarihi.includes('0001-')) return ''
+        if (v.piyangoAmacId === 3) return ''
+        return dateStore.dateFormat({ date: v.cekilisTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 12. ÇEKİLİŞ GÖREVLİSİ
+    header.push({
+      name: 'cekilisGorevlisi',
+      title: 'Çekiliş Görevlisi',
+      compute: (v: Record<string, any>): string => {
+        return v.cekilisGorevlisi || ''
+      }
+    })
+
+    // 13. GAZETE İLAN TARİHİ
+    header.push({
+      name: 'gazeteIlanTarihi',
+      title: 'Gazete İlan Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.gazeteIlanTarihi || v.gazeteIlanTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.gazeteIlanTarihi })
+      },
+      sort: true,
+      filter: {
+        type: 'date',
+        between: true
+      }
+    })
+
+    // 14. GAZETE ADI
+    header.push({
+      name: 'gazeteAdi',
+      title: 'Gazete Adı',
+      compute: (v: Record<string, any>): string => {
+        return v.gazeteAdi || ''
+      }
+    })
+
+    // 15. İZİN BEDELİ
+    header.push({
+      name: 'izinBedeliTutari',
+      title: 'İzin Bedeli',
+      compute: (v: Record<string, any>): string => {
+        if (v.izinBedeliTutari === null || v.izinBedeliTutari === undefined) return ''
+        return globalStore.toTrLocale(v.izinBedeliTutari)
+      },
+      sort: true
+    })
+
+    // 16. İKRAMİYE TUTARI
+    header.push({
+      name: 'ikramiyeTutari',
+      title: 'İkramiye Tutarı',
+      compute: (v: Record<string, any>): string => {
+        if (v.ikramiyeTutari === null || v.ikramiyeTutari === undefined) return ''
+        return globalStore.toTrLocale(v.ikramiyeTutari)
+      },
+      sort: true
+    })
+
+    // 17. TEMİNAT TARİHİ
+    header.push({
+      name: 'teminatTarihi',
+      title: 'Teminat Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.teminatTarihi || v.teminatTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.teminatTarihi })
+      },
+      sort: true
+    })
+
+    // 18. TEMİNAT SAYISI
+    header.push({
+      name: 'teminatSayisi',
+      title: 'Teminat Sayısı',
+      compute: (v: Record<string, any>): string => {
+        return v.teminatSayisi || ''
+      },
+      sort: true
+    })
+
+    // 19. TEMİNAT BANKASI
+    header.push({
+      name: 'teminatBankasi',
+      title: 'Teminat Bankası',
+      compute: (v: Record<string, any>): string => {
+        return v.teminatBankasi || ''
+      }
+    })
+
+    // 20. TEMİNAT TUTARI
+    header.push({
+      name: 'teminatTutari',
+      title: 'Teminat Tutarı',
+      compute: (v: Record<string, any>): string => {
+        if (v.teminatTutari === null || v.teminatTutari === undefined) return ''
+        return globalStore.toTrLocale(v.teminatTutari)
+      },
+      sort: true
+    })
+
+    // 21. T. PARA CİNSİ
+    header.push({
+      name: 'paraBirimiSembol',
+      title: 'T. Para Cinsi',
+      compute: (v: Record<string, any>): string => {
+        return v.paraBirimiSembol || ''
+      }
+    })
+
+    // 22. T. İADE TARİHİ
+    header.push({
+      name: 'teminatIadeTarihi',
+      title: 'T. İade Tarihi',
+      compute: (v: Record<string, any>): string => {
+        if (!v.teminatIadeTarihi || v.teminatIadeTarihi === null) return ''
+        return dateStore.dateFormat({ date: v.teminatIadeTarihi })
+      },
+      sort: true
+    })
+
+    // 23. T. İADE SAYISI
+    header.push({
+      name: 'teminatIadeSayisi',
+      title: 'T. İade Sayısı',
+      compute: (v: Record<string, any>): string => {
+        return v.teminatIadeSayisi || ''
+      },
+      sort: true
+    })
+
+    // 24. İKRAMİYELER
+    header.push({
+      name: 'ikramiyeler',
+      title: 'İkramiyeler',
+      style: { width: '15%' },
+      compute: (v: Record<string, any>): string => {
+        return v.ikramiyeler || ''
+      }
+    })
+
+    // Muhasebe özel sütunlar
+    header.push({
+      name: 'atanmis',
+      title: 'Sevk Durumu',
+      computeHtml: (v: Record<string, any>): string => {
+        if (v.atanmis) {
+          return `<strong class="back-grad back-grad-sevk-ok">
+            ${v.atananlar}
+          </strong>`
+        } else {
+          return `<span class="back-grad back-grad-sevk">
+            Sevk Edilmemiş</span>`
         }
       }
-    )
+    })
 
-    if (usersStore.isVakifDernek || usersStore.isPanelUser) {
-      header.push({
-        name: 'cekilisTarihi',
-        title: 'Çekiliş Tarihi',
-        compute: (v: Record<string, any>): string => {
-          return dateStore.dateFormat({ date: v.cekilisTarihi })
-        },
-        sort: true,
-        filter: {
-          type: 'date',
-          range: true
+    header.push({
+      name: 'basvuruBedelNo',
+      title: 'Muhasebeleştirme Durumu',
+      computeHtml: (v: Record<string, any>): string => {
+        let durum = ''
+        if (v.basvuruBedelNo !== null) {
+          durum += `<strong">Başvuru Bedel No: </strong>
+            ${v.basvuruBedelNo}<br>`
         }
-      })
-    }
-    if (!usersStore.isVakifDernek || usersStore.isPanelUser) {
-      header.push(
-        {
-          name: 'baslangicTarihi',
-          title: 'Başlangıç Tarihi',
-          compute: (v: Record<string, any>): string => {
-            if (v.baslangicTarihi.includes('0001-')) return ''
-            else return dateStore.dateFormat({ date: v.baslangicTarihi })
-          },
-          sort: true,
-          filter: {
-            type: 'date',
-            range: true
-          }
-        },
-        {
-          name: 'bitisTarihi',
-          title: 'Bitis Tarihi',
-          compute: (v: Record<string, any>): string => {
-            if (v.bitisTarihi.includes('0001-')) return ''
-            else return dateStore.dateFormat({ date: v.bitisTarihi })
-          },
-          sort: true,
-          filter: {
-            type: 'date',
-            range: true
-          }
-        }
-      )
-    }
-
-    header.push(
-      {
-        name: 'cekilisYontemi',
-        title: 'Çekiliş Yöntemi',
-        sort: true,
-        filter: {
-          type: 'select',
-          data: cekilisYontemleri.value,
-          listVal: 'id',
-          listText: 'deger',
-          filterId: 'cekilisYontemiId'
-        }
-      },
-      { name: 'ikramiyeler', title: 'İkramiyeler', style: { width: '15%' } },
-      {
-        name: 'durum',
-        title: 'Durum',
-        style: { width: '10%' },
-        computeHtml: (v: Record<string, any>): string => {
-          return `<span class="back-grad ${piyangoStore.LoterryStatusClass(v.durum)}">
-                ${v.durum}
-              </span>`
-        },
-        filter: {
-          type: 'select',
-          data: piyangoOnayDurumlari.value,
-          listVal: 'id',
-          listText: 'tipAdi',
-          filterId: 'durumId'
-        }
-      },
-      {
-        name: 'atanmis',
-        title: 'Sevk Durumu',
-        computeHtml: (v: Record<string, any>): string => {
-          if (v.atanmis) {
-            return `<strong class="back-grad back-grad-sevk-ok">
-                ${v.atananlar}
-              </strong>`
-          } else {
-            return `<span class="back-grad back-grad-sevk">
-                Sevk Edilmemiş</span>`
-          }
-        }
-      },
-      {
-        name: 'basvuruBedelNo',
-        title: 'Muhasebeleştirme Durumu',
-        computeHtml: (v: Record<string, any>): string => {
-          let durum = ''
-          if (v.basvuruBedelNo !== null) {
-            durum += `<strong">Başvuru Bedel No: </strong>
-                ${v.basvuruBedelNo}<br>`
-          }
-          if (v.izinBedelNo !== null) {
-            durum += `<strong">İzin Bedel No: </strong>
-                ${v.izinBedelNo}`
-          }
-          return durum
+        if (v.izinBedelNo !== null) {
+          durum += `<strong">İzin Bedel No: </strong>
+            ${v.izinBedelNo}`
         }
+        return durum
       }
-    )
+    })
+
     return header
   })
 

src/module/site-yonetimi/views/SliderListe.vue

@@ -153,10 +153,7 @@
   }
   const loadSliders = async () => {
     const data = await dataStore.dataGet('Slider')
-    console.log('apidata', data)
     sliders.value = data
-
-    console.log(sliders.value)
   }
 
   const save = async () => {

src/module/uyeler/components/TabUyePiyangolar.vue

@@ -86,7 +86,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -98,7 +98,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -110,7 +110,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -122,7 +122,7 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       }
     },
     {
@@ -143,7 +143,7 @@
       title: 'Durum',
       style: { width: '10%' },
       computeHtml: (v: Record<string, any>): string => {
-        return `<span class='back-grad ${piyangoStore.LoterryStatusClass(v.durum)}'>
+        return `<span class='${piyangoStore.LoterryStatusClass(v.durum)}'>
                 ${v.durum}
               </span>`
       },

src/module/uyeler/components/TabUyeYetkiliOlduguKisiKurum.vue

@@ -66,7 +66,7 @@
       },
       filter: {
         type: 'date',
-        range: true
+        between: true
       },
       style: { width: '10%' }
     },

src/module/uyeler/components/form/FormUyeOnayLog.vue

@@ -51,12 +51,12 @@
       sort: true,
       filter: {
         type: 'date',
-        range: true
+        between: true
       },
       style:{width:'15%'}
     },
     {
-      name: 'kisiAdi',
+      name: 'email',
       title: 'Kişi',
       sort: true,
       style:{width:'20%'}

src/module/uyeler/views/UyeYetkili.vue

@@ -7,6 +7,9 @@
       <template #kisi-kurum-bilgileri>
         <tab-yetkili-uye-bilgileri />
       </template>
+      <template #piyangolar>
+        <tab-uye-piyangolar />
+      </template>
       <template #onay-durumu>
         <tab-uye-onay-durumu v-if="usersStore.isPanelUser" />
         <tab-uye-onay-durumu-user v-else />
@@ -25,6 +28,7 @@
 
   import AdminLayout from '@/layouts/AdminLayout.vue'
   import TabYetkiliUyeBilgileri from '../components/TabYetkiliUyeBilgileri.vue'
+  import TabUyePiyangolar from '../components/TabUyePiyangolar.vue'
   import TabUyeOnayDurumu from '../components/TabUyeOnayDurumu.vue'
   import TabUyeOnayDurumuUser from '../components/TabUyeOnayDurumuUser.vue'
 
@@ -32,6 +36,11 @@
   const tabList = ref<Record<string, any>[]>([
     { text: 'Kişi/Kurum Bilgileri', id: 'kisi-kurum-bilgileri' }
   ])
+  
+  if (usersStore.isPanelUser || usersStore.isAraciFirma) {
+    tabList.value.push({ text: 'Piyangolar', id: 'piyangolar' })
+  }
+  
   tabList.value.push({ text: 'Onay Durumu', id: 'onay-durumu' })
 
   onBeforeMount(async () => {

src/module/uyeler/views/UyelerListe.vue

@@ -63,7 +63,7 @@
       },
       filter: {
         type: 'date',
-        range: true
+        between: true
       },
       style: { width: '10%' }
     },

src/stores/dataStore.ts

@@ -35,13 +35,14 @@ export const useDataStore = defineStore('dataStore', () => {
       if (data.data !== undefined) sendData.data = data.data
       if (data.params !== undefined) sendData.params = data.params
       if (data.headers !== undefined) sendData.headers = data.headers
-      if (data.toast !== undefined) {
-        toastStore.AddToast(data.toast.toast, data.toast.type, data.toast.timeout)
-      }
 
       const response = await axios.get(apiBase.value + api, sendData)
       console.log('response --', api, response)
 
+      if (data.toast !== undefined) {
+        toastStore.AddToast(data.toast.toast, data.toast.type, data.toast.timeout)
+      }
+
       if (data.full !== undefined && data.full) {
         return response
       } else {
@@ -72,12 +73,13 @@ export const useDataStore = defineStore('dataStore', () => {
       if (data.options !== undefined) Object.assign(sendData, data.options)
       if (data.params !== undefined) sendData.params = data.params
       if (data.headers !== undefined) sendData.headers = data.headers
+
+      const response = await axios.post(apiBase.value + api, postData, sendData)
+
       if (data.toast !== undefined) {
         toastStore.AddToast(data.toast.toast, data.toast.type, data.toast.timeout)
       }
 
-      const response = await axios.post(apiBase.value + api, postData, sendData)
-
       if (data.full !== undefined && data.full) {
         return response
       } else {
@@ -109,11 +111,13 @@ export const useDataStore = defineStore('dataStore', () => {
       if (data.options !== undefined) Object.assign(sendData, data.options)
       if (data.params !== undefined) sendData.params = data.params
       if (data.headers !== undefined) sendData.headers = data.headers
+
+      const response = await axios.put(apiBase.value + api, postData, sendData)
+      
       if (data.toast !== undefined) {
         toastStore.AddToast(data.toast.toast, data.toast.type, data.toast.timeout)
       }
 
-      const response = await axios.put(apiBase.value + api, postData, sendData)
       if (data.full !== undefined && data.full) {
         return response
       } else {
@@ -144,11 +148,13 @@ export const useDataStore = defineStore('dataStore', () => {
       if (data.options !== undefined) Object.assign(sendData, data.options)
       if (data.params !== undefined) sendData.params = data.params
       if (data.headers !== undefined) sendData.headers = data.headers
+
+      const response = await axios.delete(apiBase.value + api, sendData)
+      
       if (data.toast !== undefined) {
         toastStore.AddToast(data.toast.toast, data.toast.type, data.toast.timeout)
       }
 
-      const response = await axios.delete(apiBase.value + api, sendData)
       if (data.full !== undefined && data.full) {
         return response
       } else {

tsconfig.app.json

@@ -1,6 +1,6 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "Configs.ts"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,

tsconfig.node.json

@@ -1,11 +1,12 @@
 {
-  "extends": "@tsconfig/node20/tsconfig.json",
+  "extends": "./tsconfig.json",
   "include": [
     "vite.config.*",
     "vitest.config.*",
     "cypress.config.*",
     "nightwatch.conf.*",
-    "playwright.config.*"
+    "playwright.config.*",
+    "Configs.ts"
   ],
   "compilerOptions": {
     "composite": true,

vite.config.ts

@@ -3,6 +3,7 @@ import { fileURLToPath, URL } from 'node:url'
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import vueJsx from '@vitejs/plugin-vue-jsx'
+import { SetTemplateGroup } from './Configs.js'
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -23,5 +24,46 @@ export default defineConfig({
   },
   esbuild: {
     drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : []
+  },
+  build: {
+    rollupOptions: {
+      output: {
+        manualChunks(id) {
+          if (id.includes('/src/')) {
+            const group = SetTemplateGroup(id)
+            if (group) return `grp_${group}` // group files
+          }
+
+          // jquery files
+          if (id.includes('node_modules/jquery')) return 'ven_jquery'
+          if (id.includes('node_modules/summernote')) return 'ven_summer'
+          if (id.includes('node_modules/pdfmake')) return 'ven_pdfmake'
+          if (id.includes('node_modules/html-to-pdfmake')) return 'ven_pdfmake'
+          if (id.includes('node_modules/vue3-pdfmake')) return 'ven_pdfmake'
+
+          // other node_modules files
+          if (id.includes('node_modules')) return 'vendor'
+        },
+        assetFileNames: (assetInfo) => {
+          const name = assetInfo.names?.[0] || assetInfo.name || ''
+
+          if (name.endsWith('.css')) {
+            return 'static/css/[name]-[hash][extname]'
+          }
+          if (/\.(png|jpe?g|svg|gif|webp|ico)$/i.test(name)) {
+            return 'static/images/[name]-[hash][extname]'
+          }
+          if (/\.(ttf|woff2?|eot|otf)$/i.test(name)) {
+            return 'static/fonts/[name]-[hash][extname]'
+          }
+          return 'static/[name]-[hash][extname]'
+        },
+        chunkFileNames: (chunkInfo) => {
+          if (chunkInfo.name?.startsWith('grp_')) return 'static/js/[name]-[hash].js'
+          return 'static/js/[name]-[hash].js'
+        },
+        entryFileNames: 'static/js/[name]-[hash].js'
+      }
+    }
   }
 })