diff --git a/src/composables/useRole.js b/src/composables/useRole.js index e700b1f2e7c..e4e4f52c74f 100644 --- a/src/composables/useRole.js +++ b/src/composables/useRole.js @@ -13,7 +13,7 @@ export function useRole() { name: data.user.name, nickname: data.user.nickname, lang: data.user.lang || 'es', - departmentFk: data.user.worker.department.departmentFk, + departmentFk: data.user?.worker?.department?.departmentFk, }; state.setUser(userData); state.setRoles(roles); diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index 039d3ca9e0c..634b8e50aee 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -113,7 +113,7 @@ const columns = computed(() => [ }, { align: 'left', - name: 'shipped', + name: 'shippedDate', cardVisible: true, label: t('ticketList.shipped'), columnFilter: { @@ -123,7 +123,7 @@ const columns = computed(() => [ }, { align: 'left', - name: 'shipped', + name: 'shippedHour', component: 'time', columnFilter: false, label: t('ticketList.hour'), diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index 9eb8ce8cbfc..2e44df7aa15 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -205,6 +205,7 @@ ticketList: toLines: Go to lines addressNickname: Address nickname ref: Reference + hour: Hour rounding: Rounding noVerifiedData: No verified data purchaseRequest: Purchase request