From 1dace39882a136d1304b3f8905494555e67cfd0e Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 26 Jul 2024 11:24:40 +0200 Subject: [PATCH] refactor: refs #7553 changed isScanned field & fixed cardDescriptor warning --- src/components/ui/CardDescriptor.vue | 3 ++- src/pages/Ticket/Card/TicketExpedition.vue | 23 +++++++++------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 90ac856e5c..7f35f0a28a 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -47,6 +47,7 @@ let store; let entity; const isLoading = ref(false); const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName); +const menuRef = ref(); defineExpose({ getData }); onBeforeMount(async () => { @@ -170,7 +171,7 @@ const toModule = computed(() => {{ t('components.cardDescriptor.moreOptions') }} - + diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue index e8dd5b31c8..5ca57ae8eb 100644 --- a/src/pages/Ticket/Card/TicketExpedition.vue +++ b/src/pages/Ticket/Card/TicketExpedition.vue @@ -98,14 +98,6 @@ const columns = computed(() => [ isTitle: true, columnFilter: { inWhere: true, - // component: 'select', - // attrs: { - // url: 'Items', - // useLike: false, - // fields: ['id', 'name'], - // optionLabel: 'name', - // optionValue: 'id', - // }, }, }, { @@ -181,7 +173,6 @@ const logTableColumns = computed(() => [ name: 'created', field: 'created', align: 'center', - columnFilter: null, format: (value) => toDateTimeFormat(value), }, { @@ -189,11 +180,6 @@ const logTableColumns = computed(() => [ name: 'isScanned', field: 'isScanned', align: 'center', - columnFilter: null, - format: (value) => { - if (value === true) return t('expedition.yes'); - else return t('expedition.no'); - }, }, ]); @@ -365,6 +351,15 @@ onUnmounted(() => (stateStore.rightDrawer = false)); +