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

Merge branch 'dev' into 8320-moveTestsToSections
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
PAU ROVIRA ROSALENY 2024-12-20 08:28:13 +00:00
parent 77d7c2261e 8b3b74a972
commit 47a1eb61b9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/common/VnSelect.vue
View File

@ -379,7 +379,8 @@ function handleKeyDown(event) {
</template> </template>
<template #option="{ opt, itemProps }"> <template #option="{ opt, itemProps }">
<QItem v-bind="itemProps"> <QItem v-bind="itemProps">
<QItemSection v-if="opt[optionValue] == opt[optionLabel]"> <QItemSection v-if="typeof opt !== 'object'"> {{ opt }}</QItemSection>
<QItemSection v-else-if="opt[optionValue] == opt[optionLabel]">
<QItemLabel>{{ opt[optionLabel] }}</QItemLabel> <QItemLabel>{{ opt[optionLabel] }}</QItemLabel>
</QItemSection> </QItemSection>
<QItemSection v-else> <QItemSection v-else>

5
src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
View File

@ -116,6 +116,7 @@ function deleteFile(dmsFk) {
<template #form="{ data }"> <template #form="{ data }">
<VnRow> <VnRow>
<VnSelect <VnSelect
:required="true"
:label="t('supplierFk')" :label="t('supplierFk')"
v-model="data.supplierFk" v-model="data.supplierFk"
option-value="id" option-value="id"
@ -244,6 +245,8 @@ function deleteFile(dmsFk) {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect <VnSelect
:required="true"
:is-clearable="false"
:label="t('Currency')" :label="t('Currency')"
v-model="data.currencyFk" v-model="data.currencyFk"
:options="currencies" :options="currencies"
@ -253,6 +256,8 @@ function deleteFile(dmsFk) {
/> />
<VnSelect <VnSelect
:required="true"
:is-clearable="false"
v-if="companiesRef" v-if="companiesRef"
:label="t('Company')" :label="t('Company')"
v-model="data.companyFk" v-model="data.companyFk"