verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 85 Releases Wiki Activity

Merge branch 'warmfix_ticketList_sortByShipped' into test

This commit is contained in:
Javier Segarra 2025-04-04 09:50:02 +02:00
parent e9ef1c308e 1a7a8dfc95
commit b7625f06bd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/composables/useRole.js
View File

@ -13,7 +13,7 @@ export function useRole() {
name: data.user.name, name: data.user.name,
nickname: data.user.nickname, nickname: data.user.nickname,
lang: data.user.lang || 'es', lang: data.user.lang || 'es',
departmentFk: data.user.worker.department.departmentFk, departmentFk: data.user?.worker?.department?.departmentFk,
}; };
state.setUser(userData); state.setUser(userData);
state.setRoles(roles); state.setRoles(roles);

4
src/pages/Ticket/TicketList.vue
View File

@ -113,7 +113,7 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'shipped', name: 'shippedDate',
cardVisible: true, cardVisible: true,
label: t('ticketList.shipped'), label: t('ticketList.shipped'),
columnFilter: { columnFilter: {
@ -123,7 +123,7 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'shipped', name: 'shippedHour',
component: 'time', component: 'time',
columnFilter: false, columnFilter: false,
label: t('ticketList.hour'), label: t('ticketList.hour'),

1
src/pages/Ticket/locale/en.yml
View File

@ -205,6 +205,7 @@ ticketList:
toLines: Go to lines toLines: Go to lines
addressNickname: Address nickname addressNickname: Address nickname
ref: Reference ref: Reference
hour: Hour
rounding: Rounding rounding: Rounding
noVerifiedData: No verified data noVerifiedData: No verified data
purchaseRequest: Purchase request purchaseRequest: Purchase request