From 43c14c902f81e7beaaa07e79751f46bdbd93805b Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 25 Dec 2023 19:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9B=B6=E6=8B=85=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/reservation/reservationAddFrom.vue | 4 ++++
 src/views/distribution/turndelivery/deliveryMarket.vue    | 1 +
 vite.config.js                                            | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 1f9aa830..f66e6e18 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/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;
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 37c352d9..84e5ec4c 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/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: '无效的配送计划',
diff --git a/vite.config.js b/vite.config.js
index 187bfd53..768ed4ed 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -25,14 +25,14 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
-          target: 'http://192.168.6.148:9777',
-          // target: 'http://192.168.6.116:8777',  
+          // target: 'http://192.168.6.148:9777',
+          // target: 'http://192.168.10.57:13000',
           // tjj
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',
           // target: 'http://h5uapi.huitongys.com',
-          // target: 'http://test.api.huitongys.com',
+          target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },