wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

fix: refs #7717 fix OrderList table filters' and summary table style

This commit is contained in:
Jon Elias 2024-07-26 14:09:09 +02:00
parent cc518d5a80
commit d588db05ac
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/pages/Order/Card/OrderSummary.vue
View File

@ -180,15 +180,17 @@ const detailsColumns = ref([
<ItemDescriptorProxy :id="props.row.item?.id" />
</span>
</QTd>
<QTd key="description" :props="props" class="description">
<div class="name">
<span>{{ props.row.item.name }}</span>
<span
v-if="props.row.item.subName"
class="subName"
>
{{ props.row.item.subName }}
</span>
<QTd key="description" :props="props">
<div class="description">
<div class="name">
{{ props.row.item.name }}
<span
v-if="props.row.item.subName"
class="subName"
>
{{ props.row.item.subName }}
</span>
</div>
</div>
<FetchedTags :item="props.row.item" :max-length="5" />
</QTd>
@ -228,24 +230,13 @@ const detailsColumns = ref([
}
.description {
display: flex;
flex-direction: column;
justify-content: center;
text-align: left;
height: auto;
padding-top: 12px;
padding-bottom: 12px;
padding-top: 15px;
padding-bottom: 15px;
.name {
display: flex;
align-items: center;
padding-bottom: 8px;
& > * {
flex: 1;
}
.subName {
margin-left: 5%;
text-transform: uppercase;
color: var(--vn-label-color);
}

38
src/pages/Order/OrderList.vue
View File

@ -29,7 +29,7 @@ const columns = computed(() => [
},
{
align: 'left',
name: 'clientName',
name: 'clientFk',
label: t('module.customer'),
isTitle: true,
cardVisible: true,
@ -41,20 +41,26 @@ const columns = computed(() => [
columnField: {
component: null,
},
format: (row) => row?.clientName,
},
{
align: 'left',
name: 'name',
name: 'salesPersonFk',
label: t('module.salesPerson'),
component: 'select',
attrs: {
url: 'Workers/activeWithInheritedRole',
fields: ['id', 'name'],
where: { role: 'salesPerson' },
},
columnField: {
component: null,
columnFilter: {
component: 'select',
inWhere: true,
attrs: {
url: 'Workers/activeWithInheritedRole',
fields: ['id', 'name'],
where: { role: 'salesPerson' },
useLike: false,
optionValue: 'id',
optionLabel: 'name',
optionFilter: 'firstName',
},
},
format: (row) => row?.name,
},
{
align: 'left',
@ -92,22 +98,30 @@ const columns = computed(() => [
},
{
align: 'left',
name: 'agencyName',
name: 'agencyModeFk',
label: t('module.agency'),
component: 'select',
cardVisible: true,
attrs: {
url: 'Agencies',
url: 'agencyModes',
fields: ['id', 'name'],
find: {
value: 'agencyModeFk',
label: 'agencyName',
},
},
columnField: {
component: null,
},
format: (row) => row?.agencyName,
},
{
align: 'left',
name: 'total',
label: t('module.total'),
columnFilter: {
inWhere: true,
},
format: ({ total }) => toCurrency(total),
cardVisible: true,
},