diff --git a/src/api/basicdata/basicdataTray.js b/src/api/basicdata/basicdataTray.js
index 5a184131..fb747ddb 100644
--- a/src/api/basicdata/basicdataTray.js
+++ b/src/api/basicdata/basicdataTray.js
@@ -1,6 +1,5 @@
 import request from '@/axios';
 
-
 export const getList = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/tray/list',
@@ -11,7 +10,7 @@ export const getList = (current, size, params) => {
       ...params,
     },
   });
-}
+};
 export const getpackList = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/tray/packageList',
@@ -20,9 +19,9 @@ export const getpackList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getinventoryList = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/tray/inventoryList',
@@ -31,9 +30,9 @@ export const getinventoryList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getlclList = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/tray/lclList',
@@ -42,9 +41,9 @@ export const getlclList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getpackListhistory = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/tray/packageListhistory',
@@ -53,9 +52,9 @@ export const getpackListhistory = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getinventoryListhistory = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/tray/inventoryListhistory',
@@ -64,19 +63,19 @@ export const getinventoryListhistory = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getPrintTemplate = (ids) => {
+export const getPrintTemplate = ids => {
   return request({
     url: '/api/logpm-basicdata/tray/barCode',
     method: 'post',
-    params:{
-      ids
-    }
-  })
-}
+    params: {
+      ids,
+    },
+  });
+};
 
 export const getlclListhistory = (current, size, params) => {
   return request({
@@ -86,76 +85,84 @@ export const getlclListhistory = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-basicdata/tray/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-basicdata/tray/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const disable = (ids) => {
+    },
+  });
+};
+export const disable = ids => {
   return request({
     url: '/api/logpm-basicdata/tray/disable',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const addable = (ids) => {
+    },
+  });
+};
+export const addable = ids => {
   return request({
     url: '/api/logpm-basicdata/tray/addable',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-basicdata/tray/save',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-basicdata/tray/update',
     method: 'post',
-    data: row
-  })
-}
-export const vacant = (row) => {
+    data: row,
+  });
+};
+export const vacant = row => {
   return request({
     url: '/api/logpm-basicdata/tray/vacant',
     method: 'post',
-    data: row
-  })
-}
-export const vacants = (row) => {
+    data: row,
+  });
+};
+export const vacants = row => {
   return request({
     url: '/api/logpm-basicdata/tray/vacants',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
+/**
+ * 获取仓库信息
+ */
+export const getWarehouseListqx = () => {
+  return request({
+    url: '/api/logpm-basicdata/warehouse/warehouseListqx',
+    method: 'get',
+  });
+};
diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue
index 7c4e0b96..26b40ac7 100644
--- a/src/components/pric/tablePric.vue
+++ b/src/components/pric/tablePric.vue
@@ -1,5 +1,10 @@
 <template>
-  <el-table :data="SurchargeData" border style="width: 100%" class="el_row_table">
+  <el-table
+    :data="SurchargeData"
+    border
+    :style="{ width: '100%', maxHeight: height + 'px' }"
+    class="el_row_table"
+  >
     <template v-for="column in Surcharge" :key="column.prop">
       <el-table-column
         v-if="column.disabled"
@@ -89,6 +94,9 @@ function selectChange(data) {
   emit('change', data);
 }
 const props = defineProps({
+  height: {
+    type: Number,
+  },
   SurchargeData: {
     type: Array,
     required: true,
@@ -102,6 +110,11 @@ const props = defineProps({
     default: () => [],
   },
 });
+console.log(props.height,'props');
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.el_row_table {
+  overflow: scroll;
+}
+</style>
diff --git a/src/option/basicdata/basicdataTray1.js b/src/option/basicdata/basicdataTray1.js
new file mode 100644
index 00000000..011b9eac
--- /dev/null
+++ b/src/option/basicdata/basicdataTray1.js
@@ -0,0 +1,115 @@
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'palletName',
+    label: '托盘名称',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'trayTypeName',
+    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: 'typeName',
+    label: '托盘类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'trayStatusName',
+    label: '托盘状态',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'palletCode',
+    label: '托盘码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'oldQrCode',
+    label: '旧托盘码',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'disableTypeName',
+    label: '禁用状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    head: false,
+  },
+];
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index 9ccebb73..fbc2aaab 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -1,560 +1,857 @@
 <template>
-  <basic-container v-loading="loadingObj.pageLoading">
-    <avue-crud
-      :option="option"
-      v-model:search="search"
-      v-model:page="page"
-      v-model="form"
-      :table-loading="loading"
-      :data="data"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      ref="crud"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left>
-        <!--        <el-button type="danger"-->
-        <!--                   icon="el-icon-delete"-->
-        <!--                   plain-->
-        <!--                   v-if="permission.BasicdataTray_delete"-->
-        <!--                   @click="handleDelete">删 除-->
-        <!--        </el-button>-->
-        <!--        <el-button type="warning"-->
-        <!--                   plain-->
-        <!--                   icon="el-icon-download"-->
-        <!--                   @click="handleExport">导 出-->
-        <!--        </el-button>-->
-        <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
-          >查看二维码
-        </el-button>
-        <el-button type="warning" plain icon="el-icon-edit" @click="lossess">报 损 </el-button>
-        <el-button type="warning" plain icon="el-icon-circle-close" @click="disable"
-          >禁 用
-        </el-button>
-        <el-button type="warning" plain icon="el-icon-check" @click="addable">启 用 </el-button>
-        <el-button type="warning" plain icon="el-icon-refresh" @click="vacants"
-          >一 键 空 置
-        </el-button>
-      </template>
-      <template #menu="{ size, row, index }">
-        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>-->
-        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>-->
-        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>-->
-        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>-->
-        <el-button
-          type="primary"
-          text
-          icon="el-icon-view"
-          v-if="row.trayStatus !== '3'"
-          @click="Details(row)"
-          >在 托 详 情</el-button
-        >
-        <el-button type="primary" text icon="el-icon-view" @click="historys(row)"
-          >历 史 记 录</el-button
-        >
-      </template>
-    </avue-crud>
-    <el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
-      <div class="print_QRCode">
-        <div v-html="html"></div>
-      </div>
-      <div class="dialog-footer mt10">
-        <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search">
+          <!-- <el-form-item label="打托方式">
+            <el-select class="w100" v-model="query.abnormalStatus" clearable placeholder="打托方式">
+              <el-option label="待处理" :value="0" />
+              <el-option label="完结" :value="1" />
+            </el-select>
+          </el-form-item> -->
+
+          <el-form-item label="仓库" class="el-times">
+            <el-select
+              class="w100"
+              v-model="query.warehouseId"
+              filterable
+              clearable
+              placeholder="仓库"
+            >
+              <el-option
+                v-for="item in details.warehouseOption"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="托盘类型" class="el-times">
+            <el-select
+              class="w100"
+              v-model="query.type"
+              filterable
+              clearable
+              placeholder="托盘类型"
+            >
+              <el-option
+                v-for="item in details.typeOption"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="托盘状态" class="el-times">
+            <el-select
+              class="w100"
+              v-model="query.trayStatus"
+              filterable
+              clearable
+              placeholder="托盘状态"
+            >
+              <el-option
+                v-for="item in details.trayStatusOption"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="托盘名称" class="el-times">
+            <el-input v-model="query.palletName" clearable placeholder="请输入仓库名称"></el-input>
+          </el-form-item>
+
+          <el-form-item label="托盘码" class="el-times">
+            <el-input v-model="query.palletCode" clearable placeholder="请输入仓库名称"></el-input>
+          </el-form-item>
+
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+          </el-form-item>
+        </el-form>
       </div>
-    </el-dialog>
-    <el-dialog :title="'确认破损'" v-model="damagedBox" width="45%" append-to-body>
-      <avue-form :option="damagedoption" v-model="damagedform" :data="damageddata" ref="signform">
-      </avue-form>
-      <div style="bottom: 7%; margin-left: 500px; width: 50%">
-        <div style="width: 100%">
-          <el-button type="primary" @click="submitForm" style="margin-right: 20%">确定</el-button>
-          <el-button type="primary" @click="cancellation">取消</el-button>
+
+      <!-- 控件模块 -->
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <!-- 新增 -->
+          <el-button type="primary" icon="Plus" @click="handleShowAdd">新 增</el-button>
+
+          <!-- 查看二维码 -->
+          <el-button type="primary" icon="Printer" @click="handleShowHtml">查看二维码</el-button>
+
+          <!-- 报损 -->
+          <el-button type="primary" icon="Edit" @click="handleBreakage">报 损</el-button>
+
+          <!-- 禁用 -->
+          <!-- <el-button type="primary" icon="CircleClose" @click="handleDisabled">禁 用</el-button> -->
+
+          <!-- 启用 -->
+          <!-- <el-button type="primary" icon="CircleCheck" @click="handleStartUsing">启 用</el-button> -->
+
+          <!-- 一键空置 -->
+          <el-button type="primary" icon="Refresh" @click="handleBatchVacancy">一键空置</el-button>
+        </div>
+
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
         </div>
       </div>
-    </el-dialog>
+
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text
+              v-if="slotProps.scope.row.trayStatus !== '3'"
+              @click="handleDetails(slotProps.scope)"
+            >
+              在托详情
+            </el-text>
+            <el-text @click="handleHistory(slotProps.scope)"> 历史记录 </el-text>
+          </template>
+        </template>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.pageNum"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
   </basic-container>
+
+  <el-dialog title="新 增" v-model="details.popUpShow.addVisted" width="40%" append-to-body>
+    <el-form :model="details.form" label-width="120px" class="addForm">
+      <el-form-item
+        label="仓库"
+        :rules="[{ required: true, message: '请选择仓库', trigger: ['change', 'blur'] }]"
+      >
+        <el-select
+          class="w100"
+          v-model="details.form.warehouseId"
+          filterable
+          clearable
+          placeholder="仓库"
+        >
+          <el-option
+            v-for="item in details.warehouseOption"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="托盘类型"
+        :rules="[{ required: true, message: '请选择托盘类型', trigger: ['change', 'blur'] }]"
+      >
+        <el-select
+          class="w100"
+          v-model="details.form.type"
+          filterable
+          clearable
+          placeholder="托盘类型"
+        >
+          <el-option
+            v-for="item in details.typeOption"
+            :key="item.dictKey"
+            :label="item.dictValue"
+            :value="item.dictKey"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        prop="number"
+        label="数量"
+        :rules="[{ required: true, message: '请输入数量', trigger: ['change', 'blur'] }]"
+      >
+        <el-input-number
+          class="w100"
+          v-model="details.form.number"
+          :min="0"
+          :precision="0"
+          :value-on-clear="0"
+          :controls="false"
+        />
+      </el-form-item>
+    </el-form>
+
+    <div class="mt20 flex-c-sb">
+      <div></div>
+      <div class="flex">
+        <el-button icon="Position" type="primary" @click="handleSubmitAdd">确定</el-button>
+        <el-button icon="CircleClose" @click="details.popUpShow.addVisted = false">取消</el-button>
+      </div>
+    </div>
+  </el-dialog>
+
+  <el-dialog title="报 损" v-model="details.popUpShow.BreakageVisited" width="40%" append-to-body>
+    <el-form :model="details.form" label-width="120px" class="addForm">
+      <el-form-item label="破损图片">
+        <el-upload
+          v-model:file-list="details.imgList"
+          list-type="picture-card"
+          action="/api/blade-resource/oss/endpoint/put-file"
+          :before-upload="beforeAvatarUpload"
+          :headers="headers"
+          multiple
+          drag
+        >
+          <el-icon><Plus /></el-icon>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item label="备注">
+        <el-input type="textarea" v-model="details.form.remark" />
+      </el-form-item>
+    </el-form>
+
+    <div class="mt20 flex-c-sb">
+      <div></div>
+      <div class="flex">
+        <el-button icon="Position" type="primary" @click="handleBreakageSubmit">确定</el-button>
+        <el-button icon="CircleClose" @click="details.popUpShow.BreakageVisited = false"
+          >取消</el-button
+        >
+      </div>
+    </div>
+  </el-dialog>
+
+  <!-- 打印 -->
+  <MyPrint
+    :html="details.html"
+    v-model="details.popUpShow.QrCodeVisited"
+    width="780px"
+    :isShowExport="false"
+  />
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    v-model="details.columnList"
+    :columnList="details.columnList"
+  ></edittablehead>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+import { mapGetters } from 'vuex';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import {
+  downloadXls,
+  setNodeHeight,
+  getHtmls,
+  deepClone,
+  handleClearTableQuery,
+  getObjType,
+  handleSelectQuery,
+  handleInputQuery,
+  handleTranslationDataSeclect,
+} from '@/utils/util';
+import { columnList } from '@/option/basicdata/basicdataTray1';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { getToken } from '@/utils/auth';
 import {
   getList,
-  getDetail,
   add,
   update,
-  remove,
-  vacant,
   getPrintTemplate,
   disable,
   addable,
   vacants,
+  getWarehouseListqx,
 } from '@/api/basicdata/basicdataTray';
-import option from '@/option/basicdata/basicdataTray';
-import { mapGetters } from 'vuex';
-import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';
-import { downloadXls } from '@/utils/util';
-import { dateNow } from '@/utils/date';
-import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
-import { getLodop } from '@/utils/LodopFuncs';
-import print from '@/utils/print';
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      //破损是否显示
-      damagedBox: false,
-      search: {},
-      loading: true,
-      page: {
-        pageSize: 30,
-        currentPage: 1,
-        total: 0,
-      },
-      // 破损表单数据
-      damagedform: {},
-      // 破损列表
-      damageddata: [],
-      // 表单配置
-      damagedoption: {
-        height: 'auto',
-        width: '40px',
-        calcHeight: 30,
-        tip: false,
-        searchShow: false,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: true,
-        dialogClickModal: false,
-
-        emptyBtn: false, //隐藏清空按钮
-        submitBtn: false, //隐藏提交按钮
-        column: [
-          {
-            label: '破损图片',
-            prop: 'damagedPhotos',
-            labelWidth: '150',
-            type: 'upload',
-            listType: 'picture-card',
-            width: '150px',
-            span: 15,
-            multiple: true,
-            align: 'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            limit: 5,
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-            disabled: false,
-          },
-
-          {
-            label: '备注',
-            prop: 'damagedNote',
-            labelWidth: '150',
-            span: 15,
-            type: 'input',
-            width: '150px',
-            align: 'center',
-          },
-        ],
+
+// 获取路由实例
+const $router = useRouter();
+
+const headers = computed(() => {
+  return { 'Blade-Auth': 'Bearer ' + getToken() };
+});
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
       },
-      damagedId: null,
-      selectionList: [],
-      option: option,
-      data: [],
-      html: null, // 页面包条码内容
-      dialogVisible: false,
-      loadingObj: {
-        pageLoading: false,
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
       },
-    };
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    permissionList() {
-      return {
-        addBtn: this.validData(this.permission.BasicdataTray_add, false),
-        viewBtn: this.validData(this.permission.BasicdataTray_view, false),
-        delBtn: this.validData(this.permission.BasicdataTray_delete, false),
-        editBtn: this.validData(this.permission.BasicdataTray_edit, false),
-      };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
     },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList: deepClone(columnList),
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+    /** 页面loading */
+    pageLoading: false,
   },
-  methods: {
-    //取消
-    cancellation() {
-      this.damagedBox = false;
-    },
-    historys(row) {
-      this.$router.push({
-        path: '/basicdata/warehouse/tray/basicdataTrayhistory',
-        query: {
-          data: encodeURIComponent(JSON.stringify(row)),
-          name: row.palletCode + '-查看历史记录',
-        },
-      });
-    },
-    submitForm() {
-      let row = {};
-      row.id = this.damagedform.id;
-      row.trayStatus = 3;
-      row.damagedPhotos = this.damagedform.damagedPhotos.join(',');
-      row.damagedNote = this.damagedform.damagedNote;
-      console.log('更新参数>>>>>>>>', row);
-      update(row).then(
-        () => {
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.damagedBox = false;
-          this.onLoad(this.page, this.query);
-        },
-        error => {
-          loading();
-          console.log(error);
-        }
-      );
-    },
-    losses(row) {
-      this.damagedform = row;
-      this.damagedBox = true;
-    },
-    lossess() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择一条数据');
-        return;
-      }
-      if (this.selectionList.length > 1) {
-        this.$message.warning('只能选一条数据');
-        return;
-      }
-      console.log('this.selectionList>>>>>>', this.selectionList);
-      this.damagedform.id = this.selectionList[0].id;
-      this.damagedBox = true;
-    },
-    vacant(row) {
-      this.$confirm('确认空置？')
-        .then(_ => {
-          console.log('row>>>>>>>>>>>>>>>>空置', row);
-          vacant(row).then(
-            () => {
-              this.onLoad(this.page);
-              this.$message({
-                type: 'success',
-                message: '操作成功!',
-              });
-            },
-            error => {
-              loading();
-              console.log(error);
-            }
-          );
-        })
-        .catch(_ => {});
-    },
-    vacants() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据空置?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          console.log('this.selectionList>>>>>>>>>>>>>>>>>>', this.selectionList);
-          const newList = this.selectionList.map(item => item.palletCode);
-          return vacants(newList);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    disable() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据禁用?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return disable(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    addable() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据启用?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return addable(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    //批量打印数据处理代码
-    printTemplate() {
-      const printNode = document.querySelectorAll('.print_QRCode>div>div');
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 图片预览 */
+    abnormalVisited: false,
+    /** 二维码 */
+    QrCodeVisited: false,
+    /** 新增 */
+    addVisted: false,
+    /** 破损 */
+    BreakageVisited: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  imgList: [],
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+  /** 打印html */
+  html: '',
+  /** 仓库 */
+  warehouseOption: [],
+  /** 托盘类型 */
+  typeOption: [],
+  /** 托盘状态 */
+  trayStatusOption: [],
+});
 
-      console.log('printNode :>> ', printNode);
-      print(printNode, 'titlePrint');
-    },
-    async handleqr() {
-      try {
-        this.loadingObj.pageLoading = true;
-
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-
-        let checkcode = [];
-        this.selectionList.map(item => {
-          checkcode.push(item.id);
-        });
-
-        let qr = checkcode.join(',');
-        console.log(qr);
-        this.html = '';
-        const res = await getPrintTemplate(qr);
-        console.log(res.data);
-        const { code, data } = res.data;
-        if (code !== 200) return;
-        this.html = this.getHtmls(data.dataList, data.templateHtml);
-        this.dialogVisible = true;
-      } catch (error) {
-        console.log('error :>> ', error);
-      } finally {
-        this.loadingObj.pageLoading = false;
-      }
-    },
-    Details(row) {
-      this.$router.push({
-        path: '/basicdata/warehouse/tray/basicdataTrayedt',
-        query: {
-          data: encodeURIComponent(JSON.stringify(row)),
-          name: row.palletCode + '-查看在托情况',
-        },
-      });
-    },
-    rowSave(row, done, loading) {
-      console.log('this.form>>>>>>>>>>>>', this.form);
-      // this.form.trayStatus("1");
-      add(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          window.console.log(error);
-        }
-      );
-    },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          done();
-        },
-        error => {
-          loading();
-          console.log(error);
-        }
-      );
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    handleExport() {
-      let downloadUrl = `/api/logpm-basicdata/material/export-BasicdataTray?${
-        this.website.tokenHeader
-      }=${getToken()}`;
-      const {} = this.query;
-      let values = {};
-      this.$confirm('是否导出数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        NProgress.start();
-        exportBlob(downloadUrl, values).then(res => {
-          downloadXls(res.data, `托盘${dateNow()}.xlsx`);
-          NProgress.done();
-        });
-      });
-    },
-    beforeOpen(done, type) {
-      if (['edit', 'view'].includes(type)) {
-        getDetail(this.form.id).then(res => {
-          this.form = res.data.data;
-        });
-      }
-      done();
-    },
-    searchReset() {
-      this.query = {};
-      console.log('123123123');
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      console.log(this.query, 'query');
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  popUpShow,
+} = toRefs(details);
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+
+onMounted(() => {
+  const timer = setTimeout(() => {
+    details.listNode = document.querySelector('.maboxhi');
+    details.listNode.style.transition = 'all .5s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = async (page?: any, params = {}) => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    if (page) _page = page;
+    // 获取暂存单列表
+
+    const submitData = { ..._page, ...details.query, ...params };
+
+    const res = await getList(_page.pageNum, _page.pageSize, submitData);
+    console.log('res :>> ', res);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = data.records;
+
+    handleTranslationDataSeclect(details.data, details.columnList);
+
+    details.page.total = data.total;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+// onLoad();
+
+const assignmentSelect = (data, type) => {
+  for (let i = 0; i < details.columnList.length; i++) {
+    const item = details.columnList[i];
+
+    if (item.prop !== type) continue;
+    item.checkarr =
+      getObjType(data) === 'array'
+        ? data.map(val => {
+            return {
+              label: val.dictValue,
+              value: val.dictKey,
+            };
+          })
+        : [];
+    break;
+  }
+};
+
+const init = () => {
+  // 打托方式
+  const palletOrderTypePromise = getDictionaryBiz('pallet_order_type').then(res => {
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    assignmentSelect(data, 'trayTypeName');
+  });
+  // 托盘类型
+  const trayTypePromise = getDictionaryBiz('tray_type').then(res => {
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    assignmentSelect(data, 'typeName');
+    details.typeOption = getObjType(data) === 'array' ? data : [];
+  });
+  // 托盘状态
+  const trayStatusPromise = getDictionaryBiz('tray_status').then(res => {
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    assignmentSelect(data, 'trayStatusName');
+    details.trayStatusOption = getObjType(data) === 'array' ? data : [];
+  });
+
+  // 获取仓库列表
+  getWarehouseListqx().then(res => {
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.warehouseOption = getObjType(data) === 'array' ? data : [];
+  });
+
+  const _arr = [palletOrderTypePromise, trayTypePromise, trayStatusPromise];
+  Promise.all(_arr).then(() => {
+    console.log('details.columnList :>> ', details.columnList);
+    onLoad();
+  });
+};
+
+init();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad(details.page);
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.stockupDate = [];
+  details.page.pageNum = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad(details.page);
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(details.listNode, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  handleInputQuery(index, row, details.query);
+  onLoad(details.page);
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  handleSelectQuery(index, row, details.query);
+  onLoad(details.page);
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  onLoad(details.page);
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.pageNum = current;
+  onLoad();
+};
+
+/** 弹出层开启前清除数据 */
+const beforeClose = done => {
+  done();
+  details.form = {};
+  details.selectionList = [];
+  details.view = false;
+};
+
+/** 新增 */
+const handleShowAdd = () => {
+  // 初始化赋值表单
+  details.form = {
+    // 仓库Id
+    warehouseId: '',
+    // 托盘类型
+    type: '',
+    // 数量
+    number: 0,
+    // 托盘状态 -- 默认空闲
+    typeStatus: '1',
+  };
+
+  details.popUpShow.addVisted = true;
+};
+
+/** 新增提交 */
+const handleSubmitAdd = async () => {
+  try {
+    details.popUpShow.addVisted = false;
+
+    details.loadingObj.pageLoading = true;
+    const res = await add(details.form);
+    console.log(res.data);
+    const { code, msg } = res.data;
+    if (code !== 200) return;
+    msg && ElMessage.success(msg);
+    onLoad();
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+/** 查看二维码 */
+const handleShowHtml = async () => {
+  try {
+    details.loadingObj.pageLoading = true;
+
+    if (details.selectionList.length === 0) {
+      ElMessage.warning('请选择至少一条数据');
+      return;
+    }
+
+    let checkcode = details.selectionList.map(item => {
+      checkcode.push(item.id);
+    });
+
+    let qr = checkcode.join(',');
+    console.log(qr);
+    details.html = '';
+    const res = await getPrintTemplate(qr);
+    console.log(res.data);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.html = getHtmls(data.dataList, data.templateHtml);
+    details.popUpShow.QrCodeVisited = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+/** 报损 */
+const handleBreakage = () => {
+  if (details.selectionList.length === 0) return ElMessage.warning('请选择一条数据进行报损');
+  if (details.selectionList.length > 1) return ElMessage.warning('只能选一条数据操作');
+
+  details.form = { remark: '' };
+  details.popUpShow.BreakageVisited = true;
+};
+
+/** 报损提交 */
+const handleBreakageSubmit = async () => {
+  try {
+    const submitData = {
+      damagedNote: details.form.remark,
+      damagedPhotos: '',
+      id: details.selectionList[0].id,
+      trayStatus: 3,
+    };
+
+    const imgArr = [];
+    console.log('details.imgList :>> ', details.imgList);
+    for (let i = 0; i < details.imgList.length; i++) {
+      const item = details.imgList[i];
+
+      if (!item.response) return ElMessage.warning('图片上传未完成，请移除或等待');
+
+      const { code, data } = item.response;
+
+      if (code !== 200 || getObjType(data) !== 'object')
+        return ElMessage.warning('存在上传失败图片，请移除');
+      imgArr.push(data.link);
+    }
+
+    submitData.damagedPhotos = imgArr.join(',');
+
+    details.popUpShow.BreakageVisited = false;
+
+    details.loadingObj.pageLoading = true;
+    const res = await update(submitData);
+    console.log(res.data);
+    const { code, msg } = res.data;
+    if (code !== 200) return;
+
+    msg && ElMessage.success(msg);
+    onLoad();
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+// 上传图片规则
+const beforeAvatarUpload = rawFile => {
+  const nameArr = rawFile.name.split('.');
+  if (['png', 'jpg', 'jpeg'].includes(nameArr[nameArr.length - 1])) return true;
+  ElMessage.warning('请上传 png / jpg / jpeg 的图片');
+  return false;
+};
+
+/** 禁用 */
+const handleDisabled = () => {
+  if (details.selectionList.length === 0) {
+    ElMessage.warning('请选择至少一条数据');
+    return;
+  }
+  ElMessageBox.confirm('确定将选择数据禁用?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const res = await disable(details.selectionList.map(val => val.id).join(','));
+      console.log(res.data);
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      msg && ElMessage.success(msg);
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+/** 启用 */
+const handleStartUsing = () => {
+  if (details.selectionList.length === 0) {
+    ElMessage.warning('请选择至少一条数据');
+    return;
+  }
+  ElMessageBox.confirm('确定将选择数据启用?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const res = await addable(details.selectionList.map(val => val.id).join(','));
+      console.log(res.data);
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      msg && ElMessage.success(msg);
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+/** 批量空置 */
+const handleBatchVacancy = () => {
+  if (details.selectionList.length === 0) {
+    ElMessage.warning('请选择至少一条数据');
+    return;
+  }
+  ElMessageBox.confirm('确定将选择数据空置?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+      const res = await vacants(details.selectionList.map(val => val.palletCode));
+      console.log(res.data);
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      msg && ElMessage.success(msg);
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+/** 查看详情 */
+const handleDetails = ({ row }) => {
+  $router.push({
+    path: '/basicdata/warehouse/tray/basicdataTrayedt',
+    query: {
+      data: encodeURIComponent(JSON.stringify(row)),
+      name: row.palletCode + '-查看在托情况',
     },
-    onLoad(page, params = {}) {
-      this.loading = true;
-
-      const { warehouseId, trayStatus, type, palletCode, palletName } = this.query;
-
-      let values = {
-        warehouseId: warehouseId,
-        trayStatus: trayStatus,
-        type: type,
-        palletCode: palletCode,
-        palletName: palletName,
-      };
-
-      getList(page.currentPage, page.pageSize, values).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
+  });
+};
+
+/** 查看历史 */
+const handleHistory = ({ row }) => {
+  $router.push({
+    path: '/basicdata/warehouse/tray/basicdataTrayhistory',
+    query: {
+      data: encodeURIComponent(JSON.stringify(row)),
+      name: row.palletCode + '-查看历史记录',
     },
-  },
+  });
 };
 </script>
 
 <style scoped lang="scss">
-:deep(.avue-form__row) {
-  margin-left: 10px;
-  max-width: 300px !important;
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
 }
-:deep(.no-print) {
-  margin-left: auto;
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
 }
-:deep(.el-form-item__label) {
-  width: auto !important;
+
+.mt20 {
+  margin-top: 20px;
 }
-:deep(.avue-form__row) {
-  margin-left: 0;
+
+.fwb {
+  font-weight: bold;
 }
-:deep(.no-print) {
-  .el-button {
-    margin-right: 0;
+
+:deep(.el-tag) {
+  border: none;
+
+  &.blue {
+    background: var(--el-color-primary);
   }
 }
+
+.border_top {
+  border-top: 1px solid #ccc;
+}
+
+.w100 {
+  width: 100% !important;
+}
+
+:deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+
+.addForm .el-form-item {
+  margin-right: 0;
+}
 </style>
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray2.vue b/src/views/basicdata/warehouse/tray/basicdataTray2.vue
new file mode 100644
index 00000000..9ccebb73
--- /dev/null
+++ b/src/views/basicdata/warehouse/tray/basicdataTray2.vue
@@ -0,0 +1,560 @@
+<template>
+  <basic-container v-loading="loadingObj.pageLoading">
+    <avue-crud
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <!--        <el-button type="danger"-->
+        <!--                   icon="el-icon-delete"-->
+        <!--                   plain-->
+        <!--                   v-if="permission.BasicdataTray_delete"-->
+        <!--                   @click="handleDelete">删 除-->
+        <!--        </el-button>-->
+        <!--        <el-button type="warning"-->
+        <!--                   plain-->
+        <!--                   icon="el-icon-download"-->
+        <!--                   @click="handleExport">导 出-->
+        <!--        </el-button>-->
+        <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
+          >查看二维码
+        </el-button>
+        <el-button type="warning" plain icon="el-icon-edit" @click="lossess">报 损 </el-button>
+        <el-button type="warning" plain icon="el-icon-circle-close" @click="disable"
+          >禁 用
+        </el-button>
+        <el-button type="warning" plain icon="el-icon-check" @click="addable">启 用 </el-button>
+        <el-button type="warning" plain icon="el-icon-refresh" @click="vacants"
+          >一 键 空 置
+        </el-button>
+      </template>
+      <template #menu="{ size, row, index }">
+        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>-->
+        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>-->
+        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>-->
+        <!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>-->
+        <el-button
+          type="primary"
+          text
+          icon="el-icon-view"
+          v-if="row.trayStatus !== '3'"
+          @click="Details(row)"
+          >在 托 详 情</el-button
+        >
+        <el-button type="primary" text icon="el-icon-view" @click="historys(row)"
+          >历 史 记 录</el-button
+        >
+      </template>
+    </avue-crud>
+    <el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
+      <div class="print_QRCode">
+        <div v-html="html"></div>
+      </div>
+      <div class="dialog-footer mt10">
+        <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" icon="Printer" @click="printTemplate">打 印</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :title="'确认破损'" v-model="damagedBox" width="45%" append-to-body>
+      <avue-form :option="damagedoption" v-model="damagedform" :data="damageddata" ref="signform">
+      </avue-form>
+      <div style="bottom: 7%; margin-left: 500px; width: 50%">
+        <div style="width: 100%">
+          <el-button type="primary" @click="submitForm" style="margin-right: 20%">确定</el-button>
+          <el-button type="primary" @click="cancellation">取消</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  vacant,
+  getPrintTemplate,
+  disable,
+  addable,
+  vacants,
+} from '@/api/basicdata/basicdataTray';
+import option from '@/option/basicdata/basicdataTray';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import { getLodop } from '@/utils/LodopFuncs';
+import print from '@/utils/print';
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      //破损是否显示
+      damagedBox: false,
+      search: {},
+      loading: true,
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      // 破损表单数据
+      damagedform: {},
+      // 破损列表
+      damageddata: [],
+      // 表单配置
+      damagedoption: {
+        height: 'auto',
+        width: '40px',
+        calcHeight: 30,
+        tip: false,
+        searchShow: false,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        dialogClickModal: false,
+
+        emptyBtn: false, //隐藏清空按钮
+        submitBtn: false, //隐藏提交按钮
+        column: [
+          {
+            label: '破损图片',
+            prop: 'damagedPhotos',
+            labelWidth: '150',
+            type: 'upload',
+            listType: 'picture-card',
+            width: '150px',
+            span: 15,
+            multiple: true,
+            align: 'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            limit: 5,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+            disabled: false,
+          },
+
+          {
+            label: '备注',
+            prop: 'damagedNote',
+            labelWidth: '150',
+            span: 15,
+            type: 'input',
+            width: '150px',
+            align: 'center',
+          },
+        ],
+      },
+      damagedId: null,
+      selectionList: [],
+      option: option,
+      data: [],
+      html: null, // 页面包条码内容
+      dialogVisible: false,
+      loadingObj: {
+        pageLoading: false,
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.BasicdataTray_add, false),
+        viewBtn: this.validData(this.permission.BasicdataTray_view, false),
+        delBtn: this.validData(this.permission.BasicdataTray_delete, false),
+        editBtn: this.validData(this.permission.BasicdataTray_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    //取消
+    cancellation() {
+      this.damagedBox = false;
+    },
+    historys(row) {
+      this.$router.push({
+        path: '/basicdata/warehouse/tray/basicdataTrayhistory',
+        query: {
+          data: encodeURIComponent(JSON.stringify(row)),
+          name: row.palletCode + '-查看历史记录',
+        },
+      });
+    },
+    submitForm() {
+      let row = {};
+      row.id = this.damagedform.id;
+      row.trayStatus = 3;
+      row.damagedPhotos = this.damagedform.damagedPhotos.join(',');
+      row.damagedNote = this.damagedform.damagedNote;
+      console.log('更新参数>>>>>>>>', row);
+      update(row).then(
+        () => {
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.damagedBox = false;
+          this.onLoad(this.page, this.query);
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    losses(row) {
+      this.damagedform = row;
+      this.damagedBox = true;
+    },
+    lossess() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择一条数据');
+        return;
+      }
+      if (this.selectionList.length > 1) {
+        this.$message.warning('只能选一条数据');
+        return;
+      }
+      console.log('this.selectionList>>>>>>', this.selectionList);
+      this.damagedform.id = this.selectionList[0].id;
+      this.damagedBox = true;
+    },
+    vacant(row) {
+      this.$confirm('确认空置？')
+        .then(_ => {
+          console.log('row>>>>>>>>>>>>>>>>空置', row);
+          vacant(row).then(
+            () => {
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!',
+              });
+            },
+            error => {
+              loading();
+              console.log(error);
+            }
+          );
+        })
+        .catch(_ => {});
+    },
+    vacants() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据空置?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          console.log('this.selectionList>>>>>>>>>>>>>>>>>>', this.selectionList);
+          const newList = this.selectionList.map(item => item.palletCode);
+          return vacants(newList);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    disable() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据禁用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return disable(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    addable() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据启用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return addable(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    //批量打印数据处理代码
+    printTemplate() {
+      const printNode = document.querySelectorAll('.print_QRCode>div>div');
+
+      console.log('printNode :>> ', printNode);
+      print(printNode, 'titlePrint');
+    },
+    async handleqr() {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+
+        let checkcode = [];
+        this.selectionList.map(item => {
+          checkcode.push(item.id);
+        });
+
+        let qr = checkcode.join(',');
+        console.log(qr);
+        this.html = '';
+        const res = await getPrintTemplate(qr);
+        console.log(res.data);
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        this.html = this.getHtmls(data.dataList, data.templateHtml);
+        this.dialogVisible = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+    },
+    Details(row) {
+      this.$router.push({
+        path: '/basicdata/warehouse/tray/basicdataTrayedt',
+        query: {
+          data: encodeURIComponent(JSON.stringify(row)),
+          name: row.palletCode + '-查看在托情况',
+        },
+      });
+    },
+    rowSave(row, done, loading) {
+      console.log('this.form>>>>>>>>>>>>', this.form);
+      // this.form.trayStatus("1");
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleExport() {
+      let downloadUrl = `/api/logpm-basicdata/material/export-BasicdataTray?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {} = this.query;
+      let values = {};
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `托盘${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      console.log('123123123');
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      console.log(this.query, 'query');
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+
+      const { warehouseId, trayStatus, type, palletCode, palletName } = this.query;
+
+      let values = {
+        warehouseId: warehouseId,
+        trayStatus: trayStatus,
+        type: type,
+        palletCode: palletCode,
+        palletName: palletName,
+      };
+
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+:deep(.avue-form__row) {
+  margin-left: 10px;
+  max-width: 300px !important;
+}
+:deep(.no-print) {
+  margin-left: auto;
+}
+:deep(.el-form-item__label) {
+  width: auto !important;
+}
+:deep(.avue-form__row) {
+  margin-left: 0;
+}
+:deep(.no-print) {
+  .el-button {
+    margin-right: 0;
+  }
+}
+</style>
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 5c889a6c..7ef036ce 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -168,6 +168,7 @@
           :Surcharge="Categorybyitembilling"
           @focus="handleRowFocus"
           @search="search"
+          :height="150"
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'"> </template>
@@ -178,10 +179,11 @@
       <div class="el_category">
         <span class="title">品类按方计费</span>
         <SurchargeTable
-          :SurchargeData="form.Categorybyitembilling"
-          :Surcharge="Categorybyitembilling"
+          :SurchargeData="form.Categorybasedbillingbyparty"
+          :Surcharge="Categorybasedbillingbyparty"
           @focus="handleRowFocus"
           @search="search"
+          :height="150"
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'"> </template>
@@ -190,12 +192,13 @@
       </div>
 
       <div class="el_category">
-        <span class="title">品类按方计费</span>
+        <span class="title">品类按重量计费</span>
         <SurchargeTable
-          :SurchargeData="form.Categorybyitembilling"
-          :Surcharge="Categorybyitembilling"
+          :SurchargeData="form.Categorychargesbyweight"
+          :Surcharge="Categorychargesbyweight"
           @focus="handleRowFocus"
           @search="search"
+          :height="150"
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'"> </template>
@@ -204,12 +207,13 @@
       </div>
 
       <div class="el_category">
-        <span class="title">品类按方计费</span>
+        <span class="title">品类按吨计费</span>
         <SurchargeTable
-          :SurchargeData="form.Categorybyitembilling"
-          :Surcharge="Categorybyitembilling"
+          :SurchargeData="form.Categorybilledbyton"
+          :Surcharge="Categorybilledbyton"
           @focus="handleRowFocus"
           @search="search"
+          :height="150"
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'"> </template>
@@ -275,11 +279,68 @@
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
-            <el-text class="el_text_del">删除</el-text>
+            <div class="el_btn_txt">
+              <el-text class="el_text_del" @click="Oversizedbillingdel(slotProps)">删除</el-text>
+              <el-text class="el_text_add" @click="Oversizedbillingadd">新增</el-text>
+            </div>
           </template>
         </template>
       </SurchargeTable>
     </div>
+
+    <div class="el_Super">
+      <div class="el_Super_box">
+        <span class="title">统一超区公里数(km)</span>
+        <el-input-number
+          v-model="form.numc"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
+      </div>
+      <div class="el_Super_box">
+        <span class="title">统一超区后单价(元/km)</span>
+        <el-input-number
+          v-model="form.numc"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
+      </div>
+      <div class="el_Super_box">
+        <span class="title">点位补贴单价(元/点)</span>
+        <el-input-number
+          v-model="form.numc"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
+      </div>
+      <div class="el_Super_box">
+        <span class="title">保底费(元)</span>
+        <el-input-number
+          v-model="form.numc"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
+      </div>
+      <div class="el_Super_box">
+        <span class="title">油费(元/km)</span>
+        <el-input-number
+          v-model="form.numc"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
+      </div>
+    </div>
+
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="form.dialogVisible = false">取消</el-button>
@@ -319,6 +380,107 @@ const form = ref({
       options: [],
       loading: false,
     },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+  ],
+  //品类按方计费
+  Categorybasedbillingbyparty: [
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+  ],
+
+  // 品类按重量计费
+  Categorychargesbyweight: [
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
+  ],
+  // 品类按吨计费
+  Categorybilledbyton: [
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      UnitPrice: '', //单价(元/件)
+      options: [],
+      loading: false,
+    },
   ],
   asurcharge: [
     {
@@ -402,7 +564,60 @@ const Categorybyitembilling = ref([
     disabled: true,
   },
 ]);
-
+// 品类按方计费
+const Categorybasedbillingbyparty = ref([
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '成本结算品类',
+    prop: 'Warehousecategory',
+    type: 'select',
+    width: 'auto',
+    disabled: true,
+  },
+  {
+    label: '单价(元/件)',
+    prop: 'UnitPrice',
+    type: 'number',
+    width: 'auto',
+    disabled: true,
+  },
+]);
+//品类按重量计费
+const Categorychargesbyweight = ref([
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '成本结算品类',
+    prop: 'Warehousecategory',
+    type: 'select',
+    width: 'auto',
+    disabled: true,
+  },
+  {
+    label: '单价(元/件)',
+    prop: 'UnitPrice',
+    type: 'number',
+    width: 'auto',
+    disabled: true,
+  },
+]);
+// 品类按吨计费
+const Categorybilledbyton = ref([
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '成本结算品类',
+    prop: 'Warehousecategory',
+    type: 'select',
+    width: 'auto',
+    disabled: true,
+  },
+  {
+    label: '单价(元/件)',
+    prop: 'UnitPrice',
+    type: 'number',
+    width: 'auto',
+    disabled: true,
+  },
+]);
 // 附加费
 const asurcharge = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
@@ -495,6 +710,14 @@ const newlyadded = row => {
 const Pricingrules = () => {
   console.log(form.value);
 };
+// 新增超区区域计费
+const Oversizedbillingadd=()=>{
+  
+}
+// 删除超区区域计费
+const Oversizedbillingdel=(row)=>{
+console.log(row,'删除超区费');
+}
 </script>
 
 <style scoped lang="scss">
@@ -645,5 +868,41 @@ const Pricingrules = () => {
     color: #ff5722;
     cursor: pointer;
   }
+  .el_text_add{
+    margin-left: 10px;
+    color: #0045c4;
+    cursor: pointer;
+  }
+}
+.el_Super {
+  display: flex;
+  justify-content: space-between;
+  .el_Super_box {
+    width: 18%;
+    display: flex;
+    flex-direction: column;
+    .el-input-number {
+      width: 100%;
+    }
+    .title {
+      position: relative;
+      padding: 0 10px;
+      display: block;
+      margin-top: 20px;
+      margin-bottom: 10px;
+    }
+    .title::after {
+      content: '';
+      position: absolute;
+      left: 0;
+      top: 0;
+      width: 4px;
+      height: 100%;
+      background-color: #172e60;
+    }
+  }
+}
+.SuperAdd {
+  display: flex;
 }
 </style>
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
index ef6a543b..c226556e 100644
--- a/src/views/distribution/artery/abnormalList.vue
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -129,7 +129,7 @@
           background
           @size-change="sizeChange"
           @current-change="currentChange"
-          :current-page="page.currentPage"
+          :current-page="page.pageNum"
           :page-sizes="[30, 50, 80, 120]"
           :page-size="page.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
@@ -365,7 +365,7 @@ const searchChange = () => {
 const searchReset = () => {
   details.query = {};
   details.stockupDate = [];
-  details.page.currentPage = 1;
+  details.page.pageNum = 1;
   handleClearTableQuery(details.columnList);
   onLoad(details.page);
 };
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index 6ba2827c..47988400 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -727,7 +727,7 @@ export default {
 
         for (let i = 0; i < this.data.length; i++) {
           const value = this.data[i];
-
+          value.scanNum = value.scanNum || 0;
           value.realNum = isNumber(value.realNum) ? Number(value.realNum) : 0;
           value.totalPlanNum = isNumber(value.totalPlanNum) ? Number(value.totalPlanNum) : 0;
           value.realVolume = isNumber(value.realVolume) ? Number(value.realVolume) : 0;
diff --git a/src/views/reportforms/DeliveryDetails.vue b/src/views/reportforms/DeliveryDetails.vue
index 885c0497..90644261 100644
--- a/src/views/reportforms/DeliveryDetails.vue
+++ b/src/views/reportforms/DeliveryDetails.vue
@@ -384,11 +384,11 @@ const searchChange = () => {
 
   // 签收扫描时间
   if (TopQuery.value.Signfor?.length) {
-    queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
-    queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    queryCarn.value.startSjsigningTime = dayjs(TopQuery.value.Signfor[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.endSjsigningTime = dayjs(TopQuery.value.Signfor[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
-    delete queryCarn.value.startTaskTime;
-    delete queryCarn.value.endTaskTime;
+    delete queryCarn.value.startSjsigningTime;
+    delete queryCarn.value.endSjsigningTime;
   }
   // 仓库处理
   if (TopQuery.value.warehouseNameRange?.length) {