diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 9ab080276..d6117a117 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -54,8 +54,8 @@ const $props = defineProps({ default: true, }, bottom: { - type: Object, - default: null, + type: Boolean, + default: false, }, cardClass: { type: String, @@ -575,29 +575,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) { /> - +
+ + + {{ createForm.title }} + +
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index 4e90245d6..92babfcc6 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -63,6 +63,10 @@ const props = defineProps({ type: Function, default: undefined, }, + searchRemoveParams: { + type: Boolean, + default: true, + }, }); const searchText = ref(); @@ -101,12 +105,18 @@ async function search() { const filter = { params: { - ...Object.fromEntries(staticParams), search: searchText.value, }, - ...{ filter: props.filter }, + filter: props.filter, }; + if (!props.searchRemoveParams || !searchText.value) { + filter.params = { + ...Object.fromEntries(staticParams), + search: searchText.value, + }; + } + if (props.whereFilter) { filter.filter = { where: props.whereFilter(searchText.value), diff --git a/src/css/app.scss b/src/css/app.scss index abb388be9..fa798d543 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -149,7 +149,8 @@ select:-webkit-autofill { .q-card, .q-table, .q-table__bottom, -.q-drawer { +.q-drawer, +.bottomButton { background-color: var(--vn-section-color); } diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue index a75dfa1b2..665e136e4 100644 --- a/src/pages/Customer/components/CustomerSamplesCreate.vue +++ b/src/pages/Customer/components/CustomerSamplesCreate.vue @@ -107,7 +107,7 @@ const setParams = (params) => { const getPreview = async () => { const params = { - recipientId: entityId, + recipientId: entityId.value, }; const validationMessage = validateMessage(); if (validationMessage) return notify(t(validationMessage), 'negative'); diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue index 26133a7eb..2ede429a0 100644 --- a/src/pages/Order/Card/OrderCatalog.vue +++ b/src/pages/Order/Card/OrderCatalog.vue @@ -1,7 +1,7 @@