From 25dbf68002d0533df46e51e7c1d2e8b573ae0d88 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Fri, 30 Jun 2023 17:53:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLadingList.vue | 371 ++++++++++++++++--
 .../signfor/distributionSignfor.vue           |   2 +-
 .../stockup/distributionStockup.vue           | 241 ++++++++++--
 3 files changed, 555 insertions(+), 59 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 0dcff8f4..8d34ba8f 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -27,42 +27,30 @@
           <!-- 头部右侧按钮模块 -->
           <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>
         <!-- 列表模块 -->
-        <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>
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
+            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
+              >Delete</el-button
+            >
           </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>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">情况跟进</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">签收</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        </tablecmt>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -275,6 +263,12 @@
     </div>-->
 
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
@@ -287,6 +281,273 @@ import { getToken } from '@/utils/auth';
 export default {
   data () {
     return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'pickUpTime',
+          label: '提货批次',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerName',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '联系电话',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: true,
+        },
+        {
+          prop: 'warehouseEntryTime',
+          label: '入库时间',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'collect_fee',
+          label: '到付运费',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'transport',
+          label: '搬运费',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storageFee',
+          label: '仓储费',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'forklift',
+          label: '叉车费',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'pickUpTime',
+          label: '总费用',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '应提件数',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '实提件数',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        
+        {
+          prop: 'typeService',
+          label: '服务类型',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'pickUpTime',
+          label: '货品信息',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'pickUpTime',
+          label: '提货手机',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'consignee',
+          label: '提货人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'pickUpPlate',
+          label: '提货车牌',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'deliveryDocument',
+          label: '提货证件',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'certificateType',
+          label: '证件类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'totalCost',
+          label: '费用合计',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -324,6 +585,23 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
+    /** 
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+     let newarr = this.$functions.getStorage(window.location.pathname);
+    if (newarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      newarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }
   },
   computed: {
     ...mapGetters(["permission",'tagWel','tagList']),
@@ -345,6 +623,41 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /** 
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList  
+     */
+    setnewcolum(newarr, headarr) {
+      // console.log(newarr,'+++++++++++')
+      this.columnList = newarr;
+      this.$functions.setStorage(window.location.pathname, headarr);
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+    },
     handleRemove(file, fileList) {
       console.log(file, fileList);
     },
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 7f47b4a6..d6e0c58e 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -61,7 +61,7 @@
           @timeCheck="timesc"
           @btnCheck="btnsc"
           @selectCheck="selectsc"
-          @selection="selectionsc"
+          @selection="selectionChange"
         >
           <template #default="slotProps">
             <el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 01e64438..00c18769 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -41,34 +41,23 @@
       </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="50" 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>
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
+            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
+              >Delete</el-button
+            >
           </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>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -206,6 +195,12 @@
       </el-dialog>
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
@@ -220,6 +215,142 @@ import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 export default {
   data () {
     return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'stockupDate',
+          label: '备货时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockupUser',
+          label: '备货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatus',
+          label: '备货状态',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupArea',
+          label: '备货区',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignStatus',
+          label: '指派状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockipAllocation',
+          label: '备货库位',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'goodsAreaId',
+          label: '备货区编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: true,
+        },
+        {
+          prop: 'forklift',
+          label: '叉车司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loader',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fixTime',
+          label: '确认完成备货时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignTime',
+          label: '指派时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '160',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -258,6 +389,23 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
+    /** 
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+     let newarr = this.$functions.getStorage(window.location.pathname);
+    if (newarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      newarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -270,6 +418,41 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /** 
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList  
+     */
+    setnewcolum(newarr, headarr) {
+      // console.log(newarr,'+++++++++++')
+      this.columnList = newarr;
+      this.$functions.setStorage(window.location.pathname, headarr);
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+    },
     //查询备货
     getStockUp(row){
       console.log("row",row);
@@ -491,8 +674,8 @@ export default {
       this.selectionList = list;
     },
     selectionClear () {
-      this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.selectionList = [];
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;

From 7a10ba012250516e180b707489c85d81926d34bb Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Mon, 3 Jul 2023 09:50:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0table=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/distributionStockup.vue           |   6 +-
 .../stockup/distributionStockupDiscuss.vue    | 659 ++++++++++++------
 .../stockup/distributionStockupMarket.vue     | 239 ++++++-
 .../stockup/distributionStockupSelf.vue       | 239 ++++++-
 4 files changed, 868 insertions(+), 275 deletions(-)

diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 00c18769..24261900 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -52,10 +52,8 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
-            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
-              >Delete</el-button
-            >
+            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>
           </template>
         </tablecmt>
       </el-row>
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index e0135ce3..cd18c0f3 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row :hidden="!search" style="padding:6px 18px">
+      <el-row :hidden="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="备货状态:">
@@ -11,7 +11,10 @@
             <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>
           </el-form-item>
           <el-form-item label="指派状态;1-未指派、2-已指派:">
-            <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
+            <el-input
+              v-model="query.assignStatus"
+              placeholder="请输入指派状态;1-未指派、2-已指派"
+            ></el-input>
           </el-form-item>
           <!-- 查询按钮 -->
           <el-form-item>
@@ -25,63 +28,60 @@
           <!-- 头部左侧按钮模块 -->
           <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>
-            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift(row)" >指派叉车司机</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift(row)"
+              >指派叉车司机</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
-            <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>
-            <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
-            <el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>
+            <el-button icon="el-icon-search" @click="onLoad">全部</el-button>
+            <el-button icon="el-icon-refresh" @click="getStockUp('2')">已备货</el-button>
+            <el-button icon="el-icon-search" @click="getStockUp('1')">待备货</el-button>
 
-<!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
-<!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
+            <!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
+            <!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
           </div>
         </div>
       </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="50" 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>
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+              >查看</el-button
+            >
+            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)"
+              >编辑</el-button
+            >
           </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>
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <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
+            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>
@@ -93,7 +93,8 @@
                 v-for="item in forkliftData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -103,7 +104,8 @@
                 v-for="item in loaderData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -113,51 +115,64 @@
                 v-for="item in goodsAreaIdData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormCustomer = false">取消</el-button>
-        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
-      </span>
+          <span class="dialog-footer">
+            <el-button @click="dialogFormCustomer = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
+          </span>
         </template>
       </el-dialog>
       <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
           <el-form-item label="备货时间" prop="stockupDate">
-            <el-date-picker v-model="form.stockupDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择备货时间"></el-date-picker>
+            <el-date-picker
+              v-model="form.stockupDate"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择备货时间"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="备货人" prop="stockupUser">
-            <el-input v-model="form.stockupUser" placeholder="请输入备货人"/>
+            <el-input v-model="form.stockupUser" placeholder="请输入备货人" />
           </el-form-item>
           <el-form-item label="备货状态" prop="stockupStatus">
-            <el-input v-model="form.stockupStatus" placeholder="请输入备货状态"/>
+            <el-input v-model="form.stockupStatus" placeholder="请输入备货状态" />
           </el-form-item>
           <el-form-item label="备货区" prop="stockupArea">
-            <el-input v-model="form.stockupArea" placeholder="请输入备货区"/>
+            <el-input v-model="form.stockupArea" placeholder="请输入备货区" />
           </el-form-item>
           <el-form-item label="指派状态;1-未指派、2-已指派" prop="assignStatus">
-            <el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态;1-未指派、2-已指派">
+            <el-select
+              v-model="form.assignStatus"
+              clearable
+              placeholder="请选择指派状态;1-未指派、2-已指派"
+            >
               <el-option
                 v-for="item in assignStatusData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="备货库位" prop="stockipAllocation">
-            <el-input v-model="form.stockipAllocation" placeholder="请输入备货库位"/>
+            <el-input v-model="form.stockipAllocation" placeholder="请输入备货库位" />
           </el-form-item>
           <el-form-item label="备货区编号" prop="goodsAreaId">
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号">
@@ -165,7 +180,8 @@
                 v-for="item in goodsAreaIdData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -175,7 +191,8 @@
                 v-for="item in forkliftData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -185,41 +202,204 @@
                 v-for="item in loaderData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="确认完成备货时间" prop="fixTime">
-            <el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
+            <el-date-picker
+              v-model="form.fixTime"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择确认完成备货时间"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="指派时间" prop="assignTime">
-            <el-date-picker v-model="form.assignTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择指派时间"></el-date-picker>
+            <el-date-picker
+              v-model="form.assignTime"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择指派时间"
+            ></el-date-picker>
           </el-form-item>
         </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 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,getListUser,addAssign } from "@/api/distribution/distributionStockup";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getListUser,
+  addAssign,
+} from '@/api/distribution/distributionStockup';
 import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
-import { getListOwn,getUser } from '@/api/system/user';
-import option from "@/option/distribution/distributionStockup";
-import { mapGetters } from "vuex";
+import { getListOwn, getUser } from '@/api/system/user';
+import option from '@/option/distribution/distributionStockup';
+import { mapGetters } from 'vuex';
 import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 
 export default {
-  data () {
+  data() {
     return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'stockupDate',
+          label: '备货时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockupUser',
+          label: '备货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatus',
+          label: '备货状态',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupArea',
+          label: '备货区',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignStatus',
+          label: '指派状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockipAllocation',
+          label: '备货库位',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'goodsAreaId',
+          label: '备货区编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: true,
+        },
+        {
+          prop: 'forklift',
+          label: '叉车司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loader',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fixTime',
+          label: '确认完成备货时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignTime',
+          label: '指派时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '160',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -239,7 +419,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -253,34 +433,86 @@ export default {
       loaderData: [],
       goodsAreaIdData: [],
       deptId: '',
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    let newarr = this.$functions.getStorage(window.location.pathname);
+    if (newarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      newarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
+    showdrawer(value) {
+      this.drawerShow = value;
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr) {
+      // console.log(newarr,'+++++++++++')
+      this.columnList = newarr;
+      this.$functions.setStorage(window.location.pathname, headarr);
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+    },
     //查询备货
-    getStockUp(row){
-      console.log("row",row);
+    getStockUp(row) {
+      console.log('row', row);
       let params = {};
       switch (row) {
-          case '1':
-            params.stockupStatus = '2'
-            break;
-          case '2':
-            params.stockupStatus = '3'
-            break;
+        case '1':
+          params.stockupStatus = '2';
+          break;
+        case '2':
+          params.stockupStatus = '3';
+          break;
       }
       getList(this.page.currentPage, this.page.pageSize, params).then(res => {
         const data = res.data.data;
@@ -291,125 +523,126 @@ export default {
       });
     },
     //查询叉车人员
-    async getFork(){
+    async getFork() {
       let ides = '';
-      let ide = {  };
-      await getListUser().then(res =>{
+      let ide = {};
+      await getListUser().then(res => {
         // console.log("res>>>",res.data.data);
         ides = res.data.data.tenantId;
         this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{
+      });
+      await getPostList(ides).then(res => {
         // console.log(">>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
+        res.data.data.forEach(i => {
+          if (i.postName == '叉车') {
             ide = i;
           }
-        })
-      })
+        });
+      });
       // console.log("ied>>>>>",ide);
-      let params={
+      let params = {
         postId: ide.id, //岗位
         deptId: this.deptId, //部门
         // roleId: '', //角色
-      }
-      getListOwn(Object.assign(params, this.query)).then(res =>{
+      };
+      getListOwn(Object.assign(params, this.query)).then(res => {
         // console.log(".............",res.data.data);
         let fo = [];
-        res.data.data.forEach( i =>{
-          let a ={
+        res.data.data.forEach(i => {
+          let a = {
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.name,
           };
           fo.push(a);
         });
         this.forkliftData = fo;
-      })
-     await this.getStorageArea();
-     await this.getTeam();
-
+      });
+      await this.getStorageArea();
+      await this.getTeam();
     },
     //查询班组
-    async getTeam(){
-      let params ={
-        department: this.deptId
-      }
-      getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res =>{
+    async getTeam() {
+      let params = {
+        department: this.deptId,
+      };
+      getListTeam(
+        this.page.currentPage,
+        this.page.pageSize,
+        Object.assign(params, this.query)
+      ).then(res => {
         // console.log(">><><",res.data.data.records);
-        let fo= [];
-        res.data.data.records.forEach(i =>{
-          let a= {
+        let fo = [];
+        res.data.data.records.forEach(i => {
+          let a = {
             dictKey: i.id,
-            dictValue: i.name +'-'+i.groupName
-          }
+            dictValue: i.name + '-' + i.groupName,
+          };
           fo.push(a);
         });
         this.loaderData = fo;
-      })
+      });
     },
     //备货区
-    async getStorageArea(){
-      let params ={
-        department: this.deptId
-      }
-      stockUp(params).then(res =>{
+    async getStorageArea() {
+      let params = {
+        department: this.deptId,
+      };
+      stockUp(params).then(res => {
         // console.log("res>>>",res.data.data);
-        let fo =[];
-        res.data.data.forEach(i =>{
+        let fo = [];
+        res.data.data.forEach(i => {
           let v = {
             dictKey: i.id,
-            dictValue: i.name +'-'+i.headline
-          }
-          fo.push(v)
-        })
+            dictValue: i.name + '-' + i.headline,
+          };
+          fo.push(v);
+        });
         this.goodsAreaIdData = fo;
-      })
+      });
     },
-     handleForklift(){
-       if (this.selectionList.length === 0) {
-         this.$message.warning("请选择至少一条数据");
-         return;
-       }
+    handleForklift() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
       this.dialogFormCustomer = true;
       this.getFork();
-      this.getTeam()
-
+      this.getTeam();
     },
     //确定指派
-    callFordelivery(){
+    callFordelivery() {
       this.form.ids = this.ids;
-      addAssign(this.form).then(res =>{
+      addAssign(this.form).then(res => {
         this.$message({
-          type: "success",
-          message: "操作成功！"
+          type: 'success',
+          message: '操作成功！',
         });
         this.onLoad(this.page);
         this.dialogFormCustomer = false;
-      })
-
+      });
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
       } else {
@@ -417,41 +650,41 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -460,16 +693,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -477,64 +710,64 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       this.query.typeService = 1;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
-       this.data.forEach(async i =>{
-         if(i.forklift != "-1"){
-           console.log("i==",i);
-           let a = await getUser(i.forklift);
-           i.forklift =a.data.data.name;
-         }
+        this.data.forEach(async i => {
+          if (i.forklift != '-1') {
+            console.log('i==', i);
+            let a = await getUser(i.forklift);
+            i.forklift = a.data.data.name;
+          }
 
-         i.loader = i.groupName;
-         i.stockupArea = i.headline;
-         if(i.assignStatus == '2'){
-           i.assignStatus = '已指派';
-         }else{
-           i.assignStatus = '未指派';
-         }
-         if(i.stockupStatus == '2'){
-           i.stockupStatus = '待备货';
-         }else if(i.stockupStatus == '3'){
-           i.stockupStatus = '已备货';
-         }else{
-           i.stockupStatus = '未备货';
-         }
-       });
-        this.selectionClear();
+          i.loader = i.groupName;
+          i.stockupArea = i.headline;
+          if (i.assignStatus == '2') {
+            i.assignStatus = '已指派';
+          } else {
+            i.assignStatus = '未指派';
+          }
+          if (i.stockupStatus == '2') {
+            i.stockupStatus = '待备货';
+          } else if (i.stockupStatus == '3') {
+            i.stockupStatus = '已备货';
+          } else {
+            i.stockupStatus = '未备货';
+          }
+        });
+        // this.selectionClear();
         this.loading = false;
       });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index efc859b0..c1ddb0bc 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -41,34 +41,21 @@
       </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="50" 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>
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>
           </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>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -206,6 +193,12 @@
       </el-dialog>
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
@@ -220,6 +213,142 @@ import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 export default {
   data () {
     return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'stockupDate',
+          label: '备货时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockupUser',
+          label: '备货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatus',
+          label: '备货状态',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupArea',
+          label: '备货区',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignStatus',
+          label: '指派状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockipAllocation',
+          label: '备货库位',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'goodsAreaId',
+          label: '备货区编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: true,
+        },
+        {
+          prop: 'forklift',
+          label: '叉车司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loader',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fixTime',
+          label: '确认完成备货时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignTime',
+          label: '指派时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '160',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -258,6 +387,23 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
+    /** 
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+     let newarr = this.$functions.getStorage(window.location.pathname);
+    if (newarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      newarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -270,6 +416,41 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /** 
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList  
+     */
+    setnewcolum(newarr, headarr) {
+      // console.log(newarr,'+++++++++++')
+      this.columnList = newarr;
+      this.$functions.setStorage(window.location.pathname, headarr);
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+    },
     //查询备货
     getStockUp(row){
       console.log("row",row);
@@ -287,7 +468,7 @@ export default {
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
-        this.selectionClear();
+        // this.selectionClear();
       });
     },
     //查询叉车人员
@@ -492,7 +673,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/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index b840f8a3..3eeea3fd 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -41,34 +41,21 @@
       </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="50" 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>
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>
           </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>
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -206,6 +193,12 @@
       </el-dialog>
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
@@ -220,6 +213,142 @@ import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 export default {
   data () {
     return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'stockupDate',
+          label: '备货时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockupUser',
+          label: '备货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupStatus',
+          label: '备货状态',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockupArea',
+          label: '备货区',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignStatus',
+          label: '指派状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'stockipAllocation',
+          label: '备货库位',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'goodsAreaId',
+          label: '备货区编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: true,
+        },
+        {
+          prop: 'forklift',
+          label: '叉车司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loader',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fixTime',
+          label: '确认完成备货时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assignTime',
+          label: '指派时间',
+          type: 5,
+          values: '',
+          width: '220',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '160',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -258,6 +387,23 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
+    /** 
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+     let newarr = this.$functions.getStorage(window.location.pathname);
+    if (newarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      newarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }
   },
   computed: {
     ...mapGetters(["permission"]),
@@ -270,6 +416,41 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /** 
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList  
+     */
+    setnewcolum(newarr, headarr) {
+      // console.log(newarr,'+++++++++++')
+      this.columnList = newarr;
+      this.$functions.setStorage(window.location.pathname, headarr);
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+    },
     //查询备货
     getStockUp(row){
       console.log("row",row);
@@ -287,7 +468,7 @@ export default {
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
-        this.selectionClear();
+        // this.selectionClear();
       });
     },
     //查询叉车人员
@@ -492,7 +673,7 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;