diff --git a/src/api/waybill/TemporaryStorageList.js b/src/api/waybill/TemporaryStorageList.js
index 26c7c2af..e7022d8c 100644
--- a/src/api/waybill/TemporaryStorageList.js
+++ b/src/api/waybill/TemporaryStorageList.js
@@ -105,3 +105,11 @@ export const postCreateOrderPackage = (data = {}) => {
     data,
   });
 };
+
+export const $_getopenOrderAdvancePageList = (data) => {
+  return request({
+    url: '/api/logpm-trunkline/openOrder/advancePageListByBussiness',
+    method: 'post',
+    data
+  });
+};
\ No newline at end of file
diff --git a/src/option/basicdata/BackStockTask.js b/src/option/basicdata/BackStockTask.js
index edbbc12f..ff2d26d3 100644
--- a/src/option/basicdata/BackStockTask.js
+++ b/src/option/basicdata/BackStockTask.js
@@ -165,7 +165,7 @@ export default [
     sortable: true,
   },
   {
-    label: '任务状态',
+    label: '回库任务状态',
     prop: 'confirmStatusName',
     type: 1,
     values: '',
diff --git a/src/option/basicdata/basicdataWarehouseTemp.js b/src/option/basicdata/basicdataWarehouseTemp.js
index 4b56acea..9c1c0de9 100644
--- a/src/option/basicdata/basicdataWarehouseTemp.js
+++ b/src/option/basicdata/basicdataWarehouseTemp.js
@@ -69,7 +69,39 @@ export const columnList = [
       sortable: true,
       head: false,
     },
-
+    {
+      prop: 'legalPerson',
+      label: '法人',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'legalPersonPhone',
+      label: '法人联系电话',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'deposit',
+      label: '押金',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
     {
       prop: 'functionType',
       label: '职能类型',
diff --git a/src/option/warehouse/PreStoragePackage.js b/src/option/warehouse/PreStoragePackage.js
index da50ce26..39d98367 100644
--- a/src/option/warehouse/PreStoragePackage.js
+++ b/src/option/warehouse/PreStoragePackage.js
@@ -85,27 +85,27 @@ export const columnList = [
   //   sortable: true,
   // },
 
-  {
-    prop: 'sendWarehouseName',
-    label: '发站仓',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'acceptWarehouseName',
-    label: '目的仓',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'sendWarehouseName',
+  //   label: '发站仓',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'acceptWarehouseName',
+  //   label: '目的仓',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     label: '物料名称',
     prop: 'materialName',
diff --git a/src/option/warehouse/Prewarehouseorder.js b/src/option/warehouse/Prewarehouseorder.js
new file mode 100644
index 00000000..3a8d5ad1
--- /dev/null
+++ b/src/option/warehouse/Prewarehouseorder.js
@@ -0,0 +1,681 @@
+export const columnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'orderCode',
+      label: '订单自编号',
+      type: 2,
+      values: '',
+      width: '200',
+      checkarr: [],
+      fixed: true,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'dealerName',
+      label: '商场名称',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'storeName',
+      label: '门店名称',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'warehouseName',
+      label: '导入仓库',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'incomingWarehouseName',
+      label: '入库仓库',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'siteName',
+      label: '基地',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'brand',
+      label: '品牌',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'totalNum',
+      label: '数量',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      isshowSummary: true,
+    },
+    // {
+    //   prop: 'senderFactory',
+    //   label: '发货单位',
+    //   type: 1,
+    //   values: '',
+    //   width: '130',
+    //   checkarr: [],
+    //   fixed: false,
+    //   sortable: true,
+    // },
+    {
+      prop: 'senderName',
+      label: '发货人',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'senderPhone',
+      label: '发货人电话',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'senderAddress',
+      label: '发货地址',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'consigneePerson',
+      label: '商场联系人',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'consigneeMobile',
+      label: '联系电话',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'consigneeAddress',
+      label: '地址',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'lineNameTitle',
+      label: '干仓配',
+      type: 1,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'trainNumber',
+      label: '客户车次',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'legacyStatusName',
+      label: '遗留',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'customerName',
+      label: '顾客姓名',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'customerPhone',
+      label: '顾客电话',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'customerAddress',
+      label: '顾客地址',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'deliveryDate',
+      label: '交期',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'dealerCode',
+      label: '商场编码',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'storeCode',
+      label: '门店编码',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'createUserName',
+      label: '创建人',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'orderType',
+      label: '订单类型',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'systemType',
+      label: '订单来源',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'createTime',
+      label: '创建时间',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'serviceNum',
+      label: '服务号',
+      type: 2,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: '',
+      label: '操作',
+      type: 6,
+      values: '',
+      width: '200',
+      checkarr: [],
+      fixed: 'right',
+      sortable: false,
+    },
+  ];
+  
+  /** 包件明细表头 */
+  export const packageListColumnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'billladingCode',
+      label: '订单自编号',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: true,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'carNumber',
+      label: '汇通商场',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'driverName',
+      label: '商场名称',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'driverPhone',
+      label: '门店名称',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'warehouseName',
+      label: '基地',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'lineNameTitle',
+      label: '干仓配',
+      type: 1,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'nodeNub',
+      label: '数量',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'startTime',
+      label: '客户车次',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'endTime',
+      label: '遗留',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'planVolume',
+      label: '顾客姓名',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'billladingStatus',
+      label: '顾客电话',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'chargeType',
+      label: '顾客地址',
+      type: 1,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'totalFee',
+      label: '交期',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'remark',
+      label: '商场编码',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'carrierName',
+      label: '门店编码',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'waybillCount',
+      label: '创建人',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'totalNum',
+      label: '订单类型',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'totalWeight',
+      label: '订单来源',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'createTime',
+      label: '创建时间',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'createUserName',
+      label: '服务号',
+      type: 1,
+      values: '',
+      width: '130',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'createUserName',
+      label: '操作',
+      type: 6,
+      values: '',
+      width: '350',
+      checkarr: [],
+      fixed: 'right',
+      sortable: false,
+    },
+  ];
+  
+  export const packageColumnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'orderPackageCode',
+      label: '包条码',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: true,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'orderCode',
+      label: '订单自编号',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'firstPackName',
+      label: '一级品类',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'secondPackName',
+      label: '二级品类',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'thirdPackName',
+      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: 'brand',
+      label: '品牌',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'MaintenanceOrNot',
+      label: '是否维护',
+      type: 14,
+      values: '',
+      width: '150',
+      checkarr: [
+        { label: '是', value: '是' },
+        { label: '否', value: '否' },
+      ],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    // {
+    //   prop: 'costCategory',
+    //   label: '成本品类',
+    //   type: 6,
+    //   values: '',
+    //   width: '150',
+    //   checkarr: [],
+    //   fixed: 'right',
+    //   sortable: true,
+    //   head: false,
+    // },
+    {
+      prop: 'incomeCategory',
+      label: '收入品类',
+      type: 6,
+      values: '',
+      width: '200',
+      checkarr: [],
+      fixed: 'right',
+      sortable: true,
+      head: false,
+    },
+  ];
+  
\ No newline at end of file
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 8edecfc3..a75d81a6 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -34,7 +34,9 @@
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
             <div class="ElBtnClass">
-              <el-text v-if=" userInfo == 'admin'" @click="Expandconfiguration(slotProps.scope.row)">扩展配置</el-text>
+              <el-text v-if="userInfo == 'admin'" @click="Expandconfiguration(slotProps.scope.row)"
+                >扩展配置</el-text
+              >
               <el-text @click="view(slotProps.scope)">查看</el-text>
               <el-text @click="edit(slotProps.scope)">编辑</el-text>
               <el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
@@ -307,7 +309,28 @@
             :value-on-clear="0"
           />
         </el-form-item>
-
+        <el-form-item label="法人">
+          <el-input v-model.trim="Addform.legalPerson" placeholder="请输入法人" />
+        </el-form-item>
+        <el-form-item label="法人联系电话">
+          <el-input-number
+            style="width: 100%"
+            v-model="Addform.legalPersonPhone"
+            :min="0"
+            :controls="false"
+            placeholder="法人联系电话"
+          />
+        </el-form-item>
+        <el-form-item label="押金">
+          <el-input-number
+            style="width: 100%"
+            v-model="Addform.deposit"
+            :min="0"
+            :controls="false"
+            :value-on-clear="0"
+            placeholder="请输入押金"
+          />
+        </el-form-item>
         <el-form-item label="日期范围" prop="daterange">
           <el-date-picker
             v-model="Addform.daterange"
@@ -494,8 +517,8 @@ import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
 const dataRwo = ref({}); //当前行数据
 const props = { multiple: true };
 const options = ref([]); //职能类型
-const userInfo=ref({})
-userInfo.value = JSON.parse(localStorage.getItem('TWMS-userInfo')).content.user_name;//扩展配置目前就管理员可以操作
+const userInfo = ref({});
+userInfo.value = JSON.parse(localStorage.getItem('TWMS-userInfo')).content.user_name; //扩展配置目前就管理员可以操作
 const Compulsoryoptions = [
   {
     value: 1,
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index ef04c1d0..7b6dbd16 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -489,14 +489,14 @@ const asurcharge = ref([
     disabled: true,
   },
   {
-    label: '分货费(元/层/件)',
+    label: '分货费(元/件)',
     prop: 'cargoSplittingFee',
     type: 'number',
     width: 'auto',
     disabled: true,
   },
   {
-    label: '平移费(元/件)',
+    label: '平移费(元/米/件)',
     prop: 'translationFee',
     type: 'number',
     width: 'auto',
diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue
index dddafbe0..63492e69 100644
--- a/src/views/cost/storagecost/WarehouseMonthly.vue
+++ b/src/views/cost/storagecost/WarehouseMonthly.vue
@@ -23,8 +23,19 @@
                 />
               </el-select>
             </el-form-item>
-
-            <el-form-item label="结算年份">
+            <el-form-item label="结算日期">
+              <el-date-picker
+                v-model="queryTop.Settlementdate"
+                type="monthrange"
+                unlink-panels
+                range-separator="到"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="YYYY-MM"
+                :shortcuts="shortcuts"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="结算年份">
               <el-date-picker
                 v-model="queryTop.costSettlementYear"
                 type="year"
@@ -34,7 +45,8 @@
             </el-form-item>
 
             <el-form-item label="结算月">
-              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
+              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份" 
+              style="width: 240px;">
                 <el-option
                   v-for="item in monthList"
                   :key="item.value"
@@ -42,7 +54,7 @@
                   :value="item.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -274,23 +286,20 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  if (queryTop.value.warehouse?.length) {
-    queryTop.value.warehouseName = queryTop.value.warehouse.join(',');
+  console.log(queryTop.value.Settlementdate);
+  if (queryTop.value.Settlementdate) {
+    const [startDateQuery, endDateQuery] = queryTop.value.Settlementdate;
+    details.query.startDateQuery = startDateQuery;
+    details.query.endDateQuery = endDateQuery;
   } else {
-    delete queryTop.value.warehouseName;
-    delete details.query.warehouseName;
+    delete details.query.startDateQuery;
+    delete details.query.endDateQuery;
   }
-  if (queryTop.value.costSettlementMonth) {
-    if (!queryTop.value.costSettlementYear) {
-      ElMessage({
-        message: '请选择年份',
-        type: 'warning',
-      });
-      return;
-    }
+  if (queryTop.value.warehouse?.length) {
+    details.query.warehouseNameQuery = queryTop.value.warehouse.join(',');
+  } else {
+    delete details.query.warehouseNameQuery;
   }
-  details.query = { ...details.query, ...queryTop.value };
-  delete details.query.warehouse; //删除多余字段
   onLoad();
 };
 // 清空
diff --git a/src/views/cost/storagecost/Warehousedaily.vue b/src/views/cost/storagecost/Warehousedaily.vue
index 35856a17..48c88122 100644
--- a/src/views/cost/storagecost/Warehousedaily.vue
+++ b/src/views/cost/storagecost/Warehousedaily.vue
@@ -1,30 +1,30 @@
 <template>
-    <basic-container>
-      <!-- 首页表格 -->
-      <div class="avue-crud">
-        <!-- 搜索模块 -->
-        <el-row v-if="search">
-          <!-- 查询模块 -->
-          <el-form :inline="true" :model="queryTop" class="el-fr-d">
-            <!-- 查询按钮 -->
-            <div>
-              <el-form-item label="目的仓">
-                <el-select
-                  v-model="queryTop.warehouse"
-                  multiple
-                  placeholder="请选择仓库"
-                  style="min-width: 340px"
-                >
-                  <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="结算年份">
+  <basic-container>
+    <!-- 首页表格 -->
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <el-row v-if="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="queryTop" class="el-fr-d">
+          <!-- 查询按钮 -->
+          <div>
+            <el-form-item label="目的仓">
+              <el-select
+                v-model="queryTop.warehouse"
+                multiple
+                placeholder="请选择仓库"
+                style="min-width: 340px"
+              >
+                <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-date-picker
                   v-model="queryTop.costSettlementYear"
                   type="year"
@@ -42,403 +42,409 @@
                     :value="item.value"
                   />
                 </el-select>
-              </el-form-item>
-            </div>
-            <el-form-item class="el-btn">
-              <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-              <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+              </el-form-item> -->
+            <el-form-item label="结算日期">
+              <el-date-picker
+                v-model="queryTop.costSettlementYear"
+                type="daterange"
+                unlink-panels
+                range-separator="到"
+                start-placeholder="开始日期"
+                end-placeholder="结束如期"
+                :shortcuts="shortcuts"
+              />
             </el-form-item>
-          </el-form>
-        </el-row>
-  
-        <!-- 控件模块 -->
-        <el-row>
-          <div class="avue-crud__header">
-            <!-- 头部左侧按钮模块 -->
-            <div class="avue-crud__left">
-              <!-- <el-button type="primary" @click="exportExcel"
+          </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="exportExcel"
                 ><el-icon><Plus /></el-icon>导出</el-button
               > -->
-            </div>
-            <!-- 头部右侧按钮模块 -->
-            <div class="avue-crud__right">
-              <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
-              <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-              <el-button icon="Search" @click="searchHide" circle></el-button>
-            </div>
           </div>
-        </el-row>
-  
-        <!-- 首页表格 -->
-        <el-row>
-          <!-- 列表模块 -->
-          <tablecmt
-            class="tableNode"
-            :columnList="details.columnList"
-            :tableData="data"
-            :loading="loadingObj.list"
-            @inputTxt="inputsc"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionChange"
-          >
-            <template #default="slotProps">
-              <template v-if="slotProps.scope.column.label === '操作'">
-                <div class="ElBtnClass">
-                  <el-button @click="view(slotProps.scope)">查看</el-button>
-                </div>
-              </template>
-            </template>
-          </tablecmt>
-        </el-row>
-  
-        <!-- 分页模块 -->
-        <el-row class="el-fy">
-          <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-            <div></div>
-            <el-pagination
-              align="right"
-              background
-              @size-change="sizeChange"
-              @current-change="currentChange"
-              :current-page="page.currentPage"
-              :page-sizes="[30, 50, 80, 120]"
-              :page-size="page.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="page.total"
-            >
-            </el-pagination>
+          <!-- 头部右侧按钮模块 -->
+          <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>
-        </el-row>
-      </div>
-    </basic-container>
-    <!-- 列表配置显示 -->
-    <edittablehead
-      @closce="showdrawer"
-      :drawerShow="drawerShow"
-      :columnList="details.columnList"
-      v-model="details.columnList"
-    ></edittablehead>
-  </template>
-  
-  <script setup>
-  import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-  import { columnList } from '@/option/storagecost/Warehousedaily.js';
-  import {
-    $_GetexpenseWarehouseDay,
-    $_getMyWarehouseList,
-    $_expenseWarehouseMonth,
-  } from '@/api/storagecost/index.js';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { processRowProperty, setNodeHeight } from '@/utils/util';
-  import functions from '@/utils/functions.js';
-  import { ElMessageBox, ElMessage } from 'element-plus';
-  import { downloadXls } from '@/utils/util';
-  import { useStore } from 'vuex';
-  import dayjs from 'dayjs';
-  const $router = useRouter(); //跳转
-  const $useStore = useStore(); //权限
-  const $route = useRoute(); //获取地址栏参数
-  const warehouseList = ref([]); //仓库
-  const monthList = ref([]); //月份
-  const queryTop = ref({}); //顶部查询
-  const details = reactive({
-    /** 是否开启搜索 */
-    search: false,
-    /** 表格搜索条件 */
-    query: {},
-    /** 时间快捷选择设置 */
-    shortcuts: [
-      {
-        text: '最近一周',
-        value: () => {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-          return [start, end];
-        },
-      },
-      {
-        text: '最近一个月',
-        value: () => {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-          return [start, end];
-        },
-      },
-      {
-        text: '最近三个月',
-        value: () => {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-          return [start, end];
-        },
+        </div>
+      </el-row>
+
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-button @click="view(slotProps.scope)">查看</el-button>
+              </div>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </div>
+  </basic-container>
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/storagecost/Warehousedaily.js';
+import {
+  $_GetexpenseWarehouseDay,
+  $_getMyWarehouseList,
+  $_expenseWarehouseMonth,
+} from '@/api/storagecost/index.js';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls } from '@/utils/util';
+import { useStore } from 'vuex';
+import dayjs from 'dayjs';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const warehouseList = ref([]); //仓库
+const monthList = ref([]); //月份
+const queryTop = ref({}); //顶部查询
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
       },
-    ],
-    /** 列表 */
-    columnList,
-  
-    /** 列表数据 */
-    data: [],
-    /** 页面loading */
-    loadingObj: {
-      /** 列表加载loading */
-      list: false,
-      packageListLoading: false,
-    },
-    /** 列表复选框选中的数据 */
-    selectionList: [],
-    /** 是否显示设置表格 */
-    drawerShow: false,
-    /** 分页参数 */
-    page: {
-      currentPage: 1,
-      pageSize: 50,
-      total: 0,
     },
-  
-    /** 弹出层显示 */
-    popUpShow: {
-      /** 包件明细 */
-      packageOrderListlVisited: false,
-      /** 二维码 */
-      QRCodeVisible: false,
-      /** 修改客户信息 */
-      editClientInfoVisible: false,
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
     },
-    /** 列表Dom节点 */
-    listNode: '',
-    form: {},
-    /** 全屏 */
-    fullscreenObj: {
-      /** 包明细 */
-      packageOrderListlVisited: false,
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
     },
+  ],
+  /** 列表 */
+  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,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  details.query[row.prop] = index;
+  processRowProperty(index, row, details);
+  console.log(details.query, '合并后的参数');
+  onLoad();
+};
+// 实例函数
+const test = val => {};
+/** 表格表头时间选择 */
+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];
+  }
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = val => {
+  console.log(val);
+};
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowProperty(index, row, details);
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  if (queryTop.value.costSettlementYear?.length) {
+    const [startDateQuery, endDateQuery] = queryTop.value.costSettlementYear;
+    details.query.startDateQuery = startDateQuery;
+    details.query.endDateQuery = endDateQuery;
+  } else {
+    delete details.query.startDateQuery;
+    delete details.query.endDateQuery;
+  }
+  if (queryTop.value.warehouse) {
+    details.query.warehouseNameQuery = queryTop.value.warehouse.join(',');
+  }else{
+    delete details.query.warehouseNameQuery;
+  }
+  onLoad();
+};
+// 清空
+const searchReset = () => {
+  details.query = {};
+  queryTop.value = {};
+  details.columnList.forEach(item => {
+    item.values = '';
   });
-  
-  const {
-    search,
-    query,
-    shortcuts,
-    data,
-    loadingObj,
-    selectionList,
-    drawerShow,
-    page,
-    trickleLoadingPage,
-    zeroAdditionalRecordingInfo,
-    popUpShow,
-    recorddata,
-  } = toRefs(details);
-  
-  /** 展开列表控件 */
-  const showdrawer = _flag => {
-    details.drawerShow = _flag;
-  };
-  /** 表格表头输入框搜索 */
-  const inputsc = (index, row) => {
-    details.query[row.prop] = index;
-    processRowProperty(index, row, details);
-    console.log(details.query, '合并后的参数');
-    onLoad();
-  };
-  // 实例函数
-  const test = val => {};
-  /** 表格表头时间选择 */
-  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];
-    }
-  };
-  
-  /** 表格表头输入框搜索 */
-  const btnsc = val => {
-    console.log(val);
-  };
-  /** 表格表头下拉框选择 */
-  const selectsc = (index, row) => {
-    processRowProperty(index, row, details);
-  };
-  /** 表格表头复选框选择 */
-  const selectionChange = list => {
-    console.log(list);
-    details.selectionList = list;
-  };
-  // 网页顶部搜索按钮
-  const searchChange = () => {
-    if (queryTop.value.warehouse?.length) {
-      queryTop.value.warehouseName = queryTop.value.warehouse.join(',');
-    } else {
-      delete queryTop.value.warehouseName;
-      delete details.query.warehouseName;
-    }
-    if (queryTop.value.costSettlementMonth) {
-      if (!queryTop.value.costSettlementYear) {
-        ElMessage({
-          message: '请选择年份',
-          type: 'warning',
-        });
-        return;
-      }
-    }
-    details.query = { ...details.query, ...queryTop.value };
-    delete details.query.warehouse; //删除多余字段
-    onLoad();
-  };
-  // 清空
-  const searchReset = () => {
-    details.query = {};
-    queryTop.value = {};
-    details.columnList.forEach(item => {
-      item.values = '';
-    });
-    onLoad();
-  };
-  // 每页多少条
-  const sizeChange = val => {
-    details.page.pageSize = val;
-    onLoad();
-  };
-  /** 页码改变执行的回调 */
-  const currentChange = val => {
-    details.page.currentPage = val;
-    onLoad();
-  };
-  // 刷新按钮
-  const searchChangeS = () => {
-    onLoad(); //获取列表参数
-  };
-  // 顶部搜索
-  const searchHide = () => {
-    console.log(details);
-    details.search = !details.search;
-    const _node = document.querySelector('.tableNode');
-    setNodeHeight(_node, '', true);
-  };
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
-    getDictionaryBiz(dictionaryType).then(res => {
-      console.log(res, '字典');
-      res.data.data.forEach(item => {
-        targetArray.push({
-          value: item.dictKey,
-          label: item.dictValue,
-        });
+  onLoad();
+};
+// 每页多少条
+const sizeChange = val => {
+  details.page.pageSize = val;
+  onLoad();
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+  details.page.currentPage = val;
+  onLoad();
+};
+// 刷新按钮
+const searchChangeS = () => {
+  onLoad(); //获取列表参数
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
       });
     });
-  }
-  
-  // 获取仓库
-  const MyWarehouseList = () => {
-    $_getMyWarehouseList().then(res => {
-      console.log(res, '仓库列表');
-      res.data.data.forEach(item => {
-        warehouseList.value.push({
-          value: item.name,
-          label: item.name,
-        });
+  });
+}
+
+// 获取仓库
+const MyWarehouseList = () => {
+  $_getMyWarehouseList().then(res => {
+    console.log(res, '仓库列表');
+    res.data.data.forEach(item => {
+      warehouseList.value.push({
+        value: item.name,
+        label: item.name,
       });
     });
+  });
+};
+
+// 页面初始化
+const onLoad = value => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...value,
   };
-  
-  // 页面初始化
-  const onLoad = value => {
-    let data = {
-      current: details.page.currentPage,
-      size: details.page.pageSize,
-      ...details.query,
-      ...value,
-    };
-    $_GetexpenseWarehouseDay(data).then(res => {
-      if (res.data.code == 200) {
-        details.data = res.data.data.records || [];
-        details.page.total = res.data.data.total; //页码
-      }
+  $_GetexpenseWarehouseDay(data).then(res => {
+    if (res.data.code == 200) {
+      details.data = res.data.data.records || [];
+      details.page.total = res.data.data.total; //页码
+    }
+  });
+};
+const monthFn = () => {
+  for (let i = 0; i < 12; i++) {
+    monthList.value.push({
+      value: i + 1,
+      label: i + 1 + '月',
     });
-  };
-  const monthFn = () => {
-    for (let i = 0; i < 12; i++) {
-      monthList.value.push({
-        value: i + 1,
-        label: i + 1 + '月',
+  }
+};
+const PageOnload = () => {
+  onLoad(); //获取列表参数
+  MyWarehouseList(); //获取仓库
+  monthFn(); //月份初始化
+};
+// 页面初始化方法
+PageOnload();
+//导出
+
+const exportExcel = () => {
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      console.log(details.query, '搜索参数');
+      details.loadingObj.list = true;
+      let data = {
+        ...details.query,
+      };
+      console.log(data, '要提交的数据');
+      $_expenseWarehouseMonth(data).then(res => {
+        details.loadingObj.list = false;
+        downloadXls(res.data, `月度仓储成本统计.xlsx`);
+        ElMessage({
+          message: '导出成功',
+          type: 'success',
+        });
       });
-    }
-  };
-  const PageOnload = () => {
-    onLoad(); //获取列表参数
-    MyWarehouseList(); //获取仓库
-    monthFn(); //月份初始化
-  };
-  // 页面初始化方法
-  PageOnload();
-  //导出
-  
-  const exportExcel = () => {
-    ElMessageBox.confirm('是否导出数据?', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
     })
-      .then(() => {
-        console.log(details.query, '搜索参数');
-        details.loadingObj.list = true;
-        let data = {
-          ...details.query,
-        };
-        console.log(data, '要提交的数据');
-        $_expenseWarehouseMonth(data).then(res => {
-          details.loadingObj.list = false;
-          downloadXls(res.data, `月度仓储成本统计.xlsx`);
-          ElMessage({
-            message: '导出成功',
-            type: 'success',
-          });
-        });
-      })
-      .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;
-  }
-  .el-fr-d {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    .el-btn {
-      margin-right: 0;
-    }
+    .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;
+}
+.el-fr-d {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  .el-btn {
+    margin-right: 0;
   }
-  </style>
-  
\ No newline at end of file
+}
+</style>
diff --git a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
new file mode 100644
index 00000000..10158ed5
--- /dev/null
+++ b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
@@ -0,0 +1,465 @@
+<template>
+  <basic-container>
+    <!-- 首页表格 -->
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="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-item>
+          <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>
+      </div>
+
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <!-- 修改客户信息 -->
+            <el-button type="primary" icon="Edit" @click="editClientInfo"> 修改客户信息 </el-button>
+
+            <!-- 删除 -->
+            <el-button type="primary" icon="Delete" @click="handleDelete"> 删除 </el-button>
+
+            <!-- 开标签 -->
+            <el-button type="primary" icon="Plus" @click="handleOpenAddTagDlog">开标签</el-button>
+
+            <!-- 批量开标签导入 -->
+            <el-button
+              type="primary"
+              icon="Upload"
+              @click="
+                () => {
+                  if (!ChecksWhetherTheWarehouseIsSelected())
+                    return ElMessage.warning('多仓权限无法操作，请选择仓库');
+                  details.popUpShow.UploadBatch = true;
+                  details.ouPaiChooseType = 0;
+                }
+              "
+            >
+              批量开标签导入
+            </el-button>
+
+            <!-- 欧派数据导入 -->
+            <el-button
+              type="primary"
+              icon="Upload"
+              @click="
+                () => {
+                  details.popUpShow.UploadPackageDelivery = true;
+                  details.ouPaiChooseType = 0;
+                }
+              "
+            >
+              欧派数据导入
+            </el-button>
+
+            <!-- 冻结 -->
+            <el-button type="primary" icon="Rank" @click="handleFreeze">冻结</el-button>
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="Search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-text @click="handleShowPackageOrderList(slotProps.scope)">包明细</el-text>
+              </div>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </div>
+  </basic-container>
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { columnList } from '@/option/warehouse/Prewarehouseorder.js';
+import { processRowPropertyName, setNodeHeight } from '@/utils/util';
+import {
+  $_getopenOrderAdvancePageList,
+  postOpenOrderDeletedAdvance,
+} from '@/api/waybill/TemporaryStorageList';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls, handleClearTableQuery,ChecksWhetherTheWarehouseIsSelected } from '@/utils/util';
+import { useStore } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 表格搜索条件 */
+  query: {},
+  defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
+  },
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
+  },
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+  defaultTime2,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+  onLoad();
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad();
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowPropertyName(index, row, details.query);
+  onLoad();
+};
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
+};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  onLoad();
+};
+// 每页多少条
+const sizeChange = val => {
+  details.page.pageSize = val;
+  onLoad();
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+  details.page.currentPage = val;
+  onLoad();
+};
+// 刷新按钮
+const searchChangeS = () => {
+  details.search = false; //关闭搜索
+  onLoad();
+};
+//清空
+const searchReset = () => {
+  details.query = {};
+  details.page.currentPage = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+      });
+    });
+  });
+}
+
+const onLoad = async () => {
+  try {
+    // 获取初始化页面数据
+    let _data = {
+      freezeStatus: '0',
+      hasPackage: 1,
+      pageNum: details.page.currentPage,
+      pageSize: details.page.pageSize,
+    };
+    details.loadingObj.list = true;
+    let _res = await $_getopenOrderAdvancePageList(_data);
+    const { code, data } = _res.data;
+    if (code === 200) {
+      details.data = data.records;
+      details.page.total = data.total;
+    }
+    console.log(_res, '初始化数据');
+  } catch (e) {
+    console.log(e, 'error');
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+// 初始化页面
+const onLoadPage = () => {
+  onLoad();
+};
+onLoadPage();
+/** 修改客户信息 */
+const editClientInfo = () => {
+  if (details.selectionList.length === 0) {
+    return ElMessage({
+      type: 'warning',
+      message: '最少选择一条数据',
+    });
+  }
+
+  const ids = JSON.stringify(details.selectionList.map(item => item.id));
+  const info = JSON.stringify(details.selectionList[0]);
+
+  // $router.push(`/waybill/EditCustomerInfo?ids=${ids}&info=${info}`);
+  $router.push({
+    path: `/waybill/EditCustomerInfo/${ids}/${info}`,
+    query: {
+      name: `订单 -- ${details.selectionList[0].orderCode} 客户信息修改`,
+    },
+  });
+};
+/** 查看包明细 */
+const handleShowPackageOrderList = ({ row }) => {
+  $router.push({
+    path: '/waybill/orderPackageListDetails?name=包明细',
+    query: {
+      id: row.id,
+      name: `订单 -- ${row.orderCode} 包明细`,
+    },
+  });
+};
+/** 批量删除 */
+const handleDelete = () => {
+  if (details.selectionList.length === 0) {
+    return ElMessage({
+      type: 'warning',
+      message: '最少选择一条数据',
+    });
+  }
+
+  ElMessageBox.confirm('确认删除数据吗?', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.list = true;
+
+      const ids = details.selectionList.map(item => item.id);
+
+      const res = await postOpenOrderDeletedAdvance({ advanceIds: ids, freezeStatus: '1' });
+      const { code } = res.data;
+      if (code !== 200) {
+        return;
+      }
+      ElMessage({
+        type: 'success',
+        message: '操作成功',
+      });
+      details.page.currentPage = 1;
+      await onLoad()
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.list = false;
+    }
+  });
+};
+
+
+
+/** 开启开标签弹窗 */
+const handleOpenAddTagDlog = async () => {
+  if (!ChecksWhetherTheWarehouseIsSelected())
+    return ElMessage.warning('多仓权限无法操作，请选择仓库');
+
+  details.popUpShow.addTagVisited = true;
+
+  await nextTick();
+
+  ruleFormRef.value.resetFields();
+};
+</script>
+
+<style scoped lang="scss">
+.ElBtnClass button {
+  border: none;
+  padding: 0;
+  background-color: transparent;
+}
+:deep(.el-card) {
+  height: 100%;
+}
+:deep(.el-card__body) {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.el-fy {
+  flex: 1;
+  display: flex;
+  align-items: flex-end;
+  margin-bottom: 10px;
+}
+.avue-crud {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+</style>