From 641a25097d874069ece59949e24e32ede213b0fb Mon Sep 17 00:00:00 2001 From: jgallego Date: Thu, 3 Oct 2024 08:30:19 +0200 Subject: [PATCH 01/16] fix: refundInvoice --- src/components/RefundInvoiceForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue index c21c892dd..9d9f0cff1 100644 --- a/src/components/RefundInvoiceForm.vue +++ b/src/components/RefundInvoiceForm.vue @@ -24,9 +24,9 @@ const { notify } = useNotify(); const rectificativeTypeOptions = ref([]); const siiTypeInvoiceOutsOptions = ref([]); -const inheritWarehouse = ref(true); const invoiceParams = reactive({ id: $props.invoiceOutData?.id, + inheritWarehouse: true, }); const invoiceCorrectionTypesOptions = ref([]); @@ -138,7 +138,7 @@ const refund = async () => {
{{ t('Inherit warehouse tooltip') }} From 530ed4b716b55aa2ddb5365baddadc5694f2281f Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 4 Oct 2024 08:48:36 +0200 Subject: [PATCH 02/16] refs #7355 fix searchbar --- src/pages/Account/AccountList.vue | 25 +++++++++---------------- src/pages/Account/Card/AccountCard.vue | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue index d698596b9..d1240f7a6 100644 --- a/src/pages/Account/AccountList.vue +++ b/src/pages/Account/AccountList.vue @@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; import AccountSummary from './Card/AccountSummary.vue'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; - +import AccountFilter from './AccountFilter.vue'; +import RightMenu from 'src/components/common/RightMenu.vue'; const { t } = useI18n(); const { viewSummary } = useSummaryDialog(); const tableRef = ref(); @@ -18,14 +19,6 @@ const columns = computed(() => [ isId: true, field: 'id', cardVisible: true, - columnFilter: { - component: 'select', - name: 'search', - attrs: { - url: 'VnUsers/preview', - fields: ['id', 'name'], - }, - }, }, { align: 'left', @@ -36,9 +29,6 @@ const columns = computed(() => [ columnField: { component: null, }, - columnFilter: { - inWhere: true, - }, cardVisible: true, create: true, }, @@ -50,9 +40,6 @@ const columns = computed(() => [ columnField: { component: null, }, - columnFilter: { - inWhere: true, - }, cardVisible: true, create: true, }, @@ -105,7 +92,11 @@ const exprBuilder = (param, value) => { :label="t('account.search')" :info="t('account.searchInfo')" /> - + + + { default-mode="table" redirect="account" :use-model="true" + :right-search="false" + auto-load /> diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue index 67fa15898..119a7fd07 100644 --- a/src/pages/Account/Card/AccountCard.vue +++ b/src/pages/Account/Card/AccountCard.vue @@ -10,7 +10,7 @@ const { t } = useI18n(); Date: Fri, 4 Oct 2024 12:34:37 +0200 Subject: [PATCH 04/16] feat: added click and transfer tickets and deleted useless code --- src/pages/Ticket/Card/TicketTransfer.vue | 38 ++++++-------------- src/pages/Ticket/Card/TicketTransferForm.vue | 7 ++-- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue index 1944b80f4..e1a011a84 100644 --- a/src/pages/Ticket/Card/TicketTransfer.vue +++ b/src/pages/Ticket/Card/TicketTransfer.vue @@ -1,13 +1,11 @@