src/components/ui/VnSubToolbar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onBeforeUnmount, ref, nextTick } from 'vue';
+import { onMounted, onBeforeUnmount, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 const stateStore = useStateStore();

src/pages/Item/Card/ItemDiary.vue

@@ -5,7 +5,9 @@ import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import OrderDescriptorProxy from 'src/pages/Order/Card/OrderDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -45,8 +47,8 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('itemDiary.id'),
+        label: t('itemDiary.origin'),
-        name: 'id',
+        name: 'originId',
         align: 'left',
     },
     {
@@ -65,8 +67,8 @@ const columns = computed(() => [
     },
 
     {
-        label: t('itemDiary.client'),
+        label: t('itemDiary.entity'),
-        name: 'client',
+        name: 'entityId',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
@@ -111,10 +113,28 @@ const getBadgeAttrs = (_date) => {
     return attrs;
 };
 
-const getIdDescriptor = (row) => {
+const originTypeMap = {
-    let descriptor = EntryDescriptorProxy;
+    entry: {
-    if (row.isTicket) descriptor = TicketDescriptorProxy;
+        descriptor: EntryDescriptorProxy,
-    return descriptor;
+        icon: 'vn:entry',
+    },
+    ticket: {
+        descriptor: TicketDescriptorProxy,
+        icon: 'vn:ticket',
+    },
+    order: {
+        descriptor: OrderDescriptorProxy,
+        icon: 'vn:basket',
+    },
+};
+
+const entityTypeMap = {
+    client: {
+        descriptor: CustomerDescriptorProxy,
+    },
+    supplier: {
+        descriptor: SupplierDescriptorProxy,
+    },
 };
 
 onMounted(async () => {
@@ -206,21 +226,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
-            <template #body-cell-id="{ row }">
+            <template #body-cell-originId="{ row }">
                 <QTd @click.stop>
                     <component
-                        :is="getIdDescriptor(row)"
+                        :is="originTypeMap[row.originType]?.descriptor"
-                        :id="row.origin"
+                        :id="row.originId"
                         class="q-ma-none"
                         dense
                         style="font-size: 14px"
                     >
-                        {{ row.origin }}
+                        {{ row.originId }}
                     </component>
-                    <span class="link">{{ row.origin }}</span>
+                    <span class="link">
+                        <QIcon
+                            :name="originTypeMap[row.originType]?.icon"
+                            class="fill-icon q-mr-sm"
+                            size="xs"
+                        />
+                        {{ row.originId }}
+                    </span>
                 </QTd>
             </template>
-            <template #body-cell-client="{ row }">
+            <template #body-cell-entityId="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         :color="row.highlighted ? 'warning' : 'transparent'"
@@ -228,11 +255,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         dense
                         style="font-size: 14px"
                     >
-                        <span v-if="row.isTicket" class="link">
+                        <component
-                            {{ dashIfEmpty(row.name) }}
+                            :is="entityTypeMap[row.entityType]?.descriptor"
-                            <CustomerDescriptorProxy :id="row.clientFk" />
+                            :id="row.entityId"
+                            class="q-ma-none"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ row.entityId }}
+                        </component>
+                        <span class="link">
+                            {{ dashIfEmpty(row.entityName) }}
                         </span>
-                        <span v-else>{{ dashIfEmpty(row.name) }}</span>
                     </QBadge>
                 </QTd>
             </template>

src/pages/Item/locale/en.yml

@@ -14,10 +14,10 @@ shelvings:
     removeConfirmSubtitle: Are you sure you want to continue?
 itemDiary:
     date: Date
-    id: Id
+    origin: Origin
     state: State
     reference: Reference
-    client: Client
+    entity: Entity
     in: In
     out: Out
     balance: Balance

src/pages/Item/locale/es.yml

@@ -14,10 +14,10 @@ shelvings:
     removeConfirmSubtitle: ¿Seguro que quieres continuar?
 itemDiary:
     date: Fecha
-    id: Id
+    origin: Origen
     state: Estado
     reference: Referencia
-    client: Cliente
+    entity: Entidad
     in: Entrada
     out: Salida
     balance: Balance

src/pages/Order/Card/OrderDescriptorProxy.vue

@@ -0,0 +1,17 @@
+<script setup>
+import OrderDescriptor from './OrderDescriptor.vue';
+import OrderSummary from './OrderSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <OrderDescriptor v-if="$props.id" :id="$props.id" :summary="OrderSummary" />
+    </QPopupProxy>
+</template>

src/pages/Supplier/Card/SupplierSummary.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUpdated } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';

src/pages/Ticket/TicketFilter.vue

@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();