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 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57b06f7d1f - Show all commits

10
src/pages/Shelving/Card/ShelvingFilter.vue
View File

@ -50,12 +50,15 @@ function setParkings(data) {
</template>
<template #body="{ params }">
<QList dense>
<QItem>
<QItem class="q-my-sm">
<QItemSection v-if="!parkings">
<QSkeleton type="QInput" class="full-width" />
</QItemSection>
<QItemSection v-if="parkings">
<QSelect
dense
outlined
rounded
:label="t('params.parkingFk')"
v-model="params.parkingFk"
:options="parkings"
@ -68,12 +71,15 @@ function setParkings(data) {
/>
</QItemSection>
</QItem>
<QItem>
<QItem class="q-mb-sm">
<QItemSection v-if="!workers">
<QSkeleton type="QInput" class="full-width" />
</QItemSection>
<QItemSection v-if="workers">
<QSelect
dense
outlined
rounded
:label="t('params.userFk')"
v-model="params.userFk"
:options="workers"