small improvements
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:
parent
087d22e77d
commit
018f251f3d
|
@ -1093,6 +1093,7 @@ export default {
|
||||||
deleteTravel: 'Delete travel',
|
deleteTravel: 'Delete travel',
|
||||||
AddEntry: 'Add entry',
|
AddEntry: 'Add entry',
|
||||||
thermographs: 'Thermographs',
|
thermographs: 'Thermographs',
|
||||||
|
hb: 'HB',
|
||||||
},
|
},
|
||||||
variables: {
|
variables: {
|
||||||
search: 'Id/Reference',
|
search: 'Id/Reference',
|
||||||
|
|
|
@ -1093,6 +1093,7 @@ export default {
|
||||||
deleteTravel: 'Eliminar envío',
|
deleteTravel: 'Eliminar envío',
|
||||||
AddEntry: 'Añadir entrada',
|
AddEntry: 'Añadir entrada',
|
||||||
thermographs: 'Termógrafos',
|
thermographs: 'Termógrafos',
|
||||||
|
hb: 'HB',
|
||||||
},
|
},
|
||||||
variables: {
|
variables: {
|
||||||
search: 'Id/Referencia',
|
search: 'Id/Referencia',
|
||||||
|
|
|
@ -44,14 +44,14 @@ const entriesTableColumns = computed(() => {
|
||||||
label: t('travel.summary.confirmed'),
|
label: t('travel.summary.confirmed'),
|
||||||
field: 'isConfirmed',
|
field: 'isConfirmed',
|
||||||
name: 'isConfirmed',
|
name: 'isConfirmed',
|
||||||
align: 'center',
|
align: 'left',
|
||||||
showValue: false,
|
showValue: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('travel.summary.entryId'),
|
label: t('travel.summary.entryId'),
|
||||||
field: 'id',
|
field: 'id',
|
||||||
name: 'id',
|
name: 'id',
|
||||||
align: 'center',
|
align: 'left',
|
||||||
showValue: false,
|
showValue: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -68,6 +68,13 @@ const entriesTableColumns = computed(() => {
|
||||||
align: 'left',
|
align: 'left',
|
||||||
showValue: true,
|
showValue: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: t('travel.summary.hb'),
|
||||||
|
field: 'hb',
|
||||||
|
name: 'hb',
|
||||||
|
align: 'left',
|
||||||
|
showValue: true,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: t('travel.summary.freight'),
|
label: t('travel.summary.freight'),
|
||||||
field: 'freightValue',
|
field: 'freightValue',
|
||||||
|
@ -151,27 +158,33 @@ const entriesTableRows = computed(() => {
|
||||||
return entries.value;
|
return entries.value;
|
||||||
});
|
});
|
||||||
|
|
||||||
const entriesTotalHb = computed(() => {
|
const entriesTotalHb = computed(() =>
|
||||||
return entriesTableRows.value.reduce((acc, { hb }) => acc + hb, 0);
|
entriesTableRows.value.reduce((acc, { hb }) => acc + hb, 0)
|
||||||
});
|
);
|
||||||
|
|
||||||
const entriesTotalFreight = computed(() => {
|
const entriesTotalFreight = computed(() =>
|
||||||
return toCurrency(
|
toCurrency(
|
||||||
entriesTableRows.value.reduce((acc, { freightValue }) => acc + freightValue, 0)
|
entriesTableRows.value.reduce((acc, { freightValue }) => acc + freightValue, 0)
|
||||||
);
|
)
|
||||||
});
|
);
|
||||||
|
|
||||||
const entriesTotalCc = computed(() => {
|
const entriesTotalPackageValue = computed(() =>
|
||||||
return entriesTableRows.value.reduce((acc, { cc }) => acc + cc, 0);
|
toCurrency(
|
||||||
});
|
entriesTableRows.value.reduce((acc, { packageValue }) => acc + packageValue, 0)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
const entriesTotalPallet = computed(() => {
|
const entriesTotalCc = computed(() =>
|
||||||
return entriesTableRows.value.reduce((acc, { pallet }) => acc + pallet, 0);
|
entriesTableRows.value.reduce((acc, { cc }) => acc + cc, 0)
|
||||||
});
|
);
|
||||||
|
|
||||||
const entriesTotalM3 = computed(() => {
|
const entriesTotalPallet = computed(() =>
|
||||||
return entriesTableRows.value.reduce((acc, { m3 }) => acc + m3, 0);
|
entriesTableRows.value.reduce((acc, { pallet }) => acc + pallet, 0)
|
||||||
});
|
);
|
||||||
|
|
||||||
|
const entriesTotalM3 = computed(() =>
|
||||||
|
entriesTableRows.value.reduce((acc, { m3 }) => acc + m3, 0)
|
||||||
|
);
|
||||||
|
|
||||||
const getTravelEntries = async (id) => {
|
const getTravelEntries = async (id) => {
|
||||||
try {
|
try {
|
||||||
|
@ -320,7 +333,7 @@ async function setTravelData(travelData) {
|
||||||
</template>
|
</template>
|
||||||
<template #body-cell-id="{ col, value }">
|
<template #body-cell-id="{ col, value }">
|
||||||
<QTd>
|
<QTd>
|
||||||
<QBtn v-if="col.name === 'id'" flat color="blue" dense>
|
<QBtn v-if="col.name === 'id'" flat color="blue">
|
||||||
{{ value }}
|
{{ value }}
|
||||||
<EntryDescriptorProxy :id="value" />
|
<EntryDescriptorProxy :id="value" />
|
||||||
</QBtn>
|
</QBtn>
|
||||||
|
@ -340,6 +353,7 @@ async function setTravelData(travelData) {
|
||||||
<QTd></QTd>
|
<QTd></QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotalHb }}</QTd>
|
<QTd class="text-bold">{{ entriesTotalHb }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotalFreight }}</QTd>
|
<QTd class="text-bold">{{ entriesTotalFreight }}</QTd>
|
||||||
|
<QTd class="text-bold">{{ entriesTotalPackageValue }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotalCc }}</QTd>
|
<QTd class="text-bold">{{ entriesTotalCc }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotalPallet }}</QTd>
|
<QTd class="text-bold">{{ entriesTotalPallet }}</QTd>
|
||||||
<QTd class="text-bold">{{ entriesTotalM3 }}</QTd>
|
<QTd class="text-bold">{{ entriesTotalM3 }}</QTd>
|
||||||
|
|
|
@ -19,6 +19,7 @@ const router = useRouter();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
|
|
||||||
|
const thermographPaginateRef = ref(null);
|
||||||
const warehouses = ref([]);
|
const warehouses = ref([]);
|
||||||
|
|
||||||
const thermographFilter = {
|
const thermographFilter = {
|
||||||
|
@ -58,7 +59,7 @@ const TableColumns = computed(() => {
|
||||||
name: 'destination',
|
name: 'destination',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
format: (val) =>
|
format: (val) =>
|
||||||
warehouses.value.find((warehouse) => warehouse.id === val).name,
|
warehouses.value.find((warehouse) => warehouse.id === val)?.name,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: t('travel.thermographs.created'),
|
label: t('travel.thermographs.created'),
|
||||||
|
@ -114,7 +115,12 @@ const redirectToThermographForm = (action, { id = null }) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const removeThermograph = async (id) => {
|
const removeThermograph = async (id) => {
|
||||||
await axios.delete('Travels/deleteThermograph', { id });
|
try {
|
||||||
|
await axios.delete(`Travels/deleteThermograph?id=${id}`);
|
||||||
|
await thermographPaginateRef.value.fetch();
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error removing termograph');
|
||||||
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -127,6 +133,7 @@ const removeThermograph = async (id) => {
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
|
ref="thermographPaginateRef"
|
||||||
data-key="TravelThermographs"
|
data-key="TravelThermographs"
|
||||||
url="TravelThermographs"
|
url="TravelThermographs"
|
||||||
:filter="thermographFilter"
|
:filter="thermographFilter"
|
||||||
|
|
Loading…
Reference in New Issue