diff --git a/src/pages/Property/Card/PropertyBasicData.vue b/src/pages/Property/Card/PropertyBasicData.vue index 1fbf1b599..380a99ffe 100644 --- a/src/pages/Property/Card/PropertyBasicData.vue +++ b/src/pages/Property/Card/PropertyBasicData.vue @@ -63,7 +63,6 @@ const isNew = Boolean(!route.params.id); option-value="id" option-label="code" hide-selected - @update:model-value="onClientChange" > diff --git a/src/pages/Property/PropertyList.vue b/src/pages/Property/PropertyList.vue index 7e9e82e40..842a69c85 100644 --- a/src/pages/Property/PropertyList.vue +++ b/src/pages/Property/PropertyList.vue @@ -48,12 +48,17 @@ const columns = computed(() => [ align: 'right', name: 'id', label: t('property.id'), - width: '70px', + width: '35px', + chip: { + condition: () => true, + }, + isId: true, }, { align: 'left', name: 'name', label: t('property.name'), + isTitle: true, }, { align: 'left', @@ -66,17 +71,25 @@ const columns = computed(() => [ optionValue: 'id', optionLabel: 'description', }, - format: ({description}) => description, + format: ({ propertyGroup }) => propertyGroup, + }, + { + label: t('property.group'), + name: 'propertyGroup', + cardVisible: true, + visible: false, }, { align: 'left', name: 'protocol', label: t('property.protocol'), + cardVisible: true, }, { align: 'left', name: 'cadaster', label: t('property.cadaster'), + cardVisible: true, }, { align: 'left', @@ -89,7 +102,13 @@ const columns = computed(() => [ optionValue: 'id', optionLabel: 'code', }, - format: ({code}) => code, + format: ({ companyCode }) => companyCode, + }, + { + label: t('property.owner'), + name: 'companyCode', + cardVisible: true, + visible: false, }, { align: 'left', @@ -98,6 +117,13 @@ const columns = computed(() => [ component: 'date', format: ({ purchased }) => toDate(purchased), }, + { + label: t('property.purchased'), + name: 'purchased', + format: ({ purchased }) => toDate(purchased), + cardVisible: true, + visible: false, + }, { align: 'left', name: 'booked', @@ -105,6 +131,41 @@ const columns = computed(() => [ component: 'date', format: ({ booked }) => toDate(booked), }, + { + label: t('property.booked'), + name: 'booked', + format: ({ booked }) => toDate(booked), + cardVisible: true, + visible: false, + }, + { + label: t('property.hasFormalization'), + name: 'hasFormalization', + component: 'checkbox', + cardVisible: true, + visible: false, + }, + { + label: t('property.hasSimpleCopy'), + name: 'hasSimpleCopy', + component: 'checkbox', + cardVisible: true, + visible: false, + }, + { + label: t('property.hasOriginalPropertyDeed'), + name: 'hasOriginalPropertyDeed', + component: 'checkbox', + cardVisible: true, + visible: false, + }, + { + label: t('property.hasFundProvision'), + name: 'hasFundProvision', + component: 'checkbox', + cardVisible: true, + visible: false, + }, ]); diff --git a/src/pages/Route/Vehicle/Card/VehicleNotes.vue b/src/pages/Route/Vehicle/Card/VehicleNotes.vue index 0afc3c3ed..36a8712a2 100644 --- a/src/pages/Route/Vehicle/Card/VehicleNotes.vue +++ b/src/pages/Route/Vehicle/Card/VehicleNotes.vue @@ -28,7 +28,6 @@ const body = { :add-note="true" :filter="noteFilter" :body="body" - style="overflow-y: auto" required deletable />