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

#7130 - addFieldInRoutes #259

Merged
jon merged 6 commits from 7130-addFieldInRoutes into dev 2024-04-18 09:34:32 +00:00
Conversation 1 Commits 6 Files Changed 6 +41 -24
5 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37d869d1d5 - Show all commits

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

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

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

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

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

@ -222,7 +222,6 @@ en:
from: From
to: To
Served: Served
no: No
es:
jon marked this conversation as resolved Outdated
alexm commented 2024-03-28 06:36:28 +00:00
Outdated
Review
Copy Link

Poner las traducciones si i no de manera global

Poner las traducciones si i no de manera global
params:
warehouseFk: Almacén
@ -233,7 +232,6 @@ es:
workerFk: Trabajador
from: Desde
to: Hasta
yes: Sí
Warehouse: Almacén
Description: Descripción
Vehicle: Vehículo

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

@ -187,6 +187,15 @@ const ticketColumns = ref([
:label="t('route.summary.packages')"
: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 class="vn-one">
<div class="header">
@ -278,6 +287,10 @@ en:
m3: m³
packaging: Packaging
ticket: Ticket
closed: Closed
open: Open
yes: Yes
no: No
es:
route:
summary:
@ -301,4 +314,8 @@ es:
client: Cliente
warehouse: Almacén
packaging: Encajado
closed: Cerrada
open: Abierta
yes: Sí
no: No
</i18n>

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

@ -98,7 +98,7 @@ const columns = computed(() => [
{
name: 'isServed',
label: t('Served'),
field: (row) => (row.isOk ? 'Yes' : 'No'),
field: (row) => Boolean(row.isOk),
sortable: true,
align: 'left',
},
@ -272,7 +272,7 @@ const openTicketsDialog = (id) => {
auto-load
>
<template #body="{ rows }">
<div class="q-pa-md">
<div class="q-pa-md route-table">
<QTable
v-model:selected="selectedRows"
:columns="columns"
@ -286,7 +286,7 @@ const openTicketsDialog = (id) => {
:no-data-label="t('globals.noResults')"
>
<template #body-cell-worker="{ row }">
<QTd>
<QTd class="table-input-cell">
<VnSelectFilter
:label="t('Worker')"
v-model="row.workerFk"
@ -319,7 +319,7 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-agency="{ row }">
<QTd>
<QTd class="table-input-cell">
<VnSelectFilter
:label="t('Agency')"
v-model="row.agencyModeFk"
@ -336,7 +336,7 @@ const openTicketsDialog = (id) => {
</QTd>
</template>
<template #body-cell-vehicle="{ row }">
<QTd>
<QTd class="table-input-cell">
<VnSelectFilter
:label="t('Vehicle')"
v-model="row.vehicleFk"
@ -404,23 +404,17 @@ const openTicketsDialog = (id) => {
/>
</QTd>
</template>
<template #body-cell-isServed="{ row }">
<template #body-cell-isServed="props">
<QTd>
<div class="lock-icon-cell">
<QIcon
:name="'lock'"
size="xs"
:color="row.isOk ? 'color-spacer' : 'primary'"
>
<QTooltip>
{{
row.isOk
? t('Route is closed')
: t('Route is not served')
}}
</QTooltip>
</QIcon>
</div>
<QCheckbox v-model="props.value" disable>
<QTooltip>
jon marked this conversation as resolved Outdated
jgallego commented 2024-03-28 07:11:40 +00:00
Outdated
Review
Copy Link

Me equivoqué, ahora viendolo no queda claro que rutas han salido y que rutas estan por salir.
Pongamos un checkbox para indicar si la ruta esta servida o no.

Me equivoqué, ahora viendolo no queda claro que rutas han salido y que rutas estan por salir. Pongamos un checkbox para indicar si la ruta esta servida o no.
{{
props.value
? t('Route is closed')
: t('Route is not served')
}}
</QTooltip>
</QCheckbox>
</QTd>
</template>
<template #body-cell-actions="props">
@ -481,7 +475,7 @@ const openTicketsDialog = (id) => {
<style lang="scss" scoped>
.table-input-cell {
min-width: 150px;
max-width: 143px;
}
.route-list {