diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index c9f590565..e4924d3c1 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -329,6 +329,7 @@ globals: email: Email SSN: SSN fi: FI + packing: ITP myTeam: My team departmentFk: Department countryFk: Country diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 61a5984cb..1a0adb2f3 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -335,6 +335,7 @@ globals: SSN: NSS fi: NIF myTeam: Mi equipo + packing: ITP countryFk: País changePass: Cambiar contraseña deleteConfirmTitle: Eliminar los elementos seleccionados diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue index 8377d73ef..5c2f5480a 100644 --- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue +++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue @@ -134,6 +134,7 @@ const getLocale = (label) => { /> + { /> + + + + + + + + + + [ align: 'left', format: (row) => row.practicalHour, columnFilter: false, + dense: true, }, { label: t('salesTicketsTable.preparation'), @@ -190,6 +196,7 @@ const columns = computed(() => [ 'false-value': 0, 'true-value': 1, }, + component: false, }, { label: t('salesTicketsTable.zone'), @@ -206,6 +213,12 @@ const columns = computed(() => [ }, }, }, + { + label: t('salesTicketsTable.payMethod'), + name: 'payMethod', + align: 'left', + columnFilter: false, + }, { label: t('salesTicketsTable.total'), name: 'totalWithVat', @@ -219,6 +232,36 @@ const columns = computed(() => [ }, }, }, + { + label: t('salesTicketsTable.department'), + name: 'department', + align: 'left', + columnFilter: { + component: 'select', + url: 'Departments', + attrs: { + options: DepartmentOpts.value, + optionValue: 'name', + optionLabel: 'name', + dense: true, + }, + }, + }, + { + label: t('salesTicketsTable.packing'), + name: 'packing', + align: 'left', + columnFilter: { + component: 'select', + url: 'ItemPackingTypes', + attrs: { + options: ItemPackingTypeOpts.value, + 'option-value': 'code', + 'option-label': 'code', + dense: true, + }, + }, + }, { align: 'right', name: 'tableActions', @@ -318,6 +361,24 @@ const openTab = (id) => auto-load @on-fetch="(data) => (zoneOpts = data)" /> + +