From a580f8b5c537be50a85bc3f2e6dad0de523cbdff Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Fri, 30 Jun 2023 17:59:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A1=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/deline/basicDeline.vue        |   1 +
 .../deliverylist/distributionDeliveryList.vue | 315 +++++++-
 ...t2.vue => distributionDeliveryListdis.vue} |  11 +-
 .../distributionDeliveryListedt.vue           |   3 +-
 ...t3.vue => distributionDeliveryListmar.vue} |   8 +-
 .../signfor/distributionSignfor.vue           |  37 +-
 .../signfor/distributionSignfortreat.vue      | 709 ++++++++++++++++++
 7 files changed, 1023 insertions(+), 61 deletions(-)
 rename src/views/distribution/deliverylist/{distributionDeliveryList2.vue => distributionDeliveryListdis.vue} (93%)
 rename src/views/distribution/deliverylist/{distributionDeliveryList3.vue => distributionDeliveryListmar.vue} (96%)
 create mode 100644 src/views/distribution/signfor/distributionSignfortreat.vue

diff --git a/src/views/basic/deline/basicDeline.vue b/src/views/basic/deline/basicDeline.vue
index 7dcbf885..74f3f808 100644
--- a/src/views/basic/deline/basicDeline.vue
+++ b/src/views/basic/deline/basicDeline.vue
@@ -119,6 +119,7 @@
         this.edit =false
 
       },
+
       viewDeline(row){
         console.log("row>>>>>>>>>>>>>>>>>>>>",row);
         this.delineformdata={}
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 57a96a3a..6bb70bda 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -32,40 +32,56 @@
           <!-- 头部右侧按钮模块 -->
           <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%">
@@ -85,6 +101,12 @@
       <!-- 表单模块 -->
     </div>
   </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
@@ -96,6 +118,7 @@ import { getDictionaryBiz } from '@/api/system/dict';
 export default {
   data () {
     return {
+
       height: 0,
       // 弹框标题
       title: '',
@@ -111,6 +134,7 @@ export default {
       query: {},
       //数据统计
       statistics:{},
+      drawerShow: false,
       // 分页信息
       page: {
         currentPage: 1,
@@ -127,6 +151,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,
       // 表单列表
@@ -136,7 +314,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"]),
@@ -149,15 +343,78 @@ 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 => {
+        console.log("res.data.data>>>>>>>>",res.data.data);
         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);
       });
     },
@@ -279,7 +536,7 @@ export default {
     },
     selectionClear () {
       this.selectionList = [];
-      this.$refs.table.clearSelection();
+      // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList2.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
similarity index 93%
rename from src/views/distribution/deliverylist/distributionDeliveryList2.vue
rename to src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 5a993325..4832e016 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList2.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -28,7 +28,7 @@
         <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="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
 <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -46,10 +46,10 @@
                   :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="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>
+<!--          <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"
@@ -62,11 +62,8 @@
           <!-- 操作栏模块 -->
           <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>
-<!--              <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>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index dcd1e119..610b9bac 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -145,7 +145,7 @@ export default {
       edt:false,
       //查看pda
       padview:false,
-      // 是否为查看模式
+      // 是否为查看模式。。
       view: false,
       // 查询信息
       query: {},
@@ -391,7 +391,6 @@ export default {
       this.box = true;
       getWrapdetail(row.id).then(res => {
         console.log("查看>>>>>>>",res.data.data);
-        // this.wrapdata = res.data.data;
       });
     },
     handleDelete() {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList3.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
similarity index 96%
rename from src/views/distribution/deliverylist/distributionDeliveryList3.vue
rename to src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index e7a15368..c9b1f4d2 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList3.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -28,7 +28,7 @@
         <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="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
 <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -46,10 +46,10 @@
                   :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="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>
+<!--          <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"
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index 7f47b4a6..02b345e3 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -26,22 +26,22 @@
       </tablecmt> -->
       <el-row :hidden="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
-          <!-- 查询按钮 -->
-          <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-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>
         <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-->
+<!--            >-->
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -64,10 +64,9 @@
           @selection="selectionsc"
         >
           <template #default="slotProps">
-            <el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
-            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
-              >Delete</el-button
-            >
+            <el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
+<!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
+<!--              >Delete</el-button>-->
           </template>
         </tablecmt>
         <!-- <el-table ref="table" v-loading="loading"
@@ -505,8 +504,8 @@ export default {
     this.queryDictionary();
     this.init();
     this.onLoad(this.page);
-    
-    /** 
+
+    /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
@@ -539,9 +538,9 @@ export default {
     showdrawer(value){
       this.drawerShow=value
     },
-    /** 
+    /**
      * 弹窗的勾选回调，用于更改头部数组
-     * 固定搭配，只需要更换   columnList  
+     * 固定搭配，只需要更换   columnList
      */
     setnewcolum(newarr, headarr) {
       // console.log(newarr,'+++++++++++')
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
new file mode 100644
index 00000000..7f47b4a6
--- /dev/null
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -0,0 +1,709 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <!-- <tablecmt
+      :columnList="columnList"
+      :tableData="tableData"
+      @inputTxt='inputsc'
+      @timeCheck="timesc"
+      @btnCheck="btnsc"
+      @selectCheck="selectsc"
+      @selection="selectionsc"
+      >
+      <template #default="slotProps">
+        <el-button
+            size="small"
+            @click="editsolt(slotProps.scope)"
+            >Edit</el-button
+          >
+          <el-button
+            size="small"
+            type="danger"
+            @click="delectsolt(slotProps.scope)"
+            >Delete</el-button
+          >
+      </template>
+      </tablecmt> -->
+      <el-row :hidden="!search" style="padding: 6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionsc"
+        >
+          <template #default="slotProps">
+            <el-button size="small" @click="editsolt(slotProps.scope)">Edit</el-button>
+            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
+              >Delete</el-button
+            >
+          </template>
+        </tablecmt>
+        <!-- <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">
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #="{row}">
+              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">签收</el-button>
+            </template>
+          </el-table-column>
+        </el-table> -->
+      </el-row>
+      <el-row>
+        <div class="avue-crud__pagination" style="width: 100%">
+          <!-- 分页模块 -->
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[10, 20, 30, 40, 50, 100]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <!--          <el-form-item label="订单自编号;订单关联id" prop="orderId">-->
+          <!--            <el-input v-model="form.orderId" placeholder="请输入订单自编号;订单关联id"/>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="收货人" prop="consignee">
+            <el-input v-model="form.consignee" placeholder="请输入收货人" />
+          </el-form-item>
+          <el-form-item label="收货人手机号" prop="consigneePhone">
+            <el-input v-model="form.consigneePhone" placeholder="请输入收货人手机号" />
+          </el-form-item>
+          <el-form-item label="收货地址" prop="deliveryAddress">
+            <el-input v-model="form.deliveryAddress" placeholder="请输入收货地址" />
+          </el-form-item>
+          <!--          <el-form-item label="服务类型" prop="serveType">-->
+          <!--            <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="服务类型" prop="serveType">-->
+          <!--            <el-input v-model="form.serveType" placeholder="请输入服务类型"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="配送仓库" prop="distributingWarehouse">-->
+          <!--            <el-input v-model="form.distributingWarehouse" placeholder="请输入配送仓库"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="配送车次" prop="trainNumber">-->
+          <!--            <el-input v-model="form.trainNumber" placeholder="请输入配送车次"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="订单总数" prop="orderTotal">-->
+          <!--            <el-input v-model="form.orderTotal" placeholder="请输入订单总数"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="总件数" prop="total">-->
+          <!--            <el-input v-model="form.total" placeholder="请输入总件数"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="装车件数" prop="loadedNumber">-->
+          <!--            <el-input v-model="form.loadedNumber" placeholder="请输入装车件数"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="签收数" prop="receivedQuantity">-->
+          <!--            <el-input v-model="form.receivedQuantity" placeholder="请输入签收数"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="送货司机" prop="deliveryDriver">-->
+          <!--            <el-input v-model="form.deliveryDriver" placeholder="请输入送货司机"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="送货司机手机号" prop="deliveryDriverPhone">-->
+          <!--            <el-input v-model="form.deliveryDriverPhone" placeholder="请输入送货司机手机号"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="签收时间" prop="signingTime">-->
+          <!--            <el-input v-model="form.signingTime" placeholder="请输入签收时间"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="签收人" prop="signee">-->
+          <!--            <el-input v-model="form.signee" placeholder="请输入签收人"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="签收状态;1-未签收,2-司机签收,3-文员签收" prop="signingStatus">-->
+          <!--            <el-select v-model="form.signingStatus" clearable placeholder="请选择签收状态;1-未签收,2-司机签收,3-文员签收">-->
+          <!--              <el-option-->
+          <!--                v-for="item in signingStatusData"-->
+          <!--                :key="item.dictKey"-->
+          <!--                :label="item.dictValue"-->
+          <!--                :value="item.dictKey">-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="签收类型" prop="signingType">
+            <el-select v-model="form.signingType" clearable placeholder="请选择签收类型">
+              <el-option
+                v-for="item in signingTypeData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="文员复核图片" prop="clerkSignPictures">
+            <el-input v-model="form.clerkSignPictures" placeholder="请上传文员复核图片" />
+          </el-form-item>
+          <!--          <el-form-item label="司机签收图片" prop="deliverySignPictures">-->
+          <!--            <el-input v-model="form.deliverySignPictures" placeholder="请输入司机签收图片"/>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="服务号" prop="serviceNumber">-->
+          <!--            <el-input v-model="form.serviceNumber" placeholder="请输入服务号"/>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="备注" prop="notes">
+            <el-input v-model="form.notes" placeholder="请输入备注" />
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from '@/api/distribution/distributionSignfor';
+import option from '@/option/distribution/distributionSignfor';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+export default {
+  data() {
+    return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'orderId',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'consignee',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryAddress',
+          label: '收货地址',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'consigneePhone',
+          label: '收货人手机号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'serveType',
+          label: '服务类型',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'distributingWarehouse',
+          label: '配送仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trainNumber',
+          label: '配送车次',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: true,
+        },
+        {
+          prop: 'orderTotal',
+          label: '订单总数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'total',
+          label: '总件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loadedNumber',
+          label: '装车件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'receivedQuantity',
+          label: '签收数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryDriver',
+          label: '送货司机',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryDriverPhone',
+          label: '送货司机手机号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'signingTime',
+          label: '文员签收时间',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'sjsigningTime',
+          label: '司机签收时间',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'signee',
+          label: '签收人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'signingStatus',
+          label: '签收状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              value: '已签收',
+              label: '已签收',
+            },
+            {
+              value: '未签收',
+              label: '未签收',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'signingType',
+          label: '签收类型',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'notes',
+          label: '备注',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      //签收类型
+      signingTypeData: [],
+      //签收状态
+      signingStatusData: [],
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40,
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    };
+  },
+  mounted() {
+    this.queryDictionary();
+    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;
+          }
+        });
+      });
+    }
+    // this.columnListedit=JSON.parse(JSON.stringify(this.columnList))
+  },
+  computed: {
+    ...mapGetters(['permission','setting']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /** 
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList  
+     */
+    setnewcolum(newarr, headarr) {
+      // console.log(newarr,'+++++++++++')
+      this.columnList = newarr;
+      this.$functions.setStorage(window.location.pathname, headarr);
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+    },
+    queryDictionary() {
+      getDictionaryBiz('distribution_signfor_status').then(res => {
+        this.signingTypeData = res.data.data;
+      });
+      getDictionaryBiz('distribution_signfor_type').then(res => {
+        this.signingStatusData = res.data.data;
+      });
+    },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide() {
+      this.search = !this.search;
+    },
+    searchChange() {
+      this.onLoad(this.page);
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit() {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+      }
+    },
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
+    },
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView(row) {
+      this.title = '查看';
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    beforeClose(done) {
+      done();
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      this.query.signingStatus_notequal = 2;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        // this.selectionClear();
+      });
+    },
+  },
+};
+</script>