Merge branch 'master' into hotfix-irpfDaysOnWard
gitea/salix-front/pipeline/pr-master This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
dc9dad69a2
|
@ -8,7 +8,7 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
|
|||
import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
|
||||
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
|
||||
|
||||
import { toDate } from 'src/filters';
|
||||
import { dateRange, toDate } from 'src/filters';
|
||||
import { dashIfEmpty } from 'src/filters';
|
||||
import { usePrintService } from 'composables/usePrintService';
|
||||
import useNotify from 'src/composables/useNotify.js';
|
||||
|
@ -35,14 +35,17 @@ const store = arrayData.store;
|
|||
|
||||
onUnmounted(() => state.unset('SupplierConsumption'));
|
||||
const dateRanges = computed(() => {
|
||||
const { from, to } = arrayData.store?.userParams || {};
|
||||
let { from, to } = arrayData.store?.userParams || {};
|
||||
return { from, to };
|
||||
});
|
||||
|
||||
const reportParams = computed(() => ({
|
||||
const reportParams = computed(() => {
|
||||
return {
|
||||
recipientId: Number(route.params.id),
|
||||
...dateRanges.value,
|
||||
}));
|
||||
to: dateRange(dateRanges.value.to)[1],
|
||||
from: dateRange(dateRanges.value.from)[1],
|
||||
};
|
||||
});
|
||||
|
||||
async function getSupplierConsumptionData() {
|
||||
await arrayData.fetch({ append: false });
|
||||
|
|
Loading…
Reference in New Issue