diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 4b9e5c1a..fd9451ee 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -227,7 +227,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="费用类型" prop="businessType" v-if="distriType">
+            <el-form-item label="配送类型" prop="businessType" v-if="distriType">
               <el-radio-group v-model="form.businessType" class="ml-4"  v-for="item in distributionType">
                 <el-radio :label="item.dictKey" size="large" style="margin-right: 25px">{{item.dictValue}}</el-radio>
                 <!--                  <el-radio label="2" size="large">Option 2</el-radio>-->
diff --git a/src/views/basicdata/brand/basicClientFrom.vue b/src/views/basicdata/brand/basicClientFrom.vue
index b0daffc4..b73732ce 100644
--- a/src/views/basicdata/brand/basicClientFrom.vue
+++ b/src/views/basicdata/brand/basicClientFrom.vue
@@ -210,7 +210,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="费用类型" prop="businessType" v-if="distriType">
+          <el-form-item label="配送类型" prop="businessType" v-if="distriType">
             <el-radio-group v-model="form.businessType" class="ml-4"  v-for="item in distributionType">
               <el-radio :label="item.dictKey" size="large" style="margin-right: 25px">{{item.dictValue}}</el-radio>
               <!--                  <el-radio label="2" size="large">Option 2</el-radio>-->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 331f76c7..d576aacc 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -61,7 +61,7 @@
             <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>
             <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>
             <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button>
-            <el-button type="danger" icon="el-icon-plus"  v-if = "handler">转配送</el-button>
+<!--            <el-button type="danger" icon="el-icon-plus"  v-if = "handler">转配送</el-button>-->
 
           </div>
           <div class="avue-crud__left">
@@ -93,7 +93,7 @@
         >
           <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>
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>-->
           </template>
         </tablecmt>
       </el-row>
@@ -469,7 +469,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'typeService',
+          prop: 'typeName',
           label: '服务类型',
           type: 3,
           values: '',
@@ -581,18 +581,76 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-     let newarr = this.$functions.getStorage(window.location.pathname);
-    if (newarr) {
+      // let checkList=[]
+      // this.columnList.map(item => {
+      //     item.head = false;
+      // });
+    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;
       });
-      newarr.map(ite => {
+      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: {
@@ -621,10 +679,19 @@ export default {
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr) {
+    setnewcolum(newarr, headarr,type) {
       // console.log(newarr,'+++++++++++')
-      this.columnList = newarr;
-      this.$functions.setStorage(window.location.pathname, headarr);
+      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);
@@ -644,6 +711,8 @@ export default {
       console.log(index, row);
       if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
       }else{
         this.query[row.prop] = index;
       }
@@ -952,7 +1021,7 @@ export default {
     handleEdit (row) {
       this.title = '编辑'
       this.box = true
-      getDetail(row.id).then(res => {
+      getDetail(row.row.id).then(res => {
         this.form = res.data.data;
       });
     },
@@ -963,11 +1032,12 @@ export default {
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
+      // console.log("查看===",row.row);
       this.$router.push({
         path: '/distribution/inventory/distributionStockArticleDetails',
         query: {
-          id : row.id,
-          name: "详情"+row.orderSelfNumbering
+          id : row.row.id,
+          name: "详情 - "+row.row.orderSelfNumbering
         },
       })
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 0a5c190f..f882b39d 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -92,7 +92,7 @@
         >
           <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>
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>-->
           </template>
         </tablecmt>
       </el-row>
@@ -580,18 +580,80 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-     let newarr = this.$functions.getStorage(window.location.pathname);
-    if (newarr) {
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+      // let checkList=[]
+      // this.columnList.map(item => {
+      //     item.head = false;
+      // });
+    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;
       });
-      newarr.map(ite => {
+      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: {
@@ -961,8 +1023,8 @@ export default {
       this.$router.push({
         path: '/distribution/inventory/distributionStockArticleDetails',
         query: {
-          id : row.id,
-          name: "详情"+row.orderSelfNumbering
+          id : row.row.id,
+          name: "详情"+row.row.orderSelfNumbering
         },
       })
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index b6dfecbb..6c36f7c9 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -92,7 +92,7 @@
         >
           <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>
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>-->
           </template>
         </tablecmt>
       </el-row>
@@ -576,22 +576,80 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
-     /**
+    /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-     let newarr = this.$functions.getStorage(window.location.pathname);
-    if (newarr) {
+      // let checkList=[]
+      // this.columnList.map(item => {
+      //     item.head = false;
+      // });
+    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;
       });
-      newarr.map(ite => {
+      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: {
@@ -961,8 +1019,8 @@ export default {
       this.$router.push({
         path: '/distribution/inventory/distributionStockArticleDetails',
         query: {
-          id : row.id,
-          name: "详情"+row.orderSelfNumbering
+          id : row.row.id,
+          name: "详情"+row.row.orderSelfNumbering
         },
       })
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index ab6b15a5..6172a974 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -92,7 +92,7 @@
         >
           <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>
+<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>-->
           </template>
         </tablecmt>
       </el-row>
@@ -576,22 +576,80 @@ export default {
   mounted () {
     this.init();
     this.onLoad(this.page);
-     /**
+    /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-     let newarr = this.$functions.getStorage(window.location.pathname);
-    if (newarr) {
+      // let checkList=[]
+      // this.columnList.map(item => {
+      //     item.head = false;
+      // });
+    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;
       });
-      newarr.map(ite => {
+      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: {
@@ -961,8 +1019,8 @@ export default {
       this.$router.push({
         path: '/distribution/inventory/distributionStockArticleDetails',
         query: {
-          id : row.id,
-          name: "详情"+row.orderSelfNumbering
+          id : row.row.id,
+          name: "详情"+row.row.orderSelfNumbering
         },
       })
 
diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index 55a52a60..21456635 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -23,46 +23,34 @@
           <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="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>
+<!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
+            <el-button type="danger" icon="el-icon-plus" @click="handleImport" 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>
         <!-- 列表模块 -->
-        <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 type="primary" text icon="el-icon-view" @click="handleViewDetails(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="handleViewDismantle(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="handleViewDetails(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-view" @click="handleViewDismantle(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%">
@@ -79,6 +67,15 @@
           </el-pagination>
         </div>
       </el-row>
+      <el-dialog title="用户数据导入" append-to-body v-model="excelBox" width="555px">
+        <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+          <template #excelTemplate>
+            <el-button type="primary" @click="handleTemplate">
+              点击下载<i class="el-icon-download el-icon--right"></i>
+            </el-button>
+          </template>
+        </avue-form>
+      </el-dialog>
       <!-- 拆包模块 -->
       <el-dialog :title="title"
                  v-model="dismantle"
@@ -190,6 +187,12 @@
       </el-dialog>
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
@@ -197,16 +200,310 @@ import { getList, getDetail, add, update, remove,addParcels } from "@/api/distri
 import { getListParcelDetails } from "@/api/distribution/distributionParcelDetails";
 import option from "@/option/distribution/distributionStockList";
 import { mapGetters } from "vuex";
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import dayjs from 'dayjs';
 
 export default {
   data () {
     return {
+      drawerShow: false,
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'incomingBatch',
+          label: '入库批次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderSelfNumbering',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'market',
+          label: '商场',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'cargoNumber',
+          label: '货物编号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shop',
+          label: '门店',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'storageLocation',
+          label: '库位信息',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'mallName',
+          label: '商城名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'outboundQuantity',
+          label: '出库数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'despatch',
+          label: '物流发运车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'factory',
+          label: '工厂车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'category',
+          label: '品分类',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unpack',
+          label: '是否拆包',
+          type: 3,
+          values: '',
+          width: '180',
+          checkarr: [ {
+            value: '2',
+            label: '是',
+          },
+            {
+              value: '1',
+              label: '否',
+            },],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeCode',
+          label: '门店编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketCode',
+          label: '商场编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shoppingMall',
+          label: '所属商场',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityOccupied',
+          label: '占用数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
       height: 0,
       // 弹框标题
       title: '',
       stockId: '', //拆包id
       // 是否展示弹框
       box: false,
+      excelBox: false, //导入
+      excelForm: {},
       dismantle: false, //是否展示拆包弹框
       // 是否显示查询
       search: true,
@@ -237,11 +534,79 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '模板上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '模板上传中，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data',
+            },
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: '/blade-system/user/import-user',
+          },
+          {
+            label: '数据覆盖',
+            prop: 'isCovered',
+            type: 'switch',
+            align: 'center',
+            width: 80,
+            dicData: [
+              {
+                label: '否',
+                value: 0,
+              },
+              {
+                label: '是',
+                value: 1,
+              },
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
+                required: true,
+                message: '请选择是否覆盖',
+                trigger: 'blur',
+              },
+            ],
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
     }
   },
   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"]),
@@ -261,6 +626,81 @@ 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);
+      if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(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) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+    handleImport(){
+      this.excelBox = true;
+    },
+    refreshChange() {
+      this.onLoad(this.page);
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleTemplate() {
+      exportBlob(
+        `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '用户数据模板.xlsx');
+      });
+    },
     //数量校验
     handleNumberRange(e,row) {
       // console.log("执行了2222",e,e.target.value,row);
@@ -435,7 +875,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/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue
index 43fbdde9..efb0327a 100644
--- a/src/views/distribution/inventory/distributionStockListDiscuss.vue
+++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue
@@ -27,40 +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="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-view" @click="handleViewDetails(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="handleViewDismantle(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%">
@@ -135,16 +125,315 @@
       </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/distribution/distributionStockList";
 import option from "@/option/distribution/distributionStockList";
 import { mapGetters } from "vuex";
+import dayjs from 'dayjs';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 
 export default {
   data () {
     return {
+      drawerShow: false,
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'incomingBatch',
+          label: '入库批次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderSelfNumbering',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'market',
+          label: '商场',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'cargoNumber',
+          label: '货物编号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shop',
+          label: '门店',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'storageLocation',
+          label: '库位信息',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'mallName',
+          label: '商城名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'outboundQuantity',
+          label: '出库数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'despatch',
+          label: '物流发运车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'factory',
+          label: '工厂车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'category',
+          label: '品分类',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unpack',
+          label: '是否拆包',
+          type: 3,
+          values: '',
+          width: '180',
+          checkarr: [ {
+            value: '2',
+            label: '是',
+          },
+            {
+              value: '1',
+              label: '否',
+            },],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeCode',
+          label: '门店编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketCode',
+          label: '商场编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shoppingMall',
+          label: '所属商场',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityOccupied',
+          label: '占用数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -177,6 +466,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"]),
@@ -189,6 +495,110 @@ 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);
+      if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(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) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+    handleImport(){
+      this.excelBox = true;
+    },
+    refreshChange() {
+      this.onLoad(this.page);
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleTemplate() {
+      exportBlob(
+        `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '用户数据模板.xlsx');
+      });
+    },
+    handleViewDetails (row) {
+      this.$router.push({
+        path: '/distribution/inventory/distributionStockListDetails',
+        query:{
+          id: row.id,
+          name: row.mallName+" — 明细"
+        }
+      });
+
+
+    },
+    handleViewDismantle (row) {
+      console.log("><<>L:",row);
+      this.dismantle = true;
+      this.view = true;
+      this.title = '拆包';
+      this.stockId = row.id;
+      //查询包件详情表
+      let par ={
+        parcelListId : row.parcelListId
+      }
+      getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
+        console.log("<><>===", res.data.data);
+        const data = res.data.data;
+        this.pageDetails.total = data.total;
+        this.formDetails = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -293,7 +703,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/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 43fbdde9..efb0327a 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -27,40 +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="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-view" @click="handleViewDetails(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="handleViewDismantle(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%">
@@ -135,16 +125,315 @@
       </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/distribution/distributionStockList";
 import option from "@/option/distribution/distributionStockList";
 import { mapGetters } from "vuex";
+import dayjs from 'dayjs';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 
 export default {
   data () {
     return {
+      drawerShow: false,
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'incomingBatch',
+          label: '入库批次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderSelfNumbering',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'market',
+          label: '商场',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'cargoNumber',
+          label: '货物编号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shop',
+          label: '门店',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'storageLocation',
+          label: '库位信息',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'mallName',
+          label: '商城名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'outboundQuantity',
+          label: '出库数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'despatch',
+          label: '物流发运车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'factory',
+          label: '工厂车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'category',
+          label: '品分类',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unpack',
+          label: '是否拆包',
+          type: 3,
+          values: '',
+          width: '180',
+          checkarr: [ {
+            value: '2',
+            label: '是',
+          },
+            {
+              value: '1',
+              label: '否',
+            },],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeCode',
+          label: '门店编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketCode',
+          label: '商场编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shoppingMall',
+          label: '所属商场',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityOccupied',
+          label: '占用数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -177,6 +466,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"]),
@@ -189,6 +495,110 @@ 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);
+      if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(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) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+    handleImport(){
+      this.excelBox = true;
+    },
+    refreshChange() {
+      this.onLoad(this.page);
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleTemplate() {
+      exportBlob(
+        `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '用户数据模板.xlsx');
+      });
+    },
+    handleViewDetails (row) {
+      this.$router.push({
+        path: '/distribution/inventory/distributionStockListDetails',
+        query:{
+          id: row.id,
+          name: row.mallName+" — 明细"
+        }
+      });
+
+
+    },
+    handleViewDismantle (row) {
+      console.log("><<>L:",row);
+      this.dismantle = true;
+      this.view = true;
+      this.title = '拆包';
+      this.stockId = row.id;
+      //查询包件详情表
+      let par ={
+        parcelListId : row.parcelListId
+      }
+      getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
+        console.log("<><>===", res.data.data);
+        const data = res.data.data;
+        this.pageDetails.total = data.total;
+        this.formDetails = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -293,7 +703,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/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue
index 43fbdde9..efb0327a 100644
--- a/src/views/distribution/inventory/distributionStockListSelf.vue
+++ b/src/views/distribution/inventory/distributionStockListSelf.vue
@@ -27,40 +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="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-view" @click="handleViewDetails(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="handleViewDismantle(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%">
@@ -135,16 +125,315 @@
       </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/distribution/distributionStockList";
 import option from "@/option/distribution/distributionStockList";
 import { mapGetters } from "vuex";
+import dayjs from 'dayjs';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { getListParcelDetails } from '@/api/distribution/distributionParcelDetails';
 
 export default {
   data () {
     return {
+      drawerShow: false,
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'incomingBatch',
+          label: '入库批次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderSelfNumbering',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'market',
+          label: '商场',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'cargoNumber',
+          label: '货物编号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shop',
+          label: '门店',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'storageLocation',
+          label: '库位信息',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'mallName',
+          label: '商城名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'outboundQuantity',
+          label: '出库数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'despatch',
+          label: '物流发运车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'factory',
+          label: '工厂车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'category',
+          label: '品分类',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unpack',
+          label: '是否拆包',
+          type: 3,
+          values: '',
+          width: '180',
+          checkarr: [ {
+            value: '2',
+            label: '是',
+          },
+            {
+              value: '1',
+              label: '否',
+            },],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeCode',
+          label: '门店编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketCode',
+          label: '商场编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'shoppingMall',
+          label: '所属商场',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'unit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'quantityOccupied',
+          label: '占用数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -177,6 +466,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"]),
@@ -189,6 +495,110 @@ 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);
+      if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(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) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+    handleImport(){
+      this.excelBox = true;
+    },
+    refreshChange() {
+      this.onLoad(this.page);
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleTemplate() {
+      exportBlob(
+        `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '用户数据模板.xlsx');
+      });
+    },
+    handleViewDetails (row) {
+      this.$router.push({
+        path: '/distribution/inventory/distributionStockListDetails',
+        query:{
+          id: row.id,
+          name: row.mallName+" — 明细"
+        }
+      });
+
+
+    },
+    handleViewDismantle (row) {
+      console.log("><<>L:",row);
+      this.dismantle = true;
+      this.view = true;
+      this.title = '拆包';
+      this.stockId = row.id;
+      //查询包件详情表
+      let par ={
+        parcelListId : row.parcelListId
+      }
+      getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
+        console.log("<><>===", res.data.data);
+        const data = res.data.data;
+        this.pageDetails.total = data.total;
+        this.formDetails = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -293,7 +703,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/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 0bf7b418..94bddff5 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -31,8 +31,8 @@
         <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>
+           <!-- <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" icon="el-icon-plus" @click="handleAdd">自提签收</el-button>
 
           </div>
@@ -387,7 +387,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'collect_fee',
+          prop: 'collectFee',
           label: '到付运费',
           type: 1,
           values: '',
@@ -470,7 +470,7 @@ export default {
         {
           prop: 'typeService',
           label: '服务类型',
-          type: 3,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -478,7 +478,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'pickUpTime',
+          prop: 'productInformation',
           label: '货品信息',
           type: 2,
           values: '',
@@ -488,7 +488,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'pickUpTime',
+          prop: 'pickupPhone',
           label: '提货手机',
           type: 2,
           values: '',
@@ -537,6 +537,16 @@ export default {
           fixed: false,
           sortable: false,
         },
+        {
+          prop: 'conditionName',
+          label: '状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
         {
           prop: 'totalCost',
           label: '费用合计',
@@ -590,6 +600,7 @@ export default {
       data: [],
       clientType: [],
       costList: [],
+      distributionType: [],
       costListName: [],
       certificateType: [],
 
@@ -713,11 +724,24 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 160);
       //字典
       getDictionaryBiz('delivery_cost').then(res => {
-
         this.clientType = res.data.data;
-      }); //字典
+      });
+      getDictionaryBiz('distribution_type').then(res => { //服务类型
+        this.distributionType = res.data.data;
+        this.columnList[17].checkarr = res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+      //字典
       getDictionaryBiz('certificate_type').then(res => {
         this.certificateType = res.data.data;
+        this.columnList[23].checkarr = res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
       });
     },
     searchHide () {