wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into Hotfix-FixEntryDmsTest

This commit is contained in:
Jon Elias 2024-09-16 06:20:36 +00:00
parent 0f604ea8b5 07e45f2051
commit c08167c5a9
8 changed files with 71 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/i18n/locale/en.yml
View File

@ -285,6 +285,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

8
src/i18n/locale/es.yml
View File

@ -289,6 +289,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

4
src/pages/Entry/EntryBuysTableDialog.vue
View File

@ -116,7 +116,7 @@ const entriesTableColumns = computed(() => [
{{ col.value }} {{ col.value }}
</QTd> </QTd>
<QBtn <QBtn
icon="print" icon="visibility"
v-if="props.row.stickers > 0" v-if="props.row.stickers > 0"
:loading="isLoading" :loading="isLoading"
@click=" @click="
@ -126,7 +126,7 @@ const entriesTableColumns = computed(() => [
" "
unelevated unelevated
> >
<QTooltip>{{ t('printLabel') }}</QTooltip> <QTooltip>{{ t('viewLabel') }}</QTooltip>
</QBtn> </QBtn>
</QTr> </QTr>
</template> </template>

2
src/pages/Entry/locale/en.yml
View File

@ -11,4 +11,4 @@ shipped: Shipped
fromShipped: Shipped(from) fromShipped: Shipped(from)
toShipped: Shipped(to) toShipped: Shipped(to)
printLabels: Print stickers printLabels: Print stickers
printLabel: Print sticker viewLabel: View sticker

2
src/pages/Entry/locale/es.yml
View File

@ -15,4 +15,4 @@ shipped: F. salida
fromShipped: F. salida(desde) fromShipped: F. salida(desde)
toShipped: F. salida(hasta) toShipped: F. salida(hasta)
printLabels: Imprimir etiquetas printLabels: Imprimir etiquetas
printLabel: Imprimir etiqueta viewLabel: Ver etiqueta

110
src/pages/Item/ItemFixedPrice.vue
View File

@ -76,16 +76,8 @@ const columns = computed(() => [
name: 'rate2', name: 'rate2',
...defaultColumnAttrs, ...defaultColumnAttrs,
cardVisible: true, cardVisible: true,
columnField: { component: 'input',
class: 'expand', type: 'number',
component: 'input',
type: 'number',
},
columnFilter: {
class: 'expand',
component: 'input',
type: 'number',
},
}, },
{ {
label: t('item.fixedPrice.packingPrice'), label: t('item.fixedPrice.packingPrice'),
@ -93,35 +85,18 @@ const columns = computed(() => [
name: 'rate3', name: 'rate3',
...defaultColumnAttrs, ...defaultColumnAttrs,
cardVisible: true, cardVisible: true,
columnField: { component: 'input',
class: 'expand', type: 'number',
component: 'input',
type: 'number',
},
columnFilter: {
class: 'expand',
component: 'input',
type: 'number',
},
}, },
{ {
label: t('item.fixedPrice.minPrice'), label: t('item.fixedPrice.minPrice'),
field: 'minPrice', field: 'minPrice',
columnClass: 'shrink',
name: 'minPrice', name: 'minPrice',
...defaultColumnAttrs, ...defaultColumnAttrs,
cardVisible: true, cardVisible: true,
columnField: { component: 'input',
class: 'expand', type: 'number',
component: 'input',
type: 'number',
},
columnFilter: {
class: 'expand',
component: 'input',
type: 'number',
},
}, },
{ {
label: t('item.fixedPrice.started'), label: t('item.fixedPrice.started'),
@ -162,16 +137,9 @@ const columns = computed(() => [
name: 'warehouseFk', name: 'warehouseFk',
...defaultColumnAttrs, ...defaultColumnAttrs,
columnClass: 'shrink', columnClass: 'shrink',
columnFilter: { component: 'select',
component: 'select',
}, options: warehousesOptions,
columnField: {
component: 'select',
class: 'expand',
},
attrs: {
options: warehousesOptions,
},
}, },
{ {
align: 'right', align: 'right',
@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
</span> </span>
<span class="subName">{{ row.subName }}</span> <span class="subName">{{ row.subName }}</span>
<ItemDescriptorProxy :id="row.itemFk" /> <ItemDescriptorProxy :id="row.itemFk" />
<FetchedTags style="width: max-content; max-width: 220px" :item="row" /> <FetchedTags :item="row" />
</template> </template>
<template #column-rate2="props"> <template #column-rate2="props">
<VnInput <QTd class="col">
mask="###.##" <VnInput
v-model.number="props.row.rate2" type="currency"
v-on="getRowUpdateInputEvents(props)" style="width: 75px"
> v-model.number="props.row.rate2"
<template #append>€</template> v-on="getRowUpdateInputEvents(props)"
</VnInput> >
<template #append>€</template>
</VnInput>
</QTd>
</template> </template>
<template #column-rate3="props"> <template #column-rate3="props">
<VnInput <QTd class="col">
mask="###.##" <VnInput
v-model.number="props.row.rate3" style="width: 75px"
v-on="getRowUpdateInputEvents(props)" type="currency"
> v-model.number="props.row.rate3"
<template #append>€</template> v-on="getRowUpdateInputEvents(props)"
</VnInput> >
<template #append>€</template>
</VnInput>
</QTd>
</template> </template>
<template #column-minPrice="props"> <template #column-minPrice="props">
<QTd class="col"> <QTd class="col">
<div class="row" style="width: 115px"> <div class="row">
<QCheckbox <QCheckbox
:model-value="props.row.hasMinPrice" :model-value="props.row.hasMinPrice"
@update:model-value="updateMinPrice($event, props)" @update:model-value="updateMinPrice($event, props)"
@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
/> />
<VnInput <VnInput
class="col" class="col"
type="currency"
mask="###.##"
:disable="props.row.hasMinPrice === 1" :disable="props.row.hasMinPrice === 1"
v-model.number="props.row.minPrice" v-model.number="props.row.minPrice"
v-on="getRowUpdateInputEvents(props)" v-on="getRowUpdateInputEvents(props)"
@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
/> />
</template> </template>
<template #column-warehouseFk="props"> <template #column-warehouseFk="props">
<VnSelect <QTd class="col">
style="max-width: 150px" <VnSelect
:options="warehousesOptions" style="max-width: 150px"
hide-selected :options="warehousesOptions"
option-label="name" hide-selected
option-value="id" option-label="name"
v-model="props.row.warehouseFk" option-value="id"
v-on="getRowUpdateInputEvents(props, false, 'select')" v-model="props.row.warehouseFk"
/> v-on="getRowUpdateInputEvents(props, false, 'select')"
/>
</QTd>
</template> </template>
<template #column-deleteAction="{ row, rowIndex }"> <template #column-deleteAction="{ row, rowIndex }">
<QIcon <QIcon

26
src/pages/Monitor/Ticket/MonitorTicketFilter.vue
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

2
src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
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')"