Merge branch 'dev' into pre-production

src/option/warehouse/warehouseWarehousingDetail.js

@@ -119,7 +119,7 @@ export default {
       search: true,
     },
     {
-      label: "入库数量",
+      label: "预计入库数量",
       prop: "createInventory",
       search: true,
     },

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -431,7 +431,6 @@ export default {
   },
   mounted () {
     this.init();
-    this.onLoad(this.page);
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
@@ -645,6 +644,7 @@ export default {
           return item
         });
       });
+      this.onLoad(this.page);
 
     },
     searchHide () {