fix: update default DMS code and improve filter handling in various components #1637
|
@ -15,7 +15,7 @@ const editDownloadDisabled = ref(false);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
defaultDmsCode: {
|
defaultDmsCode: {
|
||||||
type: String,
|
type: String,
|
||||||
default: 'InvoiceIn',
|
default: 'invoiceIn',
|
||||||
},
|
},
|
||||||
disable: {
|
disable: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
|
|
@ -648,7 +648,7 @@ onMounted(() => {
|
||||||
:url="`Entries/${entityId}/getBuyList`"
|
:url="`Entries/${entityId}/getBuyList`"
|
||||||
search-url="EntryBuys"
|
search-url="EntryBuys"
|
||||||
save-url="Buys/crud"
|
save-url="Buys/crud"
|
||||||
:filter="filter"
|
:filter="editableMode ? filter : {}"
|
||||||
:disable-option="{ card: true }"
|
:disable-option="{ card: true }"
|
||||||
v-model:selected="selectedRows"
|
v-model:selected="selectedRows"
|
||||||
@on-fetch="() => footerFetchDataRef.fetch()"
|
@on-fetch="() => footerFetchDataRef.fetch()"
|
||||||
|
|
|
@ -147,7 +147,7 @@ async function deleteEntry() {
|
||||||
<template>
|
<template>
|
||||||
<CardDescriptor
|
<CardDescriptor
|
||||||
:url="`Entries/${entityId}`"
|
:url="`Entries/${entityId}`"
|
||||||
:user-filter="entryFilter"
|
:filter="entryFilter"
|
||||||
title="supplier.nickname"
|
title="supplier.nickname"
|
||||||
data-key="Entry"
|
data-key="Entry"
|
||||||
width="lg-width"
|
width="lg-width"
|
||||||
|
|
|
@ -116,6 +116,7 @@ const filter = computed(() => ({
|
||||||
hour: 0,
|
hour: 0,
|
||||||
minute: 0,
|
minute: 0,
|
||||||
second: 0,
|
second: 0,
|
||||||
|
milliseconds: 0,
|
||||||
}),
|
}),
|
||||||
m3: { neq: null },
|
m3: { neq: null },
|
||||||
},
|
},
|
||||||
|
|
|
@ -199,7 +199,11 @@ const entriesTotals = computed(() => {
|
||||||
|
|
||||||
entriesTableRows.value.forEach((row) => {
|
entriesTableRows.value.forEach((row) => {
|
||||||
for (const key in totals) {
|
for (const key in totals) {
|
||||||
totals[key] += row[key] || 0;
|
if (key === 'cc') {
|
||||||
|
totals[key] += Math.ceil(row[key] || 0);
|
||||||
|
} else {
|
||||||
|
totals[key] += row[key] || 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -337,9 +341,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
|
||||||
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
|
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
|
||||||
<VnLv
|
<VnLv
|
||||||
:label="t('travel.summary.availabled')"
|
:label="t('travel.summary.availabled')"
|
||||||
:value="
|
:value="dashIfEmpty(toDateTimeFormat(travel.availabled))"
|
||||||
dashIfEmpty(toDateTimeFormat(travel.availabled))
|
|
||||||
"
|
|
||||||
/>
|
/>
|
||||||
</QCard>
|
</QCard>
|
||||||
<QCard class="full-width">
|
<QCard class="full-width">
|
||||||
|
|
|
@ -89,7 +89,7 @@ defineExpose({ states });
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('travel.warehouseOut')"
|
:label="t('travel.warehouseOut')"
|
||||||
v-model="params.warehouseOut"
|
v-model="params.warehouseOutFk"
|
||||||
@update:model-value="searchFn()"
|
@update:model-value="searchFn()"
|
||||||
url="warehouses"
|
url="warehouses"
|
||||||
:use-like="false"
|
:use-like="false"
|
||||||
|
@ -140,6 +140,7 @@ en:
|
||||||
ref: Reference
|
ref: Reference
|
||||||
agency: Agency
|
agency: Agency
|
||||||
warehouseInFk: Warehouse In
|
warehouseInFk: Warehouse In
|
||||||
|
warehouseOutFk: Warehouse Out
|
||||||
shipped: Shipped
|
shipped: Shipped
|
||||||
shipmentHour: Shipment Hour
|
shipmentHour: Shipment Hour
|
||||||
warehouseOut: Warehouse Out
|
warehouseOut: Warehouse Out
|
||||||
|
@ -153,6 +154,7 @@ es:
|
||||||
ref: Referencia
|
ref: Referencia
|
||||||
agency: Agencia
|
agency: Agencia
|
||||||
warehouseInFk: Alm.Entrada
|
warehouseInFk: Alm.Entrada
|
||||||
|
warehouseOutFk: Alm.Salida
|
||||||
shipped: F.Envío
|
shipped: F.Envío
|
||||||
shipmentHour: Hora de envío
|
shipmentHour: Hora de envío
|
||||||
warehouseOut: Alm.Salida
|
warehouseOut: Alm.Salida
|
||||||
|
|
Loading…
Reference in New Issue