diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 16b09b01..1041b5aa 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -79,7 +79,7 @@
         <template #default="scope">
           <el-text class="mx-2" v-if="Number(column.type)<6&&Number(column.type)>0">{{ scope.row[column.prop] }}</el-text>
           <slot v-if="column.type == 6" :scope="scope"></slot>
-          <el-image preview-teleported v-if="column.type==7" style="width: 60px; height: 60px;margin-left: 10px;" :initial-index="index" :z-index="2040" v-for="(item,index) in scope.row[column.prop].split(',')" :src="item" :preview-src-list="scope.row[column.prop].split(',')"/>
+          <el-image preview-teleported v-if="column.type==7" style="width: 60px; height: 60px;margin-left: 10px;" :initial-index="index" :z-index="100" v-for="(item,index) in scope.row[column.prop].split(',')" :src="item" :preview-src-list="scope.row[column.prop].split(',')"/>
           <!-- <slot v-if="column.type == 7" name="test" :testdata="scope"></slot> -->
           <!-- <el-button
             v-if="column.type == 6"
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 1612baf0..a152599e 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -170,7 +170,7 @@ export default {
           checkarr: [],
           fixed: true,
           sortable: true,
-          head: true,
+          // head: true,
         },
         {
           prop: 'warehouseName',
@@ -231,7 +231,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: true,
+
         },
         {
           prop: 'customersNumber',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 4832e016..d6cf2fd0 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -1,16 +1,6 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-<!--      <el-row :hidden="!search" style="padding:6px 18px">-->
-<!--        &lt;!&ndash; 查询模块 &ndash;&gt;-->
-<!--        <el-form :inline="true" :model="query">-->
-<!--          &lt;!&ndash; 查询按钮 &ndash;&gt;-->
-<!--          <el-form-item>-->
-<!--            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>-->
-<!--            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>-->
-<!--          </el-form-item>-->
-<!--        </el-form>-->
-<!--      </el-row>-->
       <el-row :gutter="24" class="rows">
         <el-col :xl="14" :lg="7" :md="8" :sm="24" >
           <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总件数：{{statistics.deliveriesTotal}} </span>
@@ -20,53 +10,65 @@
         </el-col>
       </el-row>
       <el-row style="margin-top: 30px">
-<!--        <el-button-group>-->
-<!--          <el-button type="primary"  @click="deliverytype('')" >全部</el-button>-->
-<!--          <el-button type="primary"  @click="deliverytype('2')">商配<i class="el-icon-arrow-right el-icon&#45;&#45;right"></i></el-button>-->
-<!--          <el-button type="primary"  @click="deliverytype('1')">市配</el-button>-->
-<!--        </el-button-group>-->
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left" style="margin-top: 20px">
-<!--            <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>-->
           </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="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="selectionsc"
+        >
+          <template #default="slotProps">
+            <el-button size="small" @click="editsolt(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="handleViewBlank(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        </tablecmt>
+        <!--        <el-table ref="table" v-loading="loading"-->
+        <!--                  @selection-change="selectionChange"-->
+        <!--                  :data="data"-->
+        <!--                  :height="height"-->
+        <!--                  style="width: 100%"-->
+        <!--                  :border="option.border">-->
+        <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
+        <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+        <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
+        <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+        <!--          <template v-for="(item,index) in option.column">-->
+        <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
+        <!--            <el-table-column v-if="item.hide!==true"-->
+        <!--                             :prop="item.prop"-->
+        <!--                             :label="item.label"-->
+        <!--                             :width="item.width"-->
+        <!--                             :key="index">-->
+        <!--            </el-table-column>-->
+        <!--          </template>-->
+        <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
+        <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+        <!--            <template #="{row}">-->
+        <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
+        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
+        <!--            </template>-->
+        <!--          </el-table-column>-->
+        <!--        </el-table>-->
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -86,10 +88,16 @@
       <!-- 表单模块 -->
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove, getstatistics } from '@/api/distribution/distributionDeliveryList';
+import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList";
 import option from "@/option/distribution/distributionDeliveryList";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -97,6 +105,7 @@ import { getDictionaryBiz } from '@/api/system/dict';
 export default {
   data () {
     return {
+
       height: 0,
       // 弹框标题
       title: '',
@@ -112,6 +121,7 @@ export default {
       query: {},
       //数据统计
       statistics:{},
+      drawerShow: false,
       // 分页信息
       page: {
         currentPage: 1,
@@ -128,6 +138,160 @@ export default {
       form: {},
       // 选择行
       selectionList: [],
+      columnList: [
+        // {
+        //   prop: '',
+        //   label: '序号',
+        //   type: 0,
+        //   values: '',
+        //   width: 55,
+        //   checkarr: [],
+        //   fixed: true,
+        // },
+        {
+          prop: 'trainNumber',
+          label: '车次',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'warehouseName',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'kind',
+          label: '配送种类',
+          type: 3,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'vehicleName',
+          label: '配送车辆',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'driverName',
+          label: '配送司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'distributionCompany',
+          label: '配送公司',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'state',
+          label: '配送状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'customersNumber',
+          label: '配送客户数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'price',
+          label: '配送价格',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'orderNumber',
+          label: '订单总数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryNumber',
+          label: '配送件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'scannedNumber',
+          label: '扫描件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loadingTeam',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed:'right',
+          sortable: false,
+        }
+        // 更多列的配置...
+      ],
       // 表单配置
       option: option,
       // 表单列表
@@ -137,7 +301,23 @@ export default {
   mounted () {
     this.queryDictionary();
     this.init();
-
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    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"]),
@@ -150,23 +330,84 @@ 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);
+      this.$router.push({
+        path: '/distribution/deliverylist/distributionDeliveryListedt',
+        query: {
+          id: row.id,
+          name: row.trainNumber +'-查看配送'
+        }
+      });
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      this.query[row.prop] =index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      this.query[row.prop] =index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
     queryDictionary() {
       getDictionaryBiz('delivery_type').then(res => {
         this.deliverytypeData = res.data.data;
       });
       getDictionaryBiz('distribution_deliverylist_kind').then(res => {
         this.deliverykindData = res.data.data;
+        this.columnList[2].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+
       });
       getDictionaryBiz('distribution_deliverylist_state').then(res => {
         this.deliveryliststateData = res.data.data;
+        this.columnList[6].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
         this.onLoad(this.page);
       });
     },
     //类型切换
-    deliverytype(type){
-      this.query.type=type;
-      this.onLoad(this.page)
-    },
+    // deliverytype(type){
+    //   this.query.type=type;
+    //   this.onLoad(this.page)
+    // },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -280,7 +521,7 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
@@ -292,8 +533,8 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-      this.query.type='1'
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      this.query.type ='1'
+      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         for (let i = 0; i < data.records.length; i++) {
@@ -325,7 +566,9 @@ export default {
       getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         this.statistics = res.data.data
       });
-
+      // getDetail(row.id).then(res => {
+      //   this.form = res.data.data;
+      // });
     }
   }
 };
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index c9b1f4d2..9c8d1c79 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -1,16 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-<!--      <el-row :hidden="!search" style="padding:6px 18px">-->
-<!--        &lt;!&ndash; 查询模块 &ndash;&gt;-->
-<!--        <el-form :inline="true" :model="query">-->
-<!--          &lt;!&ndash; 查询按钮 &ndash;&gt;-->
-<!--          <el-form-item>-->
-<!--            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>-->
-<!--            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>-->
-<!--          </el-form-item>-->
-<!--        </el-form>-->
-<!--      </el-row>-->
+
       <el-row :gutter="24" class="rows">
         <el-col :xl="14" :lg="7" :md="8" :sm="24" >
           <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总件数：{{statistics.deliveriesTotal}} </span>
@@ -20,54 +11,65 @@
         </el-col>
       </el-row>
       <el-row style="margin-top: 30px">
-<!--        <el-button-group>-->
-<!--          <el-button type="primary"  @click="deliverytype('')" >全部</el-button>-->
-<!--          <el-button type="primary"  @click="deliverytype('2')">商配<i class="el-icon-arrow-right el-icon&#45;&#45;right"></i></el-button>-->
-<!--          <el-button type="primary"  @click="deliverytype('1')">市配</el-button>-->
-<!--        </el-button-group>-->
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left" style="margin-top: 20px">
-<!--            <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>-->
           </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="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="selectionsc"
+        >
+          <template #default="slotProps">
+            <el-button size="small" @click="editsolt(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-view" @click="handleViewBlank(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        </tablecmt>
+        <!--        <el-table ref="table" v-loading="loading"-->
+        <!--                  @selection-change="selectionChange"-->
+        <!--                  :data="data"-->
+        <!--                  :height="height"-->
+        <!--                  style="width: 100%"-->
+        <!--                  :border="option.border">-->
+        <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
+        <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+        <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
+        <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+        <!--          <template v-for="(item,index) in option.column">-->
+        <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
+        <!--            <el-table-column v-if="item.hide!==true"-->
+        <!--                             :prop="item.prop"-->
+        <!--                             :label="item.label"-->
+        <!--                             :width="item.width"-->
+        <!--                             :key="index">-->
+        <!--            </el-table-column>-->
+        <!--          </template>-->
+        <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
+        <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+        <!--            <template #="{row}">-->
+        <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
+        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
+        <!--            </template>-->
+        <!--          </el-table-column>-->
+        <!--        </el-table>-->
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -87,10 +89,16 @@
       <!-- 表单模块 -->
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove, getstatistics } from '@/api/distribution/distributionDeliveryList';
+import { getList, getDetail, add, update, remove,getPage,getstatistics } from "@/api/distribution/distributionDeliveryList";
 import option from "@/option/distribution/distributionDeliveryList";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -98,6 +106,7 @@ import { getDictionaryBiz } from '@/api/system/dict';
 export default {
   data () {
     return {
+
       height: 0,
       // 弹框标题
       title: '',
@@ -113,6 +122,7 @@ export default {
       query: {},
       //数据统计
       statistics:{},
+      drawerShow: false,
       // 分页信息
       page: {
         currentPage: 1,
@@ -129,6 +139,160 @@ export default {
       form: {},
       // 选择行
       selectionList: [],
+      columnList: [
+        // {
+        //   prop: '',
+        //   label: '序号',
+        //   type: 0,
+        //   values: '',
+        //   width: 55,
+        //   checkarr: [],
+        //   fixed: true,
+        // },
+        {
+          prop: 'trainNumber',
+          label: '车次',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'warehouseName',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'kind',
+          label: '配送种类',
+          type: 3,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'vehicleName',
+          label: '配送车辆',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'driverName',
+          label: '配送司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'distributionCompany',
+          label: '配送公司',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'state',
+          label: '配送状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'customersNumber',
+          label: '配送客户数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'price',
+          label: '配送价格',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'orderNumber',
+          label: '订单总数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryNumber',
+          label: '配送件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'scannedNumber',
+          label: '扫描件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loadingTeam',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed:'right',
+          sortable: false,
+        }
+        // 更多列的配置...
+      ],
       // 表单配置
       option: option,
       // 表单列表
@@ -138,7 +302,23 @@ export default {
   mounted () {
     this.queryDictionary();
     this.init();
-
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    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"]),
@@ -151,23 +331,84 @@ 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);
+      this.$router.push({
+        path: '/distribution/deliverylist/distributionDeliveryListedt',
+        query: {
+          id: row.id,
+          name: row.trainNumber +'-查看配送'
+        }
+      });
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      this.query[row.prop] =index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      this.query[row.prop] =index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
     queryDictionary() {
       getDictionaryBiz('delivery_type').then(res => {
         this.deliverytypeData = res.data.data;
       });
       getDictionaryBiz('distribution_deliverylist_kind').then(res => {
         this.deliverykindData = res.data.data;
+        this.columnList[2].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+
       });
       getDictionaryBiz('distribution_deliverylist_state').then(res => {
         this.deliveryliststateData = res.data.data;
+        this.columnList[6].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
         this.onLoad(this.page);
       });
     },
     //类型切换
-    deliverytype(type){
-      this.query.type=type;
-      this.onLoad(this.page)
-    },
+    // deliverytype(type){
+    //   this.query.type=type;
+    //   this.onLoad(this.page)
+    // },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
@@ -281,7 +522,7 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
@@ -293,8 +534,8 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-      this.query.type='2'
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      this.query.type = '2'
+      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         for (let i = 0; i < data.records.length; i++) {
@@ -326,7 +567,9 @@ export default {
       getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         this.statistics = res.data.data
       });
-
+      // getDetail(row.id).then(res => {
+      //   this.form = res.data.data;
+      // });
     }
   }
 };
diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue
index e220de45..71254ba2 100644
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@@ -133,8 +133,8 @@ export default {
         //   fixed: true,
         // },
         {
-          prop: 'number',
-          label: '编号',
+          prop: 'serviceNumber',
+          label: '服务号',
           type: 2,
           values: '',
           width: '150',
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index ba7aa1e0..25c44005 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -216,7 +216,7 @@ export default {
           head: false,
         },
         {
-          prop: 'orderId',
+          prop: 'orderSelfNumbering',
           label: '订单自编号',
           type: 2,
           values: '',
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index c5d8db30..c76928b3 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -224,7 +224,7 @@ export default {
           head: false,
         },
         {
-          prop: 'orderId',
+          prop: 'orderSelfNumbering',
           label: '订单自编号',
           type: 2,
           values: '',
diff --git a/src/views/distribution/turndelivery/deliveryInfo.vue b/src/views/distribution/turndelivery/deliveryInfo.vue
index 7e209eac..09a20def 100644
--- a/src/views/distribution/turndelivery/deliveryInfo.vue
+++ b/src/views/distribution/turndelivery/deliveryInfo.vue
@@ -18,12 +18,8 @@
     </el-row>
   </div> -->
   <div class="tabbertop">
-    <div class="xz">
-      自主配送
-    </div>
-    <div>
-      外协配送
-    </div>
+    <div @click="ccc" :class="aaa ? 'xz' : ''">自主配送</div>
+    <div @click="ddd" :class="bbb ? 'xz' : ''">外协配送</div>
   </div>
   <!-- <div style="border: 3px solid pink; margin: 2%" v-if="aaa">
     <el-form ref="form" :model="form" label-width="100px" style="margin: 3px">
@@ -147,66 +143,132 @@
     </el-form>
   </div> -->
   <div class="maboxc">
-    <div class="minbox">
+    <div class="minbox" v-if="aaa">
       <div>
         <span>*</span>
         车辆信息
       </div>
       <div>
-        <el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
+        <el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
           <div class="itemmabox">
-            <span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
+            <span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
               {{ item }}
             </span>
           </div>
         </el-scrollbar>
       </div>
     </div>
-    <div class="minbox">
+    <div class="minbox" v-if="aaa">
       <div>
         <span>*</span>
         司机负责人
       </div>
       <div>
-        <el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
+        <el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
           <div class="itemmabox">
-            <span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
+            <span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
               {{ item }}
             </span>
           </div>
         </el-scrollbar>
       </div>
     </div>
-    <div class="minbox">
+    <div class="minbox" v-if="aaa">
       <div>
         <span>*</span>
         配送司机信息
       </div>
       <div>
-        <el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
+        <el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
           <div class="itemmabox">
-            <span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
+            <span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
               {{ item }}
             </span>
           </div>
         </el-scrollbar>
       </div>
     </div>
+    <el-col style="margin-right: 20px;" :span="6" v-if="bbb">
+      <el-form-item label="外协来源:" prop="goodsShelfId">
+        <el-select v-model="form.tripartiteSource" placeholder="请选择来源">
+          <el-option
+            v-for="item in tripartiteSourceData"
+            :key="item.dictKey"
+            :label="item.dictValue"
+            :value="item.dictValue"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-col>
+    <el-col style="margin-right: 20px;" :span="6" v-if="bbb">
+      <el-form-item label="司机名称:" prop="goodsShelfId">
+        <el-input v-model="form.driverName" placeholder="请输入司机名称"></el-input>
+      </el-form-item>
+    </el-col>
+    <el-col style="margin-right: 20px;" :span="6" v-if="bbb">
+      <el-form-item label="司机电话:" prop="goodsShelfId">
+        <el-input v-model="form.deiverPhone" placeholder="请输入本次费用"></el-input>
+      </el-form-item>
+    </el-col>
+    <el-col style="margin-right: 20px;" :span="6" v-if="bbb">
+      <el-form-item label="车辆车牌:" prop="goodsShelfId">
+        <el-input v-model="form.vehicleNum" placeholder="请输入本次费用"></el-input>
+      </el-form-item>
+    </el-col>
+    <el-col style="margin-right: 20px;" :span="6" v-if="bbb">
+      <el-form-item label="配送费用:" prop="goodsShelfId">
+        <el-input v-model="form.deliveryFee" placeholder="请输入本次费用"></el-input>
+      </el-form-item>
+    </el-col>
     <div class="minbox">
       <div>
         <span>*</span>
         叉车司机
       </div>
       <div>
-        <el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
+        <el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
           <div class="itemmabox">
-            <span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
+            <span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
               {{ item }}
             </span>
           </div>
         </el-scrollbar>
       </div>
     </div>
+    <div class="duoxuan">
+      <el-checkbox-group v-model="this.loadAndUnload">
+        <el-checkbox
+          v-for="item in loadAndUnloadData"
+          :label="item.dictKey"
+          :value="item.dictKey"
+          >{{ item.dictValue }}</el-checkbox
+        >
+      </el-checkbox-group>
+    </div>
+    <div class="beihuobox">
+      <div>备货</div>
+      <div>
+        <el-date-picker
+          v-model="timevalue"
+          type="datetime"
+          placeholder="Pick a Date"
+          format="YYYY/MM/DD hh:mm:ss"
+          value-format="x"
+        />
+      </div>
+    </div>
+    <div class="remarksbox">
+      <div class="titl">备注</div>
+      <el-input
+        v-model="remarks"
+        maxlength="300"
+        placeholder="Please input"
+        show-word-limit
+        rows="2"
+        type="textarea"
+      />
+    </div>
   </div>
   <div style="border: 3px solid pink; margin: 2%" v-if="bbb">
     <el-form ref="form" :model="form" label-width="100px" style="margin: 3px">
@@ -321,20 +383,19 @@
     <el-row>
       <!-- 列表模块 -->
       <tablecmt
-          :columnList="columnList"
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionsc"
-        >
-          <template #default="slotProps">
-            <el-button size="small" @click="editsolt(slotProps.scope)">查看</el-button>
-
-          </template>
-        </tablecmt>
+        :columnList="columnList"
+        :tableData="data"
+        :loading="loading"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionsc"
+      >
+        <template #default="slotProps">
+          <el-button size="small" @click="editsolt(slotProps.scope)">查看</el-button>
+        </template>
+      </tablecmt>
     </el-row>
     <el-form-item style="margin-left: 45%; margin-top: 10px">
       <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
@@ -615,6 +676,9 @@ export default {
       loadAndUnloadData: [],
       tripartiteSourceData: [],
       loadAndUnload: [],
+      checkList: [],
+      timevalue: '',
+      remarks: '',
     };
   },
   created() {
@@ -641,7 +705,7 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-     let newarr = this.$functions.getStorage(window.location.pathname);
+    let newarr = this.$functions.getStorage(window.location.pathname);
     if (newarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -656,8 +720,8 @@ export default {
     }
   },
   methods: {
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
@@ -986,72 +1050,89 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .tabbertop{
-    width: 100%;
-    // height: 6px;
-    background-color: #ffffff;
+.beihuobox {
+  display: flex;
+  align-items: center;
+  margin-right: 20px;
+  margin-left: 20px;
+  > div:nth-of-type(1) {
+    margin-right: 20px;
+  }
+}
+.remarksbox {
+  display: flex;
+  align-items: flex-start;
+  width: 100%;
+  min-height: 150px;
+  > .titl {
+    width: 40px;
+  }
+}
+.tabbertop {
+  width: 100%;
+  // height: 6px;
+  background-color: #ffffff;
+  display: flex;
+  align-items: center;
+  padding-left: 50px;
+  box-sizing: border-box;
+  > div {
+    width: 150px;
+    font-size: 20px;
+    height: 50px;
     display: flex;
     align-items: center;
-    padding-left: 50px;
-    box-sizing: border-box;
-    >div{
-      width: 150px;
-      font-size: 20px;
-      height: 50px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      
-    }
-    .xz{
-      color: #D3832A;
-      border-bottom: 5px solid #D3832A;
-    }
+    justify-content: center;
+    border-bottom: 5px solid #d3832a00;
+  }
+  .xz {
+    color: #d3832a;
+    border-bottom: 5px solid #d3832a;
   }
-  .maboxc{
-    width: 98%;
-    margin: auto;
-    padding: 20px;
+}
+.maboxc {
+  width: 98%;
+  margin: auto;
+  padding: 20px;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  background-color: #ffffff;
+  margin-bottom: 20px;
+  border-radius: 5px;
+  margin-top: 10px;
+  box-sizing: border-box;
+  > .minbox {
     display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    box-sizing: border-box;
-    background-color: #ffffff;
+    align-items: flex-start;
+    margin-right: 30px;
     margin-bottom: 20px;
-    border-radius: 5px;
-    margin-top: 10px;
-    box-sizing: border-box;
-    >.minbox{
+    > div:nth-of-type(1) {
       display: flex;
-      align-items: flex-start;
-      margin-right: 30px;
-      margin-bottom: 20px;
-      >div:nth-of-type(1){
-        display: flex;
-        align-items: center;
-        >span{
-          color: #ff0000;
-          font-size: 20px;
-        }
+      align-items: center;
+      > span {
+        color: #ff0000;
+        font-size: 20px;
       }
-      >div:nth-of-type(2){
-        width: 220px;
-        margin-left: 10px;
-        border-radius: 3px;
-        .itemmabox{
-          display: flex;
-          flex-direction: column;
-          >span{
-            width: 100%;
-            // height: 32px;
-            // background-color: #ffffff;
-            border: 1px solid #EEEEEE;
-            box-sizing: border-box;
-            padding: 5px;
-
-          }
+    }
+    > div:nth-of-type(2) {
+      width: 220px;
+      margin-left: 10px;
+      border-radius: 3px;
+      .itemmabox {
+        display: flex;
+        flex-direction: column;
+        > span {
+          width: 100%;
+          // height: 32px;
+          // background-color: #ffffff;
+          border: 1px solid #eeeeee;
+          box-sizing: border-box;
+          padding: 5px;
         }
       }
     }
   }
+}
 </style>