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

refs #6595 - PR2 - Resolve conflicts #144

Merged
alexm merged 250 commits from hyervoni-branch-PR-2 into dev 2024-01-11 12:22:28 +00:00
Conversation 0 Commits 250 Files Changed 138 +16 -1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e0215e5216 - Show all commits

8
src/pages/Route/Cmr/CmrFilter.vue
View File

@ -87,7 +87,7 @@ const countries = ref();
<QItemSection v-if="!countries">
<QSkeleton type="QInput" class="full-width" />
</QItemSection>
<QItemSection v-if="countries">
<QItemSection v-if="countries" class="q-mb-sm">
<QSelect
:label="t('route.cmr.list.country')"
v-model="params.country"
@ -98,6 +98,9 @@ const countries = ref();
transition-hide="jump-up"
emit-value
map-options
dense
outlined
rounded
>
<template #prepend>
<QIcon name="flag" size="sm"></QIcon>
@ -111,6 +114,9 @@ const countries = ref();
:label="t('route.cmr.list.shipped')"
v-model="params.shipped"
mask="date"
dense
outlined
rounded
>
<template #append>
<QIcon name="event" class="cursor-pointer">

9
src/pages/Ticket/TicketFilter.vue
View File

@ -265,6 +265,9 @@ const warehouses = ref();
option-label="name"
emit-value
map-options
dense
outlined
rounded
/>
</QItemSection>
</QItem>
@ -282,6 +285,9 @@ const warehouses = ref();
option-label="name"
emit-value
map-options
dense
outlined
rounded
/>
</QItemSection>
</QItem>
@ -299,6 +305,9 @@ const warehouses = ref();
option-label="name"
emit-value
map-options
dense
outlined
rounded
/>
</QItemSection>
</QItem>