From 470ae07d4793145af8010baf96b6a1c976120ff9 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 26 Dec 2023 15:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turndelivery/deliveryDiscuss.vue          |  7 +-
 .../parcelList/distributionParcelList.vue     | 80 +++++++++++++++----
 2 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 1345f9aa..9076e1c6 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -320,7 +320,7 @@
                           align="center"
                         >
                           <template #default="props">
-                            <span :class="props.row[item.prop] == 'state' ? '.static-class' : ''">{{
+                            <span :id="props.row[item.prop]" :class="props.row[item.prop] == 'state' ? '.static-class' : ''">{{
                               props.row[item.prop] ? props.row[item.prop] : '/'
                             }}</span>
                           </template>
@@ -1888,6 +1888,9 @@ const soclear=()=>{
 }
 // 编辑多功能搜索
 const SearchFu = () => {
+return
+  document.getElementById(multifunctional.value).scrollIntoView()
+return
   console.log(soInpuState.value, '当前搜索状态');
 
   if (!multifunctional.value && !dataInfoTemp.value.length) {
@@ -1930,7 +1933,7 @@ const SearchFu = () => {
       console.log(dataInfoTemp.value,'临时存储的值');
       dataInfo.value = temp; //如果搜索到了值才赋值
       soInpuState.value = false; //表示当前已经搜索过了
- 
+
   }
 
   // console.log(dataInfo.value, '搜索结果');
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index df1a0523..544eb224 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -369,35 +369,85 @@ export default {
           fixed: false,
           sortable: true,
         },
+
+
         {
-          label: '预约单编号',
           prop: 'reservationCode',
-          display: false,
-          hide: true,
+          label: '预约单编号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
+
+
         {
-          label: '配送车次号',
           prop: 'noteNumber',
-          display: false,
-          hide: true,
+          label: '配送车次号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
+
+
         {
-          label: '配送司机',
           prop: 'driverName',
-          display: false,
-          hide: true,
+          label: '配送司机',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
+
+
         {
-          label: '装车时间',
           prop: 'scanTime',
-          display: false,
-          hide: true,
+          label: '装车时间',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
+
+        {
+          prop: 'scanUser',
+          label: '实际装车人',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
-          label: '签收时间',
           prop: 'signingTime',
-          display: false,
-          hide: true,
+          label: '签收时间',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'signingUser',
+          label: '实际签收人',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
           label: '配送车牌',