wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'test' into dev

This commit is contained in:
Guillermo Bonet 2023-08-11 07:48:25 +02:00
parent d9dd0a4931 0b42eca8ea
commit 96cfea8a41
4 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,7 @@ export default {
}, },
cmr: { cmr: {
list: { list: {
total: 'Total {0} records', total: 'Total records',
cmrFk: 'Cmr id', cmrFk: 'Cmr id',
hasCmrDms: `Attached in gestdoc`, hasCmrDms: `Attached in gestdoc`,
true: 'Yes', true: 'Yes',

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

@ -470,7 +470,7 @@ export default {
}, },
cmr: { cmr: {
list: { list: {
total: 'Total {0} registros', total: 'Total registros',
cmrFk: 'Id cmr', cmrFk: 'Id cmr',
hasCmrDms: 'Adjuntado en gestdoc', hasCmrDms: 'Adjuntado en gestdoc',
true: 'Sí', true: 'Sí',

24
src/pages/Route/Cmr/CmrFilter.vue
View File

@ -123,19 +123,19 @@ const countries = ref();
<i18n> <i18n>
en: en:
params: params:
cmrFk: Cmr id, cmrFk: Cmr id
hasCmrDms: Attached in gestdoc, hasCmrDms: Attached in gestdoc
ticketFk: Ticketd id, ticketFk: Ticketd id
country: Country, country: Country
clientFk: Client id, clientFk: Client id
shipped: Preparation date, shipped: Preparation date
es: es:
params: params:
cmrFk: Id cmr, cmrFk: Id cmr
hasCmrDms: Adjuntado en gestdoc, hasCmrDms: Adjuntado en gestdoc
ticketFk: Id ticket, ticketFk: Id ticket
country: País, country: País
clientFk: Id cliente, clientFk: Id cliente
shipped: Fecha preparación, shipped: Fecha preparación
</i18n> </i18n>

21
src/pages/Route/Cmr/CmrList.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { computed } from 'vue'; import { computed, ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import VnPaginate from 'components/ui/VnPaginate.vue'; import VnPaginate from 'components/ui/VnPaginate.vue';
@ -56,8 +56,8 @@ const columns = computed(() => [
}, },
]); ]);
function getProjectUrl() { function getProjectUrl() {
return ((new URL(window.location)).origin); return new URL(window.location).origin;
}; }
</script> </script>
<template> <template>
<div class="column items-center"> <div class="column items-center">
@ -80,11 +80,14 @@ function getProjectUrl() {
auto-load auto-load
> >
<template #top> <template #top>
{{ t('route.cmr.list.total', [rows.length]) }} {{ `${t('route.cmr.list.total')}: ${rows.length}` }}
</template> </template>
<template #body-cell-cmrFk="{ value }"> <template #body-cell-cmrFk="{ value }">
<QTd align="right" class="text-primary"> <QTd align="right" class="text-primary">
<a :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`" target="_blank"> <a
:href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`"
target="_blank"
>
<span class="text-primary">{{ value }}</span> <span class="text-primary">{{ value }}</span>
</a> </a>
</QTd> </QTd>
@ -92,10 +95,12 @@ function getProjectUrl() {
<template #body-cell-hasCmrDms="{ value }"> <template #body-cell-hasCmrDms="{ value }">
<QTd align="center"> <QTd align="center">
<QBadge <QBadge
:id="(value) ? 'true' : 'false'" :id="value ? 'true' : 'false'"
:label="(value) :label="
value
? t('route.cmr.list.true') ? t('route.cmr.list.true')
: t('route.cmr.list.false')" : t('route.cmr.list.false')
"
/> />
</QTd> </QTd>
</template> </template>