0
0
Fork 0

Merge pull request '#7353 warmfix-fixSearchbar' (!697) from 7353-warmfix-fixSearchbar into test

Reviewed-on: verdnatura/salix-front#697
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-09-13 07:22:43 +00:00
commit 9d63bd1f02
4 changed files with 23 additions and 21 deletions

View File

@ -278,6 +278,14 @@ globals:
createInvoiceIn: Create invoice in createInvoiceIn: Create invoice in
myAccount: My account myAccount: My account
noOne: No one noOne: No one
params:
clientFk: Client id
salesPersonFk: Sales person
warehouseFk: Warehouse
provinceFk: Province
from: From
To: To
stateFk: State
errors: errors:
statusUnauthorized: Access denied statusUnauthorized: Access denied
statusInternalServerError: An internal server error has ocurred statusInternalServerError: An internal server error has ocurred

View File

@ -282,6 +282,14 @@ globals:
createInvoiceIn: Crear factura recibida createInvoiceIn: Crear factura recibida
myAccount: Mi cuenta myAccount: Mi cuenta
noOne: Nadie noOne: Nadie
params:
clientFk: Id cliente
salesPersonFk: Comercial
warehouseFk: Almacén
provinceFk: Provincia
from: Desde
To: Hasta
stateFk: Estado
errors: errors:
statusUnauthorized: Acceso denegado statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor statusInternalServerError: Ha ocurrido un error interno del servidor

View File

@ -40,7 +40,7 @@ const handleScopeDays = (params, days, callback) => {
<VnFilterPanel <VnFilterPanel
:data-key="dataKey" :data-key="dataKey"
:search-button="true" :search-button="true"
:hidden-tags="['from', 'to']" :hidden-tags="['from', 'to', 'search']"
:custom-tags="['scopeDays']" :custom-tags="['scopeDays']"
:unremovable-params="['from', 'to', 'scopeDays']" :unremovable-params="['from', 'to', 'scopeDays']"
> >
@ -64,7 +64,7 @@ const handleScopeDays = (params, days, callback) => {
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnInput <VnInput
:label="t('params.clientFk')" :label="t('globals.params.clientFk')"
v-model="params.clientFk" v-model="params.clientFk"
is-outlined is-outlined
/> />
@ -105,7 +105,7 @@ const handleScopeDays = (params, days, callback) => {
outlined outlined
dense dense
rounded rounded
:label="t('params.salesPersonFk')" :label="t('globals.params.salesPersonFk')"
v-model="params.salesPersonFk" v-model="params.salesPersonFk"
url="Workers/search" url="Workers/search"
:params="{ departmentCodes: ['VT'] }" :params="{ departmentCodes: ['VT'] }"
@ -158,7 +158,7 @@ const handleScopeDays = (params, days, callback) => {
outlined outlined
dense dense
rounded rounded
:label="t('params.stateFk')" :label="t('globals.params.stateFk')"
v-model="params.stateFk" v-model="params.stateFk"
url="States" url="States"
is-outlined is-outlined
@ -184,7 +184,7 @@ const handleScopeDays = (params, days, callback) => {
outlined outlined
dense dense
rounded rounded
:label="t('params.warehouseFk')" :label="t('globals.params.warehouseFk')"
v-model="params.warehouseFk" v-model="params.warehouseFk"
:options="warehouses" :options="warehouses"
/> />
@ -196,7 +196,7 @@ const handleScopeDays = (params, days, callback) => {
outlined outlined
dense dense
rounded rounded
:label="t('params.provinceFk')" :label="t('globals.params.provinceFk')"
v-model="params.provinceFk" v-model="params.provinceFk"
url="Provinces" url="Provinces"
/> />
@ -235,22 +235,15 @@ const handleScopeDays = (params, days, callback) => {
<i18n> <i18n>
en: en:
params: params:
clientFk: Client id
orderFk: Order id orderFk: Order id
scopeDays: Days onward scopeDays: Days onward
nickname: Nickname nickname: Nickname
salesPersonFk: Sales person
refFk: Invoice refFk: Invoice
agencyModeFk: Agency agencyModeFk: Agency
stateFk: State
groupedStates: Grouped State groupedStates: Grouped State
warehouseFk: Warehouse
provinceFk: Province
myTeam: My team myTeam: My team
problems: With problems problems: With problems
pending: Pending pending: Pending
from: From
to: To
alertLevel: Grouped State alertLevel: Grouped State
FREE: Free FREE: Free
DELIVERED: Delivered DELIVERED: Delivered
@ -261,22 +254,15 @@ en:
es: es:
params: params:
clientFk: Id cliente
orderFk: Id cesta orderFk: Id cesta
scopeDays: Días en adelante scopeDays: Días en adelante
nickname: Nombre mostrado nickname: Nombre mostrado
salesPersonFk: Comercial
refFk: Factura refFk: Factura
agencyModeFk: Agencia agencyModeFk: Agencia
stateFk: Estado
groupedStates: Estado agrupado groupedStates: Estado agrupado
warehouseFk: Almacén
provinceFk: Provincia
myTeam: Mi equipo myTeam: Mi equipo
problems: Con problemas problems: Con problemas
pending: Pendiente pending: Pendiente
from: Desde
To: Hasta
alertLevel: Estado agrupado alertLevel: Estado agrupado
FREE: Libre FREE: Libre
DELIVERED: Servido DELIVERED: Servido

View File

@ -3,7 +3,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
</script> </script>
<template> <template>
<VnSearchbar <VnSearchbar
data-key="SalesMonitorTickets" data-key="saleMonitorTickets"
url="SalesMonitors/salesFilter" url="SalesMonitors/salesFilter"
:redirect="false" :redirect="false"
:label="$t('searchBar.label')" :label="$t('searchBar.label')"