diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js
index e315e83a..1d0c3bfe 100644
--- a/src/api/distribution/distributionReservation.js
+++ b/src/api/distribution/distributionReservation.js
@@ -9,8 +9,8 @@ export const getList = (current, size, params) => {
       current,
       size,
     },
-  })
-}
+  });
+};
 
 export const getReservationList = (current, size, params) => {
   return request({
@@ -21,98 +21,98 @@ export const getReservationList = (current, size, params) => {
       current,
       size,
     },
-  })
-}
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-distribution/reservation/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
 /**
  * 预约数据导出
  * @param row
  * @returns {AxiosPromise}
  */
-export const reservationExport = (row) => {
+export const reservationExport = row => {
   return request({
     url: '/api/logpm-distribution/reservation/export-distrbutionReservation',
     method: 'get',
     params: {
-      ...row
+      ...row,
     },
     responseType: 'blob',
-  })
-}
+  });
+};
 
 /**
  * 预约订单数据详情导出
  * @param row
  * @returns {AxiosPromise}
  */
-export const reservationInfoStockArticleExport = (row) => {
+export const reservationInfoStockArticleExport = row => {
   return request({
     url: '/api/logpm-distribution/reservationStockarticle/export-distributionReservationStockarticle',
     method: 'get',
     params: {
-      ...row
+      ...row,
     },
     responseType: 'blob',
-  })
-}
+  });
+};
 /**
  * 预约包件数据详情导出
  * @param row
  * @returns {AxiosPromise}
  */
-export const reservationInfoPackageExport = (row) => {
+export const reservationInfoPackageExport = row => {
   return request({
     url: '/api/logpm-distribution/reservationPackage/distributionReservationPackage/export-distributionReservationPackage',
     method: 'get',
     params: {
-      ...row
+      ...row,
     },
     responseType: 'blob',
-  })
-}
+  });
+};
 /**
  * 预约库存平数据详情导出
  * @param row
  * @returns {AxiosPromise}
  */
-export const reservationInfoStockListExport = (row) => {
+export const reservationInfoStockListExport = row => {
   return request({
     url: '/api/logpm-distribution/reservationStocklist/distributionReservationStocklist/export-distributionReservationStocklist',
     method: 'get',
     params: {
-      ...row
+      ...row,
     },
     responseType: 'blob',
-  })
-}
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-distribution/reservation/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-distribution/reservation/save',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
 /**
  * 取消预约指定包件
@@ -123,203 +123,204 @@ export const cancelReservationPackage = data => {
   return request({
     url: '/api/logpm-distribution/reservation/cancelReservationPackage',
     method: 'post',
-    data: data
-  })
-}
-
+    data: data,
+  });
+};
 
-export const autonomouslySave = (row) => {
+export const autonomouslySave = row => {
   return request({
     url: '/api/logpm-distribution/reservation/autonomouslySave',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-distribution/reservation/update',
     method: 'post',
-    data: row
-  })
-}
-
-
+    data: row,
+  });
+};
 
-export const updateReservation = (row) => { //修改用户信息
+export const updateReservation = row => {
+  //修改用户信息
   return request({
     url: '/api/logpm-distribution/reservation/updateClient',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
 /**
  * 批量转备货
  * @param ids 预约列表id
  * @returns {AxiosPromise}
  */
-export const confirms = (row) => {
+export const confirms = row => {
   return request({
     url: '/api/logpm-distribution/reservation/stockUpTask',
     method: 'post',
-    data:row
-  })
-}
+    data: row,
+  });
+};
 
 /**
  * 预约批量确认
  * @param row
  * @returns {AxiosPromise}
  */
-export const addReservations = (row) => {
+export const addReservations = row => {
   return request({
     url: '/api/logpm-distribution/reservation/confirmReservations',
     method: 'post',
-    data:row
-  })
-}
+    data: row,
+  });
+};
 
 /**
  * 预约批量确认
  * @param row
  * @returns {AxiosPromise}
  */
-export const getReservationAddr = (ids) => {
+export const getReservationAddr = ids => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationAddr',
     method: 'get',
-    params:{
-      ids
-    }
-  })
-}
-
+    params: {
+      ids,
+    },
+  });
+};
 
 /**
  * 预约转配送任务
  * @param row
  * @returns {AxiosPromise}
  */
-export const deliveryTask = (data) => {
+export const deliveryTask = data => {
   return request({
     url: '/api/logpm-distribution/reservation/deliveryTask',
     method: 'post',
-    data:data
-  })
-}
-
+    data: data,
+  });
+};
 
-export const getReservationInfo = (reservationId) => {
+export const getReservationInfo = reservationId => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationInfo',
     method: 'get',
-    params:{
-      reservationId
-    }
-  })
-}
+    params: {
+      reservationId,
+    },
+  });
+};
 
 /**
  * 预约批量确认
  * @param row
  * @returns {AxiosPromise}
  */
-export const deliveryBusinessTask = (data) => {
+export const deliveryBusinessTask = data => {
   return request({
     url: '/api/logpm-distribution/reservation/deliveryBusinessTask',
     method: 'post',
-    data:data
-  })
-}
+    data: data,
+  });
+};
 
 /**
  * 取消预约
  * @param data
  * @returns {AxiosPromise}
  */
-export const cancelReservation = (data) => {
+export const cancelReservation = data => {
   return request({
     url: '/api/logpm-distribution/reservation/cancelReservation',
     method: 'put',
-    data:data
-  })
-}
+    data: data,
+  });
+};
 
-export const getReservationDetail = (id) => {
+export const getReservationDetail = id => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationDetail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const getReservationPackage = (reservationId,id) => {
+export const getReservationPackage = (reservationId, id) => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationPackage',
     method: 'get',
     params: {
       reservationId,
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const getReservationPackageList = (reservationId,id) => {
+export const getReservationPackageList = (reservationId, id) => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationPackageList',
     method: 'get',
     params: {
       reservationId,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getReservationStockListInfo = (reservationId) => {
+export const getReservationStockListInfo = reservationId => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationStockListInfo',
     method: 'get',
     params: {
       reservationId,
-    }
-  })
-}
+    },
+  });
+};
 
-export const patchPrintList = (ids) => {
+/**
+ * 批量打印预约单
+ * @param {*} ids
+ * @returns
+ */
+export const patchPrintList = ids => {
   return request({
     url: '/api/logpm-distribution/deliveryList/printBatchByReservation',
     method: 'post',
-    params: ids
+    params: ids,
   });
-}
+};
 
 /**
  * 查询预约计划零担详情
  * @param ids
  * @returns {AxiosPromise}
  */
-export const getReservationZeroOrderDetail = (reservationId,id) => {
+export const getReservationZeroOrderDetail = (reservationId, id) => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationZeroOrderDetail',
     method: 'get',
-    params: { id,reservationId }
+    params: { id, reservationId },
   });
-}
+};
 
 /**
  * 查询预约计划零担详情
  * @param ids
  * @returns {AxiosPromise}
  */
-export const getDeliveryZeroOrderDetail = (deliveryId,orderId) => {
+export const getDeliveryZeroOrderDetail = (deliveryId, orderId) => {
   return request({
     url: '/api/logpm-distribution/deliveryList/getDeliveryZeroOrderDetail',
     method: 'get',
-    params: { deliveryId,orderId }
+    params: { deliveryId, orderId },
   });
-}
+};
 export const $_getDeliveryZeroOrderDetail = params => {
   return request({
     url: '/api/logpm-distribution/deliveryList/getDeliveryZeroOrderDetail',
@@ -332,21 +333,10 @@ export const $_getDeliveryZeroOrderDetail = params => {
  * @param ids
  * @returns {AxiosPromise}
  */
-export const getReservationPackageListByOrderId = (current, size,params) => {
+export const getReservationPackageListByOrderId = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/reservation/getReservationPackageListByOrderId',
     method: 'get',
-    params: { current, size,...params }
+    params: { current, size, ...params },
   });
-}
-
-
-
-
-
-
-
-
-
-
-
+};
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index de74e03e..5092a19f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container class="basic-container">
+  <basic-container class="basic-container" v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 查询模块 -->
@@ -590,7 +590,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '200',
+          width: '250',
           checkarr: [],
           fixed: 'right',
           sortable: false,
@@ -620,6 +620,9 @@ export default {
       data: [],
       driverData: [],
       vehicleData: [],
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   watch: {
@@ -1195,18 +1198,26 @@ export default {
         this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.isShow = true;
-      this.html = '';
-      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 1 });
-      console.log('res :>> ', res);
-      const {
-        data: { code, data },
-      } = res;
-      if (code === 200) {
-        // 初始化打印页面
-        data.forEach(item => {
-          this.html += item.templateHtml;
-        });
+      try {
+        this.loadingObj.pageLoading = true;
+
+        this.html = '';
+        const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 1 });
+        this.isShow = true;
+        console.log('res :>> ', res);
+        const {
+          data: { code, data },
+        } = res;
+        if (code === 200) {
+          // 初始化打印页面
+          data.forEach(item => {
+            this.html += item.templateHtml;
+          });
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
     },
 
@@ -1214,19 +1225,26 @@ export default {
      * 获取单个打印页面
      */
     async printOrder(row) {
-      console.log('row :>> ', row);
-      this.html = '';
-      const res = await printBatch({ ids: row.id, type: 1 });
-      console.log('res :>> ', res);
-      const {
-        data: { code, data },
-      } = res;
-      if (code === 200) {
-        // 初始化打印页面
-        data.forEach(item => {
-          this.html += item.templateHtml;
-        });
-        this.isShow = true;
+      try {
+        this.loadingObj.pageLoading = true;
+        console.log('row :>> ', row);
+        this.html = '';
+        const res = await printBatch({ ids: row.id, type: 1 });
+        console.log('res :>> ', res);
+        const {
+          data: { code, data },
+        } = res;
+        if (code === 200) {
+          // 初始化打印页面
+          data.forEach(item => {
+            this.html += item.templateHtml;
+          });
+          this.isShow = true;
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
     },
 
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 41a40936..1f0ca4bf 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <el-divider>基本信息</el-divider>
       <!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
@@ -162,7 +162,6 @@
                 >打印
               </el-text>
 
-
               <el-text
                 type="primary"
                 text
@@ -261,7 +260,9 @@
           >
             <template #default="slotProps">
               <el-text size="small" @click="handleQRCode(slotProps.scope.row)">查看二维码</el-text>
-              <el-text size="small" @click="ViewingTrajectories(slotProps.scope.row)">查看轨迹</el-text>
+              <el-text size="small" @click="ViewingTrajectories(slotProps.scope.row)"
+                >查看轨迹</el-text
+              >
             </template>
           </tablecmt>
 
@@ -727,7 +728,7 @@
               <img w-full :src="dialogImageUrlE" alt="IMG" />
             </el-dialog>
           </div>
-          <div class="tj-ttn">
+          <div class="flex-c-c mt10">
             <el-button type="primary" @click="submitForm" :disabled="TCloading">确定</el-button>
             <el-button type="primary" @click="cancellation">取消</el-button>
           </div>
@@ -737,16 +738,15 @@
       <el-dialog
         title="二维码"
         :visible.sync="dialogVisibleF"
-        width="780px"
+        width="70vw"
         v-model="dialogVisibleF"
       >
         <div>
           <div v-html="html"></div>
         </div>
-        <span slot="footer" class="dialog-footer">
-          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
-          <el-button @click="dialogVisibleF = false">取 消</el-button>
+        <span slot="footer" class="dialog-footer flex-c-c mt10">
+          <el-button @click="dialogVisibleF = false">关 闭</el-button>
+          <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
         </span>
       </el-dialog>
     </div>
@@ -756,53 +756,49 @@
       <div>
         <div v-html="html"></div>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="printTemplate">打 印</el-button>
-        <el-button type="primary" @click="isShowPrint = false">确 定</el-button>
-        <el-button @click="isShowPrint = false">取 消</el-button>
+      <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>
       </span>
     </el-dialog>
 
-
     <el-dialog
-    title="异常装车包件列表"
-    v-model="abnormalBox"
-    width="67%"
-    append-to-body
-    @close="Abnormalshutdown"
-    class="el_abnormalBox"
-  >
-
-           <tablecmt
-              :columnList="AbnormalReview"
-              :tableData="AbnormalReviewData"
-              :loading="AbnormalReviewloading"
-              @inputTxt="inputscReservationPackage"
-              @timeCheck="timescReservationPackage"
-              @selectCheck="selectscReservationPackage"
-              ref="YcwtableBox"
-              @selection="selectionChange"
+      title="异常装车包件列表"
+      v-model="abnormalBox"
+      width="67%"
+      append-to-body
+      @close="Abnormalshutdown"
+      class="el_abnormalBox"
+    >
+      <tablecmt
+        :columnList="AbnormalReview"
+        :tableData="AbnormalReviewData"
+        :loading="AbnormalReviewloading"
+        @inputTxt="inputscReservationPackage"
+        @timeCheck="timescReservationPackage"
+        @selectCheck="selectscReservationPackage"
+        ref="YcwtableBox"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label == '操作'">
+            <el-text
+              v-if="
+                slotProps.scope.row.auditingStatus === 1 ||
+                slotProps.scope.row.auditingStatusName == '待审核'
+              "
+              size="small"
+              @click="auditing(slotProps.scope.row)"
+              >审 核</el-text
             >
-              <template #default="slotProps">
-                <template v-if="slotProps.scope.column.label == '操作'">
-
-                  <el-text
-                  v-if="slotProps.scope.row.auditingStatus === 1 || slotProps.scope.row.auditingStatusName == '待审核'"
-                    size="small"
-                    @click="auditing(slotProps.scope.row)"
-                    >审 核</el-text
-                  >
-                </template>
-              </template>
-            </tablecmt>
-
-          <div class="el_examine_approve">
-              <el-button type="primary" @click="allauditing">一键审批</el-button>
-          </div>
-
-  </el-dialog>
-
+          </template>
+        </template>
+      </tablecmt>
 
+      <div class="el_examine_approve">
+        <el-button type="primary" @click="allauditing">一键审批</el-button>
+      </div>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -843,12 +839,12 @@ import dayjs from 'dayjs';
 import {
   updateReservation,
   cancelReservationPackage,
+  patchPrintList,
 } from '@/api/distribution/distributionReservation';
 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 { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js';
 
 export default {
   data() {
@@ -858,7 +854,7 @@ export default {
       checkloading: false, //复核签收加载
       dialogImageUrl: '', //图片放大地址
       dialogVisible: false, //图片状态
-      AbnormalReview:AbnormalReview,
+      AbnormalReview: AbnormalReview,
       dialogImageUrlA: '',
       dialogImageUrlB: '',
       dialogImageUrlC: '',
@@ -872,13 +868,13 @@ export default {
       dialogVisibleF: false,
       deliveryId: null,
       Routid: null,
-      abnormalBox: false,//异常审核包件列表弹窗
+      abnormalBox: false, //异常审核包件列表弹窗
       Abnormalloading: false, //审核加载效果
-      toexamineID:'',//审核id
-      AbnormalReviewloading:false,//审核表格加载
+      toexamineID: '', //审核id
+      AbnormalReviewloading: false, //审核表格加载
       TCloading: false, //提交按钮
       TcForm: {}, //弹窗表单
-      AbnormalReviewData:[{trainNumber:''}],//异常审核
+      AbnormalReviewData: [{ trainNumber: '' }], //异常审核
       // 上门照
       DoorstepPhoto: [],
       // 堆门照
@@ -1330,7 +1326,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '200',
+          width: '250',
           checkarr: [],
           fixed: 'right',
           hide: true,
@@ -1894,7 +1890,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '200',
+          width: '250',
           checkarr: [],
           fixed: 'right',
           sortable: false,
@@ -2167,7 +2163,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '200',
+          width: '250',
           checkarr: [],
           fixed: 'right',
           hide: true,
@@ -2947,7 +2943,7 @@ export default {
             prop: 'signingTime',
             type: 6,
             values: '',
-            width: '200',
+            width: '250',
             checkarr: [],
             fixed: 'right',
           },
@@ -3313,7 +3309,7 @@ export default {
             label: '操作',
             type: 6,
             values: '',
-            width: '200',
+            width: '250',
             checkarr: [],
             fixed: 'right',
             hide: true,
@@ -3573,12 +3569,17 @@ export default {
       isShowPrint: false,
       /** 打印的Html */
       html: '',
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   watch: {
     '$route.data': {
       handler(newVal, oldVal) {
         console.log(newVal, oldVal);
+        console.log('this.$route :>> ', this.$route);
+        if (this.$route.path !== '/distribution/deliverylist/distributionDeliveryListedt') return;
         if (this.$router.data) {
           this.fetchData();
         }
@@ -3597,8 +3598,7 @@ export default {
     this.setTableHeight();
   },
   created() {
-    this.onLoad();
-
+    // this.onLoad();
     // //查询字典
     // this.queryDictionary();
   },
@@ -3621,26 +3621,29 @@ export default {
     },
   },
   methods: {
-        // 异常审核函数
+    // 异常审核函数
     viewAbnormalLoading(scope) {
-      console.log(this.$refs.YcwtableBox,'2');
-      this.toexamineID = scope;//存一个id用于刷新页面用
-      console.log(this.toexamineID,'this.toexamineID');
-      this.AbnormalReviewloading = true;//开启加载
-      console.log(scope,'scope');
+      console.log(this.$refs.YcwtableBox, '2');
+      this.toexamineID = scope; //存一个id用于刷新页面用
+      console.log(this.toexamineID, 'this.toexamineID');
+      this.AbnormalReviewloading = true; //开启加载
+      console.log(scope, 'scope');
       this.abnormalBox = true;
-      loadingAbnormalPackageListDetail(scope.signId).then(res=>{
-        console.log(res,'异常审核查询');
-        this.AbnormalReviewData = res.data.data
-      }).catch(res=>{
-        console.log(res,'关闭加载效果');
-      }).finally(()=>{
-        this.AbnormalReviewloading = false;//关闭加载
-      })
+      loadingAbnormalPackageListDetail(scope.signId)
+        .then(res => {
+          console.log(res, '异常审核查询');
+          this.AbnormalReviewData = res.data.data;
+        })
+        .catch(res => {
+          console.log(res, '关闭加载效果');
+        })
+        .finally(() => {
+          this.AbnormalReviewloading = false; //关闭加载
+        });
     },
-     //审批异常装车包件
-     auditing(row) {
-      this.AbnormalReviewloading = true;//开启加载
+    //审批异常装车包件
+    auditing(row) {
+      this.AbnormalReviewloading = true; //开启加载
       console.log('----------->row', row);
       loadingAbnormalPackageListAuditing(row.id).then(res => {
         console.log('res-------->', res);
@@ -3649,59 +3652,64 @@ export default {
             type: 'success',
             message: '操作成功!',
           });
-          this.AbnormalReviewloading = false;//关闭加载
+          this.AbnormalReviewloading = false; //关闭加载
           console.log();
           this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
         }
       });
     },
     // 一键审核
-   allauditing(){
-      let DataSubmit=[]
-      if(!this.selectionList.length){
-        this.AbnormalReviewloading = true;//开启加载
-        this.AbnormalReviewData.forEach( item=>{
-       if(item.auditingStatusName == '待审核'){
-        DataSubmit.push(item.id)
-      }
-      })
-      }else{
-        const allGreaterThanTen = this.selectionList.every(item => item.auditingStatusName == '待审核');
-        if(!allGreaterThanTen){
+    allauditing() {
+      let DataSubmit = [];
+      if (!this.selectionList.length) {
+        this.AbnormalReviewloading = true; //开启加载
+        this.AbnormalReviewData.forEach(item => {
+          if (item.auditingStatusName == '待审核') {
+            DataSubmit.push(item.id);
+          }
+        });
+      } else {
+        const allGreaterThanTen = this.selectionList.every(
+          item => item.auditingStatusName == '待审核'
+        );
+        if (!allGreaterThanTen) {
           ElMessage({
-        message: '勾选中的数据有已经审核过的,请取消勾选后重新尝试',
-        type: 'warning',
-          })
-          return
+            message: '勾选中的数据有已经审核过的,请取消勾选后重新尝试',
+            type: 'warning',
+          });
+          return;
         }
-        this.AbnormalReviewloading = true;//开启加载
-        this.selectionList.forEach(item=>{
-          DataSubmit.push(item.id)
-        })
+        this.AbnormalReviewloading = true; //开启加载
+        this.selectionList.forEach(item => {
+          DataSubmit.push(item.id);
+        });
       }
-      loadingAbnormalPackageListAuditing(DataSubmit.join(',')).then(res => {
-        if (res.data.code == 200) {
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
+      loadingAbnormalPackageListAuditing(DataSubmit.join(','))
+        .then(res => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!',
+            });
 
-          this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
-        }
-      }).catch(res=>{
-        console.log(res,'失败');
-      }).finally(()=>{
-        this.AbnormalReviewloading = false;//关闭加载
-      });
+            this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
+          }
+        })
+        .catch(res => {
+          console.log(res, '失败');
+        })
+        .finally(() => {
+          this.AbnormalReviewloading = false; //关闭加载
+        });
 
       this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
     },
     // 关闭异常审核
-    Abnormalshutdown(){
-      this.selectionList=[],//清空勾选
-      this.AbnormalReviewData=[],//清空数据
-      console.log('关闭异常审核');
-      this.onLoad()
+    Abnormalshutdown() {
+      (this.selectionList = []), //清空勾选
+        (this.AbnormalReviewData = []), //清空数据
+        console.log('关闭异常审核');
+      this.onLoad();
     },
     async setTableHeight() {
       await this.$nextTick();
@@ -3944,50 +3952,87 @@ export default {
     btnsc() {},
     selectsc() {},
     /** 打印配送单 */
-    handlePrint(row) {
-      console.log('this.deliverydata.type :>> ', this.deliverydata.type);
-      const submitData = {
-        ids: row.deliveryId,
-        type: this.deliverydata.type,
-      };
-      printBatch(submitData);
+    async handlePrint(row) {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        console.log('this.deliverydata.type :>> ', this.deliverydata.type);
+        this.html = '';
+        const submitData = {
+          ids: row.id,
+        };
+        const res = await patchPrintList(submitData);
+
+        const { code, data } = res.data;
+
+        if (code !== 200) return;
+
+        this.html = this.getHtmls(res.data.data, res.data.data[0].templateHtml);
+        this.dialogVisibleF = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     /** 打印库存存品 */
-    handleInventoryQRCode(row) {
-      this.materialQRCode = row;
-      console.log('row------------>', row);
-      // let qr = {
-      //   ids: row.id,
-      // };
-      this.html = '';
-      showInventoryPackgeCode(row.reservationId, row.id).then(res => {
+    async handleInventoryQRCode(row) {
+      try {
+        this.loadingObj.pageLoading = true;
+        this.materialQRCode = row;
+        console.log('row------------>', row);
+        // let qr = {
+        //   ids: row.id,
+        // };
+        this.html = '';
+        const res = await showInventoryPackgeCode(row.reservationId, row.id);
+
+        const { code, data } = res.data;
+        if (code !== 200) return;
         // this.orderPackageCode = res.data
         console.log(res.data);
         this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-      });
-      this.dialogVisibleF = true;
+
+        this.isShowPrint = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = true;
+      }
     },
     /**
      * 查看二维码
      * @param {*} row
      */
-    handleQRCode(row) {
+    async handleQRCode(row) {
       // this.title = '查看'
       // this.view = true;
       // this.box = true;
-      this.materialQRCode = row;
+      try {
+        this.loadingObj.pageLoading = true;
+
+        this.materialQRCode = row;
+
+        let qr = {
+          ids: row.id,
+        };
+        this.html = '';
+        const res = await showOrderPackgeCode(qr);
+
+        const { code, data } = res.data;
+
+        if (code !== 200) return;
 
-      let qr = {
-        ids: row.id,
-      };
-      this.html = '';
-      showOrderPackgeCode(qr).then(res => {
         // this.orderPackageCode = res.data
         console.log(res.data);
-        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-      });
+        this.html = this.getHtmls(data.dataList, data.templateHtml);
 
-      this.dialogVisibleF = true;
+        this.isShowPrint = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     cancelReservationPackage(row) {
       console.log('row', row);
@@ -3999,7 +4044,7 @@ export default {
         type: 1,
         packageIds: row.id,
       };
-   
+
       cancelReservationPackage(data).then(res => {
         if (res.data.code === 200) {
           this.$message.success(res.data.msg);
@@ -4007,14 +4052,14 @@ export default {
         }
       });
     },
-    ViewingTrajectories(val){
-      this.$router.push({ 
+    ViewingTrajectories(val) {
+      this.$router.push({
         path: '/distribution/signdetail/packageNodeSearch',
         query: {
-          orderPackageCode:val.orderPackageCode, 
-          } 
-      })
-      },
+          orderPackageCode: val.orderPackageCode,
+        },
+      });
+    },
     cancelReservationInventoryPackage(row) {
       console.log('row', row);
       console.log('deliveryId', this.deliveryId);
@@ -4150,7 +4195,6 @@ export default {
         if (valid) {
           this.form.stringValue = jsonString;
           if (!this.form.id) {
-
             this.form.masterId = this.propertyformdata.id;
             add(this.form).then(() => {
               this.box = false;
@@ -4844,19 +4888,23 @@ export default {
       this.inventorypage.pageSize = pageSize;
       this.handleordpage(this.inventorypage);
     },
-    onLoad() {
-      //查询详情
-      const data = decodeURIComponent(this.$route.query.data);
-      this.deliverydata = JSON.parse(data);
-      this.loading=true;//开启加载
-      console.log(this.Routid, this.Routid, '存储的ID=====================WDWADAWD');
-      console.log('data>>>>>>>>', this.deliverydata);
-      this.deliveryId = this.deliverydata.id; //存储ID
-      this.loading = true;
-      let id = this.deliverydata.id;
-      getDetail(id).then(res => {
-        console.log('res.data>>>>>>>>>>>>', res.data.data);
-        const data = res.data.data;
+    async onLoad() {
+      try {
+        this.loadingObj.pageLoading = true;
+        //查询详情
+        const subdata = decodeURIComponent(this.$route.query.data);
+        this.deliverydata = JSON.parse(subdata);
+        this.loading = true; //开启加载
+        console.log(this.Routid, this.Routid, '存储的ID=====================WDWADAWD');
+        console.log('data>>>>>>>>', this.deliverydata);
+        this.deliveryId = this.deliverydata.id; //存储ID
+        let id = this.deliverydata.id;
+        const res = await getDetail(id);
+
+        const { code, data } = res.data;
+
+        if (code !== 200) return;
+
         this.deliverydata = data;
         // this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
         if (data.stockupInfo.forkliftName) {
@@ -4887,13 +4935,13 @@ export default {
         let packNum = 0;
         let invenNum = 0;
         let signNum = 0;
-        this.data.map(item => {
-          console.log('--------------->item', item);
+
+        for (const item of this.data) {
           a += parseInt(item.inventoryNub) + parseInt(item.loadedNub);
           packNum += parseInt(item.reservationNum);
           invenNum += parseInt(item.reservationStockListNum);
           signNum += parseInt(item.receivedQuantity);
-        });
+        }
 
         this.deliverydata.scannedNumber = a;
         this.deliverydata.deliveryNumber = packNum;
@@ -4908,15 +4956,13 @@ export default {
         // console.log('--------->deliveryType', this.deliverydata);
         // if (this.deliverydata.deliveryType !== '商配') {
         //   this.handleInventory(this.packpage);
-        this.loading=false;//关闭加载
         // }
-      }).catch(res=>{
-      console.log(res,'错误信息');
-      }).finally(()=>{
-        this.loading=false;//关闭加载
-      });
-
-
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loading = false; //关闭加载
+        this.loadingObj.pageLoading = false;
+      }
     },
   },
 };
@@ -4941,11 +4987,7 @@ export default {
     content: '';
   }
 }
-.tj-ttn {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
+
 :deep(.el-dialog__body) {
   img {
     width: 100%;
@@ -4961,17 +5003,17 @@ export default {
   font-weight: bold;
   color: var(--el-color-primary);
 }
-.el_examine_approve{
+.el_examine_approve {
   width: 100%;
   display: flex;
   justify-content: flex-end;
 }
-:deep(#bodys){
+:deep(#bodys) {
   height: 300px !important;
 }
-.el_abnormalBox{
-  .maboxhi{
-    height:500px !important;
+.el_abnormalBox {
+  .maboxhi {
+    height: 500px !important;
   }
 }
 </style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 6bb18804..5e1c5659 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
@@ -747,6 +747,10 @@ export default {
       driverData: [],
       vehicleData: [],
       tableNode: null,
+      /** loading */
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   mounted() {
@@ -1319,18 +1323,25 @@ export default {
         this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.isShow = true;
-      this.html = '';
-      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 2 });
-      console.log('res :>> ', res);
-      const {
-        data: { code, data },
-      } = res;
-      if (code === 200) {
-        // 初始化打印页面
-        data.forEach(item => {
-          this.html += item.templateHtml;
-        });
+      try {
+        this.loadingObj.pageLoading = true;
+        this.html = '';
+        const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 2 });
+        this.isShow = true;
+        console.log('res :>> ', res);
+        const {
+          data: { code, data },
+        } = res;
+        if (code === 200) {
+          // 初始化打印页面
+          data.forEach(item => {
+            this.html += item.templateHtml;
+          });
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
     },
 
@@ -1338,19 +1349,25 @@ export default {
      * 获取单个打印页面
      */
     async printOrder(row) {
-      console.log('row :>> ', row);
-      this.html = '';
-      const res = await printBatch({ ids: row.id, type: 2 });
-      console.log('res :>> ', res);
-      const {
-        data: { code, data },
-      } = res;
-      if (code === 200) {
-        // 初始化打印页面
-        data.forEach(item => {
-          this.html += item.templateHtml;
-        });
-        this.isShow = true;
+      try {
+        this.loadingObj.pageLoading = true;
+
+        const res = await printBatch({ ids: row.id, type: 2 });
+        this.html = '';
+        const {
+          data: { code, data },
+        } = res;
+        if (code === 200) {
+          // 初始化打印页面
+          data.forEach(item => {
+            this.html += item.templateHtml;
+          });
+          this.isShow = true;
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
     },
 
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 635017da..2ea48300 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 列表模块 -->
@@ -636,6 +636,10 @@ export default {
         },
       ],
       html: null, // 页面包条码内容
+      /** loading */
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   mounted() {
@@ -1292,11 +1296,11 @@ export default {
     },
     handleTrajectory(row) {
       console.log('>>>>', row);
-      this.$router.push({ 
+      this.$router.push({
         path: '/distribution/signdetail/packageNodeSearch',
         query: {
-          orderPackageCode:row.orderPackageCode, 
-          } 
+          orderPackageCode: row.orderPackageCode,
+        },
       });
     },
     handleDelete() {
@@ -1360,6 +1364,14 @@ export default {
       this.onLoadOwn(this.page);
     },
     onLoad(page, params = {}) {
+      try {
+        this.loadingObj.pageLoading = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+
       this.loading = true;
       console.log('执行了查询零零零零');
       this.query.id = this.$route.query.id;
@@ -1375,7 +1387,15 @@ export default {
         }
       );
     },
-    onLoadOwn(page, params = {}) {
+    async onLoadOwn(page, params = {}) {
+      try {
+        this.loadingObj.pageLoading = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+
       // this.loading = true;
       this.dataMaterial = false;
       params = {
@@ -1406,6 +1426,7 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .plck {
   display: flex;