- Filtreleme yapısı değiştirildi.

- Tarihler için başlangıç-bitiş aralığı seçilebielcek
- geri dönüldüğünde çıkan hatalar düzeltildi
- filtrede date olan alanlar için başlangıç-bitiş seçimi eklendi
- axios serializer eklendi. array ile verilen parametrelerde hata çıkıyordu
This commit is contained in:
M. Bestami
2025-10-24 10:24:05 +03:00
parent f31bd6ba9e
commit 03689a01e3
18 changed files with 311 additions and 285 deletions

View File

@ -2162,7 +2162,7 @@ section {
}
.panel-wrapper {
max-width: 480px;
max-width: 600px;
}
.panel-wrapper.panel-wide {
@ -2175,7 +2175,7 @@ section {
}
.panel-wrapper.panel-right.showme {
left: calc(100% - 480px);
left: calc(100% - 600px);
}
.panel-wrapper.panel-right.panel-wide.showme {

View File

@ -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
}
}
}

View File

@ -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,15 +97,22 @@
<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>
<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(k as string)"></span>
<span
class="list-filter-close"
@click="RemoveFilterKey(index, filterIndex)"></span>
</div>
</template>
</template>
</div>
</div>
<slot name="datatable">
@ -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]
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 = []
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.assign(filterParams, localFilterParams.value)
EqualObjects(filterParams, localFilterParams.value)
}
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) {
Object.keys(route.query).forEach((k) => {
if (k.includes('Filters[')) delete route.query[k]
})
const q = {
query: {
const newQuery: Record<string, any> = {
...route.query
}
}
Object.keys(filterParams).forEach((f, k) => {
q.query['Filters[' + f + ']'] = filterParams[f].op + filterParams[f].val
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,61 @@
const RouteFilterControl = () => {
if (props.isUseRoute) {
const q = { ...route.query }
localFilterParams.value = {}
Object.keys(filterParams).forEach((k) => {
delete filterParams[k]
})
filterChanging.value = true
console.log('c', localFilterParams.value, route.query)
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 forText = props.tableHeader[
filter.hIndex
].filter!.data.find(
(o: Record<string, any>) =>
String(
o[props.tableHeader[filter.hIndex].filter!.listVal]
) === String(filter.values[ind].val)
)
filter.values[ind].text =
forText[props.tableHeader[filter.hIndex].filter!.listText]
}
})
} 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 forText = props.tableHeader[filter.hIndex].filter!.data.find(
(o: Record<string, any>) =>
String(o[props.tableHeader[filter.hIndex].filter!.listVal]) ===
String(filter.values[0].val)
)
filter.values[0].text =
forText[props.tableHeader[filter.hIndex].filter!.listText]
}
}
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
})
@ -484,11 +551,7 @@
}
// Filtre parametrelerini ekle
if (filters()) {
Object.keys(filterParams).forEach((f, k) => {
exportParams['Filters[' + f + ']'] = filterParams[f].op + filterParams[f].val
})
}
if (haveFilter.value) AddParamsToObject(exportParams)
// Axios ile dosya indirme - interceptor otomatik olarak token ekleyecek
try {
@ -538,10 +601,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)
@ -587,7 +648,7 @@
let el: HTMLInputElement = document.getElementById(
'listsearch' + rnd.value
) as HTMLInputElement
el.focus
el.focus()
el.select()
}, 50)
}
@ -614,41 +675,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)
})
@ -678,14 +715,6 @@
}
}
)
watch(
() => localPagination.value.pageNumber,
() => {
if (!pageNumberChanging.value) {
GetLocalData()
}
}
)
watch(
() => props.refresh,
() => {

View File

@ -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'">
<template v-for="(filter, i) in localFilterParams">
<template v-if="filter.type === 'datetime-local'">
<div class="panel-content-item">
<form-date
v-model="localFilterData[filter.name]"
:label="filter.title"
@change="UpdateFilter(filter)" />
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.filter.range !== undefined && filter.filter.range"
v-if="filter.range !== undefined && filter.range"
:listData="filterOperator"
v-model="localFilterData[filter.name + 'op']"
@change="UpdateFilter(filter)" />
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.filter.type === 'date'">
<template v-if="filter.type === 'date'">
<div class="panel-content-item">
<form-date
type="date"
v-model="localFilterData[filter.name]"
:label="filter.title"
@change="UpdateFilter(filter)" />
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.filter.range !== undefined && filter.filter.range"
v-if="filter.range !== undefined && filter.range"
:listData="filterOperator"
v-model="localFilterData[filter.name + 'op']"
@change="UpdateFilter(filter)" />
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.filter.type === 'text'">
<template v-if="filter.type === 'text'">
<div class="panel-content-item">
<form-input
v-model="localFilterData[filter.name]"
v-model="filter.values[0].val"
:label="filter.title"
@change="UpdateFilter(filter)" />
@change="UpdateFilter(filter, 0)" />
<form-select
v-if="filter.filter.range !== undefined && filter.filter.range"
v-if="filter.range !== undefined && filter.range"
:listData="filterOperator"
v-model="localFilterData[filter.name + 'op']"
@change="UpdateFilter(filter)" />
v-model="filter.values[0].op"
@change="UpdateFilter(filter, 0)"
label="Operator" />
</div>
</template>
<template v-if="filter.filter.type === 'select'">
<template v-if="filter.type === 'select'">
<div class="panel-content-item">
<form-select
:listData="filter.filter.data"
:listText="filter.filter.listText"
:listVal="filter.filter.listVal"
:extraData="filter"
: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="localFilterData[filter.filter.filterId || filter.name] as number"
v-model="filter.values[0].val"
@change="UpdateFilterSelect"
clearable />
</div>
</template>
</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,15 @@
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]
console.log(v,d)
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]
console.log("-----")
ext.f.filter = false
ext.f.values[0].text = ''
}
emit('update:filterParams', localFilterParams)
}
onBeforeMount(() => {
createFilterData()
})
</script>

View File

@ -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,9 +85,11 @@
currentTab.value = Number(d)
}
if (props.isUseRoute) {
nextTick(() => {
router.push({
params: { ...route.params, tabid: props.tabList[currentTab.value].id }
})
})
}
CalculateNavPosition()
}

View File

@ -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

View File

@ -59,7 +59,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
},
{

View File

@ -32,7 +32,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
},
{

View File

@ -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

View File

@ -23,8 +23,7 @@
</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'
@ -40,7 +39,6 @@
const piyangoServices = usePiyangoServices()
import router from '@/router'
const route = useRoute()
const loaded = ref<boolean>(false)
const apiList = ref<string>('')
@ -77,7 +75,6 @@
style: { width: '10%' }
})
if (usersStore.isAraciFirma || usersStore.isPanelUser) {
header.push({ name: 'duzenleyen', title: 'Düzenleyen' })
}
@ -110,7 +107,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
}
)
@ -126,7 +123,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
})
}
@ -142,7 +139,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
},
{
@ -155,7 +152,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
}
)
@ -243,13 +240,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>

View File

@ -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
}
},
{

View File

@ -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
)

View File

@ -88,7 +88,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
}
)
@ -103,7 +103,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
})
}
@ -119,7 +119,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
},
{
@ -132,7 +132,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
}
}
)

View File

@ -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 () => {

View File

@ -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
}
},
{

View File

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

View File

@ -51,7 +51,7 @@
sort: true,
filter: {
type: 'date',
range: true
between: true
},
style:{width:'15%'}
},

View File

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