From d726faa4c84811a14b6daaa75ca6a28edb085ae7 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 3 Jan 2024 20:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=9C=8D=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderend.vue     | 28 ++++++++++---------
 .../signfor/distributionSignforedt.vue        | 22 +++++++++++++++
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index dbb67046..5ff85eca 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -329,7 +329,10 @@
                   <div class="Paymentname" @click="PaymentSelection(item)">
                     {{ item.payment ? item.text : '支付方式' }}
                   </div>
-
+                  <div class="el_PaymentUnit">
+                <span>支付单位:</span>
+                <el-input v-model="item.paymentUnit" placeholder="请输入支付单位" />
+              </div>
                   <div>
                     <el-date-picker
                       v-model="item.compensationTime"
@@ -343,10 +346,7 @@
                   </div>
                 </div>
               </div>
-              <div class="el_PaymentUnit">
-                <span>支付单位:</span>
-                <el-input v-model="paymentUnit" placeholder="请输入支付单位" />
-              </div>
+          
               <div class="el_tool">
                 <span>总金额:{{ TotalClaimAmount }}元</span>
               </div>
@@ -1104,7 +1104,7 @@ const onLoad = () => {
               name: item.resultTypeName,
               text: item.compensationMethodName,
               compensationTime: item.compensationTime,
-              // paymentUnit:item.paymentUnit,
+              paymentUnit:item.paymentUnit,
             };
           }
         );
@@ -1292,7 +1292,7 @@ const changeProcessingResults = val => {
       payment: '',
       text: '',
       compensationTime: '',
-      // paymentUnit:'',
+      paymentUnit:'',
     };
     // 根据num为newItem的name字段赋值
     switch (num) {
@@ -1805,14 +1805,14 @@ const submit = () => {
               : '未知支付方式',
             resultName: item.name, //处理结果名字
             compensationTime: item.compensationTime, //赔付时间
-            // paymentUnit: item.paymentUnit, //赔付单位
+            paymentUnit: item.paymentUnit, //赔付单位
           };
         } else {
           return null;
         }
       })
       .filter(item => item !== null);
-    data.aftersalesProcessingResultsDTO.paymentUnit = paymentUnit.value; //支付单位
+    // data.aftersalesProcessingResultsDTO.paymentUnit = paymentUnit.value; //支付单位
     data.aftersalesProcessingResultsDTO.processingMoneyEntityList =
       data['processingMoneyEntityList'];
     console.log('走到了这一步');
@@ -2083,10 +2083,11 @@ const CustomerServiceCompleted = () => {
       display: flex;
       margin-bottom: 20px;
       height: 30px;
-      width: 68%;
+      width: 100%;
+      justify-content: space-between;
       span {
         display: block;
-        width: 30%;
+        width:140px;
         color: #606266;
         font-size: 16px;
       }
@@ -2261,7 +2262,7 @@ const CustomerServiceCompleted = () => {
 }
 // 数字输入框
 :deep(.el-input-number) {
-  width: 26%;
+  width: 160px;
 }
 .contemtMax {
   display: flex;
@@ -2533,10 +2534,11 @@ const CustomerServiceCompleted = () => {
 }
 .el_PaymentUnit {
   display: flex;
+  align-items: center;
   span {
     display: flex;
+    width: 80px !important;
     align-items: center;
-    width: 120px;
   }
   :deep(.el-input) {
     width: 150px;
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index a245f546..80e6fb7f 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -1141,6 +1141,28 @@ const menuData2 = ref([
     sortable: true,
     head: false,
   },
+  {
+    prop: 'loadingTime',
+    label: '装车时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signeeName',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'trainNumber',
     label: '包件类型',