diff --git a/src/api/addvalue/distributionAddvalue.js b/src/api/addvalue/distributionAddvalue.js
new file mode 100644
index 00000000..b6cb9cac
--- /dev/null
+++ b/src/api/addvalue/distributionAddvalue.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/addvalue/distributionAddvalue/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/addvalue/distributionAddvalue/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/addvalue/distributionAddvalue/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/addvalue/distributionAddvalue/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/addvalue/distributionAddvalue/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/addvalue/distributionAddvalueDetail.js b/src/api/addvalue/distributionAddvalueDetail.js
new file mode 100644
index 00000000..a85839b2
--- /dev/null
+++ b/src/api/addvalue/distributionAddvalueDetail.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/addvalueDetail/distributionAddvalueDetail/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/addvalueDetail/distributionAddvalueDetail/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/addvalueDetail/distributionAddvalueDetail/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/addvalueDetail/distributionAddvalueDetail/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/addvalueDetail/distributionAddvalueDetail/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/addvalue/distributionAddvaluePackage.js b/src/api/addvalue/distributionAddvaluePackage.js
new file mode 100644
index 00000000..bcc0ad04
--- /dev/null
+++ b/src/api/addvalue/distributionAddvaluePackage.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/addvaluePackage/distributionAddvaluePackage/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/addvaluePackage/distributionAddvaluePackage/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/addvaluePackage/distributionAddvaluePackage/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/addvaluePackage/distributionAddvaluePackage/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/addvaluePackage/distributionAddvaluePackage/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/distribution/disStockListDetail.js b/src/api/distribution/disStockListDetail.js
index 86b163f6..d0713238 100644
--- a/src/api/distribution/disStockListDetail.js
+++ b/src/api/distribution/disStockListDetail.js
@@ -22,6 +22,21 @@ export const getDisStockList = (params) => {
   })
 }
 
+/**
+ * 库存品打印模板
+ * @param params
+ * @returns {AxiosPromise}
+ */
+export const getPrintDetail = (params) => {
+  return request({
+    url: '/api/logpm-distribution/disStockListDetail/getPrintDetail',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/disStockListDetail/detail',
diff --git a/src/option/addvalue/distributionAddvalue.js b/src/option/addvalue/distributionAddvalue.js
new file mode 100644
index 00000000..a640ab4d
--- /dev/null
+++ b/src/option/addvalue/distributionAddvalue.js
@@ -0,0 +1,102 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；",
+      prop: "addvalueId",
+    },
+    {
+      label: "关联表ID",
+      prop: "refId",
+    },
+    {
+      label: "关联类型 1 预约单 2 配送单 3 .",
+      prop: "refType",
+    },
+    {
+      label: "编号",
+      prop: "code",
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+    },
+    {
+      label: "费用",
+      prop: "fee",
+    },
+  ]
+}
diff --git a/src/option/addvalue/distributionAddvalueDetail.js b/src/option/addvalue/distributionAddvalueDetail.js
new file mode 100644
index 00000000..37ebd131
--- /dev/null
+++ b/src/option/addvalue/distributionAddvalueDetail.js
@@ -0,0 +1,110 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "增值服务ID",
+      prop: "addvalueId",
+    },
+    {
+      label: "包件记录类型 1 全部订单和包间 2 扫码订单和包件 3手动输入",
+      prop: "recordType",
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+    },
+    {
+      label: "费用",
+      prop: "fee",
+    },
+    {
+      label: "件数【来源于下级子表】",
+      prop: "num",
+    },
+    {
+      label: "基数;根据配置文件读取出来的基数值 用于计算费用",
+      prop: "radix",
+    },
+    {
+      label: "楼层数",
+      prop: "floolNum",
+    },
+    {
+      label: "公里;用于 平移和超区的附属字段 整数  计量单位按照M 来计算",
+      prop: "distance",
+    },
+  ]
+}
diff --git a/src/option/addvalue/distributionAddvaluePackage.js b/src/option/addvalue/distributionAddvaluePackage.js
new file mode 100644
index 00000000..d387463a
--- /dev/null
+++ b/src/option/addvalue/distributionAddvaluePackage.js
@@ -0,0 +1,118 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+    },
+    {
+      label: "包件ID",
+      prop: "packageId",
+    },
+    {
+      label: "包件类型;1-订制品；2-库存品",
+      prop: "conditions",
+    },
+    {
+      label: "包条码",
+      prop: "orderPackageCode",
+    },
+    {
+      label: "订单自编号",
+      prop: "orderCode",
+    },
+    {
+      label: "商配名称",
+      prop: "materialName",
+    },
+    {
+      label: "订单ID",
+      prop: "stockArticleId",
+    },
+    {
+      label: "数量",
+      prop: "quantity",
+    },
+    {
+      label: "客户ID",
+      prop: "reservationId",
+    },
+    {
+      label: "增值服务详情表ID",
+      prop: "addvalueDetailId",
+    },
+  ]
+}
diff --git a/src/views/addvalue/distributionAddvalue.vue b/src/views/addvalue/distributionAddvalue.vue
new file mode 100644
index 00000000..eb871586
--- /dev/null
+++ b/src/views/addvalue/distributionAddvalue.vue
@@ -0,0 +1,303 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <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="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-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="增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；" prop="addvalueId">
+            <el-input v-model="form.addvalueId" placeholder="请输入增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；"/>
+          </el-form-item>
+          <el-form-item label="关联表ID" prop="refId">
+            <el-input v-model="form.refId" placeholder="请输入关联表ID"/>
+          </el-form-item>
+          <el-form-item label="关联类型 1 预约单 2 配送单 3 ." prop="refType">
+            <el-input v-model="form.refType" placeholder="请输入关联类型 1 预约单 2 配送单 3 ."/>
+          </el-form-item>
+          <el-form-item label="编号" prop="code">
+            <el-input v-model="form.code" placeholder="请输入编号"/>
+          </el-form-item>
+          <el-form-item label="预留1" prop="reserve1">
+            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+          </el-form-item>
+          <el-form-item label="预留2" prop="reserve2">
+            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+          </el-form-item>
+          <el-form-item label="预留3" prop="reserve3">
+            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+          </el-form-item>
+          <el-form-item label="预留4" prop="reserve4">
+            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+          </el-form-item>
+          <el-form-item label="预留5" prop="reserve5">
+            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+          </el-form-item>
+          <el-form-item label="费用" prop="fee">
+            <el-input v-model="form.fee" 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/addvalue/distributionAddvalue";
+import option from "@/option/addvalue/distributionAddvalue";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    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;
+      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>
diff --git a/src/views/addvalue/distributionAddvalueDetail.vue b/src/views/addvalue/distributionAddvalueDetail.vue
new file mode 100644
index 00000000..c5e96a83
--- /dev/null
+++ b/src/views/addvalue/distributionAddvalueDetail.vue
@@ -0,0 +1,309 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <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="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-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="增值服务ID" prop="addvalueId">
+            <el-input v-model="form.addvalueId" placeholder="请输入增值服务ID"/>
+          </el-form-item>
+          <el-form-item label="包件记录类型 1 全部订单和包间 2 扫码订单和包件 3手动输入" prop="recordType">
+            <el-input v-model="form.recordType" placeholder="请输入包件记录类型 1 全部订单和包间 2 扫码订单和包件 3手动输入"/>
+          </el-form-item>
+          <el-form-item label="预留1" prop="reserve1">
+            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+          </el-form-item>
+          <el-form-item label="预留2" prop="reserve2">
+            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+          </el-form-item>
+          <el-form-item label="预留3" prop="reserve3">
+            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+          </el-form-item>
+          <el-form-item label="预留4" prop="reserve4">
+            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+          </el-form-item>
+          <el-form-item label="预留5" prop="reserve5">
+            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+          </el-form-item>
+          <el-form-item label="费用" prop="fee">
+            <el-input v-model="form.fee" placeholder="请输入费用"/>
+          </el-form-item>
+          <el-form-item label="件数【来源于下级子表】" prop="num">
+            <el-input v-model="form.num" placeholder="请输入件数【来源于下级子表】"/>
+          </el-form-item>
+          <el-form-item label="基数;根据配置文件读取出来的基数值 用于计算费用" prop="radix">
+            <el-input v-model="form.radix" placeholder="请输入基数;根据配置文件读取出来的基数值 用于计算费用"/>
+          </el-form-item>
+          <el-form-item label="楼层数" prop="floolNum">
+            <el-input v-model="form.floolNum" placeholder="请输入楼层数"/>
+          </el-form-item>
+          <el-form-item label="公里;用于 平移和超区的附属字段 整数  计量单位按照M 来计算" prop="distance">
+            <el-input v-model="form.distance" placeholder="请输入公里;用于 平移和超区的附属字段 整数  计量单位按照M 来计算"/>
+          </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/addvalue/distributionAddvalueDetail";
+import option from "@/option/addvalue/distributionAddvalueDetail";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    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;
+      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>
diff --git a/src/views/addvalue/distributionAddvaluePackage.vue b/src/views/addvalue/distributionAddvaluePackage.vue
new file mode 100644
index 00000000..ae0f86a9
--- /dev/null
+++ b/src/views/addvalue/distributionAddvaluePackage.vue
@@ -0,0 +1,315 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <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="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-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="预留1" prop="reserve1">
+            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+          </el-form-item>
+          <el-form-item label="预留2" prop="reserve2">
+            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+          </el-form-item>
+          <el-form-item label="预留3" prop="reserve3">
+            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+          </el-form-item>
+          <el-form-item label="预留4" prop="reserve4">
+            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+          </el-form-item>
+          <el-form-item label="预留5" prop="reserve5">
+            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+          </el-form-item>
+          <el-form-item label="包件ID" prop="packageId">
+            <el-input v-model="form.packageId" placeholder="请输入包件ID"/>
+          </el-form-item>
+          <el-form-item label="包件类型;1-订制品；2-库存品" prop="conditions">
+            <el-input v-model="form.conditions" placeholder="请输入包件类型;1-订制品；2-库存品"/>
+          </el-form-item>
+          <el-form-item label="包条码" prop="orderPackageCode">
+            <el-input v-model="form.orderPackageCode" placeholder="请输入包条码"/>
+          </el-form-item>
+          <el-form-item label="订单自编号" prop="orderCode">
+            <el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
+          </el-form-item>
+          <el-form-item label="商配名称" prop="materialName">
+            <el-input v-model="form.materialName" placeholder="请输入商配名称"/>
+          </el-form-item>
+          <el-form-item label="订单ID" prop="stockArticleId">
+            <el-input v-model="form.stockArticleId" placeholder="请输入订单ID"/>
+          </el-form-item>
+          <el-form-item label="数量" prop="quantity">
+            <el-input v-model="form.quantity" placeholder="请输入数量"/>
+          </el-form-item>
+          <el-form-item label="客户ID" prop="reservationId">
+            <el-input v-model="form.reservationId" placeholder="请输入客户ID"/>
+          </el-form-item>
+          <el-form-item label="增值服务详情表ID" prop="addvalueDetailId">
+            <el-input v-model="form.addvalueDetailId" placeholder="请输入增值服务详情表ID"/>
+          </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/addvalue/distributionAddvaluePackage";
+import option from "@/option/addvalue/distributionAddvaluePackage";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    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;
+      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>
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index f9176535..ecd09cfb 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row v-if="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="客户名称:">
@@ -69,7 +69,9 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -90,79 +92,102 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text>
-              <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
-              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
-              <!-- <el-text type="primary" text icon="el-icon-delete" @click="handleAddSon(slotProps.scope.row)">新增</el-text>
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleView(slotProps.scope.row)"
+              >查看</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleEdit(slotProps.scope.row)"
+              >编辑</el-text
+            >
+            <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
+              >删除</el-text
+            >
+            <!-- <el-text type="primary" text icon="el-icon-delete" @click="handleAddSon(slotProps.scope.row)">新增</el-text>
               <el-text type="primary" text icon="el-icon-delete" @click="handleHistory(slotProps.scope.row)">合同历史记录</el-text>
               <el-text type="primary" text icon="el-icon-delete" @click="handleEntrepot(slotProps.scope.row)">服务仓</el-text>
               <el-text type="primary" text icon="el-icon-delete" @click="handleLinkman(slotProps.scope.row)">联系人</el-text>
               <el-text type="primary" text icon="el-icon-delete" @click="handleBrand(slotProps.scope.row)">品牌</el-text>
               <el-text type="primary" text icon="el-icon-delete" @click="handleMall(slotProps.scope.row)">三方商城</el-text> -->
-              <el-dropdown @command="(command)=>handleCommand(command,slotProps.scope.row)">
-                    <el-text type="primary" text>
-                      更多
-                      <el-icon class="el-icon--right">
-                        <arrow-down />
-                      </el-icon>
-                    </el-text>
-                <template #dropdown>
-                  <el-dropdown-menu>
-                    <el-dropdown-item command="1">
-                      <el-text>新增</el-text>
-                    </el-dropdown-item>
-                    <el-dropdown-item command="2">
-                      <el-text>合同历史记录</el-text>
-                    </el-dropdown-item>
-                    <el-dropdown-item command="3">
-                      <el-text>服务仓</el-text>
-                    </el-dropdown-item>
-                    <el-dropdown-item command="4">
-                      <el-text>联系人</el-text>
-                    </el-dropdown-item>
-                    <el-dropdown-item command="5">
-                      <el-text>品牌</el-text>
-                    </el-dropdown-item>
-                    <el-dropdown-item command="6">
-                      <el-text>三方商城</el-text>
-                    </el-dropdown-item>
-                    <el-dropdown-item command="7">
-                      <el-text>开通账号</el-text>
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </template>
-              </el-dropdown>
+            <el-dropdown @command="command => handleCommand(command, slotProps.scope.row)">
+              <el-text type="primary" text>
+                更多
+                <el-icon class="el-icon--right">
+                  <arrow-down />
+                </el-icon>
+              </el-text>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item command="1">
+                    <el-text>新增</el-text>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="2">
+                    <el-text>合同历史记录</el-text>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="3">
+                    <el-text>服务仓</el-text>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="4">
+                    <el-text>联系人</el-text>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="5">
+                    <el-text>品牌</el-text>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="6">
+                    <el-text>三方商城</el-text>
+                  </el-dropdown-item>
+                  <el-dropdown-item command="7">
+                    <el-text>开通账号</el-text>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </template>
         </tablecmt>
         <!-- 列表模块 -->
-
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[30, 50,80, 120]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :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="35%"
-                 :before-close="beforeClose"
-                 :close-on-click-modal="false"
-                 append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="40%"
+        :before-close="beforeClose"
+        :close-on-click-modal="false"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
           <!-- 表单字段 -->
           <el-form-item label="客户编码" prop="clientCode">
-            <el-input v-model="form.clientCode" :validate-method="validateInput" placeholder="请输入客户编码" style="width: 100%" :disabled = viewClientEntd />
+            <el-input
+              v-model="form.clientCode"
+              :validate-method="validateInput"
+              placeholder="请输入客户编码"
+              style="width: 100%"
+              :disabled="viewClientEntd"
+            />
           </el-form-item>
           <el-form-item label="客户名称" prop="clientName">
             <el-input v-model="form.clientName" placeholder="请输入客户名称" style="width: 100%" />
@@ -173,36 +198,51 @@
             <!--              <el-option label="发货方" value="1"/>-->
             <!--              <el-option label="收货方" value="2"/>-->
             <!--            </el-select>-->
-            <el-select v-model="form.clientType" class="m-2" placeholder="请选择客户端类型" style="width: 100%">
+            <el-select
+              v-model="form.clientType"
+              class="m-2"
+              placeholder="请选择客户端类型"
+              style="width: 100%"
+            >
               <el-option
                 v-for="item in clientType"
                 :key="item.dictKey"
                 :label="item.dictValue"
                 :value="item.dictKey"
-
               />
             </el-select>
-
           </el-form-item>
-            <el-form-item label="服务类型" prop="typeServiceList">
-              <el-select v-model="form.typeServiceList" multiple placeholder="请选择" style="width: 100%" @change="coverCharge">
-                <el-option
-                  v-for="item in freightType"
-                  :key="item.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="配送类型" prop="businessType" v-if="distriType">
-              <el-radio-group v-model="form.businessType" class="ml-4"  v-for="item in distributionType">
-                <el-radio :label="item.dictKey" size="large" style="margin-right: 25px">{{item.dictValue}}</el-radio>
-                <!--                  <el-radio label="2" size="large">Option 2</el-radio>-->
-              </el-radio-group>
-              <!--              </div>-->
-
-            </el-form-item>
-<!--                    <el-form-item label="客户端类型" prop="typeService">
+          <el-form-item label="服务类型" prop="typeServiceList">
+            <el-select
+              v-model="form.typeServiceList"
+              multiple
+              placeholder="请选择"
+              style="width: 100%"
+              @change="coverCharge"
+            >
+              <el-option
+                v-for="item in freightType"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送类型" prop="businessType" v-if="distriType">
+            <el-radio-group
+              v-model="form.businessType"
+              class="ml-4"
+              v-for="item in distributionType"
+            >
+              <el-radio :label="item.dictKey" size="large" style="margin-right: 25px">{{
+                item.dictValue
+              }}</el-radio>
+              <!--                  <el-radio label="2" size="large">Option 2</el-radio>-->
+            </el-radio-group>
+            <!--              </div>-->
+          </el-form-item>
+          <!--                    <el-form-item label="客户端类型" prop="typeService">
           &lt;!&ndash;            <el-input v-model="form.typeService" placeholder="请输入客户类型"/>&ndash;&gt;
           &lt;!&ndash;            <el-input v-model="form.typeService" placeholder="请输入客户类型;1 C端  2 B端"/>&ndash;&gt;
                       <el-select v-model="form.typeService" class="m-2" placeholder="请选择客户端类型" style="width: 100%">
@@ -223,7 +263,11 @@
           </el-form-item>
           <el-form-item label="地址" prop="bladeRegionProvinceId">
             <!--            <el-input v-model="form.bladeRegionProvinceId" placeholder="请输入省份"/>-->
-            <el-cascader :options="optioner" style="width: 100%" v-model="form.bladeRegionProvinceId">
+            <el-cascader
+              :options="optioner"
+              style="width: 100%"
+              v-model="form.bladeRegionProvinceId"
+            >
               <template #default="{ node, data }">
                 <span>{{ data.label }}</span>
                 <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -233,12 +277,12 @@
           <el-form-item label="详细地址" prop="detailedly">
             <el-input v-model="form.detailedly" placeholder="请填写详细地址" style="width: 100%" />
           </el-form-item>
-<!--          <el-form-item label="三方商城" prop="tripartiteMall">-->
-<!--            <el-input v-model="form.tripartiteMall" placeholder="请填写三方商城" style="width: 100%" />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="开票信息" prop="billingInformation">-->
-<!--            <el-input v-model="form.billingInformation" placeholder="请填写开票信息" style="width: 100%" />-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="三方商城" prop="tripartiteMall">-->
+          <!--            <el-input v-model="form.tripartiteMall" placeholder="请填写三方商城" style="width: 100%" />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="开票信息" prop="billingInformation">-->
+          <!--            <el-input v-model="form.billingInformation" placeholder="请填写开票信息" style="width: 100%" />-->
+          <!--          </el-form-item>-->
           <!--          <el-form-item label="市" prop="bladeRegionCityId">-->
           <!--            <el-input v-model="form.bladeRegionCityId" placeholder="请输入市"/>-->
           <!--          </el-form-item>-->
@@ -254,7 +298,11 @@
               :headers="headers"
               multiple
               :on-preview="handlePreview"
-              :on-success="(response, file, fileList) => {uploadSuccess(fileList)}"
+              :on-success="
+                (response, file, fileList) => {
+                  uploadSuccess(fileList);
+                }
+              "
               :on-remove="handleRemove"
               :before-remove="beforeRemove"
               :before-upload="beforeUploadFn"
@@ -263,9 +311,7 @@
             >
               <el-button>上传</el-button>
               <template #tip>
-                <div class="el-upload__tip">
-                  大小不超过500KB的jpg/png文件。
-                </div>
+                <div class="el-upload__tip">大小不超过500KB的jpg/png文件。</div>
               </template>
             </el-upload>
             <el-image-viewer
@@ -311,39 +357,58 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
       </el-dialog>
 
-
       <!-- 账号绑定弹出框页面
       1、显示登录账号
       2、显示账号的名称 -->
       <el-dialog title="开通账号" v-model="openAcountStatus">
-
-        <el-form :disabled="view" ref="openAcountorm" :model="openAcountform" :rules="openAcountrules" label-width="120px">
-
-          <el-form-item label="姓名" prop="linkman" >
-            <el-input v-model="openAcountform.name" placeholder="请输入联系人" maxlength="20" style="width: 100%" />
+        <el-form
+          :disabled="view"
+          ref="openAcountorm"
+          :model="openAcountform"
+          :rules="openAcountrules"
+          label-width="120px"
+        >
+          <el-form-item label="姓名" prop="linkman">
+            <el-input
+              v-model="openAcountform.name"
+              placeholder="请输入联系人"
+              maxlength="20"
+              style="width: 100%"
+            />
           </el-form-item>
 
-          <el-form-item label="账号" prop="linkman" >
-            <el-input v-model="openAcountform.phone" placeholder="请输入电话" type="number" maxlength="11" style="width: 100%" />
+          <el-form-item label="账号" prop="linkman">
+            <el-input
+              v-model="openAcountform.phone"
+              placeholder="请输入电话"
+              type="number"
+              maxlength="11"
+              style="width: 100%"
+            />
           </el-form-item>
-          <el-form-item label="密码" >
-            <span style="color: red;">默认系统初始化密码</span>
+          <el-form-item label="密码">
+            <span style="color: red">默认系统初始化密码</span>
           </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('form')">提 交</el-button>
-            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false">取 消</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
+              >提 交</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false"
+              >取 消</el-button
+            >
           </span>
         </template>
-
       </el-dialog>
 
       <el-drawer
@@ -352,7 +417,8 @@
         size="60%"
         v-model="drawer"
         :direction="direction"
-        :before-close="handleDrawerClose">
+        :before-close="handleDrawerClose"
+      >
         <BasicShopSub :mainId="basicClientId"></BasicShopSub>
       </el-drawer>
       <!--      <el-drawer-->
@@ -369,7 +435,15 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, updateCargoControl, remove, getListCode } from '@/api/basicdata/basicClient';
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  updateCargoControl,
+  remove,
+  getListCode,
+} from '@/api/basicdata/basicClient';
 import option from '@/option/basicdata/basicClient';
 import { mapGetters } from 'vuex';
 import BasicShopSub from '@/views/basicdata/brand/basicShopSub.vue';
@@ -380,11 +454,9 @@ import globalc from '@/api/basicdata/globalc';
 import { Base64 } from 'js-base64';
 import dayjs from 'dayjs';
 
-
 export default {
   components: {
-    BasicShopSub
-
+    BasicShopSub,
   },
   data() {
     return {
@@ -460,7 +532,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-          downprop:'leaseAccessories'
+          downprop: 'leaseAccessories',
         },
         {
           prop: 'cargoControl',
@@ -508,7 +580,7 @@ export default {
       activeNames: ['1'],
       height: 0,
       showImgViewer: false,
-      imgPreviewUrl: [],// 当前要放大的图片存放位置
+      imgPreviewUrl: [], // 当前要放大的图片存放位置
       fileList: [],
 
       // 主键
@@ -538,13 +610,13 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
 
       // 表单数据
       form: {
         contractStartTime: '',
-        contractEntTime: ''
+        contractEntTime: '',
       },
       // 选择行
       selectionList: [],
@@ -566,7 +638,7 @@ export default {
             const start = new Date();
             start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
             return [start, end];
-          }
+          },
         },
         {
           text: '上个月',
@@ -575,7 +647,7 @@ export default {
             const start = new Date();
             start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
             return [start, end];
-          }
+          },
         },
         {
           text: '最近3个月',
@@ -584,69 +656,50 @@ export default {
             const start = new Date();
             start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
             return [start, end];
-          }
-        }
+          },
+        },
       ],
       rules: {
         clientCode: [
           { required: true, message: '请输入客户编码', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          { validator: this.validateInput, trigger: 'blur' }
+          { validator: this.validateInput, trigger: 'blur' },
         ],
         clientName: [
           { required: true, message: '请输入客户名称', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        typeService: [
-          { required: true, message: '请选择客户端类型', trigger: 'blur' }
-        ],
+        typeService: [{ required: true, message: '请选择客户端类型', trigger: 'blur' }],
         businessType: [
           { required: true, message: '请选择配送业务类型', trigger: 'change' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        clientType: [
-          { required: true, message: '请选择客户类型', trigger: 'change' }
-        ],
-        typeServiceList: [
-          { required: true, message: '请选择服务类型', trigger: 'change' }
-        ],
-        linkman: [
-          { required: true, message: '请填写联系人', trigger: 'blur' }
-        ],
-        detailedly: [
-          { required: true, message: '请填写详细地址', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, message: '请填写联系电话', trigger: 'blur' }
-        ],
+        clientType: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
+        typeServiceList: [{ required: true, message: '请选择服务类型', trigger: 'change' }],
+        linkman: [{ required: true, message: '请填写联系人', trigger: 'blur' }],
+        detailedly: [{ required: true, message: '请填写详细地址', trigger: 'blur' }],
+        phone: [{ required: true, message: '请填写联系电话', trigger: 'blur' }],
         contractEntTime: [
-          { type: 'date', required: true, message: '请选择合同结束时间', trigger: 'change' }
+          { type: 'date', required: true, message: '请选择合同结束时间', trigger: 'change' },
         ],
         contractStartTime: [
-          { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' }
-        ],
-        bladeRegionProvinceId: [
-          { required: true, message: '请选择地址', trigger: 'change' }
+          { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' },
         ],
-        leaseAccessories: [
-          { required: true, message: '请上传合同文件', trigger: 'blur' }
-        ]
+        bladeRegionProvinceId: [{ required: true, message: '请选择地址', trigger: 'change' }],
+        leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }],
       },
       bianji: false,
 
-      openAcountStatus:false,//开通账号弹出框状态
-      openAcountform:{
-        name:"",
-        phone:""
-      }
+      openAcountStatus: false, //开通账号弹出框状态
+      openAcountform: {
+        name: '',
+        phone: '',
+      },
     };
   },
-  created() {
-
-  },
+  created() {},
   mounted() {
     this.init();
-
   },
   computed: {
     ...mapGetters(['permission']),
@@ -659,35 +712,34 @@ export default {
     },
     headers() {
       return {
-        'Blade-Auth': 'Bearer ' + getToken()
+        'Blade-Auth': 'Bearer ' + getToken(),
       };
     },
     action() {
       return '/api/blade-resource/oss/endpoint/put-file';
       // return '/api/blade-resource/oss/endpoint/put-file-attach'
-    }
+    },
   },
   methods: {
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
-      }else if(type==3){
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     selectionsc(value) {
       console.log(value);
@@ -704,22 +756,22 @@ export default {
       console.log(index, row);
     },
     selectsc(index, row) {
-      console.log("123123123",index, row);
-      if(row.prop ==='clientTypeName'){
+      console.log('123123123', index, row);
+      if (row.prop === 'clientTypeName') {
         this.query['clientType'] = index;
-      }else{
+      } else {
         this.query[row.prop] = index;
       }
       this.onLoad(this.page);
     },
     timesc(index, row) {
       console.log(index, row);
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.query[row.prop] =  index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
@@ -730,69 +782,65 @@ export default {
       this.onLoad(this.page);
     },
 
-
-
-    handleCommand(command,row){
-      console.log(command,row)
+    handleCommand(command, row) {
+      console.log(command, row);
       switch (Number(command)) {
         case 1:
-        this.handleAddSon(row)
+          this.handleAddSon(row);
           break;
         case 2:
-        this.handleHistory(row)
+          this.handleHistory(row);
           break;
         case 3:
-        this.handleEntrepot(row)
+          this.handleEntrepot(row);
           break;
         case 4:
-        this.handleLinkman(row)
+          this.handleLinkman(row);
           break;
         case 5:
-        this.handleBrand(row)
+          this.handleBrand(row);
           break;
         case 6:
-        this.handleMall(row)
+          this.handleMall(row);
           break;
         case 7:
-        this.openAcount(row)
+          this.openAcount(row);
           break;
       }
     },
     //远程校验
-    validateInput(value,a) {
+    validateInput(value, a) {
       // console.log("执行了",value,a);
       return new Promise((resolve, reject) => {
         // 发送异步请求到服务器进行校验
         // 假设请求返回的数据为 { valid: true } 表示校验通过
         // 模拟异步请求，假设延时1秒
-        if(!this.viewClientEntd){
+        if (!this.viewClientEntd) {
           setTimeout(async () => {
             const response = { valid: false }; // 假设校验通过
-            await getListCode({ code: a }).then(res =>{
+            await getListCode({ code: a }).then(res => {
               // console.log("smgsmg",res.data);
               if (res.data.data.length > 0) {
                 reject(new Error('编码已存在')); // 校验不通过，调用 reject() 并传递错误信息
               } else {
                 resolve(); // 校验通过，调用 resolve()
               }
-            })
-
+            });
           }, 1000);
-        }else{
+        } else {
           resolve();
         }
-
       });
     },
 
     coverCharge(num) {
       this.distriType = false;
       // console.log(num);
-      num.forEach(i =>{
-        if(i == '3'){
+      num.forEach(i => {
+        if (i == '3') {
           this.distriType = true;
         }
-      })
+      });
     },
 
     handleChange(val) {
@@ -803,8 +851,6 @@ export default {
      * 开通账号
      */
     openAcount(row) {
-
-
       // this.openAcountform.name = row.linkman;
       // this.openAcountform.phone = row.phone;
       // this.openAcountStatus = true;
@@ -813,10 +859,9 @@ export default {
         path: '/basicdata/brand/basicClientAccount',
         query: {
           id: row.id,
-          name: '商场 - ' + row.clientName
-        }
+          name: '商场 - ' + row.clientName,
+        },
       });
-
     },
 
     //
@@ -826,21 +871,23 @@ export default {
         path: '/basicdata/brand/basicdataTripartiteMall',
         query: {
           id: row.id,
-          name: '商场 - ' + row.clientName
-        }
+          name: '商场 - ' + row.clientName,
+        },
       });
-
     },
     //打开文件
     downloadLink(row) {
-      window.open('http://192.168.10.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
+      window.open(
+        'http://192.168.10.100:8012/onlinePreview?url=' +
+          encodeURIComponent(Base64.encode(row.leaseAccessories))
+      );
     },
     //控制控货
     makeCargo(row) {
       console.log('控货操作！！', row);
       let r = {
         id: row.id,
-        cargoControl: row.cargoControl
+        cargoControl: row.cargoControl,
       };
       this.$confirm(`确定要修改${row.clientName}的控货状态吗？`, {
         type: 'warning',
@@ -855,26 +902,23 @@ export default {
                 this.onLoad(this.page);
                 this.$message({
                   type: 'success',
-                  message: '操作成功!'
+                  message: '操作成功!',
                 });
                 done();
               } else {
                 this.$message({
                   type: 'warning',
-                  message: '操作失败!'
+                  message: '操作失败!',
                 });
               }
-
             });
           } else {
             //点击其他地方时就相当于点击了false
             //done 关闭窗口
             done();
           }
-        }
+        },
       });
-
-
     },
     uploadSuccess(fileList) {
       if (this.title == '编辑') {
@@ -894,17 +938,17 @@ export default {
       this.showImgViewer = false;
     },
     //文件上传前的一些业务需要的校验
-    beforeUploadFn (file, fileList) {
+    beforeUploadFn(file, fileList) {
       // console.log("上传校验");
-      let fileNameLength = file.name.lastIndexOf('.') // 文件名开始到最后一个点的长度
-      let fileFormat = file.name.substring(fileNameLength + 1, (file.name).length)
-      fileFormat = fileFormat.toLowerCase()
-      let imgArr = ['txt']
+      let fileNameLength = file.name.lastIndexOf('.'); // 文件名开始到最后一个点的长度
+      let fileFormat = file.name.substring(fileNameLength + 1, file.name.length);
+      fileFormat = fileFormat.toLowerCase();
+      let imgArr = ['txt'];
       if (imgArr.includes(fileFormat)) {
         // this.warning(this.$t('lang.fileFormat'))
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handlePreview(file) {
@@ -913,10 +957,15 @@ export default {
 
       this.showImgViewer = true;
 
+      console.log('-=-=sc上传', this.fileList);
 
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
     },
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
@@ -926,11 +975,12 @@ export default {
       getDictionaryBiz('client_type').then(res => {
         // console.log("字典》》》",res);
         this.clientType = res.data.data;
-        this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
+        this.$functions.checkcColumnList('clientTypeName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
       });
       //字典
       getDictionaryBiz('basic_freight_type').then(res => {
@@ -956,7 +1006,6 @@ export default {
       //    });
       //  }
 
-
       // console.log('市111', this.optioner);
       this.height = this.setPx(document.body.clientHeight - 340);
       getLazyTreeAll().then(res => {
@@ -979,7 +1028,6 @@ export default {
       this.onLoad(this.page);
     },
     handleSubmit(from) {
-
       console.log('上传的集合。。', JSON.parse(JSON.stringify(this.fileList)));
       if (this.title == '编辑' && this.bianji == false) {
         console.log('编辑1111');
@@ -987,7 +1035,6 @@ export default {
           let li = [];
           this.fileList.forEach(it => {
             li.push(it.url);
-
           });
           this.form.leaseAccessories = li.length > 0 ? li.join(',') : null;
         } else {
@@ -1007,21 +1054,20 @@ export default {
       }
 
       if (!this.form.id) {
-
         console.log('添加提交的数据：', this.form);
-        this.$refs[from].validate((valid) => {
+        this.$refs[from].validate(valid => {
           if (valid) {
             // this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined;
             this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
             this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
             this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
-            console.log("上传llll>>>",this.form);
+            console.log('上传llll>>>', this.form);
             add(this.form).then(() => {
               this.box = false;
               this.onLoad(this.page);
               this.$message({
                 type: 'success',
-                message: '操作成功!'
+                message: '操作成功!',
               });
             });
           } else {
@@ -1029,10 +1075,8 @@ export default {
             return false;
           }
         });
-
       } else {
-
-        this.$refs[from].validate((valid) => {
+        this.$refs[from].validate(valid => {
           if (valid) {
             console.log('修改提交的数据：', this.form);
             // this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined;
@@ -1044,7 +1088,7 @@ export default {
               this.onLoad(this.page);
               this.$message({
                 type: 'success',
-                message: '操作成功!'
+                message: '操作成功!',
               });
             });
           } else {
@@ -1052,8 +1096,6 @@ export default {
             return false;
           }
         });
-
-
       }
     },
     handleAdd() {
@@ -1065,13 +1107,13 @@ export default {
       this.viewClientEntd = false;
     },
     handleAddSon(row) {
-      console.log(row)
+      console.log(row);
       this.$router.push({
         path: '/basicdata/brand/basicClientFrom',
         query: {
           id: row.id,
-          name: '新增 - ' + row.clientName
-        }
+          name: '新增 - ' + row.clientName,
+        },
       });
     },
     handleEdit(row) {
@@ -1083,30 +1125,30 @@ export default {
       this.viewClientEntd = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
-        if(this.form.detailedly == "0" || this.form.detailedly == "-1"){
-          this.form.detailedly = "";
+        if (this.form.detailedly == '0' || this.form.detailedly == '-1') {
+          this.form.detailedly = '';
         }
-        let bus =[];
-        this.form.typeServiceBusiness.forEach(i =>{
+        let bus = [];
+        this.form.typeServiceBusiness.forEach(i => {
           bus.push(i.typeService);
-          if(i.typeService == '3'){
+          if (i.typeService == '3') {
             this.distriType = true;
             this.form.businessType = i.mold;
           }
-        })
-        if(!!bus){
+        });
+        if (!!bus) {
           this.form.typeServiceList = bus;
         }
 
         let a = [];
         if (!!this.form.bladeRegionProvinceId) {
-          if(res.data.data?.bladeRegionProvinceId){
+          if (res.data.data?.bladeRegionProvinceId) {
             a.push(res.data.data.bladeRegionProvinceId);
           }
-          if(res.data.data?.bladeRegionCityId){
+          if (res.data.data?.bladeRegionCityId) {
             a.push(res.data.data.bladeRegionCityId);
           }
-          if(res.data.data?.bladeRegionAreaId){
+          if (res.data.data?.bladeRegionAreaId) {
             a.push(res.data.data.bladeRegionAreaId);
           }
         }
@@ -1118,19 +1160,20 @@ export default {
             d.forEach(i => {
               let q = {
                 name: '',
-                url: i
+                url: i,
               };
               le.push(q);
             });
             this.fileList = le;
           } else {
-            this.fileList = [{
-              name: this.form.fileName,
-              url: this.form.leaseAccessories
-            }];
+            this.fileList = [
+              {
+                name: this.form.fileName,
+                url: this.form.leaseAccessories,
+              },
+            ];
           }
         }
-
       });
     },
     handleView(row) {
@@ -1139,48 +1182,48 @@ export default {
       // this.box = true;
       // this.fileList = [];
       this.$router.push({
-        path:'/basicdata/brand/basicClientDetail',
-        query:{
-          id:row.id
-        }
-      })
-      return
+        path: '/basicdata/brand/basicClientDetail',
+        query: {
+          id: row.id,
+        },
+      });
+      return;
       getDetail(row.id).then(res => {
         // res.data.data.typeService = res.data.data.typeService.toString();
         console.log('>>>>>', res.data.data);
         this.form = res.data.data;
-        if(this.form.detailedly == "0" || this.form.detailedly == "-1"){
-          this.form.detailedly = "";
+        if (this.form.detailedly == '0' || this.form.detailedly == '-1') {
+          this.form.detailedly = '';
         }
 
-        let bus =[];
+        let bus = [];
         // console.log("????><><><",this.form.typeServiceBusiness);
-        this.form.typeServiceBusiness.forEach(i =>{
+        this.form.typeServiceBusiness.forEach(i => {
           bus.push(i.typeService);
-          if(i.typeService == '3'){
+          if (i.typeService == '3') {
             this.distriType = true;
             // i.businessType = i.mold;
-            this.form.businessType= i.mold;
+            this.form.businessType = i.mold;
           }
-        })
+        });
 
-        if(!!bus){
+        if (!!bus) {
           this.form.typeServiceList = bus;
         }
         //处理第
         let a = [];
         if (!!this.form.bladeRegionProvinceId) {
-          if(res.data.data?.bladeRegionProvinceId){
+          if (res.data.data?.bladeRegionProvinceId) {
             a.push(res.data.data.bladeRegionProvinceId);
           }
-          if(res.data.data?.bladeRegionCityId){
+          if (res.data.data?.bladeRegionCityId) {
             a.push(res.data.data.bladeRegionCityId);
           }
-          if(res.data.data?.bladeRegionAreaId){
+          if (res.data.data?.bladeRegionAreaId) {
             a.push(res.data.data.bladeRegionAreaId);
           }
         }
-        console.log("aaa",a);
+        console.log('aaa', a);
         this.form.bladeRegionProvinceId = a;
         //处理图片
         if (!!this.form.leaseAccessories) {
@@ -1188,19 +1231,21 @@ export default {
             let le = [];
             let d = this.form.leaseAccessories.splice(',');
             d.forEach(i => {
-              console.log(">>>>",i);
+              console.log('>>>>', i);
               let q = {
                 name: '',
-                url: i
+                url: i,
               };
               le.push(q);
             });
             this.fileList = le;
           } else {
-            this.fileList = [{
-              name: this.form.fileName,
-              url: this.form.leaseAccessories
-            }];
+            this.fileList = [
+              {
+                name: this.form.fileName,
+                url: this.form.leaseAccessories,
+              },
+            ];
           }
         }
       });
@@ -1209,13 +1254,14 @@ export default {
       this.basicClientId = row.id;
       this.drawer = true;
     },
-    handleBrand(row) { //品牌
+    handleBrand(row) {
+      //品牌
       this.$router.push({
-        path:'/basicdata/brand/basicdataStoreBrand',
-        query:{
+        path: '/basicdata/brand/basicdataStoreBrand',
+        query: {
           id: row.id,
-          name: "品牌 - "+row.clientName
-        }
+          name: '品牌 - ' + row.clientName,
+        },
       });
     },
 
@@ -1229,10 +1275,9 @@ export default {
         path: '/basicdata/brand/basicHistoricalContract',
         query: {
           id: row.id,
-          name: '历史记录 - ' + row.clientName
-        }
+          name: '历史记录 - ' + row.clientName,
+        },
       });
-
     },
     //仓库
     handleEntrepot(row) {
@@ -1245,10 +1290,9 @@ export default {
         query: {
           id: row.id,
           name: '服务仓 - ' + row.clientName,
-          type: '2'
-        }
+          type: '2',
+        },
       });
-
     },
     //联系人
     handleLinkman(row) {
@@ -1257,7 +1301,7 @@ export default {
         query: {
           id: row.id,
           name: '联系人 - ' + row.clientName,
-        }
+        },
       });
     },
     //基地
@@ -1266,8 +1310,8 @@ export default {
         path: '/basicdata/brand/basicdataCustomerBase',
         query: {
           id: row.id,
-          name: '基地 - ' + row.clientName
-        }
+          name: '基地 - ' + row.clientName,
+        },
       });
     },
     //商场
@@ -1276,8 +1320,8 @@ export default {
         path: '/basicdata/brand/basicShop',
         query: {
           id: row.id,
-          name: '门店- ' + row.clientName
-        }
+          name: '门店- ' + row.clientName,
+        },
       });
     },
     handleDrawerClose() {
@@ -1292,7 +1336,7 @@ export default {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -1302,7 +1346,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
         });
     },
@@ -1310,7 +1354,7 @@ export default {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -1319,7 +1363,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
         });
     },
@@ -1329,8 +1373,7 @@ export default {
       this.view = false;
     },
     onClose(done) {
-
-      console.log("执行了");
+      console.log('执行了');
     },
     selectionChange(list) {
       this.selectionList = list;
@@ -1364,10 +1407,8 @@ export default {
         const data = res.data.data;
         console.log(data);
 
-
         data.records.forEach(i => {
-
-         let ke =  this.clientType.find( kh=>parseInt(kh.dictKey) == parseInt(i.clientType));
+          let ke = this.clientType.find(kh => parseInt(kh.dictKey) == parseInt(i.clientType));
           // console.log("客户类型<><><>",ke);
           if (!!ke) {
             i.clientTypeName = ke.dictValue;
@@ -1380,35 +1421,39 @@ export default {
 
           if (!i.typeServiceBusiness) {
             i.typeServiceName = '无';
-          }else{
-            i.typeServiceBusiness.forEach( ty =>{
-              let fuw =  this.freightType.find( fw => parseInt(fw.dictKey) == parseInt(ty.typeService) );
-              if(!!fuw){
+          } else {
+            i.typeServiceBusiness.forEach(ty => {
+              let fuw = this.freightType.find(
+                fw => parseInt(fw.dictKey) == parseInt(ty.typeService)
+              );
+              if (!!fuw) {
                 // console.log("fuw",fuw);
-                typeServiceName.push( fuw.dictValue);
+                typeServiceName.push(fuw.dictValue);
                 // console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue);
               }
             });
-            i.typeServiceName = typeServiceName.join(",");
+            i.typeServiceName = typeServiceName.join(',');
           }
-
         });
         let dz = '';
         data.records.forEach(it => {
-          let arrsheng = this.optioner.filter((i) => {
+          let arrsheng = this.optioner.filter(i => {
             return it.bladeRegionProvinceId == i.value;
           });
-          if(arrsheng.length == 0) return
+          if (arrsheng.length == 0) return;
           // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
-          let arrshi = arrsheng[0].children.filter((i) => {
+          let arrshi = arrsheng[0].children.filter(i => {
             return it.bladeRegionCityId == i.value;
           });
           // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
-          let arrqu = arrshi[0].children.filter((i) => {
+          let arrqu = arrshi[0].children.filter(i => {
             return it.bladeRegionAreaId == i.value;
           });
           // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
-          dz = arrsheng[0].label + (arrshi[0].label?`/${arrshi[0].label}`:``) + (arrqu[0]?.label?`/${arrqu[0]?.label}`:'');
+          dz =
+            arrsheng[0].label +
+            (arrshi[0].label ? `/${arrshi[0].label}` : ``) +
+            (arrqu[0]?.label ? `/${arrqu[0]?.label}` : '');
           it.bladeRegionProvinceId = dz;
         });
 
@@ -1418,8 +1463,7 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-    }
-  }
+    },
+  },
 };
 </script>
-
diff --git a/src/views/basicdata/brand/basicClientAccount.vue b/src/views/basicdata/brand/basicClientAccount.vue
index 6b046d0e..ed6e083d 100644
--- a/src/views/basicdata/brand/basicClientAccount.vue
+++ b/src/views/basicdata/brand/basicClientAccount.vue
@@ -1,217 +1,235 @@
 <template>
-    <basic-container>
-      <div class="avue-crud">
-        <el-row   v-if="!search" style="padding:6px 18px">
-          <!-- 查询模块 -->
-          <el-form :inline="true" :model="query">
-            
-            <el-form-item label="账号:">
-              <el-input v-model="query.account" placeholder="请输入账号"></el-input>
-            </el-form-item>
-  <!--          <el-form-item label="状态:">-->
-  <!--            <el-input v-model="query.condition" placeholder="请输入状态"></el-input>-->
-  <!--          </el-form-item>-->
-            <!-- 查询按钮 -->
-            <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="el-icon-search" @click="searchHide" circle></el-button>
-            </div>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row v-if="!search" style="padding: 6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="账号:">
+            <el-input v-model="query.account" placeholder="请输入账号"></el-input>
+          </el-form-item>
+          <!--          <el-form-item label="状态:">-->
+          <!--            <el-input v-model="query.condition" placeholder="请输入状态"></el-input>-->
+          <!--          </el-form-item>-->
+          <!-- 查询按钮 -->
+          <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>
-        </el-row>
-        <el-row>
-          <!-- 列表模块 -->
-          <tablecmt
-            :columnList="columnList"
-            :tableData="data"
-            :loading="loading"
-            @inputTxt="inputsc"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionChange"
-          >
-            <template #default="slotProps">
-              
-              <!-- <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text> -->
-                <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
-            </template>
-          </tablecmt>
-          
-        </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="[30, 50,80, 120]"
-                           :page-size="page.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="page.total">
-            </el-pagination>
+          <!-- 头部右侧按钮模块 -->
+          <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>
-        </el-row>
-  
-
-  
-        <el-dialog title="创建账号" v-model="openAcountStatus">
-
-           <el-form :disabled="view" ref="openAcountorm" :model="openAcountform" :rules="openAcountrules" label-width="120px">
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <!-- <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text> -->
+            <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
+              >删除</el-text
+            >
+          </template>
+        </tablecmt>
+      </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="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
 
-          <el-form-item label="姓名" prop="openAcountform.name" >
-            <el-input v-model="openAcountform.name" placeholder="请输入联系人" maxlength="20" style="width: 100%" />
+      <el-dialog title="创建账号" v-model="openAcountStatus">
+        <el-form
+          :disabled="view"
+          ref="openAcountorm"
+          :model="openAcountform"
+          :rules="openAcountrules"
+          label-width="120px"
+        >
+          <el-form-item label="姓名" prop="openAcountform.name">
+            <el-input
+              v-model="openAcountform.name"
+              placeholder="请输入联系人"
+              maxlength="20"
+              style="width: 100%"
+            />
           </el-form-item>
 
-          <el-form-item label="账号" prop="openAcountform.phone" >
-            <el-input v-model="openAcountform.phone" placeholder="请输入电话" type="number" maxlength="11" style="width: 100%" />
+          <el-form-item label="账号" prop="openAcountform.phone">
+            <el-input
+              v-model="openAcountform.phone"
+              placeholder="请输入电话"
+              type="number"
+              maxlength="11"
+              style="width: 100%"
+            />
           </el-form-item>
-          <el-form-item label="密码" >
-            <span style="color: red;">默认系统初始化密码</span>
+          <el-form-item label="密码">
+            <span style="color: red">默认系统初始化密码</span>
           </el-form-item>
-          </el-form>
+        </el-form>
 
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('openAcountorm')">提 交</el-button>
-            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false">取 消</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="handleSubmit('openAcountorm')"
+              >提 交</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false"
+              >取 消</el-button
+            >
           </span>
         </template>
-
       </el-dialog>
+    </div>
+  </basic-container>
+</template>
 
+<script>
+import { getList, add } from '@/api/basicdata/basicClientAccount';
+import { mapGetters } from 'vuex';
 
-      </div>
-    </basic-container>
-  </template>
-  
-  <script>
-  import { getList,add } from "@/api/basicdata/basicClientAccount";
-  import { mapGetters } from "vuex";
-  
-  export default {
-    
-    data () {
-      return {
-        columnList: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: 55,
-            checkarr: [],
-            fixed: true,
-          },
-          {
-            prop: 'phone',
-            label: '账号',
-            type: 2,
-            values: '',
-            width: '200',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'name',
-            label: '姓名',
-            type: 2,
-            values: '',
-            width: '200',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-        
-         
-          {
-            prop: 'createTime',
-            label: '创建时间',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: 'right',
-            hide: true,
-          },
-        ],
-        optionProps:{
-          value: 'id',
-          label: 'cName',
-          children: 'childrenList',    //子元素字段名
-          emitPath : false,
-          checkStrictly:true,
-          expandTrigger: 'hover'    //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了
+export default {
+  data() {
+    return {
+      columnList: [
+        {
+          prop: '',
+          label: '',
+          type: 0,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
         },
-        cascaderKey : 1,//防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1
-        height: 0,
-        // 弹框标题
-        title: '',
-        costCorrelationId: '',
-        // 是否展示弹框
-        box: false,
-        openAcountStatus:false,//开通账号弹出框状态
-      openAcountform:{
-        name:"",
-        phone:""
-      },
-        // 是否展示抽屉
-        drawer: false,
-        // 抽屉方向
-        direction: 'rtl',
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-        // 查询信息
-        query: {},
-        // 分页信息
-        page: {
-          currentPage: 1,
-          pageSize: 30,
-          total: 40
+        {
+          prop: 'no',
+          label: '账号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'name',
+          label: '姓名',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
-        // 表单数据
-        form: {},
-        pan: false,
-        // 选择行
-        selectionList: [],
-        // 表单列表
-        data: [],
-        optioner:[],
-        optionsr:[],
-        optionser:[],
-        rules: {
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ],
+      optionProps: {
+        value: 'id',
+        label: 'cName',
+        children: 'childrenList', //子元素字段名
+        emitPath: false,
+        checkStrictly: true,
+        expandTrigger: 'hover', //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了
+      },
+      cascaderKey: 1, //防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1
+      height: 0,
+      // 弹框标题
+      title: '',
+      costCorrelationId: '',
+      // 是否展示弹框
+      box: false,
+      openAcountStatus: false, //开通账号弹出框状态
+      openAcountform: {
+        name: '',
+        phone: '',
+      },
+      // 是否展示抽屉
+      drawer: false,
+      // 抽屉方向
+      direction: 'rtl',
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      // 表单数据
+      form: {},
+      pan: false,
+      // 选择行
+      selectionList: [],
+      // 表单列表
+      data: [],
+      optioner: [],
+      optionsr: [],
+      optionser: [],
+      rules: {
         //   province: [
         //     { required: true, message: '请选择地址', trigger: 'blur' },
         //     // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
@@ -234,225 +252,191 @@
         //   goalGranary: [
         //     { required: true, message: '请选择末端仓', trigger: 'blur' }
         //   ],
-        },
-      }
+      },
+    };
+  },
+  watch: {},
+  created() {
+    this.onLoad(this.page);
+  },
+  mounted() {
+    this.init();
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
     },
-    watch: {
-      
+  },
+  methods: {
+    //关闭浮层
+    hideCascaderInp() {
+      this.$refs.cascaderRef.value.togglePopperVisible(false);
     },
-    created() {
-       
+    handleDrawerClose() {
+      this.costCorrelationId = '';
+      this.drawer = false;
     },
-    mounted () {
-      this.init();
-  
+    handleDrawer(row) {
+      this.costCorrelationId = row.id;
+      this.drawer = true;
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      ids () {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
+    textWarebox(e, index) {
+      console.log(e, index);
+      this.costWraeList[index] = e;
     },
-    methods: {
-      //关闭浮层
-      hideCascaderInp(){
-        this.$refs.cascaderRef.value.togglePopperVisible(false)
-  
-      },
-      handleDrawerClose(){
-        this.costCorrelationId = '';
-        this.drawer = false;
-      },
-      handleDrawer(row) {
-        this.costCorrelationId = row.id;
-        this.drawer = true;
-      },
-      textWarebox(e,index) {
-        console.log(e,index)
-        this.costWraeList[index] = e;
-      },
-      textbox(e,index) {
-        console.log(e,index)
-        this.costList[index] = e;
-      },
-      handleCheckedCities(value) {
-        console.log(value);
-        if(value.length < 1){
-          this.costWraeList = [];
+    textbox(e, index) {
+      console.log(e, index);
+      this.costList[index] = e;
+    },
+    handleCheckedCities(value) {
+      console.log(value);
+      if (value.length < 1) {
+        this.costWraeList = [];
+      }
+      this.wareType.forEach(i => {
+        if (value.includes(i.dictValue)) {
+          // console.log(i);
+          i.pitch = true;
+          // this.$set(i,'pitch',false);
+          this.costWraeListName = value;
+        } else {
+          i.pitch = false;
+          this.costWraeList[i] = null;
+          i.remark = null;
         }
-          this.wareType.forEach(i =>{
-            if(value.includes(i.dictValue)){
-              // console.log(i);
-              i.pitch = true;
-              // this.$set(i,'pitch',false);
-              this.costWraeListName = value;
-            }else{
-              i.pitch = false;
-              this.costWraeList[i] = null;
-              i.remark = null;
-            }
-          });
-      },
-      handleCheckedCitiesChange(value) {
-    
-
-
-      },
-      remoteMethod(query){
-    
-      },
-      remoteMethodBin(query){
-   
-      },
-      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 (from) {
-        this.$refs[from].validate(async (valid) => {
-          if (valid) {
-            this.openAcountform.clientId=this.$route.query.id;
-            add(this.openAcountform).then(() => {
-              this.openAcountStatus = false;
-              this.onLoad(this.page);
-              this.$message({
-                type: 'success',
-                message: '操作成功!'
-              });
-            });
-          }
-        })
-  
-      },
-      handleAdd () {
+      });
+    },
+    handleCheckedCitiesChange(value) {},
+    remoteMethod(query) {},
+    remoteMethodBin(query) {},
+    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);
+    },
 
-        this.openAcountStatus = true;
-  
-      },
-      handleEdit (row) {
-       
- 
-      },
-      handleView (row) {
-      
-  
-      },
-      handleDelete () {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.selectionClear();
+    handleSubmit(from) {
+      this.$refs[from].validate(async valid => {
+        if (valid) {
+          this.openAcountform.clientId = this.$route.query.id;
+          add(this.openAcountform).then(() => {
+            this.openAcountStatus = false;
             this.onLoad(this.page);
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
           });
-      },
-      rowDel (row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        }
+      });
+    },
+    handleAdd() {
+      this.openAcountStatus = true;
+    },
+    handleEdit(row) {},
+    handleView(row) {},
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
         })
-          .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 = [];
-      },
-      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.clientId=  this.$route.query.id;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.clientType.forEach(it =>{
-            data.records.forEach(i =>{
-              if(parseInt( it.dictKey ) == parseInt(i.freightMark)){
-                i.freightMark = it.dictValue
-              }
-              if(i.freightMark == '-1'){
-                i.freightMark = '无'
-              }
-            })
-          })
-    
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
+        .then(() => {
           this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
         });
-      }
-    }
-    };
-  </script>
-  <style>
-  .ca .el-radio__inner {
-    top: -18px;
-    left: -19px;
-    border-radius: 0;
-    border: 0;
-    width: 170px;
-    height: 34px;
-    background-color: transparent;
-    cursor: pointer;
-    box-sizing: border-box;
-    position: absolute;
-  }
-  
-  .ca .el-radio__input.is-checked .el-radio__inner {
-    background: transparent;
-  }
-  
-  </style>
-  
\ No newline at end of file
+    },
+    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 = [];
+    },
+    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.clientId = this.$route.query.id;
+      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>
+<style>
+.ca .el-radio__inner {
+  top: -18px;
+  left: -19px;
+  border-radius: 0;
+  border: 0;
+  width: 170px;
+  height: 34px;
+  background-color: transparent;
+  cursor: pointer;
+  box-sizing: border-box;
+  position: absolute;
+}
+
+.ca .el-radio__input.is-checked .el-radio__inner {
+  background: transparent;
+}
+</style>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index cb294023..21e72d3c 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -768,6 +768,8 @@ export default {
       getGoodsAreaoptionList().then(res=>{
         const data = res.data.data;
         this.areaoption = data
+        console.log("this.areaoption>>>>>>>>>>>>>",this.areaoption
+        );
       })
       getTemplateData("9").then(res=>{
         console.log(res.data.data);
@@ -925,16 +927,16 @@ export default {
             if (!this.form.id) {
               console.log("this.form>>>>>>>", this.form);
               console.log("this.optioner>>>>>>>", this.optioner);
-              if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
-                    //这里需要截取最后一个ID
-                    let a = this.form.goodsAreaId;
-                this.form.goodsAreaId = a[a.length - 1];
-              }
-              this.optioner.map(item => {
-                if (item.id == this.form.goodsAreaId) {
-                  this.form.goodsAreaName = item.headline
-                }
-              })
+              // if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
+              //       //这里需要截取最后一个ID
+              //       let a = this.form.goodsAreaId;
+              //   this.form.goodsAreaId = a[a.length - 1];
+              // }
+              // this.optioner.map(item => {
+              //   if (item.id == this.form.goodsAreaId) {
+              //     this.form.goodsAreaName = item.headline
+              //   }
+              // })
               add(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index f6a5dce1..e3544589 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -524,6 +524,7 @@ function initpage() {
 }
 function handleExportArea() {
   let id=details.arrlist[details.checkselect]?.id||0
+   let name=details.arrlist[details.checkselect]?.name||''
   if (id ===0){
     proxy.$message({
       type: "success",
@@ -543,7 +544,7 @@ function handleExportArea() {
   }).then(() => {
     NProgress.start();
     exportBlob(downloadUrl, values).then(res => {
-      downloadXls(res.data, `仓库${dateNow()}.xlsx`);
+      downloadXls(res.data, name+`${dateNow()}.xlsx`);
       NProgress.done();
     })
   });
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index a1e95430..ccd760c3 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -25,11 +25,11 @@
       </el-row>
       <el-row :gutter="24" class="rows">
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>装卸班组：{{ deliverydata.loadingTeamName }} </span>
+          <span>装车班组：{{ deliverydata.loadingTeamName }} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
           <!--          <span>{{deliverydata.loadingTeamType}} </span> -->
-          <span>装卸班组：{{ deliverydata.teamResponsibility }} </span>
+          <span>卸车班组：{{ deliverydata.unloadingTeamName }} </span>
           <!--          <span>装卸类型： 装 </span>-->
         </el-col>
       </el-row>
@@ -53,20 +53,20 @@
       </el-row>
       <el-divider>配送情况</el-divider>
       <el-row :gutter="24" class="rows">
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
           <span>配送客户：{{ deliverydata.customersNumber }} </span>
         </el-col>
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
           <span>计划包件件数：{{ deliverydata.deliveryNumber }} </span>
         </el-col>
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
           <span>计划库存品数：{{ deliverydata.inventoryNub }} </span>
         </el-col>
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
           <span>装车件数：{{ deliverydata.scannedNumber }} </span>
         </el-col>
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
-          <span>剩余件数：{{ deliverydata.deliveryNumber - deliverydata.scannedNumber }}</span>
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
+          <span>签收件数：{{ deliverydata.signingNumber}}</span>
         </el-col>
       </el-row>
 
@@ -158,7 +158,7 @@
                   text
                   icon="el-icon-view"
                   @click="handleSign(slotProps.scope.row)"
-                  v-if="slotProps.scope.row.signingStatus == '未签收' && slotProps.scope.row.driverSigning == '已签收'"
+                  v-if="slotProps.scope.row.signingStatus == '待审核' && slotProps.scope.row.driverSigning == '已签收'"
                   >复核签收
                 </el-text>
                 <el-text
@@ -166,7 +166,7 @@
                   text
                   icon="el-icon-view"
                   @click="handleSignone(slotProps.scope.row)"
-                  v-if="slotProps.scope.row.signingStatus == '未签收' && slotProps.scope.row.driverSigning == '未签收'"
+                  v-if="slotProps.scope.row.signingStatus == '待审核' && slotProps.scope.row.driverSigning == '未签收'"
                   >一键签收
                 </el-text>
             </template>
@@ -188,7 +188,7 @@
             <template #default="slotProps">
             </template>
           </tablecmt>
-          
+
         </el-tab-pane>
         <el-tab-pane label="包 件 列 表" name="tab3">
           <!-- 列表模块 -->
@@ -205,7 +205,7 @@
             <template #default="slotProps">
             </template>
           </tablecmt>
-          
+
           <!-- <div class="avue-crud__pagination" style="width: 100%"> -->
             <!-- 分页模块 -->
             <el-pagination
@@ -227,7 +227,7 @@
           <!-- 列表模块 -->
           <tablecmt
             :columnList="inventoryoptioncolumn"
-            :tableData="orddata"
+            :tableData="inventorydata"
             :loading="loading"
             @inputTxt="inputsc"
             @timeCheck="timesc"
@@ -517,25 +517,25 @@ export default {
         //   head: false,
         // },
         {
-          prop: 'reservationStockListNum',
-          label: '计划库存品数',
-          type: 2,
+          prop: 'reservationNum',
+          label: '计划包件数',
+          type: 1,
           values: '',
-          width: '150',
+          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
-          prop: 'reservationNum',
-          label: '计划包件数',
-          type: 1,
+          prop: 'reservationStockListNum',
+          label: '计划库存品数',
+          type: 2,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
           prop: 'loadedNub',
@@ -598,8 +598,18 @@ export default {
           sortable: true,
         },
         {
-          prop: 'signingStatus',
-          label: '司机签收时间',
+          prop: 'reservationSigningStatus',
+          label: '签收状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'driverSigning',
+          label: '司机签收状态',
           type: 1,
           values: '',
           width: '150',
@@ -610,7 +620,7 @@ export default {
         },
         {
           prop: 'signingStatus',
-          label: '文员复核时间',
+          label: '文员复核状态',
           type: 1,
           values: '',
           width: '180',
@@ -2295,40 +2305,43 @@ export default {
       });
     },
     submitForm() {
+      console.log("--------------->this.signtitle",this.signtitle);
       this.$refs.signform.validate(valid => {
         if (valid) {
-          if ((this.signtitle = '复核签收')) {
+          if ((this.signtitle === '复核签收')) {
             let row = {};
             console.log(
               'this.signform.deliverySignPictures>>>>>>>>>',
               this.signform.deliverySignPictures
             );
             row.id = this.signform.deliveryId;
-            row.deliverySignPictures = this.signform.deliverySignPictures;
+            row.deliverySignPictures = this.signform.deliverySignPictures.join(",");
             row.clerkSignRemarks = this.signform.clerkSignRemarks;
             row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
             row.signingStatus = '2';
             console.log('更新参数>>>>>>>>', row);
             //  if (!!row.id){
-            updatesign(row).then(
-              () => {
-                this.$message({
-                  type: 'success',
-                  message: '操作成功!',
-                });
-                this.signBox = false;
-                this.onLoad();
-              },
-              error => {
-                console.log(error);
-                this.signBox = false;
-              }
-            );
+            // updatesign(row).then(
+            //   () => {
+            //     this.$message({
+            //       type: 'success',
+            //       message: '操作成功!',
+            //     });
+            //     this.signBox = false;
+            //     this.onLoad();
+            //   },
+            //   error => {
+            //     console.log(error);
+            //     this.signBox = false;
+            //   }
+            // );
           } else {
             let data = {};
-            data.reservationId = row.id;
+            console.log("---------------->this.deliverydata",this.deliverydata);
+            console.log("---------------->this.signform",this.signform);
+            data.reservationId = this.signform.id;
             data.deliveryId = this.deliverydata.id;
-            data.deliverySignPictures = this.signform.deliverySignPictures;
+            data.deliverySignPictures = this.signform.deliverySignPictures.join(",");
             data.clerkSignRemarks = this.signform.clerkSignRemarks;
             console.log('一键签收data>>>>>>>>>>', data);
             getOneclickq(data).then(res => {
@@ -2379,8 +2392,8 @@ export default {
         res => {
           console.log('查看>>>>>库存>>', res.data.data);
           const data = res.data.data;
-          this.inventorydata = data.records;
-          this.inventorypage.total = data.total;
+          this.inventorydata = data;
+          // this.inventorypage.total = data.total;
         }
       );
     },
@@ -2427,6 +2440,7 @@ export default {
           let data = {};
           data.reservationId = row.id;
           data.deliveryId = this.deliverydata.id;
+          console.log("------------->data",data);
           getOneclick(data).then(res => {
             this.$message.success(res.data.msg);
             this.onLoad();
@@ -2549,26 +2563,48 @@ export default {
       getDetail(id).then(res => {
         console.log('res.data>>>>>>>>>>>>', res.data.data);
         const data = res.data.data;
+        this.deliverydata = data
         this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
-        console.log(
-          'data.stockupInfo.teamResponsibility------------------->',
-          data.stockupInfo.teamResponsibility
-        );
-        let a = data.stockupInfo.teamResponsibility.split(',');
-        let b = [];
-        a.forEach(item => {
-          switch (item) {
-            case '1':
-              b.push('装');
-              return;
-            case '2':
-              b.push('卸');
-          }
-        });
+        this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
 
-        this.deliverydata.teamResponsibility = b.join(',');
-        //this.deliverydata = data
+        console.log('this.deliverydata>>>>>>>>>>>>', this.deliverydata);
+        // this.deliverydata.teamResponsibility = b.join(',');
+        // console.log(
+        //   'data.stockupInfo.teamResponsibility------------------->',
+        //   data.stockupInfo.teamResponsibility
+        // );
+        // let a = data.stockupInfo.teamResponsibility.split(',');
+        // let b = [];
+        // a.forEach(item => {
+        //   switch (item) {
+        //     case '1':
+        //       b.push('装');
+        //       return;
+        //     case '2':
+        //       b.push('卸');
+        //   }
+        // });
         this.data = data.reservationList;
+        let a = 0;
+        let packNum =0 ;
+        let invenNum =0 ;
+        let signNum =0 ;
+        this.data.map(item=>{
+          console.log("--------------->item",item);
+          a +=  parseInt(item.inventoryNub)+parseInt(item.loadedNub);
+          packNum +=  parseInt(item.reservationNum);
+          invenNum +=  parseInt(item.reservationStockListNum);
+          signNum +=  parseInt(item.receivedQuantity);
+        })
+
+        this.deliverydata.scannedNumber = a;
+        this.deliverydata.deliveryNumber = packNum;
+        this.deliverydata.inventoryNub = invenNum;
+        this.deliverydata.signingNumber = signNum;
+        console.log("---------------------------->a",a);
+        console.log("---------------------------->packNum",packNum);
+        console.log("---------------------------->invenNum",invenNum);
+        console.log("---------------------------->signNum",signNum);
       });
       this.handleOrder(this.packpage);
       this.handlePackage(this.packpage);
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 97812a62..d0eb2d32 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -464,7 +464,17 @@ export default {
         },
         {
           prop: 'loadingTeamName',
-          label: '装卸班组',
+          label: '装车班组',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loadingTeamName',
+          label: '装车班组',
           type: 2,
           values: '',
           width: '150',
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 7c8c2912..7483a283 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -1351,7 +1351,7 @@
         let b = [];
         console.log('>>>>>>>>>>>>>', data);
         data.forEach(d => {
-          if (d.stockupStatus === '20' || d.stockupStatusName === '待备货') {
+          if (d.stockupStatus === '20' || d.stockupStatusName === '待备货' ) {
             a.push(d.reservationCode);
           }
           if (d.stockupStatus === '30' || d.stockupStatusName === '已备货') {
diff --git a/src/views/distribution/reservation/reservationDetails.vue b/src/views/distribution/reservation/reservationDetails.vue
index 2a60f1a3..4c19d7e1 100644
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@@ -326,6 +326,30 @@
         addvalueServeTypeData:[],
         dialogVisible:false,
         packageColumnList: [
+          {
+            prop: 'waybillNumber',
+            label: '运单号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+            // head: true,
+          },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+            // head: true,
+          },
           {
             prop: 'orderCode',
             label: '订单自编号',
@@ -359,8 +383,8 @@
             sortable: true,
           },
           {
-            label: '一级品',
-            prop: 'firsts',
+            label: '发站仓',
+            prop: 'sendWarehouseName',
             type: 2,
             values: '',
             width: '150',
@@ -369,8 +393,8 @@
             sortable: true,
           },
           {
-            label: '二级品',
-            prop: 'second',
+            label: '目的仓',
+            prop: 'acceptWarehouseName',
             type: 2,
             values: '',
             width: '150',
@@ -378,9 +402,29 @@
             fixed: false,
             sortable: true,
           },
+          // {
+          //   label: '发货时间',
+          //   prop: 'acceptWarehouseName',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
           {
-            label: '三级品',
-            prop: 'thirdProduct',
+            label: '入库时间',
+            prop: 'warehouseEntryTimeEnd',
+            type: 5,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            label: '入库车次',
+            prop: 'trainNumber',
             type: 2,
             values: '',
             width: '150',
@@ -389,8 +433,8 @@
             sortable: true,
           },
           {
-            label: '货位信息',
-            prop: 'goodsAllocation',
+            label: '一级品',
+            prop: 'firsts',
             type: 2,
             values: '',
             width: '150',
@@ -399,8 +443,18 @@
             sortable: true,
           },
           {
-            label: '所在托盘',
-            prop: 'pallet',
+            label: '二级品',
+            prop: 'second',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            label: '三级品',
+            prop: 'thirdProduct',
             type: 2,
             values: '',
             width: '150',
@@ -438,6 +492,26 @@
             fixed: false,
             sortable: true,
           },
+          {
+            label: '货位信息',
+            prop: 'goodsAllocation',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            label: '所在托盘',
+            prop: 'pallet',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
           {
             prop: '',
             label: '操作',
@@ -451,28 +525,28 @@
         ],
         stockArticleColumnList: [
           {
-            prop: 'orderCode',
-            label: '订单自编号',
+            prop: 'waybillNumber',
+            label: '运单号',
             type: 2,
             values: '',
             width: '160',
             checkarr: [],
             fixed: true,
-            sortable: true,
-            head: false
           },
           {
-            prop: 'waybillNumber',
-            label: '运单号',
+            prop: 'orderCode',
+            label: '订单自编号',
             type: 2,
             values: '',
             width: '160',
             checkarr: [],
             fixed: true,
+            sortable: true,
+            head: false
           },
           {
-            label: '货物名称',
-            prop: 'descriptionGoods',
+            label: '商场名称',
+            prop: 'mallName',
             type: 2,
             values: '',
             width: '160',
@@ -481,8 +555,8 @@
             sortable: true
           },
           {
-            label: '品牌',
-            prop: 'brand',
+            label: '门店名称',
+            prop: 'storeName',
             type: 2,
             values: '',
             width: '160',
@@ -491,8 +565,8 @@
             sortable: true
           },
           {
-            label: '收货单位',
-            prop: 'consigneeUnit',
+            label: '货物名称',
+            prop: 'descriptionGoods',
             type: 2,
             values: '',
             width: '160',
@@ -501,8 +575,8 @@
             sortable: true
           },
           {
-            label: '订单来源',
-            prop: 'resource',
+            label: '品牌',
+            prop: 'brand',
             type: 2,
             values: '',
             width: '160',
@@ -510,10 +584,9 @@
             fixed: false,
             sortable: true
           },
-
           {
-            label: '服务类型',
-            prop: 'typeService',
+            label: '收货单位',
+            prop: 'consigneeUnit',
             type: 2,
             values: '',
             width: '160',
@@ -521,9 +594,10 @@
             fixed: false,
             sortable: true
           },
+
           {
-            label: '商场名称',
-            prop: 'mallName',
+            label: '订单来源',
+            prop: 'resource',
             type: 2,
             values: '',
             width: '160',
@@ -532,8 +606,8 @@
             sortable: true
           },
           {
-            label: '门店名称',
-            prop: 'storeName',
+            label: '服务类型',
+            prop: 'typeService',
             type: 2,
             values: '',
             width: '160',
@@ -551,16 +625,16 @@
             fixed: false,
             sortable: true
           },
-          {
-            label: '增值服务费',
-            prop: 'fee',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
+          // {
+          //   label: '增值服务费',
+          //   prop: 'fee',
+          //   type: 1,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
           {
             prop: '',
             label: '操作',
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index bb8d493b..1ee84f8a 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -82,7 +82,7 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" v-if="!slotProps.scope.row.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
+            <el-text type="primary" text icon="el-icon-view" v-if="!slotProps.scope?.row?.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
             <el-button type="primary" text icon="el-icon-view"  @click="handleQRCode(row)">查看包条码</el-button>
 
           </template>
@@ -103,7 +103,10 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
-            <tablecmt
+
+            <el-text type="primary" text icon="el-icon-view"  @click="handleBatchDetail('2')">批量打印</el-text>
+
+          <tablecmt
           :columnList="columnListarrs.columnInventory"
           :tableData="data2"
           :loading="loading"
@@ -112,8 +115,9 @@
           @btnCheck="btnsc"
           @selectCheck="selectsc"
           @selection="selectionChange"
-        >
+         >
           <template #default="slotProps">
+
             <el-text type="primary" text icon="el-icon-view"  @click="handleDetail(slotProps.scope.row)">明细</el-text>
 
           </template>
@@ -136,13 +140,47 @@
         </el-tabs>
 
       </el-row>
-      <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
-        <div >
-          <span>lmy 666</span>
+      <el-dialog title="包条码" :visible.sync="dialogPack" width="1050px" v-model="dialogPack">
+
+        <el-text type="primary" icon="el-icon-view"  @click="handleBatchDetail('1')">批量打印</el-text>
+
+        <tablecmt
+          :columnList="columnListarrs.columnInventoryBatch"
+          :tableData="packageCodeList"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+
+            <el-text type="primary" text icon="el-icon-view"  @click="handlePrintDetail(slotProps.scope.row)">打印</el-text>
+
+          </template>
+        </tablecmt>
+
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChange"
+                         @current-change="currentChange"
+                         :current-page="page2.currentPage"
+                         :page-sizes="[30, 50,80, 120]"
+                         :page-size="page2.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page2.total">
+          </el-pagination>
         </div>
+
+<!--        <div v-for="item in packageCodeList">-->
+<!--          <span>{{item}}</span>-->
+<!--        </div>-->
         <span slot="footer" class="dialog-footer">
           <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
+<!--          <el-button type="primary" @click="printTemplate">打 印</el-button>-->
           <el-button type="primary" @click="dialogPack = false">确 定</el-button>
           <el-button @click="dialogPack = false">取 消</el-button>
         </span>
@@ -250,6 +288,7 @@ import { getStockDetail } from '@/api/distribution/distributionStock';
 import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { getLodop } from '@/utils/LodopFuncs';
 import dayjs from 'dayjs';
+import { getDisStockList,getPrintDetail } from '@/api/distribution/disStockListDetail';
 
 export default {
   data () {
@@ -581,6 +620,15 @@ export default {
         },
       ],
       columnInventory:[
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'sku',
           label: 'SKU',
@@ -713,6 +761,94 @@ export default {
           hide: true,
         },
 
+      ],
+      columnInventoryBatch:[
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'sku',
+          label: 'SKU',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '100',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '230',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+
       ],
       },
       height: 0,
@@ -785,6 +921,7 @@ export default {
       trade:false, // 商
       municipal:true, // 市
       taker:true, // 自提
+      packageCodeList: [], // 自提
     }
   },
   mounted () {
@@ -820,11 +957,88 @@ export default {
     }
   },
   methods: {
+    //批量打印
+    handleBatchDetail(type){
+      console.log("selectionList",this.selectionList);
+      if(this.selectionList.length == 0){
+        this.$message.warning("至少选择一条数据！！")
+        return ;
+      }
+      if(type== '1'){
+        //包条码批量
+        let checkcode=[]
+        this.selectionList.map(item=>{
+          checkcode.push(item.id)
+        })
+        let qr = {
+          ids: checkcode.join(','),
+          type: "2"
+        };
+        getPrintDetail(qr).then( res =>{
+          console.log(",./");
+          this.html=''
+          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+        })
+      }else if(type== '2'){
+//包条码批量
+        let myMap = [];
+        this.selectionList.map(item=>{
+         if(!!item.stocklist){
+           myMap.push(item.stocklist);
+         }
+        })
+        let qr = {
+          ids: myMap.join(","),
+          type: "3"
+        };
+        console.log("><><>>",qr);
+        //库存品订单批量
+        getPrintDetail(qr).then( res =>{
+          // console.log(",./");
+          this.html=''
+          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+        })
+
+      }
+
+    },
+    //单独打印
+    handlePrintDetail(row){
+      console.log("单个答应》》》",row);
+      row.type = "1";
+      getPrintDetail(row).then( res =>{
+        console.log(",./");
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+      })
+
+    },
     //查看库存品明细
     handleDetail(row){
       console.log("row>><><><",row);
       this.dialogPack = true;
-
+      //查询信息
+      let po = {
+        stockListId: row.stockListId,
+        reservationId: row.reservationId,
+      }
+      let s =[];
+      getDisStockList(po).then( res =>{
+        console.log("res>>>>库存包件码",res.data.data);
+        res.data.data.forEach(i => {
+          if(!!i){
+            let a = {};
+            a.sku = i.sku;
+            a.orderCode = i.orderCode;
+            a.descriptionGoods = i.descriptionGoods;
+            a.cargoUnit = i.cargoUnit;
+            a.stockPackageCode = i.stockPackageCode;
+            a.brandName = i.brandName;
+            s.push(a);
+          }
+        });
+        this.packageCodeList = s;
+      })
     },
     showdrawer(value){
       this.drawerShow=value
@@ -1307,21 +1521,30 @@ export default {
     //查询包件列表
    async getStockUpParcelsList(page){
       let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("包件...",a.data);
-     const data = a.data.data;
-     this.data1 = data.records;
-     if(this.data1.length > 0){
-       this.data1.forEach(i =>{
-         if(!i.stockupStatus){
-           i.stockupStatusName = "待备货";
-           this.isStockUp = true;
-         }else{
-           i.stockupStatusName = "已备货";
+     // console.log("包件...",a.data.data);
+       const data = a.data.data;
+       if(data.records.length > 0){
+         // console.log("数据》《》《",data.records[0]);
+         if(!!data.records[0]){
+           this.data1 = data.records;
+           // console.log("数据》《》《》",this.data1);
+           if(this.data1[0] != null ){
+           this.data1.forEach(i =>{
+             if(i != null ){
+               console.log("><><><>>>",i);
+               if(!i.stockupStatus){
+                 i.stockupStatusName = "待备货";
+                 this.isStockUp = true;
+               }else{
+                 i.stockupStatusName = "已备货";
+               }
+             }
+           })
+           }
          }
-       })
-     }
 
-     this.page1.total = a.data.data.total;
+         this.page1.total = a.data.data.total;
+       }
      this.loading = false;
      this.selectionClear();
     },
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 782491e5..b99a0541 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -32,7 +32,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="车辆信息:" prop="vehicleIds">
+                    <el-form-item label="配送车辆信息:" prop="vehicleIds">
                         <el-select
                                 filterable
                                 multiple
@@ -125,7 +125,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="装卸班组:" prop="loader">
+                    <el-form-item label="装车班组:" prop="loader">
                         <el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
                             <el-option
                                     v-for="item in loaderData"
@@ -138,18 +138,31 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="班组职能:" prop="goodsAreaId">
-                        <el-checkbox-group v-model="loadAndUnload">
-                            <el-checkbox
-                                    v-for="item in loadAndUnloadData"
-                                    :label="item.dictKey"
+                    <el-form-item label="卸车班组:" prop="loader">
+                        <el-select filterable v-model="stockUpForm.unloader" placeholder="请选择装卸班组">
+                            <el-option
+                                    v-for="item in loaderData"
+                                    :key="item.dictKey"
+                                    :label="item.dictValue"
                                     :value="item.dictKey"
                             >
-                                <span>{{ item.dictValue }}</span>
-                            </el-checkbox>
-                        </el-checkbox-group>
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
+<!--                <el-col :span="6">-->
+<!--                    <el-form-item label="班组职能:" prop="goodsAreaId">-->
+<!--                        <el-checkbox-group v-model="loadAndUnload">-->
+<!--                            <el-checkbox-->
+<!--                                    v-for="item in loadAndUnloadData"-->
+<!--                                    :label="item.dictKey"-->
+<!--                                    :value="item.dictKey"-->
+<!--                            >-->
+<!--                                <span>{{ item.dictValue }}</span>-->
+<!--                            </el-checkbox>-->
+<!--                        </el-checkbox-group>-->
+<!--                    </el-form-item>-->
+<!--                </el-col>-->
                 <el-col :span="6">
                     <el-form-item label="配送类型:" prop="goodsAreaId">
                         <el-radio-group v-model="stockUpForm.deliveryType">
@@ -1124,6 +1137,14 @@
               }
             });
           }
+          if (this.stockUpForm.unloader) {
+            this.loaderData.forEach(a => {
+              if (this.stockUpForm.loader === a.dictKey) {
+                stockup.unloaderName = a.dictValue;
+                stockup.unloaderId = a.dictKey;
+              }
+            });
+          }
           console.log('this.stockUpForm.forklift-------->', this.stockUpForm.forklift);
           this.forkliftData.forEach(b => {
             if (this.stockUpForm.forklift === b.dictKey) {
@@ -1146,7 +1167,7 @@
           if (this.stockUpForm.outboundDate) {
             stockup.outboundDate = this.stockUpForm.outboundDate;
           }
-          stockup.loadAndUnload = this.loadAndUnload.join(',');
+          // stockup.loadAndUnload = this.loadAndUnload.join(',');
           data.stockupInfo = stockup;
           //将服务类型转为数组
           if (this.serveType) {
@@ -1246,6 +1267,14 @@
               }
             });
           }
+          if (this.stockUpForm.unloader) {
+            this.loaderData.forEach(a => {
+              if (this.stockUpForm.loader === a.dictKey) {
+                stockup.unloaderName = a.dictValue;
+                stockup.unloaderId = a.dictKey;
+              }
+            });
+          }
           this.forkliftData.forEach(b => {
             if (this.stockUpForm.forklift === b.dictKey) {
               stockup.forkliftName = b.dictValue;
@@ -1273,7 +1302,7 @@
             return a - b;
           });
           this.stockUpForm.serveType = serve.join(',');
-          stockup.loadAndUnload = this.loadAndUnload.join(',');
+          // stockup.loadAndUnload = this.loadAndUnload.join(',');
           //判断是否是三方配送
           if (this.waixieForm.tripartiteSource) {
             //三方配送数据构建
@@ -1457,9 +1486,9 @@
         getDictionaryBiz('addvalue_serve_type').then(res => {
           this.addvalueServeTypeData = res.data.data;
         });
-        getDictionaryBiz('load_and_unload').then(res => {
-          this.loadAndUnloadData = res.data.data;
-        });
+        // getDictionaryBiz('load_and_unload').then(res => {
+        //   this.loadAndUnloadData = res.data.data;
+        // });
         getDictionaryBiz('delivery_way').then(res => {
           this.deliveryWayData = res.data.data;
         });
@@ -1478,7 +1507,7 @@
           this.waixieForm.deliveryFee = '';
 
         } else {
-          this.loadAndUnload = [];
+          // this.loadAndUnload = [];
           this.serveType = [];
           this.waixieForm = {};
         }
@@ -1486,7 +1515,7 @@
         this.bbb = false;
         this.stockUpForm.deliveryType = '1';
         this.stockUpForm.deliveryWay = '10';
-        this.loadAndUnload = ['1', '2'];
+        // this.loadAndUnload = ['1', '2'];
         this.stockUpForm.otherFee = 0;
         this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
@@ -1499,7 +1528,7 @@
           this.driverForm.masterDriverName = '';
           this.driverForm.masterVehicleNub = '';
         } else {
-          this.loadAndUnload = [];
+          // this.loadAndUnload = [];
           this.serveType = [];
           this.waixieForm = {};
         }
@@ -1507,7 +1536,7 @@
         this.bbb = true;
         this.stockUpForm.deliveryType = '1';
         this.stockUpForm.deliveryWay = '10';
-        this.loadAndUnload = ['1', '2'];
+        // this.loadAndUnload = ['1', '2'];
         this.stockUpForm.otherFee = 0;
         this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
@@ -1683,11 +1712,12 @@
             this.stockUpForm.deliveryType = '1';
             this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
             // this.serveType = data.reservationInfo.serveType.split(',');
-            if (data.stockupInfo) {
-              this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
-            }
+            // if (data.stockupInfo) {
+            //   this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
+            // }
             // data.deliverySelfVO
-            this.stockUpForm.loader = data.stockupInfo.loaderId;
+            this.stockUpForm.loader = data.loadingTeamId;
+            this.stockUpForm.unloader = data.unloadingTeamId;
             this.stockUpForm.forklift = data.stockupInfo.forkliftId;
             this.stockUpForm.outboundDate = data.stockupInfo.outboundDate;
             this.stockUpForm.remarks = data.remarks;
@@ -1699,16 +1729,16 @@
               }
             });
             this.orderData = data.stockArticleList;
-            if (data.teamResponsibility) {
-              this.loadAndUnload = data.teamResponsibility.split(',');
-            }
+            // if (data.teamResponsibility) {
+            //   this.loadAndUnload = data.teamResponsibility.split(',');
+            // }
             console.log('data.kind', data.kind);
             if (data.kind === '1') {
               //自主配送
               let self = data.deliverySelfVO;
               let vehicle = await this.getvehicleData();
               console.log('___________________-->', vehicle);
-              let driver = await this.getMasterDriverData();
+              let driver = await this.getDriverData();
               let a = [];
               let b = [];
               let vehicleInfo = [];
@@ -1761,7 +1791,7 @@
         } else {
           this.stockUpForm.deliveryType = '1';
           this.stockUpForm.deliveryWay = '10';
-          this.loadAndUnload = ['1', '2'];
+          // this.loadAndUnload = ['1', '2'];
           this.stockUpForm.otherFee = 0;
           this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
           this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 68554c1c..01321530 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -11,18 +11,20 @@
         <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="车辆信息:" prop="vehicleIds">
+                    <el-form-item label="配送司机信息:" prop="goodsShelfId">
+                        <!--                        @change="changeSlaveDriver"-->
                         <el-select
-                                filterable
+                                v-model="deliveryDriver"
                                 multiple
-                                v-model="vehicleIds"
-                                placeholder="请选择车辆"
-                                @change="changeVehicle"
+                                filterable
+                                @change="changeDriver"
+
+                                placeholder="请选择司机"
                         >
                             <el-option
-                                    v-for="item in vehicleData"
+                                    v-for="item in driverData"
                                     :key="item.id"
-                                    :label="item.vehicleNub"
+                                    :label="item.name"
                                     :value="item.id"
                             >
                             </el-option>
@@ -30,26 +32,25 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="配送司机信息:" prop="goodsShelfId">
-                        <!--                        @change="changeSlaveDriver"-->
+                    <el-form-item label="配送车辆信息:" prop="vehicleIds">
                         <el-select
-                                v-model="deliveryDriver"
-                                multiple
                                 filterable
-                                @change="changeDriver"
-
-                                placeholder="请选择司机"
+                                multiple
+                                v-model="vehicleIds"
+                                placeholder="请选择车辆"
+                                @change="changeVehicle"
                         >
                             <el-option
-                                    v-for="item in driverData"
+                                    v-for="item in vehicleData"
                                     :key="item.id"
-                                    :label="item.name"
+                                    :label="item.vehicleNub"
                                     :value="item.id"
                             >
                             </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
+
                 <el-col :span="6">
           <span>
             <el-form-item label="主司机:" prop="forklift">
@@ -125,7 +126,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="装卸班组:" prop="loader">
+                    <el-form-item label="装车班组:" prop="loader">
                         <el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
                             <el-option
                                     v-for="item in loaderData"
@@ -139,19 +140,33 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="班组职能:" prop="goodsAreaId">
-                        <el-checkbox-group v-model="loadAndUnload">
-                            <el-checkbox
-                                    v-for="item in loadAndUnloadData"
-                                    :label="item.dictKey"
+                    <el-form-item label="卸车班组:" prop="loader">
+                        <el-select filterable v-model="stockUpForm.unloader" placeholder="请选择装卸班组">
+                            <el-option
+                                    v-for="item in loaderData"
+                                    :key="item.dictKey"
+                                    :label="item.dictValue"
                                     :value="item.dictKey"
                                     :disabled="isDisable"
                             >
-                                <span>{{ item.dictValue }}</span>
-                            </el-checkbox>
-                        </el-checkbox-group>
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
+<!--                <el-col :span="6">-->
+<!--                    <el-form-item label="班组职能:" prop="goodsAreaId">-->
+<!--                        <el-checkbox-group v-model="loadAndUnload">-->
+<!--                            <el-checkbox-->
+<!--                                    v-for="item in loadAndUnloadData"-->
+<!--                                    :label="item.dictKey"-->
+<!--                                    :value="item.dictKey"-->
+<!--                                    :disabled="isDisable"-->
+<!--                            >-->
+<!--                                <span>{{ item.dictValue }}</span>-->
+<!--                            </el-checkbox>-->
+<!--                        </el-checkbox-group>-->
+<!--                    </el-form-item>-->
+<!--                </el-col>-->
                 <el-col :span="6">
                     <el-form-item label="配送类型:" prop="goodsAreaId">
                         <el-radio-group v-model="stockUpForm.deliveryType">
@@ -921,7 +936,6 @@
           });
       },
       onSubmitOrder() {
-
         let stockup = {};
         let tripartite = {};
         let data = {};
@@ -993,6 +1007,15 @@
                 }
               });
             }
+
+            if (params.unloader) {
+              this.loaderData.forEach(a => {
+                if (params.loader === a.dictKey) {
+                  stockup.unloaderName = a.dictValue;
+                  stockup.unloaderId = a.dictKey;
+                }
+              });
+            }
             if (params.forklift) {
               this.forkliftData.forEach(b => {
                 if (params.forklift === b.dictKey) {
@@ -1015,9 +1038,9 @@
             if (params.remarks) {
               data.remarks = params.remarks;
             }
-            if (this.loadAndUnload.length > 0) {
-              stockup.loadAndUnload = this.loadAndUnload.join(',');
-            }
+            // if (this.loadAndUnload.length > 0) {
+            //   stockup.loadAndUnload = this.loadAndUnload.join(',');
+            // }
             if (params.outboundDate) {
               stockup.outboundDate = params.outboundDate.toString();
             }
@@ -1190,9 +1213,9 @@
         getDictionaryBiz('addvalue_serve_type').then(res => {
           this.addvalueServeTypeData = res.data.data;
         });
-        getDictionaryBiz('load_and_unload').then(res => {
-          this.loadAndUnloadData = res.data.data;
-        });
+        // getDictionaryBiz('load_and_unload').then(res => {
+        //   this.loadAndUnloadData = res.data.data;
+        // });
         getDictionaryBiz('delivery_way').then(res => {
           this.deliveryWayData = res.data.data;
         });
@@ -1211,7 +1234,7 @@
           this.driverForm.vehicleNum = '';
           this.driverForm.deliveryFee = '';
         } else {
-          this.loadAndUnload = [];
+          // this.loadAndUnload = [];
           this.serveType = [];
           this.driverForm = {};
           this.waixieForm = {};
@@ -1219,7 +1242,7 @@
         this.aaa = true;
         this.bbb = false;
         this.stockUpForm.deliveryType = '2';
-        this.stockUpForm.deliveryWay = '2';
+        // this.stockUpForm.deliveryWay = '2';
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.form.taskTime = dayjs().format('YYYY-MM-DD');
         this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
@@ -1232,7 +1255,7 @@
           this.driverForm.masterVehicleNub = '';
           this.driverForm = {};
         } else {
-          this.loadAndUnload = [];
+          // this.loadAndUnload = [];
           this.serveType = [];
           this.driverForm = {};
           this.waixieForm = {};
@@ -1240,7 +1263,7 @@
         this.aaa = false;
         this.bbb = true;
         this.stockUpForm.deliveryType = '2';
-        this.stockUpForm.deliveryWay = '2';
+        // this.stockUpForm.deliveryWay = '2';
         this.form.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD');
@@ -1253,12 +1276,12 @@
       onLoad(page, params = {}) {
         //初始化页面数据
         this.stockUpForm.deliveryType = '2';
-        this.stockUpForm.deliveryWay = '2';
+        // this.stockUpForm.deliveryWay = '2';
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
         this.stockUpForm.otherFee = 0;
-        this.loadAndUnload = ['1', '2'];
+        // this.loadAndUnload = ['1', '2'];
         if (this.reservationIds) {
           this.isoperation = false;
           console.log('》》》》》》》》》》》》》》》', this.reservationIds);
@@ -1288,9 +1311,9 @@
             this.stockUpForm.taskTime = deliveryData.taskTime;
             this.stockUpForm.stockupDate = deliveryData.stockupInfo.stockupDate;
             this.stockUpForm.remarks = deliveryData.remarks;
-            if (deliveryData.stockupInfo.teamResponsibility) {
-              this.loadAndUnload = deliveryData.stockupInfo.teamResponsibility.split(',');
-            }
+            // if (deliveryData.stockupInfo.teamResponsibility) {
+            //   this.loadAndUnload = deliveryData.stockupInfo.teamResponsibility.split(',');
+            // }
             console.log('reservationInfo--------------->', res.data.data.reservationInfo);
             this.reservationData = deliveryData.reservationInfos;
             if (deliveryData.kind === '1') {