From 45b54332060a2dd2faf3db663bedc7b079e2510c Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 20 Sep 2024 09:14:11 +0200 Subject: [PATCH 01/12] refs #6898 fix filter --- src/components/CreateNewPostcodeForm.vue | 2 +- src/components/VnSelectProvince.vue | 2 +- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Supplier/Card/SupplierFiscalData.vue | 2 +- src/pages/Supplier/SupplierList.vue | 13 +++++++++++++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue index a426ac2b4c..f920303c4a 100644 --- a/src/components/CreateNewPostcodeForm.vue +++ b/src/components/CreateNewPostcodeForm.vue @@ -105,7 +105,7 @@ async function setProvince(id, data) { option-label="name" option-value="id" :rules="validate('postcode.city')" - :roles-allowed-to-create="['deliveryAssistant']" + :roles-allowed-to-create="['deliveryAssistant', 'administrative']" :emit-value="false" clearable > diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue index ea10ace19f..d50e292ce6 100644 --- a/src/components/VnSelectProvince.vue +++ b/src/components/VnSelectProvince.vue @@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) { hide-selected v-model="provinceFk" :rules="validate && validate('postcode.provinceFk')" - :roles-allowed-to-create="['deliveryAssistant']" + :roles-allowed-to-create="['deliveryAssistant', 'administrative']" > + From e1f3589110f55936bb916ed20cc915fc8e0242fa Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 20 Sep 2024 12:17:10 +0200 Subject: [PATCH 06/12] fix: refs #7353 horizontal scroll --- src/pages/Monitor/Ticket/MonitorTickets.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 29bf429155..4c6daca876 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -54,7 +54,6 @@ const columns = computed(() => [ label: t('salesTicketsTable.problems'), name: 'totalProblems', align: 'left', - columnClass: 'no-padding', columnFilter: false, attrs: { dense: true, From 87efc2f355d5bcc4dacc44ac6f90b2ca07698297 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 20 Sep 2024 13:00:34 +0200 Subject: [PATCH 07/12] fix: refs #7353 responsive filters --- src/pages/Monitor/MonitorClients.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue index 68b24b400b..e98e11c6db 100644 --- a/src/pages/Monitor/MonitorClients.vue +++ b/src/pages/Monitor/MonitorClients.vue @@ -141,8 +141,9 @@ const columns = computed(() => [ From 3e101242f64b72cd6ab727e93fd4a9ddabd99b34 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 20 Sep 2024 13:20:40 +0200 Subject: [PATCH 08/12] chore: refs #7353 drop useless code --- src/pages/Monitor/Ticket/MonitorTickets.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index 4c6daca876..f6e9848cf3 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -205,7 +205,6 @@ const columns = computed(() => [ name: 'totalWithVat', field: 'totalWithVat', align: 'left', - style: 'max-width: 75px', columnFilter: { component: 'number', name: 'totalWithVat', From 7a253d314c6940c25100c3c78aa7dd79cf1126bd Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 20 Sep 2024 13:22:15 +0200 Subject: [PATCH 09/12] chore: refs #7353 drop useless code --- src/pages/Monitor/Ticket/MonitorTickets.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue index f6e9848cf3..16d5abffb2 100644 --- a/src/pages/Monitor/Ticket/MonitorTickets.vue +++ b/src/pages/Monitor/Ticket/MonitorTickets.vue @@ -106,7 +106,6 @@ const columns = computed(() => [ { label: t('salesTicketsTable.date'), name: 'shippedDate', - style: { 'max-width': '100px' }, align: 'left', columnFilter: { component: 'date', From df56eefe2f0ab236f475fd177ec22e0e9c435e14 Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 20 Sep 2024 15:46:54 +0200 Subject: [PATCH 10/12] fix: refs #7353 fine tunning ui --- src/pages/Monitor/MonitorClients.vue | 2 +- src/pages/Monitor/MonitorOrders.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue index e98e11c6db..c1958cdcb3 100644 --- a/src/pages/Monitor/MonitorClients.vue +++ b/src/pages/Monitor/MonitorClients.vue @@ -143,7 +143,7 @@ const columns = computed(() => [ margin-bottom: 0; flex-direction: row; > * { - max-width: 105px; + max-width: 125px; } } diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue index eb455a239c..52d442d0a6 100644 --- a/src/pages/Monitor/MonitorOrders.vue +++ b/src/pages/Monitor/MonitorOrders.vue @@ -132,7 +132,6 @@ const openTab = (id) => :table="{ 'row-key': 'id', selection: 'multiple', - 'hide-bottom': true, }" default-mode="table" :row-click="({ id }) => openTab(id)" From 1ae20202ccd84c09428572fb14c3764dd11ccf1c Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 23 Sep 2024 11:56:20 +0200 Subject: [PATCH 11/12] feat: refs #8000 add column into zoneBasicData --- src/pages/Zone/Card/ZoneBasicData.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue index 512d076369..c60a4c77b2 100644 --- a/src/pages/Zone/Card/ZoneBasicData.vue +++ b/src/pages/Zone/Card/ZoneBasicData.vue @@ -64,6 +64,15 @@ const agencyOptions = ref([]); type="number" min="0" /> + + @@ -128,4 +137,5 @@ es: Bonus: Bonificación Inflation: Inflación Volumetric: Volumétrico + Max length m³: Medidad máxima tumbado From 5ebbb1cf737aa405717efe4b8851601287898333 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 23 Sep 2024 12:24:19 +0200 Subject: [PATCH 12/12] feat: refs #8000 fix --- src/pages/Zone/Card/ZoneBasicData.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue index c60a4c77b2..535f2393df 100644 --- a/src/pages/Zone/Card/ZoneBasicData.vue +++ b/src/pages/Zone/Card/ZoneBasicData.vue @@ -137,5 +137,5 @@ es: Bonus: Bonificación Inflation: Inflación Volumetric: Volumétrico - Max length m³: Medidad máxima tumbado + Max length m³: Medida máxima tumbado