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

refs #5995 Added module route and external cmrs #75

Merged
guillermo merged 5 commits from 5995-externalCmr into master 2023-08-10 07:56:14 +00:00
Conversation 0 Commits 5 Files Changed 9 +9 -13
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f29a64d4a - Show all commits

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

@ -19,6 +19,7 @@ export default {
save: 'Save',
remove: 'Remove',
reset: 'Reset',
close: 'Close',
cancel: 'Cancel',
confirm: 'Confirm',
back: 'Back',

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

@ -19,6 +19,7 @@ export default {
save: 'Guardar',
remove: 'Eliminar',
reset: 'Restaurar',
close: 'Cerrar',
cancel: 'Cancelar',
confirm: 'Confirmar',
back: 'Volver',

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

@ -73,6 +73,8 @@ const countries = ref();
:options="countries"
option-value="country"
option-label="country"
transition-show="jump-down"
transition-hide="jump-up"
emit-value
map-options
>
@ -93,21 +95,13 @@ const countries = ref();
<QIcon name="event" class="cursor-pointer">
<QPopupProxy
cover
transition-show="scale"
transition-hide="scale"
transition-show="rotate"
transition-hide="rotate"
>
<QDate v-model="params.shipped" landscape>
<div
class="row items-center justify-end q-gutter-sm"
>
<QDate v-model="params.shipped" minimal>
<div class="row items-center justify-end q-gutter-sm">
<QBtn
:label="t('globals.cancel')"
color="primary"
flat
v-close-popup
/>
<QBtn
:label="t('globals.confirm')"
:label="t('globals.close')"
color="primary"
flat
@click="save"