Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/DialogCreateOrder.vue

@@ -1466,12 +1466,13 @@ export default {
       if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
         this.checkPreInArray = this.orderFormData.split(",");
       }
+      this.findMethod(this.orderFormData.fromCorp);
       this.curAction = {}
       this.refreshCodesPanel();
       //加载选择框候选数据
       this.findInvListByUser();
       this.initBusType();
-      this.findMethod(this.orderFormData.fromCorp);
+     // this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
     } else {
       //新增页面