From 71f29f79c0879a176363de8f4c96b8f51b82f068 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Wed, 13 Sep 2023 10:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E6=A0=BC=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/tray/basicdataTrayedt.vue       | 1210 ++++++++++-----
 .../warehouse/tray/basicdataTrayhistory.vue   | 1356 ++++++++++++-----
 2 files changed, 1795 insertions(+), 771 deletions(-)

diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 9828b0ae..c01228e1 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -2,145 +2,153 @@
   <basic-container>
     <div class="avue-crud">
       <el-divider>托 盘 信 息</el-divider>
-<!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
-<!--        <template #input="{row}">-->
-<!--          <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>-->
-<!--        </template>-->
-<!--      </avue-form>-->
+      <!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
+      <!--        <template #input="{row}">-->
+      <!--          <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>-->
+      <!--        </template>-->
+      <!--      </avue-form>-->
       <el-row :gutter="24" class="rows">
-        <el-col :xl="7" :lg="7" :md="8" :sm="24" >
-          <span>托盘码：{{traydata.palletCode}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>托盘码：{{ traydata.palletCode }} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>类 型：{{traydata.$type}} </span>
+          <span>类 型：{{ traydata.$type }} </span>
         </el-col>
       </el-row>
 
       <el-divider>在 托 货 物</el-divider>
-      <el-tabs type="border-card" v-model="activeTab"  @tab-click="handleTabClick" >
+      <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
         <el-tab-pane label="包 件 列 表" name="tab1">
           <!-- 列表模块 -->
-          <el-table ref="table" v-loading="loading"
-                    @selection-change="selectionChange"
-                    :data="packdata"
-                    :height="height"
-                    style="width: 100%"
-                    :border="option.border"
+          <tablecmt
+            :columnList="wrapoptioncolumn"
+            :tableData="packdata"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
-            <el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
-            <template v-for="(item,index) in wrapoption.column">
-              <!-- table字段 -->
-              <el-table-column v-if="item.hide!==true"
-                               :prop="item.prop"
-                               :label="item.label"
-                               align="center"
-                               :width="item.width"
-                               :key="index">
-              </el-table-column>
+            <template #default="slotProps">
+              <el-text
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handlePrintDetail(slotProps.scope.row)"
+                >打印</el-text
+              >
             </template>
-          </el-table>
-
-          <div class="avue-crud__pagination" style="width:100%">
+          </tablecmt>
+          <div class="avue-crud__pagination" style="width: 100%">
             <!-- 分页模块 -->
-            <el-pagination align="right"
-                           background
-                           @size-change="psizeChange"
-                           @current-change="pcurrentChange"
-                           :current-page="packpage.currentPage"
-                           :page-sizes="[30, 50,80, 120]"
-                           :page-size="packpage.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="packpage.total">
+            <el-pagination
+              align="right"
+              background
+              @size-change="psizeChange"
+              @current-change="pcurrentChange"
+              :current-page="packpage.currentPage"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="packpage.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="packpage.total"
+            >
             </el-pagination>
           </div>
         </el-tab-pane>
         <el-tab-pane label="库 存 品 列 表" name="tab2">
-            <!-- 列表模块 -->
-          <el-table ref="table" v-loading="loading"
-                    @selection-change="selectionChange"
-                    :data="inventorydata"
-                    :height="height"
-                    style="width: 100%"
-                    :border="option.border"
+          <!-- 列表模块 -->
+          <tablecmt
+            :columnList="inventoryoptioncolumn"
+            :tableData="inventorydata"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
-            <el-table-column type="expand" v-if="inventoryoption.expand" align="center"></el-table-column>
-            <template v-for="(item,index) in inventoryoption.column">
-              <!-- table字段 -->
-              <el-table-column v-if="item.hide!==true"
-                               :prop="item.prop"
-                               :label="item.label"
-                               align="center"
-                               :width="item.width"
-                               :key="index">
-              </el-table-column>
+            <template #default="slotProps">
+              <el-text
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handlePrintDetail(slotProps.scope.row)"
+                >打印</el-text
+              >
             </template>
-          </el-table>
-          <div class="avue-crud__pagination" style="width:100%">
+          </tablecmt>
+          <div class="avue-crud__pagination" style="width: 100%">
             <!-- 分页模块 -->
-            <el-pagination align="right"
-                           background
-                           @size-change="isizeChange"
-                           @current-change="icurrentChange"
-                           :current-page="inventorypage.currentPage"
-                           :page-sizes="[30, 50,80, 120]"
-                           :page-size="inventorypage.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="inventorypage.total">
+            <el-pagination
+              align="right"
+              background
+              @size-change="isizeChange"
+              @current-change="icurrentChange"
+              :current-page="inventorypage.currentPage"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="inventorypage.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="inventorypage.total"
+            >
             </el-pagination>
           </div>
-
         </el-tab-pane>
         <el-tab-pane label="零 担 列 表" name="tab3">
           <!-- 列表模块 -->
-          <el-table ref="table" v-loading="loading"
-                    @selection-change="selectionChange"
-                    :data="data"
-                    :height="height"
-                    style="width: 100%"
-                    :border="option.border"
+          <tablecmt
+            :columnList="optioncolumn"
+            :tableData="data"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
-            <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-            <template v-for="(item,index) in option.column">
-              <!-- table字段 -->
-              <el-table-column v-if="item.hide!==true"
-                               :prop="item.prop"
-                               :label="item.label"
-                               align="center"
-                               :width="item.width"
-                               :key="index">
-              </el-table-column>
+            <template #default="slotProps">
+              <!-- <el-text
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handlePrintDetail(slotProps.scope.row)"
+                >打印</el-text
+              > -->
             </template>
-          </el-table>
-          <div class="avue-crud__pagination" style="width:100%">
+          </tablecmt>
+          <div class="avue-crud__pagination" style="width: 100%">
             <!-- 分页模块 -->
-            <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
+              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-tab-pane>
-
       </el-tabs>
 
-
-
-      <el-row>
-      </el-row>
-
+      <el-row> </el-row>
     </div>
   </basic-container>
 </template>
 
 <script>
-import { getDetail, add, update, remove ,getpackList,getinventoryList,getlclList} from '@/api/basicdata/basicdataTray';
+import {
+  getDetail,
+  add,
+  update,
+  remove,
+  getpackList,
+  getinventoryList,
+  getlclList,
+} from '@/api/basicdata/basicdataTray';
 
 import option from '@/option/basic/basicPdarecords';
 import { mapGetters } from 'vuex';
@@ -165,35 +173,33 @@ export default {
       search: true,
       //是否显示新增
       isadd: false,
-      traydata:{
-
-      },
+      traydata: {},
       // 加载中
       loading: true,
       //查看按钮
-      edt:false,
-      activeTab:'tab1',
+      edt: false,
+      activeTab: 'tab1',
       previousTab: null,
-      trayId:null,
+      trayId: null,
       //隐藏
-      pake:false,
-      cus:true,
-      ord:false,
-      inventory:false,
+      pake: false,
+      cus: true,
+      ord: false,
+      inventory: false,
       //查看pda
-      padview:false,
+      padview: false,
       // 是否为查看模式。。
       view: false,
       // 签收。。
-      signView:false,
+      signView: false,
       // 查询信息
       query: {},
-      inputTypeData:[],
+      inputTypeData: [],
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -212,66 +218,63 @@ export default {
         selection: true,
         column: [
           {
-            label: "经销商名称",
-            prop: "dealerName",
+            label: '经销商名称',
+            prop: 'dealerName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: '运单号',
+            prop: 'waybillNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "经销商编码",
-            prop: "dealerCode",
+            label: '经销商编码',
+            prop: 'dealerCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单收货人",
-            prop: "consigneePerson",
+            label: '运单收货人',
+            prop: 'consigneePerson',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单收货地址",
-            prop: "consigneeAddress",
+            label: '运单收货地址',
+            prop: 'consigneeAddress',
             search: true,
-            width:"100px"
+            width: '100px',
           },
 
           {
-            label: "运单收货电话",
-            prop: "consigneeMobile",
+            label: '运单收货电话',
+            prop: 'consigneeMobile',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在库位",
-            prop: "positionCode",
+            label: '所在库位',
+            prop: 'positionCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在列",
-            prop: "columnNum",
+            label: '所在列',
+            prop: 'columnNum',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在行",
-            prop: "layerNum",
+            label: '所在行',
+            prop: 'layerNum',
             search: true,
-            width:"100px"
+            width: '100px',
           },
-        ]
+        ],
       },
 
-
-
-
       // 表单配置
       wrapoption: {
         expand: false,
@@ -280,100 +283,100 @@ export default {
         selection: true,
         column: [
           {
-            label: "服务号",
-            prop: "serviceNumber",
+            label: '服务号',
+            prop: 'serviceNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: '运单号',
+            prop: 'waybillNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包条码",
-            prop: "orderPackageCode",
+            label: '包条码',
+            prop: 'orderPackageCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "仓库",
-            prop: "warehouse",
+            label: '仓库',
+            prop: 'warehouse',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "一级品类",
-            prop: "firsts",
+            label: '一级品类',
+            prop: 'firsts',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "二级品类",
-            prop: "second",
+            label: '二级品类',
+            prop: 'second',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "三级品类",
-            prop: "thirdProduct",
+            label: '三级品类',
+            prop: 'thirdProduct',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物品编号",
-            prop: "materialCode",
+            label: '物品编号',
+            prop: 'materialCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物品名称",
-            prop: "materialName",
+            label: '物品名称',
+            prop: 'materialName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "品牌",
-            prop: "brandName",
+            label: '品牌',
+            prop: 'brandName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件状态",
-            prop: "orderPackageStatusName",
+            label: '包件状态',
+            prop: 'orderPackageStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件冻结状态",
-            prop: "orderPackageFreezeStatusName",
+            label: '包件冻结状态',
+            prop: 'orderPackageFreezeStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件上架状态",
-            prop: "orderPackageGroundingStatusName",
+            label: '包件上架状态',
+            prop: 'orderPackageGroundingStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件备货状态",
-            prop: "orderPackageStockupStatusName",
+            label: '包件备货状态',
+            prop: 'orderPackageStockupStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件预约状态",
-            prop: "orderPackageReservationStatusName",
+            label: '包件预约状态',
+            prop: 'orderPackageReservationStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件装车状态",
-            prop: "orderPackageLoadingStatusName",
+            label: '包件装车状态',
+            prop: 'orderPackageLoadingStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
 
           // {
@@ -382,22 +385,21 @@ export default {
           //   width:"100px"
           // },
           {
-            label: "所在库位",
-            prop: "positionCode",
-            width:"100px"
+            label: '所在库位',
+            prop: 'positionCode',
+            width: '100px',
           },
           {
-            label: "所在列",
-            prop: "columnNum",
-            width:"100px"
+            label: '所在列',
+            prop: 'columnNum',
+            width: '100px',
           },
           {
-            label: "所在层",
-            prop: "layerNum",
-            width:"100px"
+            label: '所在层',
+            prop: 'layerNum',
+            width: '100px',
           },
-
-        ]
+        ],
       },
       // 库存品表单配置
       inventoryoption: {
@@ -407,10 +409,10 @@ export default {
         selection: true,
         column: [
           {
-            label: "sku",
-            prop: "sku",
+            label: 'sku',
+            prop: 'sku',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           // {
           //   label: "订单自编号",
@@ -419,57 +421,57 @@ export default {
           //   width:"100px"
           // },
           {
-            label: "物料名称",
-            prop: "descriptionGoods",
+            label: '物料名称',
+            prop: 'descriptionGoods',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物料编号",
-            prop: "cargoNumber",
+            label: '物料编号',
+            prop: 'cargoNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "规格",
-            prop: "cargoNorms",
+            label: '规格',
+            prop: 'cargoNorms',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "单位",
-            prop: "cargoUnit",
+            label: '单位',
+            prop: 'cargoUnit',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "仓库",
-            prop: "warehouseName",
+            label: '仓库',
+            prop: 'warehouseName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所属商场",
-            prop: "shoppingMall",
+            label: '所属商场',
+            prop: 'shoppingMall',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在库位",
-            prop: "positionCode",
-            width:"100px"
+            label: '所在库位',
+            prop: 'positionCode',
+            width: '100px',
           },
           {
-            label: "所在列",
-            prop: "columnNum",
-            width:"100px"
+            label: '所在列',
+            prop: 'columnNum',
+            width: '100px',
           },
           {
-            label: "所在层",
-            prop: "layerNum",
-            width:"100px"
+            label: '所在层',
+            prop: 'layerNum',
+            width: '100px',
           },
-        ]
+        ],
       },
       // 订单表单配置
       ordoption: {
@@ -479,96 +481,520 @@ export default {
         selection: true,
         column: [
           {
-            label: "订单自编号",
-            prop: "orderCode",
+            label: '订单自编号',
+            prop: 'orderCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "货物名称",
-            prop: "descriptionGoods",
+            label: '货物名称',
+            prop: 'descriptionGoods',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物料名称",
-            prop: "materialName",
+            label: '物料名称',
+            prop: 'materialName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "备货件数",
-            prop: "deliveryNumber",
+            label: '备货件数',
+            prop: 'deliveryNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "已备数量",
-            prop: "readyStock",
+            label: '已备数量',
+            prop: 'readyStock',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "备货状态",
-            prop: "stockArticleState",
+            label: '备货状态',
+            prop: 'stockArticleState',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "托盘码",
-            prop: "pallet",
+            label: '托盘码',
+            prop: 'pallet',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在货位",
-            prop: "positionCode",
+            label: '所在货位',
+            prop: 'positionCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
-        ]
+        ],
       },
       //包肩分页信息
-      wpage:{
+      wpage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       //包肩分页信息
-      packpage:{
+      packpage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
-      ordpage:{
+      ordpage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
-      inventorypage:{
+      inventorypage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单列表
       data: [],
       // 签收列表
       signdata: [],
       //客户id
-      wid:null,
+      wid: null,
       //客户详情
-      wrapdata:[],
+      wrapdata: [],
       //包条列表
-      packdata:[],
+      packdata: [],
       //订单列表
-      orddata:[],
+      orddata: [],
       //库存品列表
-      inventorydata:[],
+      inventorydata: [],
+      wrapoptioncolumn: [
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'firsts',
+          label: '一级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'second',
+          label: '二级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'thirdProduct',
+          label: '三级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialCode',
+          label: '物品编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialName',
+          label: '物品名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageFreezeStatusName',
+          label: '包件冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageGroundingStatusName',
+          label: '包件上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStockupStatusName',
+          label: '包件备货状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageReservationStatusName',
+          label: '包件预约状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageLoadingStatusName',
+          label: '包件装车状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'positionCode',
+          label: '所在库位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'columnNum',
+          label: '所在列',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'layerNum',
+          label: '所在层',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
+      inventoryoptioncolumn: [
+        {
+          prop: 'sku',
+          label: 'sku',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoNumber',
+          label: '物料编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoNorms',
+          label: '规格',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouseName',
+          label: '仓库',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'shoppingMall',
+          label: '所属商场',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'positionCode',
+          label: '所在库位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'columnNum',
+          label: '所在列',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'layerNum',
+          label: '所在层',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
+      optioncolumn: [
+        {
+          prop: 'dealerName',
+          label: '经销商名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'dealerCode',
+          label: '经销商编码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consigneePerson',
+          label: '运单收货人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consigneeAddress',
+          label: '运单收货地址',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consigneeMobile',
+          label: '运单收货电话',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'positionCode',
+          label: '所在库位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'columnNum',
+          label: '所在列',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'layerNum',
+          label: '所在行',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
     };
   },
   watch: {
     // eslint-disable-next-line no-unused-vars
-    '$route'(to, from) {
+    $route(to, from) {
       // this.isadd =false;
       // this.query.masterId = null;
       // this.masterId = null;
@@ -581,11 +1007,28 @@ export default {
       //   this.onLoad(this.page);
       // } else {
       // }
-    }
+    },
   },
   mounted() {
     this.init();
     this.onLoad();
+    // let arr = [];
+    // this.option.column.map(item => {
+    //   if (!item.hide) {
+    //     arr.push({
+    //       prop: item.prop,
+    //       label: item.label,
+    //       type: 1,
+    //       values: '',
+    //       width: '150',
+    //       checkarr: [],
+    //       fixed: false,
+    //       sortable: true,
+    //       head: false,
+    //     });
+    //   }
+    // });
+    // console.log(JSON.stringify(arr));
   },
   created() {
     // //查询字典
@@ -600,11 +1043,11 @@ export default {
         ids.push(ele.id);
       });
       return ids.join(',');
-    }
+    },
   },
   methods: {
     beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
+      if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = res.data.data;
         });
@@ -613,7 +1056,7 @@ export default {
     },
     //修改
     rowUpdate(row, index, done, loading) {
-      console.log("row>>>>>>>>",row);
+      console.log('row>>>>>>>>', row);
     },
     queryDictionary() {
       getDictionaryBiz('yes_no').then(res => {
@@ -622,34 +1065,31 @@ export default {
       getDictionaryBiz('basic_in_type').then(res => {
         this.inputTypeData = res.data.data;
       });
-
     },
     //返回
-    handleViewpda() {
-
-    },
+    handleViewpda() {},
     //取消
-    cancellation(){
+    cancellation() {
       this.signBox = false;
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    handleTabClick(tab, event){
-      console.log("tab>>>>>>>>", tab.paneName);
-      let tabName = tab.paneName
-      switch (tabName){
+    handleTabClick(tab, event) {
+      console.log('tab>>>>>>>>', tab.paneName);
+      let tabName = tab.paneName;
+      switch (tabName) {
         case 'tab1':
-          console.log("ssss")
+          console.log('ssss');
           break;
         case 'tab2':
-          console.log("ssss")
+          console.log('ssss');
           break;
         case 'tab3':
-          console.log("ssss")
+          console.log('ssss');
           break;
         case 'tab4':
-          console.log("ssss")
+          console.log('ssss');
           break;
       }
     },
@@ -667,7 +1107,7 @@ export default {
     handleSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          this.form.stringValue =jsonString;
+          this.form.stringValue = jsonString;
           if (!this.form.id) {
             this.form.masterId = this.propertyformdata.id;
             add(this.form).then(() => {
@@ -675,12 +1115,12 @@ export default {
               this.onLoad(this.page);
               this.$message({
                 type: 'success',
-                message: '操作成功!'
+                message: '操作成功!',
               });
               let str = {
-                val: false
-              }
-              this.$emit("returnproperty", str);
+                val: false,
+              };
+              this.$emit('returnproperty', str);
             });
           } else {
             update(this.form).then(() => {
@@ -688,12 +1128,12 @@ export default {
               this.onLoad(this.page);
               this.$message({
                 type: 'success',
-                message: '操作成功!'
+                message: '操作成功!',
               });
               let str = {
-                val: false
-              }
-              this.$emit("returnproperty", str);
+                val: false,
+              };
+              this.$emit('returnproperty', str);
             });
           }
         } else {
@@ -704,54 +1144,55 @@ export default {
     },
 
     //客户列表
-    handleCustom(){
-      this.cus =true
-      this.pake =false
-      this.ord =false
-      this.inventory =false
+    handleCustom() {
+      this.cus = true;
+      this.pake = false;
+      this.ord = false;
+      this.inventory = false;
     },
     //订单列表
-    handleOrder(page){
-      let params={}
-      params.deliveryId =  this.traydata.id
+    handleOrder(page) {
+      let params = {};
+      params.deliveryId = this.traydata.id;
       getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("查看>>>>>订单>>",res.data.data);
-        const data =res.data.data
-        this.orddata = data.records
-        this.ordpage.total = data.total
+        console.log('查看>>>>>订单>>', res.data.data);
+        const data = res.data.data;
+        this.orddata = data.records;
+        this.ordpage.total = data.total;
       });
     },
     //包件列表
-    handlePackage(page){
-      let params={}
-      params.id =  this.traydata.id
+    handlePackage(page) {
+      let params = {};
+      params.id = this.traydata.id;
       getpackList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data =res.data.data
-        this.packdata = data.records
-        this.packpage.total = data.total
+        const data = res.data.data;
+        this.packdata = data.records;
+        this.packpage.total = data.total;
       });
-
     },
     //零担列表
-   handlelcl(page){
-      let params={}
-      params.id =  this.traydata.id
+    handlelcl(page) {
+      let params = {};
+      params.id = this.traydata.id;
       getlclList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data =res.data.data
-        this.data = data.records
-        this.page.total = data.total
+        const data = res.data.data;
+        this.data = data.records;
+        this.page.total = data.total;
       });
     },
     //库存列表
-    handleInventory(page){
-      let params={}
-      params.id =  this.traydata.id
-      getinventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("查看>>>>>库存>>",res.data.data);
-        const data =res.data.data
-        this.inventorydata = data.records
-        this.inventorypage.total = data.total
-      });
+    handleInventory(page) {
+      let params = {};
+      params.id = this.traydata.id;
+      getinventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          console.log('查看>>>>>库存>>', res.data.data);
+          const data = res.data.data;
+          this.inventorydata = data.records;
+          this.inventorypage.total = data.total;
+        }
+      );
     },
     handleAdd() {
       this.title = '新增';
@@ -766,53 +1207,54 @@ export default {
       });
     },
     handleView(row) {
-      console.log("查看>>>>>>>>>>",row);
+      console.log('查看>>>>>>>>>>', row);
       this.title = '查看';
       this.view = true;
       this.box = true;
-      this.wid= row.id
-    this.getWrapdetails(this.wpage)
+      this.wid = row.id;
+      this.getWrapdetails(this.wpage);
     },
     handleSign(row) {
-      console.log("签收>>>>>>>>>>",row);
+      console.log('签收>>>>>>>>>>', row);
       this.signtitle = '复核签收';
       // this.view = true;
-      this.signform = row
-       this.signBox = true;
-    //  this.wid= row.id
-   // this.getWrapdetails(this.wpage)
+      this.signform = row;
+      this.signBox = true;
+      //  this.wid= row.id
+      // this.getWrapdetails(this.wpage)
     },
     //一键签收
     handleSignone(row) {
-      console.log("一键签收>>>>>>>>>>",row);
-        this.signtitle = '一键签收';
-          this.signform = row
-          this.signBox = true
+      console.log('一键签收>>>>>>>>>>', row);
+      this.signtitle = '一键签收';
+      this.signform = row;
+      this.signBox = true;
     },
     handleOne(row) {
-      console.log("签收>>>>>>>>>>",row);
+      console.log('签收>>>>>>>>>>', row);
       this.$confirm('确认一键装车？')
         .then(_ => {
-              let data ={}
-            data.reservationId =row.id
-            data.deliveryId =this.traydata.id
+          let data = {};
+          data.reservationId = row.id;
+          data.deliveryId = this.traydata.id;
           getOneclick(data).then(res => {
-           this.$message.success(res.data.msg)
-            this.onLoad()
+            this.$message.success(res.data.msg);
+            this.onLoad();
           });
         })
-        .catch(_ => {
-        });
+        .catch(_ => {});
     },
-    getWrapdetails(page){
-      let params={}
-      params.reservationId = this.wid
-      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("查看>>>>>>>",res.data.data);
-        const data =res.data.data
-        this.wrapdata = data.records
-        this.wpage.total = data.total
-      });
+    getWrapdetails(page) {
+      let params = {};
+      params.reservationId = this.wid;
+      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          console.log('查看>>>>>>>', res.data.data);
+          const data = res.data.data;
+          this.wrapdata = data.records;
+          this.wpage.total = data.total;
+        }
+      );
     },
 
     handleDelete() {
@@ -823,7 +1265,7 @@ export default {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -833,7 +1275,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
         });
     },
@@ -841,7 +1283,7 @@ export default {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -850,7 +1292,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
         });
     },
@@ -860,7 +1302,7 @@ export default {
       this.view = false;
     },
     selectionChange(list) {
-      console.log("sllsls");
+      console.log('sllsls');
       this.selectionList = list;
     },
     selectionClear() {
@@ -877,41 +1319,41 @@ export default {
     },
     wcurrentChange(currentPage) {
       this.wpage.currentPage = currentPage;
-      this.getWrapdetails(this.wpage)
+      this.getWrapdetails(this.wpage);
     },
     wsizeChange(pageSize) {
       this.wpage.pageSize = pageSize;
-      this.getWrapdetails(this.wpage)
+      this.getWrapdetails(this.wpage);
     },
     pcurrentChange(currentPage) {
       this.packpage.currentPage = currentPage;
-      this.handlePackage(this.packpage)
+      this.handlePackage(this.packpage);
     },
     psizeChange(pageSize) {
       this.packpage.pageSize = pageSize;
-      this.handlePackage(this.packpage)
+      this.handlePackage(this.packpage);
     },
     ocurrentChange(currentPage) {
       this.ordpage.currentPage = currentPage;
-      this.handleordpage(this.ordpage)
+      this.handleordpage(this.ordpage);
     },
     osizeChange(pageSize) {
       this.inventorypage.pageSize = pageSize;
-      this.handleordpage(this.inventorypage)
+      this.handleordpage(this.inventorypage);
     },
     icurrentChange(currentPage) {
       this.inventorypage.currentPage = currentPage;
-      this.handleordpage(this.inventorypage)
+      this.handleordpage(this.inventorypage);
     },
     isizeChange(pageSize) {
       this.inventorypage.pageSize = pageSize;
-      this.handleordpage(this.inventorypage)
+      this.handleordpage(this.inventorypage);
     },
     onLoad() {
       //查询详情
       const data = decodeURIComponent(this.$route.query.data);
       this.traydata = JSON.parse(data);
-      console.log("data>>>>>>>>", this.traydata);
+      console.log('data>>>>>>>>', this.traydata);
       this.loading = true;
       // getDetail(id).then(res => {
       //   console.log("res.data>>>>>>>>>>>>",res.data.data);
@@ -919,11 +1361,11 @@ export default {
       //   //this.traydata = data
       //   this.data = data.reservationList
       // });
-       this.handlelcl(this.page);
-       this.handlePackage(this.packpage);
-       this.handleInventory(this.inventorypage);
+      this.handlelcl(this.page);
+      this.handlePackage(this.packpage);
+      this.handleInventory(this.inventorypage);
       this.loading = false;
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
index 30afccb1..99836bf3 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
@@ -2,145 +2,154 @@
   <basic-container>
     <div class="avue-crud">
       <el-divider>托 盘 信 息</el-divider>
-<!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
-<!--        <template #input="{row}">-->
-<!--          <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>-->
-<!--        </template>-->
-<!--      </avue-form>-->
+      <!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
+      <!--        <template #input="{row}">-->
+      <!--          <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>-->
+      <!--        </template>-->
+      <!--      </avue-form>-->
       <el-row :gutter="24" class="rows">
-        <el-col :xl="7" :lg="7" :md="8" :sm="24" >
-          <span>托盘码：{{traydata.palletCode}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>托盘码：{{ traydata.palletCode }} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>类 型：{{traydata.$type}} </span>
+          <span>类 型：{{ traydata.$type }} </span>
         </el-col>
       </el-row>
 
       <el-divider>历 史 在 托 货 物</el-divider>
-      <el-tabs type="border-card" v-model="activeTab"  @tab-click="handleTabClick" >
+      <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
         <el-tab-pane label="包 件 列 表" name="tab1">
           <!-- 列表模块 -->
-          <el-table ref="table" v-loading="loading"
-                    @selection-change="selectionChange"
-                    :data="packdata"
-                    :height="height"
-                    style="width: 100%"
-                    :border="option.border"
+          <tablecmt
+            :columnList="wrapoptioncolumn"
+            :tableData="packdata"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
-            <el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
-            <template v-for="(item,index) in wrapoption.column">
-              <!-- table字段 -->
-              <el-table-column v-if="item.hide!==true"
-                               :prop="item.prop"
-                               :label="item.label"
-                               align="center"
-                               :width="item.width"
-                               :key="index">
-              </el-table-column>
+            <template #default="slotProps">
+              <!-- <el-text
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handlePrintDetail(slotProps.scope.row)"
+                >打印</el-text
+              > -->
             </template>
-          </el-table>
-
-          <div class="avue-crud__pagination" style="width:100%">
+          </tablecmt>
+          <div class="avue-crud__pagination" style="width: 100%">
             <!-- 分页模块 -->
-            <el-pagination align="right"
-                           background
-                           @size-change="psizeChange"
-                           @current-change="pcurrentChange"
-                           :current-page="packpage.currentPage"
-                           :page-sizes="[30, 50,80, 120]"
-                           :page-size="packpage.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="packpage.total">
+            <el-pagination
+              align="right"
+              background
+              @size-change="psizeChange"
+              @current-change="pcurrentChange"
+              :current-page="packpage.currentPage"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="packpage.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="packpage.total"
+            >
             </el-pagination>
           </div>
         </el-tab-pane>
         <el-tab-pane label="库 存 品 列 表" name="tab2">
-            <!-- 列表模块 -->
-          <el-table ref="table" v-loading="loading"
-                    @selection-change="selectionChange"
-                    :data="inventorydata"
-                    :height="height"
-                    style="width: 100%"
-                    :border="option.border"
+          <!-- 列表模块 -->
+          <tablecmt
+            :columnList="inventoryoptioncolumn"
+            :tableData="inventorydata"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
-            <el-table-column type="expand" v-if="inventoryoption.expand" align="center"></el-table-column>
-            <template v-for="(item,index) in inventoryoption.column">
-              <!-- table字段 -->
-              <el-table-column v-if="item.hide!==true"
-                               :prop="item.prop"
-                               :label="item.label"
-                               align="center"
-                               :width="item.width"
-                               :key="index">
-              </el-table-column>
+            <template #default="slotProps">
+              <!-- <el-text
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handlePrintDetail(slotProps.scope.row)"
+                >打印</el-text
+              > -->
             </template>
-          </el-table>
-          <div class="avue-crud__pagination" style="width:100%">
+          </tablecmt>
+
+          <div class="avue-crud__pagination" style="width: 100%">
             <!-- 分页模块 -->
-            <el-pagination align="right"
-                           background
-                           @size-change="isizeChange"
-                           @current-change="icurrentChange"
-                           :current-page="inventorypage.currentPage"
-                           :page-sizes="[30, 50,80, 120]"
-                           :page-size="inventorypage.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="inventorypage.total">
+            <el-pagination
+              align="right"
+              background
+              @size-change="isizeChange"
+              @current-change="icurrentChange"
+              :current-page="inventorypage.currentPage"
+              :page-sizes="[30, 50, 80, 120]"
+              :page-size="inventorypage.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="inventorypage.total"
+            >
             </el-pagination>
           </div>
-
         </el-tab-pane>
         <el-tab-pane label="零 担 列 表" name="tab3">
           <!-- 列表模块 -->
-          <el-table ref="table" v-loading="loading"
-                    @selection-change="selectionChange"
-                    :data="data"
-                    :height="height"
-                    style="width: 100%"
-                    :border="option.border"
+          <tablecmt
+            :columnList="optioncolumn"
+            :tableData="data"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
-            <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-            <template v-for="(item,index) in option.column">
-              <!-- table字段 -->
-              <el-table-column v-if="item.hide!==true"
-                               :prop="item.prop"
-                               :label="item.label"
-                               align="center"
-                               :width="item.width"
-                               :key="index">
-              </el-table-column>
+            <template #default="slotProps">
+              <!-- <el-text
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="handlePrintDetail(slotProps.scope.row)"
+                >打印</el-text
+              > -->
             </template>
-          </el-table>
-          <div class="avue-crud__pagination" style="width:100%">
+          </tablecmt>
+          <div class="avue-crud__pagination" style="width: 100%">
             <!-- 分页模块 -->
-            <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
+              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-tab-pane>
-
       </el-tabs>
 
-
-
-      <el-row>
-      </el-row>
-
+      <el-row> </el-row>
     </div>
   </basic-container>
 </template>
 
 <script>
-import { getDetail, add, update, remove ,getpackListhistory,getinventoryListhistory,getlclListhistory} from '@/api/basicdata/basicdataTray';
+import {
+  getDetail,
+  add,
+  update,
+  remove,
+  getpackListhistory,
+  getinventoryListhistory,
+  getlclListhistory,
+} from '@/api/basicdata/basicdataTray';
 
 import option from '@/option/basic/basicPdarecords';
 import { mapGetters } from 'vuex';
@@ -165,35 +174,33 @@ export default {
       search: true,
       //是否显示新增
       isadd: false,
-      traydata:{
-
-      },
+      traydata: {},
       // 加载中
       loading: true,
       //查看按钮
-      edt:false,
-      activeTab:'tab1',
+      edt: false,
+      activeTab: 'tab1',
       previousTab: null,
-      trayId:null,
+      trayId: null,
       //隐藏
-      pake:false,
-      cus:true,
-      ord:false,
-      inventory:false,
+      pake: false,
+      cus: true,
+      ord: false,
+      inventory: false,
       //查看pda
-      padview:false,
+      padview: false,
       // 是否为查看模式。。
       view: false,
       // 签收。。
-      signView:false,
+      signView: false,
       // 查询信息
       query: {},
-      inputTypeData:[],
+      inputTypeData: [],
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -212,86 +219,83 @@ export default {
         selection: true,
         column: [
           {
-            label: "经销商名称",
-            prop: "dealerName",
+            label: '经销商名称',
+            prop: 'dealerName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: '运单号',
+            prop: 'waybillNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "经销商编码",
-            prop: "dealerCode",
+            label: '经销商编码',
+            prop: 'dealerCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单收货人",
-            prop: "consigneePerson",
+            label: '运单收货人',
+            prop: 'consigneePerson',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单收货地址",
-            prop: "consigneeAddress",
+            label: '运单收货地址',
+            prop: 'consigneeAddress',
             search: true,
-            width:"100px"
+            width: '100px',
           },
 
           {
-            label: "运单收货电话",
-            prop: "consigneeMobile",
+            label: '运单收货电话',
+            prop: 'consigneeMobile',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "货位信息",
-            prop: "goodsAllocationName",
+            label: '货位信息',
+            prop: 'goodsAllocationName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在列",
-            prop: "columnNum",
+            label: '所在列',
+            prop: 'columnNum',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所在行",
-            prop: "layerNum",
+            label: '所在行',
+            prop: 'layerNum',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "关系类型",
-            prop: "bindingType",
-            width:"100px"
+            label: '关系类型',
+            prop: 'bindingType',
+            width: '100px',
           },
           {
-            label: "操作时间",
-            prop: "operateTime",
-            width:"100px"
+            label: '操作时间',
+            prop: 'operateTime',
+            width: '100px',
           },
           {
-            label: "操作人",
-            prop: "operateUserName",
-            width:"100px"
+            label: '操作人',
+            prop: 'operateUserName',
+            width: '100px',
           },
           {
-            label: "操作数量",
-            prop: "num",
-            width:"100px"
+            label: '操作数量',
+            prop: 'num',
+            width: '100px',
           },
-        ]
+        ],
       },
 
-
-
-
       // 表单配置
       wrapoption: {
         expand: false,
@@ -300,100 +304,100 @@ export default {
         selection: true,
         column: [
           {
-            label: "服务号",
-            prop: "serviceNumber",
+            label: '服务号',
+            prop: 'serviceNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: '运单号',
+            prop: 'waybillNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包条码",
-            prop: "orderPackageCode",
+            label: '包条码',
+            prop: 'orderPackageCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "仓库",
-            prop: "warehouse",
+            label: '仓库',
+            prop: 'warehouse',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "一级品类",
-            prop: "firsts",
+            label: '一级品类',
+            prop: 'firsts',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "二级品类",
-            prop: "second",
+            label: '二级品类',
+            prop: 'second',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "三级品类",
-            prop: "thirdProduct",
+            label: '三级品类',
+            prop: 'thirdProduct',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物品编号",
-            prop: "materialCode",
+            label: '物品编号',
+            prop: 'materialCode',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物品名称",
-            prop: "materialName",
+            label: '物品名称',
+            prop: 'materialName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "品牌",
-            prop: "brandName",
+            label: '品牌',
+            prop: 'brandName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件状态",
-            prop: "orderPackageStatusName",
+            label: '包件状态',
+            prop: 'orderPackageStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件冻结状态",
-            prop: "orderPackageFreezeStatusName",
+            label: '包件冻结状态',
+            prop: 'orderPackageFreezeStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件上架状态",
-            prop: "orderPackageGroundingStatusName",
+            label: '包件上架状态',
+            prop: 'orderPackageGroundingStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件备货状态",
-            prop: "orderPackageStockupStatusName",
+            label: '包件备货状态',
+            prop: 'orderPackageStockupStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件预约状态",
-            prop: "orderPackageReservationStatusName",
+            label: '包件预约状态',
+            prop: 'orderPackageReservationStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "包件装车状态",
-            prop: "orderPackageLoadingStatusName",
+            label: '包件装车状态',
+            prop: 'orderPackageLoadingStatusName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           // {
           //   label: "托盘码",
@@ -401,42 +405,41 @@ export default {
           //   width:"100px"
           // },
           {
-            label: "库位名称",
-            prop: "goodsAllocationName",
-            width:"100px"
+            label: '库位名称',
+            prop: 'goodsAllocationName',
+            width: '100px',
           },
           {
-            label: "所在列",
-            prop: "columnNum",
-            width:"100px"
+            label: '所在列',
+            prop: 'columnNum',
+            width: '100px',
           },
           {
-            label: "所在层",
-            prop: "layerNum",
-            width:"100px"
+            label: '所在层',
+            prop: 'layerNum',
+            width: '100px',
           },
           {
-            label: "关系类型",
-            prop: "bindingType",
-            width:"100px"
+            label: '关系类型',
+            prop: 'bindingType',
+            width: '100px',
           },
           {
-            label: "操作时间",
-            prop: "operateTime",
-            width:"100px"
+            label: '操作时间',
+            prop: 'operateTime',
+            width: '100px',
           },
           {
-            label: "操作人",
-            prop: "operateUserName",
-            width:"100px"
+            label: '操作人',
+            prop: 'operateUserName',
+            width: '100px',
           },
           {
-            label: "操作数量",
-            prop: "num",
-            width:"100px"
+            label: '操作数量',
+            prop: 'num',
+            width: '100px',
           },
-
-        ]
+        ],
       },
       // 库存品表单配置
       inventoryoption: {
@@ -446,126 +449,682 @@ export default {
         selection: true,
         column: [
           {
-            label: "sku",
-            prop: "sku",
+            label: 'sku',
+            prop: 'sku',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物料名称",
-            prop: "descriptionGoods",
+            label: '物料名称',
+            prop: 'descriptionGoods',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "物料编号",
-            prop: "cargoNumber",
+            label: '物料编号',
+            prop: 'cargoNumber',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "规格",
-            prop: "cargoNorms",
+            label: '规格',
+            prop: 'cargoNorms',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "单位",
-            prop: "cargoUnit",
+            label: '单位',
+            prop: 'cargoUnit',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "仓库",
-            prop: "warehouseName",
+            label: '仓库',
+            prop: 'warehouseName',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "所属商场",
-            prop: "shoppingMall",
+            label: '所属商场',
+            prop: 'shoppingMall',
             search: true,
-            width:"100px"
+            width: '100px',
           },
           {
-            label: "库位名称",
-            prop: "goodsAllocationName",
-            width:"100px"
+            label: '库位名称',
+            prop: 'goodsAllocationName',
+            width: '100px',
           },
           {
-            label: "所在列",
-            prop: "columnNum",
-            width:"100px"
+            label: '所在列',
+            prop: 'columnNum',
+            width: '100px',
           },
           {
-            label: "所在层",
-            prop: "layerNum",
-            width:"100px"
+            label: '所在层',
+            prop: 'layerNum',
+            width: '100px',
           },
           {
-            label: "关系类型",
-            prop: "bindingType",
-            width:"100px"
+            label: '关系类型',
+            prop: 'bindingType',
+            width: '100px',
           },
           {
-            label: "操作时间",
-            prop: "operateTime",
-            width:"100px"
+            label: '操作时间',
+            prop: 'operateTime',
+            width: '100px',
           },
           {
-            label: "操作人",
-            prop: "operateUserName",
-            width:"100px"
+            label: '操作人',
+            prop: 'operateUserName',
+            width: '100px',
           },
           {
-            label: "操作数量",
-            prop: "num",
-            width:"100px"
+            label: '操作数量',
+            prop: 'num',
+            width: '100px',
           },
-        ]
+        ],
       },
 
       //包肩分页信息
-      wpage:{
+      wpage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       //包肩分页信息
-      packpage:{
+      packpage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
-      ordpage:{
+      ordpage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
-      inventorypage:{
+      inventorypage: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单列表
       data: [],
       // 签收列表
       signdata: [],
       //客户id
-      wid:null,
+      wid: null,
       //客户详情
-      wrapdata:[],
+      wrapdata: [],
       //包条列表
-      packdata:[],
+      packdata: [],
       //订单列表
-      orddata:[],
+      orddata: [],
       //库存品列表
-      inventorydata:[],
+      inventorydata: [],
+      wrapoptioncolumn: [
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'firsts',
+          label: '一级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'second',
+          label: '二级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'thirdProduct',
+          label: '三级品类',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialCode',
+          label: '物品编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialName',
+          label: '物品名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageFreezeStatusName',
+          label: '包件冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageGroundingStatusName',
+          label: '包件上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStockupStatusName',
+          label: '包件备货状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageReservationStatusName',
+          label: '包件预约状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageLoadingStatusName',
+          label: '包件装车状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'goodsAllocationName',
+          label: '库位名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'columnNum',
+          label: '所在列',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'layerNum',
+          label: '所在层',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'bindingType',
+          label: '关系类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operateTime',
+          label: '操作时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operateUserName',
+          label: '操作人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'num',
+          label: '操作数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
+      inventoryoptioncolumn: [
+        {
+          prop: 'sku',
+          label: 'sku',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoNumber',
+          label: '物料编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoNorms',
+          label: '规格',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouseName',
+          label: '仓库',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'shoppingMall',
+          label: '所属商场',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'goodsAllocationName',
+          label: '库位名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'columnNum',
+          label: '所在列',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'layerNum',
+          label: '所在层',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'bindingType',
+          label: '关系类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operateTime',
+          label: '操作时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operateUserName',
+          label: '操作人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'num',
+          label: '操作数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
+      optioncolumn: [
+        {
+          prop: 'dealerName',
+          label: '经销商名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'dealerCode',
+          label: '经销商编码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consigneePerson',
+          label: '运单收货人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consigneeAddress',
+          label: '运单收货地址',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consigneeMobile',
+          label: '运单收货电话',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'goodsAllocationName',
+          label: '货位信息',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'columnNum',
+          label: '所在列',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'layerNum',
+          label: '所在行',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'bindingType',
+          label: '关系类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operateTime',
+          label: '操作时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operateUserName',
+          label: '操作人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'num',
+          label: '操作数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
     };
   },
   watch: {
     // eslint-disable-next-line no-unused-vars
-    '$route'(to, from) {
+    $route(to, from) {
       // this.isadd =false;
       // this.query.masterId = null;
       // this.masterId = null;
@@ -578,11 +1137,28 @@ export default {
       //   this.onLoad(this.page);
       // } else {
       // }
-    }
+    },
   },
   mounted() {
     this.init();
     this.onLoad();
+    // let arr = [];
+    // this.option.column.map(item => {
+    //   if (!item.hide) {
+    //     arr.push({
+    //       prop: item.prop,
+    //       label: item.label,
+    //       type: 1,
+    //       values: '',
+    //       width: '150',
+    //       checkarr: [],
+    //       fixed: false,
+    //       sortable: true,
+    //       head: false,
+    //     });
+    //   }
+    // });
+    // console.log(JSON.stringify(arr));
   },
   created() {
     // //查询字典
@@ -596,11 +1172,11 @@ export default {
         ids.push(ele.id);
       });
       return ids.join(',');
-    }
+    },
   },
   methods: {
     beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
+      if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = res.data.data;
         });
@@ -609,7 +1185,7 @@ export default {
     },
     //修改
     rowUpdate(row, index, done, loading) {
-      console.log("row>>>>>>>>",row);
+      console.log('row>>>>>>>>', row);
     },
     queryDictionary() {
       getDictionaryBiz('yes_no').then(res => {
@@ -618,34 +1194,31 @@ export default {
       getDictionaryBiz('basic_in_type').then(res => {
         this.inputTypeData = res.data.data;
       });
-
     },
     //返回
-    handleViewpda() {
-
-    },
+    handleViewpda() {},
     //取消
-    cancellation(){
+    cancellation() {
       this.signBox = false;
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    handleTabClick(tab, event){
-      console.log("tab>>>>>>>>", tab.paneName);
-      let tabName = tab.paneName
-      switch (tabName){
+    handleTabClick(tab, event) {
+      console.log('tab>>>>>>>>', tab.paneName);
+      let tabName = tab.paneName;
+      switch (tabName) {
         case 'tab1':
-          console.log("ssss")
+          console.log('ssss');
           break;
         case 'tab2':
-          console.log("ssss")
+          console.log('ssss');
           break;
         case 'tab3':
-          console.log("ssss")
+          console.log('ssss');
           break;
         case 'tab4':
-          console.log("ssss")
+          console.log('ssss');
           break;
       }
     },
@@ -663,7 +1236,7 @@ export default {
     handleSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          this.form.stringValue =jsonString;
+          this.form.stringValue = jsonString;
           if (!this.form.id) {
             this.form.masterId = this.propertyformdata.id;
             add(this.form).then(() => {
@@ -671,12 +1244,12 @@ export default {
               this.onLoad(this.page);
               this.$message({
                 type: 'success',
-                message: '操作成功!'
+                message: '操作成功!',
               });
               let str = {
-                val: false
-              }
-              this.$emit("returnproperty", str);
+                val: false,
+              };
+              this.$emit('returnproperty', str);
             });
           } else {
             update(this.form).then(() => {
@@ -684,12 +1257,12 @@ export default {
               this.onLoad(this.page);
               this.$message({
                 type: 'success',
-                message: '操作成功!'
+                message: '操作成功!',
               });
               let str = {
-                val: false
-              }
-              this.$emit("returnproperty", str);
+                val: false,
+              };
+              this.$emit('returnproperty', str);
             });
           }
         } else {
@@ -700,54 +1273,61 @@ export default {
     },
 
     //客户列表
-    handleCustom(){
-      this.cus =true
-      this.pake =false
-      this.ord =false
-      this.inventory =false
+    handleCustom() {
+      this.cus = true;
+      this.pake = false;
+      this.ord = false;
+      this.inventory = false;
     },
     //订单列表
-    handleOrder(page){
-      let params={}
-      params.deliveryId =  this.traydata.id
+    handleOrder(page) {
+      let params = {};
+      params.deliveryId = this.traydata.id;
       getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("查看>>>>>订单>>",res.data.data);
-        const data =res.data.data
-        this.orddata = data.records
-        this.ordpage.total = data.total
+        console.log('查看>>>>>订单>>', res.data.data);
+        const data = res.data.data;
+        this.orddata = data.records;
+        this.ordpage.total = data.total;
       });
     },
     //包件列表
-    handlePackagehistory(page){
-      let params={}
-      params.id =  this.traydata.id
-      getpackListhistory(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("包件res.data.data>>>>>>>>>>>{}",res.data.data);
-        const data =res.data.data
-        this.packdata = data.records
-        this.packpage.total = data.total
-      });
-
+    handlePackagehistory(page) {
+      let params = {};
+      params.id = this.traydata.id;
+      getpackListhistory(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          console.log('包件res.data.data>>>>>>>>>>>{}', res.data.data);
+          const data = res.data.data;
+          this.packdata = data.records;
+          this.packpage.total = data.total;
+        }
+      );
     },
     //零担列表
-   handlelcl(page){
-      let params={}
-      params.id =  this.traydata.id
-      getlclListhistory(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data =res.data.data
-        this.data = data.records
-        this.page.total = data.total
-      });
+    handlelcl(page) {
+      let params = {};
+      params.id = this.traydata.id;
+      getlclListhistory(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          const data = res.data.data;
+          this.data = data.records;
+          this.page.total = data.total;
+        }
+      );
     },
     //库存列表
-    handleInventory(page){
-      let params={}
-      params.id =  this.traydata.id
-      getinventoryListhistory(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("查看>>>>>库存>>",res.data.data);
-        const data =res.data.data
-        this.inventorydata = data.records
-        this.inventorypage.total = data.total
+    handleInventory(page) {
+      let params = {};
+      params.id = this.traydata.id;
+      getinventoryListhistory(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then(res => {
+        console.log('查看>>>>>库存>>', res.data.data);
+        const data = res.data.data;
+        this.inventorydata = data.records;
+        this.inventorypage.total = data.total;
       });
     },
     handleAdd() {
@@ -763,32 +1343,34 @@ export default {
       });
     },
     handleView(row) {
-      console.log("查看>>>>>>>>>>",row);
+      console.log('查看>>>>>>>>>>', row);
       this.title = '查看';
       this.view = true;
       this.box = true;
-      this.wid= row.id
-    this.getWrapdetails(this.wpage)
+      this.wid = row.id;
+      this.getWrapdetails(this.wpage);
     },
     handleSign(row) {
-      console.log("签收>>>>>>>>>>",row);
+      console.log('签收>>>>>>>>>>', row);
       this.signtitle = '复核签收';
       // this.view = true;
-      this.signform = row
-       this.signBox = true;
-    //  this.wid= row.id
-   // this.getWrapdetails(this.wpage)
+      this.signform = row;
+      this.signBox = true;
+      //  this.wid= row.id
+      // this.getWrapdetails(this.wpage)
     },
 
-    getWrapdetails(page){
-      let params={}
-      params.reservationId = this.wid
-      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        console.log("查看>>>>>>>",res.data.data);
-        const data =res.data.data
-        this.wrapdata = data.records
-        this.wpage.total = data.total
-      });
+    getWrapdetails(page) {
+      let params = {};
+      params.reservationId = this.wid;
+      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          console.log('查看>>>>>>>', res.data.data);
+          const data = res.data.data;
+          this.wrapdata = data.records;
+          this.wpage.total = data.total;
+        }
+      );
     },
 
     handleDelete() {
@@ -799,7 +1381,7 @@ export default {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -809,7 +1391,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
         });
     },
@@ -817,7 +1399,7 @@ export default {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -826,7 +1408,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
         });
     },
@@ -836,7 +1418,7 @@ export default {
       this.view = false;
     },
     selectionChange(list) {
-      console.log("sllsls");
+      console.log('sllsls');
       this.selectionList = list;
     },
     selectionClear() {
@@ -853,41 +1435,41 @@ export default {
     },
     wcurrentChange(currentPage) {
       this.wpage.currentPage = currentPage;
-      this.getWrapdetails(this.wpage)
+      this.getWrapdetails(this.wpage);
     },
     wsizeChange(pageSize) {
       this.wpage.pageSize = pageSize;
-      this.getWrapdetails(this.wpage)
+      this.getWrapdetails(this.wpage);
     },
     pcurrentChange(currentPage) {
       this.packpage.currentPage = currentPage;
-      this.handlePackagehistory(this.packpage)
+      this.handlePackagehistory(this.packpage);
     },
     psizeChange(pageSize) {
       this.packpage.pageSize = pageSize;
-      this.handlePackagehistory(this.packpage)
+      this.handlePackagehistory(this.packpage);
     },
     ocurrentChange(currentPage) {
       this.ordpage.currentPage = currentPage;
-      this.handleordpage(this.ordpage)
+      this.handleordpage(this.ordpage);
     },
     osizeChange(pageSize) {
       this.inventorypage.pageSize = pageSize;
-      this.handleordpage(this.inventorypage)
+      this.handleordpage(this.inventorypage);
     },
     icurrentChange(currentPage) {
       this.inventorypage.currentPage = currentPage;
-      this.handleordpage(this.inventorypage)
+      this.handleordpage(this.inventorypage);
     },
     isizeChange(pageSize) {
       this.inventorypage.pageSize = pageSize;
-      this.handleordpage(this.inventorypage)
+      this.handleordpage(this.inventorypage);
     },
     onLoad() {
       //查询详情
       const data = decodeURIComponent(this.$route.query.data);
       this.traydata = JSON.parse(data);
-      console.log("data>>>>>>>>", this.traydata);
+      console.log('data>>>>>>>>', this.traydata);
       this.loading = true;
       // getDetail(id).then(res => {
       //   console.log("res.data>>>>>>>>>>>>",res.data.data);
@@ -895,11 +1477,11 @@ export default {
       //   //this.traydata = data
       //   this.data = data.reservationList
       // });
-       this.handlelcl(this.page);
-       this.handlePackagehistory(this.packpage);
-       this.handleInventory(this.inventorypage);
+      this.handlelcl(this.page);
+      this.handlePackagehistory(this.packpage);
+      this.handleInventory(this.inventorypage);
       this.loading = false;
-    }
-  }
+    },
+  },
 };
 </script>