0
0
Fork 0

Merge pull request 'refs #6898 fix filter' (!733) from 6898-fixSupplier2 into master

Reviewed-on: verdnatura/salix-front#733
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Carlos Satorres 2024-09-20 07:35:27 +00:00
commit 28cd15508f
6 changed files with 18 additions and 3 deletions

View File

@ -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
>

View File

@ -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']"
>
<template #option="{ itemProps, opt }">
<QItem v-bind="itemProps">

View File

@ -1010,6 +1010,7 @@ supplier:
account: Account
payMethod: Pay Method
payDay: Pay Day
country: Country
summary:
responsible: Responsible
notes: Notes

View File

@ -994,6 +994,7 @@ supplier:
account: Cuenta
payMethod: Método de pago
payDay: Dia de pago
country: País
summary:
responsible: Responsable
notes: Notas

View File

@ -129,7 +129,7 @@ function handleLocation(data, location) {
<VnRow>
<VnLocation
:rules="validate('Worker.postcode')"
:roles-allowed-to-create="['deliveryAssistant']"
:roles-allowed-to-create="['deliveryAssistant', 'administrative']"
v-model="data.postCode"
@update:model-value="(location) => handleLocation(data, location)"
>

View File

@ -75,6 +75,19 @@ const columns = computed(() => [
},
visible: false,
},
{
align: 'left',
label: t('supplier.list.tableVisibleColumns.country'),
name: 'country',
columnFilter: {
component: 'select',
name: 'countryFk',
attrs: {
url: 'countries',
fields: ['id', 'name'],
},
},
},
]);
</script>