diff --git a/src/api/warehouse/warehouseRetentionRecord.js b/src/api/warehouse/warehouseRetentionRecord.js
index e1bebe97..18852b61 100644
--- a/src/api/warehouse/warehouseRetentionRecord.js
+++ b/src/api/warehouse/warehouseRetentionRecord.js
@@ -97,7 +97,7 @@ export const $_RetentionWarehouseRetentionRecord = params => {
 
 export const $_warehouseRetentionRecordPage = params => {
   return request({
-    url: '/api/logpm-warehouse/warehouseRetentionRecord/page',
+    url: '/api/logpm-warehouse/warehouseRetentionScan/page',
     method: 'get',
     params,
   });
diff --git a/src/option/warehouse/warehouseRetentionRecord.js b/src/option/warehouse/warehouseRetentionRecord.js
index e467011d..e589cb3c 100644
--- a/src/option/warehouse/warehouseRetentionRecord.js
+++ b/src/option/warehouse/warehouseRetentionRecord.js
@@ -1,237 +1,195 @@
-export default {
-  height: 'auto',
-  calcHeight: 30,
-  tip: false,
-  searchShow: false,
-  searchMenuSpan: 6,
-  border: true,
-  index: true,
-  viewBtn: true,
-  selection: true,
-  menu: false,
-  dialogClickModal: false,
-  column: [
-    {
-      label: '主键',
-      prop: 'id',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '租户号',
-      prop: 'tenantId',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '创建人',
-      prop: 'createUser',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '创建时间',
-      prop: 'createTime',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '更新人',
-      prop: 'updateUser',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '状态',
-      prop: 'status',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '是否已删除',
-      prop: 'isDeleted',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '创建部门',
-      prop: 'createDept',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '预留1',
-      prop: 'reserve1',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '预留2',
-      prop: 'reserve2',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '预留3',
-      prop: 'reserve3',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '预留4',
-      prop: 'reserve4',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '预留5',
-      prop: 'reserve5',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '订单自编码',
-      prop: 'orderCode',
-      type: 'input',
-    },
-    {
-      label: '包件码',
-      prop: 'packageCode',
-      type: 'input',
-    },
-    {
-      label: '运单号',
-      prop: 'waybillNo',
-      type: 'input',
-    },
-    {
-      label: '滞留车次号',
-      prop: 'retentionCarId',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '滞留车次号',
-      prop: 'retentionCarNo',
-      type: 'input',
-    },
-    {
-      label: '滞留仓库id',
-      prop: 'retentionWarehouseId',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '滞留仓库名称',
-      prop: 'retentionWarehouseName',
-      type: 'input',
-    },
-    {
-      label: '滞留类型',
-      prop: 'retentionType',
-      type: 'select',
-      dicUrl: '/api/blade-system/dict-biz/dictionary?code=retention_type',
-      props: {
-        label: 'dictValue',
-        value: 'dictKey',
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    values: '',
+    width: '55',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: '55',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'trainNumber',
+    label: '车次号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'reservationCode',
+    label: '预约编号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillNumber',
+    label: '运单号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '240',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+
+  {
+    prop: 'materialNumber',
+    label: '物料编码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  
+  {
+    prop: 'materialName',
+    label: '物料名称',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'retentionScanTime',
+    label: '滞留扫描时间',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'retentionScanUsername',
+    label: '滞留操作人',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'retentionQuantity',
+    label: '数量',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+
+  {
+    prop: 'warehouseName',
+    label: '仓库名称',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+
+  {
+    prop: 'retentionWayName',
+    label: '滞留方式',
+    type: 3,
+    values: '',
+    width: '180',
+    checkarr: [
+      {
+        label: '扫描',
+        value: 1,
       },
-    },
-    {
-      label: '装车时间',
-      prop: 'assembleCarDate',
-      type: 'input',
-    },
-    {
-      label: '装车人id',
-      prop: 'assembleCarPersonId',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '装车人名称',
-      prop: 'assembleCarPersonName',
-      type: 'input',
-    },
-    {
-      label: '备注',
-      prop: 'remark',
-      type: 'input',
-    },
-    {
-      label: '取消滞留人id',
-      prop: 'cancelRetentionUserId',
-      type: 'input',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-      hide: true,
-    },
-    {
-      label: '取消滞留人名称',
-      prop: 'cancelRetentionUserName',
-      type: 'input',
-    },
-    {
-      label: '取消滞留备注',
-      prop: 'cancelRemark',
-      type: 'input',
-    },
-  ],
-};
+      {
+        label: '文员',
+        value: 2,
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'scanTypeName',
+    label: '滞留操作类型',
+    type: 3,
+    values: '',
+    width: '180',
+    checkarr: [
+      {
+        label: '包件',
+        value: 1,
+      },
+      {
+        label: '订单',
+        value: 2,
+      },
+      {
+        label: '托盘',
+        value: 3,
+      },
+    ],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
+];
diff --git a/src/page/login/aiqa.vue b/src/page/login/aiqa.vue
index 8331e00d..b52aed5a 100644
--- a/src/page/login/aiqa.vue
+++ b/src/page/login/aiqa.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="page-content">
     <div class="header">
-      <div class="logo"><img :src="logo" />
+      <div class="logo">
+        <img :src="logo" />
         <span>货无忧AI智能问答</span>
       </div>
       <div class="icon-box">
@@ -11,8 +12,7 @@
     <div class="content">
       <div class="left">
         <div class="content-box" ref="chatContainer">
-          
-        <div class="content-time">{{time}}</div>
+          <div class="content-time">{{ time }}</div>
           <template v-for="(item, index) in Data.ChathistoryList" :key="index">
             <div
               :class="{
@@ -21,8 +21,8 @@
               }"
             >
               <div class="icon">
-               <el-icon v-if=" item.state === 'user'"><Avatar /></el-icon>
-              <img  v-else :src="logotx" />
+                <el-icon v-if="item.state === 'user'"><Avatar /></el-icon>
+                <img v-else :src="logotx" />
               </div>
               <div>
                 <div
@@ -132,6 +132,19 @@ const Data = ref({
     {
       content: '谷歌浏览器下载地址',
     },
+    {
+      content: '东集pad安装初始密码是什么',
+    },
+    {
+      content: '东集pad-q7恢复出厂设置',
+    },
+    {
+      content: '货无忧的汇通物流公司编码是多少',
+    },
+    {
+      content: '蓝牙打印机芝柯tx453设备连接密码是多少',
+    },
+
   ],
   ChathistoryList: [
     // {
@@ -200,9 +213,9 @@ const setCurrentTime = () => {
   return `${year}年${month}月${day}日 ${hours}:${minutes}:${seconds}`;
 };
 
-const time = computed(()=>{
-  return setCurrentTime()
-})
+const time = computed(() => {
+  return setCurrentTime();
+});
 // 用户输入逻辑
 const inputData = value => {
   Data.value.input = value;
@@ -237,7 +250,7 @@ const AiData = (value = '') => {
     name: '货无忧智能AI', //昵称
     content: aiResponse, //文本描述
     link: '', //文件下载地址
-    time: setCurrentTime(),//日期
+    time: setCurrentTime(), //日期
   };
 
   if (isFirstMessage.value) {
@@ -295,7 +308,28 @@ const AiData = (value = '') => {
     } else if (lowercaseValue.includes('谷歌') || lowercaseValue.includes('谷歌浏览器下载地址')) {
       aiResponse = '谷歌浏览器下载地址如下：';
       data.link = 'https://www.google.cn/intl/zh-CN/chrome/?';
-    } else {
+    } else if (
+      lowercaseValue.includes('东集pda初始密码') ||
+      lowercaseValue.includes('东集pad安装初始密码')
+    ) {
+      aiResponse = '东集PDA安装初始密码是：4007770876';
+    } 
+    else if (
+      lowercaseValue.includes('东集pad-q7恢复出厂设置')
+    ) {
+      aiResponse = '东集pad-q7恢复出厂设置教程地址:1、关机状态下，按下【电源键】、【两侧扫描键】； 2、出现开机画面，松开【电源键】，出现工厂模式界面，按键全部松开；3、进入工厂模式后通过方向键选择【wipe data/factory reset】, 按电源键确认进入子菜单，选择【yes】，按【电源键】确认，恢复出厂完成后选择第一个【reboot system now】 ，按【电源键】确认重启设备。视频教程如下:https://mp.weixin.qq.com/s/0CG-jYooh9LJ-9aLauVGfA';
+    }
+    else if (
+      lowercaseValue.includes('货无忧的汇通物流公司编码是多少')
+    ) {
+      aiResponse = '货无忧的汇通物流公司编码是：627683';
+    }
+    else if (
+      lowercaseValue.includes('蓝牙打印机芝柯tx453设备连接密码是多少') ||  lowercaseValue.includes('tx453')
+    ) {
+      aiResponse = '蓝牙打印机芝柯xt453设备连接密码是：0000';
+    }
+    else {
       aiResponse = '我不太理解您的问题，我正在努力学习中，请重新描述或输入其他问题，或联系管理员';
     }
   }
@@ -378,7 +412,7 @@ AiData(); //初始化AI机器人
     .logo {
       display: flex;
       align-items: center;
-      span{
+      span {
         margin-left: 10px;
       }
       img {
@@ -437,7 +471,7 @@ AiData(); //初始化AI机器人
             justify-content: center;
             color: #d3832a;
             font-size: 3em;
-            img{
+            img {
               width: 100%;
               height: 100%;
             }
@@ -500,7 +534,7 @@ AiData(); //初始化AI机器人
         .el-input__wrapper {
           box-shadow: none;
         }
-        .el-input__inner{
+        .el-input__inner {
           font-size: 12px;
         }
         .el-button {
@@ -531,7 +565,7 @@ AiData(); //初始化AI机器人
     }
   }
 }
-.content-time{
+.content-time {
   text-align: center;
   color: #9a9a9a;
   font-size: 12px;
diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue
index f50e1f67..ae32a1be 100644
--- a/src/views/basicdata/TripartiteMaterial/list.vue
+++ b/src/views/basicdata/TripartiteMaterial/list.vue
@@ -192,15 +192,15 @@
         </el-form-item>
 
         <el-form-item label="一级品">
-          <el-input placeholder="请输入一级品" v-model="details.form.firsts"></el-input>
+          <el-input placeholder="请输入一级品" v-model.trim="details.form.firsts"></el-input>
         </el-form-item>
 
         <el-form-item label="二级品">
-          <el-input placeholder="请输入二级品" v-model="details.form.seconds"></el-input>
+          <el-input placeholder="请输入二级品" v-model.trim="details.form.seconds"></el-input>
         </el-form-item>
 
         <el-form-item label="三级品">
-          <el-input placeholder="请输入三级品" v-model="details.form.thirds"></el-input>
+          <el-input placeholder="请输入三级品" v-model.trim="details.form.thirds"></el-input>
         </el-form-item>
       </el-form>
 
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index b7d8126b..17d0431e 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -45,65 +45,102 @@
     <el-form :model="formLoad" class="el_pricing">
       <el-form-item label="是否有附加费">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">是</el-radio>
-          <el-radio value=0 size="large">否</el-radio>
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="是否公里数计费">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">是</el-radio>
-          <el-radio value=0 size="large">否</el-radio>
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="公里计算规则">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">总公里</el-radio>
-          <el-radio value=0 size="large">点位公里</el-radio>
-          <el-radio value=0 size="large">最远点位公里数</el-radio>
+          <el-radio value="1" size="large">总公里</el-radio>
+          <el-radio value="0" size="large">点位公里</el-radio>
+          <el-radio value="0" size="large">最远点位公里数</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="是否计算返程">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">是</el-radio>
-          <el-radio value=0 size="large">否</el-radio>
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="是否补贴起步公里数计费">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">是</el-radio>
-          <el-radio value=0 size="large">否</el-radio>
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="补贴公里计算规则">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">总公里数</el-radio>
-          <el-radio value=0 size="large">点位公里数</el-radio>
-          <el-radio value=0 size="large">最远点位公里数</el-radio>
+          <el-radio value="1" size="large">总公里数</el-radio>
+          <el-radio value="0" size="large">点位公里数</el-radio>
+          <el-radio value="0" size="large">最远点位公里数</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="是否计算返程">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">是</el-radio>
-          <el-radio value=0 size="large">否</el-radio>
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="是否超区公里计费">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">是</el-radio>
-          <el-radio value=0 size="large">否</el-radio>
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="超区公里数计算规则">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">总公里数</el-radio>
-          <el-radio value=0 size="large">点位公里数</el-radio>
-          <el-radio value=0 size="large">最远点位公里数</el-radio>
+          <el-radio value="1" size="large">总公里数</el-radio>
+          <el-radio value="0" size="large">点位公里数</el-radio>
+          <el-radio value="0" size="large">最远点位公里数</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="超区点位计费模式">
         <el-radio-group v-model="formLoad.a" class="ml-4">
-          <el-radio value=1 size="large">统一计费</el-radio>
-          <el-radio value=0 size="large">区域计费</el-radio>
+          <el-radio value="1" size="large">统一计费</el-radio>
+          <el-radio value="0" size="large">区域计费</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否计算返程">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否点位补贴计费">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否保底费">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否补贴油费">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="补贴油费计算规则">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">总公里数</el-radio>
+          <el-radio value="0" size="large">点位公里数</el-radio>
+          <el-radio value="0" size="large">最远点位公里数</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否计算返程">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
@@ -209,17 +246,17 @@ const newlyadded = row => {
     cursor: pointer;
   }
 }
-.el_pricing{
+.el_pricing {
   display: flex;
   flex-wrap: wrap;
-  :deep(.el-form-item){
+  :deep(.el-form-item) {
     display: flex;
     flex-direction: column;
     width: 30%;
-    .el-form-item__content{
+    .el-form-item__content {
       background-color: #f6f6f6;
       padding: 0 10px;
-      .el-radio-group{
+      .el-radio-group {
         flex-wrap: nowrap;
       }
     }
diff --git a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
index d50614d1..cc33ce1e 100644
--- a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
+++ b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
@@ -1,443 +1,327 @@
 <template>
-  <div class="maxContent">
-    <!-- 搜索功能  -->
-    <div>
-      <div class="SoInput" v-show="searchSo">
-        <el-form :model="SoInfoData">
-          <el-form-item label="滞留车次号:">
-            <el-input v-model="SoInfoData.a" placeholder="请输入1" />
-          </el-form-item>
-          <el-form-item label="滞留类型:">
-            <el-input v-model="SoInfoData.b" placeholder="请输入2" />
-          </el-form-item>
-          <el-form-item label="滞留创建人:">
-            <el-input v-model="SoInfoData.c" placeholder="请输入3" />
-          </el-form-item>
-          <el-form-item label="滞留时间:">
-            <el-input v-model="SoInfoData.d" placeholder="请输入4" />
+  <basic-container>
+    <!-- 首页表格 -->
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <el-row v-if="search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="el-fr-d">
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
         </el-form>
-        <div class="SoBtn">
-          <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-        </div>
-      </div>
-      <!-- 查询按钮 -->
-      <!-- 头部右侧按钮模块 -->
-      <div class="avue-crud__right">
-        <el-button icon="el-icon-refresh" @click="Refresh" circle></el-button>
-        <el-button icon="el-icon-search" @click="searchSo = !searchSo" circle></el-button>
-      </div>
-      <!-- 表格开始 -->
-      <el-table
-        v-loading="loading"
-        element-loading-text="数据正在更新中..."
-        :data="ElData"
-        row-key="name"
-        border
-        height="600"
-        style="width: 100%"
-        ref="tableRef"
-        @select-all="selectAll"
-        @select="selectChange"
-      >
-        <el-table-column type="selection" width="55" fixed />
-        <el-table-column type="index" fixed width="50" height="100" label="#" align="center" />
+      </el-row>
 
-        <!--
-            Type ===1 普通文本
-            Type ===2 图片显示
-            Type ===3 操作功能
-            label:    标题
-            width:    宽度
-            prop:     数据字段
-           -->
+      <!-- 控件模块 -->
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" @click="AddInfo"
+              ><el-icon><Download /></el-icon>导出</el-button
+            >
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="Search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
 
-        <el-table-column
-          :prop="item.prop"
-          :label="item.label"
-          :width="item.width"
-          :fixed="item.fixed"
-          align="center"
-          v-for="(item, index) in menuData"
-          :key="item.label"
+      <!-- 首页表格 -->
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :loading="loadingObj.list"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
         >
-          <el-table-column
-            :prop="item.prop"
-            :label="item.label"
-            :width="item.width"
-            :fixed="item.fixed"
-            align="center"
-          >
-            <template #header>
-              <!-- <el-input
-                @change="InputSo(item)"
-                clearable
-                v-if="item.type == 4"
-                v-model="item.values"
-                :placeholder="`请输入${item.label}`"
-              /> -->
-            </template>
-
-            <template #default="props">
-              <img :src="props.row[item.prop]" class="el-Img" v-if="item.type === 2" />
-
-              <div :class="ElBtnClass" v-if="item.type == 3">
-                <el-button
-                  :link="ElButtonS[0].link"
-                  :class="ElButtonS[0].class"
-                  :auto-insert-space="ElButtonS[0].space"
-                  :size="ElButtonS[0].size"
-                  :icon="ElButtonS[0].icon"
-                  @click="ViewEvent(props.row)"
-                  >滞留明细</el-button
-                >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-button @click="view(slotProps.scope)">查看</el-button>
               </div>
-              <span v-if="item.type == 6">{{
-                props.row[item.prop] == 1
-                  ? '装车滞留'
-                  : props.row[item.prop] == 2
-                  ? '配送滞留'
-                  : props.row[item.prop] == 3
-                  ? '出库滞留滞留'
-                  : '/'
-              }}</span>
-              <span v-if="item.type == 1">{{
-                props.row[item.prop] ? props.row[item.prop] : '/'
-              }}</span>
             </template>
-          </el-table-column>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- 表格翻页功能 -->
-    <div class="demo-pagination-block TCdemo-pagination-block">
-      <el-pagination
-        v-model:current-page="currentPage"
-        v-model:page-size="pageSize"
-        :page-sizes="pageList"
-        :disabled="disabled"
-        :background="background"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="PageSizeChange"
-        @current-change="SizeChange"
-      />
-    </div>
-    <!-- 弹窗详情 -->
-    <el-dialog v-model="PopupDetails" title="详情数据展示" width="70%" :before-close="handleClose">
-      <el-tabs type="border-card" class="demo-tabs">
-        <el-tab-pane v-for="item in Tabs" :key="item.name">
-          <template #label>
-            <span class="custom-tabs-label">
-              <el-icon><component :is="item.icon" /></el-icon>
-              <span>{{ item.label }}</span>
-            </span>
           </template>
-        </el-tab-pane>
-      </el-tabs>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button>Cancel</el-button>
-          <el-button type="primary"> Confirm </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </div>
+  </basic-container>
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+    v-model="details.columnList"
+  ></edittablehead>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, computed } from 'vue';
-import { useRouter} from 'vue-router';
+import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { $_warehouseRetentionRecordPage } from '@/api/warehouse/warehouseRetentionRecord.js';
-import { ElMessage } from 'element-plus';
-const SoInfoData = ref({}); //搜索框参数
-const searchSo = ref(false); //搜索框
-const ElData = ref([]); //表格的值
-const currentPage = ref(1); // 默认页码
-const pageSize = ref(20); // 默认每一页几条
-const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
-const background = ref(true); // 是否开启背景颜色
-const disabled = ref(false); // 是否禁止使用页码功能
-const total = ref(10); //页码总数
-const loading = ref(false); //表格加载Load
-const PopupDetails = ref(false); //弹窗详情是否展示
-const router = useRouter(); //路由注册
-const Tabs = ref([
-  // 标题栏
-  { label: '处理中', name: 0, icon: 'Monitor' },
-  { label: '理赔金额未出', name: 1, icon: 'Coin' },
-  { label: '处理完毕', name: 2, icon: 'Check' },
-  { label: '完结', name: 3, icon: 'Reading' },
-  { label: '仲裁中', name: 4, icon: 'List' },
-  { label: '全部', name: 5, icon: 'Notification' },
-]);
-// 菜单表头
-const menuData = ref([
-  {
-    prop: 'retentionCarNo',
-    label: '滞留车次号',
-    type: 4,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: true,
-    search: true,
-    head: true,
-  },
-  {
-    prop: 'retentionType',
-    label: '滞留类型',
-    type: 6,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    search: true,
-    head: true,
-  },
-  {
-    prop: 'assembleCarPersonName',
-    label: '装车人名称',
-    type: 4,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: false,
-    search: false,
-    head: true,
-  },
-  {
-    prop: 'retentionCreateUserName',
-    label: '滞留操作人',
-    type: 4,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: false,
-    search: false,
-    head: true,
-  },
-  {
-    prop: 'createTime',
-    label: '滞留时间',
-    type: 4,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: false,
-    search: false,
-    head: true,
-  },
-  {
-    prop: 'retentionQuantity',
-    label: '滞留数量',
-    type: 4,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    search: false,
-    head: true,
-  },
-  {
-    prop: 'retentionWarehouseName',
-    label: '仓库名称',
-    type: 4,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: false,
-    search: false,
-    head: true,
+import { columnList } from '@/option/warehouse/warehouseRetentionRecord';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import functions from '@/utils/functions.js';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { downloadXls } from '@/utils/util';
+import { useStore } from 'vuex';
+import dayjs from 'dayjs';
+const $router = useRouter(); //跳转
+const $useStore = useStore(); //权限
+const $route = useRoute(); //获取地址栏参数
+const details = reactive({
+  /** 是否开启搜索 */
+  search: false,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: true,
+    packageListLoading: false,
   },
-  {
-    prop: 'retentionRemarks',
-    label: '备注',
-    type: 4,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    search: false,
-    head: true,
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    currentPage: 1,
+    pageSize: 50,
+    total: 0,
   },
-  // {
-  //   prop: '',
-  //   label: '预留1',
-  //   type: 4,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   search: false,
-  //   head: true,
-  // },
-  // {
-  //   prop: '',
-  //   label: '预留2',
-  //   type: 4,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   search: false,
-  //   head: true,
-  // },
-  // {
-  //   prop: '',
-  //   label: '预留3',
-  //   type: 4,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   search: false,
-  //   head: true,
-  // },
-  // {
-  //   prop: '',
-  //   label: '预留4',
-  //   type: 4,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   search: false,
-  //   head: true,
-  // },
-  {
-    prop: '',
-    label: '操作',
-    type: 3,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: 'right',
-    search: false,
-    head: true,
+
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 包件明细 */
+    packageOrderListlVisited: false,
+    /** 二维码 */
+    QRCodeVisible: false,
+    /** 修改客户信息 */
+    editClientInfoVisible: false,
   },
-]); //表头结构
-// 按钮配置
-const ElButtonS = ref([
-  // 1.link    切换按钮样式(文本模式-false ,按钮模式-tre)
-  // 2.class   按钮样式名(用于切换按钮样式)
-  // 3.space   是否开启按钮文子直接间距(true开启 ,false关闭)
-  // 4.size    按钮尺寸默认小尺寸('large'| 'default'| 'small')
-  // 5.icon    按钮图标
-  // 6.table   按钮名称
-  {
-    link: false,
-    class: 'el-btn-view',
-    space: true,
-    size: 'small',
-    icon: 'el-icon-view',
-    table: '详情',
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 包明细 */
+    packageOrderListlVisited: false,
   },
-]);
-// 页面初始化请求
-function onLoad() {
-  loading.value = true; //开启表格加载
-  let Data = {
-    current: currentPage.value, //页码
-    size: pageSize.value, //条数
-  };
-  $_warehouseRetentionRecordPage(Data).then(res => {
-    console.log(res, '滞留初始化页面获取到的值');
-    ElData.value = res.data.data.records;
-    total.value = res.data.data.total; //数据总条数
-    loading.value = false; //关闭表格加载
-  });
-}
-// 调用页面初始化获取数据
-onLoad();
-const InputSo = val => {
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  data,
+  loadingObj,
+  selectionList,
+  drawerShow,
+  page,
+  trickleLoadingPage,
+  zeroAdditionalRecordingInfo,
+  popUpShow,
+  recorddata,
+} = toRefs(details);
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  details.drawerShow = _flag;
+};
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  details.query[row.prop] = index;
+  processRowProperty(index, row, details);
+  test(details.query);
+};
+// 实例函数
+const test = val => {};
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = val => {
   console.log(val);
 };
-// 表格筛选
-const selectChange = () => {
-  console.log('触发了选择');
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  processRowProperty(index, row, details);
 };
-// 表格筛选
-const selectAll = () => {
-  console.log('触发了选择');
+/** 表格表头复选框选择 */
+const selectionChange = list => {
+  console.log(list);
+  details.selectionList = list;
 };
-// 重置搜索表单
-const searchReset = () => {
-  SoInfoData.value = {};
+// 网页顶部搜索按钮
+const searchChange = () => {
+  details.search = false; //关闭搜索
 };
-// 点击详情按钮
-const ViewEvent = val => {
-  console.log(val);
-
-  router.push({
-    path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-    query: {
-      id: val.id,
-      name: val.retentionCarNo + '-滞留明细',
-    },
-  });
-
-
-  // console.log(val);
-  // PopupDetails.value = true;
+// 每页多少条
+const sizeChange = val => {
+  details.page.pageSize = val;
+};
+/** 页码改变执行的回调 */
+const currentChange = val => {
+  details.page.currentPage = val;
 };
-// 关闭弹窗关闭回调
-const handleClose = () => {
-  PopupDetails.value = false;
+// 刷新按钮
+const searchChangeS = () => {
+  details.search = false; //关闭搜索
 };
-// 刷新页面按钮(初始化页面参数)
-const Refresh = () => {
-  onLoad(); //初始化表格数据
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
+      });
+    });
+  });
+}
+// 页面初始化
+const onLoad = () => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+  };
+  $_warehouseRetentionRecordPage(data).then(res => {
+    console.log(res, '返回值');
+    details.data = res.data.data.records;
+    details.data.forEach(item => {
+      if (item.retentionWay == 1) {
+        item.retentionWayName = '扫描';
+      } else if (item.retentionWay == 2) {
+        item.retentionWayName = '文员';
+      }
+      if (item.scanType == 1) {
+        item.scanType = '包件';
+      } else if (item.scanType == 2) {
+        item.scanTypeName = '订单';
+      } else if (item.scanType == 3) {
+        item.scanTypeName = '托盘';
+      }
+    });
+    details.page.total = res.data.data.total;
+    details.loadingObj.list = false;
+  });
 };
+onLoad();
+
+// 页面初始化方法
 </script>
 
-<style lang="scss" scoped>
-.maxContent {
-  width: 100%;
-  box-sizing: border-box;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
+<style scoped lang="scss">
+.ElBtnClass button {
+  border: none;
+  padding: 0;
+  background-color: transparent;
 }
-.SoInput {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 10px;
-  margin-top: 10px;
-  form {
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 5px;
-    :deep(.el-form-item) {
-      margin-bottom: 0;
-    }
-  }
-  .SoBtn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
+:deep(.el-card) {
+  height: 100%;
 }
-.avue-crud__right {
-  margin-top: 5px;
+:deep(.el-card__body) {
+  height: 100%;
   display: flex;
-  justify-content: flex-end;
-  margin-bottom: 5px;
-  padding: 0 10px;
-}
-:deep(.cell) {
-  padding: 0;
+  flex-direction: column;
 }
-.demo-pagination-block {
+.el-fy {
   flex: 1;
   display: flex;
   align-items: flex-end;
-  margin-bottom: 8px;
-  justify-content: flex-end;
-  margin-right: 6px;
+  margin-bottom: 10px;
 }
-:deep(.el-table-column--selection) {
-  text-align: center;
+.avue-crud {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 </style>