Merge branch 'dev' into feature/FixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
8bb3d48c81
|
@ -141,6 +141,19 @@ select:-webkit-autofill {
|
|||
background-color: var(--vn-section-color);
|
||||
}
|
||||
|
||||
.q-checkbox {
|
||||
& .q-checkbox__label {
|
||||
color: var(--vn-text-color);
|
||||
}
|
||||
& .q-checkbox__inner {
|
||||
color: var(--vn-label-color);
|
||||
}
|
||||
}
|
||||
|
||||
.tr-header {
|
||||
color: var(--vn-label-color);
|
||||
}
|
||||
|
||||
.q-chip,
|
||||
.q-notification__message,
|
||||
.q-notification__icon {
|
||||
|
|
|
@ -138,7 +138,7 @@ const ticketsColumns = ref([
|
|||
<VnTitle :text="t('invoiceOut.summary.taxBreakdown')" />
|
||||
<QTable :columns="taxColumns" :rows="invoiceOut.taxesBreakdown" flat>
|
||||
<template #header="props">
|
||||
<QTr :props="props">
|
||||
<QTr class="tr-header" :props="props">
|
||||
<QTh v-for="col in props.cols" :key="col.name" :props="props">
|
||||
{{ t(col.label) }}
|
||||
</QTh>
|
||||
|
@ -149,6 +149,18 @@ const ticketsColumns = ref([
|
|||
<QCard class="vn-three">
|
||||
<VnTitle :text="t('invoiceOut.summary.tickets')" />
|
||||
<QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
|
||||
<template #header="props">
|
||||
<QTr :props="props">
|
||||
<QTh
|
||||
class="tr-header"
|
||||
v-for="col in props.cols"
|
||||
:key="col.name"
|
||||
:props="props"
|
||||
>
|
||||
{{ t(col.label) }}
|
||||
</QTh>
|
||||
</QTr>
|
||||
</template>
|
||||
<template #body-cell-item="{ value }">
|
||||
<QTd>
|
||||
<QBtn flat color="primary">
|
||||
|
@ -159,7 +171,7 @@ const ticketsColumns = ref([
|
|||
</template>
|
||||
<template #body-cell-quantity="{ value, row }">
|
||||
<QTd>
|
||||
<QBtn flat color="primary" dense>
|
||||
<QBtn class="no-uppercase" flat color="primary" dense>
|
||||
{{ value }}
|
||||
<CustomerDescriptorProxy :id="row.id" />
|
||||
</QBtn>
|
||||
|
@ -170,3 +182,8 @@ const ticketsColumns = ref([
|
|||
</template>
|
||||
</CardSummary>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
.no-uppercase {
|
||||
text-transform: none;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -119,8 +119,8 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
label: t('invoiceOut.negativeBases.comercial'),
|
||||
field: 'workerSocialName',
|
||||
name: 'comercial',
|
||||
field: 'workerName',
|
||||
name: 'worker',
|
||||
align: 'left',
|
||||
},
|
||||
]);
|
||||
|
@ -181,9 +181,11 @@ const downloadCSV = async () => {
|
|||
<TicketDescriptorProxy :id="row.ticketFk" />
|
||||
</QTd>
|
||||
</template>
|
||||
<template #body-cell-comercial="{ row }">
|
||||
<template #body-cell-worker="{ row }">
|
||||
<QTd>
|
||||
<QBtn flat dense color="blue">{{ row.comercialName }}</QBtn>
|
||||
<QBtn class="no-uppercase" flat dense color="blue">{{
|
||||
row.workerName
|
||||
}}</QBtn>
|
||||
<WorkerDescriptorProxy :id="row.comercialId" />
|
||||
</QTd>
|
||||
</template>
|
||||
|
@ -211,6 +213,9 @@ const downloadCSV = async () => {
|
|||
border-radius: 4px;
|
||||
padding: 6px;
|
||||
}
|
||||
.no-uppercase {
|
||||
text-transform: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
<i18n>
|
||||
|
|
Loading…
Reference in New Issue