src/pages/Item/Card/ItemLastEntries.vue

@@ -36,18 +36,7 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const where = {
+let arrayData = useArrayData('ItemLastEntries');
-    itemFk: route.params.id,
-};
-
-const arrayData = useArrayData('ItemLastEntries', {
-    url: 'Items/lastEntriesFilter',
-    order: ['landed DESC', 'buyFk DESC'],
-    exprBuilder: exprBuilder,
-    userFilter: {
-        where: where,
-    },
-});
 const itemLastEntries = ref([]);
 
 const columns = computed(() => [
@@ -161,25 +150,51 @@ const getDate = (date, type) => {
 };
 
 const updateFilter = async () => {
-    let filter;
+    let landed;
-    if (!from.value && to.value) filter = { lte: to.value };
+    if (!from.value && to.value) landed = { lte: to.value };
-    else if (from.value && !to.value) filter = { gte: from.value };
+    else if (from.value && !to.value) landed = { gte: from.value };
-    else if (from.value && to.value) filter = { between: [from.value, to.value] };
+    else if (from.value && to.value) landed = { between: [from.value, to.value] };
-
-    const userFilter = arrayData.store.userFilter.where;
-
-    userFilter.landed = filter;
 
+    arrayData.store.filter.where.landed = landed;
     await fetchItemLastEntries();
 };
 
 onMounted(async () => {
-    const _from = Date.vnNew();
+    const landed = arrayData.store.filter.where?.landed;
-    _from.setDate(_from.getDate() - 75);
+    arrayData = useArrayData('ItemLastEntries', {
-    from.value = getDate(_from, 'from');
+        url: 'Items/lastEntriesFilter',
-    const _to = Date.vnNew();
+        order: ['landed DESC', 'buyFk DESC'],
-    _to.setDate(_to.getDate() + 10);
+        exprBuilder: exprBuilder,
-    to.value = getDate(_to, 'to');
+        filter: {
+            where: {
+                itemFk: route.params.id,
+                landed,
+            },
+        },
+    });
+
+    if (landed) {
+        const key = Object.keys(landed)[0];
+        switch (key) {
+            case 'gte':
+                from.value = landed.gte;
+                break;
+            case 'lte':
+                to.value = landed.lte;
+                break;
+            case 'between':
+                from.value = landed.between[0];
+                to.value = landed.between[1];
+                break;
+        }
+    } else {
+        const _from = Date.vnNew();
+        _from.setDate(_from.getDate() - 75);
+        from.value = getDate(_from, 'from');
+        const _to = Date.vnNew();
+        _to.setDate(_to.getDate() + 10);
+        to.value = getDate(_to, 'to');
+    }
 
     updateFilter();