diff --git a/src/api/reportforms/index.js b/src/api/reportforms/index.js
index a9922d4f..e001acbc 100644
--- a/src/api/reportforms/index.js
+++ b/src/api/reportforms/index.js
@@ -46,7 +46,14 @@ export const $_getdetails = (params) => {
       params,
     });
   };
-
+  // 配送明细报表V2
+  export const $_getdetailsv2 = (params) => {
+    return request({
+      url: '/logpm-report/reportDelivery/details/v2',
+      method: 'get',
+      params,
+    });
+  };
 //  配送明细报表报表导出
   export const $_exportDetails = (params) => {
     return request({
@@ -57,14 +64,15 @@ export const $_getdetails = (params) => {
     })
   }
 
-    // 自提明细报表
-export const $_getSelfpickup = (params) => {
+//  配送明细报表报表导出
+export const $_exportDetailsv2 = (params) => {
   return request({
-    url: '/api/logpm-report/reportBillLoading/details',
+    url: '/api/logpm-report/reportDelivery/exportDetails/v2',
     method: 'get',
     params,
-  });
-};
+    responseType: 'blob',
+  })
+}
 
 //  自提明细报表报表导出
 export const $_exportSelfpickup  = (params) => {
diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 27bacff2..5777d94f 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -775,7 +775,7 @@ export const AppealList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '80',
+    width: '100',
     checkarr: [],
     fixed: 'right',
     sortable: false,
diff --git a/src/option/reportforms/DeliveryDetailsVtwo.js b/src/option/reportforms/DeliveryDetailsVtwo.js
new file mode 100644
index 00000000..8052141c
--- /dev/null
+++ b/src/option/reportforms/DeliveryDetailsVtwo.js
@@ -0,0 +1,535 @@
+export const columnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'trainNumber',
+      label: '车次',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'reservationCode',
+        label: '预约单号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'taskTime',
+        label: '配送日期',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+
+    {
+      prop: 'warehouseName',
+      label: '仓库',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'brand',
+      label: '品牌',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'signNum',
+      label: '签收数量',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      isshowSummary: true,
+      head: false,
+    },
+    {
+      prop: 'loadingMode',
+      label: '装车方式',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'signType',
+      label: '签收方式',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'type',
+        label: '配送类型',
+        type: 3,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'kind',
+        label: '配送种类',
+        type: 3,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+    {
+      prop: 'vehicleName',
+      label: '配送车辆',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'driverName',
+      label: '配送司机',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'distributionCompany',
+      label: '配送公司',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    }, 
+    {
+      prop: 'drConsignee',
+      label: '客户名称',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'deliveryPhone',
+        label: '客户电话',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'deliveryAddress',
+        label: '地址',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'consignee',
+        label: '运单收货单位',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'consigneeName',
+        label: '运单收货人',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'consigneeMobile',
+        label: '运单收货电话',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'waybillNo',
+        label: '运单号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'stockArticleId',
+        label: '订单自编码',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'orderPackageCode',
+        label: '包条码',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'customerTrain',
+        label: '客户车次号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'conditions',
+        label: '包件类型',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'firsts',
+        label: '一级品',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'decond',
+        label: '二级品',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'thirdProduct',
+        label: '三级品',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'materialCode',
+        label: '物料编码',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'materialName',
+        label: '物料名称',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'startWar',
+        label: '始发仓',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'startWarInTime',
+        label: '始发仓入库日期',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'startWarOutTime',
+        label: '始发仓发货日期',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'warehouseEntryTimeEnd',
+        label: '入库时间',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'driverSigning',
+        label: '司机签收状态',
+        type: 3,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'unloadTime',
+        label: '装车时间',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'unAdministratorsName',
+        label: '装车人',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'sjsigningTime',
+        label: '签收时间',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'ldsSigneeName',
+        label: '签收人',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'signingStatus',
+        label: '文员审核状态',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'signingTime',
+        label: '文员审核时间',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'examineUserName',
+        label: '审核人名称',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+          {
+        prop: 'abnormalSigning',
+        label: '是否异常签收',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+    //       {
+    //     prop: 'abnormalLoading',
+    //     label: '是否异常装车',
+    //     type: 1,
+    //     values: '',
+    //     width: '150',
+    //     checkarr: [],
+    //     fixed: false,
+    //     sortable: true,
+    //     head: false,
+    //   },
+    //       {
+    //     prop: 'auditingStatus',
+    //     label: '异常审核状态',
+    //     type: 1,
+    //     values: '',
+    //     width: '150',
+    //     checkarr: [],
+    //     fixed: false,
+    //     sortable: true,
+    //     head: false,
+    //   },
+    //       {
+    //     prop: 'auditingUser',
+    //     label: '审核人',
+    //     type: 2,
+    //     values: '',
+    //     width: '150',
+    //     checkarr: [],
+    //     fixed: false,
+    //     sortable: true,
+    //     head: false,
+    //   },
+    //       {
+    //     prop: 'auditingTime',
+    //     label: '审核时间',
+    //     type: 4,
+    //     values: '',
+    //     width: '150',
+    //     checkarr: [],
+    //     fixed: false,
+    //     sortable: true,
+    //     head: false,
+    //   },
+    // {
+    //   prop: 'createUserName',
+    //   label: '操作',
+    //   type: 6,
+    //   values: '',
+    //   width: '200',
+    //   checkarr: [],
+    //   fixed: 'right',
+    //   sortable: false,
+    // },
+  ]
\ No newline at end of file
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 223787cf..f9365b33 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -2046,19 +2046,23 @@ const InformationViewing = val => {
       Routstate: 'appeal',
     });
     $router.push({ path: workOrderInfoPath, query: queryParams });
+    console.log('申诉跳转');
+    
     return;
   }
 
   if (TabPermissions.value === 4) {
     Resultediting(val);
+    console.log('菜单4跳转');
     return;
   }
 
   if (TabPermissions.value === 7) {
     $router.push({ path: workOrderInfoPath, query: queryParams });
+    console.log('菜单7跳转');
     return;
   }
-
+  console.log('默认跳转');
   $router.push({ path: workOrderInfoPath, query: { ...queryParams, id: val.row.id } });
 };
 
@@ -2125,7 +2129,7 @@ const InformationViewing = val => {
 // 首页查看详情按钮
 
 const view = val => {
-  console.log(val.row, '申诉查看');
+  console.log(val.row, '查看');
   const workOrderInfoPath = '/aftersales/aftersalesWorkOrderInfo';
   const baseQueryParams = {
     id: val.row.workOrderId,
@@ -2151,9 +2155,12 @@ const view = val => {
   }
 
   if (TabPermissions.value === 4) {
+    console.log('当前菜单4');
+    
     const claimQueryParams = {
       ...baseQueryParams,
       appealID: val.row.id,
+      id:val.row.lawoId,//理赔金未出需要的ID
       ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '',
       Routstate: '',
       AppealReview: val.row.typesOf ? (val.row.typesOf === '0' ? 'true' : 'false') : 'true',
@@ -2178,6 +2185,8 @@ const view = val => {
     Routstate: '',
     AppealReview: val.row.typesOf ? (val.row.typesOf === '0' ? 'true' : 'false') : 'true',
   };
+  console.log('默认跳转');
+  
   $router.push({ path: workOrderInfoPath, query: defaultQueryParams });
 };
 
@@ -2403,7 +2412,7 @@ const CancelappealFn = val => {
 const appeal = (val, state) => {
   console.log(state, 'state');
   AppealAttachment.value = []; //清空图片
-  Appealselection.value = ''; //清空责任人
+  Appealselection.value = []; //清空责任人
   Reasonforappeal.value = ''; //清空申诉内容
   console.log(state);
   console.log(val, '申诉当前点击的按钮');
@@ -2991,14 +3000,14 @@ const appealFn = val => {
 };
 
 // 申诉列表
-const AppealTab = val => {
+const AppealTab = async val => {
   console.log(val, '完结当前列表');
   arbitrationTemp.value = val;
 
   if (val == 0) {
     arbitrationTemp.value = 0;
     AppealStatusT.value = false; //申诉列表关闭
-    Tableheaderswitching(columnList); //切换表头
+
     console.log('处理完毕');
     ProcessingPartyState.value = false; //关闭处理方
     details.query.workOrderStatus = 80;
@@ -3008,6 +3017,7 @@ const AppealTab = val => {
       ...details.query,
     };
     IndexTable(data, true);
+    Tableheaderswitching(columnList); //切换表头
   } else {
     arbitrationTemp.value = 1;
     AppealListFn(); //申诉列表函数
@@ -3574,6 +3584,8 @@ const AllEndArbitration = () => {
 
 const ResultConfirmation = val => {
   if (UserPermissions.value == '仓库客服') {
+    console.log('仓库客服');
+
     //处理完毕菜单下面确定按钮用于确定处理结果（仓库客服用的）
     let data = {
       assignList: [],
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index a6cbdb57..fe9eb9d4 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -10,7 +10,7 @@
         <el-form :model="Indexform" class="IndexFrom" ref="IndexForm" disabled>
           <div class="el_top">
             <el-form-item label="异常类型" class="el_inputTop">
-              <el-select v-model="Indexform.workOrderType" style="width: 240px;">
+              <el-select v-model="Indexform.workOrderType" style="width: 240px">
                 <el-option
                   v-for="item in IndexException"
                   :key="item.value"
@@ -21,7 +21,7 @@
             </el-form-item>
 
             <el-form-item label="发现节点" class="el_inputTop">
-              <el-select v-model="Indexform.discoveryNode" style="width: 240px;">
+              <el-select v-model="Indexform.discoveryNode" style="width: 240px">
                 <el-option
                   v-for="item in DiscoveringNodes"
                   :key="item.value"
@@ -113,7 +113,7 @@
                 <div class="el_information_row">
                   <el-form-item label="车次号" v-if="displaySettings.trainNumber">
                     <el-tooltip
-                      :content="item.trainNumber ? item.trainNumber : '车次号'"
+                      :content="item && item.trainNumber ? item.trainNumber : '车次号'"
                       placement="top"
                     >
                       <el-input v-model="Indexform.trainNumber" />
@@ -1076,7 +1076,7 @@ const pictureList = val => {
   amplifyurl.value = val.url;
 };
 // 菜单切换显示输入框
-const displaySettings = computed(() => {
+const displaySettings = computed(() => { 
   return {
     trainNumber: ['3', '5', '7', '6'].includes(Indexform.value.discoveryNode), //车次号
     deliveryTime: ['5', '7', '6'].includes(Indexform.value.discoveryNode), //配送时间
@@ -1104,7 +1104,10 @@ const handle = () => {
   });
 };
 // 是否可以查看完结信息
-const Completionpermissions = computed(() => {
+const Completionpermissions = computed(async () => {
+  if (await localStorage.getItem('my_data')) {
+    Mydata.value = await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
+  }
   if (CompensationParty.value.length) {
     console.log(CompletedView.value, 'CompletedView.value');
     if (CompletedView.value.includes(Mydata.value.id) || UserPermissions.value != '仓库客服') {
@@ -1120,8 +1123,8 @@ const Completionpermissions = computed(() => {
 });
 const onLoad = async () => {
   pageState.value = true; //开启页面加载
-  if (localStorage.getItem('my_data')) {
-    Mydata.value =  await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
+  if (await localStorage.getItem('my_data')) {
+    Mydata.value = await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
   }
   getDictionaryBiz('after_sales_visits').then(async res => {
     const matchingItem = res.data.data.find(
@@ -1135,10 +1138,10 @@ const onLoad = async () => {
     console.log(UserPermissions.value, '当前角色权限');
     await Chathistory(); //聊天的历史记录
     routerState.value = $route.query.routerState;
-   await updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
-   await  updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
-  await  handle(); //处理方和责任方信息
- 
+    await updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
+    await updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
+    await handle(); //处理方和责任方信息
+
     $_getInfo({ id: $route.query.id }).then(res => {
       pageState.value = false; //关闭页面加载
       if ($route.query.Routstate) {
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index b213a7c3..b735dc35 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -452,7 +452,7 @@
                       :class="{ payanindemnity_title: item.state == 0 }"
                       :label="item.state == 0 ? '赔款方' : '受款方'"
                     >
-                      <el-select v-model="item.warehouseId" filterable placeholder="请选择仓库">
+                      <el-select style="width: 200px;" v-model="item.warehouseId" filterable placeholder="请选择仓库">
                         <el-option
                           v-for="item in warehouseData"
                           :key="item.value"
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index d6edc13b..0b3733d0 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -81,7 +81,13 @@
           <el-button icon="Search" @click="searchHide" circle></el-button>
         </div>
       </div>
-
+      <el-tabs type="border-card" class="top-el-tabs" v-model="tabName" @tab-change="tabchange">
+        <el-tab-pane label="全部" :name="0"></el-tab-pane>
+        <el-tab-pane label="保险临期" :name="1"></el-tab-pane>
+        <el-tab-pane label="保险到期" :name="2"></el-tab-pane>
+        <el-tab-pane label="年审临期" :name="3"></el-tab-pane>
+        <el-tab-pane label="年审到期" :name="4"></el-tab-pane>
+      </el-tabs>
       <!-- 列表模块 -->
       <tablecmt
         :columnList="details.columnList"
@@ -192,7 +198,7 @@ import { getOwn } from '@/api/basicdata/basicdataDriverArtery';
 const $router = useRouter();
 
 const $store = useStore();
-
+const tabName=ref(0)
 const details = reactive<any>({
   /** 是否开启搜索 */
   search: true,
@@ -231,7 +237,7 @@ const details = reactive<any>({
   /** 列表 */
   columnList: deepClone(columnList),
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -288,7 +294,13 @@ const onLoad = debounce(async () => {
     details.loadingObj.list = true;
     let _page = details.page;
     // 获取暂存单列表
-    const res = await getPage({ ..._page, ...details.query });
+    let submit = {
+       ..._page,
+        ...details.query,
+        pageType:tabName.value,
+      }
+    
+    const res = await getPage(submit);
     console.log('res :>> ', res);
     const { code, data } = res.data;
     if (code !== 200) return;
@@ -385,7 +397,9 @@ initData();
 const searchChange = () => {
   onLoad();
 };
-
+const tabchange=()=>{
+  onLoad();
+}
 /** 清空表单 */
 const searchReset = () => {
   details.query = {};
@@ -576,4 +590,9 @@ const handleExport = () => {
 .fwb {
   font-weight: bold;
 }
+:deep(.top-el-tabs) {
+  .el-tabs__content {
+    display: none;
+  }
+}
 </style>
diff --git a/src/views/reportforms/DeliveryDetailsVtwo.vue b/src/views/reportforms/DeliveryDetailsVtwo.vue
new file mode 100644
index 00000000..9b211900
--- /dev/null
+++ b/src/views/reportforms/DeliveryDetailsVtwo.vue
@@ -0,0 +1,627 @@
+<template>
+    <basic-container>
+      <!-- 首页表格 -->
+      <div class="avue-crud">
+        <!-- 搜索模块 -->
+        <el-row v-if="search">
+          <!-- 查询模块 -->
+          <el-form :inline="true" :model="TopQuery" class="el-fr-d">
+            <!-- 查询按钮 -->
+  
+            <div class="el_top_left">
+              <el-form-item label="配送日期">
+                <el-date-picker
+                  v-model="TopQuery.time"
+                  type="datetimerange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  :default-time="defaultTime2"
+                />
+              </el-form-item>
+              <el-form-item label="扫描签收时间">
+                <el-date-picker
+                  v-model="TopQuery.Signfor"
+                  type="datetimerange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="shortcuts"
+                  :default-time="defaultTime2"
+                />
+              </el-form-item>
+              <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-input
+                  v-model="TopQuery.vehicleNameRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  clearable
+                  placeholder="多个配送车辆请用逗号隔开"
+                />
+              </el-form-item>
+              <el-form-item label="配送司机">
+                <el-input
+                  v-model="TopQuery.driverNameRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  clearable
+                  placeholder="多个配送司机请用逗号隔开"
+                />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input
+                  v-model="TopQuery.consigneeRange"
+                  style="width: 240px"
+                  :rows="1"
+                  clearable
+                  type="textarea"
+                  placeholder="多个客户名称请用逗号隔开"
+                />
+              </el-form-item>
+  
+              <el-form-item label="运单收货人">
+                <el-input
+                  v-model="TopQuery.consigneeNameRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  clearable
+                  placeholder="多个运单收货人请用逗号隔开"
+                />
+              </el-form-item>
+            </div>
+          </el-form>
+        </el-row>
+  
+        <!-- 控件模块 -->
+        <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 type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+              <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+              <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="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="columnList"
+    ></edittablehead>
+  </template>
+  
+  <script setup>
+  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+  import { columnList } from '@/option/reportforms/DeliveryDetailsVtwo.js';
+  import { getDictionaryBiz } from '@/api/system/dict'; //字典
+  import { processRowProperty, setNodeHeight } from '@/utils/util';
+  import { $_getdetailsv2, $_exportDetailsv2, $_getMyWarehouseList } from '@/api/reportforms/index.js';
+  import { ElMessageBox } from 'element-plus';
+  import { downloadXls, deepClone } from '@/utils/util';
+  import functions from '@/utils/functions.js';
+  import dayjs from 'dayjs';
+  const queryCarn = ref({}); //查询顶部
+  const indeterminate = ref(false);
+  const checkAll = ref(false);
+  const TopQuery = ref({
+    warehouseNameRange: [],
+    time: [],
+  }); //查询顶部
+  const warehouseList = ref([]); //仓库列表
+  const DeliveryTypeList = ref([
+    {
+      label: '商配',
+      value: '商配',
+    },
+  
+    {
+      label: '市配',
+      value: '市配',
+    },
+  ]); //配送类型
+  // 配送种类
+  const DeliverygenericList = ref([
+    {
+      label: '自主配送',
+      value: '自主配送',
+    },
+  
+    {
+      label: '三方配送',
+      value: '三方配送',
+    },
+  ]); //配送类型
+  
+  // 签收状态
+  
+  const Signingstatus = ref([
+    {
+      label: '已签收',
+      value: '已签收',
+    },
+  
+    {
+      label: '未签收',
+      value: '未签收',
+    },
+  ]);
+  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];
+        },
+      },
+    ],
+    /** 列表 */
+    columnList: deepClone(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,
+    data,
+    loadingObj,
+    selectionList,
+    drawerShow,
+    page,
+    trickleLoadingPage,
+    zeroAdditionalRecordingInfo,
+    popUpShow,
+    recorddata,
+    defaultTime2,
+  } = toRefs(details);
+  
+  /** 展开列表控件 */
+  const showdrawer = _flag => {
+    details.drawerShow = _flag;
+  };
+  /** 表格表头输入框搜索 */
+  const inputsc = (index, row) => {
+    details.query[row.prop] = index;
+    processRowProperty(index, row, details);
+    // getrain();
+  };
+  
+  /** 表格表头时间选择 */
+  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];
+    }
+    // getrain();
+  };
+  
+  /** 表格表头输入框搜索 */
+  const btnsc = val => {
+    console.log(val);
+  };
+  /** 表格表头下拉框选择 */
+  const selectsc = (index, row) => {
+    processRowProperty(index, row, details);
+    // getrain();
+  };
+  /** 表格表头复选框选择 */
+  const selectionChange = list => {
+    console.log(list);
+    details.selectionList = list;
+  };
+  // 清空
+  const searchReset = () => {
+    TopQuery.value = {};
+    TopQuery.value.warehouseNameRange = [];
+    TopQuery.value.time = [];
+  
+    queryCarn.value = {};
+    details.query = {};
+    columnList.forEach(item => {
+      item.values = '';
+    });
+    details.page.total = 0;
+    details.data = [];
+    // getrain();
+  };
+  // 网页顶部搜索按钮
+  const searchChange = () => {
+    // 日期处理
+    if (TopQuery.value.time?.length) {
+      queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+      queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    } else {
+      delete queryCarn.value.startTaskTime;
+      delete queryCarn.value.endTaskTime;
+    }
+  
+    // 签收扫描时间
+    if (TopQuery.value.Signfor?.length) {
+      queryCarn.value.startSjsigningTime = dayjs(TopQuery.value.Signfor[0]).format(
+        'YYYY-MM-DD HH:mm:ss'
+      ); //开始日期
+      queryCarn.value.endSjsigningTime = dayjs(TopQuery.value.Signfor[1]).format(
+        'YYYY-MM-DD HH:mm:ss'
+      ); //结束日期
+    } else {
+      delete queryCarn.value.startSjsigningTime;
+      delete queryCarn.value.endSjsigningTime;
+    }
+    // 仓库处理
+    if (TopQuery.value.warehouseNameRange?.length) {
+      queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
+    } else {
+      delete queryCarn.value.warehouseNameRange;
+    }
+  
+    const propertiesToCheck = [
+      'vehicleNameRange',
+      'driverNameRange',
+      'consigneeRange',
+      'consigneeNameRange',
+    ];
+    const updateQueryProperty = property => {
+      if (TopQuery.value[property]) {
+        queryCarn.value[property] = TopQuery.value[property];
+      } else {
+        delete queryCarn.value[property];
+      }
+    };
+    propertiesToCheck.forEach(updateQueryProperty);
+    console.log(queryCarn.value, '顶部搜索触发');
+    getrain(queryCarn.value);
+    // details.search = false; //关闭搜索
+  };
+  // 每页多少条
+  const sizeChange = val => {
+    details.page.pageSize = val;
+    getrain(queryCarn.value);
+  };
+  /** 页码改变执行的回调 */
+  const currentChange = val => {
+    details.page.currentPage = val;
+    getrain(queryCarn.value);
+  };
+  // 刷新按钮
+  const searchChangeS = () => {
+    // details.columnList.forEach(item => {
+    //   item.values = '';
+    // });
+    details.search = false; //关闭搜索
+    getrain();
+  };
+  // 顶部搜索
+  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 = () => {
+    warehouseList.value = [];
+  
+    columnList.find(res => res.label == '配送类型').checkarr = [];
+    columnList.find(res => res.label == '配送类型').checkarr = DeliveryTypeList.value;
+    columnList.find(res => res.label == '配送种类').checkarr = [];
+    columnList.find(res => res.label == '配送种类').checkarr = DeliverygenericList.value;
+    columnList.find(res => res.label == '仓库').checkarr = [];
+    columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
+    columnList.find(res => res.label == '司机签收状态').checkarr = [];
+    columnList.find(res => res.label == '司机签收状态').checkarr = Signingstatus.value;
+  
+    console.log(columnList, 'columnList');
+    // 获取仓库
+  
+    $_getMyWarehouseList().then(res => {
+      console.log(res, '仓库列表');
+      if (res.data.data.length)
+        res.data.data.forEach(item => {
+          warehouseList.value.push({
+            value: item.name,
+            label: item.name,
+          });
+        });
+    });
+  };
+  onLoad();
+  // 获取数据
+  const getrain = val => {
+    let data = {
+      current: details.page.currentPage,
+      size: details.page.pageSize,
+      ...details.query,
+      ...val,
+    };
+    details.loadingObj.list = true;
+    $_getdetailsv2(data)
+      .then(res => {
+        console.log(res, '当前参数');
+        details.page.total = res.data.data.total;
+        details.data = res.data.data.records;
+      })
+      .catch(() => {})
+      .finally(() => {
+        details.loadingObj.list = false;
+      });
+  };
+  // getrain();
+  // 导出
+  const exportReport = () => {
+    ElMessageBox.confirm('是否导出报表?', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+      .then(() => {
+        let data = {
+          ...details.query,
+          ...queryCarn.value,
+        };
+        $_exportDetailsv2(data)
+          .then(res => {
+            downloadXls(res.data, `配送明细报表数据.xlsx`);
+          })
+          .catch(() => {})
+          .finally(() => {
+            details.loadingObj.list = false;
+          });
+      })
+      .catch(() => {});
+  };
+  const handleCheckAll = val => {
+    console.log(val, 'val');
+    indeterminate.value = false;
+    if (val) {
+      TopQuery.value.warehouseNameRange = warehouseList.value.map(_ => _.value);
+    } else {
+      TopQuery.value.warehouseNameRange = [];
+    }
+  };
+  
+  watch(
+    () => TopQuery.value.warehouseNameRange,
+    (newValue, oldValue) => {
+      if (newValue.length === 0) {
+        checkAll.value = false;
+        indeterminate.value = false;
+      } else if (newValue.length === warehouseList.value.length) {
+        checkAll.value = true;
+        indeterminate.value = false;
+      } else {
+        indeterminate.value = true;
+      }
+    },
+    { deep: true }
+  );
+  </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;
+  }
+  :deep(.el-fr-d) {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    .el_top_left {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      .el-form-item {
+        align-items: flex-start;
+      }
+      .el-form-item__content {
+        align-items: flex-start;
+        height: 100%;
+        .el-date-editor {
+          height: 29px !important;
+        }
+      }
+    }
+  }
+  :deep(.el-btn) {
+    margin-right: 0;
+    display: flex;
+    width: 100%;
+    justify-content: flex-end;
+    .el-form-item__content {
+      justify-content: flex-end;
+    }
+  }
+  </style>
+  
\ No newline at end of file