diff --git a/package.json b/package.json
index be77a5b6..5760b524 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "axios": "^0.21.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.10.6",
+    "echarts": "^5.5.1",
     "element-plus": "^2.3.1",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.4.1",
@@ -50,4 +51,4 @@
     "vite-plugin-vue-setup-extend": "^0.4.0",
     "xlsx": "^0.18.5"
   }
-}
\ No newline at end of file
+}
diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js
index 2812bc3e..789ad03f 100644
--- a/src/api/aftersales/aftersalesWorkOrder.js
+++ b/src/api/aftersales/aftersalesWorkOrder.js
@@ -500,6 +500,15 @@ export const $_exportWorkOrder2 = (params) => {
     responseType: 'blob',
   })
 }
+// 完结导出
+export const $_exportWorkOrder4 = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/exportWorkOrder4',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
 // 处理完毕
 export const $_exportWorkOrder3 = (params) => {
   return request({
diff --git a/src/api/reportforms/index.js b/src/api/reportforms/index.js
index e223224b..61196de5 100644
--- a/src/api/reportforms/index.js
+++ b/src/api/reportforms/index.js
@@ -190,3 +190,39 @@ export const $_exportStockOrder = params => {
     responseType: 'blob',
   });
 };
+
+// 配送统计报表
+export const $_getDeliveryStatisticsReport = params => {
+  return request({
+    url: '/api/logpm-report/qualityDispatch/number',
+    method: 'get',
+    params,
+  });
+};
+// 配送统计报表导出
+export const $_expDeliveryStatisticsReport = params => {
+  return request({
+    url: '/api/logpm-report/qualityDispatch/exporNumber',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
+// 配送统计报表详情
+export const $_getDeliveryDetailsReport = params => {
+  return request({
+    url: '/api/logpm-report/qualityDispatch/task',
+    method: 'get',
+    params,
+  });
+};
+// 配送统计报表详情导出
+export const $_expDeliveryDetailsReport = params => {
+  return request({
+    url: '/api/logpm-report/qualityDispatch/exporTask',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
+
diff --git a/src/api/wel/index.js b/src/api/wel/index.js
index 7c26ff01..25d115ac 100644
--- a/src/api/wel/index.js
+++ b/src/api/wel/index.js
@@ -18,9 +18,9 @@ export const postAllocationData = data => {
  * @param {Object} data
  * @returns
  */
-export const postOpenOrderDataByWarehouseId = data => {
+export const postAllocationDataByWarehouseId = data => {
   return request({
-    url: '/api/logpm-report/warehouseIndex/openOrderDataByWarehouseId',
+    url: '/api/logpm-report/warehouseIndex/allocationDataByWarehouseId',
     method: 'post',
     data,
   });
@@ -39,6 +39,19 @@ export const postHandOrderData = data => {
   });
 };
 
+/**
+ * 当前在库数据 -- 对比数据
+ * @param {Object} data
+ * @returns
+ */
+export const postHandOrderDataByWarehouseId = data => {
+  return request({
+    url: '/api/logpm-report/warehouseIndex/handOrderDataByWarehouseId',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 开单数据
  * @param {Object} data
@@ -52,6 +65,19 @@ export const postOpenOrderData = data => {
   });
 };
 
+/**
+ * 开单数据 -- 对比数据
+ * @param {Object} data
+ * @returns
+ */
+export const postOpenOrderDataByWarehouseId = data => {
+  return request({
+    url: '/api/logpm-report/warehouseIndex/openOrderDataByWarehouseId',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 开单收入数据
  * @param {Object} data
@@ -78,6 +104,19 @@ export const postTrunklineCarsData = data => {
   });
 };
 
+/**
+ * 干线车次数据 -- 对比数据
+ * @param {Object} data
+ * @returns
+ */
+export const postTrunklineCarsDataByWarehouseId = data => {
+  return request({
+    url: '/api/logpm-report/warehouseIndex/trunklineCarsDataByWarehouseId',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 干线发运数据
  * @param {Object} data
diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 520ba6d2..5c95196c 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -473,7 +473,7 @@ export const columnList = [
   {
     prop: 'ceator',
     label: '创建人',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/option/distribution/distributionStockArticleSelf.js b/src/option/distribution/distributionStockArticleSelf.js
index 6abeab29..67f20e13 100644
--- a/src/option/distribution/distributionStockArticleSelf.js
+++ b/src/option/distribution/distributionStockArticleSelf.js
@@ -201,6 +201,25 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'isTimeOutName',
+    label: '超时状态',
+    type: 3,
+    values: '',
+    width: '100',
+    checkarr: [
+      {
+        value: '0',
+        label: '未超时',
+      },
+      {
+        value: '1',
+        label: '超时',
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'warehouse',
     label: '所在仓库',
diff --git a/src/option/reportforms/DeliveryDetailsReport.js b/src/option/reportforms/DeliveryDetailsReport.js
new file mode 100644
index 00000000..122301dd
--- /dev/null
+++ b/src/option/reportforms/DeliveryDetailsReport.js
@@ -0,0 +1,365 @@
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '仓库',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryType',
+    label: '配送类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+        {
+            label: '商配',
+            value: '商配'
+        },
+        {
+            label: '市配',
+            value: '市配'
+        }
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'reviewStatus',
+    label: '文员复核状态',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+        {
+            label: '已复核',
+            value: '已复核'
+        },
+        {
+            label: '未复核',
+            value: '未复核'
+        }
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'planReservationCode',
+    label: '预约单编号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'planTrainNumber',
+    label: '车次号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'mallName',
+    label: '商场/承运商',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'reservationConsignee',
+    label: '收货人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'driverName',
+    label: '司机/提货人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'vehicleName',
+    label: '车辆',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryTime',
+    label: '配送日期',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryCreateUserName',
+    label: '任务创建人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'planNum',
+    label: '计划件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'loadNum',
+    label: '装车件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'signNum',
+    label: '签收件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'planStockNum',
+    label: '库存品计划数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'loadStockNum',
+    label: '库存品装车数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'signStockNum',
+    label: '库存品签收数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+//   {
+//     prop: 'signStatus',
+//     label: '签收状态',
+//     type: 1,
+//     values: '',
+//     width: '150',
+//     checkarr: [],
+//     fixed: false,
+//     sortable: true,
+//     head: false,
+//   },
+  {
+    prop: 'signTime',
+    label: '签收时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signUserName',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'reviewUserName',
+    label: '审核人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'reviewTime',
+    label: '审核时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'exceptionLoadNum',
+    label: '异常装车数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'exceptionSignNum',
+    label: '异常签收数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  {
+    prop: 'deliveryMode',
+    label: '送货方式',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'startCarTime',
+    label: '发车时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'arriveCarTime',
+    label: '到达时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'unLoadNum',
+    label: '卸车件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,//开启统计
+  },
+  // {
+  //   prop: 'createUserName',
+  //   label: '操作',
+  //   type: 6,
+  //   values: '',
+  //   width: '200',
+  //   checkarr: [],
+  //   fixed: 'right',
+  //   sortable: false,
+  // },
+];
diff --git a/src/option/reportforms/DeliveryStatisticsReport.js b/src/option/reportforms/DeliveryStatisticsReport.js
new file mode 100644
index 00000000..105e6c43
--- /dev/null
+++ b/src/option/reportforms/DeliveryStatisticsReport.js
@@ -0,0 +1,215 @@
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '仓库',
+    type: 3,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryType',
+    label: '配送类型',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+  {
+    prop: 'planNum',
+    label: '预约总数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+
+  {
+    prop: 'loadNum',
+    label: '装车总数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'signNum',
+    label: '签收总数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+
+  {
+    prop: 'signRate',
+    label: '签收率',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'planStockNum',
+    label: '预约库存品数量',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'stockingQuantity',
+    label: '库存品备货件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'loadStockNum',
+    label: '库存品装车数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'signStockNum',
+    label: '库存品签收数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'signStockRate',
+    label: '库存品签收率',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'exceptionNum',
+    label: '异常数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'planAccuracy',
+    label: '计划准确率',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'customerCount',
+    label: '客户数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'reviewCustomerCount',
+    label: '已审核客户数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'reviewRate',
+    label: '审核率',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'createUserName',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
+];
diff --git a/src/option/waybill/TemporaryStorageList.js b/src/option/waybill/TemporaryStorageList.js
index d67e314a..35d0d365 100644
--- a/src/option/waybill/TemporaryStorageList.js
+++ b/src/option/waybill/TemporaryStorageList.js
@@ -105,6 +105,25 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'isTimeOutName',
+    label: '超时状态',
+    type: 14,
+    values: '',
+    width: '130',
+    checkarr: [
+      {
+        label: '超时',
+        value: 1,
+      },
+      {
+        label: '未超时',
+        value: 0,
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'totalNum',
     label: '数量',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index ec092d40..70e2a669 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1812,7 +1812,7 @@ export default [
         },
         path: '/distribution/checkInventoryTask/createTaskTemp',
         name: '盘点旧版',
-        component: () => import('@/views/distribution/checkInventoryTask/createTasktemp.vue'),
+        component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
       },
     ],
   },
@@ -1865,4 +1865,20 @@ export default [
       },
     ],
   },
+  {
+    path: '/reportforms/DeliveryDetailsReport',
+    component: Layout,
+    redirect: '/reportforms/DeliveryDetailsReport',
+    children: [
+      {
+        meta: {
+          i18n: 'dict',
+          keepAlive: true,
+        },
+        path: '/reportforms/DeliveryDetailsReport',
+        name: '配送明细详情报表',
+        component: () => import('@/views/reportforms/DeliveryDetailsReport.vue'),
+      },
+    ],
+  },
 ];
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index cd0e7143..d6f9470e 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -636,6 +636,7 @@ import {
   $_exportWorkOrder1,
   $_exportWorkOrder2,
   $_exportWorkOrder3,
+  $_exportWorkOrder4,
 } from '@/api/aftersales/aftersalesWorkOrder';
 import {
   columnList,
@@ -2830,6 +2831,10 @@ const exportReport = () => {
           // 理赔金额未出
           ExportClaimAmount(dataID);
           break;
+          case 6:
+          // 完结
+          CompleteExport(dataID);
+          break;
         default:
           ExportAll(dataID);
           break;
@@ -2934,6 +2939,26 @@ const ExportClaimAmount = async dataID => {
   } finally {
   }
 };
+// 完结导出
+const CompleteExport = async dataID => {
+  try {
+    let res = await $_exportWorkOrder4(dataID);
+    const currentDate = new Date();
+    const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
+      .toString()
+      .padStart(2, '0')}${currentDate.getDate().toString().padStart(2, '0')}${currentDate
+      .getHours()
+      .toString()
+      .padStart(2, '0')}${currentDate.getMinutes().toString().padStart(2, '0')}${currentDate
+      .getSeconds()
+      .toString()
+      .padStart(2, '0')}`;
+    downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
+  } catch (e) {
+    console.log(e);
+  } finally {
+  }
+};
 // 处理完毕导出
 const ProcessedExported = async dataID => {
   try {
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 85672ded..e25f8529 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -1010,11 +1010,15 @@ const DiscoveringNodesChange = async value => {
     typeServiceName: form.value.basis.typeServiceName, //合作模式
     TabactiveName: form.value.basis.TabactiveName, //订单类型
   };
+  form.value.deliver = [];
   if (value == '3') {
     form.value.basis.processorEntityList = [];
   } else {
     delete form.value.basis.processorEntityList;
   }
+  if (value == '5' || value == '7') {
+    form.value.deliver = [];
+  }
   console.log(form.value.basis, 'form.value.basis');
   // 公司占比重置
   form.value.Proportion = 0;
@@ -1385,7 +1389,7 @@ const ChangePackageInfo = async item => {
       console.log(form.value.Trainoptions, 'form.value.Trainoptions');
     }
     // 配送环节车次号处理
-    if (['5'].includes(form.value.basis.discoveryNode)) {
+    if (['5', '7'].includes(form.value.basis.discoveryNode)) {
       let addedTrainNumbers = []; // 临时变量存储已经添加过的车次号
       res.data.data.forEach(item => {
         if (item.deliver && item.deliver.length) {
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 89d4110d..8e800c2d 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -260,7 +260,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="租金单价">
+        <el-form-item label="仓库月租金">
           <el-input-number
             style="width: 100%"
             v-model="Addform.unitPrice"
diff --git a/src/views/cost/Deliverycostmanagement/Financialreview.vue b/src/views/cost/Deliverycostmanagement/Financialreview.vue
index ee9651b2..f5266891 100644
--- a/src/views/cost/Deliverycostmanagement/Financialreview.vue
+++ b/src/views/cost/Deliverycostmanagement/Financialreview.vue
@@ -174,6 +174,7 @@ const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const toexaminedialog = ref(false);
+const activeName = ref('first');
 const form = ref({
   a: 0,
 });
@@ -216,7 +217,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -291,7 +292,9 @@ const timesc = (index, row) => {
     delete details.query[row.prop];
   }
 };
-
+const handleClick = () => {
+  onLoad();
+};
 /** 表格表头输入框搜索 */
 const btnsc = val => {
   console.log(val);
@@ -307,7 +310,7 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 每页多少条
 const sizeChange = val => {
@@ -321,7 +324,7 @@ const currentChange = val => {
 };
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
diff --git a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
index 235c0db6..ce71748d 100644
--- a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
+++ b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
@@ -103,13 +103,16 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/OrderTotalCostDetail.js';
-import { $_getMyWarehouseList,$_OrderTotalCostDetail ,$_expenseDispatchOrderDetail} from '@/api/storagecost/index.js';
-
+import {
+  $_getMyWarehouseList,
+  $_OrderTotalCostDetail,
+  $_expenseDispatchOrderDetail,
+} from '@/api/storagecost/index.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { downloadXls } from '@/utils/util';
+import { downloadXls ,handleClearTableQuery} from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 import error from '@/error';
@@ -249,8 +252,15 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  onLoad(queryTop.value);
 };
+// 清空
+const searchReset=()=>{
+details.query={};
+queryTop.value={};
+handleClearTableQuery(details.columnList);
+onLoad()
+}
 // 每页多少条
 const sizeChange = val => {
   details.page.pageSize = val;
@@ -263,7 +273,7 @@ const currentChange = val => {
 };
 // 刷新按钮
 const searchChangeS = () => {
-  onLoad()
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
@@ -285,24 +295,27 @@ function updateDictionary(targetArray, dictionaryType) {
   });
 }
 // 页面初始化
-const  onLoad = value => {
+const onLoad = value => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
     ...details.query,
     ...value,
   };
-  details.loadingObj.list=true
-  $_OrderTotalCostDetail(data).then(res => {
-    if (res.data.code == 200) {
-      details.data = res.data.data.records || [];
-      details.page.total = res.data.data.total; //页码
-    }
-  }).catch(error=>{
-    console.log(error);
-  }).finally(()=>{
-    details.loadingObj.list=false
-  });
+  details.loadingObj.list = true;
+  $_OrderTotalCostDetail(data)
+    .then(res => {
+      if (res.data.code == 200) {
+        details.data = res.data.data.records || [];
+        details.page.total = res.data.data.total; //页码
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
 };
 const PageOnload = () => {
   onLoad(); //获取列表参数
@@ -335,7 +348,6 @@ const exportExcel = () => {
     })
     .catch(() => {});
 };
-
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/cost/storagecost/Monthlyorderwarehousing.vue b/src/views/cost/storagecost/Monthlyorderwarehousing.vue
index 26f93c5e..a6cee8ae 100644
--- a/src/views/cost/storagecost/Monthlyorderwarehousing.vue
+++ b/src/views/cost/storagecost/Monthlyorderwarehousing.vue
@@ -32,11 +32,12 @@
                 type="year"
                 placeholder="请选择年份"
                 value-format="YYYY"
+             
               />
             </el-form-item>
 
             <el-form-item label="结算月">
-              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
+              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份"    style="min-width: 80px">
                 <el-option
                   v-for="item in monthList"
                   :key="item.value"
diff --git a/src/views/cost/storagecost/OrderTotalWarehouse.vue b/src/views/cost/storagecost/OrderTotalWarehouse.vue
index f6320275..6d504373 100644
--- a/src/views/cost/storagecost/OrderTotalWarehouse.vue
+++ b/src/views/cost/storagecost/OrderTotalWarehouse.vue
@@ -35,7 +35,7 @@
             </el-form-item>
 
             <el-form-item label="结算月">
-              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
+              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份"   style="min-width: 80px">
                 <el-option
                   v-for="item in monthList"
                   :key="item.value"
@@ -276,6 +276,13 @@ const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
 };
+// 清空
+const searchReset=()=>{
+  queryTop.value = {};
+  details.query={}
+  details.data=[]
+  onLoad();
+}
 // 网页顶部搜索按钮
 const searchChange = () => {
   if (queryTop.value.warehouse?.length) {
diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue
index e0c94028..0fb8fd1a 100644
--- a/src/views/cost/storagecost/Transferwarehousestatistics.vue
+++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue
@@ -1,12 +1,12 @@
 <template>
-    <basic-container>
-      <!-- 首页表格 -->
-      <div class="avue-crud">
-        <!-- 搜索模块 -->
-        <el-row v-if="search">
-          <!-- 查询模块 -->
-          <el-form :inline="true" :model="queryTop" class="el-fr-d">
-            <div>
+  <basic-container>
+    <!-- 首页表格 -->
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <el-row v-if="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="queryTop" class="el-fr-d">
+          <div>
             <el-form-item label="中转仓">
               <el-select
                 v-model="queryTop.warehouse"
@@ -32,7 +32,11 @@
             </el-form-item>
 
             <el-form-item label="结算月">
-              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
+              <el-select
+                v-model="queryTop.costSettlementMonth"
+                placeholder="请选择月份"
+                style="min-width: 80px"
+              >
                 <el-option
                   v-for="item in monthList"
                   :key="item.value"
@@ -42,238 +46,253 @@
               </el-select>
             </el-form-item>
           </div>
-            <!-- 查询按钮 -->
-            <el-form-item class="el-btn">
-              <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-              <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-            </el-form-item>
-          </el-form>
-        </el-row>
-  
-        <!-- 控件模块 -->
-        <el-row>
-          <div class="avue-crud__header">
-            <!-- 头部左侧按钮模块 -->
-            <div class="avue-crud__left">
-              <el-button type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>导入</el-button>
-              <el-button type="primary" @click="AddInfo"><el-icon><Download /></el-icon>导出</el-button>
-            </div>
-            <!-- 头部右侧按钮模块 -->
-            <div class="avue-crud__right">
-              <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
-              <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-              <el-button icon="Search" @click="searchHide" circle></el-button>
-            </div>
-          </div>
-        </el-row>
-  
-        <!-- 首页表格 -->
-        <el-row>
-          <!-- 列表模块 -->
-          <tablecmt
-            class="tableNode"
-            :columnList="details.columnList"
-            :tableData="data"
-            :loading="loadingObj.list"
-            @inputTxt="inputsc"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionChange"
-          >
-            <template #default="slotProps">
-              <template v-if="slotProps.scope.column.label === '操作'">
-                <div class="ElBtnClass">
-                  <el-button @click="view(slotProps.scope)">查看</el-button>
-                </div>
-              </template>
-            </template>
-          </tablecmt>
-        </el-row>
-  
-        <!-- 分页模块 -->
-        <el-row class="el-fy">
-          <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-            <div></div>
-            <el-pagination
-              align="right"
-              background
-              @size-change="sizeChange"
-              @current-change="currentChange"
-              :current-page="page.currentPage"
-              :page-sizes="[30, 50, 80, 120]"
-              :page-size="page.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="page.total"
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" @click="AddInfo"
+              ><el-icon><Plus /></el-icon>导入</el-button
+            >
+            <el-button type="primary" @click="AddInfo"
+              ><el-icon><Download /></el-icon>导出</el-button
             >
-            </el-pagination>
           </div>
-        </el-row>
-      </div>
-    </basic-container>
-    <!-- 列表配置显示 -->
-    <edittablehead
-      @closce="showdrawer"
-      :drawerShow="drawerShow"
-      :columnList="details.columnList"
-       v-model="details.columnList"
-    ></edittablehead>
-  </template>
-  
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/storagecost/Transferwarehousestatistics.js';
-  import {
-  $_getMyWarehouseList
-} from '@/api/storagecost/index.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty,setNodeHeight } from '@/utils/util';	
-  import functions from '@/utils/functions.js';
-  import { ElMessageBox,ElMessage } from 'element-plus';
-  import { downloadXls } from '@/utils/util'; 
-  import { useStore } from 'vuex';
-  import dayjs from 'dayjs';
-  const $router = useRouter();//跳转
-  const $useStore = useStore();//权限
-  const $route = useRoute();//获取地址栏参数
-  const queryTop=ref({})
-  const warehouseList=ref([])
-  const monthList=ref([])
-  const details = reactive({
-    /** 是否开启搜索 */
-    search: false,
-    /** 表格搜索条件 */
-    query: {},
-    /** 时间快捷选择设置 */
-    shortcuts: [
-      {
-        text: '最近一周',
-        value: () => {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-          return [start, end];
-        },
-      },
-      {
-        text: '最近一个月',
-        value: () => {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-          return [start, end];
-        },
-      },
-      {
-        text: '最近三个月',
-        value: () => {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-          return [start, end];
-        },
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="Search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-button @click="view(slotProps.scope)">查看</el-button>
+              </div>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </div>
+  </basic-container>
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/storagecost/Transferwarehousestatistics.js';
+import { $_getMyWarehouseList } from '@/api/storagecost/index.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls } from '@/utils/util';
+import { useStore } from 'vuex';
+import dayjs from 'dayjs';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const queryTop = ref({});
+const warehouseList = ref([]);
+const monthList = ref([]);
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
       },
-    ],
-    /** 列表 */
-    columnList,
-  
-    /** 列表数据 */
-    data: [],
-    /** 页面loading */
-    loadingObj: {
-      /** 列表加载loading */
-      list: false,
-      packageListLoading: false,
-    },
-    /** 列表复选框选中的数据 */
-    selectionList: [],
-    /** 是否显示设置表格 */
-    drawerShow: false,
-    /** 分页参数 */
-    page: {
-      currentPage: 1,
-      pageSize: 50,
-      total: 0,
     },
-  
-    /** 弹出层显示 */
-    popUpShow: {
-      /** 包件明细 */
-      packageOrderListlVisited: false,
-      /** 二维码 */
-      QRCodeVisible: false,
-      /** 修改客户信息 */
-      editClientInfoVisible: false,
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
     },
-    /** 列表Dom节点 */
-    listNode: '',
-    form: {},
-    /** 全屏 */
-    fullscreenObj: {
-      /** 包明细 */
-      packageOrderListlVisited: false,
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
     },
-  });
-  
-  const {
-    search,
-    query,
-    shortcuts,
-    data,
-    loadingObj,
-    selectionList,
-    drawerShow,
-    page,
-    trickleLoadingPage,
-    zeroAdditionalRecordingInfo,
-    popUpShow,
-    recorddata,
-  } = toRefs(details);
+  ],
+  /** 列表 */
+  columnList,
 
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
-    details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
-    details.query[row.prop] = index;
-    processRowProperty(index, row, details);
-    test(details.query); 
-      
-  };
-  // 实例函数
-  const test=(val)=>{
-  
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
+  },
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  details.query[row.prop] = index;
+  processRowProperty(index, row, details);
+  test(details.query);
+};
+// 实例函数
+const test = val => {};
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
   }
-  /** 表格表头时间选择 */
-  const timesc = (index, row) => {
-    console.log(index, row);
-    if (!!index) {
-      index = dayjs(index).format('YYYY-MM-DD');
-    }
-    details.query[row.prop] = index;
-    if (!index) {
-      delete details.query[row.prop];
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = val => {
+  console.log(val);
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowProperty(index, row, details);
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  if (queryTop.value.warehouse?.length) {
+    queryTop.value.warehouseName = queryTop.value.warehouse.join(',');
+  } else {
+    delete details.query.warehouseName;
+    delete queryTop.value.warehouseName;
+  }
+  if (queryTop.value.costSettlementMonth) {
+    if (!queryTop.value.costSettlementYear) {
+      ElMessage({
+        message: '请选择年份',
+        type: 'warning',
+      });
+      return;
     }
-  };
-  
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
-    console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
-    processRowProperty(index, row, details);
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
-    console.log(list);
-    details.selectionList = list;
-  };
-  // 网页顶部搜索按钮
-  const searchChange = () => {
-    details.search = false; //关闭搜索
-  };
+  }
+  details.query = { ...details.query, ...queryTop.value };
+  delete details.query.warehouse; //删除多余字段
+  onLoad();
+};
 // 每页多少条
 const sizeChange = val => {
   details.page.pageSize = val;
@@ -284,31 +303,31 @@ const currentChange = val => {
   details.page.currentPage = val;
   onLoad();
 };
-  // 刷新按钮
-  const searchChangeS = () => {
-    details.search = false; //关闭搜索
-  };
-  // 顶部搜索
-  const searchHide = () => {
-    console.log(details);
-    details.search = !details.search;
-   const _node = document.querySelector('.tableNode');
-    setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
-    getDictionaryBiz(dictionaryType).then(res => {
-      console.log(res, '字典');
-      res.data.data.forEach(item => {
-        targetArray.push({
-          value: item.dictKey,
-          label: item.dictValue,
-        });
+// 刷新按钮
+const searchChangeS = () => {
+  details.search = false; //关闭搜索
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
       });
     });
-  }
-  // 月份
-  const monthFn = () => {
+  });
+}
+// 月份
+const monthFn = () => {
   for (let i = 0; i < 12; i++) {
     monthList.value.push({
       value: i + 1,
@@ -316,7 +335,7 @@ const currentChange = val => {
     });
   }
 };
-  // 获取仓库
+// 获取仓库
 const MyWarehouseList = () => {
   $_getMyWarehouseList().then(res => {
     console.log(res, '仓库列表');
@@ -329,44 +348,43 @@ const MyWarehouseList = () => {
   });
 };
 // 页面初始化
-const onLoad=()=>{
+const onLoad = () => {
 
-}
+};
 const PageOnload = () => {
   onLoad(); //获取列表参数
   MyWarehouseList(); //获取仓库
-  monthFn()
+  monthFn();
 };
 
 //页面初始化方法
 PageOnload();
-  // 页面初始化方法
-  </script>
-  
-  <style scoped lang="scss">
-  .ElBtnClass button {
-    border: none;
-    padding: 0;
-    background-color: transparent;
-  }
-  :deep(.el-card) {
-    height: 100%;
-  }
-  :deep(.el-card__body) {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-  .el-fy {
-    flex: 1;
-    display: flex;
-    align-items: flex-end;
-    margin-bottom: 10px;
-  }
-  .avue-crud {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-  </style>
-  
\ No newline at end of file
+// 页面初始化方法
+</script>
+
+<style scoped lang="scss">
+.ElBtnClass button {
+  border: none;
+  padding: 0;
+  background-color: transparent;
+}
+:deep(.el-card) {
+  height: 100%;
+}
+:deep(.el-card__body) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: flex-end;
+  margin-bottom: 10px;
+}
+.avue-crud {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/views/cost/storagecost/Warehouserentalmanagement.vue b/src/views/cost/storagecost/Warehouserentalmanagement.vue
index d9ab5137..65049c7c 100644
--- a/src/views/cost/storagecost/Warehouserentalmanagement.vue
+++ b/src/views/cost/storagecost/Warehouserentalmanagement.vue
@@ -424,6 +424,12 @@ const currentChange = val => {
 const searchChangeS = () => {
   details.search = false; //关闭搜索
 };
+const searchReset=() => {
+  details.query = {};
+  queryTop.value={}
+  details.data=[]
+  onLoad();
+}
 // 顶部搜索
 const searchHide = () => {
   console.log(details);
diff --git a/src/views/desk/DataBoard.vue b/src/views/desk/DataBoard.vue
new file mode 100644
index 00000000..81700c18
--- /dev/null
+++ b/src/views/desk/DataBoard.vue
@@ -0,0 +1,2104 @@
+<template>
+  <!-- 数据看板 -->
+  <div class="main_container" ref="main_container">
+    <!-- <el-button @click="handleRefresh">刷新</el-button> -->
+
+    <!-- 开单数据 && 开单收入 -->
+    <template v-if="permission && permission.DataBoard_openOrderData">
+      <div class="flex mb10 row_first">
+        <!-- 开单数据 -->
+
+        <div class="mr10 box1 view_box" v-loading="details.loadingObj.openOrderData">
+          <!-- 标题 -->
+          <div class="align_center mb20">
+            <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
+
+            <div class="title">开单数据</div>
+          </div>
+
+          <!-- 数据 -->
+          <div class="border pd10">
+            <div class="height40pt flex-c-sb border-bottom">
+              <div class="align_center">
+                <img class="mr10 img_16pt" src="@/static/icon_storage.png" alt="" />
+
+                <div>总计</div>
+              </div>
+
+              <div
+                class="align_center"
+                @click="
+                  () =>
+                    handleDetails('openOrderColumn', '开单数据详情 - 总计 - 单', {
+                      tip: '总单数',
+                      prop: 'totalNum',
+                    })
+                "
+              >
+                <span class="data mr10 underline">{{
+                  details.openOrderDataInfo.totalNum || 0
+                }}</span>
+                <span>单</span>
+              </div>
+
+              <div
+                class="align_center"
+                @click="
+                  () =>
+                    handleDetails('openOrderColumn', '开单数据详情 - 总计 - 单', {
+                      tip: '总单数',
+                      prop: 'totalCount',
+                    })
+                "
+              >
+                <span class="data mr10 underline">{{
+                  details.openOrderDataInfo.totalCount || 0
+                }}</span>
+                <span>件</span>
+              </div>
+            </div>
+
+            <!-- 当月 -->
+            <div class="height40pt flex-c-sb border-bottom">
+              <div class="align_center">
+                <img class="mr10 img_16pt" src="@/static/icon_month.png" alt="" />
+
+                <div>当月</div>
+              </div>
+
+              <!-- 单 -->
+              <div
+                class="align_center"
+                @click="
+                  () =>
+                    handleDetails('openOrderColumn', '开单数据详情 - 当月 - 单', {
+                      tip: '月单数',
+                      prop: 'monthNum',
+                    })
+                "
+              >
+                <span class="data mr10 underline">{{
+                  details.openOrderDataInfo.monthNum || 0
+                }}</span>
+                <span>单</span>
+              </div>
+
+              <!-- 件 -->
+              <div
+                class="align_center"
+                @click="
+                  () =>
+                    handleDetails('openOrderColumn', '开单数据详情 - 当月 - 件', {
+                      tip: '月件数',
+                      prop: 'monthCount',
+                    })
+                "
+              >
+                <span class="data mr10 underline">{{
+                  details.openOrderDataInfo.monthCount || 0
+                }}</span>
+                <span>件</span>
+              </div>
+            </div>
+
+            <!-- 当日 -->
+            <div class="height40pt flex-c-sb">
+              <div class="align_center">
+                <img class="mr10 img_16pt" src="@/static/icon_day.png" alt="" />
+
+                <div>当日</div>
+              </div>
+
+              <!-- 单 -->
+              <div
+                class="align_center"
+                @click="
+                  () =>
+                    handleDetails('openOrderColumn', '开单数据详情 - 当日 - 单', {
+                      tip: '日单数',
+                      prop: 'dayNum',
+                    })
+                "
+              >
+                <span class="data mr10 underline">{{ details.openOrderDataInfo.dayNum || 0 }}</span>
+                <span>单</span>
+              </div>
+
+              <!-- 件 -->
+              <div
+                class="align_center"
+                @click="
+                  () =>
+                    handleDetails('openOrderColumn', '开单数据详情 - 当日 - 件', {
+                      tip: '日件数',
+                      prop: 'dayCount',
+                    })
+                "
+              >
+                <span class="data mr10 underline">{{
+                  details.openOrderDataInfo.dayCount || 0
+                }}</span>
+                <span>件</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 开单收入 -->
+        <div class="flex1 box2 view_box" v-loading="details.loadingObj.openOrderIncome">
+          <!-- 标题 -->
+          <div class="align_center mb20">
+            <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
+
+            <div class="title">开单收入</div>
+          </div>
+
+          <div class="flex">
+            <!-- 统计数据 -->
+            <div class="border flexnone totol pd10">
+              <!-- 总计 -->
+              <div class="height40pt flex-c-sb border-bottom">
+                <div class="align_center">
+                  <img class="mr10 img_16pt" src="@/static/icon_storage.png" alt="" />
+
+                  <div>总计</div>
+                </div>
+
+                <div class="align_center">
+                  <span class="data mr10">{{ details.openOrderIncomeInfo.totalFee || 0 }}</span>
+                  <span>元</span>
+                </div>
+              </div>
+
+              <div class="monthData flex-c-sb">
+                <!-- 当月 -->
+                <div class="flex1">
+                  <div class="align_center">
+                    <img class="mr10 img_16pt" src="@/static/icon_month.png" alt="" />
+
+                    <div>当月</div>
+                  </div>
+
+                  <div class="align_center">
+                    <span class="data mr10">{{ details.openOrderIncomeInfo.monthFee || 0 }}</span>
+                    <span>元</span>
+                  </div>
+                </div>
+
+                <!-- 当日 -->
+                <div class="flex1 border-left">
+                  <div class="align_center">
+                    <img class="mr10 img_16pt" src="@/static/icon_day.png" alt="" />
+
+                    <div>当日</div>
+                  </div>
+
+                  <div class="align_center">
+                    <span class="data mr10">{{ details.openOrderIncomeInfo.dayFee || 0 }}</span>
+                    <span>元</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!-- 详情数据 -->
+            <div class="detailsData flex1 ml10">
+              <!-- 月 -->
+              <div class="flex-c-sb">
+                <!-- 干线 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.monthTrunklineFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>干线 - 月</div>
+                </div>
+                <!-- 仓储 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.monthWarehouseFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>仓储 - 月</div>
+                </div>
+                <!-- 配送 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.monthDistributionFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>配送 - 月</div>
+                </div>
+                <!-- 提货 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.monthBillladingFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>提货 - 月</div>
+                </div>
+                <!-- 安装 -->
+                <div class="item flex1">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.monthInstallFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>安装 - 月</div>
+                </div>
+              </div>
+
+              <!-- 日 -->
+              <div class="flex-c-sb mt10">
+                <!-- 干线 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.dayTrunklineFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>干线 - 日</div>
+                </div>
+                <!-- 仓储 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.dayWarehouseFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>仓储 - 日</div>
+                </div>
+                <!-- 配送 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.dayDistributionFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>配送 - 日</div>
+                </div>
+                <!-- 提货 -->
+                <div class="item flex1 mr10">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.dayBillladingFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>提货 - 日</div>
+                </div>
+                <!-- 安装 -->
+                <div class="item flex1">
+                  <div>
+                    <span class="data mr5px">{{
+                      details.openOrderIncomeInfo.dayInstallFee || 0
+                    }}</span>
+                    <span>元</span>
+                  </div>
+
+                  <div>安装 - 日</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <!-- 当前所在库位数据 && 库位数据 -->
+    <template v-if="permission && permission.DataBoard_handOrderData">
+      <div class="flex mb10 row_second">
+        <!-- 当前所在库位数据 -->
+        <div class="mr10 box1 view_box" v-loading="details.loadingObj.handOrderData">
+          <!-- 标题 -->
+          <div class="align_center mb20">
+            <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
+
+            <div class="title">当前在库数据</div>
+          </div>
+
+          <!-- 数据 -->
+          <div class="border data_container pd10 flex">
+            <!-- 总数 -->
+            <div class="item">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>总数</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 总数 - 件', {
+                      tip: '总件数',
+                      prop: 'totalNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.totalNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+
+            <!-- 零担 -->
+            <div class="item border-left">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>零担</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 零担 - 件', {
+                      tip: '零担数',
+                      prop: 'zeroNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.zeroNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+
+            <!-- 三方中转 -->
+            <div class="item border-left">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>三方中转</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 三方中转 - 件', {
+                      tip: '三方中转件数',
+                      prop: 'thirdTransferNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.thirdTransferNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+
+            <!-- 商配 -->
+            <div class="item border-left">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>商配</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 商配 - 件', {
+                      tip: '商配件数',
+                      prop: 'mallNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.mallNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+
+            <!-- 市配 -->
+            <div class="item border-left">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>市配</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 市配 - 件', {
+                      tip: '市配件数',
+                      prop: 'cityNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.cityNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+
+            <!-- 自提 -->
+            <div class="item border-left">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>自提</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 自提 - 件', {
+                      tip: '市配件数',
+                      prop: 'billNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.billNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+
+            <!-- 已打托 -->
+            <div class="item border-left">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>已打托</span>
+              </div>
+              <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('handOrderDataColumn', '在库数据详情 - 已打托 - 件', {
+                      tip: '已打托件数',
+                      prop: 'trayNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.handOrderDataInfo.trayNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 库位数据 -->
+        <div class="flex1 box2 view_box" v-loading="details.loadingObj.allocationData">
+          <!-- 标题 -->
+          <div class="align_center mb20">
+            <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
+
+            <div class="title">库位数据</div>
+          </div>
+
+          <!-- 数据 -->
+          <div class="border data_container pd10 flex">
+            <!-- 总数 -->
+            <div class="item flex1">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>总数</span>
+              </div>
+              <!-- <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('allocationDataColumn', '库位数据 - 总数 - 个', {
+                      tip: '库位总数',
+                      prop: 'totalNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.allocationDataInfo.totalNum || 0
+                }}</span>
+                <span class="">个</span>
+              </div> -->
+
+              <div class="mt10">
+                <span class="data mr5px">{{ details.allocationDataInfo.totalNum || 0 }}</span>
+                <span class="">个</span>
+              </div>
+            </div>
+
+            <!-- 已上架 -->
+            <div class="item border-left flex1">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>已上架</span>
+              </div>
+              <!-- <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('allocationDataColumn', '库位数据 - 已上架 - 个', {
+                      tip: '已上架库位',
+                      prop: 'useNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.allocationDataInfo.useNum || 0
+                }}</span>
+                <span class="">个</span>
+              </div> -->
+
+              <div class="mt10">
+                <span class="data mr5px">{{ details.allocationDataInfo.useNum || 0 }}</span>
+                <span class="">个</span>
+              </div>
+            </div>
+
+            <!-- 空闲库位 -->
+            <div class="item border-left flex1">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>空闲库位</span>
+              </div>
+              <!-- <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('allocationDataColumn', '库位数据 - 空闲库位 - 个', {
+                      tip: '空闲库位',
+                      prop: 'nullNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.allocationDataInfo.nullNum || 0
+                }}</span>
+                <span class="">个</span>
+              </div> -->
+
+              <div class="mt10">
+                <span class="data mr5px">{{ details.allocationDataInfo.nullNum || 0 }}</span>
+                <span class="">个</span>
+              </div>
+            </div>
+
+            <!-- 未上架 -->
+            <div class="item border-left flex1">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>未上架</span>
+              </div>
+              <!-- <div
+                class="mt10"
+                @click="
+                  () =>
+                    handleDetails('allocationDataColumn', '库位数据 - 未上架库位 - 个', {
+                      tip: '未上架库位',
+                      prop: 'noUpshelfNum',
+                    })
+                "
+              >
+                <span class="data mr5px underline">{{
+                  details.allocationDataInfo.noUpshelfNum || 0
+                }}</span>
+                <span class="">件</span>
+              </div> -->
+
+              <div class="mt10">
+                <span class="data mr5px">{{ details.allocationDataInfo.noUpshelfNum || 0 }}</span>
+                <span class="">件</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <!-- 干线待发运在库数据 && 干线车次统计 && 异常数据 -->
+    <template v-if="permission && permission.DataBoard_trunklineHandOrderData">
+      <div class="flex mb10 row_third">
+        <!-- 当前所在库位数据 -->
+        <div class="mr10 box1 flex1 view_box" v-loading="details.loadingObj.trunklineHandOrderData">
+          <!-- 标题 -->
+          <div class="align_center mb20">
+            <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
+
+            <div class="title">干线待发运在库数据</div>
+          </div>
+
+          <!-- 数据 -->
+          <div class="border pd10 flex-c-sb">
+            <div class="text_center">
+              <div class="data_box orange mb10">
+                <div class="data mr5px">
+                  {{ details.trunklineHandOrderDataInfo.waybillNum || 0 }}
+                </div>
+                <div class="">单</div>
+              </div>
+              <div class="">
+                <span>运单总数</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box orange mb10">
+                <div class="data mr5px">
+                  {{ details.trunklineHandOrderDataInfo.handleNum || 0 }}
+                </div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>在库总件数</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box orange mb10">
+                <div class="data mr5px">
+                  {{ details.trunklineHandOrderDataInfo.handleWeight || 0 }}
+                </div>
+                <div class="">kg</div>
+              </div>
+              <div class="">
+                <span>在库总重量</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box orange mb10">
+                <div class="data mr5px">
+                  {{ details.trunklineHandOrderDataInfo.handleVolume || 0 }}
+                </div>
+                <div class="">m³</div>
+              </div>
+              <div class="">
+                <span>在库总方数</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 干线车次统计 -->
+        <div class="mr10 flex1 box2 view_box" v-loading="details.loadingObj.trunklineCarsData">
+          <!-- 标题 -->
+          <div class="align_center mb20">
+            <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
+
+            <div class="title">干线车次统计</div>
+
+            <!-- 详情 -->
+            <!-- <div class="flex-c-c detailsBtn ml20">
+              <el-icon>
+                <DataAnalysis />
+              </el-icon>
+
+              <span
+                style="margin-left: 5px"
+                @click="() => handleDetails('trunklineCarsDataColumn', '干线车次统计')"
+              >
+                详情
+              </span>
+            </div> -->
+          </div>
+
+          <div class="border pd10 flex-c-sb">
+            <div class="text_center">
+              <div class="data_box mb10">
+                <div class="data mr5px">{{ details.trunklineCarsDataInfo.totalNum || 0 }}</div>
+                <div class="">车</div>
+              </div>
+              <div class="">
+                <span>总车次</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box mb10">
+                <div class="data mr5px">{{ details.trunklineCarsDataInfo.inTransitNum || 0 }}</div>
+                <div class="">车</div>
+              </div>
+              <div class="">
+                <span>在途</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box mb10">
+                <div class="data mr5px">{{ details.trunklineCarsDataInfo.workNum || 0 }}</div>
+                <div class="">车</div>
+              </div>
+              <div class="">
+                <span>作业</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box mb10">
+                <div class="data mr5px">{{ details.trunklineCarsDataInfo.unloadNum || 0 }}</div>
+                <div class="">车</div>
+              </div>
+              <div class="">
+                <span>卸车完成</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 异常数据 -->
+        <div class="flex1 box2 view_box" v-loading="details.loadingObj.unloadAbnormalData">
+          <!-- 标题 -->
+          <div class="flex-c-sb mb20">
+            <div class="align_center">
+              <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
+
+              <div class="title">异常数据</div>
+            </div>
+
+            <div class="align_center">
+              <div
+                :class="{ button: true, active: abnormal_status === 'day' }"
+                @click="() => (abnormal_status = 'day')"
+              >
+                当天
+              </div>
+              <div
+                :class="{ button: true, active: abnormal_status === 'month' }"
+                @click="() => (abnormal_status = 'month')"
+              >
+                当月
+              </div>
+            </div>
+          </div>
+
+          <div class="abnormal_container flex-c-sb">
+            <div class="abnormal_item green">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>发起数</span>
+              </div>
+              <div class="mt10">
+                <span class="data mr5px">{{ abnormal_Info.sendNum }}</span>
+                <span class="">单</span>
+              </div>
+            </div>
+
+            <div class="abnormal_item blue">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>待处理</span>
+              </div>
+              <div class="mt10">
+                <span class="data mr5px">{{ abnormal_Info.noDealNum }}</span>
+                <span class="">单</span>
+              </div>
+            </div>
+
+            <div class="abnormal_item red">
+              <div class="align_center">
+                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
+                <span>异常率</span>
+              </div>
+              <div class="mt10">
+                <span class="data mr5px">{{ abnormal_Info.abnormalRate }}</span>
+                <span class="">%</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <!-- 当前配送数据 && 签收数据 -->
+    <template v-if="permission && permission.DataBoard_deliveryData">
+      <div class="flex mb10 row_fourthly">
+        <!-- 当前配送数据 -->
+        <div
+          class="mr10 box1 view_box"
+          style="width: 40%"
+          v-loading="details.loadingObj.deliveryData"
+        >
+          <!-- 标题 -->
+          <div class="flex-c-sb mb20">
+            <div class="align_center">
+              <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
+
+              <div class="title">当前配送数据</div>
+            </div>
+
+            <div class="align_center">
+              <!-- 商配 -->
+              <div
+                :class="{ button: true, active: delivery_status === 1 }"
+                @click="delivery_status = 1"
+              >
+                商配
+              </div>
+
+              <!-- 外协商配 -->
+              <div
+                :class="{ button: true, active: delivery_status === 4 }"
+                @click="delivery_status = 4"
+              >
+                外协商配
+              </div>
+
+              <div
+                :class="{ button: true, active: delivery_status === 2 }"
+                @click="delivery_status = 2"
+              >
+                市配
+              </div>
+
+              <div
+                :class="{ button: true, active: delivery_status === 5 }"
+                @click="delivery_status = 5"
+              >
+                外协市配
+              </div>
+            </div>
+          </div>
+
+          <!-- 数据 -->
+          <div class="border pd10 flex-c-sb">
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_info.totalNum || 0 }}</div>
+                <div class="">单</div>
+              </div>
+              <div class="">
+                <span>配送计划总数</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_info.totalDeliveryNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>总作业</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_info.totalWeight || 0 }}</div>
+                <div class="">kg</div>
+              </div>
+              <div class="">
+                <span>总重量</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_info.totalVolume || 0 }}</div>
+                <div class="">m³</div>
+              </div>
+              <div class="">
+                <span>总方数</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_info.totalRoadNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>在途件数</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 签收数据 -->
+        <div class="flex1 box2 view_box" v-loading="details.loadingObj.signforData">
+          <!-- 标题 -->
+          <div class="align_center mb20 flex-c-sb">
+            <div class="flex">
+              <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
+
+              <div class="title">签收数据</div>
+            </div>
+
+            <div class="align_center">
+              <div
+                :class="{ button: true, active: signforData_status === '1' }"
+                @click="() => (signforData_status = '1')"
+              >
+                当天
+              </div>
+              <div
+                :class="{ button: true, active: signforData_status === '2' }"
+                @click="() => (signforData_status = '2')"
+              >
+                当月
+              </div>
+            </div>
+          </div>
+
+          <div class="border pd10 flex-c-sb">
+            <div class="text_center">
+              <div class="data_box mb10">
+                <div class="data mr5px">{{ signforData.signNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>已签收</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box orange mb10">
+                <div class="data mr5px">{{ signforData.unSignNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>未签收</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">
+                  {{ signforData.signScale || 0 }}
+                </div>
+                <div class="">%</div>
+              </div>
+              <div class="">
+                <span>签收率</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box purple mb10">
+                <div class="data mr5px">{{ signforData.clerkSignNum || 0 }}</div>
+                <div class="">个</div>
+              </div>
+              <div class="">
+                <span>文员签收任务</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box purple mb10">
+                <div class="data mr5px">
+                  {{ signforData.clerkSignforScale || 0 }}
+                </div>
+                <div class="">%</div>
+              </div>
+              <div class="">
+                <span>文员签收率</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box red mb10">
+                <div class="data mr5px">{{ signforData.clerkOverTimeSignfoNum || 0 }}</div>
+                <div class="">个</div>
+              </div>
+              <div class="">
+                <span>超时签收任务</span>
+              </div>
+            </div>
+
+            <div class="text_center" v-if="signforData_status !== '1'">
+              <div class="data_box red mb10">
+                <div class="data mr5px">
+                  {{ signforData.clerkOverTimeScale ? signforData.clerkOverTimeScale : 0 }}
+                </div>
+                <div class="">%</div>
+              </div>
+              <div class="">
+                <span>签收超时率</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 当前配送数据 && 签收数据 -- 自提 -->
+      <div class="flex mb10 row_fourthly">
+        <!-- 当前配送数据 -->
+        <div
+          class="mr10 box1 view_box"
+          style="width: 40%"
+          v-loading="details.loadingObj.deliveryData"
+        >
+          <!-- 标题 -->
+          <div class="flex-c-sb mb20">
+            <div class="align_center">
+              <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
+
+              <div class="title">当前配送数据 -- 自提</div>
+            </div>
+          </div>
+
+          <!-- 数据 -->
+          <div class="border pd10 flex-c-sb">
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_bill_info.totalNum || 0 }}</div>
+                <div class="">单</div>
+              </div>
+              <div class="">
+                <span>配送计划总数</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_bill_info.totalDeliveryNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>总作业</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_bill_info.totalWeight || 0 }}</div>
+                <div class="">kg</div>
+              </div>
+              <div class="">
+                <span>总重量</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_bill_info.totalVolume || 0 }}</div>
+                <div class="">m³</div>
+              </div>
+              <div class="">
+                <span>总方数</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">{{ delivery_bill_info.totalRoadNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>在途件数</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 签收数据 -->
+        <div class="flex1 box2 view_box" v-loading="details.loadingObj.signforData">
+          <!-- 标题 -->
+          <div class="align_center mb20 flex-c-sb">
+            <div class="flex">
+              <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
+
+              <div class="title">签收数据 -- 自提</div>
+            </div>
+
+            <div class="align_center">
+              <div
+                :class="{ button: true, active: billSignforData_status === '3' }"
+                @click="() => (billSignforData_status = '3')"
+              >
+                当天
+              </div>
+              <div
+                :class="{ button: true, active: billSignforData_status === '4' }"
+                @click="() => (billSignforData_status = '4')"
+              >
+                当月
+              </div>
+            </div>
+          </div>
+
+          <div class="border pd10 flex-c-sb">
+            <div class="text_center">
+              <div class="data_box mb10">
+                <div class="data mr5px">{{ billSignforData.signNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>已签收</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box orange mb10">
+                <div class="data mr5px">{{ billSignforData.unSignNum || 0 }}</div>
+                <div class="">件</div>
+              </div>
+              <div class="">
+                <span>未签收</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box blue mb10">
+                <div class="data mr5px">
+                  {{ billSignforData.signScale ? billSignforData.signScale : 0 }}
+                </div>
+                <div class="">%</div>
+              </div>
+              <div class="">
+                <span>签收率</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box purple mb10">
+                <div class="data mr5px">{{ billSignforData.clerkSignNum || 0 }}</div>
+                <div class="">个</div>
+              </div>
+              <div class="">
+                <span>文员签收任务</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box purple mb10">
+                <div class="data mr5px">
+                  {{ billSignforData.clerkSignforScale ? billSignforData.clerkSignforScale : 0 }}
+                </div>
+                <div class="">%</div>
+              </div>
+              <div class="">
+                <span>文员签收率</span>
+              </div>
+            </div>
+
+            <div class="text_center">
+              <div class="data_box red mb10">
+                <div class="data mr5px">{{ billSignforData.clerkOverTimeSignfoNum || 0 }}</div>
+                <div class="">个</div>
+              </div>
+              <div class="">
+                <span>超时签收任务</span>
+              </div>
+            </div>
+
+            <div class="text_center" v-if="billSignforData_status !== '3'">
+              <div class="data_box red mb10">
+                <div class="data mr5px">
+                  {{ billSignforData.clerkOverTimeScale ? billSignforData.clerkOverTimeScale : 0 }}
+                </div>
+                <div class="">%</div>
+              </div>
+              <div class="">
+                <span>签收超时率</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <!-- 详情数据 -->
+    <el-dialog
+      v-model="details.popUpShow.isShow"
+      width="80%"
+      :append-to-body="false"
+      :destroy-on-close="true"
+      draggable
+    >
+      <!-- 导出 -->
+      <div class="flex-c-sb mb10">
+        <div></div>
+        <!-- <el-button icon="Download" type="primary" @click="handleExport"> 导出 </el-button> -->
+      </div>
+
+      <!-- 表格 -->
+      <!-- <tablecmt
+          style="height: 500px"
+          :columnList="details.columnList"
+          :tableData="details.renderData"
+          :loading="details.loadingObj.loading"
+          @inputTxt="
+            (value, col) => {
+              handleInputQuery(value, col, details.query.inputQuery, true);
+              details.renderData = handleFilterData(details.tableData, [], details.query);
+            }
+          "
+          :isInitHeigt="false"
+        ></tablecmt> -->
+
+      <!-- <tablecmt
+          ref="exportColumnListNode"
+          v-show="false"
+          style="height: 500px"
+          :columnList="details.exportColumnList"
+          :tableData="details.tableData"
+          :isInitHeigt="false"
+        ></tablecmt> -->
+
+      <!-- echarts 图表容器 -->
+      <div v-loading="details.loadingObj.loading" id="echartBox" style="height: 600px"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed, reactive, defineComponent, toRefs, toRef, nextTick } from 'vue';
+import {
+  computeNumber,
+  deepClone,
+  getObjType,
+  getWinHeight,
+  handleFilterData,
+  handleInputQuery,
+  setNodeHeight,
+} from '@/utils/util.js';
+import { useStore } from 'vuex';
+import { dateNow } from '@/utils/date';
+
+import {
+  postAllocationData,
+  postHandOrderData,
+  postOpenOrderData,
+  postOpenOrderIncome,
+  postTrunklineCarsData,
+  postTrunklineHandOrderData,
+  postUnloadAbnormalData,
+  postDeliveryData,
+  postSignforData,
+  postOpenOrderDataByWarehouseId,
+  postAllocationDataByWarehouseId,
+  postHandOrderDataByWarehouseId,
+  postTrunklineCarsDataByWarehouseId,
+} from '@/api/wel/index';
+import { exportExcelByDom } from '@/utils/export';
+import * as echarts from 'echarts';
+import { openOrderColumn } from '@/option/wel/index';
+
+const exportColumnListNode = ref();
+const main_container = ref();
+
+const $store = useStore();
+
+const details = reactive({
+  title: '',
+  /** 开单数据 */
+  openOrderDataInfo: {
+    /** 开单 -- 当日 -- 单 */
+    dayNum: 0,
+    /** 开单 -- 当月 -- 单 */
+    monthNum: 0,
+    /** 开单 -- 总计 -- 单 */
+    totalNum: 0,
+    /** 开单 -- 当日 -- 单 */
+    dayCount: 0,
+    /** 开单 -- 当月 -- 单 */
+    monthCount: 0,
+    /** 开单 -- 总计 -- 件 */
+    totalCount: 0,
+  },
+  /** 开单收入 */
+  openOrderIncomeInfo: {
+    dayBillladingFee: '0.00',
+    dayDistributionFee: '0.00',
+    dayFee: '0.00',
+    dayInstallFee: '0.00',
+    dayTrunklineFee: '0.00',
+    dayWarehouseFee: '0.00',
+    monthBillladingFee: '0.00',
+    monthDistributionFee: '0.00',
+    monthFee: '0.00',
+    monthInstallFee: '0.00',
+    monthTrunklineFee: '0.00',
+    monthWarehouseFee: '0.00',
+    totalFee: '0',
+  },
+  /** 当前在库数据 */
+  handOrderDataInfo: {
+    billNum: 0,
+    cityNum: 0,
+    mallNum: 0,
+    thirdTransferNum: 0,
+    totalNum: 0,
+    trayNum: 0,
+    zeroNum: 0,
+  },
+  /** 库位数据 */
+  allocationDataInfo: {
+    noUpshelfNum: 0,
+    nullNum: 0,
+    totalNum: 0,
+    upshelfNum: 0,
+    useNum: 0,
+  },
+  /** 干线发运数据 */
+  trunklineHandOrderDataInfo: {
+    handleNum: 0,
+    handleVolume: '0.0000',
+    handleWeight: '0.0000',
+    waybillNum: 0,
+  },
+  /** 干线车次数据 */
+  trunklineCarsDataInfo: {
+    inTransitNum: 0,
+    totalNum: 0,
+    unloadNum: 0,
+    workNum: 0,
+  },
+  /** 异常卸车数据 */
+  unloadAbnormalDataInfo: {
+    abnormalDayRate: '0',
+    abnormalMonthRate: '0',
+    noDealDayNum: 0,
+    noDealMonthNum: 0,
+    sendDayNum: 0,
+    sendMonthNum: 0,
+    unloadDayNum: 0,
+    unloadMonthNum: 0,
+  },
+  /** 配送数据 */
+  deliveryDataInfo: [],
+  /** 签收数据 */
+  signforDataInfo: [],
+  loadingObj: {
+    /** 开单数据 */
+    openOrderData: false,
+    /** 开单收入 */
+    openOrderIncome: false,
+    /** 当前在库数据 */
+    handOrderData: false,
+    /** 库位数据 */
+    allocationData: false,
+    /** 干线发运数据 */
+    trunklineHandOrderData: false,
+    /** 干线车次数据 */
+    trunklineCarsData: false,
+    /** 异常卸车数据 */
+    unloadAbnormalData: false,
+    /** 配送数据 */
+    deliveryData: false,
+    /** 签收数据 */
+    signforData: false,
+    /** 弹窗loading */
+    loading: false,
+  },
+  /** 1 -- 公司首页, 2 -- 数据看板 */
+  pageType: 1,
+  /** 表头 */
+  detailOption: {
+    // 开单数据
+    openOrderColumn: deepClone(openOrderColumn),
+    /** 在库数据 */
+    handOrderDataColumn: deepClone(openOrderColumn),
+    /** 库位数据 */
+    allocationDataColumn: deepClone(openOrderColumn),
+  },
+  columnList: [],
+  exportColumnList: [],
+  tableData: [],
+  renderData: [],
+  /** 搜索 */
+  query: {
+    inputQuery: {},
+  },
+  popUpShow: {
+    isShow: false,
+  },
+});
+
+const { permission } = $store.getters;
+console.log('permission :>> ', permission);
+
+/**
+ * 配送显示数据类型
+ * 1 -- 商配
+ * 2 -- 市配
+ * 3 -- 自提
+ * 4 -- 外协商配
+ * 5 -- 外协市配
+ */
+const delivery_status = ref<1 | 2 | 3 | 4 | 5>(1);
+
+/** 异常数据状态 */
+const abnormal_status = ref<'day' | 'month'>('day');
+
+/** 签收数据状态 */
+const signforData_status = ref<'1' | '2'>('1');
+
+/** 自提签收数据状态 */
+const billSignforData_status = ref<'3' | '4'>('3');
+
+/** 请求开单数据 */
+const initOpenOrderData = async () => {
+  try {
+    details.loadingObj.openOrderData = true;
+    const res = await postOpenOrderData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.openOrderDataInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.openOrderData = false;
+  }
+};
+
+/** 请求开单收入 */
+const initOpenOrderIncome = async () => {
+  try {
+    details.loadingObj.openOrderIncome = true;
+    const res = await postOpenOrderIncome({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.openOrderIncomeInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.openOrderIncome = false;
+  }
+};
+
+/** 请求库位数据 */
+const initAllocationData = async () => {
+  try {
+    details.loadingObj.allocationData = true;
+    const res = await postAllocationData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.allocationDataInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.allocationData = false;
+  }
+};
+
+/** 请求在库数据 */
+const initHandOrderData = async () => {
+  try {
+    details.loadingObj.handOrderData = true;
+    const res = await postHandOrderData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.handOrderDataInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.handOrderData = false;
+  }
+};
+
+/** 请求干线发运数据 */
+const initTrunklineHandOrderData = async () => {
+  try {
+    details.loadingObj.trunklineHandOrderData = true;
+    const res = await postTrunklineHandOrderData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.trunklineHandOrderDataInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.trunklineHandOrderData = false;
+  }
+};
+
+/** 请求干线车次数据 */
+const initTrunklineCarsData = async () => {
+  try {
+    details.loadingObj.trunklineCarsData = true;
+    const res = await postTrunklineCarsData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.trunklineCarsDataInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.trunklineCarsData = false;
+  }
+};
+
+/** 卸车异常数据 */
+const initUnloadAbnormalData = async () => {
+  try {
+    details.loadingObj.unloadAbnormalData = true;
+    const res = await postUnloadAbnormalData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.unloadAbnormalDataInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.unloadAbnormalData = false;
+  }
+};
+
+/** 配送数据 */
+const initDeliveryData = async () => {
+  try {
+    details.loadingObj.deliveryData = true;
+    const res = await postDeliveryData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.deliveryDataInfo = data || [];
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.deliveryData = false;
+  }
+};
+
+/** 签收数据 */
+const initSignforData = async () => {
+  try {
+    details.loadingObj.signforData = true;
+    const res = await postSignforData({});
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.signforDataInfo = data || [];
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.signforData = false;
+  }
+};
+
+// 请求数据看板数据
+const handleRefresh = () => {
+  initAllocationData();
+  initHandOrderData();
+  initOpenOrderData();
+  initOpenOrderIncome();
+  initTrunklineCarsData();
+  initTrunklineHandOrderData();
+  initUnloadAbnormalData();
+  // initDeliveryData();
+  initSignforData();
+};
+
+handleRefresh();
+
+/** 异常数据 */
+const abnormal_Info = computed(() => {
+  const _obj =
+    abnormal_status.value === 'day'
+      ? {
+          sendNum: details.unloadAbnormalDataInfo.sendDayNum,
+          noDealNum: details.unloadAbnormalDataInfo.noDealDayNum,
+          abnormalRate: details.unloadAbnormalDataInfo.abnormalDayRate,
+        }
+      : {
+          sendNum: details.unloadAbnormalDataInfo.sendMonthNum,
+          noDealNum: details.unloadAbnormalDataInfo.noDealMonthNum,
+          abnormalRate: details.unloadAbnormalDataInfo.abnormalMonthRate,
+        };
+
+  return _obj;
+});
+
+/** 配送数据 */
+const delivery_info = computed(() => {
+  let _obj = {};
+
+  for (let i = 0; i < details.deliveryDataInfo.length; i++) {
+    const value = details.deliveryDataInfo[i];
+    if (delivery_status.value + '' === value.type + '') _obj = value;
+  }
+
+  return _obj;
+});
+
+/** 配送自提数据 */
+const delivery_bill_info = computed(() => {
+  let _obj = {};
+
+  for (let i = 0; i < details.deliveryDataInfo.length; i++) {
+    const value = details.deliveryDataInfo[i];
+    if (value.type + '' === '3') _obj = value;
+  }
+
+  return _obj;
+});
+
+/** 签收数据 */
+const signforData = computed(() => {
+  let _obj = {};
+
+  for (let i = 0; i < details.signforDataInfo.length; i++) {
+    const value = details.signforDataInfo[i];
+    if (value.type + '' === signforData_status.value) _obj = value;
+  }
+
+  _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
+  _obj.clerkSignforScaleNum
+    ? _obj.clerkSignforScaleNum
+    : (_obj.clerkSignforScaleNum = _obj.clerkSignforScale || 0);
+  _obj.clerkOverTimeScaleNum
+    ? _obj.clerkOverTimeScaleNum
+    : (_obj.clerkOverTimeScaleNum = _obj.clerkOverTimeScale || 0);
+
+  _obj.signScale = computeNumber(_obj.signScaleNum || 0, '*', 100).result.toFixed(2);
+  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
+  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
+
+  return _obj;
+});
+
+/** 签收数据 -- 自提 */
+const billSignforData = computed(() => {
+  let _obj = {};
+
+  for (let i = 0; i < details.signforDataInfo.length; i++) {
+    const value = details.signforDataInfo[i];
+    if (value.type + '' === billSignforData_status.value) _obj = value;
+  }
+
+  _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
+  _obj.clerkSignforScaleNum
+    ? _obj.clerkSignforScaleNum
+    : (_obj.clerkSignforScaleNum = _obj.clerkSignforScale || 0);
+  _obj.clerkOverTimeScaleNum
+    ? _obj.clerkOverTimeScaleNum
+    : (_obj.clerkOverTimeScaleNum = _obj.clerkOverTimeScale || 0);
+
+  _obj.signScale = computeNumber(_obj.signScaleNum || 0, '*', 100).result.toFixed(2);
+  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
+  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
+
+  return _obj;
+});
+
+/** 请求详情 */
+const handleDetails = async (type, title, optionObj = {}) => {
+  details.popUpShow.isShow = true;
+  details.loadingObj.loading = true;
+  details.title = title;
+
+  try {
+    let res: any = { data: {} };
+    switch (type) {
+      // 开单数据
+      case 'openOrderColumn':
+        res = await postOpenOrderDataByWarehouseId({});
+        break;
+
+      // 库位数据
+      case 'allocationDataColumn':
+        res = await postAllocationDataByWarehouseId({});
+        break;
+
+      // 在库数据
+      case 'handOrderDataColumn':
+        res = await postHandOrderDataByWarehouseId({});
+        break;
+
+      // 干线车次数据
+      case 'trunklineCarsDataColumn':
+        res = await postTrunklineCarsDataByWarehouseId({});
+        break;
+
+      default:
+        break;
+    }
+    const { code, data } = res.data;
+    if (code !== 200 || getObjType(data) !== 'array') return;
+
+    const _arr = [];
+
+    for (let i = 0; i < data.length; i++) {
+      const value = data[i];
+
+      let isContinue = false;
+
+      for (let j = 0; j < _arr.length; j++) {
+        const item = _arr[j];
+        if (item.value > value[optionObj.prop]) continue;
+        _arr.splice(j, 0, {
+          name: value.warehouseName + ' - ' + value[optionObj.prop],
+          value: value[optionObj.prop],
+        });
+        isContinue = true;
+        break;
+      }
+      if (isContinue) continue;
+
+      _arr.push({
+        name: value.warehouseName + ' - ' + value[optionObj.prop],
+        value: value[optionObj.prop],
+      });
+    }
+
+    nextTick(() => {
+      // 初始化Echarts
+      const chartDom = document.getElementById('echartBox');
+      const myChart = echarts.init(chartDom);
+
+      const option = {
+        title: {
+          text: title,
+          // subtext: 'Fake Data',
+          left: 'center',
+        },
+        tooltip: {
+          trigger: 'item',
+        },
+        legend: {
+          orient: 'vertical',
+          left: 'left',
+        },
+        series: [
+          {
+            name: optionObj.tip,
+            // 数据显示类型 -- 扇形
+            type: 'pie',
+            // radius: '50%',
+            // 数据
+            data: _arr,
+            // 激活样式
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)',
+              },
+              label: {
+                show: true,
+                fontSize: 20,
+                fontWeight: 'bold',
+              },
+            },
+            // 扇区显示
+            radius: ['30%', '70%'],
+            avoidLabelOverlap: false,
+            // 扇区间隔
+            padAngle: 2,
+            // 最小显示角度
+            minShowLabelAngle: 5,
+            // 距离左侧的距离
+            left: '20%',
+          },
+        ],
+      };
+
+      option && myChart.setOption(option);
+    });
+
+    // details.tableData = data;
+    // details.renderData = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.loading = false;
+  }
+};
+
+/** 导出 */
+const handleExport = () => {
+  exportExcelByDom(exportColumnListNode.value.$el, `${details.title} - ${dateNow()}.xlsx`);
+};
+
+onMounted(async () => {
+  await nextTick();
+  const node = main_container.value;
+  node.style.minHeight = getWinHeight() - node.getBoundingClientRect().top + 'px';
+});
+</script>
+
+<style scoped lang="scss">
+.main_container {
+  font-size: 14px;
+  background: #f5f5f6;
+  padding: 0 5px;
+  position: relative;
+
+  // 弹窗
+  :deep(.el-overlay) {
+    position: absolute;
+  }
+
+  :deep(.el-overlay-dialog) {
+    position: absolute;
+  }
+}
+
+.view_box {
+  padding: 10px;
+  padding-top: 8px;
+  background: #fff;
+  border-radius: 5px;
+
+  .title {
+    font-weight: bold;
+    font-size: 18px;
+    line-height: 18px;
+  }
+
+  .img_16pt {
+    width: 20px;
+    height: 20px;
+  }
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+
+.pd10 {
+  padding: 0 10px;
+}
+
+.detailsBtn {
+  font-size: 0.9rem;
+  color: var(--el-color-primary);
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.3s;
+
+  &:hover {
+    color: #2693ff;
+  }
+}
+
+.align_center {
+  display: flex;
+  align-items: center;
+}
+
+// 开单数据
+.height40pt {
+  height: 60px;
+}
+
+// 数据样式
+.data {
+  font-weight: bold;
+  color: #000;
+  font-family: DIN-Bold;
+  font-size: 20px;
+}
+
+.border {
+  border: 1pt solid #f5f5f6;
+  border-radius: 5px;
+  box-sizing: border-box;
+}
+
+.border-bottom {
+  border-bottom: 1pt solid #f5f5f6;
+  box-sizing: border-box;
+}
+
+.border-left {
+  border-left: 1px solid #f5f5f6;
+  box-sizing: border-box;
+}
+
+// 第一排
+.row_first {
+  & > div {
+    height: 100%;
+  }
+
+  .box1 {
+    height: 100%;
+    width: 400px;
+    box-sizing: border-box;
+    flex: none;
+  }
+
+  // 开单收入
+  .box2 {
+    height: 100%;
+
+    // 统计数据
+    .totol {
+      width: 400px;
+
+      .monthData {
+        height: 120px;
+
+        & > div {
+          height: 80%;
+          flex-direction: column;
+          display: flex;
+          justify-content: space-around;
+          padding: 0 10px;
+          box-sizing: border-box;
+        }
+      }
+    }
+
+    // 详情数据
+    .detailsData {
+      .item {
+        background: #f2f7fb;
+        border-radius: 5px;
+        height: 85px;
+        box-sizing: border-box;
+        padding: 10px;
+        color: #a4b0c2;
+        display: flex;
+        justify-content: space-between;
+        flex-direction: column;
+      }
+    }
+  }
+}
+
+// 第二排
+.row_second {
+  .dataIcon {
+    height: 14px;
+    width: 14px;
+  }
+
+  .data_container {
+    height: 100px;
+    box-sizing: border-box;
+    padding: 20px 0;
+  }
+
+  .item {
+    width: 150px;
+    height: 100%;
+    padding: 0 20px;
+    box-sizing: border-box;
+    flex: none;
+  }
+}
+
+// 第三排
+.row_third {
+  @extend .row_second;
+  .abnormal_container {
+    height: 100px;
+  }
+
+  .abnormal_item {
+    box-sizing: border-box;
+    padding: 20px;
+    width: 160px;
+    color: #7b8ba4;
+
+    &.red {
+      background: #ffeeed;
+
+      .data {
+        color: #ff5d52;
+      }
+    }
+
+    &.blue {
+      background: #e9f4ff;
+
+      .data {
+        color: #2693ff;
+      }
+    }
+
+    &.green {
+      background: #e5f8f3;
+
+      .data {
+        color: #00c090;
+      }
+    }
+  }
+
+  .button {
+    padding: 0px 10px;
+    height: 18px;
+    line-height: 18px;
+    background: #fff;
+    border: 1px solid #f5f5f6;
+    border-radius: 2px;
+    color: #000;
+    font-size: 12px;
+    transition: all 0.3s;
+    cursor: pointer;
+    &.active {
+      color: #fff;
+      background: #2693ff;
+      border-color: #2693ff;
+    }
+  }
+}
+
+// 第四排
+.row_fourthly {
+  @extend .row_third;
+
+  .item {
+    width: 150px;
+  }
+}
+
+.underline {
+  color: #2693ff;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.flex1 {
+  flex: 1 !important;
+}
+
+.data_box {
+  padding: 16px;
+  min-width: 80px;
+  word-break: break-all;
+  background-color: #e5f8f3;
+  border-radius: 4px;
+  border-bottom: 5px solid #00c090;
+
+  &.orange {
+    background: #fff4ec;
+    border-color: #ff9545;
+  }
+
+  &.blue {
+    background-color: #f2f7fb;
+    border-color: #2693ff;
+  }
+
+  &.red {
+    background: #ffeeed;
+    border-color: #ff5d52;
+  }
+
+  &.purple {
+    background: #f0eff8;
+    border-color: #6b60c2;
+  }
+}
+
+.mr5px {
+  margin-right: 5px;
+}
+
+.text_center {
+  text-align: center;
+}
+</style>
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 7d783353..91189c97 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -164,6 +164,11 @@
           >
             修 改
           </el-button>
+
+          <!-- 取消配载 -->
+          <!-- <el-button type="primary" icon="CircleClose" @click="handleCancelCarsLoad">
+            取消配载
+          </el-button> -->
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
@@ -490,6 +495,7 @@ import {
 } from '@/api/distribution/TripartiteTransfer.js';
 import {
   postFindLoadingListData,
+  postCancelCarsLoadByLoadId,
   postRemoveCarsLoadScan,
   postUpdateLoadScanFinalNodeIdById,
 } from '@/api/distribution/VehicleStowage';
@@ -1258,6 +1264,66 @@ const handleSubmitCloseAnAccount = async () => {
   }
 };
 
+/** 取消配载 */
+const handleCancelCarsLoad = () => {
+  if (!ChecksWhetherTheWarehouseIsSelected())
+    return ElMessage.warning('多仓权限无法操作，请选择仓库');
+
+  if (details.selectionList.length === 0) {
+    return ElMessage({
+      message: '请选择需要取消的数据',
+      type: 'warning',
+    });
+  } else if (details.selectionList.length !== 1) {
+    return ElMessage({
+      message: '仅支持单条数据操作',
+      type: 'warning',
+    });
+  }
+  ElMessageBox.confirm('确认取消配载吗?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const ids = [];
+    const _flag = details.selectionList.every(val => {
+      ids.push(val.id);
+      console.log('val :>> ', val);
+      return Number(val.loadStatus) === 0;
+    });
+
+    if (!_flag)
+      return ElMessage({
+        message: '车辆已发车, 无法取消配载计划',
+        type: 'warning',
+      });
+
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const submitData = {
+        loadId: ids.join(','),
+        startCarType: '1',
+      };
+
+      const res = await postCancelCarsLoadByLoadId(submitData);
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '取消配载成功',
+      });
+      initOnload();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
 /**
  * 是否开启床车明细全屏
  * @params(_type) 开启或关闭
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index d29eaf94..1ba4280b 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -1061,7 +1061,7 @@ const handleCostApportionments = async () => {
   for (let i = 0; i < details.oldData.length; i++) {
     const value = details.oldData[i];
 
-    if (!value.checkUserName) {
+    if (Number(value.checkStatus) === 0) {
       _flag = true;
       break;
     }
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 6c68e6cc..758da0a4 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -1058,13 +1058,17 @@ export default {
       // 获取当前日期
       const currentDate = dayjs();
       // 计算一个月前的日期
-      const startDate = currentDate.subtract(1, 'month');
+      // 获取当前月份的第一天
+      const startDate = currentDate.startOf('month');
+      // 获取当前月份的最后一天
+      const endDate = currentDate.endOf('month');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.Deliverydate = [];
       this.Deliverydate[0] = formatDate(startDate); // 一个月前的日期
-      this.Deliverydate[1] = formatDate(currentDate); // 当前日期
+      this.Deliverydate[1] = formatDate(endDate); // 当前日期
     },
+
     async onLoad(page, params = {}) {
       this.loading = true;
       if (this.currentdate) {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 1dceea59..ceb727c3 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -338,7 +338,7 @@ export default {
   data() {
     return {
       height: 0,
-      currentdate:true,
+      currentdate: true,
       // 弹框标题
       title: '',
       // 是否展示弹框
@@ -989,22 +989,24 @@ export default {
     Getcurrentdate() {
       // 获取当前日期
       const currentDate = dayjs();
-      // 计算一个月前的日期
-      const startDate = currentDate.subtract(1, 'month');
+      // 获取当前月份的第一天
+      const startDate = currentDate.startOf('month');
+      // 获取当前月份的最后一天
+      const endDate = currentDate.endOf('month');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.query.taskTimeArr = [];
       this.query.taskTimeArr[0] = formatDate(startDate); // 一个月前的日期
-      this.query.taskTimeArr[1] = formatDate(currentDate); // 当前日期
+      this.query.taskTimeArr[1] = formatDate(endDate); // 当前日期
     },
 
-  async  onLoad(page, params = {}) {
+    async onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '1';
-      if(this.currentdate){
-        await this.Getcurrentdate()
+      if (this.currentdate) {
+        await this.Getcurrentdate();
       }
-  
+
       const submitData = { ...params, ...this.query };
 
       if (getObjType(this.query.taskTimeArr) === 'array') {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 54e75fc9..c4453b08 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -249,7 +249,7 @@ export default {
   data() {
     return {
       height: 0,
-      currentdate:true,
+      currentdate: true,
       dydialogVisible: false,
       // 弹框标题
       title: '',
@@ -778,21 +778,23 @@ export default {
     Getcurrentdate() {
       // 获取当前日期
       const currentDate = dayjs();
-      // 计算一个月前的日期
-      const startDate = currentDate.subtract(1, 'month');
+      // 获取当前月份的第一天
+      const startDate = currentDate.startOf('month');
+      // 获取当前月份的最后一天
+      const endDate = currentDate.endOf('month');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
       this.query.taskTimeArr = [];
       this.query.taskTimeArr[0] = formatDate(startDate); // 一个月前的日期
-      this.query.taskTimeArr[1] = formatDate(currentDate); // 当前日期
+      this.query.taskTimeArr[1] = formatDate(endDate); // 当前日期
     },
-   async onLoad(page, params = {}) {
+    async onLoad(page, params = {}) {
       this.loading = true;
       this.query.type = '2';
-      if(this.currentdate){
-        await this.Getcurrentdate()
+      if (this.currentdate) {
+        await this.Getcurrentdate();
       }
-  
+
       const submitData = { ...params, ...this.query };
 
       if (getObjType(this.query.taskTimeArr) === 'array') {
@@ -829,7 +831,7 @@ export default {
         this.page.total = data.total || 0;
         this.data = data.records || [];
         this.loading = false;
-        this.currentdate=false;
+        this.currentdate = false;
         this.selectionClear();
       });
       getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index f8be7224..6fdcf795 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -228,7 +228,12 @@
                       <el-table
                         :data="details.shipperNameOptions"
                         style="width: 100%"
-                        @row-click="handleChooseShipper"
+                        @row-click="
+                          (column, prop, order) => {
+                            handleChooseShipper(column, prop, order);
+                            handleFindPrice();
+                          }
+                        "
                         v-loading="details.loadingObj.consignerLoading"
                       >
                         <el-table-column prop="clientName" label="发货单位" width="130" />
@@ -253,7 +258,12 @@
                       <el-table
                         :data="details.shipperMobileOptions"
                         style="width: 100%"
-                        @row-click="handleChooseShipper"
+                        @row-click="
+                          (column, prop, order) => {
+                            handleChooseShipper(column, prop, order);
+                            handleFindPrice();
+                          }
+                        "
                         v-loading="details.loadingObj.consignerLoading"
                       >
                         <el-table-column prop="clientName" label="发货单位" width="130" />
@@ -327,6 +337,7 @@
                         @row-click="
                           (column, prop, order) => {
                             handleChooseConsigner(column, prop, order);
+                            handleFindPrice();
                           }
                         "
                         v-loading="details.loadingObj.consignerLoading"
@@ -356,6 +367,7 @@
                         @row-click="
                           (column, prop, order) => {
                             handleChooseConsigner(column, prop, order);
+                            handleFindPrice();
                           }
                         "
                         v-loading="details.loadingObj.consignerLoading"
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index bfb56f17..8454fd90 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -733,7 +733,13 @@ import { deepClone, setNodeHeight, hanleTextLineFeed } from '@/utils/util.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import MultiConditionSearch from '@/components/MultiConditionSearch/MultiConditionSearch.vue';
 const _newCol = deepClone(columnList);
+for (let i = 0; i < _newCol.length; i++) {
+  const val = _newCol[i];
 
+  if (val.label !== '超时状态') continue;
+  _newCol.splice(i, 1);
+  break;
+}
 export default {
   components: {
     MultiConditionSearch,
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index a778474e..232d73f7 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -471,6 +471,13 @@ import { columnList } from '@/option/distribution/distributionStockArticleSelf';
 import { deepClone, hanleTextLineFeed } from '@/utils/util.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
 const _newCol = deepClone(columnList);
+for (let i = 0; i < _newCol.length; i++) {
+  const val = _newCol[i];
+
+  if (val.label !== '超时状态') continue;
+  _newCol.splice(i, 1);
+  break;
+}
 export default {
   data() {
     return {
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 5d533fcf..4f40241d 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -464,6 +464,13 @@ import {
   handleSelectQuery,
 } from '@/utils/util.js';
 const _newCol = deepClone(columnList);
+for (let i = 0; i < _newCol.length; i++) {
+  const val = _newCol[i];
+
+  if (val.label !== '超时状态') continue;
+  _newCol.splice(i, 1);
+  break;
+}
 
 export default {
   data() {
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 6525784e..a51a065a 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -121,6 +121,7 @@
         :columnList="columnList"
         :tableData="data"
         :loading="loading"
+        :tableRowClassName="handleSetRowClassName"
         @inputTxt="inputsc"
         @timeCheck="timesc"
         @btnCheck="btnsc"
@@ -783,6 +784,25 @@ export default {
         downloadXls(res.data, '自提订单数据.xlsx');
       });
     },
+    handleSetRowClassName(row, rowIndex) {
+      console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime);
+      if (!row.warehouseEntryTime) return 'timeOut';
+
+      // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期
+
+      // 当前时间 - 创建时间
+      const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
+      console.log('time :>> ', time);
+      // 预警时间
+      const WarningTime = 1000 * 60 * 60 * 24 * 2 - 1000 * 60 * 60 * 2;
+      console.log('WarningTime :>> ', WarningTime);
+      // 超时
+      const timeOut = 1000 * 60 * 60 * 24 * 2;
+      console.log('timeOut :>> ', timeOut);
+
+      if (time > timeOut) return 'timeOut';
+      else if (time > WarningTime && time < timeOut) return 'WarningTime';
+    },
     /*getMethodName(row,num){
       console.log("名称选择事件",row);
       switch (num) {
@@ -1619,6 +1639,7 @@ export default {
           item.availableQuantity = nuMap[item.availableQuantity] || item.availableQuantity;
           item.notReceived = parseInt(item.totalNumber) - parseInt(item.incomingNum);
           item.isZeroName = Number(item.isZero) === 0 ? '否' : '是';
+          item.isTimeOutName = Number(item.isTimeOut) === 0 ? '未超时' : '超时';
 
           item.completeSetName = Number(item.completeSet) === 2 ? '已齐套' : '未齐套';
         }
@@ -1825,4 +1846,25 @@ export default {
 .el_textBtn {
   font-weight: bold;
 }
+
+// 表格行样式
+:deep(.el-table) {
+  tr {
+    &.WarningTime {
+      color: #e6a23c !important;
+
+      .el-text {
+        color: #e6a23c !important;
+      }
+    }
+
+    &.timeOut {
+      color: #f56c6c !important;
+
+      .el-text {
+        color: #f56c6c !important;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index f2c13a68..dcdf3fbe 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -271,6 +271,7 @@ export default {
   data() {
     return {
       Deliverytime: [], //提货时间
+      currentdate: true,
       columnList: [
         {
           prop: '',
@@ -1129,9 +1130,25 @@ export default {
       let formattedDate = formatter.format(date);
       return formattedDate.replace(/\//g, '-');
     },
+    Getcurrentdate() {
+      // 获取当前日期
+      const currentDate = dayjs();
+      // 获取当前月份的第一天
+      const startDate = currentDate.startOf('month');
+      // 获取当前月份的最后一天
+      const endDate = currentDate.endOf('month');
+      // 格式化日期为 'YYYY-MM-DD'
+      const formatDate = date => date.format('YYYY-MM-DD');
+      this.Deliverytime = [];
+      this.Deliverytime[0] = formatDate(startDate); // 一个月前的日期
+      this.Deliverytime[1] = formatDate(endDate); // 当前日期
+    },
     async onLoad(page, params = {}) {
       try {
         this.loading = true;
+        if (this.currentdate) {
+          await this.Getcurrentdate();
+        }
         if (this.stockupDate?.length) {
           let startDate = this.stockupDate[0];
           let entDate = this.stockupDate[1];
@@ -1205,6 +1222,7 @@ export default {
         console.log('error :>> ', error);
       } finally {
         this.loading = false;
+        this.currentdate = false;
       }
     },
   },
diff --git a/src/views/reportforms/DeliveryDetailsReport.vue b/src/views/reportforms/DeliveryDetailsReport.vue
new file mode 100644
index 00000000..dbe7644c
--- /dev/null
+++ b/src/views/reportforms/DeliveryDetailsReport.vue
@@ -0,0 +1,361 @@
+<template>
+  <basic-container>
+    <!-- 首页表格 -->
+    <div class="avue-crud" v-loading="Pageloading" element-loading-text="Loading...">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="TopQuery" class="el-fr-d">
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <!-- <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button> -->
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" @click="exportReport"
+              ><el-icon><Download /></el-icon>导出</el-button
+            >
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="Search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-text @click="view(slotProps.scope)">查看</el-text>
+              </div>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </div>
+  </basic-container>
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+<script>
+// 缓存要引入当前页面地址
+export default {
+  name: '/reportforms/DeliveryDetailsReport',
+};
+</script>
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { processRowPropertyName, setNodeHeight } from '@/utils/util';
+import { columnList } from '@/option/reportforms/DeliveryDetailsReport.js';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls, handleClearTableQuery } from '@/utils/util';
+import { useStore } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+import { $_getDeliveryDetailsReport, $_expDeliveryDetailsReport } from '@/api/reportforms/index.js';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const TopQuery = ref({}); //查询顶部
+const Pageloading = ref(false);
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 表格搜索条件 */
+  query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+
+  /** 列表数据 */
+  data: [{}],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
+  },
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+  defaultTime2,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+
+  onLoad();
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad();
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+  onLoad();
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  onLoad();
+};
+// 每页多少条
+const sizeChange = val => {
+  details.page.pageSize = val;
+  onLoad();
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+  details.page.currentPage = val;
+  onLoad();
+};
+// 刷新按钮
+const searchChangeS = () => {
+  details.search = false; //关闭搜索
+  onLoad();
+};
+//清空
+const searchReset = () => {
+  details.query = {};
+  details.page.currentPage = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+      });
+    });
+  });
+}
+
+// 页面初始化
+const onLoad = async () => {
+  console.log($route, '地址栏数据');
+  try {
+    details.loadingObj.list = true;
+    let submit = {
+      current: details.page.currentPage,
+      size: details.page.pageSize,
+      ...$route.query,
+      ...details.query,
+    };
+    let res = await $_getDeliveryDetailsReport(submit);
+    const { code, data } = res.data;
+    if (code != 200) {
+      return;
+    }
+    details.page.total = data.total;
+    details.data = data.records;
+    console.log(res, '列表数据');
+  } catch (e) {
+    console.log(e);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+onLoad();
+// 导出
+const exportReport = () => {
+  ElMessageBox.confirm('是否导出报表?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      Pageloading.value = true;
+      let data = {
+        ...$route.query,
+        ...details.query,
+      };
+      delete data.name;
+      $_expDeliveryDetailsReport(data)
+        .then(res => {
+          downloadXls(res.data, `${$route.query.name}配送统计报表数据详情.xlsx`);
+        })
+        .catch(() => {})
+        .finally(() => {
+          Pageloading.value = false;
+        });
+    })
+    .catch(() => {});
+};
+</script>
+
+<style scoped lang="scss">
+.ElBtnClass button {
+  border: none;
+  padding: 0;
+  background-color: transparent;
+}
+:deep(.el-card) {
+  height: 100%;
+}
+:deep(.el-card__body) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: flex-end;
+}
+.avue-crud {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/views/reportforms/DeliveryStatisticsReport.vue b/src/views/reportforms/DeliveryStatisticsReport.vue
new file mode 100644
index 00000000..60c38f6d
--- /dev/null
+++ b/src/views/reportforms/DeliveryStatisticsReport.vue
@@ -0,0 +1,565 @@
+<template>
+  <basic-container>
+    <!-- 首页表格 -->
+    <div class="avue-crud" v-loading="Pageloading" element-loading-text="Loading...">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="TopQuery" class="el-fr-d">
+          <el-form-item label="仓库">
+            <el-select
+              multiple
+              v-model="TopQuery.warehouseNameRange"
+              filterable
+              clearable
+              collapse-tags
+              popper-class="custom-header"
+              :max-collapse-tags="1"
+              placeholder="多选仓库搜索"
+              style="width: 240px"
+            >
+              <template #header>
+                <el-checkbox
+                  v-model="checkAll"
+                  :indeterminate="indeterminate"
+                  @change="handleCheckAll"
+                >
+                  全选
+                </el-checkbox>
+              </template>
+              <el-option
+                v-for="item in warehouseList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送类型">
+            <el-select
+              v-model="TopQuery.deliveryType"
+              clearable
+              popper-class="custom-header"
+              placeholder="请选择配送类型"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in DeliveryTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送日期">
+            <el-date-picker
+              v-model="TopQuery.time"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" @click="exportReport"
+              ><el-icon><Download /></el-icon>导出</el-button
+            >
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="Search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template
+              v-if="
+                ['审核率', '签收率', '库存品签收率', '计划准确率'].includes(
+                  slotProps.scope.column.label
+                )
+              "
+            >
+              <span
+                :class="getColorClass(slotProps.scope.column.label, slotProps.scope.row)"
+                :key="slotProps.scope.column.label"
+              >
+                {{ getRateValue(slotProps.scope.column.label, slotProps.scope.row) }}%
+              </span>
+            </template>
+            <template v-else-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-text @click="view(slotProps.scope.row)">查看</el-text>
+              </div>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <!-- <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row> -->
+    </div>
+  </basic-container>
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { processRowPropertyName, setNodeHeight } from '@/utils/util';
+import { columnList } from '@/option/reportforms/DeliveryStatisticsReport.js';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls, handleClearTableQuery } from '@/utils/util';
+import {
+  $_getDeliveryStatisticsReport,
+  $_expDeliveryStatisticsReport,
+} from '@/api/reportforms/index.js';
+import { useStore } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+import { $_getMyWarehouseList } from '@/api/reportforms/index.js';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const checkAll = ref(false);
+const Pageloading = ref(false);
+const indeterminate = ref(false);
+const warehouseList = ref([]);
+const queryCarn = ref({});
+const DeliveryTypeList = ref([
+  {
+    label: '全部',
+    value: '商配,市配',
+  },
+  {
+    label: '商配',
+    value: '商配',
+  },
+  {
+    label: '市配',
+    value: '市配',
+  },
+]);
+const TopQuery = ref({
+  warehouseNameRange: [],
+  time: [],
+}); //查询顶部
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 表格搜索条件 */
+  query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
+  },
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+  defaultTime2,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+  searchChange();
+};
+
+/** 表格表头时间选择 */
+const timesc = async (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+  searchChange();
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  console.log(columnList, 'columnList');
+  // 仓库处理
+  if (TopQuery.value.warehouseNameRange?.length) {
+    queryCarn.value.warehouseName = TopQuery.value.warehouseNameRange.join(',');
+  } else {
+    delete queryCarn.value.warehouseName;
+  }
+  //   配送类型
+  if (TopQuery.value.deliveryType) {
+    queryCarn.value.deliveryType = TopQuery.value.deliveryType;
+    columnList.find(item => item.prop == 'deliveryType').head = false;
+  } else {
+    delete queryCarn.value.deliveryType;
+
+    columnList.find(item => item.prop == 'deliveryType').head = true;
+  }
+  // 日期处理
+  if (TopQuery.value.time?.length) {
+    queryCarn.value.startTaskTime = TopQuery.value.time[0]; //开始日期
+    queryCarn.value.endTaskTime = TopQuery.value.time[1]; //结束日期
+  } else {
+    delete queryCarn.value.startTaskTime;
+    delete queryCarn.value.endTaskTime;
+  }
+  onLoad();
+};
+// 每页多少条
+const sizeChange = val => {
+  details.page.pageSize = val;
+  onLoad();
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+  details.page.currentPage = val;
+  onLoad();
+};
+// 刷新按钮
+const searchChangeS = () => {
+  details.search = false; //关闭搜索
+  onLoad();
+};
+//清空
+const searchReset = () => {
+  details.query = {};
+  queryCarn.value = {};
+  TopQuery.value = {
+    time: [],
+    deliveryType: '',
+    warehouseNameRange: [],
+  };
+  handleClearTableQuery(details.columnList);
+  details.data = [];
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+      });
+    });
+  });
+}
+const handleCheckAll = val => {
+  console.log(val, 'val');
+  indeterminate.value = false;
+  if (val) {
+    TopQuery.value.warehouseNameRange = warehouseList.value.map(_ => _.value);
+  } else {
+    TopQuery.value.warehouseNameRange = [];
+  }
+};
+const Dictionaryinitialization = () => {
+  // 获取仓库
+
+  $_getMyWarehouseList().then(res => {
+    console.log(res, '仓库列表');
+    if (res.data.data.length) {
+      console.log(columnList, 'columnList');
+
+      res.data.data.forEach(item => {
+        warehouseList.value.push({
+          value: item.name,
+          label: item.name,
+        });
+      });
+
+      columnList.find(item => item.prop == 'warehouseName').checkarr = warehouseList.value;
+    }
+  });
+};
+Dictionaryinitialization();
+// 页面初始化
+const onLoad = async () => {
+  try {
+    details.loadingObj.list = true;
+    const submit = {
+      ...details.query,
+      ...queryCarn.value,
+    };
+    const res = await $_getDeliveryStatisticsReport(submit);
+    const { code, data } = res.data;
+
+    if (code !== 200) {
+      return;
+    }
+
+    // 定义一个处理数据的函数
+    const parsePercentage = value => (value ? Number(value.slice(0, -1)) : 0);
+
+    // 直接修改原数组，避免创建新数组
+    for (let i = 0; i < data.records.length; i++) {
+      const item = data.records[i];
+      item.reviewRate = parsePercentage(item.reviewRate);
+      item.signRate = parsePercentage(item.signRate);
+      item.signStockRate = parsePercentage(item.signStockRate);
+      item.planAccuracy = parsePercentage(item.planAccuracy);
+    }
+
+    details.data = data.records;
+    details.page.total = data.total;
+  } catch (e) {
+    console.error(e);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+const getColorClass = (label, row) => {
+  const rateValue = getRateValue(label, row);
+  return rateValue === 100 ? 'rate-black' : 'rate-red';
+};
+
+const getRateValue = (label, row) => {
+  switch (label) {
+    case '审核率':
+      return row.reviewRate;
+    case '签收率':
+      return row.signRate;
+    case '库存品签收率':
+      return row.signStockRate;
+    case '计划准确率':
+      return row.planAccuracy;
+    default:
+      return 0;
+  }
+};
+// 查看详情
+const view = async row => {
+  let QueryData = {
+    deliveryType: row.deliveryType,
+    warehouseName: row.warehouseName,
+    name: `${row.warehouseName}-配送详情`,
+  };
+  $useStore.commit('DEL_ONCE_TAG', '/reportforms/DeliveryDetailsReport');
+  if (TopQuery.value.time?.length) {
+    QueryData.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    QueryData.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+  }
+  $router.push({
+    path: '/reportforms/DeliveryDetailsReport',
+    query: {
+      ...QueryData,
+    },
+  });
+};
+// 导出
+const exportReport = () => {
+  ElMessageBox.confirm('是否导出报表?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      Pageloading.value = true;
+      let data = {
+        ...details.query,
+        ...queryCarn.value,
+      };
+      $_expDeliveryStatisticsReport(data)
+        .then(res => {
+          downloadXls(res.data, `配送统计报表数据.xlsx`);
+        })
+        .catch(() => {})
+        .finally(() => {
+          Pageloading.value = false;
+        });
+    })
+    .catch(() => {});
+};
+</script>
+
+<style scoped lang="scss">
+.ElBtnClass button {
+  border: none;
+  padding: 0;
+  background-color: transparent;
+}
+:deep(.el-card) {
+  height: 100%;
+}
+:deep(.el-card__body) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: flex-end;
+}
+.avue-crud {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el_textBtn {
+  color: #ff1100 !important ;
+}
+.rate-black {
+  color: black !important;
+}
+
+.rate-red {
+  color: red !important;
+}
+</style>
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index a1e87bd9..b00ebbdb 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -196,7 +196,12 @@
                     <el-table
                       :data="details.shipperNameOptions"
                       style="width: 100%"
-                      @row-click="handleChooseShipper"
+                      @row-click="
+                        (column, prop, order) => {
+                          handleChooseShipper(column, prop, order);
+                          handleFindPrice();
+                        }
+                      "
                       v-loading="details.loadingObj.consignerLoading"
                     >
                       <el-table-column prop="clientName" label="发货单位" width="130" />
@@ -221,7 +226,12 @@
                     <el-table
                       :data="details.shipperMobileOptions"
                       style="width: 100%"
-                      @row-click="handleChooseShipper"
+                      @row-click="
+                        (column, prop, order) => {
+                          handleChooseShipper(column, prop, order);
+                          handleFindPrice();
+                        }
+                      "
                       v-loading="details.loadingObj.consignerLoading"
                     >
                       <el-table-column prop="clientName" label="发货单位" width="130" />
@@ -295,6 +305,7 @@
                       @row-click="
                         (column, prop, order) => {
                           handleChooseConsigner(column, prop, order);
+                          handleFindPrice();
                         }
                       "
                       v-loading="details.loadingObj.consignerLoading"
@@ -324,6 +335,7 @@
                       @row-click="
                         (column, prop, order) => {
                           handleChooseConsigner(column, prop, order);
+                          handleFindPrice();
                         }
                       "
                       v-loading="details.loadingObj.consignerLoading"
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index 359d386d..058858cb 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -143,6 +143,7 @@
                 ? loadingObj.haveDataList
                 : loadingObj.notHaveDataList
             "
+            :tableRowClassName="handleSetRowClassName"
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @btnCheck="btnsc"
@@ -150,7 +151,13 @@
             @selection="selectionChange"
           >
             <template #default="slotProps">
-              <template v-if="slotProps.scope.column.label === '操作'">
+              <template v-if="slotProps.scope.column.label === '超时状态'">
+                <el-tag :class="Number(slotProps.scope.row.isTimeOut) === 0 ? 'green' : 'red'">
+                  {{ slotProps.scope.row.isTimeOutName }}
+                </el-tag>
+              </template>
+
+              <template v-else-if="slotProps.scope.column.label === '操作'">
                 <el-text
                   v-if="permissionObj.TemporaryStorageList_packageDetail"
                   @click="handleShowPackageOrderList(slotProps.scope)"
@@ -563,6 +570,7 @@ import {
   downloadFileBase64,
   handleClearTableQuery,
   ChecksWhetherTheWarehouseIsSelected,
+  handleTranslationDataSeclect,
 } from '@/utils/util';
 import { columnList } from '@/option/waybill/TemporaryStorageList';
 import { useRouter } from 'vue-router';
@@ -1026,6 +1034,8 @@ const onLoad = async (params = {} as any, isRefresh?: boolean) => {
       value.legacyStatusName = Number(value.legacyStatus) ? '是' : '否';
     }
 
+    handleTranslationDataSeclect(data.records, details.columnList);
+
     if (status === 'haveData') details.haveDataData = data.records;
     else details.notHaveDataData = data.records;
     details.page.total = data.total;
@@ -1508,6 +1518,27 @@ const handleSubmitCreatePackage = async () => {
   }
 };
 
+const date = new Date();
+
+/** 设置表格行样式 */
+const handleSetRowClassName = (row, rowIndex) => {
+  if (!row.createTime) return 'timeOut';
+
+  // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期
+
+  // 当前时间 - 创建时间
+  const time = Date.now() - new Date(row.createTime).getTime();
+
+  // 预警时间
+  const WarningTime = 1000 * 60 * 60 * 22;
+
+  // 超时
+  const timeOut = 1000 * 60 * 60 * 24;
+
+  if (time > timeOut) return 'timeOut';
+  else if (time > WarningTime && time < timeOut) return 'WarningTime';
+};
+
 onActivated(() => {
   console.log('activated');
   console.log('this.$store :>> ', $store);
@@ -1689,4 +1720,25 @@ onActivated(() => {
     text-align: left !important;
   }
 }
+
+// 表格行样式
+:deep(.el-table) {
+  tr {
+    &.WarningTime {
+      color: #e6a23c !important;
+
+      .el-text {
+        color: #e6a23c !important;
+      }
+    }
+
+    &.timeOut {
+      color: #f56c6c !important;
+
+      .el-text {
+        color: #f56c6c !important;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 23a61252..7e2954ea 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -13,16 +13,17 @@
             <template v-if="item.type === 'input'">
               <div class="el_div_input">
                 <el-input
-                v-model.trim="query[item.prop]"
-                :placeholder="`请输入${item.label}`"
-                clearable
-              ></el-input>
-              <!-- <el-icon class="el_dy_icon" @click="openDialog('运单号搜索', query.waybillNoList)"
-                ><CirclePlusFilled
-              /></el-icon> -->
+                  v-model.trim="query[item.prop]"
+                  :placeholder="`请输入${item.label}`"
+                  clearable
+                ></el-input>
+                <el-icon
+                  v-if="item.label == '订单自编号'"
+                  class="el_dy_icon"
+                  @click="openDialog('订单自编号搜索', query.orderCode)"
+                  ><CirclePlusFilled
+                /></el-icon>
               </div>
-           
-
             </template>
 
             <template v-else-if="item.type === 'time'">
@@ -58,7 +59,6 @@
             <el-button type="primary" icon="Printer" @click="handleBatchBarcode">
               批量打印
             </el-button>
-            <!-- <el-button @click="openDialog">打开搜索弹窗</el-button> -->
             <!-- 批量入库 -->
             <el-button
               type="primary"
@@ -281,12 +281,11 @@
     :html="details.html"
   />
   <MultiConditionSearch
-      v-model:modelValue="dialogVisible"
-      :title="popupTitle"
-      v-model:inputValue="searchInput"
-      @dialogSearchSubmit="handleSearchSubmit"
-  >
-  </MultiConditionSearch> 
+    v-model:modelValue="dialogVisible"
+    :title="popupTitle"
+    v-model:inputValue="searchInput"
+    @dialogSearchSubmit="handleSearchSubmit"
+  />
   <Tableexportcomponent
     :menuData="details.packageListColumnList"
     :data="details.packageListData"
@@ -339,18 +338,25 @@ const Tableexportcomponent = defineAsyncComponent(
   () => import('@/components/Tableexportcomponent/Tableexportcomponent.vue')
 );
 const tcTableexport = ref(false);
-
 const dialogVisible = ref(false);
 const popupTitle = ref('搜索弹窗');
 const searchInput = ref('');
 
-const openDialog = () => {
-
+const openDialog = (title, input) => {
+  popupTitle.value = title;
+  if (input) {
+    searchInput.value = input.split(',').join('\n');
+  } else {
+    searchInput.value = '';
+  }
   dialogVisible.value = true;
 };
 
 const handleSearchSubmit = value => {
-  console.log('搜索内容:', value);
+  if (popupTitle.value == '订单自编号搜索') {
+    details.query.orderCode = value; //搜索框值
+  }
+
   dialogVisible.value = false;
 };
 
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index a87db5ba..bb0ec2e7 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -1,1244 +1,18 @@
 <template>
-  <!-- 数据看板 -->
-  <template v-if="details.pageType === 2">
-    <div class="main_container">
-      <!-- <el-button @click="handleRefresh">刷新</el-button> -->
-
-      <!-- 开单数据 && 开单收入 -->
-      <div class="flex mb10 row_first">
-        <!-- 开单数据 -->
-
-        <div class="mr10 box1 view_box" v-loading="details.loadingObj.openOrderData">
-          <!-- 标题 -->
-          <div class="align_center mb20">
-            <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
-
-            <div class="title">开单数据</div>
-
-            <!-- 详情 -->
-            <div class="flex-c-c detailsBtn ml20">
-              <el-icon>
-                <DataAnalysis />
-              </el-icon>
-
-              <span
-                style="margin-left: 5px"
-                @click="() => handleDetails('openOrderColumn', '开单数据详情')"
-              >
-                详情
-              </span>
-            </div>
-          </div>
-
-          <!-- 数据 -->
-          <div class="border pd10">
-            <div class="height40pt flex-c-sb border-bottom">
-              <div class="align_center">
-                <img class="mr10 img_16pt" src="@/static/icon_storage.png" alt="" />
-
-                <div>总计</div>
-              </div>
-
-              <div class="align_center">
-                <span class="data mr10">{{ details.openOrderDataInfo.totalNum || 0 }}</span>
-                <span>单</span>
-              </div>
-
-              <div class="align_center">
-                <span class="data mr10">{{ details.openOrderDataInfo.totalCount || 0 }}</span>
-                <span>件</span>
-              </div>
-            </div>
-
-            <div class="height40pt flex-c-sb border-bottom">
-              <div class="align_center">
-                <img class="mr10 img_16pt" src="@/static/icon_month.png" alt="" />
-
-                <div>当月</div>
-              </div>
-
-              <div class="align_center">
-                <span class="data mr10">{{ details.openOrderDataInfo.monthNum || 0 }}</span>
-                <span>单</span>
-              </div>
-
-              <div class="align_center">
-                <span class="data mr10">{{ details.openOrderDataInfo.monthCount || 0 }}</span>
-                <span>件</span>
-              </div>
-            </div>
-
-            <div class="height40pt flex-c-sb">
-              <div class="align_center">
-                <img class="mr10 img_16pt" src="@/static/icon_day.png" alt="" />
-
-                <div>当日</div>
-              </div>
-
-              <div class="align_center">
-                <span class="data mr10">{{ details.openOrderDataInfo.dayNum || 0 }}</span>
-                <span>单</span>
-              </div>
-
-              <div class="align_center">
-                <span class="data mr10">{{ details.openOrderDataInfo.dayCount || 0 }}</span>
-                <span>件</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 开单收入 -->
-        <div class="flex1 box2 view_box" v-loading="details.loadingObj.openOrderIncome">
-          <!-- 标题 -->
-          <div class="align_center mb20">
-            <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
-
-            <div class="title">开单收入</div>
-          </div>
-
-          <div class="flex">
-            <!-- 统计数据 -->
-            <div class="border flexnone totol pd10">
-              <!-- 总计 -->
-              <div class="height40pt flex-c-sb border-bottom">
-                <div class="align_center">
-                  <img class="mr10 img_16pt" src="@/static/icon_storage.png" alt="" />
-
-                  <div>总计</div>
-                </div>
-
-                <div class="align_center">
-                  <span class="data mr10">{{ details.openOrderIncomeInfo.totalFee || 0 }}</span>
-                  <span>元</span>
-                </div>
-              </div>
-
-              <div class="monthData flex-c-sb">
-                <!-- 当月 -->
-                <div class="flex1">
-                  <div class="align_center">
-                    <img class="mr10 img_16pt" src="@/static/icon_month.png" alt="" />
-
-                    <div>当月</div>
-                  </div>
-
-                  <div class="align_center">
-                    <span class="data mr10">{{ details.openOrderIncomeInfo.monthFee || 0 }}</span>
-                    <span>元</span>
-                  </div>
-                </div>
-
-                <!-- 当日 -->
-                <div class="flex1 border-left">
-                  <div class="align_center">
-                    <img class="mr10 img_16pt" src="@/static/icon_day.png" alt="" />
-
-                    <div>当日</div>
-                  </div>
-
-                  <div class="align_center">
-                    <span class="data mr10">{{ details.openOrderIncomeInfo.dayFee || 0 }}</span>
-                    <span>元</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <!-- 详情数据 -->
-            <div class="detailsData flex1 ml10">
-              <!-- 月 -->
-              <div class="flex-c-sb">
-                <!-- 干线 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.monthTrunklineFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>干线 - 月</div>
-                </div>
-                <!-- 仓储 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.monthWarehouseFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>仓储 - 月</div>
-                </div>
-                <!-- 配送 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.monthDistributionFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>配送 - 月</div>
-                </div>
-                <!-- 提货 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.monthBillladingFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>提货 - 月</div>
-                </div>
-                <!-- 安装 -->
-                <div class="item flex1">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.monthInstallFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>安装 - 月</div>
-                </div>
-              </div>
-
-              <!-- 日 -->
-              <div class="flex-c-sb mt10">
-                <!-- 干线 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.dayTrunklineFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>干线 - 日</div>
-                </div>
-                <!-- 仓储 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.dayWarehouseFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>仓储 - 日</div>
-                </div>
-                <!-- 配送 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.dayDistributionFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>配送 - 日</div>
-                </div>
-                <!-- 提货 -->
-                <div class="item flex1 mr10">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.dayBillladingFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>提货 - 日</div>
-                </div>
-                <!-- 安装 -->
-                <div class="item flex1">
-                  <div>
-                    <span class="data mr5px">{{
-                      details.openOrderIncomeInfo.dayInstallFee || 0
-                    }}</span>
-                    <span>元</span>
-                  </div>
-
-                  <div>安装 - 日</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+  <div class="el_Hwlogo">
+    <div class="content">
+      <img src="/public/img/p-logo.png" alt="" />
+      <div class="info">
+        <div class="name">{{ name }}</div>
+        <div class="slogan">您好！欢迎使用货无忧</div>
+        <div class="title">成都数联物科信息技术有限公司</div>
+        <div class="time">{{ currentTime }}</div>
       </div>
-
-      <!-- 当前所在库位数据 && 库位数据 -->
-      <div class="flex mb10 row_second">
-        <!-- 当前所在库位数据 -->
-        <div class="mr10 box1 view_box" v-loading="details.loadingObj.handOrderData">
-          <!-- 标题 -->
-          <div class="align_center mb20">
-            <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
-
-            <div class="title">当前在库数据</div>
-
-            <!-- 详情 -->
-            <!-- <div class="flex-c-c detailsBtn ml20">
-              <el-icon>
-                <DataAnalysis />
-              </el-icon>
-
-              <span
-                style="margin-left: 5px"
-                @click="() => handleDetails('openOrderColumn', '开单数据详情')"
-              >
-                详情
-              </span>
-            </div> -->
-          </div>
-
-          <!-- 数据 -->
-          <div class="border data_container pd10 flex">
-            <div class="item">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>总数</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.handOrderDataInfo.totalNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>零担</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.handOrderDataInfo.zeroNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>三方中转</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{
-                  details.handOrderDataInfo.thirdTransferNum || 0
-                }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>商配</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.handOrderDataInfo.mallNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>市配</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.handOrderDataInfo.cityNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>自提</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.handOrderDataInfo.billNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>已打托</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.handOrderDataInfo.trayNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 库位数据 -->
-        <div class="flex1 box2 view_box" v-loading="details.loadingObj.allocationData">
-          <!-- 标题 -->
-          <div class="align_center mb20">
-            <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
-
-            <div class="title">库位数据</div>
-
-            <!-- 详情 -->
-            <!-- <div class="flex-c-c detailsBtn ml20">
-              <el-icon>
-                <DataAnalysis />
-              </el-icon>
-
-              <span
-                style="margin-left: 5px"
-                @click="() => handleDetails('openOrderColumn', '开单数据详情')"
-              >
-                详情
-              </span>
-            </div> -->
-          </div>
-
-          <div class="border data_container pd10 flex">
-            <div class="item">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>总数</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.allocationDataInfo.totalNum || 0 }}</span>
-                <span class="">个</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>已上架</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.allocationDataInfo.useNum || 0 }}</span>
-                <span class="">个</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>空闲库位</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.allocationDataInfo.nullNum || 0 }}</span>
-                <span class="">个</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>已上架</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.allocationDataInfo.upshelfNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-
-            <div class="item border-left">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>未上架</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ details.allocationDataInfo.noUpshelfNum || 0 }}</span>
-                <span class="">件</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 干线待发运在库数据 && 干线车次统计 && 异常数据 -->
-      <div class="flex mb10 row_third">
-        <!-- 当前所在库位数据 -->
-        <div class="mr10 box1 flex1 view_box" v-loading="details.loadingObj.trunklineHandOrderData">
-          <!-- 标题 -->
-          <div class="align_center mb20">
-            <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
-
-            <div class="title">干线待发运在库数据</div>
-          </div>
-
-          <!-- 数据 -->
-          <div class="border pd10 flex-c-sb">
-            <div class="text_center">
-              <div class="data_box orange mb10">
-                <div class="data mr5px">
-                  {{ details.trunklineHandOrderDataInfo.waybillNum || 0 }}
-                </div>
-                <div class="">单</div>
-              </div>
-              <div class="">
-                <span>运单总数</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box orange mb10">
-                <div class="data mr5px">
-                  {{ details.trunklineHandOrderDataInfo.handleNum || 0 }}
-                </div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>在库总件数</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box orange mb10">
-                <div class="data mr5px">
-                  {{ details.trunklineHandOrderDataInfo.handleWeight || 0 }}
-                </div>
-                <div class="">kg</div>
-              </div>
-              <div class="">
-                <span>在库总重量</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box orange mb10">
-                <div class="data mr5px">
-                  {{ details.trunklineHandOrderDataInfo.handleVolume || 0 }}
-                </div>
-                <div class="">m³</div>
-              </div>
-              <div class="">
-                <span>在库总方数</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 干线车次统计 -->
-        <div class="mr10 flex1 box2 view_box" v-loading="details.loadingObj.trunklineCarsData">
-          <!-- 标题 -->
-          <div class="align_center mb20">
-            <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
-
-            <div class="title">干线车次统计</div>
-          </div>
-
-          <div class="border pd10 flex-c-sb">
-            <div class="text_center">
-              <div class="data_box mb10">
-                <div class="data mr5px">{{ details.trunklineCarsDataInfo.totalNum || 0 }}</div>
-                <div class="">车</div>
-              </div>
-              <div class="">
-                <span>总车次</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box mb10">
-                <div class="data mr5px">{{ details.trunklineCarsDataInfo.inTransitNum || 0 }}</div>
-                <div class="">车</div>
-              </div>
-              <div class="">
-                <span>在途</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box mb10">
-                <div class="data mr5px">{{ details.trunklineCarsDataInfo.workNum || 0 }}</div>
-                <div class="">车</div>
-              </div>
-              <div class="">
-                <span>作业</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box mb10">
-                <div class="data mr5px">{{ details.trunklineCarsDataInfo.unloadNum || 0 }}</div>
-                <div class="">车</div>
-              </div>
-              <div class="">
-                <span>卸车完成</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 异常数据 -->
-        <div class="flex1 box2 view_box" v-loading="details.loadingObj.unloadAbnormalData">
-          <!-- 标题 -->
-          <div class="flex-c-sb mb20">
-            <div class="align_center">
-              <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
-
-              <div class="title">异常数据</div>
-            </div>
-
-            <div class="align_center">
-              <div
-                :class="{ button: true, active: abnormal_status === 'day' }"
-                @click="() => (abnormal_status = 'day')"
-              >
-                当天
-              </div>
-              <div
-                :class="{ button: true, active: abnormal_status === 'month' }"
-                @click="() => (abnormal_status = 'month')"
-              >
-                当月
-              </div>
-            </div>
-          </div>
-
-          <div class="abnormal_container flex-c-sb">
-            <div class="abnormal_item green">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>发起数</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ abnormal_Info.sendNum }}</span>
-                <span class="">单</span>
-              </div>
-            </div>
-
-            <div class="abnormal_item blue">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>待处理</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ abnormal_Info.noDealNum }}</span>
-                <span class="">单</span>
-              </div>
-            </div>
-
-            <div class="abnormal_item red">
-              <div class="align_center">
-                <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-                <span>异常率</span>
-              </div>
-              <div class="mt10">
-                <span class="data mr5px">{{ abnormal_Info.abnormalRate }}</span>
-                <span class="">%</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 当前配送数据 && 签收数据 -->
-      <div class="flex mb10 row_fourthly">
-        <!-- 当前配送数据 -->
-        <div
-          class="mr10 box1 view_box"
-          style="width: 40%"
-          v-loading="details.loadingObj.deliveryData"
-        >
-          <!-- 标题 -->
-          <div class="flex-c-sb mb20">
-            <div class="align_center">
-              <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
-
-              <div class="title">当前配送数据</div>
-            </div>
-
-            <div class="align_center">
-              <!-- 商配 -->
-              <div
-                :class="{ button: true, active: delivery_status === 1 }"
-                @click="delivery_status = 1"
-              >
-                商配
-              </div>
-
-              <!-- 外协商配 -->
-              <div
-                :class="{ button: true, active: delivery_status === 4 }"
-                @click="delivery_status = 4"
-              >
-                外协商配
-              </div>
-
-              <div
-                :class="{ button: true, active: delivery_status === 2 }"
-                @click="delivery_status = 2"
-              >
-                市配
-              </div>
-
-              <div
-                :class="{ button: true, active: delivery_status === 5 }"
-                @click="delivery_status = 5"
-              >
-                外协市配
-              </div>
-            </div>
-          </div>
-
-          <!-- 数据 -->
-          <div class="border pd10 flex-c-sb">
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_info.totalNum || 0 }}</div>
-                <div class="">单</div>
-              </div>
-              <div class="">
-                <span>配送计划总数</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_info.totalDeliveryNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>总作业</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_info.totalWeight || 0 }}</div>
-                <div class="">kg</div>
-              </div>
-              <div class="">
-                <span>总重量</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_info.totalVolume || 0 }}</div>
-                <div class="">m³</div>
-              </div>
-              <div class="">
-                <span>总方数</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_info.totalRoadNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>在途件数</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 签收数据 -->
-        <div class="flex1 box2 view_box" v-loading="details.loadingObj.signforData">
-          <!-- 标题 -->
-          <div class="align_center mb20 flex-c-sb">
-            <div class="flex">
-              <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
-
-              <div class="title">签收数据</div>
-            </div>
-
-            <div class="align_center">
-              <div
-                :class="{ button: true, active: signforData_status === '1' }"
-                @click="() => (signforData_status = '1')"
-              >
-                当天
-              </div>
-              <div
-                :class="{ button: true, active: signforData_status === '2' }"
-                @click="() => (signforData_status = '2')"
-              >
-                当月
-              </div>
-            </div>
-          </div>
-
-          <div class="border pd10 flex-c-sb">
-            <div class="text_center">
-              <div class="data_box mb10">
-                <div class="data mr5px">{{ signforData.signNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>已签收</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box orange mb10">
-                <div class="data mr5px">{{ signforData.unSignNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>未签收</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">
-                  {{ signforData.signScale || 0 }}
-                </div>
-                <div class="">%</div>
-              </div>
-              <div class="">
-                <span>签收率</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box purple mb10">
-                <div class="data mr5px">{{ signforData.clerkSignNum || 0 }}</div>
-                <div class="">个</div>
-              </div>
-              <div class="">
-                <span>文员签收任务</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box purple mb10">
-                <div class="data mr5px">
-                  {{ signforData.clerkSignforScale || 0 }}
-                </div>
-                <div class="">%</div>
-              </div>
-              <div class="">
-                <span>文员签收率</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box red mb10">
-                <div class="data mr5px">{{ signforData.clerkOverTimeSignfoNum || 0 }}</div>
-                <div class="">个</div>
-              </div>
-              <div class="">
-                <span>超时签收任务</span>
-              </div>
-            </div>
-
-            <div class="text_center" v-if="signforData_status !== '1'">
-              <div class="data_box red mb10">
-                <div class="data mr5px">
-                  {{ signforData.clerkOverTimeScale ? signforData.clerkOverTimeScale : 0 }}
-                </div>
-                <div class="">%</div>
-              </div>
-              <div class="">
-                <span>签收超时率</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 当前配送数据 && 签收数据 -- 自提 -->
-      <div class="flex mb10 row_fourthly">
-        <!-- 当前配送数据 -->
-        <div
-          class="mr10 box1 view_box"
-          style="width: 40%"
-          v-loading="details.loadingObj.deliveryData"
-        >
-          <!-- 标题 -->
-          <div class="flex-c-sb mb20">
-            <div class="align_center">
-              <img class="mr10 img_13pt" src="@/static/icon_data.png" alt="" />
-
-              <div class="title">当前配送数据 -- 自提</div>
-            </div>
-          </div>
-
-          <!-- 数据 -->
-          <div class="border pd10 flex-c-sb">
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_bill_info.totalNum || 0 }}</div>
-                <div class="">单</div>
-              </div>
-              <div class="">
-                <span>配送计划总数</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_bill_info.totalDeliveryNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>总作业</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_bill_info.totalWeight || 0 }}</div>
-                <div class="">kg</div>
-              </div>
-              <div class="">
-                <span>总重量</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_bill_info.totalVolume || 0 }}</div>
-                <div class="">m³</div>
-              </div>
-              <div class="">
-                <span>总方数</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">{{ delivery_bill_info.totalRoadNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>在途件数</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 签收数据 -->
-        <div class="flex1 box2 view_box" v-loading="details.loadingObj.signforData">
-          <!-- 标题 -->
-          <div class="align_center mb20 flex-c-sb">
-            <div class="flex">
-              <img class="mr10 img_13pt" src="@/static/icon_money.png" alt="" />
-
-              <div class="title">签收数据 -- 自提</div>
-            </div>
-
-            <div class="align_center">
-              <div
-                :class="{ button: true, active: billSignforData_status === '3' }"
-                @click="() => (billSignforData_status = '3')"
-              >
-                当天
-              </div>
-              <div
-                :class="{ button: true, active: billSignforData_status === '4' }"
-                @click="() => (billSignforData_status = '4')"
-              >
-                当月
-              </div>
-            </div>
-          </div>
-
-          <div class="border pd10 flex-c-sb">
-            <div class="text_center">
-              <div class="data_box mb10">
-                <div class="data mr5px">{{ billSignforData.signNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>已签收</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box orange mb10">
-                <div class="data mr5px">{{ billSignforData.unSignNum || 0 }}</div>
-                <div class="">件</div>
-              </div>
-              <div class="">
-                <span>未签收</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box blue mb10">
-                <div class="data mr5px">
-                  {{ billSignforData.signScale ? billSignforData.signScale : 0 }}
-                </div>
-                <div class="">%</div>
-              </div>
-              <div class="">
-                <span>签收率</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box purple mb10">
-                <div class="data mr5px">{{ billSignforData.clerkSignNum || 0 }}</div>
-                <div class="">个</div>
-              </div>
-              <div class="">
-                <span>文员签收任务</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box purple mb10">
-                <div class="data mr5px">
-                  {{ billSignforData.clerkSignforScale ? billSignforData.clerkSignforScale : 0 }}
-                </div>
-                <div class="">%</div>
-              </div>
-              <div class="">
-                <span>文员签收率</span>
-              </div>
-            </div>
-
-            <div class="text_center">
-              <div class="data_box red mb10">
-                <div class="data mr5px">{{ billSignforData.clerkOverTimeSignfoNum || 0 }}</div>
-                <div class="">个</div>
-              </div>
-              <div class="">
-                <span>超时签收任务</span>
-              </div>
-            </div>
-
-            <div class="text_center" v-if="billSignforData_status !== '3'">
-              <div class="data_box red mb10">
-                <div class="data mr5px">
-                  {{ billSignforData.clerkOverTimeScale ? billSignforData.clerkOverTimeScale : 0 }}
-                </div>
-                <div class="">%</div>
-              </div>
-              <div class="">
-                <span>签收超时率</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 开单数据 -->
-      <el-dialog
-        title="开单数据"
-        v-model="details.popUpShow.isShow"
-        width="80%"
-        :append-to-body="false"
-        :destroy-on-close="false"
-        draggable
-      >
-        <!-- 导出 -->
-        <div class="flex-c-sb mb10">
-          <div></div>
-          <el-button icon="Download" type="primary" @click="handleExport"> 导出 </el-button>
-        </div>
-
-        <!-- 表格 -->
-        <tablecmt
-          style="height: 500px"
-          :columnList="details.columnList"
-          :tableData="details.renderData"
-          :loading="details.loadingObj.loading"
-          @inputTxt="
-            (value, col) => {
-              handleInputQuery(value, col, details.query.inputQuery, true);
-              details.renderData = handleFilterData(details.tableData, [], details.query);
-            }
-          "
-          :isInitHeigt="false"
-        ></tablecmt>
-
-        <tablecmt
-          ref="exportColumnListNode"
-          v-show="false"
-          style="height: 500px"
-          :columnList="details.exportColumnList"
-          :tableData="details.tableData"
-          :isInitHeigt="false"
-        ></tablecmt>
-      </el-dialog>
     </div>
-  </template>
-
-  <!-- 公司首页 -->
-  <template v-else>
-    <div class="el_Hwlogo">
-      <div class="content">
-        <img src="/public/img/p-logo.png" alt="" />
-        <div class="info">
-          <div class="name">{{ name }}</div>
-          <div class="slogan">您好！欢迎使用货无忧</div>
-          <div class="title">成都数联物科信息技术有限公司</div>
-          <div class="time">{{ currentTime }}</div>
-        </div>
-      </div>
-    </div>
-  </template>
+  </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, computed, reactive, defineComponent, toRefs, toRef } from 'vue';
-import {
-  computeNumber,
-  deepClone,
-  getObjType,
-  handleFilterData,
-  handleInputQuery,
-} from '@/utils/util.js';
-import { getStore } from '@/utils/store';
-import { dateNow } from '@/utils/date';
-
-import {
-  postAllocationData,
-  postHandOrderData,
-  postOpenOrderData,
-  postOpenOrderIncome,
-  postTrunklineCarsData,
-  postTrunklineHandOrderData,
-  postUnloadAbnormalData,
-  postDeliveryData,
-  postSignforData,
-  postOpenOrderDataByWarehouseId,
-} from '@/api/wel/index';
-import { exportExcelByDom } from '@/utils/export';
-
-import { openOrderColumn } from '@/option/wel/index';
-
-// 弹窗组件
-import Tip from './Tip.vue';
-
-// 注册组件
-defineComponent([Tip]);
-
-const exportColumnListNode = ref();
-
-const details = reactive({
-  title: '',
-  /** 开单数据 */
-  openOrderDataInfo: {
-    /** 开单 -- 当日 -- 单 */
-    dayNum: 0,
-    /** 开单 -- 当月 -- 单 */
-    monthNum: 0,
-    /** 开单 -- 总计 -- 单 */
-    totalNum: 0,
-    /** 开单 -- 当日 -- 单 */
-    dayCount: 0,
-    /** 开单 -- 当月 -- 单 */
-    monthCount: 0,
-    /** 开单 -- 总计 -- 件 */
-    totalCount: 0,
-  },
-  /** 开单收入 */
-  openOrderIncomeInfo: {
-    dayBillladingFee: '0.00',
-    dayDistributionFee: '0.00',
-    dayFee: '0.00',
-    dayInstallFee: '0.00',
-    dayTrunklineFee: '0.00',
-    dayWarehouseFee: '0.00',
-    monthBillladingFee: '0.00',
-    monthDistributionFee: '0.00',
-    monthFee: '0.00',
-    monthInstallFee: '0.00',
-    monthTrunklineFee: '0.00',
-    monthWarehouseFee: '0.00',
-    totalFee: '0',
-  },
-  /** 当前在库数据 */
-  handOrderDataInfo: {
-    billNum: 0,
-    cityNum: 0,
-    mallNum: 0,
-    thirdTransferNum: 0,
-    totalNum: 0,
-    trayNum: 0,
-    zeroNum: 0,
-  },
-  /** 库位数据 */
-  allocationDataInfo: {
-    noUpshelfNum: 0,
-    nullNum: 0,
-    totalNum: 0,
-    upshelfNum: 0,
-    useNum: 0,
-  },
-  /** 干线发运数据 */
-  trunklineHandOrderDataInfo: {
-    handleNum: 0,
-    handleVolume: '0.0000',
-    handleWeight: '0.0000',
-    waybillNum: 0,
-  },
-  /** 干线车次数据 */
-  trunklineCarsDataInfo: {
-    inTransitNum: 0,
-    totalNum: 0,
-    unloadNum: 0,
-    workNum: 0,
-  },
-  /** 异常卸车数据 */
-  unloadAbnormalDataInfo: {
-    abnormalDayRate: '0',
-    abnormalMonthRate: '0',
-    noDealDayNum: 0,
-    noDealMonthNum: 0,
-    sendDayNum: 0,
-    sendMonthNum: 0,
-    unloadDayNum: 0,
-    unloadMonthNum: 0,
-  },
-  /** 配送数据 */
-  deliveryDataInfo: [],
-  /** 签收数据 */
-  signforDataInfo: [],
-  loadingObj: {
-    /** 开单数据 */
-    openOrderData: false,
-    /** 开单收入 */
-    openOrderIncome: false,
-    /** 当前在库数据 */
-    handOrderData: false,
-    /** 库位数据 */
-    allocationData: false,
-    /** 干线发运数据 */
-    trunklineHandOrderData: false,
-    /** 干线车次数据 */
-    trunklineCarsData: false,
-    /** 异常卸车数据 */
-    unloadAbnormalData: false,
-    /** 配送数据 */
-    deliveryData: false,
-    /** 签收数据 */
-    signforData: false,
-    /** 弹窗loading */
-    loading: false,
-  },
-  /** 1 -- 公司首页, 2 -- 数据看板 */
-  pageType: 1,
-  /** 表头 */
-  detailOption: {
-    // 开单数据
-    openOrderColumn: deepClone(openOrderColumn),
-  },
-  columnList: [],
-  exportColumnList: [],
-  tableData: [],
-  renderData: [],
-  /** 搜索 */
-  query: {
-    inputQuery: {},
-  },
-  popUpShow: {
-    isShow: false,
-  },
-});
-
-const { detailOption } = toRefs(details);
+import { ref, onUnmounted } from 'vue';
 
 const info = localStorage.getItem('TWMS-userInfo');
 
@@ -1249,173 +23,10 @@ console.log('_userInfo :>> ', _userInfo);
 const name = ref('');
 const currentTime = ref('0000年00月00日00时00分00秒');
 
-const deliveryDataBill = computed(() => {});
-
-/**
- * 配送显示数据类型
- * 1 -- 商配
- * 2 -- 市配
- * 3 -- 自提
- * 4 -- 外协商配
- * 5 -- 外协市配
- */
-const delivery_status = ref<1 | 2 | 3 | 4 | 5>(1);
-
-/** 异常数据状态 */
-const abnormal_status = ref<'day' | 'month'>('day');
-
-/** 签收数据状态 */
-const signforData_status = ref<'1' | '2'>('1');
-
-/** 自提签收数据状态 */
-const billSignforData_status = ref<'3' | '4'>('3');
-
-/** 请求开单数据 */
-const initOpenOrderData = async () => {
-  try {
-    details.loadingObj.openOrderData = true;
-    const res = await postOpenOrderData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.openOrderDataInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.openOrderData = false;
-  }
-};
-
-/** 请求开单收入 */
-const initOpenOrderIncome = async () => {
-  try {
-    details.loadingObj.openOrderIncome = true;
-    const res = await postOpenOrderIncome({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.openOrderIncomeInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.openOrderIncome = false;
-  }
-};
-
-/** 请求库位数据 */
-const initAllocationData = async () => {
-  try {
-    details.loadingObj.allocationData = true;
-    const res = await postAllocationData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.allocationDataInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.allocationData = false;
-  }
-};
-
-/** 请求在库数据 */
-const initHandOrderData = async () => {
-  try {
-    details.loadingObj.handOrderData = true;
-    const res = await postHandOrderData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.handOrderDataInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.handOrderData = false;
-  }
-};
-
-/** 请求干线发运数据 */
-const initTrunklineHandOrderData = async () => {
-  try {
-    details.loadingObj.trunklineHandOrderData = true;
-    const res = await postTrunklineHandOrderData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.trunklineHandOrderDataInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.trunklineHandOrderData = false;
-  }
-};
-
-/** 请求干线车次数据 */
-const initTrunklineCarsData = async () => {
-  try {
-    details.loadingObj.trunklineCarsData = true;
-    const res = await postTrunklineCarsData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.trunklineCarsDataInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.trunklineCarsData = false;
-  }
-};
-
-/** 卸车异常数据 */
-const initUnloadAbnormalData = async () => {
-  try {
-    details.loadingObj.unloadAbnormalData = true;
-    const res = await postUnloadAbnormalData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.unloadAbnormalDataInfo = data || {};
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.unloadAbnormalData = false;
-  }
-};
-
-/** 配送数据 */
-const initDeliveryData = async () => {
-  try {
-    details.loadingObj.deliveryData = true;
-    const res = await postDeliveryData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.deliveryDataInfo = data || [];
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.deliveryData = false;
-  }
-};
-
-/** 签收数据 */
-const initSignforData = async () => {
-  try {
-    details.loadingObj.signforData = true;
-    const res = await postSignforData({});
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.signforDataInfo = data || [];
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.signforData = false;
-  }
-};
-
+let timer;
 // 请求数据看板数据
 const handleRefresh = () => {
-  /** 不显示首页数据看板的租户 */
-  const blackArr = ['645789', '332207'];
-  details.pageType =
-    (_userInfo.content && _userInfo.content.role_id + '' === '1713793784178806785') ||
-    blackArr.includes(_userInfo.content.tenant_id + '')
-      ? 1
-      : 2;
-
-  let timer = setInterval(() => {
+  timer = setInterval(() => {
     const now = new Date();
     const year = now.getFullYear();
     const month = String(now.getMonth() + 1).padStart(2, '0');
@@ -1426,396 +37,17 @@ const handleRefresh = () => {
     currentTime.value = `${year}年${month}月${day}日${hours}时${minutes}分${seconds}秒`;
   }, 1000);
 
-  if (details.pageType === 2) {
-    clearInterval(timer);
-    timer = null;
-    initAllocationData();
-    initHandOrderData();
-    initOpenOrderData();
-    initOpenOrderIncome();
-    initTrunklineCarsData();
-    initTrunklineHandOrderData();
-    initUnloadAbnormalData();
-    initDeliveryData();
-    initSignforData();
-  } else {
-    name.value = _userInfo.content.real_name;
-  }
+  name.value = _userInfo.content.real_name;
 };
 
 handleRefresh();
 
-/** 异常数据 */
-const abnormal_Info = computed(() => {
-  const _obj =
-    abnormal_status.value === 'day'
-      ? {
-          sendNum: details.unloadAbnormalDataInfo.sendDayNum,
-          noDealNum: details.unloadAbnormalDataInfo.noDealDayNum,
-          abnormalRate: details.unloadAbnormalDataInfo.abnormalDayRate,
-        }
-      : {
-          sendNum: details.unloadAbnormalDataInfo.sendMonthNum,
-          noDealNum: details.unloadAbnormalDataInfo.noDealMonthNum,
-          abnormalRate: details.unloadAbnormalDataInfo.abnormalMonthRate,
-        };
-
-  return _obj;
-});
-
-/** 配送数据 */
-const delivery_info = computed(() => {
-  let _obj = {};
-
-  for (let i = 0; i < details.deliveryDataInfo.length; i++) {
-    const value = details.deliveryDataInfo[i];
-    if (delivery_status.value + '' === value.type + '') _obj = value;
-  }
-
-  return _obj;
+onUnmounted(() => {
+  clearInterval(timer);
 });
-
-/** 配送自提数据 */
-const delivery_bill_info = computed(() => {
-  let _obj = {};
-
-  for (let i = 0; i < details.deliveryDataInfo.length; i++) {
-    const value = details.deliveryDataInfo[i];
-    if (value.type + '' === '3') _obj = value;
-  }
-
-  return _obj;
-});
-
-/** 签收数据 */
-const signforData = computed(() => {
-  let _obj = {};
-
-  for (let i = 0; i < details.signforDataInfo.length; i++) {
-    const value = details.signforDataInfo[i];
-    if (value.type + '' === signforData_status.value) _obj = value;
-  }
-
-  _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
-  _obj.clerkSignforScaleNum
-    ? _obj.clerkSignforScaleNum
-    : (_obj.clerkSignforScaleNum = _obj.clerkSignforScale || 0);
-  _obj.clerkOverTimeScaleNum
-    ? _obj.clerkOverTimeScaleNum
-    : (_obj.clerkOverTimeScaleNum = _obj.clerkOverTimeScale || 0);
-
-  _obj.signScale = computeNumber(_obj.signScaleNum || 0, '*', 100).result.toFixed(2);
-  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScaleNum || 0, '*', 100).result.toFixed(
-    2
-  );
-  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScaleNum || 0, '*', 100).result.toFixed(
-    2
-  );
-
-  return _obj;
-});
-
-/** 签收数据 -- 自提 */
-const billSignforData = computed(() => {
-  let _obj = {};
-
-  for (let i = 0; i < details.signforDataInfo.length; i++) {
-    const value = details.signforDataInfo[i];
-    if (value.type + '' === billSignforData_status.value) _obj = value;
-  }
-
-  _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
-  _obj.clerkSignforScaleNum
-    ? _obj.clerkSignforScaleNum
-    : (_obj.clerkSignforScaleNum = _obj.clerkSignforScale || 0);
-  _obj.clerkOverTimeScaleNum
-    ? _obj.clerkOverTimeScaleNum
-    : (_obj.clerkOverTimeScaleNum = _obj.clerkOverTimeScale || 0);
-
-  _obj.signScale = computeNumber(_obj.signScaleNum || 0, '*', 100).result.toFixed(2);
-  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScaleNum || 0, '*', 100).result.toFixed(
-    2
-  );
-  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScaleNum || 0, '*', 100).result.toFixed(
-    2
-  );
-
-  return _obj;
-});
-
-/** 请求详情 */
-const handleDetails = async (type, title) => {
-  details.popUpShow.isShow = true;
-  details.loadingObj.loading = true;
-  details.title = title;
-  details.columnList = details.detailOption[type];
-  const _arr = [];
-  const _whiteArr = ['操作', '序号', '复选框'];
-  for (let i = 0; i < details.columnList.length; i++) {
-    const val = { ...details.columnList[i] };
-    if (_whiteArr.includes(val.label)) continue;
-    val.type = 30;
-    _arr.push(val);
-  }
-  details.exportColumnList = _arr;
-
-  try {
-    let res: any = { data: {} };
-    switch (type) {
-      // 开单数据
-      case 'openOrderColumn':
-        res = await postOpenOrderDataByWarehouseId({});
-        break;
-
-      default:
-        break;
-    }
-    const { code, data } = res.data;
-    if (code !== 200 || getObjType(data) !== 'array') return;
-    details.tableData = data;
-    details.renderData = data;
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    details.loadingObj.loading = false;
-  }
-};
-
-/** 导出 */
-const handleExport = () => {
-  exportExcelByDom(exportColumnListNode.value.$el, `${details.title} - ${dateNow()}.xlsx`);
-};
 </script>
 
 <style scoped lang="scss">
-.main_container {
-  font-size: 14px;
-  background: #f5f5f6;
-  padding: 0 5px;
-  position: relative;
-
-  // 弹窗
-  :deep(.el-overlay) {
-    position: absolute;
-  }
-
-  :deep(.el-overlay-dialog) {
-    position: absolute;
-  }
-}
-
-.view_box {
-  padding: 10px;
-  padding-top: 8px;
-  background: #fff;
-  border-radius: 5px;
-
-  .title {
-    font-weight: bold;
-    font-size: 18px;
-    line-height: 18px;
-  }
-
-  .img_16pt {
-    width: 20px;
-    height: 20px;
-  }
-}
-
-.mb20 {
-  margin-bottom: 20px;
-}
-
-.pd10 {
-  padding: 0 10px;
-}
-
-.detailsBtn {
-  font-size: 0.9rem;
-  color: var(--el-color-primary);
-  font-weight: bold;
-  cursor: pointer;
-  transition: all 0.3s;
-
-  &:hover {
-    color: #2693ff;
-  }
-}
-
-.align_center {
-  display: flex;
-  align-items: center;
-}
-
-// 开单数据
-.height40pt {
-  height: 60px;
-}
-
-// 数据样式
-.data {
-  font-weight: bold;
-  color: #000;
-  font-family: DIN-Bold;
-  font-size: 20px;
-}
-
-.border {
-  border: 1pt solid #f5f5f6;
-  border-radius: 5px;
-  box-sizing: border-box;
-}
-
-.border-bottom {
-  border-bottom: 1pt solid #f5f5f6;
-  box-sizing: border-box;
-}
-
-.border-left {
-  border-left: 1px solid #f5f5f6;
-  box-sizing: border-box;
-}
-
-// 第一排
-.row_first {
-  & > div {
-    height: 100%;
-  }
-
-  .box1 {
-    height: 100%;
-    width: 400px;
-    box-sizing: border-box;
-    flex: none;
-  }
-
-  // 开单收入
-  .box2 {
-    height: 100%;
-
-    // 统计数据
-    .totol {
-      width: 400px;
-
-      .monthData {
-        height: 120px;
-
-        & > div {
-          height: 80%;
-          flex-direction: column;
-          display: flex;
-          justify-content: space-around;
-          padding: 0 10px;
-          box-sizing: border-box;
-        }
-      }
-    }
-
-    // 详情数据
-    .detailsData {
-      .item {
-        background: #f2f7fb;
-        border-radius: 5px;
-        height: 85px;
-        box-sizing: border-box;
-        padding: 10px;
-        color: #a4b0c2;
-        display: flex;
-        justify-content: space-between;
-        flex-direction: column;
-      }
-    }
-  }
-}
-
-// 第二排
-.row_second {
-  .dataIcon {
-    height: 14px;
-    width: 14px;
-  }
-
-  .data_container {
-    height: 100px;
-    box-sizing: border-box;
-    padding: 20px 0;
-  }
-
-  .item {
-    width: 137px;
-    height: 100%;
-    padding: 0 20px;
-    box-sizing: border-box;
-    flex: none;
-  }
-}
-
-// 第三排
-.row_third {
-  @extend .row_second;
-  .abnormal_container {
-    height: 100px;
-  }
-
-  .abnormal_item {
-    box-sizing: border-box;
-    padding: 20px;
-    width: 160px;
-    color: #7b8ba4;
-
-    &.red {
-      background: #ffeeed;
-
-      .data {
-        color: #ff5d52;
-      }
-    }
-
-    &.blue {
-      background: #e9f4ff;
-
-      .data {
-        color: #2693ff;
-      }
-    }
-
-    &.green {
-      background: #e5f8f3;
-
-      .data {
-        color: #00c090;
-      }
-    }
-  }
-
-  .button {
-    padding: 0px 10px;
-    height: 18px;
-    line-height: 18px;
-    background: #fff;
-    border: 1px solid #f5f5f6;
-    border-radius: 2px;
-    color: #000;
-    font-size: 12px;
-    transition: all 0.3s;
-    cursor: pointer;
-    &.active {
-      color: #fff;
-      background: #2693ff;
-      border-color: #2693ff;
-    }
-  }
-}
-
-// 第四排
-.row_fourthly {
-  @extend .row_third;
-
-  .item {
-    width: 150px;
-  }
-}
-
 .data_box {
   padding: 16px;
   min-width: 80px;