diff --git a/src/api/waybill/orderPackageListDetails.js b/src/api/waybill/orderPackageListDetails.js
index f105be92..ccaf4f3c 100644
--- a/src/api/waybill/orderPackageListDetails.js
+++ b/src/api/waybill/orderPackageListDetails.js
@@ -33,6 +33,21 @@ export const getopenOrderIncomingPackage = data => {
   });
 };
 
+/**
+ * 直接入库 -- 商家端
+ * @param {number} current
+ * @param {number} size
+ * @param {*} params
+ * @returns
+ */
+export const postIncomingPackageByBussiness = data => {
+  return request({
+    url: '/api/logpm-trunkline/api/incoming/incomingPackageByBussiness',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 获取二维码
  */
diff --git a/src/option/basicdata/basicdataCarrier2.js b/src/option/basicdata/basicdataCarrier2.js
index 3831f281..b2c0336d 100644
--- a/src/option/basicdata/basicdataCarrier2.js
+++ b/src/option/basicdata/basicdataCarrier2.js
@@ -141,7 +141,7 @@ export const columnList = [
   {
     label: '合同起始时间',
     prop: 'contractStartTime',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -151,7 +151,7 @@ export const columnList = [
   {
     label: '合同结束时间',
     prop: 'contractEndTime',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -181,7 +181,7 @@ export const columnList = [
   {
     label: '自由车辆数',
     prop: 'freeVehiclesNub',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -191,7 +191,7 @@ export const columnList = [
   {
     label: '外部车辆数',
     prop: 'externalVehiclesNub',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -201,7 +201,7 @@ export const columnList = [
   {
     label: '星级',
     prop: 'starRating',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -248,16 +248,16 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
-  {
-    label: '道路运输许可证图片',
-    prop: 'notes',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
+  // {
+  //   label: '道路运输许可证图片',
+  //   prop: 'notes',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
   {
     prop: 'notes',
     label: '操作',
diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index e726c371..ee4319cd 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -236,6 +236,16 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'arriveTime',
+    label: '到达时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'createUserName',
     label: '操作',
diff --git a/src/option/distribution/directMerchantSign.js b/src/option/distribution/directMerchantSign.js
index 565f7c26..d17dd084 100644
--- a/src/option/distribution/directMerchantSign.js
+++ b/src/option/distribution/directMerchantSign.js
@@ -130,7 +130,7 @@ export const columnList = [
   {
     prop: 'signStatusName',
     label: '签收状态',
-    type: 14,
+    type: 3,
     values: '',
     width: '130',
     checkarr: [
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 20c53601..2397f02b 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -458,6 +458,16 @@ export default [
         },
         component: () => import('@/views/waybill/orderPackageListDetails.vue'),
       },
+      // 包明细 -- 商家
+      {
+        path: 'orderPackageListDetailsByMarket',
+        name: '包明细',
+        meta: {
+          data: 'data',
+          keepAlive: true,
+        },
+        component: () => import('@/views/waybill/orderPackageListDetailsByMarket.vue'),
+      },
       {
         path: 'EditCustomerInfo/:ids/:info',
         name: '客户信息修改',
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index 74477f41..9640f896 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -589,7 +589,7 @@ export default {
         {
           prop: 'supplier',
           label: '供应商',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -599,7 +599,7 @@ export default {
         {
           prop: 'assetType',
           label: '资产类型',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -609,7 +609,7 @@ export default {
         {
           prop: 'forkliftType',
           label: '类型',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -619,7 +619,7 @@ export default {
         {
           prop: 'abstract',
           label: '摘要',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -629,7 +629,7 @@ export default {
         {
           prop: 'load',
           label: '载重(T)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -639,7 +639,7 @@ export default {
         {
           prop: 'loadHeight',
           label: '载高(M)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -649,7 +649,7 @@ export default {
         {
           prop: 'vehicleSize',
           label: '整车尺寸',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -659,7 +659,7 @@ export default {
         {
           prop: 'forkArmsWidth',
           label: '货叉宽(M)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -669,7 +669,7 @@ export default {
         {
           prop: 'forkArmsHeight',
           label: '货叉长(M)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -679,7 +679,7 @@ export default {
         {
           prop: 'minimumTurningRadius',
           label: '最小转弯半径(M)',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -689,7 +689,7 @@ export default {
         {
           prop: 'channelWidth',
           label: '通道宽(M)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -699,7 +699,7 @@ export default {
         {
           prop: 'monthlyRent',
           label: '月租(元/月)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -719,7 +719,7 @@ export default {
         {
           prop: 'contractNumber',
           label: '合同编号',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -729,7 +729,7 @@ export default {
         {
           prop: 'leaseStartPeriod',
           label: '起租期限',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -739,7 +739,7 @@ export default {
         {
           prop: 'leaseStartTime',
           label: '租赁开始时间',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -749,7 +749,7 @@ export default {
         {
           prop: 'leaseEndTime',
           label: '租赁结束时间',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -759,7 +759,7 @@ export default {
         {
           prop: 'paymentCycle',
           label: '付款周期(月)',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -769,7 +769,7 @@ export default {
         {
           prop: 'deposit',
           label: '押金(元)',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -779,7 +779,7 @@ export default {
         {
           prop: 'paymentMethod',
           label: '付款方式',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -789,7 +789,7 @@ export default {
         {
           prop: 'notes',
           label: '备注',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -799,7 +799,7 @@ export default {
         {
           prop: 'owningWarehouse',
           label: '所属仓库',
-          type: 2,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
diff --git a/src/views/distribution/artery/VehicleStowageZeroLoading.vue b/src/views/distribution/artery/VehicleStowageZeroLoading.vue
index fece4759..8d907f64 100644
--- a/src/views/distribution/artery/VehicleStowageZeroLoading.vue
+++ b/src/views/distribution/artery/VehicleStowageZeroLoading.vue
@@ -613,10 +613,10 @@ const handleZeroUnLoadSubmit = async () => {
 
     const res = await postLoadingZero(submitData);
 
-    const { code } = res.data;
+    const { code, msg } = res.data;
 
     if (code !== 200) return;
-    ElMessage.success('卸车成功');
+    msg && ElMessage.success(msg);
     onLoad();
   } catch (error) {
     console.log('error :>> ', error);
diff --git a/src/views/distribution/artery/directMerchantSign.vue b/src/views/distribution/artery/directMerchantSign.vue
index 06868716..2f4ac8fc 100644
--- a/src/views/distribution/artery/directMerchantSign.vue
+++ b/src/views/distribution/artery/directMerchantSign.vue
@@ -40,19 +40,7 @@
         @selection="selectionChange"
       >
         <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '签收状态'">
-            <el-tag
-              :class="{
-                err: Number(slotProps.scope.row.signStatus) === 0,
-                sub: Number(slotProps.scope.row.signStatus) === 10,
-                primary: Number(slotProps.scope.row.signStatus) === 20,
-              }"
-            >
-              {{ slotProps.scope.row.signStatusName }}
-            </el-tag>
-          </template>
-
-          <template v-else-if="slotProps.scope.column.label === '操作'">
+          <template v-if="slotProps.scope.column.label === '操作'">
             <el-text
               v-if="Number(slotProps.scope.row.signStatus) !== 0"
               @click="() => handleShowSignImg(slotProps.scope)"
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 1fbb4678..0c391d58 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -359,7 +359,7 @@ export default {
         {
           prop: 'taskTime',
           label: '配送时间',
-          type: 4,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -370,7 +370,7 @@ export default {
         {
           prop: 'signLoadingDate',
           label: '装车时间',
-          type: 4,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -532,7 +532,7 @@ export default {
         {
           prop: 'signingTime',
           label: '文员签收时间',
-          type: 4,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -542,7 +542,7 @@ export default {
         {
           prop: 'sjsigningTime',
           label: '司机签收时间',
-          type: 4,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -815,7 +815,7 @@ export default {
         const res = await getDriverList(1, 10, '');
         const { code, data } = res.data;
         if (code !== 200) {
-          return 
+          return;
         }
         console.log(res, '司机信息');
         this.driverData = data.map(item => ({
diff --git a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
index a6f9d724..be333d7b 100644
--- a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
+++ b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
@@ -890,7 +890,7 @@ const onLoad = async () => {
       hasPackage: 1,
       pageNum: details.page.currentPage,
       pageSize: details.page.pageSize,
-      ...details.query
+      ...details.query,
     };
     details.loadingObj.list = true;
     let _res = await $_getopenOrderAdvancePageList(_data);
@@ -970,7 +970,7 @@ const editClientInfo = () => {
 /** 查看包明细 */
 const handleShowPackageOrderList = ({ row }) => {
   $router.push({
-    path: '/waybill/orderPackageListDetails?name=包明细',
+    path: '/waybill/orderPackageListDetailsByMarket?name=包明细',
     query: {
       id: row.id,
       name: `订单 -- ${row.orderCode} 包明细`,
@@ -1239,11 +1239,11 @@ const handleDownLoadFile = () => {
   ) {
   --el-color-danger: #f00;
 }
-.header_search{
+.header_search {
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
-  .el-btn{
+  .el-btn {
     margin-right: 0;
     width: auto;
   }
diff --git a/src/views/waybill/orderPackageListDetailsByMarket.vue b/src/views/waybill/orderPackageListDetailsByMarket.vue
new file mode 100644
index 00000000..67be36f2
--- /dev/null
+++ b/src/views/waybill/orderPackageListDetailsByMarket.vue
@@ -0,0 +1,928 @@
+<template>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search" label-width="100px">
+          <el-form-item label="运单号">
+            <el-input v-model="query.waybillNo" placeholder="请输入运单号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="订单自编号">
+            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="一级品类">
+            <el-input v-model="query.firstPackName" placeholder="请输入运单号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="二级品类">
+            <el-input
+              v-model="query.secondPackName"
+              placeholder="请输入运单号"
+              clearable
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="三级品类">
+            <el-input v-model="query.thirdPackName" placeholder="请输入运单号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="包条码">
+            <el-input
+              v-model="query.orderPackageCode"
+              placeholder="请输入运单号"
+              clearable
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="客户车次号">
+            <el-input v-model="query.trainNumber" placeholder="请输入运单号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="服务号">
+            <el-input v-model="query.serviceNum" placeholder="请输入运单号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="details.timeQuery.createTimeArr"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="handleFilterPackageData">
+              搜 索
+            </el-button>
+            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <!-- 批量打印 -->
+            <el-button type="primary" icon="Printer" @click="handleBatchBarcode">
+              批量打印
+            </el-button>
+
+            <!-- 直接入库 -->
+            <el-button
+              type="primary"
+              v-if="permissionObj.orderPackageListDetails_batchIncoming"
+              icon="Position"
+              @click="handleBatchPutInStorage"
+            >
+              批量入库
+            </el-button>
+
+            <!-- 批量删除 -->
+            <el-button
+              type="primary"
+              v-if="permissionObj.orderPackageListDetails_batchDelete"
+              icon="Delete"
+              @click="handleBatchDelete"
+              >批量删除</el-button
+            >
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" 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
+          :columnList="details.packageListColumnList"
+          :tableData="details.packageListRenderData"
+          :loading="loadingObj.packageListLoading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <el-text
+                v-if="permissionObj.orderPackageListDetails_InPackageProduct"
+                @click="handleShowPackageOrderList(slotProps.scope)"
+              >
+                包内产品
+              </el-text>
+              <el-text
+                v-if="permissionObj.orderPackageListDetails_flowNode"
+                @click="handleShowFlowNode(slotProps.scope)"
+              >
+                流转节点
+              </el-text>
+              <el-text
+                v-if="
+                  permissionObj.orderPackageListDetails_incoming &&
+                  Number(slotProps.scope.row.packageStatus) === 0
+                "
+                @click="handlePutInStorage(slotProps.scope)"
+              >
+                直接入库
+              </el-text>
+              <el-text @click="printOrder(slotProps.scope)"> 查看二维码 </el-text>
+            </template>
+          </template>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        </div>
+      </el-row>
+    </div>
+  </basic-container>
+
+  <!-- 包内产品 -->
+  <el-dialog
+    title="包内产品"
+    v-model="details.popUpShow.packageDetailColumnListVisited"
+    width="80%"
+    :before-close="beforeClose"
+    append-to-body
+    :fullscreen="details.fullscreenObj.packageDetailColumnListVisited"
+    :show-close="false"
+    class="packageDetailColumnListVisited"
+  >
+    <template #header="{ close, titleId, titleClass }">
+      <div class="my-header flex-c-sb">
+        <h4 :id="titleId" :class="titleClass">包内产品</h4>
+        <div class="flex-c-c">
+          <!-- 全屏显示按钮 -->
+          <el-button
+            type="text"
+            @click="handleFullScrean('open', 'packageDetailColumnListVisited')"
+            v-if="!details.fullscreenObj.packageDetailColumnListVisited"
+          >
+            <el-icon class=""><FullScreen /></el-icon>
+          </el-button>
+          <el-button
+            type="text"
+            @click="handleFullScrean('close', 'packageDetailColumnListVisited')"
+            v-else
+          >
+            <el-icon class=""><CopyDocument /></el-icon>
+          </el-button>
+
+          <!-- 弹窗关闭按钮 -->
+          <el-button type="text">
+            <el-icon class="" @click="close"><Close /></el-icon>
+          </el-button>
+        </div>
+      </div>
+    </template>
+    <tablecmt
+      :columnList="details.packageDetailColumnList"
+      :tableData="details.packageDetailData"
+      :loading="loadingObj.packageListLoading"
+      @inputTxt="inputsc"
+      @timeCheck="timesc"
+      @btnCheck="btnsc"
+      @selectCheck="selectsc"
+      @selection="selectionChange"
+    >
+      <template #default="slotProps"> </template>
+    </tablecmt>
+
+    <!-- 分页模块 -->
+    <el-pagination
+      align="right"
+      background
+      @size-change="sizeChange"
+      @current-change="currentChange"
+      :current-page="details.packageListPage.pageNum"
+      :page-sizes="[30, 50, 80, 120]"
+      :page-size="details.packageListPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="details.packageListPage.total"
+    >
+    </el-pagination>
+  </el-dialog>
+
+  <!-- 流转节点 -->
+  <el-dialog
+    title="流转节点"
+    v-model="details.popUpShow.flowNodeColumnListVisited"
+    width="80%"
+    :before-close="beforeClose"
+    append-to-body
+    :fullscreen="details.fullscreenObj.flowNodeColumnListVisited"
+    :show-close="false"
+    class="flowNodeColumnListVisited"
+  >
+    <template #header="{ close, titleId, titleClass }">
+      <div class="my-header flex-c-sb">
+        <h4 :id="titleId" :class="titleClass">流转节点</h4>
+        <div class="flex-c-c">
+          <!-- 全屏显示按钮 -->
+          <el-button
+            type="text"
+            @click="handleFullScrean('open', 'flowNodeColumnListVisited')"
+            v-if="!details.fullscreenObj.flowNodeColumnListVisited"
+          >
+            <el-icon class=""><FullScreen /></el-icon>
+          </el-button>
+          <el-button
+            type="text"
+            @click="handleFullScrean('close', 'flowNodeColumnListVisited')"
+            v-else
+          >
+            <el-icon class=""><CopyDocument /></el-icon>
+          </el-button>
+
+          <!-- 弹窗关闭按钮 -->
+          <el-button type="text">
+            <el-icon class="" @click="close"><Close /></el-icon>
+          </el-button>
+        </div>
+      </div>
+    </template>
+    <tablecmt
+      :columnList="details.flowNodeColumnList"
+      :tableData="details.flowNodeData"
+      :loading="loadingObj.packageListLoading"
+      @inputTxt="inputsc"
+      @timeCheck="timesc"
+      @btnCheck="btnsc"
+      @selectCheck="selectsc"
+      @selection="selectionChange"
+    >
+      <template #default="slotProps"> </template>
+    </tablecmt>
+  </el-dialog>
+
+  <!-- 打印二维码 -->
+  <MyPrint
+    :html="details.html"
+    v-model="details.popUpShow.QRCodeVisible"
+    :isShowExport="false"
+    type="titlePrint"
+    width="780px"
+  ></MyPrint>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.packageListColumnList"
+    v-model="details.packageListColumnList"
+  ></edittablehead>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+import { mapGetters, useStore } from 'vuex';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import {
+  getopenOrderFindAdvanceDetailList,
+  postIncomingPackageByBussiness,
+  getShowAdvancePackgeCode,
+  postDeleteAdvanceDetail,
+  postFinaPackageTrackLogList,
+} from '@/api/waybill/orderPackageListDetails';
+import {
+  downloadXls,
+  setNodeHeight,
+  getHtmls,
+  debounce,
+  deepClone,
+  handleClearTableQuery,
+  getObjType,
+} from '@/utils/util';
+import {
+  packageListColumnList,
+  packageDetailColumnList,
+  flowNodeColumnList,
+} from '@/option/waybill/orderPackageListDetails';
+import print from '@/utils/print';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { useRoute, useRouter } from 'vue-router';
+
+// 获取路由实例
+const $router = useRouter();
+const $route = useRoute();
+
+// vuex
+const $store = useStore();
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间选择 */
+  timeQuery: {},
+  /** 时间快捷选择设置 */
+  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];
+      },
+    },
+  ],
+  /** 包明细表头 */
+  packageListColumnList: deepClone(packageListColumnList),
+  /** 包明细数据 */
+  packageListData: [],
+  packageListRenderData: [],
+  /** 包内产品表头 */
+  packageDetailColumnList: deepClone(packageDetailColumnList),
+  /** 包内产品数据 */
+  packageDetailData: [],
+  /** 流转节点表头 */
+  flowNodeColumnList: deepClone(flowNodeColumnList),
+  /** 流转节点数据 */
+  flowNodeData: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+    /** 页面loading */
+    pageLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 包明细分页参数 */
+  packageListPage: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 流转节点 */
+    flowNodeColumnListVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 包内产品 */
+    packageDetailColumnListVisited: false,
+  },
+  /** 全屏 */
+  fullscreenObj: {
+    /** 流转节点 */
+    flowNodeColumnListVisited: false,
+    /** 包内产品 */
+    packageDetailColumnListVisited: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  html: '',
+});
+
+const { search, query, shortcuts, loadingObj, selectionList, drawerShow } = toRefs(details);
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+console.log('permission :>> ', permission);
+
+/** 权限按钮 */
+const permissionObj = reactive({
+  /** 批量删除 */
+  orderPackageListDetails_batchDelete: computed(() => {
+    return $store.getters.permission.orderPackageListDetails_batchDelete;
+  }),
+  /** 批量入库 */
+  orderPackageListDetails_batchIncoming: computed(() => {
+    return $store.getters.permission.orderPackageListDetails_batchIncoming;
+  }),
+  /** 入库 */
+  orderPackageListDetails_incoming: computed(() => {
+    return $store.getters.permission.orderPackageListDetails_Incoming;
+  }),
+  /** 流转节点 */
+  orderPackageListDetails_flowNode: computed(() => {
+    return $store.getters.permission.orderPackageListDetails_flowNode;
+  }),
+  /** 包内产品 */
+  orderPackageListDetails_InPackageProduct: computed(() => {
+    return $store.getters.permission.orderPackageListDetails_InPackageProduct;
+  }),
+});
+
+onMounted(() => {
+  const timer = setTimeout(() => {
+    details.listNode = document.querySelector('.maboxhi');
+    details.listNode.style.transition = 'all .3s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = async (params = {}) => {
+  try {
+    const {
+      query: { id },
+    } = $route;
+
+    details.loadingObj.packageListLoading = true;
+
+    // 获取暂存单列表
+    const res = await getopenOrderFindAdvanceDetailList(details.page, {
+      ...details.query,
+      ...params,
+      advanceId: id,
+    });
+
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+
+    details.packageListData = data || [];
+    handleFilterPackageData();
+  } catch (error) {
+  } finally {
+    details.loadingObj.packageListLoading = false;
+  }
+};
+
+const initPage = () => {
+  details.page.pageNum = 1;
+  onLoad();
+};
+
+/** 搜索 */
+const searchChange = () => {
+  initPage();
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.timeQuery = {};
+  handleClearTableQuery(details.packageListColumnList);
+  handleFilterPackageData();
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+  setNodeHeight(details.listNode, '', true);
+};
+
+const handleFilterPackageData = debounce(() => {
+  let _filterArr = [];
+
+  const _regArr = {};
+
+  for (const key in details.query) {
+    const value = details.query[key];
+
+    if (value) _regArr[key] = new RegExp('^' + value);
+  }
+
+  if (Object.keys(_regArr).length === 0 && Object.keys(details.timeQuery).length === 0)
+    return (details.packageListRenderData = details.packageListData);
+
+  for (let i = 0; i < details.packageListData.length; i++) {
+    const value = details.packageListData[i];
+
+    let _flag = true;
+    for (let key in _regArr) {
+      if (!_regArr[key].test(value[key])) _flag = false;
+      if (!_flag) break;
+    }
+
+    if (!_flag) continue;
+
+    for (let key in details.timeQuery) {
+      const item = details.timeQuery[key];
+      if (!item) continue;
+
+      const _startTime = Date.parse(item[0]);
+      const _endTime = Date.parse(item[1]) + 1000 * 60 * 60 * 24 - 1;
+
+      const _time = Date.parse(value[key.replace('Arr', '')]);
+
+      if (_time !== _time) _flag = false;
+      else if (_time < _startTime || _time > _endTime) _flag = false;
+
+      if (!_flag) break;
+    }
+    if (_flag) _filterArr.push(value);
+  }
+
+  details.packageListRenderData = _filterArr;
+}, 10);
+
+/** 表格表头输入框搜索 */
+const inputsc = (value, { prop }) => {
+  // 动态设置正则
+  details.query[prop] = value;
+
+  if (value === '') delete details.query[prop];
+
+  handleFilterPackageData();
+};
+
+/** 表格表头时间选择 */
+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];
+  }
+  initPage();
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = () => {};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  details.query[row.prop] = index;
+  if (!index && index !== 0) delete details.query[row.prop];
+  if (row.prop === 'certificateTypeName') {
+    details.query['certificateType'] = index;
+    if (!index) delete details.query['certificateType'];
+  }
+  initPage();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  initPage();
+};
+
+/** 页码改变执行的回调 */
+const currentChange = (pageNum: number) => {
+  details.page.pageNum = pageNum;
+  onLoad();
+};
+
+/** 弹出层开启前清除数据 */
+const beforeClose = done => {
+  done();
+  details.form = {};
+  details.selectionList = [];
+  details.view = false;
+};
+
+/** 查看包内产品 */
+const handleShowPackageOrderList = ({ row }) => {
+  // details.popUpShow.packageDetailColumnListVisited = true;
+
+  // nextTick(() => {
+  //   // 获取弹窗内表格元素节点, 并设置高度
+  //   const _node: any = document.querySelector('.packageDetailColumnListVisited .maboxhi');
+  //   if (!_node) return;
+  //   _node.style.height = '550px';
+  //   console.log('_node :>> ', _node);
+  // });
+  return ElMessage.warning({ message: '暂未开放' });
+};
+
+/** 修改客户信息 */
+const editClientInfo = () => {
+  if (details.selectionList.length !== 0) {
+    return ElMessage({
+      type: 'warning',
+      message: '最少选择一条数据',
+    });
+  }
+  //   editClientInfoVisible;
+  details.popUpShow.editClientInfoVisible = true;
+};
+
+/**
+ * 是否开启全屏
+ * @params(_type) 开启或关闭
+ */
+const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
+  let _node = '';
+  if (_name) _node = document.querySelector(`.${_name} .maboxhi`);
+
+  switch (_name) {
+    // 包内产品
+    case 'packageDetailColumnListVisited':
+      details.fullscreenObj.packageDetailColumnListVisited =
+        !details.fullscreenObj.packageDetailColumnListVisited;
+
+      if (_type === 'close') {
+        if (_node) setNodeHeight(_node, '500px');
+      } else {
+        if (_node) setNodeHeight(_node);
+      }
+      break;
+
+    default:
+      details.fullscreenObj[_name] = !details.fullscreenObj[_name];
+      if (_type === 'close') {
+        if (_node) setNodeHeight(_node, '500px');
+      } else {
+        if (_node) setNodeHeight(_node);
+      }
+      break;
+  }
+};
+
+/** 单列查看包条码 */
+const printOrder = async ({ row }) => {
+  try {
+    details.loadingObj.pageLoading = true;
+    details.html = '';
+    let qr = {
+      orderPackageCodes: row.orderPackageCode,
+    };
+    const res = await getShowAdvancePackgeCode(qr);
+    const { code, data } = res.data;
+    if (code !== 200 || !data || getObjType(data.moldList) !== 'array') return;
+    if (data.moldList.length === 0) return;
+
+    for (const iterator of data.moldList) {
+      details.html += iterator;
+    }
+
+    details.popUpShow.QRCodeVisible = true;
+    // details.html = getHtmls(data.dataList, data.templateHtml);
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+/** 打印包条码 */
+const printTemplate = () => {
+  const orderNodeList = document.querySelectorAll('.el-dialog-QRCode .el-dialog__body>div>div>div');
+  print(orderNodeList);
+};
+
+/** 入库 */
+const handlePutInStorage = ({ row }) => {
+  console.log('row :>> ', row);
+  ElMessageBox.confirm('确认直接入库吗?', '警告', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const submitData = {
+          orderPackageCode: row.orderPackageCode,
+          /** 直接入库 */
+          incomingType: '3',
+        };
+
+        const res = await postIncomingPackageByBussiness(submitData);
+        const { code } = res.data;
+
+        if (code !== 200) return;
+        initPage();
+        ElMessage({
+          type: 'success',
+          message: '入库成功',
+        });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+
+/** 批量入库 */
+const handleBatchPutInStorage = () => {
+  if (details.selectionList.length === 0) return ElMessage.error('最少选择一条数据');
+
+  let orderPackageCodes = [];
+  const _flag = details.selectionList.every(val => {
+    if (Number(val.packageStatus) === 1) {
+      return false;
+    }
+    orderPackageCodes.push(val.orderPackageCode);
+    return true;
+  });
+
+  if (!_flag) return ElMessage.error('请选择未入库的数据');
+
+  ElMessageBox.confirm('确认直接入库吗?', '警告', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const submitData = {
+          orderPackageCode: orderPackageCodes.join(','),
+          /** 直接入库 */
+          incomingType: '3',
+        };
+
+        const res = await postIncomingPackageByBussiness(submitData);
+        const { code } = res.data;
+
+        if (code !== 200) return;
+        initPage();
+        ElMessage({
+          type: 'success',
+          message: '入库成功',
+        });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    })
+    .catch(() => {});
+};
+
+/** 显示流转节点 */
+const handleShowFlowNode = async ({ row }) => {
+  try {
+    details.loadingObj.pageLoading = true;
+
+    const response = await postFinaPackageTrackLogList({ orderPackageCode: row.orderPackageCode });
+    const { code, data } = response.data;
+
+    if (code !== 200) return;
+    details.flowNodeData = data;
+
+    details.popUpShow.flowNodeColumnListVisited = true;
+    nextTick(() => {
+      // 获取弹窗内表格元素节点, 并设置高度
+      const _node: any = document.querySelector('.flowNodeColumnListVisited .maboxhi');
+      if (!_node) return;
+      _node.style.height = '550px';
+      console.log('_node :>> ', _node);
+    });
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+/** 批量删除 */
+const handleBatchDelete = () => {
+  if (details.selectionList.length === 0) return ElMessage.error('请选择需要删除的数据');
+
+  ElMessageBox.confirm('确认删除吗?', '警告', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const submitData = { advanceDetailIds: details.selectionList.map(item => item.id) };
+
+      const res = await postDeleteAdvanceDetail(submitData);
+      const { code } = res.data;
+
+      if (code !== 200) return;
+      initPage();
+      ElMessage({
+        type: 'success',
+        message: '删除成功',
+      });
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+/** 批量查看二维码 */
+const handleBatchBarcode = async () => {
+  if (details.selectionList.length === 0)
+    return ElMessage.warning({ message: '请选择需要查看的数据' });
+  try {
+    details.loadingObj.pageLoading = true;
+
+    let qr = {
+      orderPackageCodes: details.selectionList.map(val => val.orderPackageCode).join(','),
+    };
+
+    const res = await getShowAdvancePackgeCode(qr);
+
+    details.html = '';
+    const { code, data } = res.data;
+    if (code !== 200 || !data || getObjType(data.moldList) !== 'array') return;
+    if (data.moldList.length === 0) return;
+
+    for (const iterator of data.moldList) {
+      details.html += iterator;
+    }
+
+    details.popUpShow.QRCodeVisible = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+watch(
+  () => $route,
+  () => {
+    console.log('$route :>> ', $route);
+    if ($route.path !== '/waybill/orderPackageListDetailsByMarket') return;
+
+    initPage();
+  },
+  { immediate: true }
+);
+</script>
+
+<style scoped lang="scss">
+.fo-fl {
+  display: flex;
+  flex-wrap: wrap;
+  zoom: 0.9;
+}
+
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+
+.el-dialog-QRCode-container {
+  max-height: 80vh;
+  overflow-y: scroll;
+}
+</style>