diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue index 6cd62d83e..2e60a9815 100644 --- a/src/components/VnTable/VnColumn.vue +++ b/src/components/VnTable/VnColumn.vue @@ -46,6 +46,7 @@ const defaultComponents = { component: markRaw(VnInput), attrs: { disable: !$props.isEditable, + class: 'fit', }, forceAttrs: { label: $props.showLabel && $props.column.label, @@ -55,6 +56,7 @@ const defaultComponents = { component: markRaw(VnInput), attrs: { disable: !$props.isEditable, + class: 'fit', }, forceAttrs: { label: $props.showLabel && $props.column.label, @@ -66,6 +68,7 @@ const defaultComponents = { readonly: true, disable: !$props.isEditable, style: 'min-width: 125px', + class: 'fit', }, forceAttrs: { label: $props.showLabel && $props.column.label, @@ -77,7 +80,7 @@ const defaultComponents = { const defaultAttrs = { disable: !$props.isEditable, 'model-value': Boolean(prop), - class: 'no-padding', + class: 'no-padding fit', }; if (typeof prop == 'number') { @@ -94,6 +97,7 @@ const defaultComponents = { component: markRaw(VnSelect), attrs: { disable: !$props.isEditable, + class: 'fit', }, forceAttrs: { label: $props.showLabel && $props.column.label, diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index a88540ebf..184f8a158 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -131,3 +131,13 @@ watch( + + diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue index 3d482933a..9344ff869 100644 --- a/src/components/common/VnInputTime.vue +++ b/src/components/common/VnInputTime.vue @@ -111,3 +111,12 @@ watch( + diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 3e95a1e8b..e0397db82 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -409,14 +409,6 @@ customer: hasCoreVnl: VNL core received hasSepaVnl: VNL B2B received entry: - tableVisibleColumns: - id: Id - reference: Reference - created: Creation - supplierFk: Supplier - isBooked: Booked - isConfirmed: Confirmed - isOrdered: Ordered list: newEntry: New entry landed: Landed diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index d08b7eed2..7b92b29d4 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -11,8 +11,6 @@ import { toDate, toCurrency } from 'src/filters'; import { getUrl } from 'src/composables/getUrl'; import axios from 'axios'; -onUpdated(() => summaryRef.value.fetch()); - const route = useRoute(); const { t } = useI18n(); diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index 997d58f37..fe719db6e 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -14,6 +14,7 @@ const stateStore = useStateStore(); const { t } = useI18n(); const route = useRoute(); const entityId = computed(() => route.params.id); +const tableRef = ref(); const entryFilter = { include: [ @@ -51,6 +52,10 @@ const columns = computed(() => [ label: t('entry.list.tableVisibleColumns.reference'), name: 'reference', isTitle: true, + component: 'input', + columnField: { + component: null, + }, create: true, cardVisible: true, }, @@ -188,16 +193,12 @@ onMounted(async () => { ref="tableRef" data-key="EntryList" url="Entries/filter" - url-create="Entries" - save-url="Entries/crud" :filter="entryFilter" :create="{ urlCreate: 'Entries', title: 'Create entry', - onDataSaved: () => tableRef.reload(), - formInitialData: { - workerFk: entityId, - }, + onDataSaved: ({ id }) => tableRef.redirect(id), + formInitialData: {}, }" order="id DESC" :columns="columns"