forked from verdnatura/salix-front
Merge branch 'master' into hotfix_8217_updateCustomerCredit
This commit is contained in:
commit
e2f092948e
|
@ -49,13 +49,7 @@ async function handleSave() {
|
|||
|
||||
<template>
|
||||
<FetchData
|
||||
@on-fetch="
|
||||
(data) =>
|
||||
(observationTypes = data.map((type) => {
|
||||
type.label = t(`ticketNotes.observationTypes.${type.description}`);
|
||||
return type;
|
||||
}))
|
||||
"
|
||||
@on-fetch="(data) => (observationTypes = data)"
|
||||
auto-load
|
||||
url="ObservationTypes"
|
||||
/>
|
||||
|
@ -82,7 +76,7 @@ async function handleSave() {
|
|||
:label="t('ticketNotes.observationType')"
|
||||
:options="observationTypes"
|
||||
hide-selected
|
||||
option-label="label"
|
||||
option-label="description"
|
||||
option-value="id"
|
||||
v-model="row.observationTypeFk"
|
||||
:disable="!!row.id"
|
||||
|
|
|
@ -291,13 +291,8 @@ function toTicketUrl(section) {
|
|||
"
|
||||
>
|
||||
<span class="label" style="margin-right: 4px">
|
||||
({{
|
||||
t(
|
||||
`ticketNotes.observationTypes.${item.observationType.description}`
|
||||
)
|
||||
}}):
|
||||
({{ item.observationType.description }}):
|
||||
</span>
|
||||
|
||||
<span>{{ item.description }}</span>
|
||||
</QItem>
|
||||
</QVirtualScroll>
|
||||
|
|
|
@ -14,16 +14,6 @@ ticketNotes:
|
|||
description: Description
|
||||
removeNote: Remove note
|
||||
addNote: Add note
|
||||
observationTypes:
|
||||
ItemPicker: Item picker
|
||||
Packager: Packager
|
||||
Delivery: Delivery
|
||||
SalesPerson: Sales person
|
||||
Administrative: Administrative
|
||||
Weight: Weight
|
||||
InvoiceOut: Invoice Out
|
||||
DropOff: Drop Off
|
||||
Sustitución: Sustitution
|
||||
ticketSale:
|
||||
id: Id
|
||||
visible: Visible
|
||||
|
|
|
@ -29,18 +29,6 @@ ticketNotes:
|
|||
description: Descripción
|
||||
removeNote: Quitar nota
|
||||
addNote: Añadir nota
|
||||
observationTypes:
|
||||
ItemPicker: Sacador
|
||||
Packager: Encajador
|
||||
Delivery: Envío
|
||||
SalesPerson: Comercial
|
||||
Administrative: Administrativa
|
||||
Weight: Peso
|
||||
InvoiceOut: Facturas
|
||||
DropOff: Despacho
|
||||
Sustitución: Sustitución
|
||||
Accepted: Aceptado
|
||||
Denied: Denegado
|
||||
purchaseRequest:
|
||||
Id: Id
|
||||
description: Descripción
|
||||
|
|
Loading…
Reference in New Issue