diff --git a/src/components/VnTable/VnChip.vue b/src/components/VnTable/VnChip.vue index 74207b943..f70ba7423 100644 --- a/src/components/VnTable/VnChip.vue +++ b/src/components/VnTable/VnChip.vue @@ -35,7 +35,9 @@ function stopEventPropagation(event) { dense square > - {{ row[col.name] }} + + {{ col.format ? col.format(row) : row[col.name] }} + diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue index 3af58226f..9f6c6d53d 100644 --- a/src/components/VnTable/VnColumn.vue +++ b/src/components/VnTable/VnColumn.vue @@ -147,7 +147,7 @@ const col = computed(() => { } if ( (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) && - !newColumn.component + newColumn.component == null ) newColumn.component = 'checkbox'; if ($props.default && !newColumn.component) newColumn.component = $props.default; diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue index 285e2338e..e1faec0a0 100644 --- a/src/components/VnTable/VnFilter.vue +++ b/src/components/VnTable/VnFilter.vue @@ -75,6 +75,7 @@ const components = { attrs: { ...defaultAttrs, clearable: true, + type: 'number', }, forceAttrs, }, diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue index 1e1dc9e01..98c7ab392 100644 --- a/src/components/VnTable/VnOrder.vue +++ b/src/components/VnTable/VnOrder.vue @@ -1,7 +1,7 @@ - diff --git a/src/css/app.scss b/src/css/app.scss index 504718ff5..69861a80c 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -233,27 +233,23 @@ input::-webkit-inner-spin-button { } .q-table { - thead, - tbody { - th { - .q-select { - max-width: 120px; - } - } - td { - padding: 1px 10px 1px 10px; - max-width: 100px; - div span { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } + th, + td { + padding: 1px 10px 1px 10px; + max-width: 100px; + div span { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - .expand { - max-width: 400px; - } + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .shrink { + max-width: 75px; + } + .expand { + max-width: 400px; } } diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index 05698debe..8c5c6a3d0 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -44,7 +44,7 @@ const columns = computed(() => [ fields: ['id', 'name'], }, }, - class: 'expand', + columnClass: 'expand', }, { align: 'left', diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue index 1ee771bf8..98a3115da 100644 --- a/src/pages/Customer/Card/CustomerConsumption.vue +++ b/src/pages/Customer/Card/CustomerConsumption.vue @@ -1,13 +1,14 @@ diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue new file mode 100644 index 000000000..4d2c5ff3c --- /dev/null +++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue @@ -0,0 +1,91 @@ + + + +en: + params: + item: Item id + buyer: Buyer + type: Type + category: Category +es: + params: + item: Id artículo + buyer: Comprador + type: Tipo + category: Categoría + diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue index 755ba3b9a..b93e1f340 100644 --- a/src/pages/Customer/Card/CustomerCredits.vue +++ b/src/pages/Customer/Card/CustomerCredits.vue @@ -1,20 +1,14 @@ - - es: Since: Desde diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue index 86de5217e..15bf19b48 100644 --- a/src/pages/Customer/Card/CustomerSummary.vue +++ b/src/pages/Customer/Card/CustomerSummary.vue @@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue'; import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue'; import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue'; import VnTitle from 'src/components/common/VnTitle.vue'; - +import VnRow from 'src/components/ui/VnRow.vue'; const route = useRoute(); const { t } = useI18n(); @@ -131,41 +131,33 @@ const creditWarning = computed(() => { :url="`#/customer/${entityId}/fiscal-data`" :text="t('customer.summary.fiscalData')" /> - - - - - - - + + + + + + + + + + + + { /> - - + + + - + + [ name: 'name', isTitle: true, create: true, - columnField: { - class: 'expand', - }, + columnClass: 'expand', }, { align: 'left', @@ -52,9 +50,7 @@ const columns = computed(() => [ label: t('customer.extendedList.tableVisibleColumns.socialName'), isTitle: true, create: true, - columnField: { - class: 'expand', - }, + columnClass: 'expand', }, { align: 'left', @@ -136,9 +132,7 @@ const columns = computed(() => [ columnFilter: { inWhere: true, }, - columnField: { - class: 'expand', - }, + columnClass: 'expand', }, { align: 'left', diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue index 693b016fb..11f6362f8 100644 --- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue +++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue @@ -1,9 +1,8 @@