From 91b29346f4e60d23467563ace7145ca4ac031477 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 7 Mar 2024 19:20:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SelectBox/SelectBox.vue        |   5 -
 src/components/tablecmt/tablecmt.vue          |  25 ++++
 src/utils/util.js                             |  18 ++-
 src/views/aftersales/aftersalesWorkOrder.vue  | 112 ++++++++---------
 src/views/basic/coderule/basicTenantCode.vue  |  72 ++++++-----
 src/views/basic/forklift/basicForklift.vue    | 114 ++++++++++--------
 .../distribution/artery/AddVehicleStowage.vue |  93 ++++++--------
 .../artery/TripartiteTransfer.vue             |   7 +-
 .../artery/TripartiteTransferDetails.vue      |   5 +-
 .../artery/VehicleArrivalManagement.vue       |  22 ++--
 .../distribution/artery/VehicleStowage.vue    |  70 ++++++-----
 .../artery/VehicleStowageDetails.vue          |   1 +
 .../artery/addTripartiteTransfer.vue          |  22 ++--
 .../distribution/artery/directGoMarket.vue    |  44 +++----
 .../artery/directGoMarketDetails.vue          |   8 +-
 .../artery/handleLoadingDestination.vue       |   1 +
 .../artery/truckLoadingDetails.vue            |   8 +-
 .../artery/zeroAdditionalRecording.vue        |  27 +----
 .../distribution/inventory/CreateOrder.vue    |  45 +------
 .../addArteryDistrilbutionBillLadingList.vue  |   4 +-
 .../arteryDistrilbutionBillLadingList.vue     |  57 ++++-----
 21 files changed, 364 insertions(+), 396 deletions(-)

diff --git a/src/components/SelectBox/SelectBox.vue b/src/components/SelectBox/SelectBox.vue
index c695fd6d..76e9deda 100644
--- a/src/components/SelectBox/SelectBox.vue
+++ b/src/components/SelectBox/SelectBox.vue
@@ -21,9 +21,6 @@
       "
       v-if="isShowBox"
     >
-      <!-- <el-scrollbar>
-        <p v-for="item in 20" :key="item" class="scrollbar-demo-item">{{ item }}</p>
-      </el-scrollbar> -->
       <div class="content">
         <SelectComponent
           :className="props.className"
@@ -77,8 +74,6 @@ const _computed = computed({
   },
 });
 
-console.log('props :>> ', props);
-
 className.value = props.className || '';
 
 const selectBox = ref(null);
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 0a07c08f..a2e3fce2 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -44,6 +44,12 @@
               class="mx-1"
             ></el-text>
 
+            <el-icon
+              v-if="column.type == 12 && props.isShowRefresh !== false"
+              @click="handleRefresh"
+              ><RefreshRight
+            /></el-icon>
+
             <el-input
               v-if="column.type == 2 || column.type == 13"
               v-model.trim="column.values"
@@ -339,6 +345,11 @@ let props = defineProps({
     required: false,
     default: null,
   },
+  isShowRefresh: {
+    type: Boolean as PropType<boolean>,
+    required: false,
+    default: true,
+  },
 });
 /** 勾选数据统计 */
 const selectCount = ref([]);
@@ -491,6 +502,8 @@ function makeCargo(value, column: TableColumnType) {
   emit('makeCargo', value, column);
 }
 function inputchange(value, column: TableColumnType) {
+  console.log('value :>> ', value);
+  console.log('column :>> ', column);
   if (typeof value == 'string') {
     emit('inputTxt', value, column);
   }
@@ -673,6 +686,18 @@ function copyContent(content: string) {
   }
 }
 
+const handleRefresh = () => {
+  for (let i = 0; i < newcolumnList.value.length; i++) {
+    const item = newcolumnList.value[i];
+
+    item.values = '';
+
+    if (item.type === 2 || item.type === 13) emit('inputTxt', item.values, item);
+    else if (item.type === 3) emit('selectCheck', item.values, item);
+    else if (item.type === 4) emit('timeCheck', item.values, item);
+  }
+};
+
 defineExpose({ handleCheckSelect, handleClearSelect });
 </script>
 <style lang="scss">
diff --git a/src/utils/util.js b/src/utils/util.js
index fc12b717..d286e96d 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -628,8 +628,7 @@ export function debounce(func, delay) {
     const args = arguments;
     clearTimeout(timer);
     timer = setTimeout(function () {
-      // func.apply(context, args);
-      func();
+      func.apply(context, args);
       clearTimeout(timer);
     }, delay);
   };
@@ -640,8 +639,6 @@ export const removeZeroWidth = str => {
   return str.replace(/[\u200B-\u200D\uFEFF]/g, '');
 };
 
-
-
 /**判断对象除了指定值为真其余值是否为假**/
 // 测试数据
 /*let data1 = {
@@ -665,17 +662,16 @@ let targetParam3 = 'operatorTime';
 console.log(checkParams(data3, targetParam3)); // 输出 true
 */
 /**
- * 
- * @param {Object} data 
- * @param {String} targetParam 
- * @returns 
+ *
+ * @param {Object} data
+ * @param {String} targetParam
+ * @returns
  */
 export function checkParams(data, targetParam) {
   const keys = Object.keys(data);
-  if (keys.includes(targetParam) && keys.every(key => key === targetParam || data[key] === "")) {
+  if (keys.includes(targetParam) && keys.every(key => key === targetParam || data[key] === '')) {
     return true; // 指定参数存在且没有其他参数或其他参数值为空时返回 true
   } else {
     return false; // 其他情况返回 false
   }
-};
-
+}
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 70596157..ab8cd1ff 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -220,6 +220,7 @@
                 @btnCheck="btnsc"
                 @selectCheck="selectsc"
                 @selection="selectionChange"
+                :isShowRefresh="false"
                 :tableRowClassName="
                   (row, index) => {
                     if (row.departStatus != null && row.departStatus) return 'Abnormal';
@@ -264,8 +265,6 @@
                           >结果确定</el-button
                         >
 
-                   
-
                         <!-- 仲裁中确定结束仲裁按钮 -->
                         <el-button
                           v-if="TabPermissions == '5' && UserPermissions != '仓库客服'"
@@ -766,6 +765,7 @@
                   @btnCheck="btnsc"
                   @selectCheck="selectsc"
                   @selection="selectionChange"
+                  :isShowRefresh="false"
                   :tableRowClassName="
                     (row, index) => {
                       if (row.conditions != null && row.conditions == '1') return 'Abnormal';
@@ -798,6 +798,7 @@
                   @btnCheck="btnsc"
                   @selectCheck="selectsc"
                   @selection="selectionChange"
+                  :isShowRefresh="false"
                   :tableRowClassName="
                     (row, index) => {
                       if (row.conditions != null && row.conditions == '1') return 'Abnormal';
@@ -933,6 +934,7 @@
                 :columnList="customerserviceColumnList"
                 :tableData="customerData"
                 :loading="CustomerLoad"
+                :isShowRefresh="false"
                 @inputTxt="inputsc"
                 @timeCheck="timesc"
                 @btnCheck="btnsc"
@@ -1671,7 +1673,7 @@ const TransportLossNode = ref([
 ]);
 
 const Statusprocessing = val => {
-  console.log(val,'状态处理的值');
+  console.log(val, '状态处理的值');
   val.forEach(item => {
     // 对为null的数据进行处理
     // for (const property in item) {
@@ -1695,7 +1697,6 @@ const Statusprocessing = val => {
     // 提货环节下拉赋值
     if (item.discoveryNode == 1) {
       item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节
-  
     } else if (item.discoveryNode == 2) {
       item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节
     } else if (item.discoveryNode == 3) {
@@ -1712,7 +1713,6 @@ const Statusprocessing = val => {
       item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节
     }
 
-
     if (item.workOrderStatus == 10) {
       item.workOrderStatusNameS = columnList[10].checkarr[0].label; //待处理
     } else if (item.workOrderStatus == 20) {
@@ -1812,14 +1812,14 @@ const IndexTable = (val, Refresh) => {
         if (res.data.data.records.length) {
           Statusprocessing(res.data.data.records);
           console.log(res.data.data.records, 'res.data.data.records有值');
-          TabList.value.find(res => res.name == TabPermissions.value).DataList =res.data.data.records;
+          TabList.value.find(res => res.name == TabPermissions.value).DataList =
+            res.data.data.records;
           TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
           TabList.value.find(res => res.name == TabPermissions.value).request = false;
           console.log(TabList.value, '当前存储的值');
           details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList;
           page.value.total = TabList.value.find(res => res.name == TabPermissions.value).total;
           console.log(TabList.value, 'TabList.value===>');
-         
         } else {
           TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
           TabList.value.find(res => res.name == TabPermissions.value).total = 0;
@@ -2259,7 +2259,7 @@ const CancelappealFn = val => {
 
 //  工单申诉按钮
 const appeal = (val, state) => {
-  console.log(state,'state');
+  console.log(state, 'state');
   AppealAttachment.value = []; //清空图片
   Appealselection.value = ''; //清空责任人
   Reasonforappeal.value = ''; //清空申诉内容
@@ -2304,30 +2304,30 @@ const appeal = (val, state) => {
       details.selectionList.push(val.row);
     }
     dialogappeal.value = true; //展开申诉弹窗
-  } 
+  }
 };
 
 // 批量申诉
 
-const appealAll=()=>{
-    // 批量申诉
-    console.log(details.selectionList, 'details.selectionList');
-    if (!details.selectionList.length) {
-      ElMessage({
-        message: '请选择要申诉的数据',
-        type: 'warning',
-      });
-      return;
-    }
-    if (details.selectionList.length > 1) {
-      ElMessage({
-        message: '只能单条申诉',
-        type: 'warning',
-      });
-      return;
-    }
-    dialogappeal.value = true; //展开申诉弹窗
-}
+const appealAll = () => {
+  // 批量申诉
+  console.log(details.selectionList, 'details.selectionList');
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请选择要申诉的数据',
+      type: 'warning',
+    });
+    return;
+  }
+  if (details.selectionList.length > 1) {
+    ElMessage({
+      message: '只能单条申诉',
+      type: 'warning',
+    });
+    return;
+  }
+  dialogappeal.value = true; //展开申诉弹窗
+};
 // 确定理赔金额
 const DetermineClaims = val => {
   console.log(val.row);
@@ -2427,7 +2427,7 @@ const Appealbutton = state => {
     let data = {
       peopleEntityList: [], //参数一
       imagePath: '', //申诉图片附件
-      workOrderId:selectList.value[0],//工单ID
+      workOrderId: selectList.value[0], //工单ID
     };
     if (AppealeditorState.value) {
       data.workOrderId = details.selectionList[0].workOrderId;
@@ -3039,28 +3039,30 @@ const TimeoutHandling = (val, Refresh) => {
     size: details.page.pageSize,
     ...val,
   };
-  $_listOwn(data).then(res => {
-
-    details.loadingObj.list = false; //关闭动画加载
-    console.log(res, '超时记录');
-
-    if (res.data.data.records.length) {
-      Statusprocessing(res.data.data.records);
-      // details.data = res.data.data.records;
-      TabList.value.find(res => res.name == TabPermissions.value).DataList = res.data.data.records;
-      TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
-      TabList.value.find(res => res.name == TabPermissions.value).request = false;
-      page.value.total = TabList.value.find(res => res.name == TabPermissions.value).total;
-      details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList;
-    } else {
-      TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
-      TabList.value.find(res => res.name == TabPermissions.value).total = 0;
-      TabList.value.find(res => res.name == TabPermissions.value).request = true;
-      details.data= res.data.data.records
-    }
-  }).catch(res=>{
-    details.loadingObj.list = false; //关闭动画加载
-  });
+  $_listOwn(data)
+    .then(res => {
+      details.loadingObj.list = false; //关闭动画加载
+      console.log(res, '超时记录');
+
+      if (res.data.data.records.length) {
+        Statusprocessing(res.data.data.records);
+        // details.data = res.data.data.records;
+        TabList.value.find(res => res.name == TabPermissions.value).DataList =
+          res.data.data.records;
+        TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
+        TabList.value.find(res => res.name == TabPermissions.value).request = false;
+        page.value.total = TabList.value.find(res => res.name == TabPermissions.value).total;
+        details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList;
+      } else {
+        TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
+        TabList.value.find(res => res.name == TabPermissions.value).total = 0;
+        TabList.value.find(res => res.name == TabPermissions.value).request = true;
+        details.data = res.data.data.records;
+      }
+    })
+    .catch(res => {
+      details.loadingObj.list = false; //关闭动画加载
+    });
 };
 
 // 数据渲染公共函数
@@ -3382,8 +3384,8 @@ const ProcessingPartyFun = (val, Refresh) => {
         console.log(details.data, '存储的数据');
       } else {
         TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
-      TabList.value.find(res => res.name == TabPermissions.value).total = 0;
-      TabList.value.find(res => res.name == TabPermissions.value).request = true;
+        TabList.value.find(res => res.name == TabPermissions.value).total = 0;
+        TabList.value.find(res => res.name == TabPermissions.value).request = true;
         details.data = res.data.data.record;
       }
       loading.value = false; //关闭加载效果
@@ -3766,9 +3768,7 @@ const ResultConfirmation = val => {
 };
 
 // 审核确定
-const findingAudit=()=>{
-
-}
+const findingAudit = () => {};
 // 批量打回
 const BatchReturn = () => {
   BatchFrom.value.businessDepartment = [];
diff --git a/src/views/basic/coderule/basicTenantCode.vue b/src/views/basic/coderule/basicTenantCode.vue
index 8f8cb978..9b4b4ef4 100644
--- a/src/views/basic/coderule/basicTenantCode.vue
+++ b/src/views/basic/coderule/basicTenantCode.vue
@@ -201,7 +201,7 @@ import { getList, getDetail, add, update, remove } from '@/api/basic/basicTenant
 import option from '@/option/basic/basicTenantCode';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { setNodeHeight } from '@/utils/util';
+import { setNodeHeight, debounce } from '@/utils/util';
 
 export default {
   data() {
@@ -209,13 +209,22 @@ export default {
       columnList: [
         {
           prop: '',
-          label: '序号',
+          label: '复选框',
           type: 0,
           values: '',
           width: 60,
           checkarr: [],
           fixed: true,
         },
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: 60,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'codeType',
           label: '编码类型',
@@ -310,6 +319,33 @@ export default {
       buttonLoadingList: {
         handleSubmitBtn: false,
       },
+      onLoad: debounce(function (page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          console.log(data);
+          //编码类型数据回显
+          this.codeType.forEach(item => {
+            data.records.forEach(code => {
+              if (item.dictKey === code.codeType) {
+                code.codeType = item.dictValue;
+              }
+            });
+          });
+          //展示类型数据回显
+          this.showType.forEach(item => {
+            data.records.forEach(code => {
+              if (item.dictKey === code.showType) {
+                code.showType = item.dictValue;
+              }
+            });
+          });
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }, 500),
     };
   },
   created() {
@@ -408,6 +444,11 @@ export default {
         }
       });
     },
+    inputsc(index, row) {
+      this.query[row.prop] = index;
+      if (index === '') delete this.query[row.prop];
+      this.onLoad(this.page);
+    },
     handleAdd() {
       this.title = '新增';
       this.form = {};
@@ -493,33 +534,6 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        console.log(data);
-        //编码类型数据回显
-        this.codeType.forEach(item => {
-          data.records.forEach(code => {
-            if (item.dictKey === code.codeType) {
-              code.codeType = item.dictValue;
-            }
-          });
-        });
-        //展示类型数据回显
-        this.showType.forEach(item => {
-          data.records.forEach(code => {
-            if (item.dictKey === code.showType) {
-              code.showType = item.dictValue;
-            }
-          });
-        });
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index d21f5e66..ae888c78 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -528,7 +528,7 @@ import option from '@/option/basic/basicForklift2';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
-import { setNodeHeight } from '@/utils/util';
+import { setNodeHeight, debounce } from '@/utils/util';
 
 export default {
   data() {
@@ -536,13 +536,22 @@ export default {
       columnList: [
         {
           prop: '',
-          label: '序号',
+          label: '复选框',
           type: 0,
           values: '',
           width: 55,
           checkarr: [],
           fixed: true,
         },
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'businessLine',
           label: '事业线',
@@ -866,6 +875,62 @@ export default {
       buttonLoadingList: {
         handleSubmitBtn: false,
       },
+      onLoad: debounce(async function (page, params = {}) {
+        try {
+          this.loading = true;
+          const res = await getList(
+            page.currentPage,
+            page.pageSize,
+            Object.assign(params, this.query)
+          );
+          const { code, data } = res.data;
+
+          if (code !== 200) return;
+          // eslint-disable-next-line no-empty
+          for (let i = 0; i < data.records.length; i++) {
+            // 事业线转换
+            for (let j = 0; j < this.businessLineData.length; j++) {
+              // eslint-disable-next-line no-empty
+              if (data.records[i].businessLine == this.businessLineData[j].dictKey) {
+                data.records[i].businessLine = this.businessLineData[j].dictValue;
+              }
+            }
+            //供应商
+            for (let j = 0; j < this.supplierData.length; j++) {
+              // eslint-disable-next-line no-empty
+              if (data.records[i].supplier == this.supplierData[j].dictKey) {
+                data.records[i].supplier = this.supplierData[j].dictValue;
+              }
+            }
+            for (let j = 0; j < this.assetTypeData.length; j++) {
+              // eslint-disable-next-line no-empty
+              if (data.records[i].assetType == this.assetTypeData[j].dictKey) {
+                data.records[i].assetType = this.assetTypeData[j].dictValue;
+              }
+            }
+            for (let j = 0; j < this.forkliftTypeData.length; j++) {
+              // eslint-disable-next-line no-empty
+              if (data.records[i].forkliftType == this.forkliftTypeData[j].dictKey) {
+                data.records[i].forkliftType = this.forkliftTypeData[j].dictValue;
+              }
+            }
+            for (let j = 0; j < this.paymentMethodData.length; j++) {
+              // eslint-disable-next-line no-empty
+              if (data.records[i].paymentMethod == this.paymentMethodData[j].dictKey) {
+                data.records[i].paymentMethod = this.paymentMethodData[j].dictValue;
+              }
+            }
+          }
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        } catch (error) {
+          console.log('error :>> ', error);
+        } finally {
+          this.loading = false;
+        }
+      }, 100),
     };
   },
   mounted() {
@@ -1196,51 +1261,6 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        // eslint-disable-next-line no-empty
-        for (let i = 0; i < data.records.length; i++) {
-          // 事业线转换
-          for (let j = 0; j < this.businessLineData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].businessLine == this.businessLineData[j].dictKey) {
-              data.records[i].businessLine = this.businessLineData[j].dictValue;
-            }
-          }
-          //供应商
-          for (let j = 0; j < this.supplierData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].supplier == this.supplierData[j].dictKey) {
-              data.records[i].supplier = this.supplierData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.assetTypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].assetType == this.assetTypeData[j].dictKey) {
-              data.records[i].assetType = this.assetTypeData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.forkliftTypeData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].forkliftType == this.forkliftTypeData[j].dictKey) {
-              data.records[i].forkliftType = this.forkliftTypeData[j].dictValue;
-            }
-          }
-          for (let j = 0; j < this.paymentMethodData.length; j++) {
-            // eslint-disable-next-line no-empty
-            if (data.records[i].paymentMethod == this.paymentMethodData[j].dictKey) {
-              data.records[i].paymentMethod = this.paymentMethodData[j].dictValue;
-            }
-          }
-        }
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
     urlsplit() {
       if (this.fileList.length > 0) {
         let url = [];
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 618d11ba..89496e8e 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -244,6 +244,7 @@
           :tableData="details.nodeInfoData"
           :loading="loadingObj.stowageLoading"
           ref="nodeInfoRef"
+          :isShowRefresh="false"
         >
           <template #default="slotProps">
             <el-input-number
@@ -279,7 +280,7 @@
               </el-divider>
 
               <!-- 搜索区域 -->
-              <div v-if="!search">
+              <div v-h5uShow="!search">
                 <el-form
                   :inline="true"
                   label-width="80px"
@@ -389,7 +390,7 @@
               </el-divider>
 
               <!-- 搜索区域 -->
-              <div v-if="!search">
+              <div v-h5uShow="!search">
                 <el-form
                   :inline="true"
                   label-width="80px"
@@ -447,7 +448,11 @@
 
                 <!-- 展开搜索和刷新 -->
                 <div class="avue-crud__right">
-                  <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+                  <el-button
+                    icon="el-icon-refresh"
+                    @click="handleNewDataRefresh(item)"
+                    circle
+                  ></el-button>
                   <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
                 </div>
               </div>
@@ -463,7 +468,6 @@
                 @selection="list => item.selectionChange(list, index)"
                 :isselectfun="
                   row => {
-                    console.log(row);
                     return !Boolean(row.realNum);
                   }
                 "
@@ -574,7 +578,14 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, setNodeHeight, computeNumber, isNumber, deepClone } from '@/utils/util';
+import {
+  downloadXls,
+  setNodeHeight,
+  computeNumber,
+  isNumber,
+  deepClone,
+  debounce,
+} from '@/utils/util';
 import {
   columnList,
   nodeInfoColumnList,
@@ -616,8 +627,6 @@ const ruleFormRef = ref();
 // 节点下拉框实例
 const selectNodeRef = ref();
 
-console.log('ruleFormRef :>> ', ruleFormRef);
-
 // 获取用户信息
 const userInfo = computed(() => $store.state.user.userInfo);
 
@@ -810,7 +819,6 @@ const newColumnListNode = ref();
 
 /** vuex */
 const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
-console.log('permission :>> ', permission);
 
 /** 设置页面表格高度 */
 const setTabelHeight = async () => {
@@ -819,13 +827,9 @@ const setTabelHeight = async () => {
 
   const _listNode = document.querySelectorAll('.columnList.maboxhi');
 
-  console.log('nodeInfoRef.value.$el :>> ', nodeInfoRef.value.$el);
-
   // 节点信息列表高度
   setNodeHeight(nodeInfoRef.value.$el, 'auto');
 
-  console.log('_listNode :>> ', _listNode);
-
   if (_listNode.length === 0) return;
   setNodeHeight(_listNode, '55vh');
 };
@@ -838,10 +842,7 @@ onMounted(() => {
 // 清空复选框
 const clearSelectionList = () => {
   details.selectionList = [];
-  console.log('newColumnListNode :>> ', newColumnListNode);
-  console.log('oldColumnListNode :>> ', oldColumnListNode);
   newColumnListNode.value.forEach(val => {
-    console.log('val :>> ', val);
     val.handleCheckSelect([]);
   });
   oldColumnListNode.value.forEach(val => {
@@ -872,7 +873,7 @@ const handleEditForbidden = (_arr: any[]) => {
 };
 
 /** 请求运单数据 */
-const initOriginWarehouseOrder = async (params = {}) => {
+const initOriginWarehouseOrder = debounce(async (params = {}) => {
   try {
     details.loadingObj.oldListLoading = true;
     const submitData = {
@@ -884,7 +885,6 @@ const initOriginWarehouseOrder = async (params = {}) => {
     if (Number(details.pageType) === 2) submitData.loadId = details.loadId;
     if (submitData.orderCodes.length === 0) delete submitData.orderCodes;
     const res = await postFindAllOrderList(submitData);
-    console.log('res :>> ', res);
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = data.records;
@@ -894,7 +894,7 @@ const initOriginWarehouseOrder = async (params = {}) => {
   } finally {
     details.loadingObj.oldListLoading = false;
   }
-};
+}, 100);
 
 /** 请求添加在调度池中的数据 */
 const initDispatchOrder = async item => {
@@ -943,7 +943,6 @@ const onLoad = async () => {
       const { code, data } = res.data;
       if (code !== 200) return;
       details.pageInfo = data;
-      console.log('data.startWarehouseInfo.nodeName :>> ', data.startWarehouseInfo.nodeName);
       details.nodeInfoData = [
         {
           nodeName: data.startWarehouseInfo.warehouseName,
@@ -954,15 +953,12 @@ const onLoad = async () => {
         },
       ];
       details.nodeInfoData = handleEditForbidden(details.nodeInfoData);
-      console.log('details.nodeInfoData :>> ', details.nodeInfoData);
       details.form.startWarehouseName = data.startWarehouseInfo.warehouseName;
       details.form.startWarehouseId = data.startWarehouseInfo.warehouseId;
     }
     // 编辑
     else {
-      console.log('222 :>> ', 222);
       const res = await postSelectEditDetailByLoadId({ loadId: details.loadId });
-      console.log('res :>> ', res);
       const { code, data } = res.data;
       if (code !== 200) return;
 
@@ -987,11 +983,8 @@ const onLoad = async () => {
             loading: false,
             selectionChange(list, index) {
               details.nodeInfoData[index].selectionList = list;
-              console.log('list :>> ', list);
             },
             itemInputsc(value, row, index) {
-              console.log('this :>> ', this);
-
               try {
                 // 动态设置正则
                 const reg = new RegExp(value, 'i');
@@ -1060,7 +1053,6 @@ const remoteMethod = async val => {
   const { code, data } = res.data;
   if (code !== 200) return;
   details.options = data;
-  console.log('res :>> ', res);
 };
 
 remoteMethod('');
@@ -1101,14 +1093,12 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
-  console.log('111 :>> ', 111);
   if (index === '') delete details.query[row.prop];
   initOriginWarehouseOrder();
 };
 
 /** 表格表头时间选择 */
 const timesc = (index, row) => {
-  console.log(index, row);
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
   }
@@ -1168,6 +1158,22 @@ const setnewcolum = (newarr, headarr, type) => {
   }
 };
 
+const handleNewDataRefresh = item => {
+  for (let index = 0; index < item.lineCarsOrderList.length; index++) {
+    const iterator = item.lineCarsOrderList[index];
+    const _code = iterator.orderCode + ',' + iterator.waybillNo;
+    const _index = details.orderCodeList.indexOf(_code);
+    // 删除映射的订单号+运单号
+    details.orderCodeList.splice(_index, 1);
+  }
+
+  item.lineCarsOrderList = [];
+  item.renderData = [];
+
+  details.page.pageNum = 1;
+  initOriginWarehouseOrder();
+};
+
 /** 弹出层开启前清除数据 */
 const beforeClose = done => {
   done();
@@ -1180,7 +1186,6 @@ const handleNameChange = (type: number) => {
   const findValue = type === 1 ? form.value.driverName : form.value.assistantName;
 
   const _value = details.driverListByName.find(value => value.driverId === findValue);
-  console.log('_value :>> ', _value);
   if (type === 1) {
     form.value.driverName = _value.driverName;
     form.value.driverId = _value.driverId;
@@ -1195,7 +1200,6 @@ const handleNameChange = (type: number) => {
 /** 车辆改变 */
 const handleCarChange = (type: number) => {
   const _value = details.carListByName.find(value => value.carId === form.value.carNumber);
-  console.log('_value :>> ', _value);
   form.value.carNumber = _value.carNumber;
   form.value.carId = _value.carId;
 };
@@ -1260,11 +1264,8 @@ const handleAddNode = async (index: number) => {
     loading: false,
     selectionChange(list, index) {
       details.nodeInfoData[index].selectionList = list;
-      console.log('list :>> ', list);
     },
     itemInputsc(value, row, index) {
-      console.log('this :>> ', this);
-
       try {
         // 动态设置正则
         const reg = new RegExp(value, 'i');
@@ -1307,7 +1308,6 @@ const handleAddNode = async (index: number) => {
 
 /** 删除目的仓 */
 const handleDelNode = (index: number, row) => {
-  console.log('row :>> ', row);
   ElMessageBox.confirm('确认删除该节点吗?', '', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -1345,7 +1345,6 @@ const handleAddWaybill = async (index: number) => {
     });
   }
 
-  console.log('_node :>> ', _node);
   // 新增
   if (Number(details.pageType) === 3) return;
   for (let item of details.selectionList) {
@@ -1364,8 +1363,6 @@ const handleAddWaybill = async (index: number) => {
 
   _node.renderData = _node.lineCarsOrderList;
 
-  console.log('details.orderCodeList :>> ', details.orderCodeList);
-
   clearSelectionList();
   details.page.pageNum = 1;
   initOriginWarehouseOrder();
@@ -1374,7 +1371,6 @@ const handleAddWaybill = async (index: number) => {
 /** 移除调度池 */
 const handleRemoveWaybill = async (index: number) => {
   const _node = details.nodeInfoData[index];
-  console.log('details.nodeInfoData[index] :>> ', details.nodeInfoData[index]);
   // 新增
 
   if (!_node.nodeName || !_node.nodeId) {
@@ -1390,7 +1386,6 @@ const handleRemoveWaybill = async (index: number) => {
   _node.lineCarsOrderList = _node.lineCarsOrderList.filter((val, index) => {
     // 修改
     if (Number(details.pageType) === 2) {
-      console.log('_node :>> ', _node);
       if (val.carsOrderId) {
         const _index = _node.MappingData.indexOf(val.carsOrderId);
         _node.MappingData.splice(_index, 1);
@@ -1420,7 +1415,6 @@ const remoteMethodDriver = async val => {
   // if (!val) return;
 
   const res = await postFindDriverListByName({ driverName: val });
-  console.log('res :>> ', res);
   const { code, data } = res.data;
   if (code !== 200) return;
   details.driverListByName = data;
@@ -1434,7 +1428,6 @@ const remoteMethodCar = async val => {
   // if (!val) return;
 
   const res = await postFindCarListByName({ carNumber: val });
-  console.log('res :>> ', res);
   const { code, data } = res.data;
   if (code !== 200) return;
   details.carListByName = data;
@@ -1443,12 +1436,10 @@ remoteMethodCar('');
 
 /** 修改计划数 */
 const handleEditplanNum = ({ row }, item) => {
-  console.log('row :>> ', row);
   details.editInfo = row;
   details.editInfo.enterPlanNum = Number(row.planNum);
   details.editInfo.item = item;
 
-  console.log('details.editInfo :>> ', details.editInfo);
   details.popUpShow.editPlanNumberVisited = true;
 };
 
@@ -1548,7 +1539,6 @@ const addSubmit = async () => {
     submitData.addCarsLoadLineList[0].addList = _lineCarsOrderList;
     submitData.addCarsLoadLineList[0].removeList = [];
 
-    console.log('submitData :>> ', submitData);
     const res = await postSaveNew(submitData);
     const { code, msg } = res.data;
     if (code !== 200) return;
@@ -1609,7 +1599,6 @@ const editSubmit = async () => {
       val.sort = i + 1;
 
       const _index = details.allCarsLineList.indexOf(val.nodeId);
-      console.log('_index :>> ', _index);
       if (_index === -1) {
         // 本节点为新增
         val.updateType = 2;
@@ -1646,8 +1635,6 @@ const editSubmit = async () => {
           });
       }
 
-      console.log('_addArr.length :>> ', _addArr.length);
-      console.log('val.MappingData.length :>> ', val.MappingData.length);
       // 存在删除数据或新增数据, 则该节点存在更新
       if ((val.updateType !== 2 && _addArr.length > 0) || val.MappingData.length > 0)
         val.updateType = 1;
@@ -1660,11 +1647,6 @@ const editSubmit = async () => {
     submitData.addCarsLoadLineList[details.active].addList = _lineCarsOrderList;
     submitData.addCarsLoadLineList[details.active].removeList = details._removeList;
 
-    // const submitData = { loadId: details.loadId, ...details.form };
-
-    console.log('details.form :>> ', details.form);
-
-    console.log('submitData :>> ', submitData);
     const res = await postUpdateCarsLoadBasicData(submitData);
     const { code, msg } = res.data;
     if (code !== 200) return;
@@ -1673,7 +1655,6 @@ const editSubmit = async () => {
       type: 'success',
     });
     back();
-    // console.log('res :>> ', res);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -1693,11 +1674,6 @@ const nodeCostSubmit = async () => {
       carsLoadLineList: details.nodeInfoData,
     };
 
-    console.log('details.nodeInfoData :>> ', details.nodeInfoData);
-
-    console.log('details.form :>> ', details.form);
-
-    console.log('submitData :>> ', submitData);
     const res = await postUpdateLoadFeeByNodeId(submitData);
     const { code, msg } = res.data;
     if (code !== 200) return;
@@ -1718,7 +1694,6 @@ const nodeCostSubmit = async () => {
 const handleSubmit = (formEl: FormInstance | undefined) => {
   if (btnLoadingObj.submitBtn) return;
   if (!formEl) return;
-  console.log('111 :>> ', 111);
   formEl.validate(async (valid, fields) => {
     if (valid) {
       try {
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index b67e7b6b..a65e9ee9 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -367,7 +367,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, deepClone, setNodeHeight } from '@/utils/util';
+import { downloadXls, deepClone, setNodeHeight, debounce } from '@/utils/util';
 import { columnList, detailsColumnList } from '@/option/distribution/TripartiteTransfer';
 import { packageColumnList } from '@/option/distribution/VehicleStowage';
 import {
@@ -646,7 +646,7 @@ onMounted(() => {
 });
 
 /** 请求页面数据 */
-const onLoad = async (params = {}) => {
+const onLoad = debounce(async (params = {}) => {
   try {
     // 开启loading
     details.loadingObj.list = true;
@@ -674,7 +674,7 @@ const onLoad = async (params = {}) => {
   } finally {
     details.loadingObj.list = false;
   }
-};
+}, 10);
 
 // onLoad();
 /** 初始化页面 */
@@ -724,6 +724,7 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
+  if (index === '') delete details.query[row.prop];
   onLoad();
 };
 
diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue
index 7c670ff7..9bda7045 100644
--- a/src/views/distribution/artery/TripartiteTransferDetails.vue
+++ b/src/views/distribution/artery/TripartiteTransferDetails.vue
@@ -593,7 +593,7 @@ onMounted(() => {
 });
 
 /** 请求页面数据 */
-const onLoad = async () => {
+const onLoad = debounce(async () => {
   try {
     details.loadingObj.pageLoading = true;
 
@@ -644,7 +644,7 @@ const onLoad = async () => {
   } finally {
     details.loadingObj.pageLoading = false;
   }
-};
+}, 10);
 
 onLoad();
 
@@ -754,6 +754,7 @@ const remoteMethodDriver = async val => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
+  if (!index) delete details.query[row.prop];
   onLoad();
 };
 
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 1bd04585..4a72c90c 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -279,6 +279,7 @@
         :loading="loadingObj.list"
         @inputTxt="packageInputsc"
         @selection="list => (details.packageSelectedData = list)"
+        :isShowRefresh="false"
       >
         <template #default="slotProps">
           <el-text
@@ -353,7 +354,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, deepClone, setNodeHeight } from '@/utils/util';
+import { downloadXls, deepClone, setNodeHeight, debounce } from '@/utils/util';
 import { columnList } from '@/option/distribution/VehicleArrivalManagement';
 import { packageColumnList } from '@/option/distribution/VehicleStowage';
 import {
@@ -579,7 +580,7 @@ onMounted(() => {
 });
 
 /** 请求页面数据 */
-const onLoad = async (params = {}) => {
+const onLoad = debounce(async (params = {}) => {
   try {
     // 开启loading
     details.loadingObj.list = true;
@@ -602,13 +603,13 @@ const onLoad = async (params = {}) => {
   } finally {
     details.loadingObj.list = false;
   }
-};
+}, 10);
 
-onLoad(details.page);
+onLoad();
 
 /** 搜索 */
 const searchChange = () => {
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 清空表单 */
@@ -616,7 +617,7 @@ const searchReset = () => {
   details.query = {};
   details.stockupDate = [];
   details.page.pageNum = 1;
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 展开列表控件 */
@@ -634,7 +635,8 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
-  onLoad(details.page);
+  if (!index) delete details.query[row.prop];
+  onLoad();
 };
 
 /** 表格表头时间选择 */
@@ -647,7 +649,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -661,7 +663,7 @@ const selectsc = (index, row) => {
     details.query['certificateType'] = index;
     if (!index) delete details.query['certificateType'];
   }
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头复选框选择 */
@@ -672,7 +674,7 @@ const selectionChange = (list: any) => {
 /** 每页数量改变执行的回调 */
 const sizeChange = (pageSize: number) => {
   details.page.pageSize = pageSize;
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 页码改变执行的回调 */
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 0c9da30a..8be2cad6 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -56,40 +56,36 @@
       </div>
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增配载 </el-button>
-            <el-button type="primary" icon="el-icon-printer" @click="searchReset">打 印</el-button>
-            <el-button type="primary" icon="el-icon-printer" @click="searchReset"
-              >装载清单</el-button
-            >
-            <el-button type="primary" icon="el-icon-printer" @click="searchReset"
-              >装载卸车清单(财务)</el-button
-            >
-            <el-button type="primary" icon="el-icon-van" @click="handleStartCar">发 车</el-button>
-            <el-button type="primary" icon="el-icon-delete" @click="handleCancelStartCar"
-              >取消发车</el-button
-            >
-            <el-button type="primary" icon="el-icon-delete" @click="handleCancelCarsLoad"
-              >取消配载</el-button
-            >
-            <el-button type="primary" icon="el-icon-document" @click="handleComparativeStatement"
-              >对比报表</el-button
-            >
-            <el-button type="primary" icon="el-icon-document" @click="searchReset"
-              >卸车报告</el-button
-            >
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增配载 </el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="searchReset">打 印</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="searchReset">装载清单</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="searchReset"
+            >装载卸车清单(财务)</el-button
+          >
+          <el-button type="primary" icon="el-icon-van" @click="handleStartCar">发 车</el-button>
+          <el-button type="primary" icon="el-icon-delete" @click="handleCancelStartCar"
+            >取消发车</el-button
+          >
+          <el-button type="primary" icon="el-icon-delete" @click="handleCancelCarsLoad"
+            >取消配载</el-button
+          >
+          <el-button type="primary" icon="el-icon-document" @click="handleComparativeStatement"
+            >对比报表</el-button
+          >
+          <el-button type="primary" icon="el-icon-document" @click="searchReset"
+            >卸车报告</el-button
+          >
         </div>
-      </el-row>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+        </div>
+      </div>
 
       <!-- 列表模块 -->
       <tablecmt
@@ -286,6 +282,7 @@
         :loading="loadingObj.list"
         @inputTxt="packageInputsc"
         @selection="list => (details.packageSelectedData = list)"
+        :isShowRefresh="false"
       >
         <template #default="slotProps">
           <el-text
@@ -516,7 +513,7 @@ const details = reactive<any>({
     /** 选择目的地弹窗 */
     chooseDestinationVisited: false,
     /** 装载清单 */
-    listOfLoadedWagons: false,
+    listOfLoadedWagons: true,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -660,7 +657,7 @@ onMounted(() => {
 });
 
 /** 请求页面数据 */
-const onLoad = async (params = {}) => {
+const onLoad = debounce(async (params = {}) => {
   try {
     // 开启loading
     details.loadingObj.list = true;
@@ -693,7 +690,7 @@ const onLoad = async (params = {}) => {
   } finally {
     details.loadingObj.list = false;
   }
-};
+}, 10);
 
 const initOnload = () => {
   details.page.pageNum = 1;
@@ -746,6 +743,7 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
+  if (!index) delete details.query[row.prop];
   initOnload();
 };
 
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 922d799e..790b1760 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -113,6 +113,7 @@
             :tableData="details.nodeInfoData"
             :loading="loadingObj.stowageLoading"
             ref="nodeInfoRef"
+            :isShowRefresh="false"
           >
             <template #default="slotProps">
               <div>{{ slotProps.scope.row[slotProps.scope.column.property] }}</div>
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index 731539b7..796a23e0 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -763,7 +763,7 @@ watch(
 );
 
 /** 请求运单数据 */
-const initOriginWarehouseOrder = async (params = {}) => {
+const initOriginWarehouseOrder = debounce(async function (params = {}) {
   try {
     details.loadingObj.oldListLoading = true;
     const submitData = {
@@ -785,11 +785,11 @@ const initOriginWarehouseOrder = async (params = {}) => {
   } finally {
     details.loadingObj.oldListLoading = false;
   }
-};
+}, 100);
 
 /** 搜索 */
 const searchChange = () => {
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 清空表单 */
@@ -797,7 +797,7 @@ const searchReset = () => {
   details.query = {};
   details.stockupDate = [];
   details.page.pageNum = 1;
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 // 清空复选框
@@ -862,7 +862,7 @@ remoteMethodDriver('');
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 表格表头时间选择 */
@@ -875,7 +875,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 表格表头下拉框选择 */
@@ -886,7 +886,7 @@ const selectsc = (index, row) => {
     details.query['certificateType'] = index;
     if (!index) delete details.query['certificateType'];
   }
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 表格表头复选框选择 */
@@ -897,7 +897,7 @@ const selectionChange = (list: any) => {
 /** 表格表头输入框搜索 */
 const newInputsc = (index, row) => {
   details.newQuery[row.prop] = index;
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 表格表头时间选择 */
@@ -910,7 +910,7 @@ const newTimesc = (index, row) => {
   if (!index) {
     delete details.newQuery[row.prop];
   }
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 表格表头输入框搜索 */
@@ -924,7 +924,7 @@ const newSelectsc = (index, row) => {
     details.newQuery['certificateType'] = index;
     if (!index) delete details.newQuery['certificateType'];
   }
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 表格表头复选框选择 */
@@ -935,7 +935,7 @@ const newSelectionChange = (list: any) => {
 /** 每页数量改变执行的回调 */
 const sizeChange = (pageSize: number) => {
   details.page.pageSize = pageSize;
-  onLoad(details.page);
+  initOriginWarehouseOrder();
 };
 
 /** 页码改变执行的回调 */
diff --git a/src/views/distribution/artery/directGoMarket.vue b/src/views/distribution/artery/directGoMarket.vue
index 800782b7..b4df9f60 100644
--- a/src/views/distribution/artery/directGoMarket.vue
+++ b/src/views/distribution/artery/directGoMarket.vue
@@ -154,7 +154,7 @@ import {
   postFindWaybillOrderListToMall,
   getUpdateWaybillOrderIsCustemer,
 } from '@/api/distribution/directGoMarket';
-import { downloadXls, deepClone } from '@/utils/util';
+import { downloadXls, deepClone, debounce } from '@/utils/util';
 import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording';
 import { ElMessage } from 'element-plus';
 import { useRoute, useRouter } from 'vue-router';
@@ -287,7 +287,7 @@ onMounted(() => {
   }, 100);
 });
 
-const initOldData = async (params = {}) => {
+const initOldData = debounce(async function (params = {}) {
   try {
     details.loadingObj.oldListLoading = true;
     const submitData = {
@@ -308,9 +308,9 @@ const initOldData = async (params = {}) => {
   } finally {
     details.loadingObj.oldListLoading = false;
   }
-};
+}, 10);
 
-const initNewData = async (params = {}) => {
+const initNewData = debounce(async function (params = {}) {
   try {
     details.loadingObj.newListLoading = true;
     const submitData = {
@@ -331,11 +331,10 @@ const initNewData = async (params = {}) => {
   } finally {
     details.loadingObj.newListLoading = false;
   }
-};
+}, 10);
 
 /** 请求页面数据 */
 const onLoad = () => {
-  details;
   initOldData();
   initNewData();
 };
@@ -387,8 +386,9 @@ const searchHide = () => {
 
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-  details.query[row.prop] = index;
-  onLoad();
+  details.oldQuery[row.prop] = index;
+  if (index === '') delete details.oldQuery[row.prop];
+  initOldData();
 };
 
 /** 表格表头时间选择 */
@@ -397,11 +397,11 @@ const timesc = (index, row) => {
   if (!!index) {
     index = dayjs(index).format('YYYY-MM-DD');
   }
-  details.query[row.prop] = index;
+  details.oldQuery[row.prop] = index;
   if (!index) {
-    delete details.query[row.prop];
+    delete details.oldQuery[row.prop];
   }
-  onLoad();
+  initOldData();
 };
 
 /** 表格表头输入框搜索 */
@@ -409,13 +409,13 @@ const btnsc = () => {};
 
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
-  details.query[row.prop] = index;
-  if (!index) delete details.query[row.prop];
+  details.oldQuery[row.prop] = index;
+  if (!index) delete details.oldQuery[row.prop];
   if (row.prop === 'certificateTypeName') {
-    details.query['certificateType'] = index;
-    if (!index) delete details.query['certificateType'];
+    details.oldQuery['certificateType'] = index;
+    if (!index) delete details.oldQuery['certificateType'];
   }
-  onLoad();
+  initOldData();
 };
 
 /** 表格表头复选框选择 */
@@ -426,7 +426,7 @@ const selectionChange = (list: any) => {
 /** 表格表头输入框搜索 */
 const newInputsc = (index, row) => {
   details.newQuery[row.prop] = index;
-  onLoad();
+  initNewData();
 };
 
 /** 表格表头时间选择 */
@@ -439,7 +439,7 @@ const newTimesc = (index, row) => {
   if (!index) {
     delete details.newQuery[row.prop];
   }
-  onLoad();
+  initNewData();
 };
 
 /** 表格表头输入框搜索 */
@@ -453,7 +453,7 @@ const newSelectsc = (index, row) => {
     details.newQuery['certificateType'] = index;
     if (!index) delete details.newQuery['certificateType'];
   }
-  onLoad();
+  initNewData();
 };
 
 /** 表格表头复选框选择 */
@@ -464,23 +464,25 @@ const newSelectionChange = (list: any) => {
 /** 每页数量改变执行的回调 */
 const sizeChange = (pageSize: number) => {
   details.oldPage.pageSize = pageSize;
-  onLoad();
+  initOldData();
 };
 
 /** 页码改变执行的回调 */
 const currentChange = pageNum => {
   details.oldPage.pageNum = pageNum;
+  initOldData();
 };
 
 /** 每页数量改变执行的回调 */
 const newSizeChange = (pageSize: number) => {
   details.newPage.pageSize = pageSize;
-  onLoad();
+  initNewData();
 };
 
 /** 页码改变执行的回调 */
 const newCurrentChange = pageNum => {
   details.newPage.pageNum = pageNum;
+  initNewData();
 };
 
 /**
diff --git a/src/views/distribution/artery/directGoMarketDetails.vue b/src/views/distribution/artery/directGoMarketDetails.vue
index 635c3a60..dbd38d0e 100644
--- a/src/views/distribution/artery/directGoMarketDetails.vue
+++ b/src/views/distribution/artery/directGoMarketDetails.vue
@@ -130,6 +130,7 @@
           return Number(row.scanStatus) !== 3;
         }
       "
+      :isShowRefresh="false"
     >
       <template #default="slotProps">
         <el-text
@@ -267,7 +268,7 @@ import {
 } from '@/api/distribution/directGoMarket';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, deepClone } from '@/utils/util';
+import { downloadXls, deepClone, debounce } from '@/utils/util';
 import { columnList, detailsColumnList } from '@/option/distribution/directGoMarketDetails';
 import { useRouter, useRoute } from 'vue-router';
 
@@ -540,7 +541,7 @@ const initData = (data, row) => {
 };
 
 /** 请求页面数据 */
-const onLoad = async (params = {}) => {
+const onLoad = debounce(async (params = {}) => {
   try {
     // 开启loading
     details.loadingObj.list = true;
@@ -572,7 +573,7 @@ const onLoad = async (params = {}) => {
   } finally {
     details.loadingObj.list = false;
   }
-};
+}, 10);
 
 const initOnLoad = () => {
   details.page.pageNum = 1;
@@ -667,6 +668,7 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
+  if (index === '') delete details.query[row.prop];
   initOnLoad();
 };
 
diff --git a/src/views/distribution/artery/handleLoadingDestination.vue b/src/views/distribution/artery/handleLoadingDestination.vue
index 654b0479..fb70d01c 100644
--- a/src/views/distribution/artery/handleLoadingDestination.vue
+++ b/src/views/distribution/artery/handleLoadingDestination.vue
@@ -32,6 +32,7 @@
         @timeCheck="timesc"
         @selectCheck="selectsc"
         @selection="selectionChange"
+        :isShowRefresh="false"
       >
         <template #default="slotProps">
           <el-text @click="handleConfiguration(slotProps.scope)">配置包条码</el-text>
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index cb8ecfe5..297ce7e1 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -215,7 +215,7 @@ import {
 import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls, getHtmls } from '@/utils/util';
+import { downloadXls, getHtmls, debounce } from '@/utils/util';
 import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
 import { useRouter, useRoute } from 'vue-router';
 import print from '@/utils/print';
@@ -462,7 +462,7 @@ const initData = (data, row) => {
 };
 
 /** 请求页面数据 */
-const onLoad = async (params = {}) => {
+const onLoad = debounce(async (params = {}) => {
   try {
     // 开启loading
     details.loadingObj.list = true;
@@ -490,7 +490,7 @@ const onLoad = async (params = {}) => {
   } finally {
     details.loadingObj.list = false;
   }
-};
+}, 10);
 
 /** 搜索 */
 const searchChange = () => {
@@ -545,6 +545,8 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
+
+  if (!index) delete details.query[row.prop];
   onLoad();
 };
 
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index 80ffe2ed..57bdbaaf 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -265,7 +265,7 @@ import {
   postDeleteZeroSuppleById,
   postFindNextNodeList,
 } from '@/api/distribution/zeroAdditionalRecording';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
 import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording';
 import { ElMessage } from 'element-plus';
 import { useRoute, useRouter } from 'vue-router';
@@ -423,7 +423,7 @@ const initFinalNodeId = async () => {
 initFinalNodeId();
 
 /** 请求页面数据 */
-const onLoad = async (params = {}) => {
+const onLoad = debounce(async (params = {}) => {
   try {
     details.loadingObj.oldListLoading = true;
     const submitData = {
@@ -448,7 +448,7 @@ const onLoad = async (params = {}) => {
     details.loadingObj.oldListLoading = false;
   }
   // postloadZeroSuppleList
-};
+}, 10);
 
 onLoad();
 
@@ -481,30 +481,15 @@ const showdrawer = (_flag?: boolean, _type?: number) => {
 
 /** 是否开启搜索区 */
 const searchHide = () => {
-  function getWinHight() {
-    var windowHight = 0;
-    if (document.body.clientHeight && document.documentElement.clientHeight) {
-      windowHight =
-        document.body.clientHeight < document.documentElement.clientHeight
-          ? document.body.clientHeight
-          : document.documentElement.clientHeight;
-    } else {
-    }
-    return document.documentElement.clientHeight;
-  }
   details.search = !details.search;
-  const timer = setTimeout(() => {
-    details.listNodeList.forEach(_node => {
-      console.log('_node :>> ', _node);
-      _node.style.height = getWinHight() - _node.getBoundingClientRect().top - 70 + 'px';
-    });
-    clearTimeout(timer);
-  }, 10);
+
+  setNodeHeight(details.listNodeList, '');
 };
 
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.oldQuery[row.prop] = index;
+  if (!index) delete details.oldQuery[row.prop];
   onLoad();
 };
 
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index d6916954..93655192 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -983,7 +983,7 @@ import { columnList, packageListColumnList } from '@/option/waybill/TemporarySto
 import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
 import { getLazyTreeAll } from '@/api/base/region';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import type { FormInstance, FormRules } from 'element-plus';
+import type { FormInstance, FormRules, Action } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
 import {
   postOpenOrderFindClientInfo,
@@ -1580,7 +1580,6 @@ const totalCost = computed(() => {
 
 /** vuex */
 const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
-console.log('permission :>> ', permission);
 
 onMounted(() => {});
 
@@ -1589,8 +1588,6 @@ const handleTranslationLocation = () => {
   // 获取数据库中地址值
   const _location = details.query.destination;
 
-  console.log('_location :>> ', _location);
-
   let _arr = [];
 
   // 循环查找匹配的到站地址
@@ -1638,19 +1635,15 @@ getLazyTreeAll().then(res => {
 const onLoad = async (idsArr = []) => {
   try {
     details.query = deepClone(details.deepQuery);
-    console.log('details.query :>> ', details.deepQuery);
 
-    console.log('JSON.parse(details.pageInfo.ids) :>> ', JSON.parse(details.pageInfo.ids));
     let ids = [];
     if (idsArr.length === 0) ids = JSON.parse(details.pageInfo.ids);
     else ids = idsArr;
     const res = await getOpenOrderAdvanceToWaybillInfo({ advanceIds: ids });
     const { code, data } = res.data;
-    console.log('data :>> ', data);
     if (code !== 200) return;
     // 存储请求的数据
     info.value = deepClone(data);
-    console.log('info.value :>> ', info.value === data);
     for (let key in data) {
       details.query[key] = data[key] || '';
     }
@@ -1726,7 +1719,6 @@ const initPageInfo = async (idsArr = []) => {
     details.loadingObj.submitLoadingBtn = true;
 
     details.pageInfo = { ...$route.query };
-    console.log('details.pageInfo :>> ', details.pageInfo);
     if (details.pageInfo.type !== 'edit') await onLoad(idsArr);
     else {
       const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id });
@@ -1736,7 +1728,6 @@ const initPageInfo = async (idsArr = []) => {
       details.query = { ...data, ...data.warehouseWaybill };
       delete details.query.warehouseWaybill;
       details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
-      console.log('data :>> ', data);
       details.query.openOrderDate = data.warehouseWaybill.createTime;
       details.query.orderCode = data.warehouseWaybill.orderNo;
       details.query.transportType = '1';
@@ -1758,7 +1749,6 @@ const initPageInfo = async (idsArr = []) => {
         : data.warehouseWaybill.dpay;
       // 转译到站
       if (details.regionOptione.length !== 0) handleTranslationLocation();
-      console.log('details.query :>> ', details.query);
 
       // 初始化goodsList
       if (data.warehouseWaybill.detailList.length === 0)
@@ -1929,7 +1919,6 @@ const initOrderList = async (params = {}) => {
 
     const res = await getopenOrderAdvancePageList(details.page, { ...details.form, ...params });
     // 获取暂存单列表
-    console.log('res :>> ', res);
     const { code, data } = res.data;
     if (code !== 200) return;
 
@@ -2091,7 +2080,6 @@ const remoteMethod = val => {
 
 /** 目的仓选择时给目的仓名称赋值 */
 const destinationWarehouseNameChange = val => {
-  console.log('val :>> ', val);
   const _item = details.options.find(value => value.warehouseId === val);
   details.query.destinationWarehouseName = _item.warehouseName;
   details.query.destinationWarehouseId = _item.warehouseId;
@@ -2100,9 +2088,6 @@ const destinationWarehouseNameChange = val => {
 
 /** 计算行合计 */
 const handleComputed = (row: any) => {
-  // if (!row.price) return;
-  console.log('row :>> ', row);
-
   if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result;
   else if (row.chargeType === 2)
     row.subtotalFreight = computeNumber(row.volume, '*', row.price).result;
@@ -2174,7 +2159,6 @@ const handleChooseConsigner = (column, prop, order) => {
 
 /** 切换tabBar */
 const handleClickAll = e => {
-  console.log('e :>> ', e);
   const _name = e.props.name;
   details.orderStatus = _name;
   init();
@@ -2243,15 +2227,12 @@ const handlePayWay = (number?: number) => {
 };
 
 const handleRefreshText = (key, value, refreshValue?: string | number) => {
-  console.log('key :>> ', key);
   if (value) return;
   query.value[key] = refreshValue ? refreshValue : '';
-  console.log('query :>> ', query);
 };
 
 /** 重置数据 */
 const resetForm = (formEl: FormInstance | undefined) => {
-  console.log('formEl :>> ', formEl);
   if (!formEl) return;
   formEl.resetFields();
   details.goodsList = [
@@ -2290,7 +2271,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
         // 检测货物名称和件数是否正确填写
         const _flag = details.goodsList.every(val => {
-          console.log('val :>> ', val);
           if (!val.goodsName || !isNumber(val.num) || val.num === 0) return false;
           return true;
         });
@@ -2302,7 +2282,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
           });
         }
 
-        console.log('submit!');
         const submitData = {
           ...details.query,
           waybillDetailList: details.goodsList,
@@ -2317,7 +2296,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
         const { destination } = submitData;
 
-        console.log('destination :>> ', destination);
         if (destination.length === 1) {
           return ElMessage({ message: '请选择正确到站地址', type: 'warning' });
         }
@@ -2363,7 +2341,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
           submitData.waybillType = 1;
           if (typeof submitData.receipt === 'object')
             submitData.receipt = submitData.receipt.join(',');
-          console.log('submitData :>> ', submitData);
 
           // 记录提交参数
           details.submitData = submitData;
@@ -2409,7 +2386,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
           submitData.waybillType = 1;
           if (typeof submitData.receipt === 'object')
             submitData.receipt = submitData.receipt.join(',');
-          console.log('submitData :>> ', submitData);
 
           // 记录提交参数
           details.submitData = submitData;
@@ -2418,14 +2394,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
           if (!response.data.data) return ElMessage.warning('没有更改的数据');
 
-          // console.log(
-          //   'response.data.data.replaceAll :>> ',
-          //   response.data.data.replaceAll(';', '</ br>')
-          // );
-
           ElMessageBox.alert(response.data.data.replaceAll(';', ' <br /> '), '被更改数据', {
-            // if you want to disable its autofocus
-            // autofocus: false,
             dangerouslyUseHTMLString: true,
             confirmButtonText: '确认',
             callback: async (action: Action) => {
@@ -2452,7 +2421,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
         // 开启提示框, 是否继续开单
         if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true;
-        console.log('res :>> ', res);
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
@@ -2499,7 +2467,7 @@ const handleFindPrice = async (condition?: any) => {
 
     const { destination } = details.query;
 
-    if (destination.length <= 1) return;
+    if (!destination || destination.length <= 1) return;
     if (!details.query.consigneeId) return;
     if (!details.query.departureWarehouseId) return;
     if (!details.query.destinationWarehouseId) return;
@@ -2512,8 +2480,6 @@ const handleFindPrice = async (condition?: any) => {
       goodsIds: [] as any[],
     };
 
-    console.log(submitData);
-
     // 货物id
     if (condition) {
       const { goodsId } = condition;
@@ -2522,16 +2488,12 @@ const handleFindPrice = async (condition?: any) => {
     } else {
       const _goodsIdsArr = [];
 
-      console.log('details.goodsList', details.goodsList);
-
       // 筛选有goodsId的货物信息
       for (let index = 0; index < details.goodsList.length; index++) {
         const { goodsId } = details.goodsList[index];
         if (goodsId) _goodsIdsArr.push(goodsId);
       }
 
-      console.log('_goodsIdsArr', _goodsIdsArr);
-
       if (_goodsIdsArr.length === 0) return;
       submitData.goodsIds = _goodsIdsArr;
     }
@@ -2553,7 +2515,6 @@ const handleFindPrice = async (condition?: any) => {
     const res = await postFindArrPrice(submitData);
     // const { code, data } = res.data;
     const { code, data } = res.data;
-    console.log('data :>> ', data);
 
     if (code !== 200 || data.length === 0) return;
 
@@ -2570,7 +2531,6 @@ const handleFindPrice = async (condition?: any) => {
             condition[value.key] = isNumber(element.cost) ? Number(element.cost) : 0;
         }
       }
-      console.log('condition :>> ', condition);
       handleComputed(condition);
     } else {
       for (let idx = 0; idx < details.goodsList.length; idx++) {
@@ -2599,7 +2559,6 @@ const handleFindPrice = async (condition?: any) => {
             if (element.itemName === value.name)
               val[value.key] = isNumber(element.cost) ? Number(element.cost) : 0;
           }
-          console.log('val :>> ', val);
         }
         handleComputed(val);
       }
diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
index 82602db8..fa00c237 100644
--- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -612,7 +612,7 @@ const initData = async () => {
 /** 请求数据运单池数据
  * @param {boolean} isRefresh 是否刷新
  */
-const onLoad = async (isRefresh = false) => {
+const onLoad = debounce(async (isRefresh = false) => {
   try {
     if (isRefresh) details.addInfo.oldPages.pageNum = 1;
 
@@ -639,7 +639,7 @@ const onLoad = async (isRefresh = false) => {
   } finally {
     details.loadingObj.oldListLoading = false;
   }
-};
+}, 10);
 
 /** 初始化页面请求数据 */
 const initPage = async () => {
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index 5c6641c7..3bf679fe 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -321,23 +321,12 @@
 </template>
 
 <script lang="ts">
-import {
-  remove,
-  getListOwn,
-  getListOwnNUm,
-  getBillLadingExport,
-} from '@/api/distribution/distrilbutionBillLading';
+import { remove } from '@/api/distribution/distrilbutionBillLading';
 // 引入页面请求
 import {
   postPageList,
-  postFindChargeTypeList,
-  postSaveNew,
-  postList,
   postUpdateBillladingStatus,
-  postBillladingDetail,
   postBillladingPackageDetail,
-  postUpdateBillladingWaybillNum,
-  postAddWaybillToBillladingId,
 } from '@/api/distribution/arteryDistrilbutionBillLadingList';
 // 引入表格配置文件
 import {
@@ -348,7 +337,7 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 import dayjs from 'dayjs';
-import { downloadXls, setNodeHeight } from '@/utils/util';
+import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
 
 export default {
   data() {
@@ -473,6 +462,27 @@ export default {
           },
         },
       ],
+      /** 请求页面数据 */
+      onLoad: debounce(async function (page, params = {}) {
+        try {
+          // 开启页面loading
+          this.loading = true;
+
+          // 请求页面数据
+          const res = await postPageList({ ...page, ...this.query, ...params });
+
+          console.log('res :>> ', res);
+          const { code, data } = res.data;
+          if (code !== 200) return;
+
+          this.data = data.records;
+          this.page.total = data.total;
+        } catch (error) {
+          console.log('error :>> ', error);
+        } finally {
+          this.loading = false;
+        }
+      }),
     };
   },
   mounted() {
@@ -901,27 +911,6 @@ export default {
         bodyContent.style.height = '600px';
       });
     },
-    /** 请求页面数据 */
-    async onLoad(page, params = {}) {
-      try {
-        // 开启页面loading
-        this.loading = true;
-
-        // 请求页面数据
-        const res = await postPageList({ ...page, ...this.query, ...params });
-
-        console.log('res :>> ', res);
-        const { code, data } = res.data;
-        if (code !== 200) return;
-
-        this.data = data.records;
-        this.page.total = data.total;
-      } catch (error) {
-        console.log('error :>> ', error);
-      } finally {
-        this.loading = false;
-      }
-    },
     async getMenDian(row, num) {},
     //客户编号
     async remoteCodeMethod(query) {

From e2046745965f791cc92da603d9f141af4a3f1ae7 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 8 Mar 2024 19:06:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/VehicleStowage.js        |  11 +
 .../ArteryPrintTemplate.vue                   | 123 +++--
 .../TripartiteTransferPrintTemplate.vue       | 168 +++++++
 src/components/tablecmt/tablecmt.vue          |   6 +-
 src/main.js                                   |   3 +
 .../artery/TripartiteTransfer.vue             | 170 +++++--
 .../artery/VehicleArrivalManagement.vue       | 430 ++++++++++++------
 .../distribution/artery/VehicleStowage.vue    |  35 +-
 .../distributionDeliveryListedt.vue           |   1 +
 .../distribution/inventory/CreateOrder.vue    |   1 +
 ...teryDistrilbutionBillLadingListDetails.vue |   1 +
 .../distributionStockArticleDetails.vue       |   3 +-
 .../distributionStockArticleFrom.vue          |  28 +-
 .../distributionStockListDiscuss.vue          |   1 +
 .../inventory/distributionStockListMarket.vue |  11 +-
 .../inventory/distributionStockListSelf.vue   |   3 +-
 .../parcelList/distributionParcelList.vue     |  75 +--
 src/views/warehouse/warehouseWaybill.vue      | 158 +++++--
 18 files changed, 902 insertions(+), 326 deletions(-)
 create mode 100644 src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue

diff --git a/src/api/distribution/VehicleStowage.js b/src/api/distribution/VehicleStowage.js
index cce9b802..423e027c 100644
--- a/src/api/distribution/VehicleStowage.js
+++ b/src/api/distribution/VehicleStowage.js
@@ -136,3 +136,14 @@ export const postManualLoadingloadId = data => {
     data,
   });
 };
+
+/**
+ * 查看配载清单
+ */
+export const postFindLoadingListData = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/findLoadingListData',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
index 76e6a8c0..f0253b33 100644
--- a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
+++ b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue
@@ -10,19 +10,29 @@
             <img src="" alt="暂无图片" />
           </th>
           <th colspan="6">干线装载清单</th>
-          <th colspan="8"><img id="imgcode" /></th>
+          <th :colspan="8 + goodsTitleList.length + 1">
+            <img id="imgcode" />
+            <div>{{ renderInfo.carsNo }}</div>
+          </th>
         </tr>
         <tr>
-          <th colspan="4">始发站：</th>
-          <th colspan="6">经停站：</th>
-          <th colspan="8">目的站：</th>
+          <th colspan="4">始发站：{{ renderInfo.startWarehouseName }}</th>
+          <th colspan="6">
+            经停站：{{
+              renderInfo.endWarehouseNames.slice(0, renderInfo.endWarehouseNames.length - 1)[0] ||
+              ''
+            }}
+          </th>
+          <th :colspan="8 + goodsTitleList.length + 1">
+            目的站：{{ renderInfo.endWarehouseNames.slice(-1)[0] }}
+          </th>
         </tr>
         <tr>
-          <th colspan="4">司机：</th>
-          <th colspan="2">司机联系电话：</th>
-          <th colspan="3">车牌号：</th>
-          <th>卸车完成时间： 年 月 日</th>
-          <th colspan="8">卸车人员签字</th>
+          <th colspan="4">司机：{{ renderInfo.assistantName || '' }}</th>
+          <th colspan="2">司机联系电话：{{ renderInfo.assistantMobile || '' }}</th>
+          <th colspan="3">车牌号：{{ renderInfo.carNumber || '' }}</th>
+          <th>卸车完成时间： {{ renderInfo.unloadDate || '年  月  日' }}</th>
+          <th :colspan="8 + goodsTitleList.length + 1">卸车人员签字</th>
         </tr>
         <tr>
           <th rowspan="2">序号</th>
@@ -37,7 +47,7 @@
           <th rowspan="2">合同号</th>
           <th rowspan="2">计划件数</th>
           <th rowspan="2">货位</th>
-          <th colspan="2">装车产品明细</th>
+          <th :colspan="goodsTitleList.length + 1">装车产品明细</th>
           <th rowspan="2">合计件数</th>
           <th rowspan="2">卸车件数</th>
           <th rowspan="2">卸车网点</th>
@@ -45,63 +55,66 @@
           <th rowspan="2">异常备注</th>
         </tr>
         <tr>
-          <th>品类</th>
+          <th v-for="item in goodsTitleList" :key="item">{{ item }}</th>
+
           <th>小计</th>
         </tr>
       </thead>
       <tbody>
         <!-- 值 -->
-        <tr>
-          <td>序号</td>
+        <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
+          <td>{{ index + 1 }}</td>
           <!-- 发货单位 -->
-          <td contenteditable></td>
+          <td contenteditable>{{ value.shipper || '' }}</td>
           <!-- 开单时间 -->
-          <td contenteditable></td>
+          <td contenteditable>{{ value.createTime || '' }}</td>
           <!-- 始发仓 -->
-          <td contenteditable>始发仓</td>
+          <td contenteditable>{{ value.departureWarehouseName || '' }}</td>
           <!-- 目的仓 -->
-          <td contenteditable>目的仓</td>
+          <td contenteditable>{{ value.destinationWarehouseName || '' }}</td>
           <!-- 收货单位 -->
-          <td contenteditable>收货单位</td>
+          <td contenteditable>{{ value.consignee }}</td>
           <!-- 收货人 -->
-          <td contenteditable>收货人</td>
+          <td contenteditable>{{ value.consigneeName }}</td>
           <!-- 收货电话 -->
-          <td contenteditable>收货电话</td>
+          <td contenteditable>{{ value.consigneeMobile }}</td>
           <!-- 物流单号 -->
-          <td>物流单号</td>
+          <td>{{ value.waybillNo }}</td>
           <!-- 合同号 -->
-          <td>合同号</td>
+          <td>{{ value.orderCode }}</td>
           <!-- 计划件数 -->
-          <td contenteditable>计划件数</td>
+          <td contenteditable>{{ value.planNum }}</td>
           <!-- 货位 -->
-          <td>货位</td>
-          <td contenteditable>品类</td>
+          <td></td>
+          <td contenteditable v-for="item in goodsTitleList">
+            {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }}
+          </td>
           <!-- 小计 -->
-          <td contenteditable>小计</td>
+          <td contenteditable>{{ value.smallTotal }}</td>
           <!-- 合计件数 -->
-          <td contenteditable>合计件数</td>
+          <td contenteditable>{{ value.smallTotal }}</td>
           <!-- 卸车件数 -->
-          <td contenteditable>卸车件数</td>
+          <td contenteditable>{{ value.unloadNum }}</td>
           <!-- 卸车网点 -->
-          <td contenteditable>卸车网点</td>
+          <td contenteditable></td>
           <!-- 卸车时间 -->
-          <td contenteditable>卸车时间</td>
+          <td contenteditable></td>
           <!-- 异常备注 -->
-          <td contenteditable>异常备注</td>
+          <td contenteditable></td>
         </tr>
 
         <!-- 合计行 -->
         <tr>
           <th colspan="10">合计</th>
           <!-- 合计 -- 计划件数 -->
-          <td>计划件数</td>
-          <td></td>
+          <td contenteditable>{{ totalPlanNum }}</td>
           <td></td>
+          <td contenteditable v-for="item in goodsTitleList"></td>
           <td></td>
           <!-- 合计件数 -->
-          <td contenteditable></td>
+          <td contenteditable>{{ totalNum }}</td>
           <!-- 卸车件数 -->
-          <td contenteditable>卸车件数</td>
+          <td contenteditable>{{ totalUnLoadNum }}</td>
           <td></td>
           <td></td>
           <td></td>
@@ -119,23 +132,47 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, ref, onMounted } from 'vue';
+import { defineProps, ref, onMounted, reactive } from 'vue';
 
 const props = defineProps(['waybillInfo']);
 
 /** 运单信息 */
 const { waybillInfo } = props;
 
+/** 渲染数据 */
+const renderInfo = ref<any>({});
+/** 货物名称list */
+const goodsTitleList = reactive([]);
+/** 总件数 */
+const totalNum = ref(0);
+/** 卸车总数 */
+const totalUnLoadNum = ref(0);
+/** 计划中暑 */
+const totalPlanNum = ref(0);
+
+renderInfo.value = waybillInfo;
+
 /** 是否显示金额统计 */
 const isShowTotal = ref(false);
 
-onMounted(() => {
-  // let script = document.createElement('script');
-  // script.type = 'text/javascript';
-  // script.src = '@/utils/barcode.js';
-  // document.body.appendChild(script);
-  // document.querySelector('#imgcode').JsBarcode('12312312');
-});
+renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',');
+for (let index = 0; index < renderInfo.value.mainList.length; index++) {
+  const element = renderInfo.value.mainList[index];
+
+  totalNum.value += element.smallTotal || 0;
+  totalUnLoadNum.value += element.unloadNum || 0;
+  totalPlanNum.value += element.planNum || 0;
+
+  if (element.goodsList && element.goodsList.length > 0) {
+    for (let i = 0; i < element.goodsList.length; i++) {
+      const item = element.goodsList[i];
+
+      if (!goodsTitleList.includes(item.goodsName)) goodsTitleList.push(item.goodsName);
+    }
+  }
+}
+
+console.log('waybillInfo :>> ', waybillInfo);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
new file mode 100644
index 00000000..85d161d3
--- /dev/null
+++ b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <table
+      border="1"
+      style="width: 100%; text-align: center; border-collapse: collapse; border-spacing: 0"
+    >
+      <thead>
+        <tr>
+          <th colspan="4">
+            <img src="" alt="暂无图片" />
+          </th>
+          <th colspan="6">干线装载清单</th>
+          <th :colspan="3 + goodsTitleList.length + 1">
+            <img id="imgcode" />
+            <div>{{ renderInfo.carsNo }}</div>
+          </th>
+        </tr>
+        <tr>
+          <th colspan="4">始发站：{{ renderInfo.startWarehouseName }}</th>
+          <th colspan="6">
+            经停站：{{
+              renderInfo.endWarehouseNames.slice(0, renderInfo.endWarehouseNames.length - 1)[0] ||
+              ''
+            }}
+          </th>
+          <th :colspan="3 + goodsTitleList.length + 1">
+            目的站：{{ renderInfo.endWarehouseNames.slice(-1)[0] }}
+          </th>
+        </tr>
+        <tr>
+          <th colspan="4">承运商：{{ renderInfo.carrierName || '' }}</th>
+          <th colspan="2">承运商联系电话：{{ renderInfo.assistantMobile || '' }}</th>
+          <th colspan="2">承运单号：{{ renderInfo.carrierOrderCode || '' }}</th>
+          <th colspan="2">卸车完成时间： {{ renderInfo.unloadDate || '年  月  日' }}</th>
+          <th :colspan="3 + goodsTitleList.length + 1">卸车人员签字</th>
+        </tr>
+        <tr>
+          <th rowspan="2">序号</th>
+          <th rowspan="2">发货单位</th>
+          <th rowspan="2">开单时间</th>
+          <th rowspan="2">收货单位</th>
+          <th rowspan="2">收货人</th>
+          <th rowspan="2">收货电话</th>
+          <th rowspan="2">物流单号</th>
+          <th rowspan="2">合同号</th>
+          <th rowspan="2">计划件数</th>
+          <th rowspan="2">货位</th>
+          <th :colspan="goodsTitleList.length + 1">装车产品明细</th>
+          <th rowspan="2">合计件数</th>
+          <th rowspan="2">卸车件数</th>
+          <th rowspan="2">异常备注</th>
+        </tr>
+        <tr>
+          <th v-for="item in goodsTitleList" :key="item">{{ item }}</th>
+
+          <th>小计</th>
+        </tr>
+      </thead>
+      <tbody>
+        <!-- 值 -->
+        <tr v-for="(value, index) in renderInfo.mainList" style="word-break: break-all">
+          <td>{{ index + 1 }}</td>
+          <!-- 发货单位 -->
+          <td contenteditable>{{ value.shipper || '' }}</td>
+          <!-- 开单时间 -->
+          <td contenteditable>{{ value.createTime || '' }}</td>
+          <!-- 收货单位 -->
+          <td contenteditable>{{ value.consignee }}</td>
+          <!-- 收货人 -->
+          <td contenteditable>{{ value.consigneeName }}</td>
+          <!-- 收货电话 -->
+          <td contenteditable>{{ value.consigneeMobile }}</td>
+          <!-- 物流单号 -->
+          <td>{{ 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>
+
+        <!-- 合计行 -->
+        <tr>
+          <th colspan="8">合计</th>
+          <!-- 合计 -- 计划件数 -->
+          <td contenteditable>{{ totalPlanNum }}</td>
+          <td></td>
+          <td contenteditable v-for="item in goodsTitleList"></td>
+          <td></td>
+          <!-- 合计件数 -->
+          <td contenteditable>{{ totalNum }}</td>
+          <!-- 卸车件数 -->
+          <td contenteditable>{{ totalUnLoadNum }}</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td :colspan="14 + goodsTitleList.length">
+            <span style="display: inline-block; margin-right: 20px"> 投诉电话：4000184668 </span>
+            <span style="display: inline-block; margin-right: 20px"> 营业部电话：4000184668 </span>
+            <span style="display: inline-block; margin-right: 20px"> 系统单调度：4000184668 </span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, onMounted, reactive } from 'vue';
+
+const props = defineProps(['waybillInfo']);
+
+/** 运单信息 */
+const { waybillInfo } = props;
+
+/** 渲染数据 */
+const renderInfo = ref<any>({});
+/** 货物名称list */
+const goodsTitleList = reactive([]);
+/** 总件数 */
+const totalNum = ref(0);
+/** 卸车总数 */
+const totalUnLoadNum = ref(0);
+/** 计划中暑 */
+const totalPlanNum = ref(0);
+
+renderInfo.value = waybillInfo;
+
+/** 是否显示金额统计 */
+const isShowTotal = ref(false);
+
+renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',');
+for (let index = 0; index < renderInfo.value.mainList.length; index++) {
+  const element = renderInfo.value.mainList[index];
+
+  totalNum.value += element.smallTotal || 0;
+  totalUnLoadNum.value += element.unloadNum || 0;
+  totalPlanNum.value += element.planNum || 0;
+
+  if (element.goodsList && element.goodsList.length > 0) {
+    for (let i = 0; i < element.goodsList.length; i++) {
+      const item = element.goodsList[i];
+
+      if (!goodsTitleList.includes(item.goodsName)) goodsTitleList.push(item.goodsName);
+    }
+  }
+}
+
+console.log('waybillInfo :>> ', waybillInfo);
+</script>
+
+<style lang="scss" scoped>
+.waybillPrintTemplate_container {
+  width: 100%;
+}
+</style>
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index a2e3fce2..07fb7a3e 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -44,9 +44,7 @@
               class="mx-1"
             ></el-text>
 
-            <el-icon
-              v-if="column.type == 12 && props.isShowRefresh !== false"
-              @click="handleRefresh"
+            <el-icon v-if="column.type == 12 && props.isShowRefresh === true" @click="handleRefresh"
               ><RefreshRight
             /></el-icon>
 
@@ -348,7 +346,7 @@ let props = defineProps({
   isShowRefresh: {
     type: Boolean as PropType<boolean>,
     required: false,
-    default: true,
+    default: false,
   },
 });
 /** 勾选数据统计 */
diff --git a/src/main.js b/src/main.js
index da6f3bae..07e3b156 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,6 +27,7 @@ import SelectBox from './components/SelectBox/SelectBox.vue';
 import edittablehead from './components/edittablehead/index.vue';
 import WaybillPrintTemplate from './components/WaybillPrintTemplate/WaybillPrintTemplate.vue';
 import ArteryPrintTemplate from './components/ArteryPrintTemplate/ArteryPrintTemplate.vue';
+import TripartiteTransferPrintTemplate from './components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue';
 import { message } from './utils/resetMessage';
 import App from './App.vue';
 import 'animate.css';
@@ -56,6 +57,8 @@ app.component('SelectBox', SelectBox);
 app.component('WaybillPrintTemplate', WaybillPrintTemplate);
 /** 干线运输打印模版 */
 app.component('ArteryPrintTemplate', ArteryPrintTemplate);
+/** 三方运输打印模版 */
+app.component('TripartiteTransferPrintTemplate', TripartiteTransferPrintTemplate);
 app.config.globalProperties.$dayjs = dayjs;
 app.config.globalProperties.$functions = functions;
 app.provide('functions', functions);
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index a65e9ee9..956b54fb 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
       <!-- 搜索模块 -->
       <div v-h5uShow="!search">
@@ -74,33 +74,34 @@
       </div>
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button type="primary" icon="Plus" @click="addTransfer">新增中转 </el-button>
-            <el-button type="primary" icon="Printer" @click="searchReset()">装载清单</el-button>
-            <el-button type="primary" icon="Printer" @click="searchReset()"
-              >装载卸车清单(财务)</el-button
-            >
-            <el-button type="primary" icon="Van" @click="handleConfirmStartCar">发 车</el-button>
-            <el-button type="primary" icon="Delete" @click="handleCancelStartCar">
-              取消发车
-            </el-button>
-            <!-- 到达 -->
-            <el-button type="primary" icon="CircleCheck" @click="handleShowConfirm">
-              到 达
-            </el-button>
-            <el-button type="primary" icon="Edit" @click="editTransfer">修 改</el-button>
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
+
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button type="primary" icon="Plus" @click="addTransfer">新增中转 </el-button>
+          <el-button type="primary" icon="Printer" @click="handleShowListOfLoadedWagons"
+            >装载清单</el-button
+          >
+          <el-button type="primary" icon="Printer" @click="searchReset()"
+            >装载卸车清单(财务)</el-button
+          >
+          <el-button type="primary" icon="Van" @click="handleConfirmStartCar">发 车</el-button>
+          <el-button type="primary" icon="Delete" @click="handleCancelStartCar">
+            取消发车
+          </el-button>
+          <!-- 到达 -->
+          <el-button type="primary" icon="CircleCheck" @click="handleShowConfirm">
+            到 达
+          </el-button>
+          <el-button type="primary" icon="Edit" @click="editTransfer">修 改</el-button>
         </div>
-      </el-row>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+        </div>
+      </div>
 
       <!-- 表格 -->
       <!-- 列表模块 -->
@@ -351,6 +352,57 @@
     </template>
   </el-dialog>
 
+  <!-- 配载清单 -->
+  <el-dialog
+    title="配载清单"
+    v-model="details.popUpShow.listOfLoadedWagons"
+    width="80%"
+    append-to-body
+    :fullscreen="details.fullscreenObj.listOfLoadedWagonsPopUp"
+    :show-close="false"
+    class="listOfLoadedWagonsPopUp"
+  >
+    <!-- 标题 -- 头部控件区 -->
+    <template #header="{ close, titleId, titleClass }">
+      <div class="my-header flex-c-sb">
+        <div class="fwb" :id="titleId" :class="titleClass">配载清单</div>
+        <div class="flex-c-c">
+          <!-- 全屏显示按钮 -->
+          <el-button type="text" v-if="!details.fullscreenObj.listOfLoadedWagonsPopUp">
+            <el-icon class="" @click="handleFullScrean('open', 'listOfLoadedWagonsPopUp')"
+              ><FullScreen
+            /></el-icon>
+          </el-button>
+          <el-button type="text" v-else>
+            <el-icon class="" @click="handleFullScrean('close', 'listOfLoadedWagonsPopUp')"
+              ><CopyDocument
+            /></el-icon>
+          </el-button>
+
+          <!-- 弹窗关闭按钮 -->
+          <el-button type="text">
+            <el-icon class="" @click="close"><Close /></el-icon>
+          </el-button>
+        </div>
+      </div>
+    </template>
+
+    <div
+      :class="{
+        dialog_container: true,
+        fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
+      }"
+    >
+      <TripartiteTransferPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
+    </div>
+    <div class="flex-c-c mt10">
+      <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">
+        取 消
+      </el-button>
+      <el-button type="primary" icon="Printer" @click="handleSubmit"> 打 印 </el-button>
+    </div>
+  </el-dialog>
+
   <!-- 列表配置显示 -->
   <edittablehead
     @setcolum="setnewcolum"
@@ -378,6 +430,7 @@ import {
   postSignCars,
   postSettlementCars,
 } from '@/api/distribution/TripartiteTransfer.js';
+import { postFindLoadingListData } from '@/api/distribution/VehicleStowage';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useRouter } from 'vue-router';
 
@@ -435,6 +488,8 @@ const details = reactive<any>({
     list: false,
     /** 配置装车目的地详情 */
     truckLoadingDetailPopUpLoading: false,
+    /** 页面loading */
+    pageLoading: false,
   },
   /** 列表复选框选中的数据 */
   selectionList: [],
@@ -456,6 +511,8 @@ const details = reactive<any>({
     chooseDestinationVisited: false,
     /** 结算弹窗 */
     closeAnAccountVisited: false,
+    /** 装载清单 */
+    listOfLoadedWagons: false,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -497,6 +554,8 @@ const details = reactive<any>({
     /** 配置节点 */
     truckLoadingDetailPopUp: false,
     comparativeStatementPopUp: false,
+    /** 装载清单 */
+    listOfLoadedWagonsPopUp: false,
   },
   packageColumnList: deepClone(packageColumnList),
   /** 配置装车目的地数据 */
@@ -514,6 +573,7 @@ const details = reactive<any>({
   packageQuery: {},
   /** 结算金额表单 */
   closeAnAccountForm: { number: 0 },
+  listOfLoadedWagonsData: {},
 });
 
 /** 表格实例 */
@@ -1019,6 +1079,53 @@ const handleSubmitCloseAnAccount = async () => {
   } finally {
   }
 };
+
+/**
+ * 是否开启床车明细全屏
+ * @params(_type) 开启或关闭
+ */
+const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
+  let _node: any = '';
+  if (_name) _node = document.querySelectorAll(`.${_name} .maboxhi`);
+  console.log('_node :>> ', _node);
+
+  switch (_name) {
+    case 'comparativeStatementPopUp':
+      details.fullscreenObj.comparativeStatementPopUp =
+        !details.fullscreenObj.comparativeStatementPopUp;
+      break;
+
+    default:
+      details.fullscreenObj[_name] = !details.fullscreenObj[_name];
+      if (_type === 'close') {
+        if (_node) setNodeHeight(_node, '500px');
+      } else {
+        if (_node) setNodeHeight(_node);
+      }
+      break;
+  }
+};
+
+/** 显示装载清单 */
+const handleShowListOfLoadedWagons = async () => {
+  try {
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择装载清单');
+    if (details.selectionList.length > 1) return ElMessage.warning('只能选择一个装载清单');
+    details.loadingObj.pageLoading = true;
+    const { id } = details.selectionList[0];
+
+    const res = await postFindLoadingListData({ loadId: id });
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+    details.popUpShow.listOfLoadedWagons = true;
+    details.listOfLoadedWagonsData = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
 </script>
 
 <style scoped lang="scss">
@@ -1098,4 +1205,13 @@ const handleSubmitCloseAnAccount = async () => {
 .transferPopUp :deep(.el-textarea) {
   width: 500px;
 }
+
+.dialog_container {
+  max-height: 60vh;
+  overflow-y: scroll;
+
+  &.fullScreen {
+    max-height: 85vh;
+  }
+}
 </style>
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 4a72c90c..43a24a7b 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
       <!-- 搜索模块 -->
       <div v-h5uShow="search">
@@ -65,49 +65,44 @@
       </div>
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-van" @click="handleStartCar">发车 </el-button>
-            <el-button type="primary" icon="el-icon-close" @click="handleEndCar"
-              >网点取消发车</el-button
-            >
-            <el-button type="primary" icon="el-icon-printer" @click="searchReset()"
-              >装载清单</el-button
-            >
-            <el-button type="primary" icon="el-icon-printer" @click="handleArrive">到达</el-button>
-            <el-button type="primary" icon="el-icon-printer" @click="handleCloseArrive"
-              >取消到达</el-button
-            >
-            <el-button type="primary" icon="el-icon-delete" @click="handleUnloadByLoadId(1)">
-              中途到达卸车
-            </el-button>
-            <el-button
-              type="primary"
-              icon="el-icon-delete"
-              @click="handleShowComparativeStatement()"
-            >
-              对比报表
-            </el-button>
-            <el-button type="primary" icon="el-icon-document" @click="handleUnloadByLoadId(2)">
-              终点到达卸车
-            </el-button>
-            <el-button type="primary" icon="el-icon-document" @click="searchReset()">
-              卸车报告
-            </el-button>
-            <!-- <el-button type="primary" icon="el-icon-document" @click="searchReset()">
+
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button type="primary" icon="el-icon-van" @click="handleStartCar">发车 </el-button>
+          <el-button type="primary" icon="el-icon-close" @click="handleEndCar"
+            >网点取消发车</el-button
+          >
+          <el-button type="primary" icon="el-icon-printer" @click="handleShowListOfLoadedWagons"
+            >装载清单</el-button
+          >
+          <el-button type="primary" icon="el-icon-printer" @click="handleArrive">到达</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="handleCloseArrive"
+            >取消到达</el-button
+          >
+          <el-button type="primary" icon="el-icon-delete" @click="handleUnloadByLoadId(1)">
+            中途到达卸车
+          </el-button>
+          <el-button type="primary" icon="el-icon-delete" @click="handleShowComparativeStatement()">
+            对比报表
+          </el-button>
+          <el-button type="primary" icon="el-icon-document" @click="handleUnloadByLoadId(2)">
+            终点到达卸车
+          </el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchReset()">
+            卸车报告
+          </el-button>
+          <!-- <el-button type="primary" icon="el-icon-document" @click="searchReset()">
               欧派TIMS数据关联
             </el-button> -->
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
         </div>
-      </el-row>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+        </div>
+      </div>
 
       <!-- 表格 -->
 
@@ -338,6 +333,58 @@
     </template>
   </el-dialog>
 
+  <!-- 配载清单 -->
+  <el-dialog
+    title="配载清单"
+    v-model="details.popUpShow.listOfLoadedWagons"
+    width="80%"
+    :before-close="beforeClose"
+    append-to-body
+    :fullscreen="details.fullscreenObj.listOfLoadedWagonsPopUp"
+    :show-close="false"
+    class="listOfLoadedWagonsPopUp"
+  >
+    <!-- 标题 -- 头部控件区 -->
+    <template #header="{ close, titleId, titleClass }">
+      <div class="my-header flex-c-sb">
+        <div class="fwb" :id="titleId" :class="titleClass">配载清单</div>
+        <div class="flex-c-c">
+          <!-- 全屏显示按钮 -->
+          <el-button type="text" v-if="!details.fullscreenObj.listOfLoadedWagonsPopUp">
+            <el-icon class="" @click="handleFullScrean('open', 'listOfLoadedWagonsPopUp')"
+              ><FullScreen
+            /></el-icon>
+          </el-button>
+          <el-button type="text" v-else>
+            <el-icon class="" @click="handleFullScrean('close', 'listOfLoadedWagonsPopUp')"
+              ><CopyDocument
+            /></el-icon>
+          </el-button>
+
+          <!-- 弹窗关闭按钮 -->
+          <el-button type="text">
+            <el-icon class="" @click="close"><Close /></el-icon>
+          </el-button>
+        </div>
+      </div>
+    </template>
+
+    <div
+      :class="{
+        dialog_container: true,
+        fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
+      }"
+    >
+      <ArteryPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
+    </div>
+    <div class="flex-c-c mt10">
+      <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">
+        取 消
+      </el-button>
+      <el-button type="primary" icon="Printer" @click="handleSubmit"> 打 印 </el-button>
+    </div>
+  </el-dialog>
+
   <!-- 列表配置显示 -->
   <edittablehead
     @setcolum="setnewcolum"
@@ -370,6 +417,7 @@ import {
   postUpdateLoadScanFinalNodeIdById,
   postRemoveCarsLoadScan,
   postCancelStartCarByLoadId,
+  postFindLoadingListData,
 } from '@/api/distribution/VehicleStowage';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -428,6 +476,8 @@ const details = reactive({
     list: false,
     /** 配置装车目的地详情 */
     truckLoadingDetailPopUpLoading: false,
+    /** 全屏Loading */
+    pageLoading: false,
   },
   /** 列表复选框选中的数据 */
   selectionList: [],
@@ -447,12 +497,16 @@ const details = reactive({
     truckLoadingDetailVisited: false,
     /** 选择目的地弹窗 */
     chooseDestinationVisited: false,
+    /** 配载清单 */
+    listOfLoadedWagons: false,
   },
   /** 全屏 */
   fullscreenObj: {
     /** 装车明细 */
     truckLoadingDetailPopUp: false,
     comparativeStatementPopUp: false,
+    /** 配载清单 */
+    listOfLoadedWagonsPopUp: false,
   },
   /** 弹出层表单 */
   form: {},
@@ -487,6 +541,8 @@ const details = reactive({
   /** 被选中的数据 */
   chooseNodeId: '',
   packageQuery: {},
+  /** 配载清单数据 */
+  listOfLoadedWagonsData: {},
 });
 
 const tableNode = ref();
@@ -735,50 +791,68 @@ const handleShowComparativeStatement = () => {
 const handleArrive = async () => {
   if (details.selectionList.length == 0) return ElMessage.warning('请选择需要到车的数据');
 
-  console.log(
-    'details.selectionList.map(val => val.id) :>> ',
-    details.selectionList.map(val => val.id)
-  );
-  const submitData = {
-    loadId: details.selectionList.map(val => val.id).join(','),
-    ...details.form,
-  };
-
-  const res = await postloadArriveCarByLoadId(submitData);
-  const { code } = res.data;
-  if (code !== 200) {
-    return;
-  }
-  ElMessage({
-    type: 'success',
-    message: '到达成功',
-  });
+  ElMessageBox.confirm('确认到车?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const submitData = {
+        loadId: details.selectionList.map(val => val.id).join(','),
+        ...details.form,
+      };
 
-  onLoad();
+      const res = await postloadArriveCarByLoadId(submitData);
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '到达成功',
+      });
+
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
 };
 
 /** 取消到车 */
 const handleCloseArrive = async () => {
-  console.log(
-    'details.selectionList.map(val => val.id) :>> ',
-    details.selectionList.map(val => val.id)
-  );
-  const submitData = {
-    loadId: details.selectionList.map(val => val.id).join(','),
-    ...details.form,
-  };
-
-  const res = await postloadCancelArriveCarByLoadId(submitData);
-  const { code } = res.data;
-  if (code !== 200) {
-    return;
-  }
-  ElMessage({
-    type: 'success',
-    message: '取消成功',
-  });
+  ElMessageBox.confirm('确认取消到车?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const submitData = {
+        loadId: details.selectionList.map(val => val.id).join(','),
+        ...details.form,
+      };
 
-  onLoad();
+      const res = await postloadCancelArriveCarByLoadId(submitData);
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      });
+
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
 };
 
 /** 编辑配载信息 */
@@ -858,50 +932,65 @@ const handleStartCar = async () => {
     });
   }
 
-  // 判断是否有未有终点的装车数据
-  const res = await postDetermineHasNoFinalNode({ loadId: details.selectionList[0].id });
-
-  const { code, data } = res.data;
-  if (code !== 200) return;
-  // 根据data是否返值判断能否发车
-  if (data) {
-    details.popUpShow.truckLoadingDetailVisited = true;
-
-    details.packageData = data || [];
-    details.packageRenderData = details.packageData;
-
-    // 初始化数据
-    const _item = details.selectionList[0];
-    init(_item);
-
-    await nextTick();
-    const _node = document.querySelector('.truckLoadingDetailPopUpTable');
-    setNodeHeight(_node, '500px');
-  } else {
-    details.popUpShow.truckLoadingDetailVisited = false;
+  try {
+    details.loadingObj.pageLoading = true;
 
-    ElMessageBox.confirm('确认发车吗?', '', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }).then(async () => {
-      const submitData = {
-        loadId: details.selectionList.map(val => val.id).join(','),
-        startCarType: '2',
-      };
+    // 判断是否有未有终点的装车数据
+    const res = await postDetermineHasNoFinalNode({ loadId: details.selectionList[0].id });
 
-      const res = await postStartCarByLoadId(submitData);
-      const { code } = res.data;
-      if (code !== 200) {
-        return;
-      }
-      ElMessage({
-        type: 'success',
-        message: '发车成功',
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    // 根据data是否返值判断能否发车
+    if (data) {
+      details.popUpShow.truckLoadingDetailVisited = true;
+
+      details.packageData = data || [];
+      details.packageRenderData = details.packageData;
+
+      // 初始化数据
+      const _item = details.selectionList[0];
+      init(_item);
+
+      await nextTick();
+      const _node = document.querySelector('.truckLoadingDetailPopUpTable');
+      setNodeHeight(_node, '500px');
+    } else {
+      details.popUpShow.truckLoadingDetailVisited = false;
+
+      ElMessageBox.confirm('确认发车吗?', '', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(async () => {
+        try {
+          details.loadingObj.pageLoading = true;
+          const submitData = {
+            loadId: details.selectionList.map(val => val.id).join(','),
+            startCarType: '2',
+          };
+
+          const res = await postStartCarByLoadId(submitData);
+          const { code } = res.data;
+          if (code !== 200) {
+            return;
+          }
+          ElMessage({
+            type: 'success',
+            message: '发车成功',
+          });
+
+          onLoad();
+        } catch (error) {
+          console.log('error :>> ', error);
+        } finally {
+          details.loadingObj.pageLoading = false;
+        }
       });
-
-      onLoad();
-    });
+    }
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
   }
 };
 
@@ -924,22 +1013,29 @@ const handleEndCar = async () => {
     cancelButtonText: '取消',
     type: 'warning',
   }).then(async () => {
-    const submitData = {
-      loadId: details.selectionList.map(val => val.id).join(','),
-      startCarType: '2',
-    };
+    try {
+      details.loadingObj.pageLoading = true;
+      const submitData = {
+        loadId: details.selectionList.map(val => val.id).join(','),
+        startCarType: '2',
+      };
 
-    const res = await postCancelStartCarByLoadId(submitData);
-    const { code } = res.data;
-    if (code !== 200) {
-      return;
-    }
-    ElMessage({
-      type: 'success',
-      message: '取消成功',
-    });
+      const res = await postCancelStartCarByLoadId(submitData);
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      });
 
-    onLoad();
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
   });
 };
 
@@ -1044,24 +1140,53 @@ const handleUnloadByLoadId = (type: 1 | 2) => {
     cancelButtonText: '取消',
     type: 'warning',
   }).then(async () => {
-    const submitData = {
-      loadId: details.selectionList.map(val => val.id).join(','),
-      unloadType: type,
-    };
+    try {
+      details.loadingObj.pageLoading = true;
 
-    const res = await postUnloadByLoadId(submitData);
-    const { code } = res.data;
-    if (code !== 200) {
-      return;
-    }
-    ElMessage({
-      type: 'success',
-      message: '卸车成功',
-    });
+      const submitData = {
+        loadId: details.selectionList.map(val => val.id).join(','),
+        unloadType: type,
+      };
+
+      const res = await postUnloadByLoadId(submitData);
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '卸车成功',
+      });
 
-    onLoad();
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
   });
 };
+
+/** 显示装载清单 */
+const handleShowListOfLoadedWagons = async () => {
+  try {
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择装载清单');
+    if (details.selectionList.length > 1) return ElMessage.warning('只能选择一个装载清单');
+    details.loadingObj.pageLoading = true;
+    const { id } = details.selectionList[0];
+
+    const res = await postFindLoadingListData({ loadId: id });
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+    details.popUpShow.listOfLoadedWagons = true;
+    details.listOfLoadedWagonsData = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
 </script>
 
 <style scoped lang="scss">
@@ -1083,4 +1208,13 @@ const handleUnloadByLoadId = (type: 1 | 2) => {
   margin: 5px;
   color: var(--el-color-primary);
 }
+
+.dialog_container {
+  max-height: 60vh;
+  overflow-y: scroll;
+
+  &.fullScreen {
+    max-height: 85vh;
+  }
+}
 </style>
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 8be2cad6..16619762 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -61,7 +61,9 @@
         <div class="avue-crud__left">
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增配载 </el-button>
           <el-button type="primary" icon="el-icon-printer" @click="searchReset">打 印</el-button>
-          <el-button type="primary" icon="el-icon-printer" @click="searchReset">装载清单</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="handleShowListOfLoadedWagons">
+            装载清单
+          </el-button>
           <el-button type="primary" icon="el-icon-printer" @click="searchReset"
             >装载卸车清单(财务)</el-button
           >
@@ -351,7 +353,6 @@
     :fullscreen="details.fullscreenObj.listOfLoadedWagonsPopUp"
     :show-close="false"
     class="listOfLoadedWagonsPopUp"
-    v-loading="details.loadingObj.truckLoadingDetailPopUpTable"
   >
     <!-- 标题 -- 头部控件区 -->
     <template #header="{ close, titleId, titleClass }">
@@ -385,7 +386,7 @@
           fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
         }"
       >
-        <ArteryPrintTemplate />
+        <ArteryPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
       </div>
       <div class="dialog-footer">
         <el-button
@@ -394,7 +395,7 @@
         >
           取 消
         </el-button>
-        <el-button type="primary" icon="Print" @click="handleSubmit"> 打 印 </el-button>
+        <el-button type="primary" icon="Printer" @click="handleSubmit"> 打 印 </el-button>
       </div>
     </div>
   </el-dialog>
@@ -427,6 +428,7 @@ import {
   postUpdateLoadScanFinalNodeIdById,
   postRemoveCarsLoadScan,
   postManualLoadingloadId,
+  postFindLoadingListData,
 } from '@/api/distribution/VehicleStowage';
 import { useStore } from 'vuex';
 import { useRouter, useRoute } from 'vue-router';
@@ -513,7 +515,7 @@ const details = reactive<any>({
     /** 选择目的地弹窗 */
     chooseDestinationVisited: false,
     /** 装载清单 */
-    listOfLoadedWagons: true,
+    listOfLoadedWagons: false,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -540,6 +542,8 @@ const details = reactive<any>({
   /** 被选中的数据 */
   chooseNodeId: '',
   packageQuery: {},
+  /** 配载清单数据 */
+  listOfLoadedWagonsData: {},
 });
 
 /** 车辆状态字典 */
@@ -1211,6 +1215,27 @@ const handleManualLoading = ({ row }) => {
       // catch error
     });
 };
+
+/** 显示装载清单 */
+const handleShowListOfLoadedWagons = async () => {
+  try {
+    if (details.selectionList.length === 0) return ElMessage.warning('请选择装载清单');
+    if (details.selectionList.length > 1) return ElMessage.warning('只能选择一个装载清单');
+    details.loadingObj.pageLoading = true;
+    const { id } = details.selectionList[0];
+
+    const res = await postFindLoadingListData({ loadId: id });
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+    details.popUpShow.listOfLoadedWagons = true;
+    details.listOfLoadedWagonsData = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 1f0ca4bf..265bf93b 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -845,6 +845,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import { setNodeHeight } from '@/utils/util.js';
 import { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js';
+import print from '@/utils/print';
 
 export default {
   data() {
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 93655192..e7a41916 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -895,6 +895,7 @@
             @btnCheck="btnsc"
             @selectCheck="selectsc"
             @selection="selectionChange"
+            :isShowRefresh="false"
           >
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '操作'">
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index 6c3852b0..d40aca7a 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -98,6 +98,7 @@
             @btnCheck="btnsc"
             @selectCheck="selectsc"
             @selection="selectionChange"
+            :isShowRefresh="false"
           >
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '运单号'">
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 2ea48300..be792750 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -836,9 +836,8 @@ export default {
       this.onLoadOwn(this.page);
     },
     inputsc(index, row) {
-      console.log(index, row);
-      // console.log(index, row.prop);
       this.queryPage[row.prop] = index;
+      if (!index) delete this.queryPage[row.prop];
       this.onLoadOwn(this.page);
     },
     printTemplate() {
diff --git a/src/views/distribution/inventory/distributionStockArticleFrom.vue b/src/views/distribution/inventory/distributionStockArticleFrom.vue
index 24b87c08..9fd57a4a 100644
--- a/src/views/distribution/inventory/distributionStockArticleFrom.vue
+++ b/src/views/distribution/inventory/distributionStockArticleFrom.vue
@@ -90,6 +90,7 @@ import { getList, getDetail, add, update, remove } from '@/api/distribution/dist
 import option from '@/option/distribution/distributionStockArticleFrom';
 import { mapGetters } from 'vuex';
 import { addStockRow } from '@/api/distribution/distributionStockArticle';
+import { debounce } from '@/utils/util';
 
 export default {
   data() {
@@ -121,6 +122,19 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      onLoad: debounce(function (page, params = {}) {
+        console.log('1111 :>> ', 1111);
+        this.loading = true;
+        this.query.stockArticleId = this.$route.query.id;
+        this.query.conditions = '1';
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }, 10),
     };
   },
   watch: {
@@ -311,6 +325,7 @@ export default {
 
     inputsc(index, row) {
       this.query[row.prop] = index;
+      if (!index) delete this.query[row.prop];
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -326,19 +341,6 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad(page, params = {}) {
-      console.log('1111 :>> ', 1111);
-      this.loading = true;
-      this.query.stockArticleId = this.$route.query.id;
-      this.query.conditions = '1';
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue
index 47cd75f5..7a0d3ec5 100644
--- a/src/views/distribution/inventory/distributionStockListDiscuss.vue
+++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue
@@ -932,6 +932,7 @@ export default {
     inputsc(index, row) {
       console.log(index, row);
       // console.log(index, row.prop);
+      if (!index) delete this.query[row.prop];
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 0b5d3698..3702c9eb 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -850,8 +850,8 @@ export default {
         case '1':
           let a = this.optionsName.find(i => i.id == row);
           console.log('aaaa>>', a);
-          if(!a){
-            this.formInline.materialId=null
+          if (!a) {
+            this.formInline.materialId = null;
           }
           if (!!a) {
             this.formInline.materialCode = a.productCode;
@@ -861,7 +861,7 @@ export default {
             this.formInline.packageNum = a.packageNum;
             this.formInline.descriptionGoods = a.descriptionGoods;
             this.formInline.sku = a.sku;
-            this.formInline.materialId=a.id;
+            this.formInline.materialId = a.id;
             this.unpackFormDisable = this.formInline;
           }
           break;
@@ -929,6 +929,7 @@ export default {
       console.log(index, row);
       // console.log(index, row.prop);
       this.query[row.prop] = index;
+      if (!index) delete this.query[row.prop];
       this.onLoad(this.page);
     },
     //导出
@@ -1047,7 +1048,7 @@ export default {
         this.formInline.marketId = this.stockList.marketId;
         this.formInline.storeId = this.stockList.storeId;
         this.formInline.descriptionGoods = this.formInline.materialIdName;
-        if(!this.formInline.materialId){
+        if (!this.formInline.materialId) {
           delete this.formInline.materialId;
         }
         addParcels(this.formInline).then(() => {
@@ -1123,7 +1124,7 @@ export default {
       this.getQuery.quantityStock = row.row.quantityStock;
       this.formInline.descriptionGoods = this.getQuery.name;
       let q = this.distributionUnit.find(i => i.dictKey == this.getQuery.logpmUnit);
-      this.getQuery.logpmUnitName =q?q.dictValue:null;
+      this.getQuery.logpmUnitName = q ? q.dictValue : null;
       // getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
       //   console.log("<><>===", res.data.data);
       //   const data = res.data.data;
diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue
index 7f0918bc..5d361e26 100644
--- a/src/views/distribution/inventory/distributionStockListSelf.vue
+++ b/src/views/distribution/inventory/distributionStockListSelf.vue
@@ -917,9 +917,8 @@ export default {
       this.onLoad(this.page);
     },
     inputsc(index, row) {
-      console.log(index, row);
-      // console.log(index, row.prop);
       this.query[row.prop] = index;
+      if (!index) delete this.query[row.prop];
       this.onLoad(this.page);
     },
     //导出
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 543536fa..80156ef4 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -202,7 +202,7 @@ import {
 import { getDictionaryBiz } from '@/api/system/dict';
 import option from '@/option/distribution/distributionParcelList';
 import { mapGetters } from 'vuex';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, debounce } from '@/utils/util';
 import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import print from '@/utils/print';
@@ -677,7 +677,7 @@ export default {
       // 是否显示查询
       search: true,
       // 加载中
-      loading: false, 
+      loading: false,
       // 是否为查看模式
       view: false,
       // 查询信息
@@ -703,6 +703,35 @@ export default {
       loadingTime: [],
       /** 签收时间 */
       signingTime: [],
+      onLoad: debounce(async function (page, params = {}) {
+        this.loading = true;
+        try {
+          const res = await getpage(
+            page.currentPage,
+            page.pageSize,
+            Object.assign(params, this.query)
+          );
+          const { code, data } = res.data;
+          if (code !== 200) return;
+          console.log(res, '获取到的页面初始值');
+          for (let index = 0; index < data.records.length; index++) {
+            const element = data.records[index];
+            if (element.warehouseEntryTimeEnd) {
+              element.warehouseEntryTimeEnd = this.formatDateTime(element.warehouseEntryTimeEnd);
+            }
+
+            element.conditionsType = element.conditions === 1 ? '定制品' : '库存品';
+          }
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        } catch (error) {
+          console.log('error :>> ', error);
+        } finally {
+          this.loading = false;
+        }
+      }, 10),
     };
   },
   mounted() {
@@ -830,16 +859,15 @@ export default {
 
       this.dialogVisibleF = true;
     },
-    ViewingTrajectories(scope){
-      console.log(scope,'执行查看轨迹');
-      scope.row.orderPackageCode,//包条码
-      this.$router.push({ 
-        path: '/distribution/signdetail/packageNodeSearch',
-        query: {
-          orderPackageCode:scope.row.orderPackageCode, 
-          } 
-      }
-        );
+    ViewingTrajectories(scope) {
+      console.log(scope, '执行查看轨迹');
+      scope.row.orderPackageCode, //包条码
+        this.$router.push({
+          path: '/distribution/signdetail/packageNodeSearch',
+          query: {
+            orderPackageCode: scope.row.orderPackageCode,
+          },
+        });
     },
     handleExportInfo() {
       let row = {};
@@ -861,8 +889,8 @@ export default {
     },
 
     inputsc(index, row) {
-      if(!row.values){
-        return
+      if (!row.values) {
+        return;
       }
       this.query[row.prop] = index;
       console.log(this.query);
@@ -1112,25 +1140,6 @@ export default {
       const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
       print(orderNodeList);
     },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        console.log(res, '获取到的页面初始值');
-        res.data.data.records.forEach(item => {
-          if (item.warehouseEntryTimeEnd) {
-            item.warehouseEntryTimeEnd = this.formatDateTime(item.warehouseEntryTimeEnd);
-          }
-        });
-        this.page.total = data.total;
-        this.data = data.records.map(val => {
-          val.conditionsType = val.conditions === 1 ? '定制品' : '库存品';
-          return val;
-        });
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index 18101731..79822a8c 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 查询模块 -->
@@ -59,7 +59,12 @@
             <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)"
               >编辑</el-text
             >
-            <el-text type="primary" text icon="el-icon-edit" @click="showcd(slotProps.scope)"
+            <el-text
+              type="primary"
+              v-if="slotProps.scope.row.waybillType === 2"
+              text
+              icon="el-icon-edit"
+              @click="showcd(slotProps.scope)"
               >拆单</el-text
             >
             <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope)"
@@ -298,8 +303,8 @@
           <div></div>
         </div>
         <div>
-          <div></div>
-          <div></div>
+          <div>在库件数</div>
+          <div>{{ rowobj.handleNum }}</div>
         </div>
       </div>
       <div class="titlxbx">
@@ -338,7 +343,16 @@
               {{ itemlimit.productName }}
             </div>
             <div class="numbinput">
-              <el-input v-model="itemlimit.splitNum" type="number" placeholder="请输入数量" />
+              <el-input-number
+                class="w100"
+                :min="0"
+                :max="itemlimit.splitNum + rowobj.handleNum - totalNum"
+                :value-on-clear="0"
+                v-model="itemlimit.splitNum"
+                :controls="false"
+                :precision="0"
+                placeholder="请输入数量"
+              />
             </div>
           </div>
         </div>
@@ -376,7 +390,7 @@
     </div>
     <div class="btsbx">
       <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="hidedial()">确认</el-button>
+      <el-button type="primary" @click="hidedial">确认</el-button>
     </div>
   </el-dialog>
   <edittablehead
@@ -399,7 +413,7 @@ import {
 } from '@/api/warehouse/warehouseWaybill';
 import option from '@/option/warehouse/warehouseWaybill';
 import { mapGetters } from 'vuex';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, isNumber } from '@/utils/util';
 
 export default {
   data() {
@@ -603,6 +617,17 @@ export default {
           isshowSummary: true,
           sortable: true,
         },
+        {
+          prop: 'handleNum',
+          label: '可用数量',
+          type: 4,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          isshowSummary: true,
+          sortable: true,
+        },
         {
           prop: 'totalWeight',
           label: '总重量',
@@ -800,7 +825,7 @@ export default {
           goods: [
             {
               productName: '',
-              splitNum: '',
+              splitNum: 0,
             },
           ],
         },
@@ -819,6 +844,9 @@ export default {
       },
       rowobj: {},
       goodsAll: [],
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   mounted() {
@@ -905,6 +933,20 @@ export default {
       });
       return ids.join(',');
     },
+    totalNum() {
+      let number = 0;
+
+      for (let index = 0; index < this.orderlist.length; index++) {
+        const element = this.orderlist[index];
+
+        for (let i = 0; i < element.goods.length; i++) {
+          const item = element.goods[i];
+          number += item.splitNum || 0;
+        }
+      }
+
+      return number;
+    },
   },
   methods: {
     /**
@@ -1114,10 +1156,12 @@ export default {
         this.selectionClear();
       });
     },
-    showcd(row) {
-      this.dialogTableVisible = true;
-      this.rowobj = row.row;
+    showcd({ row }) {
+      if (row.handleNum === 0) return this.$message.warning('可用数量为0，暂无法拆单');
 
+      this.dialogTableVisible = true;
+      this.rowobj = row;
+      this.orderlist.splice(1);
       this.orderlist[0].goods = this.splitName(this.rowobj.goodsName);
     },
 
@@ -1132,6 +1176,7 @@ export default {
         var proN = t[i];
         var o = {};
         o.productName = proN;
+        o.splitNum = 0;
         arr[i] = o;
       }
       return arr;
@@ -1156,43 +1201,64 @@ export default {
     //     //o.value  //这个就是最后过来之后的值
     //     this.value = o.value
     // },
-    hidedial() {
-      //判
+    async hidedial() {
+      try {
+        this.loadingObj.pageLoading = true;
 
-      let row = [];
-      for (let index = 0; index < this.orderlist.length; index++) {
-        const element = this.orderlist[index];
-        if (element.goods) {
-          var o = element.goods[0];
-          if (!o.splitNum) {
-            this.$message({
-              type: 'waring',
-              message: '请输入拆分数量!',
-            });
-            return;
+        let _arr = [];
+
+        for (let index = 0; index < this.orderlist.length; index++) {
+          const value = this.orderlist[index];
+
+          let _flag = false;
+          for (let i = 0; i < value.goods.length; i++) {
+            const item = value.goods[i];
+
+            console.log('item :>> ', item);
+            if (isNumber(item.splitNum) && item.splitNum > 0) _flag = true;
           }
+
+          if (!_flag) continue;
+          let obj = {
+            waybillNo: this.rowobj.waybillNo,
+            customerPerson: value.name,
+            customerMobile: value.phone,
+            customerAddress: value.addres,
+            products: value.goods,
+          };
+          _arr.push(obj);
         }
-        let obj = {
-          waybillNo: this.rowobj.waybillNo,
-          customerPerson: element.name,
-          customerMobile: element.phone,
-          customerAddress: element.addres,
-          products: element.goods,
-        };
-        row.push(obj);
-      }
-      console.log(row);
 
-      splitOrder(row).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.orderlist = [];
-        this.selectionClear();
-      });
+        console.log('_arr :>> ', _arr);
 
-      this.dialogTableVisible = false;
+        if (_arr.length === 0) return this.$message.error('请选择需要拆单的数据');
+
+        this.dialogTableVisible = false;
+
+        const res = await splitOrder(_arr);
+
+        const { code, data } = res.data;
+
+        if (code !== 200) return this.$message.error('拆单失败');
+        this.$message.success('拆单成功');
+
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+
+        // splitOrder(row).then(res => {
+        //   const data = res.data.data;
+        //   this.page.total = data.total;
+        //   this.data = data.records;
+        //   this.loading = false;
+        //   this.orderlist = [];
+        //   this.selectionClear();
+        // });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        console.log('111 :>> ', 111);
+        this.loadingObj.pageLoading = false;
+      }
     },
     close() {
       this.dialogTableVisible = false;
@@ -1217,7 +1283,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .numbinput {
   margin: auto;
   width: 80% !important;
@@ -1409,4 +1475,8 @@ export default {
   display: flex;
   align-items: flex-end;
 }
+
+.w100 {
+  width: 100%;
+}
 </style>