Merge branch 'dev' into pre-production

src/views/mail/order/add.vue

@@ -604,7 +604,7 @@
 
 <script>
   import {
-    autonomouslySave,
+    add,
     update,
     remove,
     getReservationInfo,
@@ -2483,6 +2483,7 @@
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
         if (this.reservationId) {
+          this.form.warehouseId = this.warehouseId;
           this.form.id = this.reservationId;
           update(this.form).then(() => {
             this.$router.go(-1);
@@ -2492,6 +2493,7 @@
             });
           });
         } else {
+          this.form.warehouseId = this.warehouseId;
           add(this.form).then(() => {
             this.$message({
               type: 'success',