From 1f9aef96cab35973e5623f446057c3e4a91edd6e Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 7 Feb 2024 14:42:51 +0100 Subject: [PATCH 1/5] fix: refs #6657 full-width --- src/pages/Claim/Card/ClaimSummaryDialog.vue | 2 +- src/pages/Customer/Card/CustomerSummaryDialog.vue | 2 +- src/pages/Entry/Card/EntrySummaryDialog.vue | 2 +- src/pages/InvoiceIn/Card/InvoiceInSummaryDialog.vue | 2 +- src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue | 2 +- src/pages/Order/Card/OrderSummaryDialog.vue | 4 ++-- src/pages/Route/Card/RouteSummaryDialog.vue | 2 +- src/pages/Shelving/Card/ShelvingSummaryDialog.vue | 4 ++-- src/pages/Supplier/Card/SupplierSummaryDialog.vue | 2 +- src/pages/Ticket/Card/TicketSummaryDialog.vue | 2 +- src/pages/Travel/Card/TravelSummaryDialog.vue | 2 +- src/pages/Worker/Card/WorkerSummaryDialog.vue | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/Claim/Card/ClaimSummaryDialog.vue b/src/pages/Claim/Card/ClaimSummaryDialog.vue index 5a2b965eb0..78673f54db 100644 --- a/src/pages/Claim/Card/ClaimSummaryDialog.vue +++ b/src/pages/Claim/Card/ClaimSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Customer/Card/CustomerSummaryDialog.vue b/src/pages/Customer/Card/CustomerSummaryDialog.vue index d9571ac54b..b199177121 100644 --- a/src/pages/Customer/Card/CustomerSummaryDialog.vue +++ b/src/pages/Customer/Card/CustomerSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Entry/Card/EntrySummaryDialog.vue b/src/pages/Entry/Card/EntrySummaryDialog.vue index 527421ce20..6bf65f0ef0 100644 --- a/src/pages/Entry/Card/EntrySummaryDialog.vue +++ b/src/pages/Entry/Card/EntrySummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummaryDialog.vue b/src/pages/InvoiceIn/Card/InvoiceInSummaryDialog.vue index 8657bf6ac5..f0c37f8e32 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummaryDialog.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummaryDialog.vue @@ -16,7 +16,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue index 76283ff109..89ea808e4a 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Order/Card/OrderSummaryDialog.vue b/src/pages/Order/Card/OrderSummaryDialog.vue index ebe891f4a9..4ba02f21db 100644 --- a/src/pages/Order/Card/OrderSummaryDialog.vue +++ b/src/pages/Order/Card/OrderSummaryDialog.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/Route/Card/RouteSummaryDialog.vue b/src/pages/Route/Card/RouteSummaryDialog.vue index 4a943a93a1..00f0e8e182 100644 --- a/src/pages/Route/Card/RouteSummaryDialog.vue +++ b/src/pages/Route/Card/RouteSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Shelving/Card/ShelvingSummaryDialog.vue b/src/pages/Shelving/Card/ShelvingSummaryDialog.vue index 783e473956..8416a080e9 100644 --- a/src/pages/Shelving/Card/ShelvingSummaryDialog.vue +++ b/src/pages/Shelving/Card/ShelvingSummaryDialog.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/Supplier/Card/SupplierSummaryDialog.vue b/src/pages/Supplier/Card/SupplierSummaryDialog.vue index 6353caa382..0bbcb11982 100644 --- a/src/pages/Supplier/Card/SupplierSummaryDialog.vue +++ b/src/pages/Supplier/Card/SupplierSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Ticket/Card/TicketSummaryDialog.vue b/src/pages/Ticket/Card/TicketSummaryDialog.vue index 11e12c8a99..57df6c8070 100644 --- a/src/pages/Ticket/Card/TicketSummaryDialog.vue +++ b/src/pages/Ticket/Card/TicketSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Travel/Card/TravelSummaryDialog.vue b/src/pages/Travel/Card/TravelSummaryDialog.vue index 8351d6e5be..fe9d5e95f5 100644 --- a/src/pages/Travel/Card/TravelSummaryDialog.vue +++ b/src/pages/Travel/Card/TravelSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); diff --git a/src/pages/Worker/Card/WorkerSummaryDialog.vue b/src/pages/Worker/Card/WorkerSummaryDialog.vue index 59ea702e0f..700bd5a396 100644 --- a/src/pages/Worker/Card/WorkerSummaryDialog.vue +++ b/src/pages/Worker/Card/WorkerSummaryDialog.vue @@ -15,7 +15,7 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent(); From 78b484baeba93272d245de3c10d4984d85cdd892 Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 8 Feb 2024 09:54:17 +0100 Subject: [PATCH 2/5] fix(VnSelecFilter) filter --- src/components/common/VnSelectFilter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue index 31b0f16ad7..4bca5a9597 100644 --- a/src/components/common/VnSelectFilter.vue +++ b/src/components/common/VnSelectFilter.vue @@ -119,7 +119,7 @@ async function filterHandler(val, update) { myOptions.value = await fetchFilter(val); return; } - myOptions.value = await filter(val, myOptionsOriginal.value); + myOptions.value = filter(val, myOptionsOriginal.value); }, (ref) => { if (val !== '' && ref.options.length > 0) { From 481b022786668d57cadc209ed3b1d6517625d3bb Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 8 Feb 2024 10:10:43 +0100 Subject: [PATCH 3/5] fix(VnSelecFilter) filter --- src/components/common/VnSelectFilter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue index 4bca5a9597..659f1c3bd6 100644 --- a/src/components/common/VnSelectFilter.vue +++ b/src/components/common/VnSelectFilter.vue @@ -79,7 +79,7 @@ onMounted(() => { if ($props.url && $props.modelValue) fetchFilter($props.modelValue); }); -async function filter(val, options) { +function filter(val, options) { const search = val.toString().toLowerCase(); if (!search) return options; From 2ac20d5f15dc8794a0ddbc945a3bc771ca9a3f28 Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 8 Feb 2024 12:11:12 +0100 Subject: [PATCH 4/5] feat: refs #6657 create component & composable --- src/components/common/VnSummaryDialog.vue | 23 +++++++++++++++++++ src/composables/useSummaryDialog.js | 15 ++++++++++++ src/pages/Claim/ClaimList.vue | 12 +++++----- src/pages/Customer/CustomerList.vue | 17 ++++---------- .../CustomerExtendedListActions.vue | 19 ++++----------- src/pages/Entry/EntryList.vue | 19 ++++----------- src/pages/InvoiceIn/InvoiceInList.vue | 17 ++++---------- src/pages/InvoiceOut/InvoiceOutList.vue | 17 ++++---------- src/pages/Order/OrderList.vue | 17 ++++---------- src/pages/Shelving/ShelvingList.vue | 17 ++++---------- src/pages/Supplier/SupplierList.vue | 19 ++++----------- src/pages/Ticket/TicketList.vue | 17 ++++---------- src/pages/Travel/TravelList.vue | 19 ++++----------- src/pages/Worker/WorkerList.vue | 17 ++++---------- test/cypress/integration/vnLog.spec.js | 2 +- 15 files changed, 90 insertions(+), 157 deletions(-) create mode 100644 src/components/common/VnSummaryDialog.vue create mode 100644 src/composables/useSummaryDialog.js diff --git a/src/components/common/VnSummaryDialog.vue b/src/components/common/VnSummaryDialog.vue new file mode 100644 index 0000000000..08fc8870dc --- /dev/null +++ b/src/components/common/VnSummaryDialog.vue @@ -0,0 +1,23 @@ + + diff --git a/src/composables/useSummaryDialog.js b/src/composables/useSummaryDialog.js new file mode 100644 index 0000000000..7d431129bb --- /dev/null +++ b/src/composables/useSummaryDialog.js @@ -0,0 +1,15 @@ +import VnSummaryDialog from 'src/components/common/VnSummaryDialog.vue'; +import { useQuasar } from 'quasar'; + +export function useSummaryDialog() { + const quasar = useQuasar(); + + function viewSummary(id, summary) { + quasar.dialog({ + component: VnSummaryDialog, + componentProps: { id, summary }, + }); + } + + return { viewSummary }; +} diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index 1b5979f5ab..4929633993 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -1,7 +1,6 @@