From 24a46d276318751bb7f7c054167bc0c02416204b Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Wed, 1 Nov 2023 21:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/turndelivery/devtmp.vue | 16 +++++++++-------
 vite.config.js                                 |  4 ----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/distribution/turndelivery/devtmp.vue b/src/views/distribution/turndelivery/devtmp.vue
index 61771c93..298b3eb1 100644
--- a/src/views/distribution/turndelivery/devtmp.vue
+++ b/src/views/distribution/turndelivery/devtmp.vue
@@ -1928,21 +1928,23 @@ const SubmitLoad = () => {
   // 新增订单
   // QuantityEntryStatus为真表示此时此刻操作的是数量录入提交
   if (QuantityEntryStatus.value) {
-    dataInfo.value[dataId.value].parcelListVOS = isZeroTable.value;
+    dataInfo.value[dataId.value].parcelNumberVOS = isZeroTable.value;
     console.log(dataInfo.value[dataId.value], '当前零担信息');
+  } else {
+    entryNum(isZeroTable.value).then(res => {
+      console.log(res, '提交零担');
+      console.log(isZeroTable.value, '提交零担的值');
+    });
   }
-  entryNum(isZeroTable.value).then(res => {
-    console.log(res, '提交零担');
-    console.log(isZeroTable.value, '提交零担的值');
-  });
-  comprehensive.value = false; //关闭弹窗
+ comprehensive.value = false; //关闭弹窗
   EnteringLibrary.value = false; //关闭零担
   QuantityEntryStatus.value = false; //此时开启零担录入
 };
 // 零担数量操作
 const isZeroNumber = val => {
   console.log(val, '当前操作数据');
-  val.number = val.number;
+
+  val.reservationNum = val.number;
 };
 // 刷新功能触发事件
 const refresh = () => {
diff --git a/vite.config.js b/vite.config.js
index f1d13425..02e371b9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,11 +23,7 @@ export default ({ mode, command }) => {
           target: 'http://192.168.10.75:8777',
           // tjj
           // target: 'http://192.168.10.29:13000',
-<<<<<<< HEAD
           // target: 'http://test.api.huitongys.com',
-=======
-          target: 'http://test.api.huitongys.com',
->>>>>>> b03d088923c558e796ad872d1c718c34ccd5d8be
           // target: 'http://h5uapi.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),