diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 02cebe8d..3c49a662 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -360,4 +360,13 @@ export const $_deliveryZeroPackage = data => {
     method: 'post',
     data: data,
   });
+};
+
+// 查看二维码
+export const $_showInventoryPackgeCode = params => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/showInventoryPackgeCode',
+    method: 'get',
+    params,
+  });
 };
\ No newline at end of file
diff --git a/src/api/reportforms/index.js b/src/api/reportforms/index.js
index 6ed5b3ad..a9922d4f 100644
--- a/src/api/reportforms/index.js
+++ b/src/api/reportforms/index.js
@@ -132,10 +132,49 @@ export const $_exportInventory  = (params) => {
   })
 }
 // 获取仓库
-export const $_getMyWarehouseList = data => {
+export const $_getMyWarehouseList = (data) => {
   return request({
     url: '/api/logpm-basicdata/warehouse/getMyWarehouseList',
     method: 'get',
     data,
   });
-};
\ No newline at end of file
+};
+
+// 自提任务维度
+export const $_getasks= (params) => {
+  return request({
+    url: '/api/logpm-report/reportBillLoading/tasks',
+    method: 'get',
+    params,
+  });
+};
+// 导出自提任务
+export const $_exportTasks  = (params) => {
+  return request({
+    url: '/api/logpm-report/reportBillLoading/exportTasks',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
+
+
+// 在库订单
+export const $_getstockOrder= (params) => {
+  return request({
+    url: '/api/logpm-report/reportDelivery/stockOrder',
+    method: 'get',
+    params,
+  });
+};
+
+
+// 导出在库订单
+export const $_exportStockOrder  = (params) => {
+  return request({
+    url: '/api/logpm-report/reportDelivery/exportStockOrder',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
\ No newline at end of file
diff --git a/src/option/reportforms/Inventory.js b/src/option/reportforms/Inventory.js
index ee2b40cb..35468c7a 100644
--- a/src/option/reportforms/Inventory.js
+++ b/src/option/reportforms/Inventory.js
@@ -39,7 +39,7 @@ export const columnList = [
     {
       prop: 'serviceType',
       label: '类型',
-      type: 2,
+      type: 3,
       values: '',
       width: '150',
       checkarr: [],
diff --git a/src/option/reportforms/InventoryOutbound.js b/src/option/reportforms/InventoryOutbound.js
index 05f0e8eb..2db86d52 100644
--- a/src/option/reportforms/InventoryOutbound.js
+++ b/src/option/reportforms/InventoryOutbound.js
@@ -259,7 +259,7 @@ export const columnList = [
    {
       prop: 'outType',
       label: '出库类型',
-      type: 2,
+      type: 3,
       values: '',
       width: '150',
       checkarr: [],
diff --git a/src/option/reportforms/Selfpickupreport.js b/src/option/reportforms/Selfpickupreport.js
index fcb3ed25..84762884 100644
--- a/src/option/reportforms/Selfpickupreport.js
+++ b/src/option/reportforms/Selfpickupreport.js
@@ -28,7 +28,7 @@ export const columnList = [
     {
       prop: 'warehouse',
       label: '仓库',
-      type: 3,
+      type: 2,
       values: '',
       width: '150',
       checkarr: [],
diff --git a/src/option/reportforms/Selfpickuptask.js b/src/option/reportforms/Selfpickuptask.js
new file mode 100644
index 00000000..0cf22844
--- /dev/null
+++ b/src/option/reportforms/Selfpickuptask.js
@@ -0,0 +1,277 @@
+export const columnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'pickupBatch',
+      label: '自提批次号',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'warehouse',
+      label: '仓库',
+      type: 3,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'waybillNumber',
+      label: '运单号',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'orderCode',
+      label: '订单自编号',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'consigneeUnit',
+      label: '收货单位',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'consigneeUser',
+      label: '收货人',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    }, 
+    {
+      prop: 'consigneePhone',
+      label: '联系电话',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'billUser',
+        label: '提货人',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'billUserPhone', 
+        label: '提货人手机号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'billRegistrationNumber',
+        label: '提货车牌',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'idType',
+        label: '证件类型',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'billPaper',
+        label: '提货证件',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'billStatus',
+        label: '提货状态',
+        type:2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'planBillNumber',
+        label: '计划提货件数',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+         isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'goodsInfo',
+        label: '货物信息',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'billLoadingNum',
+        label: '实际提货件数',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'collectPaymentFee',
+        label: '到付运费',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'transportFee',
+        label: '搬运费',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'storageFee',
+        label: '仓储费',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'forkliftFee',
+        label: '叉车费',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'addValueFee',
+        label: '增值费',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'amountToFee',
+        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,
+    // },
+  ]
\ No newline at end of file
diff --git a/src/option/reportforms/Stockordertable.js b/src/option/reportforms/Stockordertable.js
new file mode 100644
index 00000000..6b549ffd
--- /dev/null
+++ b/src/option/reportforms/Stockordertable.js
@@ -0,0 +1,407 @@
+export const columnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'waybillNumber',
+      label: '运单号',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'serviceNumber',
+      label: '服务号',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'orderCode',
+        label: '订单自编号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'mallName',
+        label: '商场名称',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'descriptionGoods',
+        label: '货物名称',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'warehouse',
+        label: '仓库',
+        type: 3,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+    {
+      prop: 'warehouseEntryTime',
+      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: 'storeTime',
+      label: '在库时间',
+      type: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'consigneeUnit',
+      label: '收货单位',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    }, 
+    {
+      prop: 'consigneePerson',
+      label: '收货人',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'totalNumber',
+        label: '订单总件数',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'handQuantity', 
+        label: '在库件数',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'notReceived',
+        label: '未入库数量',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'sortingQuantity',
+        label: '分拣件数',
+        type:1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'deliveryQuantity',
+        label: '配送件数',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'transferQuantity',
+        label: '中转件数',
+        type:1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'signinQuantity',
+        label: '签收件数',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+        isshowSummary: true,//开启统计
+      },
+      {
+        prop: 'groundingStatus',
+        label: '上架状态',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'brand',
+        label: '品牌',
+        type: 1,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'trays',
+        label: '所在托盘',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'allocation',
+        label: '所在货位',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'freezeStatus',
+        label: '冻结状态',
+        type: 3,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'orderStatus',
+        label: '订单状态',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'reservationStatus',
+        label: '预约状态',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'stockupStatus',
+        label: '备货状态',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'completeSet',
+        label: '是否齐套',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'typeService',
+        label: '服务类型',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'customerName',
+        label: '顾客名字',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'customerTelephone',
+        label: '顾客电话',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'customerAddress',
+        label: '顾客地址',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'fee',
+        label: '增值服务',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'createUser',
+        label: '创建人',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'createTime',
+        label: '创建时间',
+        type: 1,
+        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/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index a35c46e3..e23adcfc 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -576,6 +576,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'typeServiceNameFy',
+          label: '服务类型',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         // {
         //   prop: 'typeServiceName',
         //   label: '服务类型',
@@ -1473,7 +1484,7 @@ export default {
                 // console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue);
               }
             });
-            i.typeServiceName = typeServiceName.join(',');
+            i.typeServiceNameFy = typeServiceName.join(',');
           }
         });
         let dz = '';
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index dd516910..3bcd549c 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -903,6 +903,7 @@ import {
   deliveryInventorySign,
   printBatch,
   $_deliveryZeroPackage,
+  $_showInventoryPackgeCode,
 } from '@/api/distribution/distributionDeliveryList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
@@ -4273,7 +4274,7 @@ export default {
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
-        this.loadingObj.pageLoading = true;
+        this.loadingObj.pageLoading = false;
       }
     },
     /**
@@ -4290,10 +4291,10 @@ export default {
         this.materialQRCode = row;
 
         let qr = {
-          ids: row.id,
+          id: row.id,
         };
         this.html = '';
-        const res = await showOrderPackgeCode(qr);
+        const res = await $_showInventoryPackgeCode(qr);
 
         const { code, data } = res.data;
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 4f534b4f..86b0c8d5 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -697,6 +697,12 @@ export default {
       }
     },
     async handleStockList() {
+
+      if(this.selectionList.length >1){
+        this.$message.warning('只能选择一个数据');
+        return;
+      }
+
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
         return;
@@ -749,10 +755,10 @@ export default {
       }
 
       //查询库存数据
-      const res = await getListOwn(this.page.currentPage, this.page.pageSize, {
+      const res = await getListOwn( {
         stockArticleIds: ids.join(','),
         parcelType: '2',
-      });
+      },this.page.currentPage, this.page.pageSize);
       // console.log("包件物料不存在！！",res.data.data.records);
       lost = res.data.data.records.every(val => {
         console.log('val.materialId :>> ', val.materialId);
diff --git a/src/views/distribution/inventory/distributionStockArticleFrom.vue b/src/views/distribution/inventory/distributionStockArticleFrom.vue
index 9fd57a4a..4b47c388 100644
--- a/src/views/distribution/inventory/distributionStockArticleFrom.vue
+++ b/src/views/distribution/inventory/distributionStockArticleFrom.vue
@@ -127,6 +127,8 @@ export default {
         this.loading = true;
         this.query.stockArticleId = this.$route.query.id;
         this.query.conditions = '1';
+        this.query.isLoading=0;
+        this.query.isSigning=0;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/reportforms/Inventory.vue b/src/views/reportforms/Inventory.vue
index bed2f8d6..eefc6eef 100644
--- a/src/views/reportforms/Inventory.vue
+++ b/src/views/reportforms/Inventory.vue
@@ -4,15 +4,83 @@
       <div class="avue-crud">
         <!-- 搜索模块 -->
         <el-row v-if="search">
-          <!-- 查询模块 -->
-          <el-form :inline="true" :model="query" 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 :inline="true" :model="TopQuery" class="el-fr-d">
+          <!-- 查询按钮 -->
+
+          <div class="el_top_left">
+            <el-form-item label="仓库">
+              <el-select
+                multiple
+                v-model="TopQuery.warehouseNameRange"
+                filterable
+                placeholder="多选仓库搜索"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="item in warehouseList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
-          </el-form>
-        </el-row>
+
+            <el-form-item label="商场名称">
+              <el-input
+                v-model="TopQuery.marketNameRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个商场名称请用逗号隔开"
+              />
+            </el-form-item>
+            <el-form-item label="物料编码">
+              <el-input
+                v-model="TopQuery.cargoNumberRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个物料编码请用逗号隔开"
+              />
+            </el-form-item>
+
+            <el-form-item label="物料名称">
+              <el-input
+                v-model="TopQuery.descriptionGoodsRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个物料名称请用逗号隔开"
+              />
+            </el-form-item>
+
+            <el-form-item label="订单自编码">
+              <el-input
+                v-model="TopQuery.orderCodeRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个订单自编码请用逗号隔开"
+              />
+            </el-form-item>
+
+            <el-form-item label="包条码">
+              <el-input
+                v-model="TopQuery.packageCodeRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个包条码请用逗号隔开"
+              />
+            </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>
@@ -90,11 +158,31 @@
   import { columnList } from '@/option/reportforms/Inventory.js';
   import { getDictionaryBiz } from '@/api/system/dict'; //字典
   import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_exportInventory ,$_getInventory} from '@/api/reportforms/index.js';
+  import { $_exportInventory ,$_getInventory,$_getMyWarehouseList} from '@/api/reportforms/index.js';
   import { ElMessageBox } from 'element-plus';
   import { downloadXls } from '@/utils/util';
   import functions from '@/utils/functions.js';
   import dayjs from 'dayjs';
+  const queryCarn=ref({});//查询顶部
+  const TopQuery=ref({})
+  const warehouseList = ref([]); //仓库列表
+  const DeliveryType=ref([{
+  label:'商配',
+  value:'商配'
+},
+{
+  label:'市配',
+  value:'市配'
+},
+{
+  label:'自提',
+  value:'自提'
+},
+{
+  label:'三方中专',
+  value:'三方中专'
+},
+]);//配送类型
   const details = reactive({
     /** 是否开启搜索 */
     search: false,
@@ -243,9 +331,58 @@
     details.selectionList = list;
   };
   // 网页顶部搜索按钮
-  const searchChange = () => {
-    details.search = false; //关闭搜索
-  };
+// 网页顶部搜索按钮
+const searchChange = () => {
+  console.log(TopQuery.value,'TopQuery.value');
+  // 仓库处理
+  if (TopQuery.value.warehouseNameRange.length) {
+    queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
+  }else{
+    delete queryCarn.value.warehouseNameRange;                                          
+  }
+  // 商场名称
+  if(TopQuery.value.marketNameRange){
+    queryCarn.value.marketNameRange = TopQuery.value.marketNameRange
+  }else{
+    delete queryCarn.value.marketNameRange;
+  }
+  // 物料编码
+  if(TopQuery.value.cargoNumberRange){
+    queryCarn.value.cargoNumberRange = TopQuery.value.cargoNumberRange
+  }else{
+    delete queryCarn.value.cargoNumberRange;
+  }
+  // 物料名称
+  if(TopQuery.value.descriptionGoodsRange){
+    queryCarn.value.descriptionGoodsRange = TopQuery.value.descriptionGoodsRange
+  }else{
+    delete queryCarn.value.descriptionGoodsRange;
+  }
+  
+  // 收货单位
+  if(TopQuery.value.consigneeUnitRange){
+    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
+  }else{
+    delete queryCarn.value.consigneeUnitRange;
+  }
+  // 订单自编号
+  if(TopQuery.value.orderCodeRange){
+    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange
+  }else{
+    delete queryCarn.value.orderCodeRange;
+  }
+
+  // 客户处理
+  if(TopQuery.value.examineUserRange){
+    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange
+  }else{
+    delete queryCarn.value.examineUserRange;
+  }
+
+  console.log(queryCarn.value, '顶部搜索触发');
+  getrain(queryCarn.value)
+  // details.search = false; //关闭搜索
+};
   // 每页多少条
   const sizeChange = val => {
     details.page.pageSize = val;
@@ -286,15 +423,33 @@
   }
   // 页面初始化方法
   const onLoad = () => {
-    // updateDictionary(columnList[3].checkarr, 'pc_work_order'); //异常类型
-  };
+  warehouseList.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 = DeliveryType.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 = () => {
+  const getrain = (val) => {
     let data = {
       current: details.page.currentPage,
       size: details.page.pageSize,
       ...details.query,
+      ...val,
     };
     details.loadingObj.list = true;
     $_getInventory(data)
diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue
index 01a1f1dd..0d61f463 100644
--- a/src/views/reportforms/InventoryOutbound.vue
+++ b/src/views/reportforms/InventoryOutbound.vue
@@ -4,15 +4,95 @@
       <div class="avue-crud">
         <!-- 搜索模块 -->
         <el-row v-if="search">
-          <!-- 查询模块 -->
-          <el-form :inline="true" :model="query" 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 :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"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                format="YYYY-MM-DD"
+                date-format="YYYY/MM/DD"
+                time-format="A"
+                @change="Toptiem"
+              />
             </el-form-item>
-          </el-form>
-        </el-row>
+            <el-form-item label="仓库">
+              <el-select
+                multiple
+                v-model="TopQuery.warehouseNameRange"
+                filterable
+                placeholder="多选仓库搜索"
+                style="width: 240px"
+              >
+                <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.marketNameRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个商场名称请用逗号隔开"
+              />
+            </el-form-item>
+            <el-form-item label="物料编码">
+              <el-input
+                v-model="TopQuery.cargoNumberRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个物料编码请用逗号隔开"
+              />
+            </el-form-item>
+
+            <el-form-item label="物料名称">
+              <el-input
+                v-model="TopQuery.materialNameRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个物料名称请用逗号隔开"
+              />
+            </el-form-item>
+
+            <el-form-item label="订单自编码">
+              <el-input
+                v-model="TopQuery.orderCodeRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个订单自编码请用逗号隔开"
+              />
+            </el-form-item>
+
+            <el-form-item label="包条码">
+              <el-input
+                v-model="TopQuery.packageCodeRange"
+                style="width: 240px"
+                :rows="1"
+                type="textarea"
+                placeholder="多个包条码请用逗号隔开"
+              />
+            </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>
@@ -90,11 +170,31 @@
   import { columnList } from '@/option/reportforms/InventoryOutbound.js';
   import { getDictionaryBiz } from '@/api/system/dict'; //字典
   import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import { $_getreport ,$_exportOutStocks} from '@/api/reportforms/index.js';
+  import { $_getreport ,$_exportOutStocks,$_getMyWarehouseList} from '@/api/reportforms/index.js';
   import { ElMessageBox } from 'element-plus';
   import { downloadXls } from '@/utils/util';
   import functions from '@/utils/functions.js';
   import dayjs from 'dayjs';
+  const queryCarn=ref({});//查询顶部
+  const TopQuery=ref({})
+  const warehouseList = ref([]); //仓库列表
+  const DeliveryType=ref([{
+  label:'商配',
+  value:'商配'
+},
+{
+  label:'市配',
+  value:'市配'
+},
+{
+  label:'自提',
+  value:'自提'
+},
+{
+  label:'三方中专',
+  value:'三方中专'
+},
+]);//配送类型
   const details = reactive({
     /** 是否开启搜索 */
     search: false,
@@ -236,16 +336,80 @@
   /** 表格表头下拉框选择 */
   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=[]
+  queryCarn.value={}
+  getrain(queryCarn.value)
+  }
   // 网页顶部搜索按钮
   const searchChange = () => {
-    details.search = false; //关闭搜索
-  };
+  console.log(TopQuery.value,'TopQuery.value');
+    // 日期处理
+    if (TopQuery.value.time) {
+    queryCarn.value.startCreateTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.endCreateTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+  }else{
+    delete  queryCarn.value.startTaskTime
+    delete  queryCarn.value.endTaskTime
+  }
+  // 仓库处理
+  if (TopQuery.value.warehouseNameRange.length) {
+    queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
+  }else{
+    delete queryCarn.value.warehouseNameRange;                                          
+  }
+  // 商场名称
+  if(TopQuery.value.marketNameRange){
+    queryCarn.value.marketNameRange = TopQuery.value.marketNameRange
+  }else{
+    delete queryCarn.value.marketNameRange;
+  }
+  // 物料编码
+  if(TopQuery.value.cargoNumberRange){
+    queryCarn.value.cargoNumberRange = TopQuery.value.cargoNumberRange
+  }else{
+    delete queryCarn.value.cargoNumberRange;
+  }
+  // 物料名称
+  if(TopQuery.value.materialNameRange){
+    queryCarn.value.materialNameRange = TopQuery.value.materialNameRange
+  }else{
+    delete queryCarn.value.materialNameRange;
+  }
+  
+  // 收货单位
+  if(TopQuery.value.consigneeUnitRange){
+    queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
+  }else{
+    delete queryCarn.value.consigneeUnitRange;
+  }
+  // 订单自编号
+  if(TopQuery.value.orderCodeRange){
+    queryCarn.value.orderCodeRange = TopQuery.value.orderCodeRange
+  }else{
+    delete queryCarn.value.orderCodeRange;
+  }
+
+  // 客户处理
+  if(TopQuery.value.examineUserRange){
+    queryCarn.value.examineUserRange = TopQuery.value.examineUserRange
+  }else{
+    delete queryCarn.value.examineUserRange;
+  }
+
+  console.log(queryCarn.value, '顶部搜索触发');
+  getrain(queryCarn.value)
+  // details.search = false; //关闭搜索
+};
   // 每页多少条
   const sizeChange = val => {
     details.page.pageSize = val;
@@ -286,15 +450,33 @@
   }
   // 页面初始化方法
   const onLoad = () => {
-    // updateDictionary(columnList[3].checkarr, 'pc_work_order'); //异常类型
-  };
+  warehouseList.value = [];
+  columnList.find(res => res.label == '仓库').checkarr = [];
+  columnList.find(res => res.label == '出库类型').checkarr = [];
+  columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
+  columnList.find(res => res.label == '出库类型').checkarr = DeliveryType.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 = () => {
+  const getrain = (val) => {
     let data = {
       current: details.page.currentPage,
       size: details.page.pageSize,
       ...details.query,
+      ...val,
     };
     details.loadingObj.list = true;
     $_getreport(data)
diff --git a/src/views/reportforms/Selfpickuptask.vue b/src/views/reportforms/Selfpickuptask.vue
new file mode 100644
index 00000000..5b540575
--- /dev/null
+++ b/src/views/reportforms/Selfpickuptask.vue
@@ -0,0 +1,560 @@
+<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"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  format="YYYY-MM-DD"
+                  date-format="YYYY/MM/DD"
+                  time-format="A"
+                  @change="Toptiem"
+                />  
+              </el-form-item>
+  
+              <el-form-item label="仓库">
+                <el-select
+                  multiple
+                  v-model="TopQuery.warehouseRange"
+                  filterable
+                  placeholder="多选仓库搜索"
+                  style="width: 240px"
+                >
+                  <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.consigneeUnitRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个收货单位请用逗号隔开"
+                />
+              </el-form-item>
+              <el-form-item label="收货人">
+                <el-input
+                  v-model="TopQuery.consigneeUserRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个收货人请用逗号隔开"
+                />
+              </el-form-item>
+              <el-form-item label="提货人">
+                <el-input
+                  v-model="TopQuery.billUserRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个提货人请用逗号隔开"
+                />
+              </el-form-item>
+  
+              <el-form-item label="运单收货人">
+                <el-input
+                  v-model="TopQuery.consigneeNameRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个运单收货人请用逗号隔开"
+                />
+              </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="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="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
+      @setcolum="setnewcolum"
+      @closce="showdrawer"
+      :drawerShow="drawerShow"
+      :columnList="details.columnList"
+    ></edittablehead>
+  </template>
+  
+  <script setup>
+  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+  import { columnList } from '@/option/reportforms/Selfpickuptask.js';
+  import { getDictionaryBiz } from '@/api/system/dict'; //字典
+  import { processRowProperty, setNodeHeight } from '@/utils/util';
+  import { $_getMyWarehouseList,$_exportStockOrder, $_getstockOrder  } from '@/api/reportforms/index.js';
+  import { ElMessageBox } from 'element-plus';
+  import { downloadXls } from '@/utils/util';
+  import functions from '@/utils/functions.js';
+  import dayjs from 'dayjs';
+  const queryCarn=ref({});//查询顶部
+  const TopQuery=ref({});//查询顶部
+  const warehouseList = ref([]); //仓库列表
+  const DeliveryTypeList = ref([
+    {
+      label: '商配',
+      value: '商配',
+    },
+  
+    {
+      label: '市配',
+      value: '市配',
+    },
+  ]); //配送类型
+  // 配送种类
+  const DeliverygenericList = ref([
+    {
+      label: '自主配送',
+      value: '自主配送',
+    },
+  
+    {
+      label: '三方配送',
+      value: '三方配送',
+    },
+  ]); //配送类型
+  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];
+        },
+      },
+    ],
+    /** 时间选择器数据 */
+    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,
+  } = toRefs(details);
+  /**
+   * 设置列表 -- 固定函数
+   * 弹窗的勾选回调，用于更改头部数组
+   * 固定搭配，只需要更换   columnList
+   *  */
+  const setnewcolum = (newarr, headarr, type) => {
+    if (type == 1) {
+      details.columnList = newarr;
+      functions.setStorage(window.location.pathname + 'checkList', headarr);
+    } else if (type == 2) {
+      details.columnList = newarr;
+      functions.setStorage(window.location.pathname + 'flexList', headarr);
+    } else if (type == 3) {
+      details.columnList = newarr;
+      functions.setStorage(window.location.pathname + 'sortlist', headarr);
+    }
+  };
+  /** 展开列表控件 */
+  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.warehouseRange=[]
+    queryCarn.value = {};
+    getrain();
+  }
+  // 网页顶部搜索按钮
+  const searchChange = () => {
+    // 日期处理
+    if (TopQuery.value.time) {
+      queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+      queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    }else{
+      delete  queryCarn.value.startCreatedTime
+      delete  queryCarn.value.endCreatedTime
+    }
+    // 仓库处理
+    if (TopQuery.value.warehouseRange.length) {
+      queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(',');
+    }else{
+      delete queryCarn.value.warehouseRange;                                          
+    }
+    // 收货单位
+    if(TopQuery.value.consigneeUnitRange){
+      queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
+    }else{
+      delete queryCarn.value.consigneeUnitRange;
+    }
+    // 收货人
+    if(TopQuery.value.consigneeUserRange){
+      queryCarn.value.consigneeUserRange = TopQuery.value.consigneeUserRange
+    }else{
+      delete queryCarn.value.consigneeUserRange;
+    }
+  
+    // 提货人
+    if(TopQuery.value.billUserRange){
+      queryCarn.value.billUserRange = TopQuery.value.billUserRange
+    }else{
+      delete queryCarn.value.billUserRange;
+    }
+    // 运单收货人
+    if(TopQuery.value.consigneeNameRange){
+      queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
+    }else{
+      delete queryCarn.value.consigneeNameRange;
+    }
+    // 运单收货人
+    if(TopQuery.value.consigneeNameRange){
+      queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
+    }
+    console.log(queryCarn.value, '顶部搜索触发');
+    getrain(queryCarn.value)
+    // details.search = false; //关闭搜索
+  };
+  // 每页多少条
+  const sizeChange = val => {
+    details.page.pageSize = val;
+    getrain();
+  };
+  /** 页码改变执行的回调 */
+  const currentChange = val => {
+    details.page.currentPage = val;
+    getrain();
+  };
+  // 刷新按钮
+  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 = warehouseList.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;
+    
+    $_getstockOrder(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,
+        };
+        $_exportStockOrder(data)
+          .then(res => {
+            downloadXls(res.data, `在库订单报表数据.xlsx`);
+          })
+          .catch(() => {})
+          .finally(() => {
+            details.loadingObj.list = 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;
+    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
diff --git a/src/views/reportforms/Stockordertable.vue b/src/views/reportforms/Stockordertable.vue
new file mode 100644
index 00000000..6abd2453
--- /dev/null
+++ b/src/views/reportforms/Stockordertable.vue
@@ -0,0 +1,560 @@
+<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"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  format="YYYY-MM-DD"
+                  date-format="YYYY/MM/DD"
+                  time-format="A"
+                  @change="Toptiem"
+                />  
+              </el-form-item>
+  
+              <el-form-item label="仓库">
+                <el-select
+                  multiple
+                  v-model="TopQuery.warehouseRange"
+                  filterable
+                  placeholder="多选仓库搜索"
+                  style="width: 240px"
+                >
+                  <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.consigneeUnitRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个收货单位请用逗号隔开"
+                />
+              </el-form-item>
+              <el-form-item label="收货人">
+                <el-input
+                  v-model="TopQuery.consigneeUserRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个收货人请用逗号隔开"
+                />
+              </el-form-item>
+              <el-form-item label="提货人">
+                <el-input
+                  v-model="TopQuery.billUserRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个提货人请用逗号隔开"
+                />
+              </el-form-item>
+  
+              <el-form-item label="运单收货人">
+                <el-input
+                  v-model="TopQuery.consigneeNameRange"
+                  style="width: 240px"
+                  :rows="1"
+                  type="textarea"
+                  placeholder="多个运单收货人请用逗号隔开"
+                />
+              </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="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="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
+      @setcolum="setnewcolum"
+      @closce="showdrawer"
+      :drawerShow="drawerShow"
+      :columnList="details.columnList"
+    ></edittablehead>
+  </template>
+  
+  <script setup>
+  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+  import { columnList } from '@/option/reportforms/Stockordertable.js';
+  import { getDictionaryBiz } from '@/api/system/dict'; //字典
+  import { processRowProperty, setNodeHeight } from '@/utils/util';
+  import { $_getMyWarehouseList,$_getasks,$_exportTasks  } from '@/api/reportforms/index.js';
+  import { ElMessageBox } from 'element-plus';
+  import { downloadXls } from '@/utils/util';
+  import functions from '@/utils/functions.js';
+  import dayjs from 'dayjs';
+  const queryCarn=ref({});//查询顶部
+  const TopQuery=ref({});//查询顶部
+  const warehouseList = ref([]); //仓库列表
+  const DeliveryTypeList = ref([
+    {
+      label: '商配',
+      value: '商配',
+    },
+  
+    {
+      label: '市配',
+      value: '市配',
+    },
+  ]); //配送类型
+  // 配送种类
+  const DeliverygenericList = ref([
+    {
+      label: '自主配送',
+      value: '自主配送',
+    },
+  
+    {
+      label: '三方配送',
+      value: '三方配送',
+    },
+  ]); //配送类型
+  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];
+        },
+      },
+    ],
+    /** 时间选择器数据 */
+    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,
+  } = toRefs(details);
+  /**
+   * 设置列表 -- 固定函数
+   * 弹窗的勾选回调，用于更改头部数组
+   * 固定搭配，只需要更换   columnList
+   *  */
+  const setnewcolum = (newarr, headarr, type) => {
+    if (type == 1) {
+      details.columnList = newarr;
+      functions.setStorage(window.location.pathname + 'checkList', headarr);
+    } else if (type == 2) {
+      details.columnList = newarr;
+      functions.setStorage(window.location.pathname + 'flexList', headarr);
+    } else if (type == 3) {
+      details.columnList = newarr;
+      functions.setStorage(window.location.pathname + 'sortlist', headarr);
+    }
+  };
+  /** 展开列表控件 */
+  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.warehouseRange=[]
+    queryCarn.value = {};
+    getrain();
+  }
+  // 网页顶部搜索按钮
+  const searchChange = () => {
+    // 日期处理
+    if (TopQuery.value.time) {
+      queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+      queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    }else{
+      delete  queryCarn.value.startCreatedTime
+      delete  queryCarn.value.endCreatedTime
+    }
+    // 仓库处理
+    if (TopQuery.value.warehouseRange.length) {
+      queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(',');
+    }else{
+      delete queryCarn.value.warehouseRange;                                          
+    }
+    // 收货单位
+    if(TopQuery.value.consigneeUnitRange){
+      queryCarn.value.consigneeUnitRange = TopQuery.value.consigneeUnitRange
+    }else{
+      delete queryCarn.value.consigneeUnitRange;
+    }
+    // 收货人
+    if(TopQuery.value.consigneeUserRange){
+      queryCarn.value.consigneeUserRange = TopQuery.value.consigneeUserRange
+    }else{
+      delete queryCarn.value.consigneeUserRange;
+    }
+  
+    // 提货人
+    if(TopQuery.value.billUserRange){
+      queryCarn.value.billUserRange = TopQuery.value.billUserRange
+    }else{
+      delete queryCarn.value.billUserRange;
+    }
+    // 运单收货人
+    if(TopQuery.value.consigneeNameRange){
+      queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
+    }else{
+      delete queryCarn.value.consigneeNameRange;
+    }
+    // 运单收货人
+    if(TopQuery.value.consigneeNameRange){
+      queryCarn.value.consigneeNameRange = TopQuery.value.consigneeNameRange
+    }
+    console.log(queryCarn.value, '顶部搜索触发');
+    getrain(queryCarn.value)
+    // details.search = false; //关闭搜索
+  };
+  // 每页多少条
+  const sizeChange = val => {
+    details.page.pageSize = val;
+    getrain();
+  };
+  /** 页码改变执行的回调 */
+  const currentChange = val => {
+    details.page.currentPage = val;
+    getrain();
+  };
+  // 刷新按钮
+  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 = warehouseList.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;
+    
+    $_getasks(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,
+        };
+        $_exportTasks(data)
+          .then(res => {
+            downloadXls(res.data, `自提任务报表数据.xlsx`);
+          })
+          .catch(() => {})
+          .finally(() => {
+            details.loadingObj.list = 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;
+    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