7336_devToTest #354

Merged
alexm merged 359 commits from 7336_devToTest into test 2024-05-07 06:34:00 +00:00
3 changed files with 10 additions and 8 deletions
Showing only changes of commit 39685c222f - Show all commits

View File

@ -145,9 +145,6 @@ select:-webkit-autofill {
} }
} }
.q-btn {
text-transform: none;
}
.tr-header { .tr-header {
color: var(--vn-label-color); color: var(--vn-label-color);
} }

View File

@ -171,7 +171,7 @@ const ticketsColumns = ref([
</template> </template>
<template #body-cell-quantity="{ value, row }"> <template #body-cell-quantity="{ value, row }">
<QTd> <QTd>
<QBtn flat color="primary" dense> <QBtn class="no-uppercase" flat color="primary" dense>
{{ value }} {{ value }}
<CustomerDescriptorProxy :id="row.id" /> <CustomerDescriptorProxy :id="row.id" />
</QBtn> </QBtn>
@ -182,3 +182,8 @@ const ticketsColumns = ref([
</template> </template>
</CardSummary> </CardSummary>
</template> </template>
<style lang="scss" scoped>
.no-uppercase {
text-transform: none;
}
</style>

View File

@ -119,8 +119,8 @@ const columns = computed(() => [
}, },
{ {
label: t('invoiceOut.negativeBases.comercial'), label: t('invoiceOut.negativeBases.comercial'),
field: 'workerSocialName', field: 'workerName',
name: 'comercial', name: 'worker',
align: 'left', align: 'left',
}, },
]); ]);
@ -181,10 +181,10 @@ const downloadCSV = async () => {
<TicketDescriptorProxy :id="row.ticketFk" /> <TicketDescriptorProxy :id="row.ticketFk" />
</QTd> </QTd>
</template> </template>
<template #body-cell-comercial="{ row }"> <template #body-cell-worker="{ row }">
<QTd> <QTd>
<QBtn class="no-uppercase" flat dense color="blue">{{ <QBtn class="no-uppercase" flat dense color="blue">{{
row.workerSocial row.workerName
}}</QBtn> }}</QBtn>
<WorkerDescriptorProxy :id="row.comercialId" /> <WorkerDescriptorProxy :id="row.comercialId" />
</QTd> </QTd>