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

refactor: refs #7130 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2024-03-28 12:19:55 +01:00
parent 6df1d0cf99
commit 37d869d1d5
5 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/i18n/en/index.js
View File

@ -997,6 +997,10 @@ export default {
downloadCmrs: 'Download CMRs', downloadCmrs: 'Download CMRs',
}, },
}, },
filter: {
no: 'No',
yes: 'Yes',
},
}, },
supplier: { supplier: {
pageTitles: { pageTitles: {

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

@ -997,6 +997,10 @@ export default {
downloadCmrs: 'Descargar CMRs', downloadCmrs: 'Descargar CMRs',
}, },
}, },
filter: {
no: 'No',
yes: 'Sí',
},
}, },
supplier: { supplier: {
pageTitles: { pageTitles: {

2
src/pages/Route/Card/RouteFilter.vue
View File

@ -222,7 +222,6 @@ en:
from: From from: From
to: To to: To
Served: Served Served: Served
no: No
es: es:
params: params:
warehouseFk: Almacén warehouseFk: Almacén
@ -233,7 +232,6 @@ es:
workerFk: Trabajador workerFk: Trabajador
from: Desde from: Desde
to: Hasta to: Hasta
yes: Sí
Warehouse: Almacén Warehouse: Almacén
Description: Descripción Description: Descripción
Vehicle: Vehículo Vehicle: Vehículo

17
src/pages/Route/Card/RouteSummary.vue
View File

@ -187,6 +187,15 @@ const ticketColumns = ref([
:label="t('route.summary.packages')" :label="t('route.summary.packages')"
:value="getTotalPackages(entity.tickets)" :value="getTotalPackages(entity.tickets)"
/> />
<QCheckbox
:label="
entity.route.isOk
? t('route.summary.closed')
: t('route.summary.open')
"
v-model="entity.route.isOk"
:disable="true"
/>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<div class="header"> <div class="header">
@ -278,6 +287,10 @@ en:
m3: m³ m3: m³
packaging: Packaging packaging: Packaging
ticket: Ticket ticket: Ticket
closed: Closed
open: Open
yes: Yes
no: No
es: es:
route: route:
summary: summary:
@ -301,4 +314,8 @@ es:
client: Cliente client: Cliente
warehouse: Almacén warehouse: Almacén
packaging: Encajado packaging: Encajado
closed: Cerrada
open: Abierta
yes: Sí
no: No
</i18n> </i18n>

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

@ -98,7 +98,7 @@ const columns = computed(() => [
{ {
name: 'isServed', name: 'isServed',
label: t('Served'), label: t('Served'),
field: (row) => (row.isOk ? 'Yes' : 'No'), field: (row) => Boolean(row.isOk),
sortable: true, sortable: true,
align: 'left', align: 'left',
}, },
@ -272,7 +272,7 @@ const openTicketsDialog = (id) => {
auto-load auto-load
> >
<template #body="{ rows }"> <template #body="{ rows }">
<div class="q-pa-md"> <div class="q-pa-md route-table">
<QTable <QTable
v-model:selected="selectedRows" v-model:selected="selectedRows"
:columns="columns" :columns="columns"
@ -286,7 +286,7 @@ const openTicketsDialog = (id) => {
:no-data-label="t('globals.noResults')" :no-data-label="t('globals.noResults')"
> >
<template #body-cell-worker="{ row }"> <template #body-cell-worker="{ row }">
<QTd> <QTd class="table-input-cell">
<VnSelectFilter <VnSelectFilter
:label="t('Worker')" :label="t('Worker')"
v-model="row.workerFk" v-model="row.workerFk"
@ -319,7 +319,7 @@ const openTicketsDialog = (id) => {
</QTd> </QTd>
</template> </template>
<template #body-cell-agency="{ row }"> <template #body-cell-agency="{ row }">
<QTd> <QTd class="table-input-cell">
<VnSelectFilter <VnSelectFilter
:label="t('Agency')" :label="t('Agency')"
v-model="row.agencyModeFk" v-model="row.agencyModeFk"
@ -336,7 +336,7 @@ const openTicketsDialog = (id) => {
</QTd> </QTd>
</template> </template>
<template #body-cell-vehicle="{ row }"> <template #body-cell-vehicle="{ row }">
<QTd> <QTd class="table-input-cell">
<VnSelectFilter <VnSelectFilter
:label="t('Vehicle')" :label="t('Vehicle')"
v-model="row.vehicleFk" v-model="row.vehicleFk"
@ -404,23 +404,17 @@ const openTicketsDialog = (id) => {
/> />
</QTd> </QTd>
</template> </template>
<template #body-cell-isServed="{ row }"> <template #body-cell-isServed="props">
<QTd> <QTd>
<div class="lock-icon-cell"> <QCheckbox v-model="props.value" disable>
<QIcon <QTooltip>
:name="'lock'" {{
size="xs" props.value
:color="row.isOk ? 'color-spacer' : 'primary'" ? t('Route is closed')
> : t('Route is not served')
<QTooltip> }}
{{ </QTooltip>
row.isOk </QCheckbox>
? t('Route is closed')
: t('Route is not served')
}}
</QTooltip>
</QIcon>
</div>
</QTd> </QTd>
</template> </template>
<template #body-cell-actions="props"> <template #body-cell-actions="props">
@ -481,7 +475,7 @@ const openTicketsDialog = (id) => {
<style lang="scss" scoped> <style lang="scss" scoped>
.table-input-cell { .table-input-cell {
min-width: 150px; max-width: 143px;
} }
.route-list { .route-list {