diff --git a/src/components/global/DataTable.vue b/src/components/global/DataTable.vue
index 76fd9fc..3180282 100644
--- a/src/components/global/DataTable.vue
+++ b/src/components/global/DataTable.vue
@@ -138,7 +138,8 @@
+ v-model:pagination="localPagination"
+ :isUseRoute="isUseRoute" />
diff --git a/src/components/global/FormSelect.vue b/src/components/global/FormSelect.vue
index 0cdf299..4c892f8 100644
--- a/src/components/global/FormSelect.vue
+++ b/src/components/global/FormSelect.vue
@@ -142,7 +142,7 @@
multipleText: 'Tümü'
})
- const emit = defineEmits(['update:modelValue', 'change','clear'])
+ const emit = defineEmits(['update:modelValue', 'change', 'clear'])
const activated = ref(false)
const multipleAllSelected = ref(false)
@@ -214,9 +214,8 @@
} else {
let text = props.listData.filter((v: Record) => {
let val = props.listVal !== undefined ? v[props.listVal] : v
- return localValue.value === val
+ return String(localValue.value) === String(val)
})[0]
-
return text !== undefined
? props.listText !== undefined
? text[props.listText]
@@ -357,7 +356,7 @@
const SetSelectedOption = () => {
selectedOption.value = props.listData.filter((v: Record) => {
- return v[props.listVal as string] === props.modelValue
+ return String(v[props.listVal as string]) === String(props.modelValue)
})[0]
}
diff --git a/src/components/global/ListTableContent.vue b/src/components/global/ListTableContent.vue
index d19fc09..137a8b5 100644
--- a/src/components/global/ListTableContent.vue
+++ b/src/components/global/ListTableContent.vue
@@ -120,13 +120,17 @@
:isPreview="isPreview"
:rowActions="rowActions"
:actionFixed="actionFixed"
- :rowActionStyle="rowActionStyle" />
+ :rowActionStyle="rowActionStyle"
+ :isUseRoute="isUseRoute" />
-
+
Filtrele
@@ -140,8 +144,11 @@
diff --git a/src/module/kullanicilar/views/KullaniciListesi.vue b/src/module/kullanicilar/views/KullaniciListesi.vue
index 5e19624..76ca9f2 100644
--- a/src/module/kullanicilar/views/KullaniciListesi.vue
+++ b/src/module/kullanicilar/views/KullaniciListesi.vue
@@ -11,7 +11,8 @@
listText="Kullanıcı"
addRoute="yeni-kullanici"
apiList="Auth/kullaniciList"
- apiText="Kullanıcı Listesi" />
+ apiText="Kullanıcı Listesi"
+ isUseRoute/>
@@ -88,7 +89,7 @@
])
const rwAction = (row: any) => {
globalStore.selUser = row.id
- router.push('detay/' + row.id)
+ router.push('detay/' + row.id+'/kullanici-bilgileri')
}
onBeforeMount(async () => {
diff --git a/src/module/muhasebe/routes/index.ts b/src/module/muhasebe/routes/index.ts
index 1d5a196..dd3ca92 100644
--- a/src/module/muhasebe/routes/index.ts
+++ b/src/module/muhasebe/routes/index.ts
@@ -5,7 +5,7 @@ import izinBedelOrani from './izin-bedel-orani'
export default [
muhasebePiyangoListesi,
- muhasebePiyangoDetay,
+ ...muhasebePiyangoDetay,
muhasebeAyarlar,
izinBedelOrani,
]
diff --git a/src/module/muhasebe/routes/muhasebe-piyango-detay.ts b/src/module/muhasebe/routes/muhasebe-piyango-detay.ts
index 6ceb3a7..494bf55 100644
--- a/src/module/muhasebe/routes/muhasebe-piyango-detay.ts
+++ b/src/module/muhasebe/routes/muhasebe-piyango-detay.ts
@@ -1,10 +1,19 @@
import MuhasebePiyangoDetay from '../views/MuhasebePiyangoDetay.vue'
-export default {
- path: '/muhasebe/piyango-detay/:piyangoId',
- name: 'MuhasebePiyangoDetay',
- component: MuhasebePiyangoDetay,
- meta: {
- authRequired: true
+export default [
+ {
+ path: '/muhasebe/piyango-detay/:piyangoId',
+ redirect: (to:Record) => ({
+ name: 'MuhasebePiyangoDetay',
+ params: { piyangoId: to.params.piyangoId, tabid: 'piyango-bilgileri' }
+ })
+ },
+ {
+ path: '/muhasebe/piyango-detay/:piyangoId/:tabid',
+ name: 'MuhasebePiyangoDetay',
+ component: MuhasebePiyangoDetay,
+ meta: {
+ authRequired: true
+ }
}
-}
+]
diff --git a/src/module/muhasebe/views/MuhasebePiyangoDetay.vue b/src/module/muhasebe/views/MuhasebePiyangoDetay.vue
index e075922..c1796d8 100644
--- a/src/module/muhasebe/views/MuhasebePiyangoDetay.vue
+++ b/src/module/muhasebe/views/MuhasebePiyangoDetay.vue
@@ -1,8 +1,8 @@
-
-
+
+
@@ -25,7 +25,7 @@
const loaded = ref(false)
const tabList = ref[]>([
- { text: 'Piyango Bilgileri', id: 'piyangobilgileri' }
+ { text: 'Piyango Bilgileri', id: 'piyango-bilgileri' }
])
onBeforeMount(async () => {
diff --git a/src/module/muhasebe/views/MuhasebePiyangoListesi.vue b/src/module/muhasebe/views/MuhasebePiyangoListesi.vue
index 92200c4..1c46f0d 100644
--- a/src/module/muhasebe/views/MuhasebePiyangoListesi.vue
+++ b/src/module/muhasebe/views/MuhasebePiyangoListesi.vue
@@ -1,6 +1,6 @@
-
+
+ apiText="Piyango Listesi"
+ isUseRoute />
diff --git a/src/module/sistem-gunlugu/views/Logs.vue b/src/module/sistem-gunlugu/views/Logs.vue
index 1eb43ec..7c4289a 100644
--- a/src/module/sistem-gunlugu/views/Logs.vue
+++ b/src/module/sistem-gunlugu/views/Logs.vue
@@ -8,7 +8,8 @@
title="Sistem Günlüğü"
listText="Log"
apiList="Auth/GetOperationLogs"
- apiText="Sistem Günlüğü Listesi" />
+ apiText="Sistem Günlüğü Listesi"
+ isUseRoute />
@@ -26,19 +27,19 @@
return dateStore.dateFormat({ date: v.timestamp })
},
sort: true,
- style:{width:'10%'}
+ style: { width: '10%' }
},
{
name: 'userName',
title: 'İşlemi yapan',
sort: true,
- style:{width:'20%'}
+ style: { width: '20%' }
},
{
name: 'operationType',
title: 'Bölüm',
sort: true,
- style:{width:'15%'}
+ style: { width: '15%' }
},
{
name: 'description',
diff --git a/src/module/site-yonetimi/views/SayfaListesi.vue b/src/module/site-yonetimi/views/SayfaListesi.vue
index 1f34f21..10b6596 100644
--- a/src/module/site-yonetimi/views/SayfaListesi.vue
+++ b/src/module/site-yonetimi/views/SayfaListesi.vue
@@ -1,6 +1,6 @@
-
+
+ :rowActionStyle="'width:10%;'"
+ isUseRoute />
diff --git a/src/module/uyeler/components/TabUyePiyangolar.vue b/src/module/uyeler/components/TabUyePiyangolar.vue
index 0461019..0758964 100644
--- a/src/module/uyeler/components/TabUyePiyangolar.vue
+++ b/src/module/uyeler/components/TabUyePiyangolar.vue
@@ -9,7 +9,8 @@
listText="Piyango"
:addRoute="PiyangoLink()"
:apiList="apiList"
- apiText="Piyango Listesi" />
+ apiText="Piyango Listesi"
+ isUseRoute />
diff --git a/src/module/uyeler/views/UyelerListe.vue b/src/module/uyeler/views/UyelerListe.vue
index e0108ef..6269ba5 100644
--- a/src/module/uyeler/views/UyelerListe.vue
+++ b/src/module/uyeler/views/UyelerListe.vue
@@ -1,6 +1,6 @@
-
+
+ apiText="Üye Listesi"
+ isUseRoute />
@@ -121,7 +122,7 @@
])
const rwAction = (row: any) => {
if (usersStore.isPanelUser) globalStore.selCustomerType = row.basvuruTipId
- router.push('detay/' + row.id)
+ router.push('detay/' + row.id+'/uye-bilgileri')
}
onBeforeMount(async () => {
diff --git a/src/stores/globalStore.ts b/src/stores/globalStore.ts
index cc75def..6b9f278 100644
--- 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(25)
+ const perPage = ref(10)
const selUser = ref(0)
const selAuthUser = ref(0)
const selCustomer = ref(0)