Merge branch 'dev' into 6943-fixCustomer

2024-07-23 09:47:01 +00:00 · 2024-07-23 09:47:01 +00:00 · 0cd42e6fac
parent bcde62afb5 0a431ef5cb
commit 0cd42e6fac
2 changed files with 5 additions and 1 deletions
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -289,6 +289,11 @@ defineExpose({
                        :params="params"
                        :columns="splittedColumns.columns"
                    />
+                    <slot
+                        name="moreFilterPanel"
+                        :params="params"
+                        :columns="splittedColumns.columns"
+                    />
                </template>
            </VnFilterPanel>
        </QScrollArea>
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@ -98,7 +98,6 @@ const printBuys = (rowId) => {
                ref="myEntriesRef"
                data-key="myEntriesList"
                url="Entries/filter"
-                :order="['landed DESC', 'id DESC']"
                :columns="columns"
                default-mode="card"
                auto-load