diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index 155b3a820..634568e46 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -137,11 +137,14 @@ async function changeState(value) { :url="ticketUrl + 'basic-data/step-one'" :text="t('globals.summary.basicData')" /> - + diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue index a47a127c1..e6db759d0 100644 --- a/src/pages/Ticket/Card/TicketVolume.vue +++ b/src/pages/Ticket/Card/TicketVolume.vue @@ -11,11 +11,13 @@ import FetchData from 'components/FetchData.vue'; import { useStateStore } from 'stores/useStateStore'; import { dashIfEmpty } from 'src/filters'; import axios from 'axios'; +import VnTable from 'src/components/VnTable/VnTable.vue'; const route = useRoute(); const stateStore = useStateStore(); const { t } = useI18n(); const salesRef = ref(null); +const tableRef = ref(); watch( () => route.params.id, @@ -34,37 +36,34 @@ const salesFilter = computed(() => ({ const sales = ref([]); const packingTypeVolume = ref([]); -const rows = computed(() => sales.value); const columns = computed(() => [ { + align: 'left', label: t('volume.item'), - name: 'item', - align: 'left', + name: 'itemFk', }, { + align: 'left', label: t('volume.description'), - name: 'description', - align: 'left', + name: 'concept', + columnClass: 'expand', }, { + align: 'left', label: t('volume.packingType'), - name: 'quantity', - field: (row) => row.item.itemPackingTypeFk, - align: 'left', - format: (val) => dashIfEmpty(val), + name: 'itemPackingTypeFk', + format: (row, dashIfEmpty) => dashIfEmpty(row.item.itemPackingTypeFk), }, { + align: 'left', label: t('volume.quantity'), name: 'quantity', - field: 'quantity', - align: 'left', }, { - label: t('volume.volumeQuantity'), - name: 'quantity', - field: (row) => row.saleVolume?.volume, align: 'left', + label: t('volume.volumeQuantity'), + name: 'volume', }, ]); @@ -124,30 +123,28 @@ onUnmounted(() => (stateStore.rightDrawer = false)); - -