From 43762f102397c14232cb0305488fe6ee73fa6e53 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 20 Jun 2024 16:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=95=86=E9=85=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=A2=AB=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderInfo.vue    |  7 +++++
 .../inventory/distrilbutionBillLading.vue     | 19 ++++++++++---
 .../turndelivery/deliveryDiscuss.vue          | 27 ++++++++++---------
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 72a670b0..b86e42d3 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -111,8 +111,14 @@
             <el-tab-pane label="基础信息">
               <div class="el_information">
                 <div class="el_information_row">
+                  
                   <el-form-item label="车次号" v-if="displaySettings.trainNumber">
+                    <el-tooltip
+                      :content="item.trainNumber ? item.trainNumber : '车次号'"
+                      placement="top"
+                    >
                     <el-input v-model="Indexform.trainNumber" />
+                    </el-tooltip>
                   </el-form-item>
 
                   <el-form-item label="配送时间" v-if="displaySettings.deliveryTime">
@@ -1365,6 +1371,7 @@ const isApplyArbitration=()=>{
 
 // 修改提交权限
 const isInformationEditing=()=>{
+  return false
   if(workOrderStatus === '10'){
     // 提交人是自己
     if( warehouseIdState.value){
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 2a5ecb1d..ec6a6cb3 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -3056,9 +3056,18 @@ export default {
             });
             submitFormData.billPackageEntityList = _billPackageEntityList;
             // SM24010411
-            console.log(submitFormData, 'submitFormData');
-            this.Selfpickuploading = true; //开启加载效果
 
+            // console.log(this.dataOwn,'库存品');
+            // console.log(this.dataList,'定制品');
+            // 商场名称
+            if (this.dataOwn?.length) {
+              submitFormData.consigneeUnit = this.dataOwn[0].consigneeUnit;
+            } else if (this.dataList?.length) {
+            submitFormData.consigneeUnit = this.dataList[0].consigneeUnit;
+            }
+          console.log(submitFormData, '最后要提交的参数');
+           this.Selfpickuploading = true; //开启加载效果
+           
             add(submitFormData)
               .then(res => {
                 this.Selfpickuploading = false; //开启加载效果
@@ -3212,8 +3221,12 @@ this.dataList.forEach(val => {
 console.log(_unBillPackageEntityList,'删除的');
 up.billPackageEntityList = _billPackageEntityList;
 up.unBillPackageEntityList = _unBillPackageEntityList;
+if (this.dataOwn?.length) {
+  up.consigneeUnit = this.dataOwn[0].consigneeUnit;
+            } else if (this.dataList?.length) {
+              up.consigneeUnit = this.dataList[0].consigneeUnit;
+            }
 this.Selfpickuploading = true; //开启加载效果
-console.log(up,'要提交的数据');
 
             update(up)
               .then(() => {
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index bd16028a..f2b2e32f 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -2061,23 +2061,24 @@ const submit = () => {
       return;
     }
     if (!wrapLoading.value) {
-      dataInfo.value = dataTmp.value;
+      dataInfo.value = [...dataInfo.value, ...dataTmp.value];
 
       console.log(dataInfo.value, '要展示的值');
       console.log('触发1');
     } else {
       // 编辑的时候需要带上这个参数存放订单下面的包件信息
-      let packageListInfo = [];
       console.log('触发2');
-      dataInfo.value[dataId.value].packageListInfo = dataTmp.value; //把存在的值给当前订单下面
-      // dataInfo.value[dataId.value].packageListInfo = wrapData.value;
+      if (!dataInfo.value[dataId.value].packageListInfo) {
+        dataInfo.value[dataId.value].packageListInfo = [];
+      }
+      dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
       wrapTemp.value[dataId.value] = dataTmp.value;
       console.log('wrapTemp.value[dataId.value] :>> ', wrapTemp.value[dataId.value]);
       console.log(wrapTemp.value, '包件订单被缓存');
       console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面');
       console.log(dataInfo.value, '所有订单信息');
-      console.log(Packageow.value,'Packageow.value');
-      Packageow.value.reservationNum =dataTmp.value.length
+      console.log(Packageow.value, 'Packageow.value');
+      Packageow.value.reservationNum = dataTmp.value.length;
     }
   } else {
     if (!dataTmp.value.length && wrapLoading.value) {
@@ -2105,17 +2106,19 @@ const submit = () => {
     if (wrapLoading.value) {
       console.log(dataInfo.value, '订单');
       console.log(dataId.value, '当前下标');
-      console.log(dataInfo.value[dataId.value], '当前下班的订单');
+      console.log(dataInfo.value[dataId.value], '当前下标的订单');
       console.log(dataTmp.value, '勾选的数据');
-      dataInfo.value[dataId.value].packageListInfo = dataTmp.value; //把存在的值给当前订单下面。。修改过
+      if (!dataInfo.value[dataId.value].packageListInfo) {
+        dataInfo.value[dataId.value].packageListInfo = [];
+      }
+      dataInfo.value[dataId.value].packageListInfo = [...dataInfo.value[dataId.value].packageListInfo, ...dataTmp.value];
       console.log(wrapTemp.value, '包件订单被缓存222');
       console.log(dataInfo.value, '处理好的订单');
-      console.log(Packageow.value,'Packageow.value');
-      Packageow.value.reservationNum =dataTmp.value.length
+      console.log(Packageow.value, 'Packageow.value');
+      Packageow.value.reservationNum = dataTmp.value.length;
       // 包件弹窗
     } else {
-      dataInfo.value = dataTmp.value;
-
+      dataInfo.value = [...dataInfo.value, ...dataTmp.value];
     }
 
     console.log('提交后的参数', dataInfo.value);