verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 62 Releases Wiki Activity

#6321 - Negative ticket #158

Open
jsegarra wants to merge 156 commits from 6321_negative_tickets into dev
pull from: 6321_negative_tickets
merge into: verdnatura:dev
Conversation 0 Commits 156 Files Changed 55 +6 -20
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 174d159d04 - Show all commits

1
src/i18n/es/index.js
View File

@ -462,6 +462,7 @@ export default {
inkFk: 'Color', inkFk: 'Color',
timed: 'timed', timed: 'timed',
minTimed: 'Hora', minTimed: 'Hora',
type: 'Tipo',
jsegarra marked this conversation as resolved Outdated
jgallego commented 2024-04-02 05:15:01 +00:00
Outdated
Review
Copy Link

articulo

articulo
negativeAction: 'Negativo', negativeAction: 'Negativo',
jsegarra marked this conversation as resolved Outdated
jgallego commented 2024-04-02 05:14:56 +00:00
Outdated
Review
Copy Link

almacen

almacen
totalNegative: 'Total negativos', totalNegative: 'Total negativos',
modalOrigin:{ modalOrigin:{

25
src/pages/Ticket/Negative/TicketLackList.vue
View File

@ -46,7 +46,7 @@ const columnsTotalNegativeDialog = computed(() => [
}, },
{ {
name: 'itemFk', name: 'itemFk',
label: t('ticket.negative.itemFk'), label: t('ticket.negative.detail.itemFk'),
field: ({ itemFk }) => itemFk, field: ({ itemFk }) => itemFk,
sortable: true, sortable: true,
}, },
@ -58,13 +58,13 @@ const columnsTotalNegativeDialog = computed(() => [
}, },
{ {
name: 'dated', name: 'dated',
label: t('ticket.negative.dated'), label: t('ticket.negative.detail.shipped'),
field: ({ dated }) => dated, field: ({ dated }) => dated,
sortable: true, sortable: true,
}, },
{ {
name: 'quantity', name: 'quantity',
label: t('ticket.negative.quantity'), label: t('ticket.negative.detail.quantity'),
field: ({ quantity }) => quantity, field: ({ quantity }) => quantity,
sortable: true, sortable: true,
}, },
@ -301,14 +301,7 @@ const updateNegativeOrigin = async () => {
t('ticket.negative.totalNegative') t('ticket.negative.totalNegative')
}}</span> }}</span>
<QSpace /> <QSpace />
<QBtn <QBtn icon="close" flat round dense v-close-popup />
icon="close"
:disable="isLoading"
flat
round
dense
v-close-popup
/>
</QCardSection> </QCardSection>
<QCardSection <QCardSection
class="row items-center justify-center column items-stretch" class="row items-center justify-center column items-stretch"
@ -366,14 +359,7 @@ const updateNegativeOrigin = async () => {
t('ticket.negative.modalOrigin.title') t('ticket.negative.modalOrigin.title')
}}</span> }}</span>
<QSpace /> <QSpace />
<QBtn <QBtn icon="close" flat round dense v-close-popup />
icon="close"
:disable="isLoading"
flat
round
dense
v-close-popup
/>
</QCardSection> </QCardSection>
<QCardSection <QCardSection
class="row items-center justify-center column items-stretch" class="row items-center justify-center column items-stretch"
@ -389,7 +375,6 @@ const updateNegativeOrigin = async () => {
<QBtn <QBtn
:label="t('globals.cancel')" :label="t('globals.cancel')"
color="primary" color="primary"
:disable="isLoading"
flat flat
v-close-popup v-close-popup
/> />