From ffd7d98e9cc25cf218b2c577d0c7ef98df7cf59b Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 13 Aug 2024 17:56:07 +0200 Subject: [PATCH] feat: travel m3 --- src/components/VnTable/VnTable.vue | 20 +++++++++++ src/pages/Entry/EntryStockBought.vue | 39 +++++++++++++++++++++- src/pages/Entry/EntryStockBoughtDetail.vue | 2 +- src/pages/Travel/Card/TravelBasicData.vue | 3 ++ 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 8a20023f2..dbe5d1622 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -15,6 +15,7 @@ import VnTableChip from 'components/VnTable/VnChip.vue'; import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue'; import VnLv from 'components/ui/VnLv.vue'; import VnTableOrder from 'src/components/VnTable/VnOrder.vue'; +import item from 'src/router/modules/item'; const $props = defineProps({ columns: { @@ -609,6 +610,25 @@ defineExpose({ + diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index e0063bb62..12fc96214 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -5,6 +5,10 @@ import { useState } from 'src/composables/useState'; import { useQuasar } from 'quasar'; import VnTable from 'components/VnTable/VnTable.vue'; +import VnRow from 'src/components/ui/VnRow.vue'; +import VnInput from 'src/components/common/VnInput.vue'; +import VnLv from 'src/components/ui/VnLv.vue'; +import FetchData from 'src/components/FetchData.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue'; @@ -37,6 +41,7 @@ const columns = [ columnFilter: false, create: true, component: 'number', + summation: true, }, { align: 'left', @@ -61,6 +66,7 @@ const columns = [ label: t('Bought'), name: 'bought', columnFilter: false, + summation: true, }, { align: 'left', @@ -92,6 +98,21 @@ const columns = [ ], }, ]; +function getFilter(dated = Date.vnNow()) { + console.log('dated: ', new Date(dated * 1000)); + return { + fields: ['id', 'm3'], + where: { dated }, + include: [ + { + relation: 'warehouseIn', + where: { code: 'vnh' }, + }, + ], + }; +} +const travel = ref(); +const fetchDataRef = ref();