refs #6905 fix translation and warnings
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2024-03-25 12:42:48 +01:00
parent c5e9572889
commit c335accffb
5 changed files with 21 additions and 23 deletions

View File

@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
} }
} }
</script> </script>
<template>
<template></template>
</template>

View File

@ -173,14 +173,14 @@ function copyUserToken() {
<div class="col q-gutter-xs q-pa-md"> <div class="col q-gutter-xs q-pa-md">
<VnRow> <VnRow>
<VnSelectFilter <VnSelectFilter
:label="t('localWarehouse')" :label="t('components.userPanel.localWarehouse')"
v-model="user.localWarehouseFk" v-model="user.localWarehouseFk"
:options="warehousesData" :options="warehousesData"
option-label="name" option-label="name"
option-value="id" option-value="id"
/> />
<VnSelectFilter <VnSelectFilter
:label="t('localBank')" :label="t('components.userPanel.localBank')"
hide-selected hide-selected
v-model="user.localBankFk" v-model="user.localBankFk"
:options="accountBankData" :options="accountBankData"
@ -190,7 +190,7 @@ function copyUserToken() {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelectFilter <VnSelectFilter
:label="t('localCompany')" :label="t('components.userPanel.localCompany')"
hide-selected hide-selected
v-model="user.companyFk" v-model="user.companyFk"
:options="companiesData" :options="companiesData"
@ -198,7 +198,7 @@ function copyUserToken() {
option-value="id" option-value="id"
/> />
<VnSelectFilter <VnSelectFilter
:label="t('userWarehouse')" :label="t('components.userPanel.userWarehouse')"
hide-selected hide-selected
v-model="user.warehouseFk" v-model="user.warehouseFk"
:options="warehousesData" :options="warehousesData"
@ -208,7 +208,7 @@ function copyUserToken() {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelectFilter <VnSelectFilter
:label="t('userCompany')" :label="t('components.userPanel.userCompany')"
hide-selected hide-selected
v-model="user.companyFk" v-model="user.companyFk"
:options="companiesData" :options="companiesData"
@ -228,18 +228,3 @@ function copyUserToken() {
} }
} }
</style> </style>
<i18n>
en:
localWarehouse: Local warehouse
localBank: Local bank
localCompany: Local company
userWarehouse: User warehouse
userCompany: User company
es:
localWarehouse: Almacén local
localBank: Banco local
localCompany: Empresa local
userWarehouse: Almacén del usuario
userCompany: Empresa del usuario
</i18n>

View File

@ -51,8 +51,8 @@ const $props = defineProps({
default: null, default: null,
}, },
limit: { limit: {
type: Number, type: [Number, String],
default: 30, default: '30',
}, },
}); });
@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
@on-fetch="(data) => setOptions(data)" @on-fetch="(data) => setOptions(data)"
:where="where || { [optionValue]: value }" :where="where || { [optionValue]: value }"
:limit="limit" :limit="limit"
:order-by="orderBy" :sort-by="sortBy"
:fields="fields" :fields="fields"
/> />
<QSelect <QSelect

View File

@ -1203,6 +1203,11 @@ export default {
copyToken: 'Token copied to clipboard', copyToken: 'Token copied to clipboard',
settings: 'Settings', settings: 'Settings',
logOut: 'Log Out', logOut: 'Log Out',
localWarehouse: 'Local warehouse',
localBank: 'Local bank',
localCompany: 'Local company',
userWarehouse: 'User warehouse',
userCompany: 'User company',
}, },
smartCard: { smartCard: {
downloadFile: 'Download file', downloadFile: 'Download file',

View File

@ -1203,6 +1203,11 @@ export default {
copyToken: 'Token copiado al portapapeles', copyToken: 'Token copiado al portapapeles',
settings: 'Configuración', settings: 'Configuración',
logOut: 'Cerrar sesión', logOut: 'Cerrar sesión',
localWarehouse: 'Almacén local',
localBank: 'Banco local',
localCompany: 'Empresa local',
userWarehouse: 'Almacén del usuario',
userCompany: 'Empresa del usuario',
}, },
smartCard: { smartCard: {
downloadFile: 'Descargar archivo', downloadFile: 'Descargar archivo',