Merge branch '6082-refactNavBar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6082-refactNavBar
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
commit
89b01759ba
|
@ -470,7 +470,7 @@ export default {
|
|||
},
|
||||
cmr: {
|
||||
list: {
|
||||
total: 'Total {0} records',
|
||||
total: 'Total records',
|
||||
cmrFk: 'Cmr id',
|
||||
hasCmrDms: `Attached in gestdoc`,
|
||||
true: 'Yes',
|
||||
|
|
|
@ -470,7 +470,7 @@ export default {
|
|||
},
|
||||
cmr: {
|
||||
list: {
|
||||
total: 'Total {0} registros',
|
||||
total: 'Total registros',
|
||||
cmrFk: 'Id cmr',
|
||||
hasCmrDms: 'Adjuntado en gestdoc',
|
||||
true: 'Sí',
|
||||
|
|
|
@ -123,19 +123,19 @@ const countries = ref();
|
|||
<i18n>
|
||||
en:
|
||||
params:
|
||||
cmrFk: Cmr id,
|
||||
hasCmrDms: Attached in gestdoc,
|
||||
ticketFk: Ticketd id,
|
||||
country: Country,
|
||||
clientFk: Client id,
|
||||
shipped: Preparation date,
|
||||
cmrFk: Cmr id
|
||||
hasCmrDms: Attached in gestdoc
|
||||
ticketFk: Ticketd id
|
||||
country: Country
|
||||
clientFk: Client id
|
||||
shipped: Preparation date
|
||||
|
||||
es:
|
||||
params:
|
||||
cmrFk: Id cmr,
|
||||
hasCmrDms: Adjuntado en gestdoc,
|
||||
ticketFk: Id ticket,
|
||||
country: País,
|
||||
clientFk: Id cliente,
|
||||
shipped: Fecha preparación,
|
||||
cmrFk: Id cmr
|
||||
hasCmrDms: Adjuntado en gestdoc
|
||||
ticketFk: Id ticket
|
||||
country: País
|
||||
clientFk: Id cliente
|
||||
shipped: Fecha preparación
|
||||
</i18n>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
import { computed, ref } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useStateStore } from 'stores/useStateStore';
|
||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||
|
@ -56,8 +56,8 @@ const columns = computed(() => [
|
|||
},
|
||||
]);
|
||||
function getProjectUrl() {
|
||||
return ((new URL(window.location)).origin);
|
||||
};
|
||||
return new URL(window.location).origin;
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
<div class="column items-center">
|
||||
|
@ -80,11 +80,14 @@ function getProjectUrl() {
|
|||
auto-load
|
||||
>
|
||||
<template #top>
|
||||
{{ t('route.cmr.list.total', [rows.length]) }}
|
||||
{{ `${t('route.cmr.list.total')}: ${rows.length}` }}
|
||||
</template>
|
||||
<template #body-cell-cmrFk="{ value }">
|
||||
<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>
|
||||
</a>
|
||||
</QTd>
|
||||
|
@ -92,10 +95,12 @@ function getProjectUrl() {
|
|||
<template #body-cell-hasCmrDms="{ value }">
|
||||
<QTd align="center">
|
||||
<QBadge
|
||||
:id="(value) ? 'true' : 'false'"
|
||||
:label="(value)
|
||||
:id="value ? 'true' : 'false'"
|
||||
:label="
|
||||
value
|
||||
? t('route.cmr.list.true')
|
||||
: t('route.cmr.list.false')"
|
||||
: t('route.cmr.list.false')
|
||||
"
|
||||
/>
|
||||
</QTd>
|
||||
</template>
|
||||
|
|
Loading…
Reference in New Issue