- Piyango önizleme tarih o günün tarihi olrak alındı

- Piyango önizleme aralıklar kısaltıldı - Dosya kapama cekilisId ler eklendi - perPage = 25 - Piyango teslim tarihi min = yedektalihli başvuru
2025-09-26 14:57:07 +03:00
parent 58cd065977
commit da432261ba
7 changed files with 83 additions and 81 deletions
--- a/src/module/cekilisler/components/display/PiyangoOnizlemeDisplay.vue
+++ b/src/module/cekilisler/components/display/PiyangoOnizlemeDisplay.vue
@ -3,8 +3,8 @@
    style="
      display: inline-block;
      width: 100%;
-      font-size: 13pt;
-      margin-bottom: 12px;
+      font-size: 10pt;
+      margin-bottom: 10px;
      text-align: center;
    ">
    MİLLİ PİYANGO İDARESİ GENEL MÜDÜRLÜĞÜ
@ -18,18 +18,15 @@
    düzenlemek üzere, aşağıda belirtilen koşullarda piyango düzenlemek üzere gerekli iznin
    verilmesi hususunda bilgilerinizi ve gereğini arz ederiz.
    <br />
-    <br />
  </div>
-  <strong style="font-size: 10pt; margin-bottom: 12px">
+  <strong style="font-size: 10pt; margin-bottom: 10px">
    PİYANGO İLE İLGİLİ BİLGİLER
  </strong>
  <br />
-  <br />
-  <strong style="font-size: 10pt; margin-bottom: 12px">
+  <strong style="font-size: 10pt; margin-bottom: 10px">
    PİYANGO ID: {{ piyangoStore.lotteryData.piyangoId }}
  </strong>
  <br />
-  <br />
  <table
    cellspacing="0"
    class="table-no-line"
@ -37,7 +34,7 @@
    <tbody>
      <tr>
        <td colspan="2">
-          <strong style="font-size: 10pt; margin-bottom: 12px">
+          <strong style="font-size: 10pt; margin-bottom: 10px">
            1- Piyangoyu Düzenleyenin
          </strong>
        </td>
@ -48,7 +45,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <template v-if="piyangoStore.duzenleyenData.basvuruTipId === 18">
          <tr>
@ -208,7 +205,7 @@
        <tbody>
          <tr>
            <td colspan="2">
-              <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+              <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
                Piyangoyu Yürütenin:
              </strong>
            </td>
@ -257,7 +254,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              2- Kampanyanın:
            </strong>
          </td>
@ -267,7 +264,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td>
@ -313,7 +310,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              3-Çekilişe katılma şekil ve şartları:
            </strong>
          </td>
@ -324,7 +321,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -348,7 +345,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              4-Çekilişin;
            </strong>
          </td>
@ -359,7 +356,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -409,7 +406,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              5-Çekiliş sonuçlarının ilan edileceği gazetenin:
            </strong>
          </td>
@ -420,7 +417,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -469,7 +466,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -515,7 +512,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              7-Diğer hususlar:
            </strong>
          </td>
@ -526,7 +523,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -555,7 +552,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              8-Piyangoya konu ikramiyeler:
            </strong>
          </td>
@ -566,7 +563,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': ['10%', '30%', '15%', '15%', '15%', '15%'],'layout': 'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt"
+      style="margin-bottom: 10px; font-size: 10pt"
      v-if="piyangoIkramiyeStore.piyangoAllIkramiyeData.length > 0">
      <tbody>
        <tr>
@ -626,7 +623,7 @@
      cellspacing="0"
      class="table-no-line"
      data-pdfmake="{'widths': [ '50%', '30%','20%'],'layout':'pdfTableLayoutNoLine'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td>
@ -635,7 +632,13 @@
          </td>
          <td></td>
          <td>
-            Tarih:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/
+            Tarih:{{
+              dateStore.dateFormat({
+                date: new Date(),
+                pattern: 'dd-mm-yy',
+                splitDate: '/'
+              })
+            }}
          </td>
        </tr>
        <tr>
--- a/src/module/cekilisler/components/display/PiyangoYardimAmacliOnizlemeDisplay.vue
+++ b/src/module/cekilisler/components/display/PiyangoYardimAmacliOnizlemeDisplay.vue
@ -3,8 +3,8 @@
    style="
      display: inline-block;
      width: 100%;
-      font-size: 14pt;
-      margin-bottom: 12px;
+      font-size: 10pt;
+      margin-bottom: 10px;
      text-align: center;
    ">
    MİLLİ PİYANGO İDARESİ GENEL MÜDÜRLÜĞÜ
@ -12,12 +12,10 @@
    Bahisler ve Oyunlar Dairesi Başkanlığına
  </strong>
  <br />
-  <br />
-  <strong style="font-size: 10pt; margin-bottom: 12px">
+  <strong style="font-size: 10pt; margin-bottom: 10px">
    PİYANGO ID: {{ piyangoStore.lotteryData.piyangoId }}
  </strong>
  <br />
-  <br />
  <table
    cellspacing="0"
    class="table-no-line"
@ -25,7 +23,7 @@
    <tbody>
      <tr>
        <td colspan="2">
-          <strong style="font-size: 10pt; margin-bottom: 12px">
+          <strong style="font-size: 10pt; margin-bottom: 10px">
            1- Piyangoyu Düzenleyenin:
          </strong>
        </td>
@ -36,7 +34,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <template v-if="piyangoStore.duzenleyenData.basvuruTipId === 18">
          <tr>
@ -166,7 +164,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              2- Piyangonun Geçerli Olduğu Yerler:
            </strong>
          </td>
@ -176,7 +174,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -199,7 +197,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              3- Basılacak Biletlerin:
            </strong>
          </td>
@ -209,7 +207,7 @@

    <table
      data-pdfmake="{'widths': [ '31%', '23%' , '23%' , '23%' ],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <thead>
        <tr>
          <th></th>
@ -285,7 +283,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              4- Biletlerin Basımı
            </strong>
          </td>
@ -295,7 +293,7 @@

    <table
      data-pdfmake="{'widths': [ '50%', '50%' ],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -320,7 +318,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              5- Çekiliş Tarih, Saati ve Adresi:
            </strong>
          </td>
@ -331,7 +329,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -381,7 +379,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              6- İkramiye Kazananların İlanı:
            </strong>
          </td>
@ -392,7 +390,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -448,7 +446,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              7- Talihlilerin Başvuru Tarihi:
            </strong>
          </td>
@ -459,7 +457,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -494,7 +492,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              8- Diğer Hususlar:
            </strong>
          </td>
@ -505,7 +503,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': [ '50%', '50%'],'layout':'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt">
+      style="margin-bottom: 10px; font-size: 10pt">
      <tbody>
        <tr>
          <td colspan="2">
@ -534,7 +532,7 @@
      <tbody>
        <tr>
          <td colspan="2">
-            <strong class="title" style="font-size: 10pt; margin-bottom: 12px">
+            <strong class="title" style="font-size: 10pt; margin-bottom: 10px">
              9-Piyangoya Konu İkramiyeler:
            </strong>
          </td>
@ -545,7 +543,7 @@
    <table
      cellspacing="0"
      data-pdfmake="{'widths': ['10%', '45%', '15%', '15%', '15%'],'layout': 'pdfTableLayout'}"
-      style="margin-bottom: 12px; font-size: 10pt"
+      style="margin-bottom: 10px; font-size: 10pt"
      v-if="piyangoIkramiyeStore.piyangoAllIkramiyeData.length > 0">
      <thead>
        <tr>
@ -611,8 +609,6 @@
  const dateStore = useDateStore()
  import { usePiyangoStore } from '../../stores/piyangoStore'
  const piyangoStore = usePiyangoStore()
-  import { usePiyangoContactStore } from '../../stores/piyangoContactStore'
-  const piyangoContactStore = usePiyangoContactStore()
  import { usePiyangoMecraStore } from '../../stores/piyangoMecraStore'
  const piyangoMecraStore = usePiyangoMecraStore()
  import { usePiyangoMecraService } from '../../service/piyangoMecraService'
@ -621,8 +617,6 @@
  const piyangoIkramiyeStore = usePiyangoIkramiyeStore()
  import { usePiyangoIkramiyeService } from '../../service/piyangoIkramiyeService'
  const piyangoIkramiyeService = usePiyangoIkramiyeService()
-  import { useCustomerIrtibatStore } from '@/module/uyeler/stores/customerIrtibatStore'
-  const customerIrtibatStore = useCustomerIrtibatStore()
  import { useCustomerIrtibatService } from '@/module/uyeler/service/customerIrtibatService'
  const customerIrtibatService = useCustomerIrtibatService()
  import { usePiyangoDataStore } from '../../stores/piyangoDataStore'
--- a/src/module/cekilisler/service/piyangoDosyaKapamaService.ts
+++ b/src/module/cekilisler/service/piyangoDosyaKapamaService.ts
@ -31,17 +31,18 @@ export const usePiyangoDosyaKapamaService = defineStore(

    const SaveDosyaKapama = async () => {
      let dt: any
+      const localData = Object.assign({}, piyangoDosyaKapamaStore.dosyaKapamaData)
+      if (localData.cekilisId === undefined)
+        localData.cekilisId = piyangoStore.selectedLottery
+
      if (!piyangoDosyaKapamaStore.isUpdate) {
        dt = await dataStore.dataPost('TeminatIadeEvrakKontrol', {
-          data: piyangoDosyaKapamaStore.dosyaKapamaData
+          data: localData
        })
      } else {
-        dt = await dataStore.dataPut(
-          'TeminatIadeEvrakKontrol/' + piyangoDosyaKapamaStore.dosyaKapamaData.id,
-          {
-            data: piyangoDosyaKapamaStore.dosyaKapamaData
-          }
-        )
+        dt = await dataStore.dataPut('TeminatIadeEvrakKontrol/' + localData.id, {
+          data: localData
+        })
      }
      if (dt !== 'errorfalse') {
        piyangoDosyaKapamaStore.isUpdate = false
@ -52,18 +53,21 @@ export const usePiyangoDosyaKapamaService = defineStore(
    const SaveDosyaKapamaIkramiye = async () => {
      if (piyangoDosyaKapamaValidationStore.IkramiyeFormCheck()) {
        let dt: any
+        const localData = Object.assign(
+          {},
+          piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData
+        )
+        if (localData.cekilisId === undefined)
+          localData.cekilisId = piyangoStore.selectedLottery
+
        if (!piyangoDosyaKapamaStore.isDosyaKapamaIkramiyeUpdate) {
          dt = await dataStore.dataPost('TeminatIadeEvrak', {
-            data: piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData
+            data: localData
          })
        } else {
-          dt = await dataStore.dataPut(
-            'TeminatIadeEvrak/' +
-              piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData.id,
-            {
-              data: piyangoDosyaKapamaStore.dosyaKapamaIkramiyeData
-            }
-          )
+          dt = await dataStore.dataPut('TeminatIadeEvrak/' + localData.id, {
+            data: localData
+          })
        }
        if (dt !== 'errorfalse') {
          piyangoDosyaKapamaStore.isDosyaKapamaIkramiyeUpdate = false
--- a/src/module/cekilisler/stores/piyangoDosyaKapamaStore.ts
+++ b/src/module/cekilisler/stores/piyangoDosyaKapamaStore.ts
@ -39,7 +39,7 @@ export const usePiyangoDosyaKapamaStore = defineStore('piyangoDosyaKapamaStore',
    duyuruMateryali: false,
    ikramiyelerinSonTeslimTarihi: '',
    teminatIadeTarihi: '',
-    evrak: { cekilisId: piyangoStore.selectedLottery }
+    cekilisId: piyangoStore.selectedLottery
  })
  const baseDosyaKapamaIkramiyeData = reactive<Record<string, any>>({
    taahhutEdilenIkramiye: '',
@ -48,7 +48,8 @@ export const usePiyangoDosyaKapamaStore = defineStore('piyangoDosyaKapamaStore',
    teslimEdilenIkramiyeYedek: '',
    teslimEdilenIkramiye: '',
    alinmayanIkramiye: '',
-    aciklama: ''
+    aciklama: '',
+    cekilisId: piyangoStore.selectedLottery
  })
  const dosyaKapamaData = reactive<Record<string, any>>({})
  const safeDosyaKapamaData = reactive<Record<string, any>>({})
--- a/src/module/cekilisler/validation/piyangoValidationStore.ts
+++ b/src/module/cekilisler/validation/piyangoValidationStore.ts
@ -167,7 +167,7 @@ export const usePiyangoValidationStore = defineStore('piyangoValidationStore', (
    }
  })
  const ikramiyeTeslimMin = computed((): Date => {
-    return piyangoStore.lotteryData.asilSonBasvuruTarihi
+    return piyangoStore.lotteryData.yedekSonBasvuruTarihi
  })
  const ikramiyeTeslimMax = computed((): Date => {
    var date: Date = new Date()
--- a/src/stores/globalStore.ts
+++ b/src/stores/globalStore.ts
@ -16,7 +16,7 @@ export const useGlobalStore = defineStore('globalStore', () => {
    tablet: 992,
    tabletp: 768
  })
-  const perPage = ref<number>(10)
+  const perPage = ref<number>(25)
  const selUser = ref<number>(0)
  const selAuthUser = ref<number>(0)
  const selCustomer = ref<number>(0)
--- a/src/stores/previewStore.ts
+++ b/src/stores/previewStore.ts
@ -11,7 +11,7 @@ export const usePreviewStore = defineStore('previewStore', () => {
    var pdfData = `<style>
    .form-item{
      width: 100%;
-      border: 1px solid #dddddd;
+      border: 1px solid #f2f2f2;
      float:left;
    }
      .form-item-half{
@ -19,8 +19,8 @@ export const usePreviewStore = defineStore('previewStore', () => {
      }
  .display-title{
    width: 100%;
-    padding: 8px 0;
-    border-bottom: 1px solid #e7e7e7;
+    padding: 4px 0;
+    border-bottom: 1px solid #f2f2f2;
    margin-bottom: 8px;
  }
    </style>`
@ -70,22 +70,22 @@ export const usePreviewStore = defineStore('previewStore', () => {
          return 1
        },
        hLineColor: function () {
-          return '#e7e7e7'
+          return '#f2f2f2'
        },
        vLineColor: function () {
-          return '#e7e7e7'
+          return '#f2f2f2'
        },
        paddingLeft: function () {
-          return 6
+          return 4
        },
        paddingRight: function () {
-          return 6
+          return 4
        },
        paddingTop: function () {
-          return 6
+          return 4
        },
        paddingBottom: function () {
-          return 6
+          return 4
        }
      },
      pdfTableLayoutNoLine: {
@ -111,7 +111,7 @@ export const usePreviewStore = defineStore('previewStore', () => {
          return 0
        },
        paddingBottom: function () {
-          return 6
+          return 4
        }
      }
    }