forked from verdnatura/salix-front
Merge pull request '#6943 removes duplicate toggle menu & fix loading animation' (!491) from 6943-fixCustomerGreuges into dev
Reviewed-on: verdnatura/salix-front#491 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
b09cbe442c
|
@ -13,7 +13,7 @@ const { t } = useI18n();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const stateStore = computed(() => useStateStore());
|
const stateStore = computed(() => useStateStore());
|
||||||
const rows = ref([]);
|
const rows = ref([]);
|
||||||
const totalAmount = ref(0);
|
const totalAmount = ref();
|
||||||
|
|
||||||
const filter = {
|
const filter = {
|
||||||
include: [
|
include: [
|
||||||
|
@ -75,7 +75,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
field: (value) => value.user.name,
|
field: (value) => value?.user?.name,
|
||||||
label: t('Created by'),
|
label: t('Created by'),
|
||||||
name: 'createdBy',
|
name: 'createdBy',
|
||||||
},
|
},
|
||||||
|
@ -87,7 +87,7 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
align: 'left',
|
align: 'left',
|
||||||
field: (value) => value.greugeType.name,
|
field: (value) => value?.greugeType?.name,
|
||||||
label: t('Type'),
|
label: t('Type'),
|
||||||
name: 'type',
|
name: 'type',
|
||||||
},
|
},
|
||||||
|
@ -108,26 +108,9 @@ const setRows = (data) => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
|
<FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
|
||||||
<Teleport to="#actions-append">
|
|
||||||
<div class="row q-gutter-x-sm">
|
|
||||||
<QBtn
|
|
||||||
flat
|
|
||||||
@click="stateStore.toggleRightDrawer()"
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
icon="menu"
|
|
||||||
>
|
|
||||||
<QTooltip bottom anchor="bottom right">
|
|
||||||
{{ t('globals.collapseMenu') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</div>
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
|
||||||
<QCard class="full-width q-pa-sm">
|
<QCard class="full-width q-pa-sm">
|
||||||
<h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
|
<h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount !== undefined">
|
||||||
<span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
|
<span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
|
||||||
{{ toCurrency(totalAmount) }}
|
{{ toCurrency(totalAmount) }}
|
||||||
</h6>
|
</h6>
|
||||||
|
|
Loading…
Reference in New Issue