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

refactor: refs #6993 merged conflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Jon Elias 2024-03-26 09:44:54 +01:00
parent 2c6d95336c
commit 9f24f1f97c
1 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/pages/Route/RouteList.vue
View File

@ -136,7 +136,7 @@ const showRouteReport = () => {
url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`; url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
} else { } else {
const params = new URLSearchParams({ const params = new URLSearchParams({
access_token: session.getToken(), access_token: session.getTokenMultimedia(),
id: idString, id: idString,
}); });
url = `api/Routes/downloadZip?${params.toString()}`; url = `api/Routes/downloadZip?${params.toString()}`;
@ -261,6 +261,7 @@ const openTicketsDialog = (id) => {
data-key="RouteList" data-key="RouteList"
url="Routes/filter" url="Routes/filter"
:order="['created DESC', 'id DESC']" :order="['created DESC', 'id DESC']"
:limit="20"
auto-load auto-load
> >
<template #body="{ rows }"> <template #body="{ rows }">
@ -272,49 +273,42 @@ const openTicketsDialog = (id) => {
flat flat
row-key="id" row-key="id"
selection="multiple" selection="multiple"
:rows-per-page-options="[0]"
hide-pagination
:pagination="{ sortBy: 'ID', descending: true }"
:no-data-label="t('globals.noResults')"
> >
<template #body-cell-worker="props"> <template #body-cell-worker="{ row }">
<QTd :props="props"> <QTd>
{{ props.row?.workerUserName }} <VnSelectFilter
<QPopupEdit :label="t('Worker')"
:model-value="props.row.workerFk" v-model="row.workerFk"
v-slot="scope" :options="workers"
buttons option-value="id"
@update:model-value=" option-label="nickname"
(worker) => updateWorker(props.row, worker) hide-selected
" dense
:emit-value="false"
:rules="validate('Route.workerFk')"
:is-clearable="false"
@update:model-value="updateRoute(row)"
> >
<VnSelectFilter <template #option="{ opt, itemProps }">
:label="t('Worker')" <QItem
v-model="scope.value" v-bind="itemProps"
:options="workers" class="q-pa-xs row items-center"
option-value="id" >
option-label="name" <QItemSection
hide-selected class="col-9 justify-center"
autofocus
:emit-value="false"
:rules="validate('Route.workerFk')"
:is-clearable="false"
@keyup.enter="scope.set"
@focus="($event) => $event.target.select()"
>
<template #option="{ opt, itemProps }">
<QItem
v-bind="itemProps"
class="q-pa-xs row items-center"
> >
<QItemSection <span>{{ opt.name }}</span>
class="col-9 justify-center" <span class="text-grey">{{
> opt.nickname
<span>{{ opt.name }}</span> }}</span>
<span class="text-grey">{{ </QItemSection>
opt.nickname </QItem>
}}</span> </template>
</QItemSection> </VnSelectFilter>
</QItem>
</template>
</VnSelectFilter>
</QPopupEdit>
</QTd> </QTd>
</template> </template>
<template #body-cell-agency="{ row }"> <template #body-cell-agency="{ row }">