fix(VnLog): update filter to include originFk and improve sorting in VnLogFilter #1690
|
@ -68,7 +68,6 @@ const filter = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
where: { and: [{ originFk: route.params.id }] },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const paginate = ref();
|
const paginate = ref();
|
||||||
|
@ -267,13 +266,6 @@ onMounted(() => {
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
stateStore.rightDrawer = false;
|
stateStore.rightDrawer = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(
|
|
||||||
() => router.currentRoute.value.params.id,
|
|
||||||
() => {
|
|
||||||
applyFilter();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
|
@ -281,6 +273,7 @@ watch(
|
||||||
:data-key
|
:data-key
|
||||||
:url="dataKey + 's'"
|
:url="dataKey + 's'"
|
||||||
:user-filter="filter"
|
:user-filter="filter"
|
||||||
|
:filter="{ where: { and: [{ originFk: route.params.id }] } }"
|
||||||
:skeleton="false"
|
:skeleton="false"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setLogTree"
|
@on-fetch="setLogTree"
|
||||||
|
|
|
@ -39,7 +39,7 @@ const checkboxOptions = ref([
|
||||||
{ name: 'select', label: 'Accesses', selected: false },
|
{ name: 'select', label: 'Accesses', selected: false },
|
||||||
]);
|
]);
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{ name: 'changedModelValue' },
|
{ name: 'changedModelValue', orderBy: 'id' },
|
||||||
{ name: 'changedModel' },
|
{ name: 'changedModel' },
|
||||||
{ name: 'userType', orderBy: false },
|
{ name: 'userType', orderBy: false },
|
||||||
{ name: 'userFk' },
|
{ name: 'userFk' },
|
||||||
|
|
Loading…
Reference in New Issue