0
0
Fork 0

Add subfilter to entry list view and entry descriptor improvements

This commit is contained in:
William Buezas 2024-01-18 08:58:04 -03:00
parent 9cd1f542aa
commit 161bfab443
5 changed files with 84 additions and 19 deletions

View File

@ -17,9 +17,9 @@ a {
// Removes chrome autofill background
input:-webkit-autofill,
select:-webkit-autofill {
color: var(--vn-text) ;
color: var(--vn-text);
font-family: $typography-font-family;
-webkit-text-fill-color: var(--vn-text) ;
-webkit-text-fill-color: var(--vn-text);
-webkit-background-clip: text !important;
background-clip: text !important;
}
@ -48,6 +48,10 @@ body.body--dark {
background-color: var(--vn-dark);
}
.color-vn-text {
color: var(--vn-text);
}
.vn-card {
background-color: var(--vn-gray);
color: var(--vn-text);

View File

@ -335,7 +335,7 @@ export default {
packagingFk: 'Embalaje',
},
descriptor: {
agency: 'Agency',
agency: 'Agencia',
landed: 'F. entrega',
warehouseOut: 'Alm. salida',
},

View File

@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
import useCardDescription from 'src/composables/useCardDescription';
import { toDate } from 'src/filters';
import { usePrintService } from 'composables/usePrintService';
const $props = defineProps({
id: {
@ -23,6 +24,7 @@ const $props = defineProps({
const route = useRoute();
const { t } = useI18n();
const { openReport } = usePrintService();
const entryFilter = {
include: [
@ -61,6 +63,14 @@ const entryFilter = {
],
};
const entityId = computed(() => {
return $props.id || route.params.id;
});
const data = ref(useCardDescription());
const setData = (entity) =>
(data.value = useCardDescription(entity.supplier.nickname, entity.id));
const getEntryRedirectionFilter = (entry) => {
let entryTravel = entry && entry.travel;
@ -82,13 +92,9 @@ const getEntryRedirectionFilter = (entry) => {
});
};
const entityId = computed(() => {
return $props.id || route.params.id;
});
const data = ref(useCardDescription());
const setData = (entity) =>
(data.value = useCardDescription(entity.supplier.nickname, entity.id));
const showEntryReport = () => {
openReport(`Entries/${route.params.id}/entry-order-pdf`);
};
</script>
<template>
@ -101,6 +107,18 @@ const setData = (entity) =>
@on-fetch="setData"
data-key="entryData"
>
<template #menu="{ entity }">
<QItem v-ripple clickable @click="showEntryReport(entity)">
<QItemSection>{{ t('Show entry report') }}</QItemSection>
</QItem>
<QItem v-ripple clickable>
<QItemSection>
<RouterLink :to="{ name: 'EntryList' }" class="color-vn-text">
{{ t('Go to module index') }}
</RouterLink>
</QItemSection>
</QItem>
</template>
<template #body="{ entity }">
<VnLv
:label="t('entry.descriptor.agency')"
@ -115,6 +133,21 @@ const setData = (entity) =>
:value="entity.travel.warehouseOut.name"
/>
</template>
<template #icons="{ entity }">
<QCardActions class="q-gutter-x-md">
<QIcon
v-if="entity.isExcludedFromAvailable"
name="vn:inventory"
color="primary"
size="xs"
>
<QTooltip>{{ t('Inventory entry') }}</QTooltip>
</QIcon>
<QIcon v-if="entity.isRaid" name="vn:web" color="primary" size="xs">
<QTooltip>{{ t('Virtual entry') }}</QTooltip>
</QIcon>
</QCardActions>
</template>
<template #actions="{ entity }">
<QCardActions>
<QBtn
@ -162,4 +195,8 @@ es:
Supplier card: Ficha del proveedor
All travels with current agency: Todos los envíos con la agencia actual
All entries with current supplier: Todas las entradas con el proveedor actual
Show entry report: Ver informe del pedido
Go to module index: Ir al índice del modulo
Inventory entry: Es inventario
Virtual entry: Es una redada
</i18n>

View File

@ -173,6 +173,31 @@ const suppliersOptions = ref([]);
/>
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<QCheckbox
:label="t('params.isBooked')"
v-model="params.isBooked"
toggle-indeterminate
/>
</QItemSection>
<QItemSection>
<QCheckbox
:label="t('params.isConfirmed')"
v-model="params.isConfirmed"
toggle-indeterminate
/>
</QItemSection>
</QItem>
<QItem>
<QItemSection>
<QCheckbox
:label="t('params.isOrdered')"
v-model="params.isOrdered"
toggle-indeterminate
/>
</QItemSection>
</QItem>
</QList>
</template>
</VnFilterPanel>
@ -200,6 +225,9 @@ en:
from: From
to: To
created: Created
isBooked: Booked
isConfirmed: Confirmed
isOrdered: Ordered
es:
params:
search: Búsqueda general
@ -212,4 +240,7 @@ es:
from: Desde
to: Hasta
created: Fecha creación
isBooked: Asentado
isConfirmed: Confirmado
isOrdered: Pedida
</i18n>

View File

@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
import { QCheckbox, QIcon } from 'quasar';
import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue';
import VnRow from 'components/ui/VnRow.vue';
import travelService from 'src/services/travel.service';
import { toDate, toCurrency } from 'src/filters';
@ -219,10 +218,7 @@ const openEntryDescriptor = () => {};
<template #body>
<QCard class="vn-one">
<VnLv
:label="t('globals.shipped')"
:value="toDate(travel.shipped)"
/>
<VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
<VnLv
:label="t('globals.wareHouseOut')"
:value="travel.warehouseOut?.name"
@ -239,10 +235,7 @@ const openEntryDescriptor = () => {};
</VnLv>
</QCard>
<QCard class="vn-one">
<VnLv
:label="t('globals.landed')"
:value="toDate(travel.landed)"
/>
<VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
<VnLv
:label="t('globals.wareHouseIn')"
:value="travel.warehouseIn?.name"