diff --git a/src/option/waybill/TemporaryStorageList.js b/src/option/waybill/TemporaryStorageList.js
index 2a075301..84ad6e80 100644
--- a/src/option/waybill/TemporaryStorageList.js
+++ b/src/option/waybill/TemporaryStorageList.js
@@ -85,6 +85,76 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'senderFactory',
+    label: '发货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'senderName',
+    label: '发货人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'senderPhone',
+    label: '发货人电话',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'senderAddress',
+    label: '发货地址',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'consigneePerson',
+    label: '商场联系人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'consigneeMobile',
+    label: '联系电话',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'consigneeAddress',
+    label: '地址',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'lineNameTitle',
     label: '干仓配',
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 43a24a7b..8a7aaf6b 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -194,6 +194,43 @@
               @click="handleEditStowage(slotProps.scope)"
               >编辑</el-text
             >
+
+            <el-dropdown>
+              <span class="el-dropdown-link">
+                <el-text>
+                  更多 <el-icon class="el-icon--right"><arrow-down /></el-icon
+                ></el-text>
+              </span>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item v-if="Mydata.id === slotProps.scope.row.nowWarehouseId">
+                    <el-text @click="handleNodeCost(slotProps.scope)"> 节点费用 </el-text>
+                  </el-dropdown-item>
+
+                  <el-dropdown-item v-if="Mydata.id === slotProps.scope.row.nowWarehouseId">
+                    <el-text @click="handleDirectGoMarketVesited(slotProps.scope)">
+                      配置直发商家
+                    </el-text>
+                  </el-dropdown-item>
+
+                  <el-dropdown-item>
+                    <el-text @click="handleDirectGoMarketDetails(slotProps.scope)">
+                      签收详情
+                    </el-text>
+                  </el-dropdown-item>
+
+                  <el-dropdown-item
+                    v-if="
+                      Mydata.id === slotProps.scope.row.nowWarehouseId &&
+                      Number(slotProps.scope.row.loadingType) === 1 &&
+                      Number(slotProps.scope.row.loadStatus) === 20
+                    "
+                  >
+                    <el-text @click="handleManualLoading(slotProps.scope)"> 手动装车 </el-text>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </template>
         </template>
       </tablecmt>
@@ -417,6 +454,7 @@ import {
   postUpdateLoadScanFinalNodeIdById,
   postRemoveCarsLoadScan,
   postCancelStartCarByLoadId,
+  postManualLoadingloadId,
   postFindLoadingListData,
 } from '@/api/distribution/VehicleStowage';
 import { useRouter } from 'vue-router';
@@ -1187,6 +1225,29 @@ const handleShowListOfLoadedWagons = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 手动装车 */
+const handleManualLoading = ({ row }) => {
+  console.log('row :>> ', row);
+  ElMessageBox.confirm(`是否进行手动装车?`)
+    .then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const response = await postManualLoadingloadId({ loadId: row.id });
+        if (response.data.code !== 200) return;
+        ElMessage.success(response.data.msg);
+        onLoad();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {
+      // catch error
+    });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 837f65be..46c33deb 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -197,7 +197,12 @@
                       </el-text>
                     </el-dropdown-item>
 
-                    <el-dropdown-item v-if="Mydata.id === slotProps.scope.row.nowWarehouseId">
+                    <el-dropdown-item
+                      v-if="
+                        Mydata.id === slotProps.scope.row.nowWarehouseId &&
+                        Number(slotProps.scope.row.loadingType) === 1
+                      "
+                    >
                       <el-text @click="handleManualLoading(slotProps.scope)"> 手动装车 </el-text>
                     </el-dropdown-item>
                   </el-dropdown-menu>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index df823450..01322f0f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -518,23 +518,22 @@
                   >
                 </template>
               </template>
-              
             </tablecmt>
             <div class="avue-crud__pagination" style="width: 100%">
-          <!-- 分页模块 -->
-          <el-pagination
-            background
-            @size-change="wsizeChange"
-            @current-change="wcurrentChange"
-            :current-page="wpage.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="wpage.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="wpage.total"
-          >
-            <!--                        :align="center"-->
-          </el-pagination>
-        </div>
+              <!-- 分页模块 -->
+              <el-pagination
+                background
+                @size-change="wsizeChange"
+                @current-change="wcurrentChange"
+                :current-page="wpage.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="wpage.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="wpage.total"
+              >
+                <!--                        :align="center"-->
+              </el-pagination>
+            </div>
           </el-tab-pane>
           <el-tab-pane label="库存品包件" name="reservationInventoryPackage">
             <el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary"
@@ -580,20 +579,20 @@
               </template>
             </tablecmt>
             <div class="avue-crud__pagination" style="width: 100%">
-          <!-- 分页模块 -->
-          <el-pagination
-            background
-            @size-change="InventoryChange"
-            @current-change="InventorycurrentChange"
-            :current-page="wpage.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="wpage.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="wpage.total"
-          >
-            <!--                        :align="center"-->
-          </el-pagination>
-        </div>
+              <!-- 分页模块 -->
+              <el-pagination
+                background
+                @size-change="InventoryChange"
+                @current-change="InventorycurrentChange"
+                :current-page="wpage.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="wpage.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="wpage.total"
+              >
+                <!--                        :align="center"-->
+              </el-pagination>
+            </div>
           </el-tab-pane>
           <!--          <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
           <!--          <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
@@ -641,29 +640,25 @@
                 </template>
               </template>
             </tablecmt>
-        <!-- 分页模块 -->
-          <div class="avue-crud__pagination" style="width: 100%">
-          <!-- 分页模块 -->
-          <el-pagination
-            background
-            @size-change="zeroChange"
-            @current-change="zerocurrentChange"
-            :current-page="zeroPg.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="zeroPg.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="zeroPg.total"
-          >
-            <!--                        :align="center"-->
-          </el-pagination>
-        </div>
-
-
-
+            <!-- 分页模块 -->
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                background
+                @size-change="zeroChange"
+                @current-change="zerocurrentChange"
+                :current-page="zeroPg.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="zeroPg.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="zeroPg.total"
+              >
+                <!--                        :align="center"-->
+              </el-pagination>
+            </div>
           </el-tab-pane>
         </el-tabs>
 
-
         <!-- 表单按钮 -->
         <!--        <template #footer>-->
         <!--          <span v-if="!view" class="dialog-footer">-->
@@ -822,7 +817,7 @@
         width="70vw"
         v-model="dialogVisibleF"
       >
-        <div>
+        <div class="waybill">
           <div v-html="html"></div>
         </div>
         <span slot="footer" class="dialog-footer flex-c-c mt10">
@@ -834,12 +829,12 @@
 
     <!-- 打印模块 -->
     <el-dialog title="二维码" :visible.sync="isShowPrint" width="780px" v-model="isShowPrint">
-      <div>
+      <div class="BarCode">
         <div v-html="html"></div>
       </div>
       <span slot="footer" class="dialog-footer flex-c-c mt10">
         <el-button @click="isShowPrint = false">关 闭</el-button>
-        <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
+        <el-button type="primary" icon="Printer" @click="printTemplatePackage">打 印</el-button>
       </span>
     </el-dialog>
 
@@ -2344,7 +2339,7 @@ export default {
       //状态列表
       stateData: [],
       // 表单配置
-      zeroPg:{
+      zeroPg: {
         currentPage: 1,
         pageSize: 30,
         total: 40,
@@ -4006,9 +4001,7 @@ export default {
           this.LessThantruckloadListData = data.records;
           this.zeroPg.total = data.total;
         })
-        .catch(() => {
-
-        })
+        .catch(() => {})
         .finally(() => {
           this.loading = false; //关闭加载
         });
@@ -4312,7 +4305,7 @@ export default {
       }
     },
     // 库存品查看二维码
-    async handleStockQRCode(row){
+    async handleStockQRCode(row) {
       try {
         this.loadingObj.pageLoading = true;
 
@@ -4463,7 +4456,7 @@ export default {
       const allSigned = this.LessThantruckloadListData.every(
         item => item.signingStatusName == '待签收' || item.signingStatusName == '部分签收'
       );
-      console.log(allSigned,'allSigned');
+      console.log(allSigned, 'allSigned');
       if (!allSigned) {
         let temp = {};
         console.log(true); // 如果都已签收，返回true
@@ -4472,7 +4465,7 @@ export default {
           message: `${temp.orderCode}运单号已签收`,
           type: 'warning',
         });
-        return
+        return;
       }
 
       this.$confirm('是否进行批量签收？')
@@ -4483,27 +4476,28 @@ export default {
             reservationId: this.wid,
             zeroPackageIds: this.selectionList.map(item => item.id).join(','),
           };
-          $_deliveryZeroPackage(data).then(res => {
-            if (res.data.code == 200) {
-              ElMessage({
-              showClose: true,
-              message: res.data.msg,
-              type: 'success',
+          $_deliveryZeroPackage(data)
+            .then(res => {
+              if (res.data.code == 200) {
+                ElMessage({
+                  showClose: true,
+                  message: res.data.msg,
+                  type: 'success',
+                });
+                this.truckload(this.page);
+                this.selectionList = [];
+              }
             })
-              this.truckload(this.page);
-              this.selectionList = [];
-            }
-          }).catch(()=>{
-
-          }).finally(()=>{
-            this.loading = false; //关闭加载
-          });
+            .catch(() => {})
+            .finally(() => {
+              this.loading = false; //关闭加载
+            });
         })
         .catch(() => {});
     },
     // 零担批量计划取消
     LdBatchcancellation() {
-      return
+      return;
       if (!this.selectionList.length) {
         ElMessage({
           message: '请勾选需要计划取消的数据',
@@ -4568,12 +4562,19 @@ export default {
           this.loading = false;
         });
     },
-    /**
+    /**printTemplate
      * 打印
      */
+    printTemplatePackage() {
+      const orderNode = document.querySelectorAll('.BarCode>div>div');
+      console.log('orderNode :>> ', orderNode);
+
+      print(orderNode);
+    },
     printTemplate() {
-      const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      print(orderNodeList);
+      const orderNode = document.querySelectorAll('.waybill>div>div');
+      console.log('orderNode :>> ', orderNode);
+      print(orderNode);
     },
     handleSubmit() {
       this.$refs.form.validate(valid => {
@@ -5241,27 +5242,27 @@ export default {
       this.getWrapdetails(this.wpage);
     },
     // 包件库存品
-    InventorycurrentChange(currentPage){
+    InventorycurrentChange(currentPage) {
       this.wpage.currentPage = currentPage;
-      this.getReservationInventoryPackageListInfo(this.wpage)
+      this.getReservationInventoryPackageListInfo(this.wpage);
     },
     wsizeChange(pageSize) {
       this.wpage.pageSize = pageSize;
       this.getWrapdetails(this.wpage);
     },
     // 包件库存品
-    InventoryChange(pageSize){
+    InventoryChange(pageSize) {
       this.wpage.pageSize = pageSize;
-      this.getReservationInventoryPackageListInfo(this.wpage)
+      this.getReservationInventoryPackageListInfo(this.wpage);
     },
     // 零担
-    zeroChange(pageSize){
+    zeroChange(pageSize) {
       this.zeroPg.pageSize = pageSize;
       this.truckload(this.zeroPg);
     },
     // 零担
-    zerocurrentChange(currentPage){
-      this.zeroPg.currentPag=currentPage;
+    zerocurrentChange(currentPage) {
+      this.zeroPg.currentPag = currentPage;
       this.truckload(this.zeroPg);
     },
     winputsc(index, row) {
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 5a7b2957..c289356c 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -80,8 +80,8 @@
         <div class="avue-crud__left">
           <el-button type="primary" icon="Printer" @click="batchPrint">打 印</el-button>
           <el-button type="primary" icon="Edit" @click="editOrder">改 单</el-button>
-          <el-button type="primary" icon="Plus" @click="searchChange">加入挑单夹</el-button>
-          <el-button type="primary" icon="Location" @click="searchChange">运单跟踪</el-button>
+          <!-- <el-button type="primary" icon="Plus" @click="searchChange">加入挑单夹</el-button> -->
+          <!-- <el-button type="primary" icon="Location" @click="searchChange">运单跟踪</el-button> -->
           <el-button type="primary" icon="Delete" @click="handleBatchDelete">批量作废</el-button>
           <el-button type="primary" icon="Rank" @click="handleBatchFreeze">冻 结</el-button>
           <el-button type="primary" icon="Refresh" @click="handleBatchRecover">恢 复</el-button>