verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity
salix-front/quasar.patch

2014 lines
92 KiB
Diff
Raw Blame History

diff --git a/quasar.config.js b/quasar.config.js
index 755e96bd..789b9f64 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -12,6 +12,7 @@ const { configure } = require('quasar/wrappers');
const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
const path = require('path');
+
module.exports = configure(function (/* ctx */) {
return {
eslint: {
@@ -29,7 +30,8 @@ module.exports = configure(function (/* ctx */) {
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://v2.quasar.dev/quasar-cli/boot-files
- boot: ['i18n', 'axios', 'vnDate', 'validations'],
+ //
+ boot: ['i18n', 'axios', 'vnDate','quasar','quasar.defaults','setDefaults', 'validations'],
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
css: ['app.scss'],
@@ -122,6 +124,33 @@ module.exports = configure(function (/* ctx */) {
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
framework: {
config: {
+ form:{
+mixins:[{
+ data(d) {
+ return {
+ title: 'Mixins are cool',
+ copyright: 'All rights reserved. Product of super awesome people'
+ };
+ },
+ created: function(data) {
+ console.log(this)
+ if(this.$el){
+
+ console.log(this.$el
+ )
+ this.greetings();
+ }
+ },
+ methods: {
+ keyup:(event)=>{
+ console.log(event)
+ },
+ greetings: function() {
+ console.log('Howdy my good fellow!');
+ }
+ }
+ }],
+ },
config: {
brand: {
primary: 'orange',
diff --git a/src/App.vue b/src/App.vue
index d0d8c935..6a201045 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
<script setup>
-import { onMounted } from 'vue';
+import { onMounted, getCurrentInstance, resolveComponent, h } from 'vue';
import { useQuasar, Dark } from 'quasar';
import { useI18n } from 'vue-i18n';
@@ -34,6 +34,7 @@ quasar.iconMapFn = (iconName) => {
content: iconName,
};
};
+// h(resolveComponent('QBtn'), { color: 'red' }, 'Click me');
</script>
<template>
diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 106dbec3..7a2a36fb 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -77,7 +77,6 @@ const onDataSaved = (data) => {
:label="t('country')"
v-model="data.countryFk"
:options="countriesOptions"
- option-value="id"
option-label="country"
hide-selected
:required="true"
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 7326ea7a..2d4d2667 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -52,8 +52,6 @@ const onDataSaved = (dataSaved) => {
:label="t('Province')"
:options="provincesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.provinceFk"
:rules="validate('city.provinceFk')"
/>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 47836c05..9572f96a 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -90,8 +90,6 @@ const onProvinceCreated = async ({ name }, formData) => {
:options="townsLocationOptions"
v-model="data.townFk"
hide-selected
- option-label="name"
- option-value="id"
:rules="validate('postcode.city')"
:roles-allowed-to-create="['deliveryAssistant']"
>
@@ -109,8 +107,6 @@ const onProvinceCreated = async ({ name }, formData) => {
:label="t('Province')"
:options="provincesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.provinceFk"
:rules="validate('postcode.provinceFk')"
:roles-allowed-to-create="['deliveryAssistant']"
@@ -128,7 +124,6 @@ const onProvinceCreated = async ({ name }, formData) => {
:options="countriesOptions"
hide-selected
option-label="country"
- option-value="id"
v-model="data.countryFk"
:rules="validate('postcode.countryFk')"
/>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index b972db2c..c79513dc 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -52,8 +52,6 @@ const onDataSaved = (dataSaved) => {
:label="t('Autonomy')"
:options="autonomiesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.autonomyFk"
:rules="validate('province.autonomyFk')"
/>
diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
index d4511a0e..b1dbad38 100644
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@@ -82,8 +82,6 @@ const onDataSaved = (dataSaved) => {
:label="t('Warehouse')"
:options="warehousesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.warehouseId"
:required="true"
/>
@@ -93,7 +91,6 @@ const onDataSaved = (dataSaved) => {
:label="t('Temperature')"
:options="temperaturesOptions"
hide-selected
- option-label="name"
option-value="code"
v-model="data.temperatureFk"
:required="true"
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 4c329a8e..155d88e6 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -164,8 +164,6 @@ const selectItem = ({ id }) => {
:label="t('entry.buys.producer')"
:options="producersOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="itemFilterParams.producerFk"
/>
</div>
@@ -174,8 +172,6 @@ const selectItem = ({ id }) => {
:label="t('entry.buys.type')"
:options="ItemTypesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="itemFilterParams.typeFk"
/>
</div>
@@ -184,8 +180,6 @@ const selectItem = ({ id }) => {
:label="t('entry.buys.color')"
:options="InksOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="itemFilterParams.inkFk"
/>
</div>
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 499d5bc4..10282267 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -150,8 +150,6 @@ const selectTravel = ({ id }) => {
:label="t('entry.basicData.agency')"
:options="agenciesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="travelFilterParams.agencyModeFk"
/>
</div>
@@ -160,8 +158,6 @@ const selectTravel = ({ id }) => {
:label="t('entry.basicData.warehouseOut')"
:options="warehousesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="travelFilterParams.warehouseOutFk"
/>
</div>
@@ -170,8 +166,6 @@ const selectTravel = ({ id }) => {
:label="t('entry.basicData.warehouseIn')"
:options="warehousesOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="travelFilterParams.warehouseInFk"
/>
</div>
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 28236be1..f59867fa 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -63,8 +63,6 @@ const onDataSaved = (data) => {
:label="t('Warehouse')"
v-model="data.warehouseFk"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
/>
</div>
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index d2651f5d..22fa28f2 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -122,7 +122,6 @@ function addDefaultData(data) {
:label="t('globals.company')"
v-model="dms.companyFk"
:options="companies"
- option-value="id"
option-label="code"
input-debounce="0"
/>
@@ -132,16 +131,12 @@ function addDefaultData(data) {
:label="t('globals.warehouse')"
v-model="dms.warehouseFk"
:options="warehouses"
- option-value="id"
- option-label="name"
input-debounce="0"
/>
<VnSelectFilter
:label="t('globals.type')"
v-model="dms.dmsTypeFk"
:options="dmsTypes"
- option-value="id"
- option-label="name"
input-debounce="0"
/>
</VnRow>
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 6368a3e5..343bdb4b 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -693,8 +693,6 @@ setLogTree();
class="full-width"
:label="t('globals.user')"
v-model="userSelect"
- option-label="name"
- option-value="id"
:options="workers"
@update:model-value="selectFilter('userSelect')"
hide-selected
diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
index b5941239..9720d391 100644
--- a/src/components/common/VnLogFilter.vue
+++ b/src/components/common/VnLogFilter.vue
@@ -49,8 +49,6 @@ const workers = ref();
v-model="params.userFk"
@update:model-value="searchFn()"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 99710408..410e0515 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -81,8 +81,9 @@ onMounted(() => {
});
async function search() {
- const staticParams = Object.entries(store.userParams)
- .filter(([key, value]) => value && (props.staticParams || []).includes(key));
+ const staticParams = Object.entries(store.userParams).filter(
+ ([key, value]) => value && (props.staticParams || []).includes(key)
+ );
await arrayData.applyFilter({
params: {
...Object.fromEntries(staticParams),
@@ -107,7 +108,7 @@ async function search() {
</script>
<template>
- <QForm @submit="search">
+ <QForm @submit="search" id="searchbarForm">
<VnInput
id="searchbar"
v-model="searchText"
diff --git a/src/css/app.scss b/src/css/app.scss
index 750439e3..37c515cb 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -97,3 +97,6 @@ input::-webkit-inner-spin-button {
-webkit-appearance: none;
-moz-appearance: none;
}
+.q-table th, .q-table td {
+ text-align: left !important;
+}
diff --git a/src/filters/toCurrency.js b/src/filters/toCurrency.js
index f820c012..d998aac3 100644
--- a/src/filters/toCurrency.js
+++ b/src/filters/toCurrency.js
@@ -12,7 +12,7 @@ export default function (value, symbol = 'EUR', fractionSize = 2) {
maximumFractionDigits: fractionSize,
};
- const lang = locale.value == 'es' ? 'de' : locale.value;
+ // const lang = locale.value == 'es-ES' ? : locale.value;
- return new Intl.NumberFormat(lang, options).format(value);
+ return new Intl.NumberFormat('de-DE', options).format(value);
}
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index ef45bf3d..3c27bd2e 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -308,7 +308,6 @@ async function importToNewRefundTicket() {
v-model="row.claimDestinationFk"
:options="destinationTypes"
option-label="description"
- option-value="id"
:autofocus="true"
dense
input-debounce="0"
@@ -350,7 +349,6 @@ async function importToNewRefundTicket() {
v-model="props.row.claimDestinationFk"
:options="destinationTypes"
option-label="description"
- option-value="id"
:autofocus="true"
dense
input-debounce="0"
@@ -425,7 +423,6 @@ async function importToNewRefundTicket() {
v-model="claimDestinationFk"
:options="destinationTypes"
option-label="description"
- option-value="id"
:autofocus="true"
dense
input-debounce="0"
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 35f93c73..41007a46 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -122,8 +122,6 @@ const statesFilter = {
<QSelect
v-model="data.workerFk"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
:label="t('claim.basicData.assignedTo')"
map-options
@@ -147,7 +145,6 @@ const statesFilter = {
<QSelect
v-model="data.claimStateFk"
:options="claimStates"
- option-value="id"
option-label="description"
emit-value
:label="t('claim.basicData.state')"
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index ee702ffd..761e2d9c 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -69,8 +69,6 @@ const states = ref();
v-model="params.salesPersonFk"
@update:model-value="searchFn()"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
@@ -92,8 +90,6 @@ const states = ref();
v-model="params.attenderFk"
@update:model-value="searchFn()"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
@@ -115,8 +111,6 @@ const states = ref();
v-model="params.claimResponsibleFk"
@update:model-value="searchFn()"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
@@ -138,7 +132,6 @@ const states = ref();
v-model="params.claimStateFk"
@update:model-value="searchFn()"
:options="states"
- option-value="id"
option-label="description"
emit-value
map-options
@@ -160,8 +153,8 @@ const states = ref();
:loading="loading"
@filter="filterFn"
@virtual-scroll="onScroll"
- option-value="id"
- option-label="name"
+
+
emit-value
map-options
/>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index fe873cfa..3e9eae22 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -97,59 +97,50 @@ const tableColumnComponents = {
const columns = computed(() => [
{
- align: 'left',
field: 'payed',
format: (value) => toDate(value),
label: t('Date'),
name: 'date',
},
{
- align: 'left',
field: 'created',
format: (value) => toDateHourMinSec(value),
label: t('Creation date'),
name: 'creationDate',
},
{
- align: 'left',
field: 'userName',
label: t('Employee'),
name: 'employee',
},
{
- align: 'left',
field: 'description',
label: t('Reference'),
name: 'reference',
},
{
- align: 'left',
field: 'bankFk',
label: t('Bank'),
name: 'bank',
},
{
- align: 'left',
field: 'debit',
label: t('Debit'),
name: 'debit',
},
{
- align: 'left',
field: 'credit',
format: (value) => toCurrency(value),
label: t('Havings'),
name: 'havings',
},
{
- align: 'left',
field: (value) => value.debit - value.credit,
format: (value) => toCurrency(value),
label: t('Balance'),
name: 'balance',
},
{
- align: 'left',
field: 'isConciliate',
label: t('Conciliated'),
name: 'conciliated',
@@ -219,16 +210,15 @@ const saveFieldValue = async (event) => {
/>
<QTable
+ name="customerBalance"
:columns="columns"
- :no-data-label="t('globals.noResults')"
- :pagination="{ rowsPerPage: 12 }"
:rows="rows"
class="full-width q-mt-md"
- row-key="id"
+ :class="defaultColumnsFormat"
>
<template #body-cell="props">
<QTd :props="props">
- <QTr :props="props" class="cursor-pointer">
+ <QTr :props="props" class="text-left cursor-pointer">
<component
:is="tableColumnComponents[props.col.name].component"
class="col-content"
@@ -284,7 +274,6 @@ const saveFieldValue = async (event) => {
@update:model-value="updateCompanyId($event)"
hide-selected
option-label="code"
- option-value="id"
v-model="companyId"
:rules="validate('entry.companyFk')"
/>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 9be4643f..f80f7f12 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -67,7 +67,12 @@ const filterOptions = {
url="Clients"
/>
- <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
+ <FormModel
+ :url="`Clients/${route.params.id}`"
+ @keyup.enter="handleCloick"
+ auto-load
+ model="customer"
+ >
<template #form="{ data, validate, filter }">
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
@@ -148,8 +153,6 @@ const filterOptions = {
@filter="(value, update) => filter(value, update, filterOptions)"
emit-value
map-options
- option-label="name"
- option-value="id"
use-input
v-model="data.salesPersonFk"
>
@@ -172,8 +175,6 @@ const filterOptions = {
:rules="validate('client.contactChannelFk')"
emit-value
map-options
- option-label="name"
- option-value="id"
v-model="data.contactChannelFk"
/>
</div>
@@ -187,8 +188,6 @@ const filterOptions = {
:rules="validate('client.transferorFk')"
emit-value
map-options
- option-label="name"
- option-value="id"
v-model="data.transferorFk"
>
<template #append>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index e1b12619..3a553b88 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -53,8 +53,6 @@ const getBankEntities = (data, formData) => {
:label="t('Billing data')"
:options="payMethods"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.payMethod"
/>
</div>
@@ -85,8 +83,6 @@ const getBankEntities = (data, formData) => {
:roles-allowed-to-create="['salesAssistant', 'hr']"
:rules="validate('Worker.bankEntity')"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.bankEntityFk"
>
<template #form>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index f74cbc2c..f61f88cd 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -74,7 +74,6 @@ function handleLocation(data, location) {
:options="typesTaxes"
hide-selected
option-label="vat"
- option-value="id"
v-model="data.sageTaxTypeFk"
/>
</div>
@@ -84,7 +83,6 @@ function handleLocation(data, location) {
:options="typesTransactions"
hide-selected
option-label="transaction"
- option-value="id"
v-model="data.sageTransactionTypeFk"
>
<template #option="scope">
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
index c237e5fd..02b7b745 100644
--- a/src/pages/Customer/Card/CustomerLog.vue
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -144,8 +144,6 @@ const setInq = (value, status) => {
:options="[]"
class="q-mt-md"
hide-selected
- option-label="name"
- option-value="id"
/>
<div class="q-mt-lg">
@@ -184,8 +182,6 @@ const setInq = (value, status) => {
:options="[]"
class="q-mt-sm"
hide-selected
- option-label="name"
- option-value="id"
/>
<VnInput :label="t('Changes')" clearable class="q-mt-sm">
<template #append>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 4addb1d6..627908a3 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -57,8 +57,6 @@ function handleLocation(data, location) {
:label="t('Salesperson')"
:options="workersOptions"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.salesPersonFk"
/>
</div>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 593b4550..333951b7 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -70,8 +70,6 @@ const zones = ref();
v-model="params.salesPersonFk"
@update:model-value="searchFn()"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
@@ -93,8 +91,6 @@ const zones = ref();
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provinces"
- option-value="id"
- option-label="name"
emit-value
map-options
hide-selected
@@ -140,8 +136,6 @@ const zones = ref();
v-model="params.zoneFk"
@update:model-value="searchFn()"
:options="zones"
- option-value="id"
- option-label="name"
emit-value
map-options
hide-selected
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 3ba7f655..c07dd5b4 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -56,7 +56,6 @@ const authors = ref();
emit-value
hide-selected
map-options
- option-label="name"
option-value="clientTypeFk"
outlined
rounded
@@ -79,8 +78,6 @@ const authors = ref();
emit-value
hide-selected
map-options
- option-label="name"
- option-value="id"
outlined
rounded
use-input
@@ -103,7 +100,6 @@ const authors = ref();
hide-selected
map-options
option-label="country"
- option-value="id"
outlined
rounded
use-input
@@ -147,8 +143,6 @@ const authors = ref();
emit-value
hide-selected
map-options
- option-label="name"
- option-value="id"
outlined
rounded
use-input
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index df898e7c..b3191316 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -208,8 +208,6 @@ const shouldRenderColumn = (colName) => {
v-model="params.salesPersonFk"
@update:model-value="searchFn()"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
@@ -275,7 +273,6 @@ const shouldRenderColumn = (colName) => {
v-model="params.countryFk"
@update:model-value="searchFn()"
:options="countriesOptions"
- option-value="id"
option-label="country"
map-options
hide-selected
@@ -292,8 +289,6 @@ const shouldRenderColumn = (colName) => {
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provincesOptions"
- option-value="id"
- option-label="name"
map-options
hide-selected
dense
@@ -368,8 +363,6 @@ const shouldRenderColumn = (colName) => {
v-model="params.payMethodFk"
:options="paymethodsOptions"
@update:model-value="searchFn()"
- option-value="id"
- option-label="name"
map-options
hide-selected
dense
@@ -387,7 +380,6 @@ const shouldRenderColumn = (colName) => {
v-model="params.sageTaxTypeFk"
@update:model-value="searchFn()"
:options="sageTaxTypesOptions"
- option-value="id"
option-label="vat"
map-options
hide-selected
@@ -408,7 +400,6 @@ const shouldRenderColumn = (colName) => {
v-model="params.sageTransactionTypeFk"
@update:model-value="searchFn()"
:options="sageTransactionTypesOptions"
- option-value="id"
option-label="transaction"
map-options
hide-selected
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 320fc205..539b9065 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -85,7 +85,6 @@ const clients = ref();
emit-value
hide-selected
map-options
- option-label="name"
option-value="name"
outlined
rounded
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30d4acf8..2d379448 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -119,8 +119,6 @@ function handleLocation(data, location) {
:options="agencyModes"
:rules="validate('route.agencyFk')"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.agencyModeFk"
/>
</div>
@@ -138,7 +136,6 @@ function handleLocation(data, location) {
:label="t('Incoterms')"
:options="incoterms"
hide-selected
- option-label="name"
option-value="code"
v-model="data.incotermsFk"
/>
@@ -149,7 +146,6 @@ function handleLocation(data, location) {
:options="customsAgents"
hide-selected
option-label="fiscalName"
- option-value="id"
v-model="data.customsAgentFk"
>
<template #form>
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 8f4be134..85e6456a 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -190,8 +190,6 @@ function handleLocation(data, location) {
:options="agencyModes"
:rules="validate('route.agencyFk')"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.agencyModeFk"
/>
</div>
@@ -209,7 +207,6 @@ function handleLocation(data, location) {
:label="t('Incoterms')"
:options="incoterms"
hide-selected
- option-label="name"
option-value="code"
v-model="data.incotermsFk"
/>
@@ -220,7 +217,6 @@ function handleLocation(data, location) {
:options="customsAgents"
hide-selected
option-label="fiscalName"
- option-value="id"
v-model="data.customsAgentFk"
>
<template #form>
@@ -242,7 +238,6 @@ function handleLocation(data, location) {
:options="observationTypes"
hide-selected
option-label="description"
- option-value="id"
v-model="note.observationTypeFk"
/>
</div>
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index 6d76c2b7..8bde9642 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -154,7 +154,6 @@ const toCustomerFileManagement = () => {
:options="optionsCompanies"
:rules="validate('entry.companyFk')"
option-label="code"
- option-value="id"
v-model="dms.companyId"
/>
</div>
@@ -165,8 +164,6 @@ const toCustomerFileManagement = () => {
<VnSelectFilter
:label="t('Warehouse')"
:options="optionsWarehouses"
- option-label="name"
- option-value="id"
v-model="dms.warehouseId"
/>
</div>
@@ -174,8 +171,6 @@ const toCustomerFileManagement = () => {
<VnSelectFilter
:label="t('Type')"
:options="optionsDmsTypes"
- option-label="name"
- option-value="id"
v-model="dms.dmsTypeId"
/>
</div>
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index f1279b93..f813d1d6 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -132,7 +132,6 @@ const toCustomerFileManagement = () => {
:options="optionsCompanies"
:rules="validate('entry.companyFk')"
option-label="code"
- option-value="id"
v-model="dms.companyId"
/>
</div>
@@ -143,8 +142,6 @@ const toCustomerFileManagement = () => {
<VnSelectFilter
:label="t('Warehouse')"
:options="optionsWarehouses"
- option-label="name"
- option-value="id"
v-model="dms.warehouseId"
/>
</div>
@@ -152,8 +149,6 @@ const toCustomerFileManagement = () => {
<VnSelectFilter
:label="t('Type')"
:options="optionsDmsTypes"
- option-label="name"
- option-value="id"
v-model="dms.dmsTypeId"
/>
</div>
diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
index d8915dc1..8eb67582 100644
--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
@@ -78,8 +78,6 @@ const toCustomerGreuges = () => {
:label="t('Type')"
:options="greugeTypes"
hide-selected
- option-label="name"
- option-value="id"
v-model="data.greugeTypeFk"
/>
</div>
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index c52cc18d..322c43c8 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -150,7 +150,6 @@ const onDataSaved = async () => {
:rules="validate('entry.companyFk')"
hide-selected
option-label="code"
- option-value="id"
v-model="data.companyFk"
/>
</div>
@@ -165,7 +164,6 @@ const onDataSaved = async () => {
@update:model-value="setPaymentType($event)"
hide-selected
option-label="bank"
- option-value="id"
v-model="data.bankFk"
>
<template #option="scope">
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 7b0d34bd..ad7f98cd 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -189,7 +189,6 @@ const toCustomerSamples = () => {
@update:model-value="setSampleType"
hide-selected
option-label="description"
- option-value="id"
required="true"
v-model="data.typeFk"
/>
@@ -242,7 +241,6 @@ const toCustomerSamples = () => {
:rules="validate('entry.companyFk')"
hide-selected
option-label="code"
- option-value="id"
required="true"
v-model="data.companyFk"
v-if="sampleType.hasCompany"
@@ -254,7 +252,6 @@ const toCustomerSamples = () => {
:options="optionsClientsAddressess"
hide-selected
option-label="nickname"
- option-value="id"
required="true"
v-model="data.addressId"
v-if="sampleType.id === 20"
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 3b30a97e..819d6a2c 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -72,8 +72,6 @@ const clientsOptions = ref([]);
:label="t('department.bossDepartment')"
v-model="data.workerFk"
:options="workersOptions"
- option-value="id"
- option-label="name"
hide-selected
map-options
:rules="validate('department.workerFk')"
@@ -84,8 +82,6 @@ const clientsOptions = ref([]);
:label="t('department.selfConsumptionCustomer')"
v-model="data.clientFk"
:options="clientsOptions"
- option-value="id"
- option-label="name"
hide-selected
map-options
:rules="validate('department.clientFk')"
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index a98a1227..57b29651 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -69,7 +69,6 @@ const onFilterTravelSelected = (formData, id) => {
:label="t('entry.basicData.supplier')"
v-model="data.supplierFk"
:options="suppliersOptions"
- option-value="id"
option-label="nickname"
hide-selected
:required="true"
@@ -92,7 +91,6 @@ const onFilterTravelSelected = (formData, id) => {
:label="t('entry.basicData.travel')"
v-model="data.travelFk"
:options="travelsOptions"
- option-value="id"
option-label="warehouseInName"
map-options
hide-selected
@@ -141,7 +139,6 @@ const onFilterTravelSelected = (formData, id) => {
:label="t('entry.basicData.company')"
v-model="data.companyFk"
:options="companiesOptions"
- option-value="id"
option-label="code"
map-options
hide-selected
@@ -155,7 +152,6 @@ const onFilterTravelSelected = (formData, id) => {
:label="t('entry.basicData.currency')"
v-model="data.currencyFk"
:options="currenciesOptions"
- option-value="id"
option-label="code"
/>
</div>
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index 0d2e5e51..846b891a 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -57,7 +57,6 @@ onMounted(() => {
:options="entryObservationsOptions"
:disable="!!row.id"
option-label="description"
- option-value="id"
hide-selected
/>
</div>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 8c434217..0f9dad2a 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -85,7 +85,6 @@ const redirectToEntryBasicData = (_, { id }) => {
class="full-width"
v-model="data.supplierFk"
:options="suppliersOptions"
- option-value="id"
option-label="nickname"
hide-selected
:required="true"
@@ -111,7 +110,6 @@ const redirectToEntryBasicData = (_, { id }) => {
class="full-width"
v-model="data.travelFk"
:options="travelsOptions"
- option-value="id"
option-label="warehouseInName"
map-options
hide-selected
@@ -143,7 +141,6 @@ const redirectToEntryBasicData = (_, { id }) => {
class="full-width"
v-model="data.companyFk"
:options="companiesOptions"
- option-value="id"
option-label="code"
map-options
hide-selected
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 22ddf0bb..ccef9b4e 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -97,7 +97,6 @@ const suppliersOptions = ref([]);
v-model="params.companyFk"
@update:model-value="searchFn()"
:options="companiesOptions"
- option-value="id"
option-label="code"
hide-selected
dense
@@ -113,8 +112,6 @@ const suppliersOptions = ref([]);
v-model="params.currencyFk"
@update:model-value="searchFn()"
:options="currenciesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -129,8 +126,6 @@ const suppliersOptions = ref([]);
v-model="params.supplierFk"
@update:model-value="searchFn()"
:options="suppliersOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index f557c8ef..5dd0aa15 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -186,7 +186,6 @@ async function upsert() {
<VnSelectFilter
:label="t('supplierFk')"
v-model="data.supplierFk"
- option-value="id"
option-label="nickname"
url="Suppliers"
:fields="['id', 'nickname']"
@@ -405,7 +404,6 @@ async function upsert() {
:label="t('Currency')"
v-model="data.currencyFk"
:options="currencies"
- option-value="id"
option-label="code"
/>
</div>
@@ -415,7 +413,6 @@ async function upsert() {
:label="t('Company')"
v-model="data.companyFk"
:options="companies"
- option-value="id"
option-label="code"
/>
</div>
@@ -456,7 +453,6 @@ async function upsert() {
:label="`${t('Company')}*`"
v-model="dms.companyId"
:options="companies"
- option-value="id"
option-label="code"
:rules="[requiredFieldRule]"
/>
@@ -467,8 +463,6 @@ async function upsert() {
:label="`${t('Warehouse')}*`"
v-model="dms.warehouseId"
:options="warehouses"
- option-value="id"
- option-label="name"
:rules="[requiredFieldRule]"
/>
<VnSelectFilter
@@ -476,8 +470,6 @@ async function upsert() {
:label="`${t('Type')}*`"
v-model="dms.dmsTypeId"
:options="dmsTypes"
- option-value="id"
- option-label="name"
:rules="[requiredFieldRule]"
/>
</QItem>
@@ -565,7 +557,6 @@ async function upsert() {
:label="`${t('Company')}*`"
v-model="dms.companyId"
:options="companies"
- option-value="id"
option-label="code"
:rules="[requiredFieldRule]"
/>
@@ -576,8 +567,6 @@ async function upsert() {
:label="`${t('Warehouse')}*`"
v-model="dms.warehouseId"
:options="warehouses"
- option-value="id"
- option-label="name"
:rules="[requiredFieldRule]"
/>
<VnSelectFilter
@@ -585,8 +574,6 @@ async function upsert() {
:label="`${t('Type')}*`"
v-model="dms.dmsTypeId"
:options="dmsTypes"
- option-value="id"
- option-label="name"
:rules="[requiredFieldRule]"
/>
</QItem>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 5adaeca9..280c194d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -484,7 +484,6 @@ const createInvoiceInCorrection = async () => {
:label="`${useCapitalize(t('globals.class'))}*`"
v-model="correctionFormData.invoiceClass"
:options="siiTypeInvoiceOuts"
- option-value="id"
option-label="code"
:rules="[requiredFieldRule]"
/>
@@ -494,7 +493,6 @@ const createInvoiceInCorrection = async () => {
:label="`${useCapitalize(t('globals.type'))}*`"
v-model="correctionFormData.invoiceType"
:options="cplusRectificationTypes"
- option-value="id"
option-label="description"
:rules="[requiredFieldRule]"
/>
@@ -502,7 +500,6 @@ const createInvoiceInCorrection = async () => {
:label="`${useCapitalize(t('globals.reason'))}*`"
v-model="correctionFormData.invoiceReason"
:options="invoiceCorrectionTypes"
- option-value="id"
option-label="description"
:rules="[requiredFieldRule]"
/>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index e240e9a8..5cca5ee3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -235,7 +235,6 @@ async function insert() {
class="full-width"
v-model="props.row['bankFk']"
:options="banks"
- option-value="id"
option-label="bank"
>
<template #option="scope">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 58f52153..a6ccd8b0 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -151,7 +151,6 @@ function getTotal(type) {
<VnSelectFilter
v-model="row[col.model]"
:options="col.options"
- option-value="id"
option-label="description"
:filter-options="['id', 'description']"
>
@@ -168,7 +167,6 @@ function getTotal(type) {
<VnSelectFilter
v-model="row[col.model]"
:options="col.options"
- option-value="id"
option-label="code"
/>
</QTd>
@@ -187,7 +185,6 @@ function getTotal(type) {
class="full-width"
v-model="props.row['intrastatFk']"
:options="intrastats"
- option-value="id"
option-label="description"
:filter-options="['id', 'description']"
>
@@ -222,7 +219,6 @@ function getTotal(type) {
class="full-width"
v-model="props.row['countryFk']"
:options="countries"
- option-value="id"
option-label="code"
/>
</QItem>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index d8e74270..e94c2c98 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -316,8 +316,6 @@ async function addExpense() {
class="full-width"
v-model="props.row['expenseFk']"
:options="expenses"
- option-value="id"
- option-label="name"
:filter-options="['id', 'name']"
>
<template #option="scope">
@@ -352,7 +350,6 @@ async function addExpense() {
class="full-width"
v-model="props.row['taxTypeSageFk']"
:options="sageTaxTypes"
- option-value="id"
option-label="vat"
:filter-options="['id', 'vat']"
>
@@ -375,7 +372,6 @@ async function addExpense() {
class="full-width"
v-model="props.row['transactionTypeSageFk']"
:options="sageTransactionTypes"
- option-value="id"
option-label="transaction"
:filter-options="['id', 'transaction']"
>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 8bf00723..4576f313 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -83,7 +83,6 @@ const suppliersRef = ref();
:label="t('params.supplierFk')"
v-model="params.supplierFk"
:options="suppliers"
- option-value="id"
option-label="nickname"
@input-value="suppliersRef.fetch()"
dense
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index c61b9f7f..5822c0ce 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -99,8 +99,6 @@ onMounted(async () => {
:label="t('client')"
v-model="formData.clientId"
:options="clientsOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -120,7 +118,6 @@ onMounted(async () => {
:label="t('company')"
v-model="formData.companyFk"
:options="companiesOptions"
- option-value="id"
option-label="code"
hide-selected
dense
@@ -131,8 +128,6 @@ onMounted(async () => {
:label="t('printer')"
v-model="formData.printer"
:options="printersOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 760c4872..aadb53b7 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -242,8 +242,6 @@ const getCategoryClass = (category, params) => {
:label="t('params.type')"
v-model="params.typeFk"
:options="typeList"
- option-value="id"
- option-label="name"
dense
outlined
rounded
@@ -278,7 +276,6 @@ const getCategoryClass = (category, params) => {
v-model="selectedOrder"
:options="orderList || []"
option-value="way"
- option-label="name"
dense
outlined
rounded
@@ -298,7 +295,6 @@ const getCategoryClass = (category, params) => {
v-model="selectedOrderField"
:options="OrderFields || []"
option-value="field"
- option-label="name"
dense
outlined
rounded
@@ -318,8 +314,6 @@ const getCategoryClass = (category, params) => {
:label="t('params.tag')"
v-model="selectedTag"
:options="props.tags || []"
- option-value="id"
- option-label="name"
dense
outlined
rounded
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index 62bfe0e0..78c153f2 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -79,8 +79,6 @@ const sourceList = ref(null);
:label="t('agency')"
v-model="params.agencyModeFk"
:options="agencyList"
- option-value="id"
- option-label="name"
dense
outlined
rounded
@@ -100,8 +98,6 @@ const sourceList = ref(null);
:label="t('salesPerson')"
v-model="params.workerFk"
:options="salesPersonList"
- option-value="id"
- option-label="name"
dense
outlined
rounded
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 6a4ae6aa..afcd0180 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -149,8 +149,6 @@ const orderFilter = {
:label="t('order.form.clientFk')"
v-model="data.clientFk"
:options="clientList"
- option-value="id"
- option-label="name"
hide-selected
@update:model-value="
(client) => fetchAddressList(client.defaultAddressFk)
@@ -172,7 +170,6 @@ const orderFilter = {
:label="t('order.form.addressFk')"
v-model="data.addressFk"
:options="addressList"
- option-value="id"
option-label="nickname"
hide-selected
:disable="!addressList?.length"
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 4be1981a..93605b8d 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -67,7 +67,6 @@ const warehouseList = ref([]);
:label="t('Worker')"
v-model="params.workerFk"
:options="workerList"
- option-value="id"
option-label="nickname"
dense
outlined
@@ -96,8 +95,6 @@ const warehouseList = ref([]);
:label="t('Agency')"
v-model="params.agencyModeFk"
:options="agencyList"
- option-value="id"
- option-label="name"
dense
outlined
rounded
@@ -152,7 +149,6 @@ const warehouseList = ref([]);
:label="t('Vehicle')"
v-model="params.vehicleFk"
:options="vehicleList"
- option-value="id"
option-label="numberPlate"
dense
outlined
@@ -175,8 +171,6 @@ const warehouseList = ref([]);
:label="t('Warehouse')"
v-model="params.warehouseFk"
:options="warehouseList"
- option-value="id"
- option-label="name"
dense
outlined
rounded
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 604f0435..a08efae6 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -119,7 +119,6 @@ const onSave = (data, response) => {
:label="t('Worker')"
v-model="data.workerFk"
:options="workerList"
- option-value="id"
option-label="nickname"
emit-value
map-options
@@ -143,7 +142,6 @@ const onSave = (data, response) => {
:label="t('Vehicle')"
v-model="data.vehicleFk"
:options="vehicleList"
- option-value="id"
option-label="numberPlate"
emit-value
map-options
@@ -158,8 +156,6 @@ const onSave = (data, response) => {
:label="t('Agency')"
v-model="data.agencyModeFk"
:options="agencyList"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0f5403ba..4eeff3f1 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -294,8 +294,6 @@ const markAsServed = () => {
:label="t('Worker')"
v-model="scope.value"
:options="workers"
- option-value="id"
- option-label="name"
hide-selected
autofocus
:emit-value="false"
@@ -338,8 +336,6 @@ const markAsServed = () => {
:label="t('Agency')"
v-model="scope.value"
:options="agencyList"
- option-value="id"
- option-label="name"
hide-selected
autofocus
:emit-value="false"
@@ -366,7 +362,6 @@ const markAsServed = () => {
:label="t('Vehicle')"
v-model="scope.value"
:options="vehicleList"
- option-value="id"
option-label="numberPlate"
hide-selected
autofocus
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index abc91373..baf83861 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -65,7 +65,6 @@ function setParkings(data) {
:label="t('params.parkingFk')"
v-model="params.parkingFk"
:options="parkings"
- option-value="id"
option-label="code"
emit-value
map-options
@@ -86,8 +85,6 @@ function setParkings(data) {
:label="t('params.userFk')"
v-model="params.userFk"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index 238879bd..d5e70fc2 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -97,7 +97,6 @@ const onSave = (shelving, newShelving) => {
<QSelect
v-model="data.parkingFk"
:options="parkingList"
- option-value="id"
option-label="code"
emit-value
:label="t('shelving.basicData.parking')"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 302e0321..7b902585 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -114,8 +114,6 @@ onMounted(() => {
:label="t('worker.create.bankEntity')"
v-model="row.bankEntityFk"
:options="bankEntitiesOptions"
- option-label="name"
- option-value="id"
hide-selected
>
<template #form>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 17786c1e..bcb281d2 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -51,8 +51,6 @@ const onDataSaved = () => {
:label="t('supplier.agencyTerms.agencyFk')"
v-model="data.agencyFk"
:options="agenciesOptions"
- option-label="name"
- option-value="id"
hide-selected
rounded
/>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index bc50deb9..4152d8fd 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -42,8 +42,6 @@ const workersOptions = ref([]);
:label="t('supplier.basicData.workerFk')"
v-model="data.workerFk"
:options="workersOptions"
- option-value="id"
- option-label="name"
hide-selected
map-options
:rules="validate('supplier.workerFk')"
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index bf5ccb11..9a49214a 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -41,8 +41,6 @@ const formatPayDems = (data) => {
:label="t('supplier.billingData.payMethodFk')"
v-model="data.payMethodFk"
:options="paymethodsOptions"
- option-value="id"
- option-label="name"
hide-selected
:rules="validate('supplier.payMethodFk')"
/>
@@ -52,7 +50,6 @@ const formatPayDems = (data) => {
:label="t('supplier.billingData.payDemFk')"
v-model="data.payDemFk"
:options="payDemsOptions"
- option-value="id"
option-label="payDem"
hide-selected
:rules="validate('supplier.payDemFk')"
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 339a9d0d..783f3ef8 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -83,7 +83,6 @@ const itemCategoriesOptions = ref([]);
v-model="params.buyerId"
@update:model-value="searchFn()"
:options="buyersOptions"
- option-value="id"
option-label="nickname"
hide-selected
dense
@@ -99,8 +98,6 @@ const itemCategoriesOptions = ref([]);
v-model="params.typeId"
@update:model-value="searchFn()"
:options="itemTypesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -126,8 +123,6 @@ const itemCategoriesOptions = ref([]);
v-model="params.categoryId"
@update:model-value="searchFn()"
:options="itemCategoriesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index becf6d81..53648754 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -84,7 +84,6 @@ function handleLocation(data, location) {
:label="t('supplier.fiscalData.sageTaxTypeFk')"
v-model="data.sageTaxTypeFk"
:options="sageTaxTypesOptions"
- option-value="id"
option-label="vat"
hide-selected
map-options
@@ -97,7 +96,6 @@ function handleLocation(data, location) {
:label="t('supplier.fiscalData.sageWithholdingFk')"
v-model="data.sageWithholdingFk"
:options="sageWithholdingsOptions"
- option-value="id"
option-label="withholding"
hide-selected
map-options
@@ -108,7 +106,6 @@ function handleLocation(data, location) {
:label="t('supplier.fiscalData.sageTransactionTypeFk')"
v-model="data.sageTransactionTypeFk"
:options="sageTransactionTypesOptions"
- option-value="id"
option-label="transaction"
hide-selected
map-options
@@ -122,7 +119,6 @@ function handleLocation(data, location) {
v-model="data.supplierActivityFk"
:options="supplierActivitiesOptions"
option-value="code"
- option-label="name"
hide-selected
map-options
/>
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
index ff90df6e..5c4c2c78 100644
--- a/src/pages/Supplier/SupplierListFilter.vue
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -75,8 +75,6 @@ const countriesOptions = ref([]);
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provincesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -91,7 +89,6 @@ const countriesOptions = ref([]);
v-model="params.countryFk"
@update:model-value="searchFn()"
:options="countriesOptions"
- option-value="id"
option-label="country"
hide-selected
dense
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3fb9c008..9a844956 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -138,8 +138,6 @@ const redirectToTicketList = (_, { id }) => {
:label="t('ticket.create.client')"
v-model="data.clientId"
:options="clientOptions"
- option-value="id"
- option-label="name"
hide-selected
@update:model-value="(client) => onClientSelected(data)"
>
@@ -164,7 +162,6 @@ const redirectToTicketList = (_, { id }) => {
:label="t('ticket.create.address')"
v-model="data.addressId"
:options="addressesOptions"
- option-value="id"
option-label="nickname"
hide-selected
:disable="!data.clientId"
@@ -201,8 +198,6 @@ const redirectToTicketList = (_, { id }) => {
:label="t('ticket.create.warehouse')"
v-model="data.warehouseId"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
@update:model-value="() => fetchAvailableAgencies(data)"
/>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7b74117b..30432057 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -89,8 +89,6 @@ const warehouses = ref();
:label="t('Salesperson')"
v-model="params.salesPersonFk"
:options="workers"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
@@ -111,8 +109,6 @@ const warehouses = ref();
v-model="params.stateFk"
@update:model-value="searchFn()"
:options="states"
- option-value="id"
- option-label="name"
emit-value
map-options
dense
@@ -188,8 +184,6 @@ const warehouses = ref();
v-model="params.provinceFk"
@update:model-value="searchFn()"
:options="provinces"
- option-value="id"
- option-label="name"
emit-value
map-options
dense
@@ -208,8 +202,6 @@ const warehouses = ref();
v-model="params.agencyModeFk"
@update:model-value="searchFn()"
:options="agencies"
- option-value="id"
- option-label="name"
emit-value
map-options
dense
@@ -228,8 +220,6 @@ const warehouses = ref();
v-model="params.warehouseFk"
@update:model-value="searchFn()"
:options="warehouses"
- option-value="id"
- option-label="name"
emit-value
map-options
dense
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 2edaac85..6b0ed81e 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -40,8 +40,6 @@ const agenciesOptions = ref([]);
:label="t('travel.basicData.agency')"
v-model="data.agencyModeFk"
:options="agenciesOptions"
- option-value="id"
- option-label="name"
map-options
hide-selected
/>
@@ -67,8 +65,6 @@ const agenciesOptions = ref([]);
:label="t('travel.basicData.warehouseOut')"
v-model="data.warehouseOutFk"
:options="agenciesOptions"
- option-value="id"
- option-label="name"
map-options
hide-selected
/>
@@ -78,8 +74,6 @@ const agenciesOptions = ref([]);
:label="t('travel.basicData.warehouseIn')"
v-model="data.warehouseInFk"
:options="agenciesOptions"
- option-value="id"
- option-label="name"
map-options
hide-selected
/>
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 4462846c..6a46c36a 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -272,8 +272,6 @@ const onThermographCreated = async (data) => {
:label="t('travel.thermographs.type')"
v-model="thermographForm.dmsTypeId"
:options="dmsTypesOptions"
- option-value="id"
- option-label="name"
/>
</div>
</VnRow>
@@ -283,7 +281,6 @@ const onThermographCreated = async (data) => {
:label="t('travel.thermographs.company')"
v-model="thermographForm.companyId"
:options="companiesOptions"
- option-value="id"
option-label="code"
/>
</div>
@@ -292,8 +289,6 @@ const onThermographCreated = async (data) => {
:label="t('travel.thermographs.warehouse')"
v-model="thermographForm.warehouseId"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
/>
</div>
</VnRow>
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 0b897516..19e24388 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -119,7 +119,6 @@ const decrement = (paramsObj, key) => {
@update:model-value="searchFn()"
:options="agenciesOptions"
option-value="agencyFk"
- option-label="name"
hide-selected
dense
outlined
@@ -154,8 +153,6 @@ const decrement = (paramsObj, key) => {
v-model="params.warehouseOutFk"
@update:model-value="searchFn()"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -170,8 +167,6 @@ const decrement = (paramsObj, key) => {
v-model="params.warehouseInFk"
@update:model-value="searchFn()"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -186,8 +181,6 @@ const decrement = (paramsObj, key) => {
v-model="params.cargoSupplierFk"
@update:model-value="searchFn()"
:options="suppliersOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -203,7 +196,6 @@ const decrement = (paramsObj, key) => {
@update:model-value="searchFn()"
:options="continentsOptions"
option-value="code"
- option-label="name"
hide-selected
dense
outlined
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index abee0356..0a707871 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -77,7 +77,6 @@ const redirectToTravelBasicData = (_, { id }) => {
v-model="data.agencyModeFk"
:options="agenciesOptions"
option-value="agencyFk"
- option-label="name"
hide-selected
/>
</div>
@@ -99,8 +98,6 @@ const redirectToTravelBasicData = (_, { id }) => {
:label="t('globals.wareHouseOut')"
v-model="data.warehouseOutFk"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
/>
</div>
@@ -109,8 +106,6 @@ const redirectToTravelBasicData = (_, { id }) => {
:label="t('globals.wareHouseIn')"
v-model="data.warehouseInFk"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
/>
</div>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c1c0d1be..6c2cf21e 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -77,7 +77,6 @@ const decrement = (paramsObj, key) => {
@update:model-value="searchFn()"
:options="agenciesOptions"
option-value="agencyFk"
- option-label="name"
hide-selected
dense
outlined
@@ -92,8 +91,6 @@ const decrement = (paramsObj, key) => {
v-model="params.warehouseOutFk"
@update:model-value="searchFn()"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -108,8 +105,6 @@ const decrement = (paramsObj, key) => {
v-model="params.warehouseInFk"
@update:model-value="searchFn()"
:options="warehousesOptions"
- option-value="id"
- option-label="name"
hide-selected
dense
outlined
@@ -173,7 +168,6 @@ const decrement = (paramsObj, key) => {
@update:model-value="searchFn()"
:options="continentsOptions"
option-value="code"
- option-label="name"
hide-selected
dense
outlined
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index cf6bc3ff..5642a238 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -132,8 +132,6 @@ function filterType(val, update) {
fill-input
hide-selected
input-debounce="0"
- option-label="name"
- option-value="id"
emit-value
map-options
:label="t('wagon.create.type')"
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index eef29a8a..a61c8fb2 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -198,7 +198,6 @@ onMounted(async () => {
:label="t('worker.create.company')"
v-model="data.companyFk"
:options="companiesOptions"
- option-value="id"
option-label="code"
hide-selected
:rules="validate('Worker.company')"
@@ -209,8 +208,6 @@ onMounted(async () => {
:label="t('worker.create.boss')"
v-model="data.bossFk"
:options="workersOptions"
- option-value="id"
- option-label="name"
hide-selected
:rules="validate('Worker.boss')"
>
@@ -234,8 +231,6 @@ onMounted(async () => {
:label="t('worker.create.payMethods')"
v-model="data.payMethodFk"
:options="payMethodsOptions"
- option-value="id"
- option-label="name"
map-options
hide-selected
:rules="validate('Worker.payMethodFk')"
@@ -261,8 +256,6 @@ onMounted(async () => {
:label="t('worker.create.bankEntity')"
v-model="data.bankEntityFk"
:options="bankEntitiesOptions"
- option-label="name"
- option-value="id"
hide-selected
:roles-allowed-to-create="['salesAssistant', 'hr']"
:rules="validate('Worker.bankEntity')"
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 0853791e..e2477372 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -72,8 +72,6 @@ const departments = ref();
v-model="params.departmentFk"
@update:model-value="searchFn()"
:options="departments"
- option-value="id"
- option-label="name"
emit-value
map-options
use-input
View Git Blame Copy Permalink