refs #6897 fix filters, right filters

src/pages/Entry/EntryLatestBuys.vue

@@ -2,8 +2,9 @@
 import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
@@ -62,8 +63,6 @@ const arrayData = useArrayData('EntryLatestBuys', {
     order: ['itemFk DESC'],
     exprBuilder: exprBuilder,
 });
-const store = arrayData.store;
-const rows = computed(() => store.data);
 const rowsSelected = ref([]);
 
 const columns = [
@@ -73,14 +72,14 @@ const columns = [
         name: 'image',
         columnField: {
             component: VnImg,
-            attrs: (id) =>  {
+            attrs: (id) => {
                 return {
                     id,
                     width: '50px',
-                }
+                };
             },
         },
-        columnFilter: false
+        columnFilter: false,
     },
     {
         align: 'left',
@@ -107,31 +106,26 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.description'),
         name: 'description',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.size'),
         name: 'size',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.tags'),
         name: 'tags',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.type'),
         name: 'type',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
         name: 'intrastat',
-
     },
     {
         align: 'left',
@@ -139,7 +133,6 @@ const columns = [
         name: 'origin',
     },
     {
-
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
@@ -148,80 +141,76 @@ const columns = [
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.isActive'),
         name: 'isActive',
-
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.family'),
-        name: 'family'
-
+        name: 'family',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.entryFk'),
-        name: 'entryFk'
-
+        name: 'entryFk',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
-        name: 'buyingValue'
-
+        name: 'buyingValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.freightValue'),
-        name: 'freightValue'
+        name: 'freightValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.comissionValue'),
-        name: 'comissionValue'
+        name: 'comissionValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
-        name: 'packageValue'
+        name: 'packageValue',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.isIgnored'),
-        name: 'isIgnored'
+        name: 'isIgnored',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.price2'),
-        name: 'price2'
+        name: 'price2',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.price3'),
-        name: 'price3'
+        name: 'price3',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.minPrice'),
-        name: 'minPrice'
+        name: 'minPrice',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.ektFk'),
-        name: 'ektFk'
+        name: 'ektFk',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.weight'),
-        name: 'weight'
+        name: 'weight',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
-        name: 'packagingFk'
+        name: 'packagingFk',
     },
     {
         align: 'left',
         label: t('entry.latestBuys.tableVisibleColumns.packingOut'),
-        name: 'packingOut'
+        name: 'packingOut',
     },
     {
         align: 'left',
@@ -231,7 +220,7 @@ const columns = [
         columnField: {
             component: null,
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing))
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
 
@@ -280,7 +269,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <VnSubToolbar/>
+    <RightMenu>
+        <template #right-panel>
+            <EntryLatestBuysFilter data-key="LatestBuys" />
+        </template>
+    </RightMenu>
+    <VnSubToolbar />
     <VnTable
         ref="tableRef"
         data-key="LatestBuys"