From 1ec7b7a8c1d6e06931873f5240c6818cc8ec40ba Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 19 Aug 2024 16:02:30 +0200
Subject: [PATCH] fix: refs #7353 css
---
src/pages/Monitor/SalesClientsTable.vue | 10 ++++++++--
src/pages/Monitor/SalesOrdersTable.vue | 25 +++++++++++++------------
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/pages/Monitor/SalesClientsTable.vue b/src/pages/Monitor/SalesClientsTable.vue
index b481f490a..3ab355872 100644
--- a/src/pages/Monitor/SalesClientsTable.vue
+++ b/src/pages/Monitor/SalesClientsTable.vue
@@ -126,8 +126,8 @@ const columns = computed(() => [
>
<template #top-left>
<VnRow>
- <VnInputDate v-model="from" label="From" dense style="flex: 0.25" />
- <VnInputDate v-model="to" label="To" 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.3" />
</VnRow>
</template>
<template #column-salesPersonFk="{ row }">
@@ -144,3 +144,9 @@ const columns = computed(() => [
</template>
</VnTable>
</template>
+
+<style lang="scss" scoped>
+td {
+ max-width: 120px;
+}
+</style>
diff --git a/src/pages/Monitor/SalesOrdersTable.vue b/src/pages/Monitor/SalesOrdersTable.vue
index b86579994..7479380d0 100644
--- a/src/pages/Monitor/SalesOrdersTable.vue
+++ b/src/pages/Monitor/SalesOrdersTable.vue
@@ -5,7 +5,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.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 { useVnConfirm } from 'composables/useVnConfirm';
import axios from 'axios';
@@ -41,6 +41,7 @@ const columns = computed(() => [
align: 'left',
orderBy: 'date_make',
columnFilter: false,
+ format: (row) => toDateTimeFormat(row.date_make),
},
{
label: t('salesOrdersTable.client'),
@@ -158,35 +159,34 @@ const openTab = (id) =>
<QBadge
:color="getBadgeColor(row.date_send)"
text-color="black"
- class="q-pa-sm q-mb-md"
+ class="q-pa-sm"
style="font-size: 14px"
>
{{ toDateFormat(row.date_send) }}
</QBadge>
</QTd>
</template>
- <template #column-dateMake="{ row }">
- <QTd>
- {{ row.date_make }}
- </QTd>
- </template>
+
<template #column-clientFk="{ row }">
<QTd>
- <div class="q-mb-md">
- <span class="link">{{ row.clientName }}</span>
+ <div class="q-mb-sm">
+ <span class="link" v-text="row.clientName" />
<CustomerDescriptorProxy :id="row.clientFk" />
</div>
- <span> {{ row.agencyName }}</span>
+ <span
+ :title="$q.screen.lt.xl ? row.agencyName : ''"
+ v-text="row.agencyName"
+ />
</QTd>
</template>
<template #column-salesPersonFk="{ row }">
<QTd>
<div class="q-mb-md">
- <span class="link">{{ row.salesPerson }}</span>
+ <span class="link" v-text="row.salesPerson" />
<WorkerDescriptorProxy :id="row.salesPersonFk" dense />
</div>
- <span>{{ toCurrency(row.import) }}</span>
+ <span v-text="toCurrency(row.import)" />
</QTd>
</template>
</VnTable>
@@ -194,5 +194,6 @@ const openTab = (id) =>
<style lang="scss" scoped>
.q-td {
color: gray;
+ max-width: 140px;
}
</style>