Merge branch 'ww' into otherChange

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;

src/views/warehouse/AdditionalOrder.vue

@@ -355,6 +355,7 @@ export default {
                 limit: 20,
             };
             this.getList();
+            this.filterQuery.page=null;
         },
         onSubmit() {
             this.loading = true;