From c1dc28a9e6bb0643c9b6525e49e61a343fbf504c Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 18 Oct 2023 23:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A2=84=E7=BA=A6=E5=B8=82?=
 =?UTF-8?q?=E9=85=8D=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/reservationAddFrom.vue        | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 2c27db0e..87d57335 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -367,7 +367,7 @@
                     <el-button v-if="!isrReservationEntry" type="primary" icon="el-icon-circle-close" @click="onSubmitUpdateZeroOrder"
                     >修改(零担订单)
                     </el-button
-                    >
+                    >loading
                     <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
                     >提交(零担订单)
                     </el-button
@@ -2657,7 +2657,7 @@
        * 增加订单提交
        */
       onSubmitOrder() {
-        console.log('-------------》', this.orderList);
+        console.log('orderList-------------》', this.orderList);
         if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!')
         const list = this.orderList;
         let _name = list[0].customerName;
@@ -2687,48 +2687,51 @@
         this.form.consignee = _name;
         this.form.deliveryAddress = _address;
         this.form.deliveryPhone = _phone;
+        this.orderData = this.orderList;
+        this.orderData =  Array.from(new Set([this.orderData,...this.orderList]))
+
         //这里需要对选择的订单进行筛选
-        const info = [];
-        this.stockArticleInfo.forEach((item, index) => {
-          this.orderList.forEach(order => {
-            // const newDate1 = this.orderData.map(item => { // map遍历本地数据
-            //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
-            //     return item;
-            // });
-            //   }              info.push(order);
-            //清理原来订单列表的订单数据
-            info.push(order);
-            this.stockArticleInfo.splice(index, 1);
-          });
-        });
+        // const info = [];
+        // this.stockArticleInfo.forEach((item, index) => {
+        //   this.orderList.forEach(order => {
+        //     // const newDate1 = this.orderData.map(item => { // map遍历本地数据
+        //     //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+        //     //     return item;
+        //     // });
+        //     //   }              info.push(order);
+        //     //清理原来订单列表的订单数据
+        //     info.push(order);
+        //     this.stockArticleInfo.splice(index, 1);
+        //   });
+        // });
 
 
-        if (this.orderData.length >= 1) {
-          let newDate1 = this.orderData.map(item => {
-            // map遍历本地数据
-            if (this.orderList.find(o => o.id !== item.id)) {
-              // 如果在接口数据中包含本地数据，则返回这条本地数据
-              return item;
-            }
-          });
-          console.log('newDate1-------------->', newDate1.length);
-          if (newDate1.length >= 1) {
-            console.log('newDate1-------------->', newDate1);
-            newDate1.forEach(a => {
-              this.orderData.push(a);
-            });
-          }
-          console.log('this.orderData------------->', this.orderData);
-        } else {
+        // if (this.orderData.length >= 1) {
+        //   let newDate1 = this.orderData.map(item => {
+        //     // map遍历本地数据
+        //     if (this.orderList.find(o => o.id !== item.id)) {
+        //       // 如果在接口数据中包含本地数据，则返回这条本地数据
+        //       return item;
+        //     }
+        //   });
+        //   console.log('newDate1-------------->', newDate1.length);
+        //   if (newDate1.length >= 1) {
+        //     console.log('newDate1-------------->', newDate1);
+        //     newDate1.forEach(a => {
+        //       this.orderData.push(a);
+        //     });
+        //   }
+        //   console.log('this.orderData------------->', this.orderData);
+        // } else {
 
-          this.orderData = this.orderList;
-        }
+        //   this.orderData = this.orderList;
+        // }
 
 
-        this.orderData.forEach(a => {
-          a.reservationNum = a.handQuantity;
+        // this.orderData.forEach(a => {
+        //   a.reservationNum = a.handQuantity;
 
-        });
+        // });
 
 
         // this.orderData.push(info);