Merge branch 'ww' into otherChange

2 years ago · 3901169861
parent c8dc99d975 2c8cdeeda2
commit 3901169861
2 changed files with 4 additions and 1 deletions
--- a/src/views/inventory/invPreProducts.vue
+++ b/src/views/inventory/invPreProducts.vue
@ -211,10 +211,12 @@ export default {
                relIdFk: null,
                batchNo: null,
                customerId: null,
-                page: 1, unitFk: null,
+                page: 1,
+                unitFk: null,
                limit: 20,
            };
            this.getList();
+            this.filterQuery.page=null;
        },
        onSubmit() {
            this.loading = true;
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@ -355,6 +355,7 @@ export default {
                limit: 20,
            };
            this.getList();
+            this.filterQuery.page=null;
        },
        onSubmit() {
            this.loading = true;