diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue index 6fe3649ed..4df84e4bd 100644 --- a/src/pages/Zone/ZoneList.vue +++ b/src/pages/Zone/ZoneList.vue @@ -4,7 +4,7 @@ import { useRouter } from 'vue-router'; import { computed, ref } from 'vue'; import axios from 'axios'; -import { toCurrency } from 'src/filters'; +import { dashIfEmpty, toCurrency } from 'src/filters'; import { toTimeFormat } from 'src/filters/date'; import { useVnConfirm } from 'composables/useVnConfirm'; import useNotify from 'src/composables/useNotify.js'; @@ -17,7 +17,6 @@ import VnInputTime from 'src/components/common/VnInputTime.vue'; import RightMenu from 'src/components/common/RightMenu.vue'; import ZoneFilterPanel from './ZoneFilterPanel.vue'; import ZoneSearchbar from './Card/ZoneSearchbar.vue'; -import FetchData from 'src/components/FetchData.vue'; const { t } = useI18n(); const router = useRouter(); @@ -26,7 +25,6 @@ const { viewSummary } = useSummaryDialog(); const { openConfirmationModal } = useVnConfirm(); const tableRef = ref(); const warehouseOptions = ref([]); -const validAddresses = ref([]); const tableFilter = { include: [ @@ -67,6 +65,7 @@ const tableFilter = { const columns = computed(() => [ { + align: 'left', name: 'id', label: t('list.id'), chip: { @@ -76,8 +75,6 @@ const columns = computed(() => [ columnFilter: { inWhere: true, }, - columnClass: 'shrink-column', - component: 'number', }, { align: 'left', @@ -109,6 +106,7 @@ const columns = computed(() => [ format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name), }, { + align: 'left', name: 'price', label: t('list.price'), cardVisible: true, @@ -116,11 +114,9 @@ const columns = computed(() => [ columnFilter: { inWhere: true, }, - columnClass: 'shrink-column', - component: 'number', }, { - align: 'center', + align: 'left', name: 'hour', label: t('list.close'), cardVisible: true, @@ -133,6 +129,7 @@ const columns = computed(() => [ label: t('list.addressFk'), cardVisible: true, columnFilter: false, + columnClass: 'expand', }, { align: 'right', @@ -167,26 +164,14 @@ const handleClone = (id) => { ); }; -function showValidAddresses(row) { - if (row.addressFk) { - const isValid = validAddresses.value.some( - (address) => address.addressFk === row.addressFk, - ); - if (isValid) - return `${row.address?.nickname}, - ${row.address?.postcode?.town?.name} (${row.address?.province?.name})`; - else return '-'; - } - return '-'; +function formatRow(row) { + if (!row?.address) return '-'; + return dashIfEmpty(`${row?.address?.nickname}, + ${row?.address?.postcode?.town?.name} (${row?.address?.province?.name})`); }