diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 025a8a2e2..65a89ee28 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -111,25 +111,23 @@ watch($props, async () => {
- + {{ $props.title }} - {{ $props.title }} - + {{ entity.name }} - {{ entity.name }}
- + #{{ $props.subtitle ?? entity.id }} -
+
@@ -163,11 +161,12 @@ watch($props, async () => { display: flex; padding: 2px 16px; .label { - color: $label-color; + color: var(--vn-label); font-size: 12px; width: 47%; } .value { + color: var(--vn-text); font-size: 14px; margin-left: 12px; width: 47%; @@ -184,22 +183,26 @@ watch($props, async () => { + + diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 561798968..b54e44398 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -151,4 +151,7 @@ watch(props, async () => { display: flex; flex-direction: row; } +.summaryHeader { + color: $white; +} diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue index 9a17fca05..0f9b99713 100644 --- a/src/components/ui/VnLv.vue +++ b/src/components/ui/VnLv.vue @@ -4,10 +4,9 @@ import { dashIfEmpty } from 'src/filters'; const $props = defineProps({ label: { type: String, default: null }, - value: { - type: [String, Boolean], - default: null, - }, + value: { type: [Number, String, Boolean], default: null }, + titleLabel: { type: String, default: null }, + titleValue: { type: [Number, String, Boolean], default: null }, info: { type: String, default: null }, dash: { type: Boolean, default: true }, }); @@ -17,7 +16,7 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
- {{ $props.label }} + {{ $props.label }}
diff --git a/src/css/app.scss b/src/css/app.scss index bf501f011..3c8cc50b6 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -26,17 +26,11 @@ select:-webkit-autofill { body.body--light { .q-header .q-toolbar { - background-color: white; + background-color: $white; color: #555; } - - .summary { - .header { - color: white; - } - } --vn-text: #000000; - --vn-gray: #dddddd; + --vn-gray: #f5f5f5; --vn-label: #5f5f5f; } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index b2414d4ce..808bf3468 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -15,6 +15,7 @@ $primary: #ec8916; $secondary: #26a69a; $accent: #9c27b0; +$white: #fff; $positive: #21ba45; $negative: #c10015; @@ -46,5 +47,3 @@ $dark-shadow-color: #000; $dark: #292929; $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24); $spacing-md: 16px; - -$label-color: #ffffff99; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 075f9739b..4cafee136 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -347,11 +347,14 @@ export default { list: { ref: 'Reference', issued: 'Issued', + shortIssued: 'Issued', amount: 'Amount', client: 'Client', created: 'Created', + shortCreated: 'Created', company: 'Company', dued: 'Due date', + shortDued: 'Due date', }, card: { issued: 'Issued', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c235fa4e8..13e3fd626 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -347,11 +347,14 @@ export default { list: { ref: 'Referencia', issued: 'Fecha emisión', + shortIssued: 'F. emisión', amount: 'Importe', client: 'Cliente', created: 'Fecha creación', + shortCreated: 'F. creación', company: 'Empresa', dued: 'Fecha vencimineto', + shortDued: 'F. vencimiento', }, card: { issued: 'Fecha emisión', diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index f9afa7177..ee9550472 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -9,6 +9,8 @@ import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue'; import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; import ClaimFilter from './ClaimFilter.vue'; +import VnLv from 'src/components/ui/VnLv.vue'; +import CardList from 'src/components/ui/CardList.vue'; const stateStore = useStateStore(); const router = useRouter(); @@ -74,116 +76,62 @@ function viewSummary(id) { auto-load >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue index acd5e3bdf..ff6cf7d04 100644 --- a/src/pages/Customer/CustomerList.vue +++ b/src/pages/Customer/CustomerList.vue @@ -7,6 +7,8 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue'; import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import CustomerFilter from './CustomerFilter.vue'; +import VnLv from 'src/components/ui/VnLv.vue'; +import CardList from 'src/components/ui/CardList.vue'; const stateStore = useStateStore(); const router = useRouter(); @@ -66,85 +68,40 @@ function viewSummary(id) { auto-load >
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 00bed322e..5ed7cdf9b 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -9,6 +9,8 @@ import InvoiceOutSummaryDialog from './Card/InvoiceOutSummaryDialog.vue'; import { toDate, toCurrency } from 'src/filters/index'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import InvoiceOutFilter from './InvoiceOutFilter.vue'; +import VnLv from 'src/components/ui/VnLv.vue'; +import CardList from 'src/components/ui/CardList.vue'; const stateStore = useStateStore(); const router = useRouter(); @@ -71,97 +73,59 @@ function viewSummary(id) { auto-load > diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index 21d1ec890..bd06f5655 100644 --- a/src/pages/Ticket/Card/TicketDescriptor.vue +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -88,7 +88,7 @@ const setData = (entity) =>