Merge pull request 'fix: refs #6238 enhance ui' (!1047) from 6238-hotfix-wideCol into master
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1047 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
559ee5416a
|
@ -57,7 +57,7 @@ const travelKgPercentages = ref([]);
|
||||||
const tableColumnComponents = {
|
const tableColumnComponents = {
|
||||||
id: {
|
id: {
|
||||||
component: QBtn,
|
component: QBtn,
|
||||||
attrs: { flat: true, color: 'primary' },
|
attrs: { flat: true, color: 'primary', dense: true },
|
||||||
},
|
},
|
||||||
cargoSupplierNickname: {
|
cargoSupplierNickname: {
|
||||||
component: QBtn,
|
component: QBtn,
|
||||||
|
@ -178,6 +178,7 @@ const columns = computed(() => [
|
||||||
align: 'left',
|
align: 'left',
|
||||||
showValue: false,
|
showValue: false,
|
||||||
sortable: true,
|
sortable: true,
|
||||||
|
style: 'min-width: 170px;',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('globals.packages'),
|
label: t('globals.packages'),
|
||||||
|
@ -237,7 +238,7 @@ const columns = computed(() => [
|
||||||
format: (value) => toDate(value),
|
format: (value) => toDate(value),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('globals.wareHhuseIn'),
|
label: t('globals.warehouseIn'),
|
||||||
field: 'warehouseInName',
|
field: 'warehouseInName',
|
||||||
name: 'warehouseInName',
|
name: 'warehouseInName',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
@ -506,7 +507,7 @@ const getColor = (percentage) => {
|
||||||
:key="col.name"
|
:key="col.name"
|
||||||
:props="props"
|
:props="props"
|
||||||
@click="stopEventPropagation($event, col)"
|
@click="stopEventPropagation($event, col)"
|
||||||
auto-width
|
:style="col.style"
|
||||||
>
|
>
|
||||||
<component
|
<component
|
||||||
:is="tableColumnComponents[col.name].component"
|
:is="tableColumnComponents[col.name].component"
|
||||||
|
@ -581,7 +582,7 @@ const getColor = (percentage) => {
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<QTd>
|
<QTd>
|
||||||
<QBtn flat class="link">{{ entry.id }} </QBtn>
|
<QBtn dense flat class="link">{{ entry.id }} </QBtn>
|
||||||
<EntryDescriptorProxy :id="entry.id" />
|
<EntryDescriptorProxy :id="entry.id" />
|
||||||
</QTd>
|
</QTd>
|
||||||
<QTd>
|
<QTd>
|
||||||
|
@ -637,6 +638,18 @@ const getColor = (percentage) => {
|
||||||
|
|
||||||
:deep(.q-table) {
|
:deep(.q-table) {
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
|
|
||||||
|
th {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
tbody tr td {
|
||||||
|
&:nth-child(1) {
|
||||||
|
max-width: 65px;
|
||||||
|
}
|
||||||
|
&:nth-child(4) {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.q-td :deep(input) {
|
.q-td :deep(input) {
|
||||||
|
@ -684,7 +697,6 @@ const getColor = (percentage) => {
|
||||||
width: max-content;
|
width: max-content;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
searchExtraCommunity: Search for extra community shipping
|
searchExtraCommunity: Search for extra community shipping
|
||||||
|
|
Loading…
Reference in New Issue