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>