diff --git a/src/App.vue b/src/App.vue
index f196b8ea..f364a451 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,6 +14,7 @@ body,
   width: 100%;
   height: 100%;
 }
+
 .BMap_cpyCtrl,
   .anchorBL {
     display: none !important;
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index f7cab58a..4a682ae7 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -7,7 +7,8 @@
     v-loading="loading"
     @selection-change="handleSelectionChange"
     border
-    height="600"
+    height="700"
+    :row-class-name="tableRowClassName"
   >
     <el-table-column
       :type="column.type == 0 ? 'selection' : ''"
@@ -20,11 +21,15 @@
       :sortable="column.sortable"
       v-show="column.head"
     >
+      <!-- <template #header>
+        <el-text class="mx-1">{{ column.label }}</el-text>
+      </template> -->
       <el-table-column
         :width="column.width"
         :prop="column.prop"
         :label="column.label"
         v-if="column.type != 0"
+        flexible
       >
         <template #header>
           <!-- <el-text class="mx-1">{{ column.label }}</el-text> -->
@@ -40,7 +45,7 @@
           <el-select
             v-if="column.type == 3"
             v-model="column.values"
-            class="m-2"
+            class="m-2 selectbr"
             clearable
             :placeholder="`请选择${column.label}`"
             @change="selectchange($event,column)"
@@ -77,15 +82,18 @@
         </template>
 
         <template #default="scope">
-          <el-text class="mx-2" v-if="(Number(column.type)<6&&Number(column.type)>0)&&column.isextrahide">{{ scope.row[column.prop] }}</el-text>
+          <el-text class="mx-2 tabculconte" v-if="(Number(column.type)<6&&Number(column.type)>0)&&column.isextrahide">{{ scope.row[column.prop] }}</el-text>
           <!-- <div v-if="Number(column.type)==8">
             <div></div>
           </div> -->
-          <slot v-if="column.type == 6" :scope="scope"></slot>
+          <div class="slotbuts" v-if="column.type == 6">
+            <slot v-if="column.type == 6" :scope="scope">
+            </slot>
+          </div>
           <el-image preview-teleported v-if="column.type==7" style="width: 60px; height: 60px;margin-left: 10px;" :initial-index="index" :z-index="100" v-for="(item,index) in scope.row[column.prop].split(',')" :src="item" :preview-src-list="scope.row[column.prop].split(',')"/>
           <el-tooltip placement="top" v-if="(Number(column.type)<6&&Number(column.type)>0)&&!column.isextrahide">
             <template #content>{{ scope.row[column.prop] }}</template>
-            <div class="on">{{ scope.row[column.prop] }}</div>
+            <div class="on tabculconte">{{ scope.row[column.prop] }}</div>
           </el-tooltip>
           <!-- <slot v-if="column.type == 7" name="test" :testdata="scope"></slot> -->
           <!-- <el-button
@@ -105,7 +113,7 @@
       </el-table-column>
 
       <template #header>
-        <el-text class="mx-1">{{ column.label }}</el-text>
+        <el-text class="mx-1 tabtitles">{{ column.label }}</el-text>
         <!-- <el-input
           v-if="column.type == 2"
           v-model="column.values"
@@ -198,6 +206,21 @@ let props = defineProps({
     required: true,
   }
 });
+let selectarr=ref([])
+const tableRowClassName = ({
+  row,
+  rowIndex,
+}: {
+  row: TableDataType
+  rowIndex: number
+})  => {
+  if (rowIndex === 1) {
+    return 'warning-row'
+  } else if (rowIndex === 3) {
+    return 'success-row'
+  }
+  return ''
+}
 let emit =defineEmits(['inputTxt','timeCheck','selectCheck','selection'])
 let newcolumnList=ref<TableColumnType[]>([])
 watchEffect(()=>{
@@ -374,7 +397,8 @@ function timechange(value,column:TableColumnType){
   emit('timeCheck',value,column)
 }
 const handleSelectionChange=(param:TableDataType[])=>{
-  console.log(param)
+  // console.log(param)
+  selectarr.value=param
   emit('selection',param)
 }
 function inputclear(value,column:TableColumnType){
@@ -427,15 +451,82 @@ watchEffect(()=>{
 
 </script>
 <style lang="scss">
-.el-table .warning-row {
-  --el-table-tr-bg-color: var(--el-color-warning-light-9);
-}
-.el-table .success-row {
-  --el-table-tr-bg-color: var(--el-color-success-light-9);
+// :root{
+//   --el-checkbox-checked-bg-color:'#D3832A';
+//   --el-checkbox-checked-input-border-color:'#D3832A';
+// }
+
+
+.el-table {
+  //悬停
+  --el-table-row-hover-background-color: #f0f9eb !important;
+  //选中
+  --el-table-current-row-background-color: #f0f9eb !important;
 }
+
 .on{
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.selectbr{
+  border: none !important;
+}
+.tabtitles{
+  color: #092C4D !important;
+}
+.el-table .ascending .sort-caret.ascending{
+  border-bottom-color: #D3832A !important;
+}
+.el-table .descending .sort-caret.descending{
+  border-top-color: #D3832A !important;
+}
+.tabculconte{
+  color: #333333 !important;
+  font-size: 13px;
+}
+.slotbuts{
+  height: 25px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.slotbuts .el-text{
+  color: #D3832A !important;
+  margin-right: 10px !important;
+  cursor: pointer;
+  &:nth-last-child(1){
+    margin-right: 0px !important;
+  }
+}
+// .el-checkbox__input.is-checked .el-checkbox__inner{
+//   background-color: #D3832A !important;
+//   border-color: #D3832A !important;
+// }
+// .is .el-checkbox__input.is-checked .el-checkbox__inner{
+//   background-color: #D3832A !important;
+//   border-color: #D3832A !important;
+// }
+// .is-checked .el-checkbox__inner:hover{
+//   border-color: #D3832A !important;
+// }
+// .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+//   background-color: #D3832A !important;
+//   border-color: #D3832A !important;
+// }
+.el-checkbox__input.is-checked .el-checkbox__inner,
+    .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+      border-color: #D3832A!important;
+      background-color: #D3832A!important;
+    }
+    .el-checkbox__input.is-focus .el-checkbox__inner{
+      border-color:  #D3832A!important;
+    }
+    //修改选中后文本的颜色
+    .el-checkbox__input.is-checked+.el-checkbox__label{
+    color:#D3832A!important;
+}
+.el-checkbox__inner:hover{
+  border-color: #D3832A!important;
+}
 </style>
diff --git a/src/utils/watermark.js b/src/utils/watermark.js
index 3a6701ea..49784ba3 100644
--- a/src/utils/watermark.js
+++ b/src/utils/watermark.js
@@ -11,12 +11,12 @@ let setWatermark = (str) => {
     }
 
     let can = document.createElement('canvas')
-    can.width = 700
-    can.height = 650
+    can.width = 800
+    can.height = 800
 
     let cans = can.getContext('2d')
     cans.rotate(-15 * Math.PI / 150)
-    cans.font = '40px Vedana'
+    cans.font = '70px Vedana'
     cans.fillStyle = 'rgba(17, 17, 17, 0.10)'
     cans.textAlign = 'left'
     cans.textBaseline = 'Middle'
@@ -26,12 +26,12 @@ let setWatermark = (str) => {
     div.id = id
     div.style.pointerEvents = 'none'
     div.style.top = '50px'
-    div.style.left = '60px'
+    div.style.left = '100px'
     div.style.position = 'fixed'
     div.style.zIndex = '1000000'
     div.style.width = document.documentElement.clientWidth + 'px'
     div.style.height = document.documentElement.clientHeight + 'px'
-    div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
+    div.style.background = 'url(' + can.toDataURL('image/png') + ') left top no-repeat'
     document.body.appendChild(div)
     return id
 }
diff --git a/src/views/basic/coderule/basicTenantCode.vue b/src/views/basic/coderule/basicTenantCode.vue
index 0aa14402..0aed801a 100644
--- a/src/views/basic/coderule/basicTenantCode.vue
+++ b/src/views/basic/coderule/basicTenantCode.vue
@@ -47,7 +47,23 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text>
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
+          </template>
+        </tablecmt>
+        <!-- <el-table ref="table" v-loading="loading"
                   @selection-change="selectionChange"
                   :data="data"
                   :height="height"
@@ -58,7 +74,6 @@
           <el-table-column v-if="option.index" label="序号" type="index" width="80" align="center">
           </el-table-column>
           <template v-for="(item,index) in option.column">
-            <!-- table字段 -->
             <el-table-column v-if="item.hide!==true"
                              :prop="item.prop"
                              :label="item.label"
@@ -66,7 +81,6 @@
                              :key="index">
             </el-table-column>
           </template>
-          <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="220" align="center">
             <template #="{row}">
               <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
@@ -74,7 +88,7 @@
               <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
             </template>
           </el-table-column>
-        </el-table>
+        </el-table> -->
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -163,6 +177,59 @@ import {getDictionaryBiz} from '@/api/system/dict';
 export default {
   data () {
     return {
+      columnList:[
+      {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 60,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'codeType',
+            label: '编码类型',
+            type: 2,
+            values: '',
+            width: '300',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'showType',
+            label: '展示类型',
+            type: 2,
+            values: '',
+            width: '',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'code',
+            label: '编码',
+            type: 2,
+            values: '',
+            width: '300',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '300',
+            checkarr: [],
+            fixed: 'right',
+            sortable: false
+          }
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -232,6 +299,24 @@ export default {
     }
   },
   methods: {
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+     setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
     //获取字典数据
     getDictionaryBizInfo(){
       getDictionaryBiz("basic_tenant_code").then(res=>{
@@ -360,7 +445,7 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index 7f54b743..de2a7a37 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -1,249 +1,1110 @@
 <template>
   <basic-container>
-    <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.basicForklift_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-<!--        <el-button type="warning"-->
-<!--                   plain-->
-<!--                   icon="el-icon-download"-->
-<!--                   @click="handleExport">导 出-->
-<!--        </el-button>-->
-      </template>
-    </avue-crud>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="请选择事业线">
+            <el-select v-model="query.businessLine" clearable placeholder="请选择事业线" >
+              <el-option
+                v-for="item in businessLineData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!--            <el-form-item label="请选择使用单位">-->
+          <!--              <el-input v-model="query.useUnit" placeholder="请输入使用单位"></el-input>-->
+          <!--            </el-form-item>-->
+          <el-form-item label="供应商">
+            <!--              <el-input v-model="query.supplier" placeholder="请输入供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛"></el-input>-->
+            <el-select v-model="query.supplier" clearable placeholder="请选择供应商" >
+              <el-option
+                v-for="item in supplierData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="合同编号">
+            <el-input v-model="query.contractNumber" placeholder="请输入合同编号"></el-input>
+          </el-form-item>
+          <!--            <el-form-item label="租赁开始时间">-->
+          <!--              <el-input v-model="query.leaseStartTime" placeholder="请输入租赁开始时间"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="租赁结束时间">-->
+          <!--              <el-input v-model="query.leaseEndTime" placeholder="请输入租赁结束时间"></el-input>-->
+          <!--            </el-form-item>-->
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</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="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text>
+              <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
+              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
+          </template>
+        </tablecmt>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChange"
+                         @current-change="currentChange"
+                         :current-page="page.currentPage"
+                         :page-sizes="[10, 20, 30, 40, 50, 100]"
+                         :page-size="page.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page.total">
+          </el-pagination>
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" :size="option.size" ref="form" :rules="validatorRules" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="事业线" prop="businessLine"  label-width="80px">
+                <el-select v-model="form.businessLine" clearable placeholder="请选择事业线" style="position: absolute;right: 0px;width: 100%">
+                  <el-option
+                    v-for="item in businessLineData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="使用单位" prop="useUnit" label-width="120px">
+                <el-input v-model="form.useUnit" placeholder="请输入使用单位" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="受票主体" prop="ticketRecipient" label-width="80px">
+                <el-input v-model="form.ticketRecipient" placeholder="请输入受票主体" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="供应商" prop="supplier" label-width="120px">
+                <el-select v-model="form.supplier" clearable placeholder="供应商" style="position: absolute;right: 0px;width: 100%">
+                  <el-option
+                    v-for="item in supplierData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="资产类型" prop="assetType" label-width="80px">
+                <el-select v-model="form.assetType" clearable placeholder="资产类型" style="position: absolute;right: 0px;width: 100%">
+                  <el-option
+                    v-for="item in assetTypeData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="类型" prop="forkliftType" label-width="120px">
+                <el-select v-model="form.forkliftType" clearable placeholder="请选择类型" style="position: absolute;right: 0px;width: 100%">
+                  <el-option
+                    v-for="item in forkliftTypeData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="摘要" prop="abstracts" label-width="80px">
+                <el-input v-model="form.abstract" placeholder="请输入摘要" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="载重" prop="loads" label-width="120px">
+                <el-input v-model="form.loads" placeholder="请输入载重;单位（T）" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="载高" prop="loadHeight" label-width="80px">
+                <el-input v-model="form.loadHeight" placeholder="请输入载高;单位（M）" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="整车尺寸" prop="vehicleSize" label-width="120px">
+                <el-input v-model="form.vehicleSize" placeholder="请输入整车尺寸;长*宽*高" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="货叉宽度" prop="forkArmsWidth" label-width="80px">
+                <el-input v-model="form.forkArmsWidth" placeholder="请输入货叉宽度;（MAX外宽,单位M）" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="货叉长度" prop="forkArmsHeight" label-width="120px">
+                <el-input v-model="form.forkArmsHeight" placeholder="请输入货叉长度;(单位M)" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="最小转弯半径" prop="minimumTurningRadius" label-width="80px">
+                <el-input v-model="form.minimumTurningRadius" placeholder="请输入最小转弯半径;(单位M)" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="通道宽度" prop="channelWidth" label-width="120px">
+                <el-input v-model="form.channelWidth" placeholder="请输入通道宽度;((min),单位M)" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="月租" prop="monthlyRent" label-width="80px">
+                <el-input v-model="form.monthlyRent" placeholder="请输入月租(元/月)" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="数量" prop="number" label-width="120px">
+                <el-input v-model="form.number" placeholder="请输入数量(台)" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="合同编号" prop="contractNumber" label-width="80px">
+                <el-input v-model="form.contractNumber" placeholder="请输入合同编号" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="起租期限" prop="leaseStartPeriod" label-width="120px">
+                <el-input v-model="form.leaseStartPeriod" placeholder="请输入起租期限;中文大写" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="租赁开始时间" prop="leaseStartTime" label-width="80px">
+                <el-date-picker v-model="form.leaseStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择租赁开始时间" style="position: absolute;right: 0px;width: 100%"></el-date-picker>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="租赁结束时间" prop="leaseEndTime" label-width="120px">
+                <el-date-picker v-model="form.leaseEndTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择租赁结束时间" style="position: absolute;right: 0px;width: 100%"></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="付款周期" prop="paymentCycle" label-width="80px">
+                <el-input v-model="form.paymentCycle" placeholder="请输入付款周期;(月)" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="付款方式" prop="paymentMethod" label-width="120px">
+                <el-select v-model="form.paymentMethod" clearable placeholder="请选择付款方式" style="position: absolute;right: 0px;width: 100%">
+                  <el-option
+                    v-for="item in paymentMethodData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+
+            <el-col :span="11">
+              <el-form-item label="押金" prop="deposit" label-width="80px">
+                <el-input v-model="form.deposit" placeholder="请输入押金;（元）" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注" prop="notes" label-width="120px">
+                <el-input v-model="form.notes" placeholder="请输入备注" style="position: absolute;right: 0px;width: 100%"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+
+            <el-col :span="11">
+              <el-form-item label="所属仓库" prop="owningWarehouse">
+                <el-select v-model="form.owningWarehouse" clearable placeholder="请选择仓库" style="position: absolute;right: 0px;width: 100%">
+                  <el-option
+                    v-for="item in owningWarehouseData"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey+''">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+
+
+          <!--          <el-form-item label="整车图片" prop="forkliftPhoto">-->
+          <!--            <el-input v-model="form.forkliftPhoto" placeholder="请输入整车图片"/>-->
+          <!--          </el-form-item>-->
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="叉车图片"  label-width="100px">
+                <el-upload
+                  multiple
+                  v-model:file-list="fileList"
+                  :disabled="view"
+                  :limit="3"
+                  list-type="picture-card"
+                  :action="action"
+                  :headers="headers"
+                  :auto-upload="true"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove">
+                  <el-icon><Plus /></el-icon>
+                </el-upload>
+                <span v-if="!view"> 上传文件只能是<b style="color: #C03639">png，jpeg，jpg</b>格式,大小不能超过<b style="color: #C03639">10M,最多3张</b> </span>
+                <el-dialog v-model="dialogVisible" >
+                  <img w-full :src="dialogImageUrl" alt="Preview Image" />
+                </el-dialog>
+
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/basic/basicForklift";
-  import option from "@/option/basic/basicForklift";
-  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';
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        search: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: option,
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.validData(this.permission.basicForklift_add, false),
-          viewBtn: this.validData(this.permission.basicForklift_view, false),
-          delBtn: this.validData(this.permission.basicForklift_delete, false),
-          editBtn: this.validData(this.permission.basicForklift_edit, false)
-        };
+import { getList, getDetail, add, update, remove } from "@/api/basic/basicForklift";
+import option from "@/option/basic/basicForklift2";
+import { mapGetters } from "vuex";
+import { getDictionaryBiz } from '@/api/system/dict';
+import { getToken } from '@/utils/auth';
+
+export default {
+  data () {
+    return {
+      columnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'businessLine',
+            label: '事业线',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'useUnit',
+            label: '使用单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'ticketRecipient',
+            label: '受票主体',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'supplier',
+            label: '供应商',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'assetType',
+            label: '资产类型',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'forkliftType',
+            label: '类型',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'abstract',
+            label: '摘要',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'load',
+            label: '载重(T)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'loadHeight',
+            label: '载高(M)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'vehicleSize',
+            label: '整车尺寸',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'forkArmsWidth',
+            label: '货叉宽(M)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'forkArmsHeight',
+            label: '货叉长(M)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'minimumTurningRadius',
+            label: '最小转弯半径(M)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'channelWidth',
+            label: '通道宽(M)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'monthlyRent',
+            label: '月租(元/月)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'number',
+            label: '数量(台)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'contractNumber',
+            label: '合同编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'leaseStartPeriod',
+            label: '起租期限',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'leaseStartTime',
+            label: '租赁开始时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'leaseEndTime',
+            label: '租赁结束时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'paymentCycle',
+            label: '付款周期(月)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deposit',
+            label: '押金(元)',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'paymentMethod',
+            label: '付款方式',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'notes',
+            label: '备注',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'owningWarehouse',
+            label: '所属仓库',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            sortable: false
+          }
+          // 更多列的配置...
+        ],
+        drawerShow: false,
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      //文件上传
+      fileList: [],
+      dialogVisible:false,
+      dialogImageUrl:'',
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      businessLineData:[],
+      supplierData:[],
+      owningWarehouseData:[],
+      paymentMethodData:[],
+      forkliftTypeData:[],
+      assetTypeData:[],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+      //表单校验
+      validatorRules: {
+        businessLine: [
+          { required: true, message: '请选择事业线!',trigger: 'blur'}
+        ],
+        ticketRecipient: [
+          { required: true, message: '请输入受票主体!',trigger: 'blur'}
+        ],
+        // deviceSerialNumber: [
+        //   { required: true, message: '请输入序列号!',trigger: 'blur'}
+        // ],
+        // state: [
+        //   { required: true, message: '请选择状态!',trigger: 'blur'}
+        // ],
+        monthlyRent: [
+          { required: true, message: '请输入月租!',trigger: 'blur'},{pattern: /(^[1-9]\d{0,9}(\.\d{1,3})?$)|(^0(\.\d{1,2})?$)/, message: '月租格式不正确!'}
+        ],
+        // purchaseAmount: [
+        //   {pattern: /(^[1-9]\d{0,9}(\.\d{1,3})?$)|(^0(\.\d{1,2})?$)/, message: '押金格式不正确!'}
+        // ],
+
       },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    }
+  },
+  mounted () {
+    this.init();
+    //查询字典
+    this.queryDictionary();
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    if (checkListnewarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      checkListnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.head){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+    }
+    if (flexListnewarr) {
+      this.columnList.map(item => {
+        item.fixed = false;
+      });
+      flexListnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            if(item.type==6){
+              item.fixed = 'right';
+            }else{
+              item.fixed = true;
+            }
+          }
         });
-        return ids.join(",");
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.fixed){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+    }
+    if (sortlistnewarr) {
+      this.columnList.map(item => {
+        item.sortable = false;
+      });
+      sortlistnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.sortable = true;
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.sortable){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+    }
+  },
+  created() {
+
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    headers() {
+      return {
+        "Blade-Auth":'Bearer ' + getToken()
+      }
+    },
+    action() {
+      return '/api/blade-resource/oss/endpoint/put-file'
+    },
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log("row>>>>>>>>>>>>>>>>>>>",row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      this.query[row.prop] =index
+      if (!index){
+        delete this.query[row.prop]
       }
+      this.onLoad(this.page);
     },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+    timesc(index, row) {
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      this.query[row.prop] =index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    queryDictionary(){
+      getDictionaryBiz("basic_business_line").then(res=>{
+        this.businessLineData =res.data.data
+      })
+      getDictionaryBiz("basic_forklift_supplier").then(res=>{
+        this.supplierData =res.data.data
+      })
+      getDictionaryBiz("basic_forklift_assettype").then(res=>{
+        this.assetTypeData =res.data.data
+      })
+      getDictionaryBiz("basic_forklift_type").then(res=>{
+        this.forkliftTypeData =res.data.data
+      })
+      getDictionaryBiz("basic_forklift_payment").then(res=>{
+        this.paymentMethodData =res.data.data
+        this.onLoad(this.page);
+      })
+    },
+    //查看图片
+    handlePictureCardPreview(file) {
+      if (!!file.response){this.dialogImageUrl = file.response.data.link;}
+      else
+      {this.dialogImageUrl=file.url}
+      this.dialogVisible = true;
+    },
+    //移除图片
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    init () {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide () {
+      this.search = !this.search;
+    },
+    searchChange () {
+      this.onLoad(this.page);
+    },
+    searchReset () {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit () {
+      this.$refs.form.validate(valid=>{
+        if (valid) {
+      this.urlsplit();
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
           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: "操作成功!"
-            });
+      }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    handleAdd () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+        if (!!res.data.data.forkliftPhoto){
+          let fileList = res.data.data.forkliftPhoto.split(",")
+          this.fileList = fileList.map(item => {
+            return {
+              url:  item
+            }
+          });
+        }
+      });
+    },
+    handleView (row) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+        if (!!res.data.data.photo){
+          let fileList = res.data.data.photo.split(",")
+          this.fileList = fileList.map(item => {
+            return {
+              url:  item
+            }
           });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
         }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+      });
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
-      },
-      handleExport() {
-        let downloadUrl = `/forklift/basicForklift/export-basicForklift?${this.website.tokenHeader}=${getToken()}`;
-        const {
-            businessLine,
-            useUnit,
-            supplier,
-            contractNumber,
-            leaseStartTime,
-            leaseEndTime,
-        } = this.query;
-        let values = {
-            businessLine_equal: businessLine,
-            useUnit_like: useUnit,
-            supplier_equal: supplier,
-            contractNumber_like: contractNumber,
-            leaseStartTime_between: leaseStartTime,
-            leaseEndTime_between: leaseEndTime,
-        };
-        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;
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        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 = [];
-        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 {
-            businessLine,
-            useUnit,
-            supplier,
-            contractNumber,
-            leaseStartTime,
-            leaseEndTime,
-        } = this.query;
-
-        let values = {
-            businessLine_equal: businessLine,
-            useUnit_like: useUnit,
-            supplier_equal: supplier,
-            contractNumber_like: contractNumber,
-            leaseStartTime_between: leaseStartTime,
-            leaseEndTime_between: leaseEndTime,
-        };
-
-        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();
         });
+    },
+    beforeClose (done) {
+      done()
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange (list) {
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        // eslint-disable-next-line no-empty
+        for (let i = 0; i < data.records.length; i++) {
+          // 事业线转换
+          for (let j = 0; j < this.businessLineData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].businessLine == this.businessLineData[j].dictKey){
+              data.records[i].businessLine=this.businessLineData[j].dictValue;
+            }
+          }
+          //供应商
+          for (let j = 0; j < this.supplierData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].supplier == this.supplierData[j].dictKey){
+              data.records[i].supplier=this.supplierData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.assetTypeData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].assetType == this.assetTypeData[j].dictKey){
+              data.records[i].assetType=this.assetTypeData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.forkliftTypeData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].forkliftType == this.forkliftTypeData[j].dictKey){
+              data.records[i].forkliftType=this.forkliftTypeData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.paymentMethodData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].paymentMethod == this.paymentMethodData[j].dictKey){
+              data.records[i].paymentMethod=this.paymentMethodData[j].dictValue;
+            }
+          }
+
+        } 
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    urlsplit() {
+      if(this.fileList.length>0){
+        let url=[]
+        for (let i = 0; i < this.fileList.length; i++) {
+          if (!!this.fileList[i].response){url.push(this.fileList[i].response.data.link)}else {url.push(this.fileList[i].url)}
+        }
+        this.form.photo= url.toString()
       }
-    }
-  };
+    },
+  }
+};
 </script>
-
-<style>
-</style>
diff --git a/src/views/basicdata/team/basicdataTeamStaff.vue b/src/views/basicdata/team/basicdataTeamStaff.vue
index 9d554477..d9d2cbdc 100644
--- a/src/views/basicdata/team/basicdataTeamStaff.vue
+++ b/src/views/basicdata/team/basicdataTeamStaff.vue
@@ -34,34 +34,22 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
-          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-          <el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
-          </el-table-column>
-          <template v-for="(item,index) in option.column">
-            <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
-            </el-table-column>
-          </template>
-          <!-- 操作栏模块 -->
-          <el-table-column prop="menu" label="操作" :width="220" align="center">
-            <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <tablecmt
+                        :columnList="columnList"
+                        :tableData="data"
+                        :loading="loading"
+                        @inputTxt="inputsc"
+                        @timeCheck="timesc"
+                        @btnCheck="btnsc"
+                        @selectCheck="selectsc"
+                        @selection="selectionsc"
+                >
+                    <template #default="slotProps">
+                      <el-text @click="handleView(slotProps.scope.row)">查 看</el-text>
+                      <el-text @click="handleEdit(slotProps.scope.row)">编 辑</el-text>
+                      <el-text @click="rowDel(slotProps.scope.row)">删 除</el-text>
+                    </template>
+                </tablecmt>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -132,6 +120,12 @@
       </el-dialog>
     </div>
   </basic-container>
+  <edittablehead
+            @setcolum="setnewcolum"
+            @closce="showdrawer"
+            :drawerShow="drawerShow"
+            :columnList="columnList"
+    ></edittablehead>
 </template>
 
 <script>
@@ -148,6 +142,71 @@ import { getListOwn } from '@/api/system/user';
 export default {
   data () {
     return {
+      columnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'name',
+            label: '姓名',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'teamGroupName',
+            label: '班组名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'departmentName',
+            label: '所属部门名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'warehouseName',
+            label: '仓库名称',
+            type: 2,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            sortable: false
+          }
+          // 更多列的配置...
+        ],
       height: 0,
       // 弹框标题
       title: '',
@@ -196,6 +255,77 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
+    /**
+       * 初始化获取本地缓存的编辑隐藏的列表
+       *  固定搭配，不能更改
+       */
+       let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+      let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+      let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
+      if (checkListnewarr) {
+        this.columnList.map(item => {
+          item.head = false;
+        });
+        checkListnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.head = true;
+            }
+          });
+        });
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.head) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'checkList', arr);
+      }
+      if (flexListnewarr) {
+        this.columnList.map(item => {
+          item.fixed = false;
+        });
+        flexListnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              if (item.type == 6) {
+                item.fixed = 'right';
+              } else {
+                item.fixed = true;
+              }
+            }
+          });
+        });
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.fixed) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
+      }
+      if (sortlistnewarr) {
+        this.columnList.map(item => {
+          item.sortable = false;
+        });
+        sortlistnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.sortable = true;
+            }
+          });
+        });
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.sortable) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
+      }
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -208,6 +338,31 @@ export default {
     }
   },
   methods: {
+    showdrawer(value) {
+        this.drawerShow = value;
+      },
+      /**
+       * 弹窗的勾选回调，用于更改头部数组
+       * 固定搭配，只需要更换   columnList
+       */
+      setnewcolum(newarr, headarr, type) {
+        // console.log(newarr,'+++++++++++')
+        if (type == 1) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+        } else if (type == 2) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+        } else if (type == 3) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
+        }
+
+      },
+      selectionsc(value) {
+        console.log('进来了>>>>>>>>>>>>>', value);
+        this.selectionList = value;
+      },
     //点击部门
     async clickDept(row){
       // console.log("进发了部门",row);
@@ -400,7 +555,7 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 0539cdb2..35f19e71 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -115,39 +115,11 @@
                         @selection="selectionsc"
                 >
                     <template #default="slotProps">
-                        <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
-                        <el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
-                        <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
+                      <el-text @click="editsolt(slotProps.scope)">查 看</el-text>
+                      <el-text @click="editmap(slotProps.scope)">地 图</el-text>
                     </template>
                 </tablecmt>
-                <!--        <el-table ref="table" v-loading="loading"-->
-                <!--                  @selection-change="selectionChange"-->
-                <!--                  :data="data"-->
-                <!--                  :height="height"-->
-                <!--                  style="width: 100%"-->
-                <!--                  :border="option.border">-->
-                <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
-                <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
-                <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
-                <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-                <!--          <template v-for="(item,index) in option.column">-->
-                <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
-                <!--            <el-table-column v-if="item.hide!==true"-->
-                <!--                             :prop="item.prop"-->
-                <!--                             :label="item.label"-->
-                <!--                             :width="item.width"-->
-                <!--                             :key="index">-->
-                <!--            </el-table-column>-->
-                <!--          </template>-->
-                <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
-                <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
-                <!--            <template #="{row}">-->
-                <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
-                <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
-                <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
-                <!--            </template>-->
-                <!--          </el-table-column>-->
-                <!--        </el-table>-->
+               
             </el-row>
             <el-row>
                 <div class="avue-crud__pagination" style="width:100%">
@@ -289,15 +261,15 @@
         // 选择行
         selectionList: [],
         columnList: [
-          // {
-          //   prop: '',
-          //   label: '序号',
-          //   type: 0,
-          //   values: '',
-          //   width: 55,
-          //   checkarr: [],
-          //   fixed: true,
-          // },
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
           {
             prop: 'trainNumber',
             label: '车次',
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index ad30feff..3bc85a23 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -136,10 +136,7 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
-<!--            <el-button size="small" @click="editsolt(slotProps.scope)">签 收</el-button>-->
-            <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
-            <!--              >Delete</el-button>-->
+            <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
           </template>
         </tablecmt>
       </el-row>