diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue index 6196c636a..1aabe1b6b 100644 --- a/src/components/LeftMenu.vue +++ b/src/components/LeftMenu.vue @@ -31,7 +31,7 @@ function findMatches(search, item) { const matches = []; function findRoute(search, item) { for (const child of item.children) { - if (search.indexOf(child.name) > -1) { + if (search?.indexOf(child.name) > -1) { matches.push(child); } else if (child.children) { findRoute(search, child); diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 025a8a2e2..65a89ee28 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -111,25 +111,23 @@ watch($props, async () => {
- + {{ $props.title }} - {{ $props.title }} - + {{ entity.name }} - {{ entity.name }}
- + #{{ $props.subtitle ?? entity.id }}
-
+
@@ -163,11 +161,12 @@ watch($props, async () => { display: flex; padding: 2px 16px; .label { - color: $label-color; + color: var(--vn-label); font-size: 12px; width: 47%; } .value { + color: var(--vn-text); font-size: 14px; margin-left: 12px; width: 47%; @@ -184,22 +183,26 @@ watch($props, async () => { + + diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index b3fb9746b..b54e44398 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -2,6 +2,8 @@ import { onMounted, ref, watch } from 'vue'; import axios from 'axios'; import SkeletonSummary from 'components/ui/SkeletonSummary.vue'; +import VnLv from 'src/components/ui/VnLv.vue'; + onMounted(() => fetch()); const entity = ref(); @@ -41,15 +43,21 @@ watch(props, async () => { diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index 711811b00..b9f0f57e7 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -9,6 +9,8 @@ import { toDate, toDateString, toCurrency } from 'src/filters/index'; import TicketSummaryDialog from './Card/TicketSummaryDialog.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import TicketFilter from './TicketFilter.vue'; +import VnLv from 'src/components/ui/VnLv.vue'; +import CardList from 'src/components/ui/CardList.vue'; const router = useRouter(); const quasar = useQuasar(); @@ -81,105 +83,50 @@ function viewSummary(id) { auto-load > diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue index 917682faf..ba64a5abb 100644 --- a/src/pages/Worker/Card/WorkerDescriptor.vue +++ b/src/pages/Worker/Card/WorkerDescriptor.vue @@ -63,6 +63,7 @@ const setData = (entity) => :url="`Workers/${entityId}`" :filter="filter" :title="data.title" + :subtitle="data.subtitle" @on-fetch=" (data) => { worker = data; @@ -74,7 +75,7 @@ const setData = (entity) =>