From 1fe7c954e4a1316ca05d0b17827b3156e0cd0ed5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 28 Oct 2024 18:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B2=E7=BA=BF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArteryPrintTemplate.vue                   | 215 ++++++++++--------
 .../TripartiteTransferPrintTemplate.vue       |  96 ++++----
 .../distribution/VehicleArrivalManagement.js  |   8 +-
 src/option/distribution/VehicleStowage.js     |   8 +-
 .../artery/TripartiteTransfer.vue             |   6 +
 .../artery/VehicleArrivalManagement.vue       |   6 +
 .../distribution/artery/VehicleStowage.vue    |   6 +
 .../distribution/inventory/BookingNote.vue    |   4 +-
 src/views/waybill/WaybillOrderList.vue        |  24 +-
 9 files changed, 203 insertions(+), 170 deletions(-)

diff --git a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
index 3380f4ed..25ef3009 100644
--- a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
+++ b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
@@ -129,103 +129,116 @@
         <th style="border-bottom: 1px solid #000; border-left: 1px solid #000">小计</th>
       </tr>
       <!-- 值 -->
-      <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">{{ index + 1 }}</td>
-        <!-- 发货单位 -->
-        <td
-          v-if="value.mergeColumnIndex"
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          :rowspan="value.mergeColumnIndex"
-          contenteditable
-        >
-          {{ value.shipper || '' }}
-        </td>
-        <!-- 开单时间 -->
-        <td
-          v-if="value.mergeColumnIndex"
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          :rowspan="value.mergeColumnIndex"
-          contenteditable
-        >
-          {{ value.createTime || '' }}
-        </td>
-        <!-- 始发仓 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
-          {{ value.departureWarehouseName || '' }}
-        </td>
-        <!-- 目的仓 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
-          {{ value.destinationWarehouseName || '' }}
-        </td>
-        <!-- 收货单位 -->
-        <td
-          v-if="value.mergeColumnIndex"
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          :rowspan="value.mergeColumnIndex"
-          contenteditable
-        >
-          {{ value.consignee }}
-        </td>
-        <!-- 收货人 -->
-        <td
-          v-if="value.mergeColumnIndex"
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          :rowspan="value.mergeColumnIndex"
-          contenteditable
-        >
-          {{ value.consigneeName }}
-        </td>
-        <!-- 收货电话 -->
-        <td
-          v-if="value.mergeColumnIndex"
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          :rowspan="value.mergeColumnIndex"
-          contenteditable
-        >
-          {{ value.consigneeMobile }}
-        </td>
-        <!-- 物流单号 -->
-        <td
-          v-if="value.mergeColumnIndex"
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          :rowspan="value.mergeColumnIndex"
-        >
-          {{ value.waybillNo }}
-        </td>
-        <!-- 合同号 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">
-          {{ value.orderCode }}
-        </td>
-        <!-- 计划件数 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
-          {{ value.planNum }}
-        </td>
-        <!-- 货位 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
-        <td
-          style="border-bottom: 1px solid #000; border-left: 1px solid #000"
-          contenteditable
-          v-for="item in goodsTitleList"
-        >
-          {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
-        </td>
-        <!-- 小计 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
-          {{ value.smallTotal }}
-        </td>
-        <!-- 合计件数 -->
-        <!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.smallTotal }}</td> -->
-        <!-- 卸车件数 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
-          {{ value.unloadNum }}
-        </td>
-        <!-- 卸车网点 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></td>
-        <!-- 卸车时间 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></td>
-        <!-- 异常备注 -->
-        <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable></td>
-      </tr>
+      <template v-if="renderInfo.mainList">
+        <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">
+            {{ index + 1 }}
+          </td>
+          <!-- 发货单位 -->
+          <td
+            v-if="value.mergeColumnIndex"
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            :rowspan="value.mergeColumnIndex"
+            contenteditable
+          >
+            {{ value.shipper || '' }}
+          </td>
+          <!-- 开单时间 -->
+          <td
+            v-if="value.mergeColumnIndex"
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            :rowspan="value.mergeColumnIndex"
+            contenteditable
+          >
+            {{ value.createTime || '' }}
+          </td>
+          <!-- 始发仓 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
+            {{ value.departureWarehouseName || '' }}
+          </td>
+          <!-- 目的仓 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
+            {{ value.destinationWarehouseName || '' }}
+          </td>
+          <!-- 收货单位 -->
+          <td
+            v-if="value.mergeColumnIndex"
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            :rowspan="value.mergeColumnIndex"
+            contenteditable
+          >
+            {{ value.consignee }}
+          </td>
+          <!-- 收货人 -->
+          <td
+            v-if="value.mergeColumnIndex"
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            :rowspan="value.mergeColumnIndex"
+            contenteditable
+          >
+            {{ value.consigneeName }}
+          </td>
+          <!-- 收货电话 -->
+          <td
+            v-if="value.mergeColumnIndex"
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            :rowspan="value.mergeColumnIndex"
+            contenteditable
+          >
+            {{ value.consigneeMobile }}
+          </td>
+          <!-- 物流单号 -->
+          <td
+            v-if="value.mergeColumnIndex"
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            :rowspan="value.mergeColumnIndex"
+          >
+            {{ value.waybillNo }}
+          </td>
+          <!-- 合同号 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000">
+            {{ value.orderCode }}
+          </td>
+          <!-- 计划件数 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
+            {{ value.planNum }}
+          </td>
+          <!-- 货位 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000"></td>
+          <td
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            contenteditable
+            v-for="item in goodsTitleList"
+          >
+            {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
+          </td>
+          <!-- 小计 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
+            {{ value.smallTotal }}
+          </td>
+          <!-- 合计件数 -->
+          <!-- <td style="border-bottom: 1px solid #000; border-left: 1px solid #000;" contenteditable>{{ value.smallTotal }}</td> -->
+          <!-- 卸车件数 -->
+          <td style="border-bottom: 1px solid #000; border-left: 1px solid #000" contenteditable>
+            {{ value.unloadNum }}
+          </td>
+          <!-- 卸车网点 -->
+          <td
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            contenteditable
+          ></td>
+          <!-- 卸车时间 -->
+          <td
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            contenteditable
+          ></td>
+          <!-- 异常备注 -->
+          <td
+            style="border-bottom: 1px solid #000; border-left: 1px solid #000"
+            contenteditable
+          ></td>
+        </tr>
+      </template>
 
       <!-- 合计行 -->
       <tr>
@@ -296,8 +309,6 @@ renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',
 let mergeStartIndex = 0;
 // 比对值
 let comparisonValue = '';
-renderInfo.value.mainList[0].mergeColumnIndex = 1;
-
 const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
   for (let index = startIndex; index < endIndex; index++) {
     const value = data[index];
@@ -312,8 +323,10 @@ const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
 for (let index = 0; index < renderInfo.value.mainList.length; index++) {
   const element = renderInfo.value.mainList[index];
 
-  if (index === 0) comparisonValue = element.waybillNo;
-
+  if (index === 0) {
+    comparisonValue = element.waybillNo;
+    element.mergeColumnIndex = 1;
+  }
   totalNum.value += element.smallTotal || 0;
   totalUnLoadNum.value += element.unloadNum || 0;
   totalPlanNum.value += element.planNum || 0;
diff --git a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
index 0e51ce6e..40c210a8 100644
--- a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
+++ b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
@@ -58,50 +58,52 @@
       </thead>
       <tbody>
         <!-- 值 -->
-        <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
-          <td>{{ index + 1 }}</td>
-          <!-- 发货单位 -->
-          <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
-            {{ value.shipper || '' }}
-          </td>
-          <!-- 开单时间 -->
-          <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
-            {{ value.createTime || '' }}
-          </td>
-          <!-- 收货单位 -->
-          <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
-            {{ value.consignee }}
-          </td>
-          <!-- 收货人 -->
-          <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
-            {{ value.consigneeName }}
-          </td>
-          <!-- 收货电话 -->
-          <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
-            {{ value.consigneeMobile }}
-          </td>
-          <!-- 物流单号 -->
-          <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex">
-            {{ value.waybillNo }}
-          </td>
-          <!-- 合同号 -->
-          <td>{{ value.orderCode }}</td>
-          <!-- 计划件数 -->
-          <td contenteditable>{{ value.planNum }}</td>
-          <!-- 货位 -->
-          <td></td>
-          <td contenteditable v-for="item in goodsTitleList">
-            {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
-          </td>
-          <!-- 小计 -->
-          <td contenteditable>{{ value.smallTotal }}</td>
-          <!-- 合计件数 -->
-          <td contenteditable>{{ value.smallTotal }}</td>
-          <!-- 卸车件数 -->
-          <td contenteditable>{{ value.unloadNum }}</td>
-          <!-- 异常备注 -->
-          <td contenteditable></td>
-        </tr>
+        <template v-if="renderInfo.mainList">
+          <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
+            <td>{{ index + 1 }}</td>
+            <!-- 发货单位 -->
+            <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
+              {{ value.shipper || '' }}
+            </td>
+            <!-- 开单时间 -->
+            <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
+              {{ value.createTime || '' }}
+            </td>
+            <!-- 收货单位 -->
+            <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
+              {{ value.consignee }}
+            </td>
+            <!-- 收货人 -->
+            <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
+              {{ value.consigneeName }}
+            </td>
+            <!-- 收货电话 -->
+            <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex" contenteditable>
+              {{ value.consigneeMobile }}
+            </td>
+            <!-- 物流单号 -->
+            <td v-if="value.mergeColumnIndex" :rowspan="value.mergeColumnIndex">
+              {{ value.waybillNo }}
+            </td>
+            <!-- 合同号 -->
+            <td>{{ value.orderCode }}</td>
+            <!-- 计划件数 -->
+            <td contenteditable>{{ value.planNum }}</td>
+            <!-- 货位 -->
+            <td></td>
+            <td contenteditable v-for="item in goodsTitleList">
+              {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
+            </td>
+            <!-- 小计 -->
+            <td contenteditable>{{ value.smallTotal }}</td>
+            <!-- 合计件数 -->
+            <td contenteditable>{{ value.smallTotal }}</td>
+            <!-- 卸车件数 -->
+            <td contenteditable>{{ value.unloadNum }}</td>
+            <!-- 异常备注 -->
+            <td contenteditable></td>
+          </tr>
+        </template>
 
         <!-- 合计行 -->
         <tr>
@@ -157,7 +159,6 @@ const isShowTotal = ref(false);
 let mergeStartIndex = 0;
 // 比对值
 let comparisonValue = '';
-renderInfo.value.mainList[0].mergeColumnIndex = 1;
 
 const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
   for (let index = startIndex; index < endIndex; index++) {
@@ -174,7 +175,10 @@ renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',
 for (let index = 0; index < renderInfo.value.mainList.length; index++) {
   const element = renderInfo.value.mainList[index];
 
-  if (index === 0) comparisonValue = element.waybillNo;
+  if (index === 0) {
+    comparisonValue = element.waybillNo;
+    element.mergeColumnIndex = 1;
+  }
 
   totalNum.value += element.smallTotal || 0;
   totalUnLoadNum.value += element.unloadNum || 0;
diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js
index df08a80d..d6c824a8 100644
--- a/src/option/distribution/VehicleArrivalManagement.js
+++ b/src/option/distribution/VehicleArrivalManagement.js
@@ -145,7 +145,7 @@ export const columnList = [
   {
     prop: 'driverName',
     label: '主驾司机',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -165,7 +165,7 @@ export const columnList = [
   {
     prop: 'carNumber',
     label: '车牌号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -175,7 +175,7 @@ export const columnList = [
   {
     prop: 'startWarehouseName',
     label: '起点仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -185,7 +185,7 @@ export const columnList = [
   {
     prop: 'endWarehouseNames',
     label: '终点仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js
index 4b30abb8..1db42ef8 100644
--- a/src/option/distribution/VehicleStowage.js
+++ b/src/option/distribution/VehicleStowage.js
@@ -145,7 +145,7 @@ export const columnList = [
   {
     prop: 'driverName',
     label: '主驾司机',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -165,7 +165,7 @@ export const columnList = [
   {
     prop: 'carNumber',
     label: '车牌号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -175,7 +175,7 @@ export const columnList = [
   {
     prop: 'startWarehouseName',
     label: '起点仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -185,7 +185,7 @@ export const columnList = [
   {
     prop: 'endWarehouseNames',
     label: '终点仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index e4011a9e..d5dcf440 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -499,6 +499,12 @@
   ></edittablehead>
 </template>
 
+<script lang="ts">
+export default {
+  name: '/distribution/artery/TripartiteTransfer',
+};
+</script>
+
 <script setup lang="ts">
 import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 import functions from '@/utils/functions';
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 9b71ac40..911153ca 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -639,6 +639,12 @@
   ></edittablehead>
 </template>
 
+<script lang="ts">
+export default {
+  name: '/distribution/artery/VehicleArrivalManagement',
+};
+</script>
+
 <script setup lang="ts">
 import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 import dayjs from 'dayjs';
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 5123d8e9..22d5c28e 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -599,6 +599,12 @@
   ></edittablehead>
 </template>
 
+<script lang="ts">
+export default {
+  name: '/distribution/artery/VehicleStowage',
+};
+</script>
+
 <script setup lang="ts">
 import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 import functions from '@/utils/functions';
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 08be1813..c7fdce3a 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -685,7 +685,7 @@
                         <el-form-item label-width="fit-content" label="支付方式:">
                           <el-select disabled v-model="query.payType" :teleported="false">
                             <el-option
-                              v-for="item in details.info.payTypeList"
+                              v-for="item in query.payTypeList"
                               :key="item.dictValue"
                               :label="item.dictValue"
                               :value="item.dictKey"
@@ -696,7 +696,7 @@
                         <el-form-item label="付款方式:" label-width="fit-content" prop="payWay">
                           <el-select disabled v-model="query.payWay" :teleported="false">
                             <el-option
-                              v-for="item in details.info.payWayList"
+                              v-for="item in query.payWayList"
                               :key="item.dictValue"
                               :label="item.dictValue"
                               :value="item.dictKey"
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index ff7a76aa..a0b7e4e8 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -109,13 +109,14 @@
             @click="handleBatchRecover"
             >恢 复</el-button
           >
+          <!-- 导出 -->
           <el-button
             type="primary"
             icon="Download"
             v-if="permissionObj.WaybillOrderList_export"
             @click="handleExport"
-            >导 出</el-button
-          >
+            >导 出
+          </el-button>
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
@@ -127,6 +128,7 @@
 
       <!-- 列表模块 -->
       <tablecmt
+        ref="tableNodeRef"
         :columnList="details.columnList"
         :tableData="data"
         :loading="loadingObj.list"
@@ -416,6 +418,8 @@ const details = reactive<any>({
   warehouseOption: [],
 });
 
+const tableNodeRef = ref();
+
 const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page, popUpShow } =
   toRefs(details);
 
@@ -455,14 +459,6 @@ const permissionObj = reactive({
   }),
 });
 
-onMounted(() => {
-  const timer = setTimeout(() => {
-    details.listNode = document.querySelector('.maboxhi');
-    details.listNode.style.transition = 'all .5s ease-out';
-    clearTimeout(timer);
-  }, 100);
-});
-
 /** 请求页面数据 */
 const onLoad = async (page?: any, params = {}) => {
   try {
@@ -559,10 +555,10 @@ const showdrawer = (_flag?: boolean) => {
 };
 
 /** 是否开启搜索区 */
-const searchHide = () => {
+const searchHide = async () => {
   details.search = !details.search;
-
-  setNodeHeight(details.listNode, '', true);
+  await nextTick();
+  setNodeHeight(tableNodeRef.value.$el, '', true);
 };
 
 /** 表格表头输入框搜索 */
@@ -982,6 +978,8 @@ const handleExport = () => {
 
       delete submitData.createTime;
       delete submitData.documentMakingTime;
+      if (details.selectionList.length > 0)
+        submitData.ids = details.selectionList.map(val => val.id).join(',');
 
       const res = await postExport(submitData);