Merge branch 'ww' into otherChange

src/views/warehouse/stockOrderSearch.vue

@@ -628,7 +628,7 @@ export default {
                 startTime: "",
                 endTime: "",
                 page: 1,
-                limit: 10
+                limit: 10,
             };
             this.getList();
             this.haveDistributionVisible = true;
@@ -1039,6 +1039,8 @@ export default {
         },
 
         subInvChange() {
+            this.actDateRange=null;
+            this.query.locStorageCode='';
             this.getBusType();
         },