Merge branch 'dev' into Fix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
4ecce6af0a
|
@ -11,6 +11,7 @@ import { useStateStore } from 'stores/useStateStore';
|
||||||
import { dashIfEmpty } from 'src/filters';
|
import { dashIfEmpty } from 'src/filters';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||||
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
|
@ -23,7 +24,7 @@ watch(
|
||||||
async () => {
|
async () => {
|
||||||
await nextTick();
|
await nextTick();
|
||||||
salesRef.value?.fetch();
|
salesRef.value?.fetch();
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const salesFilter = computed(() => ({
|
const salesFilter = computed(() => ({
|
||||||
|
@ -100,29 +101,28 @@ onMounted(() => (stateStore.rightDrawer = true));
|
||||||
@on-fetch="(data) => applyVolumes(data)"
|
@on-fetch="(data) => applyVolumes(data)"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<Teleport
|
<RightMenu>
|
||||||
to="#right-panel"
|
<template #right-panel>
|
||||||
v-if="stateStore.isHeaderMounted() && packingTypeVolume.length"
|
<QCard
|
||||||
>
|
v-for="(packingType, index) in packingTypeVolume"
|
||||||
<QCard
|
:key="index"
|
||||||
v-for="(packingType, index) in packingTypeVolume"
|
class="q-pa-md q-mb-md q-ma-md color-vn-text"
|
||||||
:key="index"
|
bordered
|
||||||
class="q-pa-md q-mb-md q-ma-md color-vn-text"
|
flat
|
||||||
bordered
|
style="border-color: black"
|
||||||
flat
|
>
|
||||||
style="border-color: black"
|
<QCardSection class="column items-center" horizontal>
|
||||||
>
|
<span>
|
||||||
<QCardSection class="column items-center" horizontal>
|
{{ t('volume.type') }}:
|
||||||
<span>
|
{{ dashIfEmpty(packingType.description) }}
|
||||||
{{ t('volume.type') }}:
|
</span>
|
||||||
{{ dashIfEmpty(packingType.description) }}
|
</QCardSection>
|
||||||
</span>
|
<QCardSection class="column items-center" horizontal>
|
||||||
</QCardSection>
|
<span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
|
||||||
<QCardSection class="column items-center" horizontal>
|
</QCardSection>
|
||||||
<span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
|
</QCard>
|
||||||
</QCardSection>
|
</template>
|
||||||
</QCard>
|
</RightMenu>
|
||||||
</Teleport>
|
|
||||||
<VnTable
|
<VnTable
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
data-key="TicketVolume"
|
data-key="TicketVolume"
|
||||||
|
|
Loading…
Reference in New Issue