Merge branch 'warmfix_ticketList_sortByShipped' into test

This commit is contained in:
Javier Segarra 2025-04-04 09:50:02 +02:00
commit b7625f06bd
3 changed files with 4 additions and 3 deletions

View File

@ -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);

View File

@ -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'),

View File

@ -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