diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 17c9f5a9..8b9d2aad 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -11,6 +11,17 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getPage = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 export const getDetail = (id) => {
   return request({
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index 24da42d1..8b481690 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -12,15 +12,15 @@
 <!--        </el-form>-->
 <!--      </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--right"></i></el-button>
-          <el-button type="primary"  @click="deliverytype('1')">市配</el-button>
-        </el-button-group>
+<!--        <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="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
 <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -98,10 +98,10 @@
           <el-form-item label="配送种类;1-市配,2-商配" prop="kind">
             <el-input v-model="form.kind" placeholder="请输入配送种类;1-市配,2-商配"/>
           </el-form-item>
-          <el-form-item label="配送车辆" prop="vehicle">
+          <el-form-item label="配送车辆" prop="vehicleName">
             <el-input v-model="form.vehicle" placeholder="请输入配送车辆"/>
           </el-form-item>
-          <el-form-item label="配送司机" prop="driver">
+          <el-form-item label="配送司机" prop="driverName">
             <el-input v-model="form.driver" placeholder="请输入配送司机"/>
           </el-form-item>
           <el-form-item label="配送公司;1-货拉拉,2-京东" prop="distributionCompany">
@@ -125,7 +125,7 @@
           <el-form-item label="扫描件数" prop="scannedNumber">
             <el-input v-model="form.scannedNumber" placeholder="请输入扫描件数"/>
           </el-form-item>
-          <el-form-item label="装卸班组" prop="loadingTeam">
+          <el-form-item label="装卸班组" prop="loadingTeamName">
             <el-input v-model="form.loadingTeam" placeholder="请输入装卸班组"/>
           </el-form-item>
         </el-form>
@@ -142,7 +142,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionDeliveryList";
+import { getList, getDetail, add, update, remove,getPage } from "@/api/distribution/distributionDeliveryList";
 import option from "@/option/distribution/distributionDeliveryList";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -214,10 +214,10 @@ export default {
       });
     },
     //类型切换
-    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);
     },
@@ -343,7 +343,7 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      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++) {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList2.vue b/src/views/distribution/deliverylist/distributionDeliveryList2.vue
new file mode 100644
index 00000000..cc9e158f
--- /dev/null
+++ b/src/views/distribution/deliverylist/distributionDeliveryList2.vue
@@ -0,0 +1,382 @@
+<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 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>-->
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </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>
+<!--              <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>
+      </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="车次" prop="trainNumber">
+            <el-input v-model="form.trainNumber" placeholder="请输入车次"/>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+          </el-form-item>
+          <el-form-item label="配送类型;1-自主配送,2-三方配送" prop="type">
+            <el-input v-model="form.type" placeholder="请输入配送类型;1-自主配送,2-三方配送"/>
+          </el-form-item>
+          <el-form-item label="配送种类;1-市配,2-商配" prop="kind">
+            <el-input v-model="form.kind" placeholder="请输入配送种类;1-市配,2-商配"/>
+          </el-form-item>
+          <el-form-item label="配送车辆" prop="vehicle">
+            <el-input v-model="form.vehicle" placeholder="请输入配送车辆"/>
+          </el-form-item>
+          <el-form-item label="配送司机" prop="driver">
+            <el-input v-model="form.driver" placeholder="请输入配送司机"/>
+          </el-form-item>
+          <el-form-item label="配送公司;1-货拉拉,2-京东" prop="distributionCompany">
+            <el-input v-model="form.distributionCompany" placeholder="请输入配送公司;1-货拉拉,2-京东"/>
+          </el-form-item>
+          <el-form-item label="配送状态;1-配送中,2-已完成" prop="state">
+            <el-input v-model="form.state" placeholder="请输入配送状态;1-配送中,2-已完成"/>
+          </el-form-item>
+          <el-form-item label="配送客户数" prop="customersNumber">
+            <el-input v-model="form.customersNumber" placeholder="请输入配送客户数"/>
+          </el-form-item>
+          <el-form-item label="配送价格" prop="price">
+            <el-input v-model="form.price" placeholder="请输入配送价格"/>
+          </el-form-item>
+          <el-form-item label="订单总数" prop="orderNumber">
+            <el-input v-model="form.orderNumber" placeholder="请输入订单总数"/>
+          </el-form-item>
+          <el-form-item label="配送件数" prop="deliveryNumber">
+            <el-input v-model="form.deliveryNumber" placeholder="请输入配送件数"/>
+          </el-form-item>
+          <el-form-item label="扫描件数" prop="scannedNumber">
+            <el-input v-model="form.scannedNumber" placeholder="请输入扫描件数"/>
+          </el-form-item>
+          <el-form-item label="装卸班组" prop="loadingTeam">
+            <el-input v-model="form.loadingTeam" 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>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionDeliveryList";
+import option from "@/option/distribution/distributionDeliveryList";
+import { mapGetters } from "vuex";
+import { getDictionaryBiz } from '@/api/system/dict';
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      //配送类型
+      deliverytypeData:[],
+      //配送种类
+      deliverykindData:[],
+      //配送状态
+      deliveryliststateData:[],
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.queryDictionary();
+    this.init();
+
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    queryDictionary() {
+      getDictionaryBiz('delivery_type').then(res => {
+        this.deliverytypeData = res.data.data;
+      });
+      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+        this.deliverykindData = res.data.data;
+      });
+      getDictionaryBiz('distribution_deliverylist_state').then(res => {
+        this.deliveryliststateData = res.data.data;
+        this.onLoad(this.page);
+      });
+    },
+    //类型切换
+    deliverytype(type){
+      this.query.type=type;
+      this.onLoad(this.page)
+    },
+    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;
+      });
+    },
+    handleViewBlank (row) {
+      this.$router.push({
+        path: '/distribution/deliverylist/distributionDeliveryListedt',
+        query: {
+          id: row.id,
+          name: row.trainNumber +'-查看配送'
+        }
+      });
+    },
+    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.type='1'
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        // eslint-disable-next-line no-empty
+        for (let i = 0; i < data.records.length; i++) {
+          // eslint-disable-next-line no-empty
+          for (let j = 0; j < this.deliverytypeData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].type == this.deliverytypeData[j].dictKey) {
+              data.records[i].type = this.deliverytypeData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.deliverykindData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].kind == this.deliverykindData[j].dictKey) {
+              data.records[i].kind = this.deliverykindData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.deliveryliststateData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
+              data.records[i].state = this.deliveryliststateData[j].dictValue;
+            }
+          }
+        }
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList3.vue b/src/views/distribution/deliverylist/distributionDeliveryList3.vue
new file mode 100644
index 00000000..7c7857cf
--- /dev/null
+++ b/src/views/distribution/deliverylist/distributionDeliveryList3.vue
@@ -0,0 +1,382 @@
+<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 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>-->
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </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>
+<!--              <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>
+      </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="车次" prop="trainNumber">
+            <el-input v-model="form.trainNumber" placeholder="请输入车次"/>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+          </el-form-item>
+          <el-form-item label="配送类型;1-自主配送,2-三方配送" prop="type">
+            <el-input v-model="form.type" placeholder="请输入配送类型;1-自主配送,2-三方配送"/>
+          </el-form-item>
+          <el-form-item label="配送种类;1-市配,2-商配" prop="kind">
+            <el-input v-model="form.kind" placeholder="请输入配送种类;1-市配,2-商配"/>
+          </el-form-item>
+          <el-form-item label="配送车辆" prop="vehicle">
+            <el-input v-model="form.vehicle" placeholder="请输入配送车辆"/>
+          </el-form-item>
+          <el-form-item label="配送司机" prop="driver">
+            <el-input v-model="form.driver" placeholder="请输入配送司机"/>
+          </el-form-item>
+          <el-form-item label="配送公司;1-货拉拉,2-京东" prop="distributionCompany">
+            <el-input v-model="form.distributionCompany" placeholder="请输入配送公司;1-货拉拉,2-京东"/>
+          </el-form-item>
+          <el-form-item label="配送状态;1-配送中,2-已完成" prop="state">
+            <el-input v-model="form.state" placeholder="请输入配送状态;1-配送中,2-已完成"/>
+          </el-form-item>
+          <el-form-item label="配送客户数" prop="customersNumber">
+            <el-input v-model="form.customersNumber" placeholder="请输入配送客户数"/>
+          </el-form-item>
+          <el-form-item label="配送价格" prop="price">
+            <el-input v-model="form.price" placeholder="请输入配送价格"/>
+          </el-form-item>
+          <el-form-item label="订单总数" prop="orderNumber">
+            <el-input v-model="form.orderNumber" placeholder="请输入订单总数"/>
+          </el-form-item>
+          <el-form-item label="配送件数" prop="deliveryNumber">
+            <el-input v-model="form.deliveryNumber" placeholder="请输入配送件数"/>
+          </el-form-item>
+          <el-form-item label="扫描件数" prop="scannedNumber">
+            <el-input v-model="form.scannedNumber" placeholder="请输入扫描件数"/>
+          </el-form-item>
+          <el-form-item label="装卸班组" prop="loadingTeam">
+            <el-input v-model="form.loadingTeam" 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>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionDeliveryList";
+import option from "@/option/distribution/distributionDeliveryList";
+import { mapGetters } from "vuex";
+import { getDictionaryBiz } from '@/api/system/dict';
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      //配送类型
+      deliverytypeData:[],
+      //配送种类
+      deliverykindData:[],
+      //配送状态
+      deliveryliststateData:[],
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.queryDictionary();
+    this.init();
+
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    queryDictionary() {
+      getDictionaryBiz('delivery_type').then(res => {
+        this.deliverytypeData = res.data.data;
+      });
+      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+        this.deliverykindData = res.data.data;
+      });
+      getDictionaryBiz('distribution_deliverylist_state').then(res => {
+        this.deliveryliststateData = res.data.data;
+        this.onLoad(this.page);
+      });
+    },
+    //类型切换
+    deliverytype(type){
+      this.query.type=type;
+      this.onLoad(this.page)
+    },
+    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;
+      });
+    },
+    handleViewBlank (row) {
+      this.$router.push({
+        path: '/distribution/deliverylist/distributionDeliveryListedt',
+        query: {
+          id: row.id,
+          name: row.trainNumber +'-查看配送'
+        }
+      });
+    },
+    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.type='2'
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        // eslint-disable-next-line no-empty
+        for (let i = 0; i < data.records.length; i++) {
+          // eslint-disable-next-line no-empty
+          for (let j = 0; j < this.deliverytypeData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].type == this.deliverytypeData[j].dictKey) {
+              data.records[i].type = this.deliverytypeData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.deliverykindData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].kind == this.deliverykindData[j].dictKey) {
+              data.records[i].kind = this.deliverykindData[j].dictValue;
+            }
+          }
+          for (let j = 0; j < this.deliveryliststateData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
+              data.records[i].state = this.deliveryliststateData[j].dictValue;
+            }
+          }
+        }
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    }
+  }
+};
+</script>