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

refs #6111 fix qtable, actions, scroll #264

Merged
carlossa merged 14 commits from 6111-modsRouteList into dev 2024-05-23 12:48:29 +00:00
Conversation 0 Commits 14 Files Changed 4 +21 -10
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a78e86a0b9 - Show all commits

9
src/i18n/es/index.js
View File

@ -91,6 +91,15 @@ export default {
log: 'Historial', log: 'Historial',
parkingList: 'Listado de parkings', parkingList: 'Listado de parkings',
}, },
worker: 'Trabajador',
vehicle: 'Vehículo',
hourStarted: 'Hora inicio',
hourFinished: 'Hora fin',
newRoute: 'Nueva Ruta',
StatingDate: 'Fecha de inicio',
Cancel: 'Cancelar',
Clone: 'Clonar',
ID: 'ID',
}, },
errors: { errors: {
statusUnauthorized: 'Acceso denegado', statusUnauthorized: 'Acceso denegado',

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

@ -29,7 +29,7 @@ const { validate } = useValidator();
const quasar = useQuasar(); const quasar = useQuasar();
const session = useSession(); const session = useSession();
const { viewSummary } = useSummaryDialog(); const { viewSummary } = useSummaryDialog();
const visibleColumns = ref([]);
const selectedRows = ref([]); const selectedRows = ref([]);
const columns = computed(() => [ const columns = computed(() => [
{ {
@ -139,8 +139,8 @@ const columns = computed(() => [
}, },
}, },
{ {
name: 'started', name: 'hourStarted',
label: t('Hour started'), label: t('hourStarted'),
field: (row) => toHour(row.started), field: (row) => toHour(row.started),
sortable: true, sortable: true,
align: 'left', align: 'left',
@ -152,8 +152,8 @@ const columns = computed(() => [
}, },
}, },
{ {
name: 'finished', name: 'hourFinished',
label: t('Hour finished'), label: t('hourFinished'),
field: (row) => toHour(row.finished), field: (row) => toHour(row.finished),
sortable: true, sortable: true,
align: 'left', align: 'left',
@ -328,7 +328,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
class="LeftIcon" class="LeftIcon"
:all-columns="allColumnNames" :all-columns="allColumnNames"
table-code="routesList" table-code="routesList"
labels-traductions-path="route.list" labels-traductions-path="globals"
@on-config-saved="visibleColumns = [...$event]" @on-config-saved="visibleColumns = [...$event]"
/> />
</template> </template>
@ -385,7 +385,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
hide-pagination hide-pagination
:no-data-label="t('globals.noResults')" :no-data-label="t('globals.noResults')"
> >
<template #top-row="{ cols }"> <!-- <template #top-row="{ cols }">
<QTr> <QTr>
<QTd /> <QTd />
<QTd <QTd
@ -394,8 +394,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
style="max-width: 100px" style="max-width: 100px"
> >
<component <component
:is="col.columnFilter.component" :is="col?.columnFilter?.component"
v-if="col.name !== 'picture'" v-if="
col.columnFilter && col.name !== 'actions'
"
v-model="col.columnFilter.filterValue" v-model="col.columnFilter.filterValue"
v-bind="col.columnFilter.attrs" v-bind="col.columnFilter.attrs"
v-on="col.columnFilter.event(col)" v-on="col.columnFilter.event(col)"
@ -403,7 +405,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
/> />
</QTd> </QTd>
</QTr> </QTr>
</template> </template> -->
<template #body-cell-worker="{ row }"> <template #body-cell-worker="{ row }">
<QTd> <QTd>
<VnSelectFilter <VnSelectFilter