Merge branch 'dev' into pre-production

src/views/distribution/reservation/reservationAddFrom.vue

@@ -2485,6 +2485,7 @@ export default {
           inventoryIds.push(item.id);
           inventoryList.push(item);
         });
+        if (!operation) return;
         orderIds.join(',');
         inventoryIds.join(',');
         this.form.stockArticleIds = orderIds.toString();
@@ -2535,6 +2536,8 @@ export default {
           operation = false;
           return;
         }
+        if (!operation) return;
+
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
         if (this.reservationId) {
@@ -3205,6 +3208,7 @@ export default {
           this.orderData = reservation.stockArticleList;
           this.inventoryData = reservation.inventoryList;
           this.inventoryData.forEach(item => {
+            item.quantityOccupied -= item.reservationNum;
             item.applyNum = item.quantityStock - item.quantityOccupied;
           });
           this.form.deliveryType = reservation.deliveryType;

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -1482,6 +1482,7 @@ export default {
         console.log('this.data------------>', this.data);
         if (!this.deliveryListId) {
           data.reservationIds = this.reservationIds;
+          data.reservationIds = this.reservationData.map(val => val.id).join(',');
           if (this.reservationData.length < 1) {
             this.$message({
               message: '无效的配送计划',