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

fix: refs #7353 css
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-08-19 16:02:30 +02:00
parent 3f9bdfcc9c
commit 1ec7b7a8c1
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/Monitor/SalesClientsTable.vue
View File

@ -126,8 +126,8 @@ const columns = computed(() => [
> >
<template #top-left> <template #top-left>
<VnRow> <VnRow>
<VnInputDate v-model="from" label="From" dense style="flex: 0.25" /> <VnInputDate v-model="from" label="From" dense style="flex: 0.3" />
<VnInputDate v-model="to" label="To" dense style="flex: 0.25" /> <VnInputDate v-model="to" label="To" dense style="flex: 0.3" />
</VnRow> </VnRow>
</template> </template>
<template #column-salesPersonFk="{ row }"> <template #column-salesPersonFk="{ row }">
@ -144,3 +144,9 @@ const columns = computed(() => [
</template> </template>
</VnTable> </VnTable>
</template> </template>
<style lang="scss" scoped>
td {
max-width: 120px;
}
</style>

25
src/pages/Monitor/SalesOrdersTable.vue
View File

@ -5,7 +5,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'components/VnTable/VnTable.vue';
import { toDateFormat } from 'src/filters/date.js'; import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
import { useVnConfirm } from 'composables/useVnConfirm'; import { useVnConfirm } from 'composables/useVnConfirm';
import axios from 'axios'; import axios from 'axios';
@ -41,6 +41,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
orderBy: 'date_make', orderBy: 'date_make',
columnFilter: false, columnFilter: false,
format: (row) => toDateTimeFormat(row.date_make),
}, },
{ {
label: t('salesOrdersTable.client'), label: t('salesOrdersTable.client'),
@ -158,35 +159,34 @@ const openTab = (id) =>
<QBadge <QBadge
:color="getBadgeColor(row.date_send)" :color="getBadgeColor(row.date_send)"
text-color="black" text-color="black"
class="q-pa-sm q-mb-md" class="q-pa-sm"
style="font-size: 14px" style="font-size: 14px"
> >
{{ toDateFormat(row.date_send) }} {{ toDateFormat(row.date_send) }}
</QBadge> </QBadge>
</QTd> </QTd>
</template> </template>
<template #column-dateMake="{ row }">
<QTd>
{{ row.date_make }}
</QTd>
</template>
<template #column-clientFk="{ row }"> <template #column-clientFk="{ row }">
<QTd> <QTd>
<div class="q-mb-md"> <div class="q-mb-sm">
<span class="link">{{ row.clientName }}</span> <span class="link" v-text="row.clientName" />
<CustomerDescriptorProxy :id="row.clientFk" /> <CustomerDescriptorProxy :id="row.clientFk" />
</div> </div>
<span> {{ row.agencyName }}</span> <span
:title="$q.screen.lt.xl ? row.agencyName : ''"
v-text="row.agencyName"
/>
</QTd> </QTd>
</template> </template>
<template #column-salesPersonFk="{ row }"> <template #column-salesPersonFk="{ row }">
<QTd> <QTd>
<div class="q-mb-md"> <div class="q-mb-md">
<span class="link">{{ row.salesPerson }}</span> <span class="link" v-text="row.salesPerson" />
<WorkerDescriptorProxy :id="row.salesPersonFk" dense /> <WorkerDescriptorProxy :id="row.salesPersonFk" dense />
</div> </div>
<span>{{ toCurrency(row.import) }}</span> <span v-text="toCurrency(row.import)" />
</QTd> </QTd>
</template> </template>
</VnTable> </VnTable>
@ -194,5 +194,6 @@ const openTab = (id) =>
<style lang="scss" scoped> <style lang="scss" scoped>
.q-td { .q-td {
color: gray; color: gray;
max-width: 140px;
} }
</style> </style>