From e21cee35d884c1bff3c9f40269e4581c2e6fbf20 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 12 Mar 2024 19:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionDeliveryList.js  |  14 +
 src/api/reportforms/index.js                  |  29 +-
 src/components/ImgList/ImgList.vue            |  45 +++
 src/main.js                                   |   2 +
 src/option/reportforms/InventoryOutbound.js   | 160 ++++++++
 src/option/reportforms/Selfpickupreport.js    | 237 +++++++++++
 src/utils/LodopFuncs.js                       |  13 +-
 .../warehouse/basicdataWarehouseTemp.vue      | 129 +++++-
 .../distributionDeliveryListedt.vue           | 155 ++++++--
 .../turndelivery/deliveryDiscuss.vue          |   1 +
 src/views/reportforms/InventoryOutbound.vue   | 367 ++++++++++++++++++
 src/views/reportforms/Selfpickupreport.vue    | 366 +++++++++++++++++
 12 files changed, 1465 insertions(+), 53 deletions(-)
 create mode 100644 src/components/ImgList/ImgList.vue
 create mode 100644 src/option/reportforms/InventoryOutbound.js
 create mode 100644 src/option/reportforms/Selfpickupreport.js
 create mode 100644 src/views/reportforms/InventoryOutbound.vue
 create mode 100644 src/views/reportforms/Selfpickupreport.vue

diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 443026d3..02cebe8d 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -346,4 +346,18 @@ export const $_cancelDelivery = data => {
     method: 'post',
     data: data,
   });
+};
+
+
+/**
+ * 零担签收
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const $_deliveryZeroPackage = data => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/deliveryZeroPackage',
+    method: 'post',
+    data: data,
+  });
 };
\ No newline at end of file
diff --git a/src/api/reportforms/index.js b/src/api/reportforms/index.js
index fd5a546d..9943023a 100644
--- a/src/api/reportforms/index.js
+++ b/src/api/reportforms/index.js
@@ -55,4 +55,31 @@ export const $_getdetails = (params) => {
       params,
       responseType: 'blob',
     })
-  }
\ No newline at end of file
+  }
+
+    // 自提明细报表
+export const $_getSelfpickup = (params) => {
+  return request({
+    url: '/api/logpm-report/reportBillLoading/details',
+    method: 'get',
+    params,
+  });
+};
+
+//  自提明细报表报表导出
+export const $_exportSelfpickup  = (params) => {
+  return request({
+    url: '/api/logpm-report/reportBillLoading/exportDetails',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  })
+}
+// 库存品出库明细报表
+export const $_getreport = (params) => {
+  return request({
+    url: '/api/logpm-report/stock-out-detail/report',
+    method: 'get',
+    params,
+  });
+};
\ No newline at end of file
diff --git a/src/components/ImgList/ImgList.vue b/src/components/ImgList/ImgList.vue
new file mode 100644
index 00000000..315cf3b9
--- /dev/null
+++ b/src/components/ImgList/ImgList.vue
@@ -0,0 +1,45 @@
+<template>
+  
+    <div class="demo-image__preview" v-for="(item, index) in srcList">
+      <el-image
+        :src="item"
+        :zoom-rate="1.2"
+        :max-scale="7"
+        :min-scale="0.2"
+        :preview-src-list="srcList"
+        :initial-index="index"
+        fit="cover"
+      />
+    </div>
+ 
+</template>
+
+<script setup>
+import { defineProps, ref, onMounted, reactive } from 'vue';
+const props = defineProps(['imgList']);
+const srcList = ref([]);
+const { imgList } = props;
+srcList.value = imgList;//赋值
+</script>
+
+<style scoped lang="scss">
+.demo-image__error .image-slot {
+  font-size: 30px;
+}
+.demo-image__error .image-slot .el-icon {
+  font-size: 30px;
+}
+.demo-image__error .el-image {
+  width: 100%;
+  height: 200px;
+}
+.demo-image__preview{
+    height: 100px;
+    width: 100px;
+    margin: 4px;
+    .el-image{
+        height: 100%;
+        width: 100%;
+    }
+}
+</style>
diff --git a/src/main.js b/src/main.js
index 07e3b156..abf42306 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,6 +28,7 @@ import edittablehead from './components/edittablehead/index.vue';
 import WaybillPrintTemplate from './components/WaybillPrintTemplate/WaybillPrintTemplate.vue';
 import ArteryPrintTemplate from './components/ArteryPrintTemplate/ArteryPrintTemplate.vue';
 import TripartiteTransferPrintTemplate from './components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue';
+import ImgList from './components/ImgList/ImgList.vue';
 import { message } from './utils/resetMessage';
 import App from './App.vue';
 import 'animate.css';
@@ -59,6 +60,7 @@ app.component('WaybillPrintTemplate', WaybillPrintTemplate);
 app.component('ArteryPrintTemplate', ArteryPrintTemplate);
 /** 三方运输打印模版 */
 app.component('TripartiteTransferPrintTemplate', TripartiteTransferPrintTemplate);
+app.component('ImgList', ImgList);
 app.config.globalProperties.$dayjs = dayjs;
 app.config.globalProperties.$functions = functions;
 app.provide('functions', functions);
diff --git a/src/option/reportforms/InventoryOutbound.js b/src/option/reportforms/InventoryOutbound.js
new file mode 100644
index 00000000..9557c39f
--- /dev/null
+++ b/src/option/reportforms/InventoryOutbound.js
@@ -0,0 +1,160 @@
+export const columnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 55,
+      fixed: true,
+    },
+    {
+      prop: 'warehouse_name',
+      label: '仓库',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'market_name',
+      label: '商场名称',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'cargo_number',
+      label: '物料编码',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'material_name',
+      label: '物料名称',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'create_time',
+      label: '出库时间',
+      type: 4,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'stock_quantity',
+      label: '出库件数',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    }, 
+    {
+      prop: 'goods_allocation_name',
+      label: '货位信息',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+     {
+        prop: 'out_type',
+        label: '出库类型',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'note_number',
+        label: '配送单号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'train_number',
+        label: '配送车次号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'reservation_code',
+        label: '预约单号',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'client_name',
+        label: '配送客户',
+        type: 2,
+        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/option/reportforms/Selfpickupreport.js b/src/option/reportforms/Selfpickupreport.js
new file mode 100644
index 00000000..2c54252d
--- /dev/null
+++ b/src/option/reportforms/Selfpickupreport.js
@@ -0,0 +1,237 @@
+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: 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: '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: 'packetBarCode',
+      label: '包条',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    }, 
+    {
+      prop: 'trainNumber',
+      label: '客户车次号',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+        prop: 'firsts',
+        label: '一级品',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'second',
+        label: '二级品',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'thirdProduct',
+        label: '三级品',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'materialCode',
+        label: '物料编码',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'materialName',
+        label: '物料名称',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'startWareInTime',
+        label: '始发仓入库日期',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'startWareOutTime',
+        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: 'scanUser',
+        label: '提货扫码人',
+        type: 2,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'scanTime',
+        label: '提货扫描时间',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'examineTime',
+        label: '文员复核时间',
+        type: 4,
+        values: '',
+        width: '150',
+        checkarr: [],
+        fixed: false,
+        sortable: true,
+        head: false,
+      },
+      {
+        prop: 'examineUser',
+        label: '文员复核人',
+        type: 2,
+        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/utils/LodopFuncs.js b/src/utils/LodopFuncs.js
index d84b885d..ffea2983 100644
--- a/src/utils/LodopFuncs.js
+++ b/src/utils/LodopFuncs.js
@@ -101,7 +101,12 @@ export function getLodop(oOBJECT, oEMBED) {
     var strCLodopInstallA =
       `<font>
        <p>检测到到您的打印设备尚未安装驱动或打印服务!请按照以下提示进行操作:</p>
-       <div class='container'><div class='left'>
+       <div class='container'>
+       <div class='left'>
+       <h2>安装Web打印服务</h2>
+       <p><b>第一步</b>:请您下载并安装Web打印服务CLodop。<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'><b>点击下载</b></a></p>
+       </div>
+       <div class='right'>
        <h2>打印机驱动下载</h2>
        <table><thead>
        <tr>
@@ -113,11 +118,7 @@ export function getLodop(oOBJECT, oEMBED) {
        <td>2020.4</td></tr>
        </tbody>
        </table>
-       </div>
-       <div class='right'>
-       <h2>安装Web打印服务</h2>
-       <p>第一步:请您下载并安装Web打印服务CLodop。<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'><b>点击下载</b></a></p>
-       </div>
+      </div>
        </div>`;
     // var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
     var strCLodopInstallB = "<br>注意事项:";
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
index 957ddb22..a357a911 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
@@ -121,23 +121,58 @@
         </el-form-item>
 
         <el-form-item label="仓库类型">
-          <el-input v-model="Addform.warehouseType" placeholder="请选择仓库类型" />
+          <el-select v-model="Addform.warehouseType" clearable placeholder="请选择仓库类型" >
+            <el-option
+              v-for="item in WarehouseType"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="消防等级">
-          <el-input v-model="Addform.fireGrade" placeholder="请选择消防等级" />
+          <el-select v-model="Addform.fireGrade" clearable placeholder="请选择消防等级" >
+            <el-option
+              v-for="item in FireProtection"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="是否具有消防等级">
-          <el-input v-model="Addform.fireRatingNot" placeholder="请选择是否具有消防等级" />
+         <el-select v-model="Addform.fireRatingNot" clearable placeholder="请选择是否具有消防等级" >
+            <el-option
+              v-for="item in Isprotection"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="仓库结构">
-          <el-input v-model="Addform.warehouseStructure" placeholder="请选择仓库结构" />
+          <el-select v-model="Addform.warehouseStructure" clearable placeholder="请选择仓库结构" >
+            <el-option
+              v-for="item in WarehouseStructureList"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="是否高架">
-          <el-input v-model="Addform.elevatedNot" placeholder="请选择是否高架" />
+          <el-select v-model="Addform.elevatedNot" clearable placeholder="请选择是否高架" >
+            <el-option
+              v-for="item in Iselevated"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="仓库层高">
@@ -145,7 +180,14 @@
         </el-form-item>
 
         <el-form-item label="电力类型">
-          <el-input v-model="Addform.powerCondition" placeholder="请输入仓库层高" />
+          <el-select v-model="Addform.powerCondition" clearable placeholder="请选择电力类型" >
+            <el-option
+              v-for="item in powerConditionList"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="租金单价">
@@ -157,11 +199,25 @@
         </el-form-item>
 
         <el-form-item label="租金类型">
-          <el-input v-model="Addform.rentType" placeholder="请输入租金类型" />
+          <el-select v-model="Addform.rentType" clearable placeholder="请选择租金类型" >
+            <el-option
+              v-for="item in rentTypeList"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="仓库等级">
-          <el-input v-model="Addform.grade" placeholder="请输入仓库等级" />
+          <el-select v-model="Addform.grade" clearable placeholder="请选择仓库等级" >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
         </el-form-item>
 
         <el-form-item label="管理费">
@@ -173,13 +229,23 @@
         </el-form-item>
 
         <el-form-item label="日期范围">
-          <el-input v-model="Addform.daterange" placeholder="请输入日期范围" />
+          <el-date-picker
+        v-model="Addform.daterange"
+        type="datetimerange"
+        start-placeholder="租赁开始日期"
+        end-placeholder="租赁结束日期"
+        format="YYYY-MM-DD"
+        date-format="YYYY/MM/DD"
+        time-format="A hh:mm:ss"
+      />
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="Addform.remarks" placeholder="请输入日期范围" />
         </el-form-item>
         <el-form-item label="收款码">
-          <el-input v-model="Addform.paymentCodeUrl" placeholder="请输入日期范围" />
+          <el-input v-model="Addform.paymentCodeUrl" placeholder="请上传收款码" />
+          <ImgList :imgList="imgs"></ImgList>
+          <ImgList :imgList="imgs1"></ImgList>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -214,11 +280,18 @@ import { columnList } from '@/option/basicdata/basicdataWarehouseTemp.js';
 import { $_getList, $_ObtainRegion,$_parentId } from '@/api/basicdata/basicdataWarehouse';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { ElMessage } from 'element-plus';
-const options = ref([{
-    dictKey:'1',
-    dictValue:'22'
-}]); //职能类型
+const options = ref([]); //职能类型
 const search = ref(false); //搜索展开
+const imgs=ref([
+  'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
+  'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg',
+])
+const imgs1=ref([
+  'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
+  'https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg',
+  'https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg',
+
+])
 const query = ref({}); //顶部搜索参数
 const newlyaddload = ref(false); //新增弹窗
 const AssessmentDepartment = ref([]); //考核部门
@@ -226,8 +299,14 @@ const department=ref()
 const Addform = ref({
   map:[],
 }); //表格新增数据表单
-
-// 获取分类指标
+const WarehouseType=ref([])//仓库类型
+const FireProtection=ref([])//消防等级
+const Isprotection=ref([])//是否具有消防等级
+const WarehouseStructureList=ref([]);//仓库结构
+const Iselevated=ref([]);//是否高架
+const powerConditionList=ref([]);//电力类型
+const rentTypeList=ref([]);//租金类型
+// 获取分类指标 
 // 在外部定义递归函数，用于加载和更新分类
 const loadChildren = (targetList, parentId, indicatorValue) => {
   let dataSub = { parentId };
@@ -321,6 +400,7 @@ const searchChangeS = () => {
   query.value = {};
   onLoad();
 };
+const areaoptions = ref([]);//地区
 // 地区获取
 const initialization = () => {
   $_ObtainRegion().then(res => {
@@ -330,10 +410,12 @@ const initialization = () => {
     console.log(res, '获取地区');
   });
 };
+
+
 initialization();
 const searchHide = () => {};
 
-const areaoptions = ref([]);//地区
+
 
 const details = reactive({
   /** 是否开启搜索 */
@@ -431,6 +513,14 @@ function updateDictionary(targetArray, dictionaryType) {
 }
 const dictionary = () => {
   updateDictionary(options.value, 'warehouse_function_type'); //职能类型
+  updateDictionary(WarehouseType.value, 'warehouse_type'); //仓库类型
+  updateDictionary(FireProtection.value, 'warehouse_fireGrade'); //消防等级
+  updateDictionary(Isprotection.value, 'yes_no'); //消防等级
+  updateDictionary(WarehouseStructureList.value, 'warehouse_structure'); //仓库结构
+  updateDictionary(Iselevated.value, 'yes_no'); //是否高架
+  updateDictionary(powerConditionList.value, 'power_condition'); //是否高架
+  updateDictionary(rentTypeList.value, 'rent_type'); //是否高架
+  updateDictionary(rentTypeList.value, 'warehouse_grade'); //仓库等级
 };
 // 页面初始化字典
 dictionary();
@@ -536,7 +626,10 @@ const AffiliationList=ref({
     width: 46%;
   }
   .el-form-item__content{
-    width: 100%;
+    width: 100% !important;
+    .el-select,.avue-input-map,.el-cascader{
+      width: 100% !important;
+    }
   }
 }
 </style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 60abb836..dd516910 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -518,7 +518,23 @@
                   >
                 </template>
               </template>
+              
             </tablecmt>
+            <div class="avue-crud__pagination" style="width: 100%">
+          <!-- 分页模块 -->
+          <el-pagination
+            background
+            @size-change="wsizeChange"
+            @current-change="wcurrentChange"
+            :current-page="wpage.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="wpage.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="wpage.total"
+          >
+            <!--                        :align="center"-->
+          </el-pagination>
+        </div>
           </el-tab-pane>
           <el-tab-pane label="库存品包件" name="reservationInventoryPackage">
             <el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary"
@@ -563,6 +579,21 @@
                 </template>
               </template>
             </tablecmt>
+            <div class="avue-crud__pagination" style="width: 100%">
+          <!-- 分页模块 -->
+          <el-pagination
+            background
+            @size-change="InventoryChange"
+            @current-change="InventorycurrentChange"
+            :current-page="wpage.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="wpage.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="wpage.total"
+          >
+            <!--                        :align="center"-->
+          </el-pagination>
+        </div>
           </el-tab-pane>
           <!--          <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
           <!--          <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
@@ -610,24 +641,29 @@
                 </template>
               </template>
             </tablecmt>
-          </el-tab-pane>
-        </el-tabs>
-
-        <div class="avue-crud__pagination" style="width: 100%">
+        <!-- 分页模块 -->
+          <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
           <el-pagination
             background
-            @size-change="wsizeChange"
-            @current-change="wcurrentChange"
-            :current-page="wpage.currentPage"
+            @size-change="zeroChange"
+            @current-change="zerocurrentChange"
+            :current-page="zeroPg.currentPage"
             :page-sizes="[30, 50, 80, 120]"
-            :page-size="wpage.pageSize"
+            :page-size="zeroPg.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="wpage.total"
+            :total="zeroPg.total"
           >
             <!--                        :align="center"-->
           </el-pagination>
         </div>
+
+
+
+          </el-tab-pane>
+        </el-tabs>
+
+
         <!-- 表单按钮 -->
         <!--        <template #footer>-->
         <!--          <span v-if="!view" class="dialog-footer">-->
@@ -866,6 +902,7 @@ import {
   getReservationPackageList,
   deliveryInventorySign,
   printBatch,
+  $_deliveryZeroPackage,
 } from '@/api/distribution/distributionDeliveryList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
@@ -2306,6 +2343,11 @@ export default {
       //状态列表
       stateData: [],
       // 表单配置
+      zeroPg:{
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
       option: {
         expand: false,
         index: true,
@@ -3961,8 +4003,11 @@ export default {
           console.log(res, '零担数据');
           const data = res.data.data;
           this.LessThantruckloadListData = data.records;
+          this.zeroPg.total = data.total;
+        })
+        .catch(() => {
+
         })
-        .catch(() => {})
         .finally(() => {
           this.loading = false; //关闭加载
         });
@@ -4383,35 +4428,68 @@ export default {
           message: '请勾选需要批量签收的数据',
           type: 'warning',
         });
-        return 
+        return;
       }
-      this.$confirm('是否进行批量签收？').then(()=>{
-        this.loading=true;//开启加载
-        if(res.data.code==200){
-          this.truckload(this.page);
-        }
-      
-      }).catch(()=>{
 
-      })
+      const allSigned = this.LessThantruckloadListData.every(
+        item => item.signingStatusName == '待签收' || item.signingStatusName == '部分签收'
+      );
+      console.log(allSigned,'allSigned');
+      if (!allSigned) {
+        let temp = {};
+        console.log(true); // 如果都已签收，返回true
+        temp = this.LessThantruckloadListData.find(item => item.signingStatusName == '已签收');
+        ElMessage({
+          message: `${temp.orderCode}运单号已签收`,
+          type: 'warning',
+        });
+        return
+      }
+
+      this.$confirm('是否进行批量签收？')
+        .then(() => {
+          this.loading = true; //开启加载
+          let data = {
+            deliveryId: this.deliveryId,
+            reservationId: this.wid,
+            zeroPackageIds: this.selectionList.map(item => item.id).join(','),
+          };
+          $_deliveryZeroPackage(data).then(res => {
+            if (res.data.code == 200) {
+              ElMessage({
+              showClose: true,
+              message: res.data.msg,
+              type: 'success',
+            })
+              this.truckload(this.page);
+              this.selectionList = [];
+            }
+          }).catch(()=>{
+
+          }).finally(()=>{
+            this.loading = false; //关闭加载
+          });
+        })
+        .catch(() => {});
     },
     // 零担批量计划取消
     LdBatchcancellation() {
+      return
       if (!this.selectionList.length) {
         ElMessage({
           message: '请勾选需要计划取消的数据',
           type: 'warning',
         });
-        return 
+        return;
       }
-      this.$confirm('是否进行批量计划取消？').then(()=>{
-        this.loading=true;//开启加载
-        if(res.data.code == 200){
-          this.truckload(this.page);
-        }
-      }).catch(()=>{
-
-      })
+      this.$confirm('是否进行批量计划取消？')
+        .then(() => {
+          this.loading = true; //开启加载
+          if (res.data.code == 200) {
+            this.truckload(this.page);
+          }
+        })
+        .catch(() => {});
     },
     // 批量签收
     Batchsigning() {
@@ -5065,6 +5143,7 @@ export default {
         console.log('库存品包件>>>>>>>', res.data.data);
         const data = res.data.data;
         this.reservationInventoryPackageData = data.records;
+        this.wpage.total = data.total;
         this.loading = false; //关闭加载
       });
     },
@@ -5132,10 +5211,30 @@ export default {
       this.wpage.currentPage = currentPage;
       this.getWrapdetails(this.wpage);
     },
+    // 包件库存品
+    InventorycurrentChange(currentPage){
+      this.wpage.currentPage = currentPage;
+      this.getReservationInventoryPackageListInfo(this.wpage)
+    },
     wsizeChange(pageSize) {
       this.wpage.pageSize = pageSize;
       this.getWrapdetails(this.wpage);
     },
+    // 包件库存品
+    InventoryChange(pageSize){
+      this.wpage.pageSize = pageSize;
+      this.getReservationInventoryPackageListInfo(this.wpage)
+    },
+    // 零担
+    zeroChange(pageSize){
+      this.zeroPg.pageSize = pageSize;
+      this.truckload(this.zeroPg);
+    },
+    // 零担
+    zerocurrentChange(currentPage){
+      this.zeroPg.currentPag=currentPage;
+      this.truckload(this.zeroPg);
+    },
     winputsc(index, row) {
       this.wrapoption.query[row.prop] = index;
       this.getWrapdetails(this.wpage);
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 97b705e9..d56e188e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -292,6 +292,7 @@
                   >
                     <template #default="slotProps">
                       <el-text
+                      v-if="slotProps.scope.row.isZero != '1'"
                         :link="ElButtonS[0].link"
                         :class="ElButtonS[0].class"
                         :auto-insert-space="ElButtonS[0].space"
diff --git a/src/views/reportforms/InventoryOutbound.vue b/src/views/reportforms/InventoryOutbound.vue
new file mode 100644
index 00000000..c21eee06
--- /dev/null
+++ b/src/views/reportforms/InventoryOutbound.vue
@@ -0,0 +1,367 @@
+<template>
+    <basic-container>
+      <!-- 首页表格 -->
+      <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-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/InventoryOutbound.js';
+  import { getDictionaryBiz } from '@/api/system/dict'; //字典
+  import { processRowProperty, setNodeHeight } from '@/utils/util';
+  import { $_getSelfpickup,$_exportSelfpickup ,$_getreport } 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 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);
+  };
+  /** 表格表头复选框选择 */
+  const selectionChange = list => {
+    console.log(list);
+    details.selectionList = list;
+  };
+  // 网页顶部搜索按钮
+  const searchChange = () => {
+    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 = () => {
+    // updateDictionary(columnList[3].checkarr, 'pc_work_order'); //异常类型
+  };
+  onLoad();
+  // 获取数据
+  const getrain = () => {
+    let data = {
+      current: details.page.currentPage,
+      size: details.page.pageSize,
+      ...details.query,
+    };
+    details.loadingObj.list = true;
+    $_getreport(data)
+      .then(res => {
+        console.log(res, '当前参数1');
+        details.page.total = res.data.data.total;
+        details.data = res.data.data.records;
+      })
+      .catch(() => {})
+      .finally(() => {
+        details.loadingObj.list = false;
+      });
+  };
+  getrain();
+  
+  // 导出
+  const exportReport = () => {
+    return;
+    ElMessageBox.confirm('是否导出报表?', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+      .then(() => {
+        details.loadingObj.list = true;
+        let data = {
+          ...details.query,
+        };
+        $_exportSelfpickup(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;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/reportforms/Selfpickupreport.vue b/src/views/reportforms/Selfpickupreport.vue
new file mode 100644
index 00000000..47bf3a5b
--- /dev/null
+++ b/src/views/reportforms/Selfpickupreport.vue
@@ -0,0 +1,366 @@
+<template>
+    <basic-container>
+      <!-- 首页表格 -->
+      <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-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/Selfpickupreport.js';
+  import { getDictionaryBiz } from '@/api/system/dict'; //字典
+  import { processRowProperty, setNodeHeight } from '@/utils/util';
+  import { $_getSelfpickup,$_exportSelfpickup } 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 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);
+  };
+  /** 表格表头复选框选择 */
+  const selectionChange = list => {
+    console.log(list);
+    details.selectionList = list;
+  };
+  // 网页顶部搜索按钮
+  const searchChange = () => {
+    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 = () => {
+    // updateDictionary(columnList[3].checkarr, 'pc_work_order'); //异常类型
+  };
+  onLoad();
+  // 获取数据
+  const getrain = () => {
+    let data = {
+      current: details.page.currentPage,
+      size: details.page.pageSize,
+      ...details.query,
+    };
+    details.loadingObj.list = true;
+    $_getSelfpickup(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(() => {
+        details.loadingObj.list = true;
+        let data = {
+          ...details.query,
+        };
+        $_exportSelfpickup(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;
+  }
+  </style>
+  
\ No newline at end of file