diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js
index d10fdd53..6f2c5279 100644
--- a/src/api/distribution/distributionReservation.js
+++ b/src/api/distribution/distributionReservation.js
@@ -12,6 +12,7 @@ export const getList = (current, size, params) => {
   })
 }
 
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/reservation/detail',
diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index d5aaf9e1..cf0468fb 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -23,6 +23,19 @@ export const getStockListOwn = (current, size, params) => {
     }
   })
 }
+
+export const getStockListClient = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/listClient',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getListStockList = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionStockList/list',
diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index 814898fb..b10c054f 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -403,7 +403,7 @@ export default {
     },
     {
       label: '物料名称',
-      prop: 'material'
+      prop: 'materialName'
     },
     {
       label: '数量',
diff --git a/src/option/distribution/distributionStockArticleFrom.js b/src/option/distribution/distributionStockArticleFrom.js
index 629ece44..dbf80df9 100644
--- a/src/option/distribution/distributionStockArticleFrom.js
+++ b/src/option/distribution/distributionStockArticleFrom.js
@@ -99,7 +99,7 @@ export default {
     },
     {
       label: "包条码",
-      prop: "packetBarCode",
+      prop: "orderPackageCode",
     },
     {
       label: "货位信息",
@@ -123,7 +123,7 @@ export default {
     },
     {
       label: "物料",
-      prop: "material",
+      prop: "materialName",
     },
     {
       label: "数量",
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 7efe69e9..2f25e3cc 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -693,7 +693,7 @@ export default {
         }, {
           prop: 'createTime',
           label: '创建时间',
-          type: 1,
+          type: 4,
           values: '',
           width: '150',
           checkarr: [],
@@ -1137,17 +1137,6 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-     /*   this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });*/
-
-        // this.columnList[26].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
@@ -1156,11 +1145,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[24].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
+
       });
       getDictionaryBiz('basic_grounding').then(res => {
         this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1168,11 +1153,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[19].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
+ 
       });
       getDictionaryBiz('freeze_status').then(res => {
         this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1180,11 +1161,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[19].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
+
       });
       getDictionaryBiz('stockup_status').then(res => {
         this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1192,11 +1169,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[36].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
+    
       });
       getDictionaryBiz('order_reservation_status').then(res => {
         this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1204,18 +1177,13 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[35].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
+   
       });
 
     },
     checkcColumnList(prop,columnList){
       for(var a = 0; a < columnList.length; a++){
         if(columnList[a].prop===prop){
-          console.log("1111111111111",columnList[a]);
           return columnList[a];
         }
       }
diff --git a/src/views/reservation/lnventory_list.vue b/src/views/reservation/lnventory_list.vue
new file mode 100644
index 00000000..fba8a6e8
--- /dev/null
+++ b/src/views/reservation/lnventory_list.vue
@@ -0,0 +1,1066 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+          <el-row :hidden="!search" style="padding:6px 18px">
+            <!-- 查询模块 -->
+            <el-form :inline="true" :model="query">
+              <el-form-item label="货物名称:">
+                <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
+              </el-form-item>
+              <el-form-item label="货物编号:">
+                <el-input v-model="query.cargoNumber" placeholder="请输入商城名称"></el-input>
+              </el-form-item>
+              <el-form-item label="物流车次:">
+                <el-input v-model="query.despatch" 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>-->
+            <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>全部拆包</el-button>-->
+            <!--            <el-button type="danger" icon="el-icon-plus" @click="handleImport" plain>导 入</el-button>-->
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <el-button type="primary" text icon="el-icon-view" @click="handleViewDetails(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="handleViewDismantle(slotProps.scope)">拆包</el-button>
+          </template>
+        </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="[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="用户数据导入" append-to-body v-model="excelBox" width="555px">
+        <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+          <template #excelTemplate>
+            <el-button type="primary" @click="handleTemplate">
+              点击下载<i class="el-icon-download el-icon--right"></i>
+            </el-button>
+          </template>
+        </avue-form>
+      </el-dialog>
+      <!-- 拆包模块 -->
+      <el-dialog :title="title"
+                 v-model="dismantle"
+                 width="60%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <div style="border: 1px solid #000000 ;height: 500px">
+          <div class="zhu" >
+            <div class="yi" >物品名称</div>
+            <div class="er" >{{getQuery.name}}</div>
+          </div>
+          <div class="zhu" >
+            <div class="yi" >物品单位</div>
+            <div class="er" >{{ getQuery.logpmUnitName }}</div>
+          </div>
+          <div class="zhu" >
+            <div class="yi" >在库数</div>
+            <div class="er" >{{ getQuery.quantityStock }}</div>
+          </div>
+          <div class="zhu" >
+            <div class="yi" >规格</div>
+            <div class="er" >{{ getQuery.packingSpecification }}</div>
+          </div>
+          <div class="zhu" >
+            <div class="yi" >包装数量</div>
+            <div class="er" >{{ getQuery.packageNum }}</div>
+          </div>
+          <div style="border-width: 1px 0 0 0; border-style: solid; border-color: black;margin-top: 5%;padding-top: 2%;padding-left: 1%">
+            <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
+              <el-form-item label="SKU"  style="width: 40%">
+                <el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
+              </el-form-item>
+              <el-form-item label="货物名称"  style="width: 40%">
+                <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />
+              </el-form-item>
+              <el-form-item label="货物单位"  style="width: 40%">
+                <el-select style="width: 100%;"
+                           v-model="formInline.cargoUnit"
+                           filterable
+                           remote
+                           reserve-keyword
+                           remote-show-suffix
+                           placeholder="请选择货物单位"
+                >
+                  <el-option
+                    v-for="item in distributionUnit"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="规格" style="width: 40%">
+                <el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable />
+              </el-form-item>
+              <el-form-item label="拆箱数" style="width: 40%">
+                <el-input v-model="formInline.unpackingQuantity" placeholder="请输入拆箱数" clearable />
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span  class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">确 定</el-button>
+            <el-button icon="el-icon-circle-close" @click="dismantle = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="订单自编号" prop="orderCode">
+            <el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
+          </el-form-item>
+          <el-form-item label="入库批次号" prop="incomingBatch">
+            <el-input v-model="form.incomingBatch" placeholder="请输入入库批次号"/>
+          </el-form-item>
+          <el-form-item label="货物名称" prop="descriptionGoods">
+            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
+          </el-form-item>
+          <el-form-item label="货物编号" prop="cargoNumber">
+            <el-input v-model="form.cargoNumber" placeholder="请输入货物编号"/>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+          </el-form-item>
+          <el-form-item label="商场" prop="market">
+            <el-input v-model="form.market" placeholder="请输入商场"/>
+          </el-form-item>
+          <el-form-item label="货物单位" prop="cargoUnit">
+            <el-input v-model="form.cargoUnit" placeholder="请输入货物单位"/>
+          </el-form-item>
+          <el-form-item label="门店" prop="shop">
+            <el-input v-model="form.shop" placeholder="请输入门店"/>
+          </el-form-item>
+          <el-form-item label="库位信息" prop="storageLocation">
+            <el-input v-model="form.storageLocation" placeholder="请输入库位信息"/>
+          </el-form-item>
+          <el-form-item label="商城名称" prop="mallName">
+            <el-input v-model="form.mallName" placeholder="请输入商城名称"/>
+          </el-form-item>
+          <el-form-item label="库存数量" prop="quantityStock">
+            <el-input v-model="form.quantityStock" placeholder="请输入库存数量"/>
+          </el-form-item>
+          <el-form-item label="出库数量" prop="outboundQuantity">
+            <el-input v-model="form.outboundQuantity" placeholder="请输入出库数量"/>
+          </el-form-item>
+          <el-form-item label="发运车次" prop="despatch">
+            <el-input v-model="form.despatch" placeholder="请输入发运车次"/>
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
+</template>
+
+<script>
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  addParcels,
+  getStockListClient
+} from '@/api/distribution/distributionStockList';
+import { getListParcelDetails } from "@/api/distribution/distributionParcelDetails";
+import { getListMaterial } from '@/api/basic/basicMaterial';
+import option from "@/option/distribution/distributionStockList";
+import { mapGetters } from "vuex";
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import dayjs from 'dayjs';
+import { getDictionaryBiz } from '@/api/system/dict';
+
+export default {
+  data () {
+    return {
+      drawerShow: false,
+      distributionType:[],
+      distributionUnit:[],
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceTypeName',
+          label: '服务类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: 'orderCode',
+        //   label: '订单自编号',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'cargoNumber',
+          label: '货物编号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'warehouse',
+        //   label: '入库时间',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'despatch',
+          label: '物流车次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'incomingBatch',
+          label: '入库批次',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'mallName',
+        //   label: '商城名称',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'quantityOccupied',
+          label: '冻结数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'outboundQuantity',
+          label: '出库数量',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        /* {
+           prop: 'despatch',
+           label: '物流发运车次',
+           type: 2,
+           values: '',
+           width: '180',
+           checkarr: [],
+           fixed: false,
+           sortable: true,
+         },*/
+        // {
+        //   prop: 'category',
+        //   label: '品分类',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场/客户',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'storeCode',
+        //   label: '门店编码',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'marketCode',
+        //   label: '商场编码',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'shoppingMall',
+        //   label: '所属商场',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '物料单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'unpackingQuantity',
+          label: '拆包数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'unpack',
+          label: '拆包状态',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [ {
+            value: `true`,
+            label: '是',
+          },
+            {
+              value: `false`,
+              label: '否',
+            },],
+          fixed: false,
+          sortable: true,
+        },
+
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      height: 0,
+      formInline:{
+        descriptionGoods: '',
+        cargoUnit: '',
+        cargoNorms: '',
+        unpackingQuantity: '',
+      },
+      // 弹框标题
+      title: '',
+      stockList: { }, //拆包对象
+      // stockId: '', //拆包id
+      // materialId: '', //物料id
+      // marketId: '', //客户id
+      // storeId: '', //客户id
+      // 是否展示弹框
+      box: false,
+      excelBox: false, //导入
+      excelForm: {},
+      dismantle: false, //是否展示拆包弹框
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      getQuery: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      pageDetails: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      formDetails: [],
+      selectionListDismantle: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '模板上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '模板上传中，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data',
+            },
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: '/blade-system/user/import-user',
+          },
+          /*{
+            label: '数据覆盖',
+            prop: 'isCovered',
+            type: 'switch',
+            align: 'center',
+            width: 80,
+            dicData: [
+              {
+                label: '否',
+                value: 0,
+              },
+              {
+                label: '是',
+                value: 1,
+              },
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
+                required: true,
+                message: '请选择是否覆盖',
+                trigger: 'blur',
+              },
+            ],
+          },*/
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+    }
+  },
+  mounted () {
+    this.init();
+    // this.onLoad(this.page);
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    if (checkListnewarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      checkListnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.head = true;
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.head){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+    }
+    if (flexListnewarr) {
+      this.columnList.map(item => {
+        item.fixed = false;
+      });
+      flexListnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            if(item.type==6){
+              item.fixed = 'right';
+            }else{
+              item.fixed = true;
+            }
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.fixed){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+    }
+    if (sortlistnewarr) {
+      this.columnList.map(item => {
+        item.sortable = false;
+      });
+      sortlistnewarr.map(ite => {
+        this.columnList.map(item => {
+          if (ite == item.label) {
+            item.sortable = true;
+          }
+        });
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.sortable){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+    }
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+    idDismantle () {
+      let ids = [];
+      this.selectionListDismantle.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+      if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='serviceTypeName'){
+        this.query['serviceType'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+    handleImport(){
+      this.excelBox = true;
+    },
+    refreshChange() {
+      this.onLoad(this.page);
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleTemplate() {
+      exportBlob(
+        `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '用户数据模板.xlsx');
+      });
+    },
+    //数量校验
+    handleNumberRange(e,row) {
+      // console.log("执行了2222",e,e.target.value,row);
+      if(e.target.value) {
+        e.target.value = e.target.value.replace(/[^\.\d]/g,'') //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
+        if(e.target.value) { //如果替换后还有值
+          e.target.value = parseInt(e.target.value); //把字符型转成整数型
+        }
+        if((e.target.value > row.number )) {
+          this.$message.error('数量不能大于订单数');
+          e.target.value = row.number;
+          return
+        }
+      }
+    },
+    init () {
+      this.height = this.setPx(document.body.clientHeight - 340);
+      getDictionaryBiz('logpm_unit').then(res => {
+        this.distributionUnit = res.data.data;
+        console.log(this.distributionUnit);
+      })
+      getDictionaryBiz('distribution_type').then(res => {
+        this.distributionType = res.data.data;
+        this.columnList[2].checkarr =res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item;
+        });
+      });
+
+
+
+      this.onLoad(this.page);
+
+    },
+    searchHide () {
+      this.search = !this.search;
+    },
+    searchChange () {
+      this.onLoad(this.page);
+    },
+    searchReset () {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    //拆包提交
+    handleSubmit () {
+      // if(this.selectionListDismantle.length < 1){
+      //   this.$message.warning("请选择一条数据！！！");
+      //   return ;
+      // }
+      if (!this.form.id) {
+
+        // if(this.selectionListDismantle.length > 0){
+        //   console.log(this.selectionListDismantle);
+        //   let shi = [];
+        //   this.selectionListDismantle.forEach( i =>{
+        //     let a = {
+        //       parcelsId : i.id,
+        //       unpackingQuantity : i.need
+        //     }
+        //     shi.push(a);
+        //   })
+        //   this.form.parcels = shi;
+        // }
+        // console.log("提交了");
+        if(parseInt(this.formInline.unpackingQuantity) >parseInt(this.getQuery.quantityStock)){
+          this.$message.warning("拆包数量大于在库数量!!!")
+          return ;
+        }else{
+          const regex = /\d+/g; // 正则表达式匹配数字
+          const numbers = this.getQuery.packageNum.match(regex); // 使用match方法获取匹配到的数字数组
+          parseInt(numbers[0]) * parseInt(this.formInline.unpackingQuantity);
+
+          this.formInline.storeNum =  parseInt(numbers[0]) * parseInt(this.formInline.unpackingQuantity);
+        }
+        this.formInline.id =this.stockList.id;
+        this.formInline.materialId =this.stockList.materialId;
+        this.formInline.marketId =this.stockList.marketId;
+        this.formInline.storeId =this.stockList.storeId;
+
+
+        console.log("提交的值",this.formInline);
+        addParcels(this.formInline).then(() => {
+          this.box = false;
+          this.dismantle = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.formInline = {};
+        });
+      } 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;
+      });
+    },
+    handleViewDetails (row) {
+      this.$router.push({
+        path: '/distribution/inventory/distributionStockListDetails',
+        query:{
+          id: row.row.id,
+          name: row.row.descriptionGoods+" — 明细"
+        }
+      });
+
+
+    },
+    async handleViewDismantle (row) {
+      console.log("><<>L:",row.row);
+      this.dismantle = true;
+      this.view = true;
+      this.title = '拆包';
+      this.stockList = row.row;
+      //查询包件详情表
+      let par ={
+        parcelListId : row.row.parcelListId
+      }
+      let ap = {
+        id: row.row.materialId,
+      }
+      //查询物料信息
+      let aa =await getListMaterial(this.pageDetails.currentPage,this.pageDetails.pageSize,ap);
+      console.log("adfadsfvasd",aa.data.data);
+      this.getQuery = aa.data.data.records[0];
+      this.getQuery.quantityStock = row.row.quantityStock;
+      this.formInline.descriptionGoods = this.getQuery.name;
+      let q =  this.distributionUnit.find( i => i.dictKey == this.getQuery.logpmUnit);
+      this.getQuery.logpmUnitName = q.dictValue;
+      // getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
+      //   console.log("<><>===", res.data.data);
+      //   const data = res.data.data;
+      //   this.pageDetails.total = data.total;
+      //   this.formDetails = data.records;
+      //   this.loading = false;
+      //   this.selectionClear();
+      // });
+    },
+    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;
+    },
+    selectionChangeDismantle (list) {
+      this.selectionListDismantle = 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);
+    },
+    currentChangeDetails (currentPage) {
+      this.pageDetails.currentPage = currentPage;
+      // this.handleViewDismantle(this.page);
+    },
+    sizeChangeDetails (pageSize) {
+      this.pageDetails.pageSize = pageSize;
+      // this.handleViewDismantle(this.page);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      this.query.serviceType = '2';
+      getStockListClient(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.data.forEach( i =>{
+          let a =  this.distributionType.find( d =>d.dictKey == i.serviceType);
+          i.serviceTypeName = a.dictValue;
+          if(i.unpack == false){
+            i.unpack = '否'
+          }else{
+            i.unpack = '是'
+          }
+        })
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
+<style>
+.zhu{
+  display: flex;flex-direction: row;
+}
+.yi{
+  border-width: 0 1px 1px 0; border-style: solid; border-color: black;width: 20%;font-size: 14px;text-align: right;padding: 1%;
+}
+.er{
+  border-width: 0 0 1px 0; border-style: solid; border-color: black;width: 90%;font-size: 14px;padding: 1%
+}
+.demo-form-inline .el-input {
+  --el-input-width: 220px;
+}
+</style>
diff --git a/src/views/reservation/order_list.vue b/src/views/reservation/order_list.vue
index dcc7739d..e521c4d3 100644
--- a/src/views/reservation/order_list.vue
+++ b/src/views/reservation/order_list.vue
@@ -1,1319 +1,1416 @@
 <template>
-    <!--全部订单-->
-    <basic-container>
-      <div class="avue-crud">
-        <el-row :hidden="!search" style="padding:6px 18px">
-          <!-- 查询模块 -->
-          <el-form :inline="true" :model="query">
-            <el-form-item label="订单自编号:">
-              <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
-            </el-form-item>
-           <!-- <el-form-item label="货物名称:">
-              <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
-            </el-form-item>
-            <el-form-item label="仓库:">
-              <el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>
-            </el-form-item>
-            <el-form-item label="是否齐套:">
-              <el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>
-            </el-form-item>
-            <el-form-item label="品牌:">
-              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
-            </el-form-item>
-            <el-form-item label="服务类型:">
-              <el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
-            </el-form-item>
-            <el-form-item label="类型;1 预约单  2库存单:">
-              <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>
-            </el-form-item>
-            <el-form-item label="状态;1 配送 2 待配送:">
-              <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></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">
-            &lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
-            <div class="avue-crud__left">
-              <el-button type="primary" icon="el-icon-plus" @click="handleTrade"  v-if="handler && taker || handler && trade"> 商配</el-button>
-              <el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button>
-              <el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button>
-              <el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button>
-            </div>
-            &lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
-  &lt;!&ndash;          <div class="avue-crud__right">&ndash;&gt;
-  &lt;!&ndash;            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>&ndash;&gt;
-  &lt;!&ndash;            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>&ndash;&gt;
-  &lt;!&ndash;          </div>&ndash;&gt;
-          </div>-->
-          <div class="avue-crud__header">
-            <!-- 头部左侧按钮模块 -->
-            <div class="avue-crud__left">
-              <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button> -->
-              <el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>
-              <!-- <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button> -->
-              <!-- <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button> -->
-              <!-- <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button> -->
-  
-            </div>
-        <!--    <div class="avue-crud__left">
-              <el-button type="primary" icon="el-icon-plus" @click="handlebill"  v-if = "!handler">创建提货单</el-button>
-              <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')"  v-if = "!handler">再次通知</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')"  v-if = "!handler">通知提货</el-button>
-            </div>-->
-            <!-- 头部右侧按钮模块 -->
-            <div class="avue-crud__right">
-              <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-              <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-              <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-            </div>
+  <!--全部订单-->
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="订单自编号:">
+            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <!--         <el-form-item label="货物名称:">
+                     <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
+                   </el-form-item>
+                   <el-form-item label="仓库:">
+                     <el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>
+                   </el-form-item>
+                   <el-form-item label="是否齐套:">
+                     <el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>
+                   </el-form-item>
+                   <el-form-item label="品牌:">
+                     <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
+                   </el-form-item>
+                   <el-form-item label="服务类型:">
+                     <el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
+                   </el-form-item>-->
+          <!--          <el-form-item label="类型;1 预约单  2库存单:">-->
+          <!--            <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="状态;1 配送 2 待配送:">-->
+          <!--            <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></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">
+                  &lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
+                  <div class="avue-crud__left">
+                    <el-button type="primary" icon="el-icon-plus" @click="handleTrade"  v-if="handler && taker || handler && trade"> 商配</el-button>
+                    <el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button>
+                    <el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button>
+                    <el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button>
+                    <el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button>
+                    <el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button>
+                  </div>
+                  &lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
+        &lt;!&ndash;          <div class="avue-crud__right">&ndash;&gt;
+        &lt;!&ndash;            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>&ndash;&gt;
+        &lt;!&ndash;            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>&ndash;&gt;
+        &lt;!&ndash;          </div>&ndash;&gt;
+                </div>-->
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button> -->
+            <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if = "handler">转预约单</el-button>
+            <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if = "handler">转库存品</el-button>
+            <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>
+            <!-- <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button> -->
+            <!--            <el-button type="danger" icon="el-icon-plus"  v-if = "handler">转配送</el-button>-->
+
           </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-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>
-            </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="[10, 20, 30, 40, 50, 100]"
-                           :page-size="page.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="page.total">
-            </el-pagination>
+          <!-- <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handlebill"  v-if = "!handler">创建提货单</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')"  v-if = "!handler">再次通知</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')"  v-if = "!handler">通知提货</el-button>
+          </div> -->
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
           </div>
-        </el-row>
-        <el-dialog v-model="dialogFormVisible" title="通知提货">
-          <el-form :model="formCall">
-            <el-form-item label="顾客姓名" :label-width="formLabelWidth">
-              <el-input v-model="formCall.customerName" autocomplete="off" />
-            </el-form-item>
-            <el-form-item label="顾客电话" :label-width="formLabelWidth">
-              <el-input v-model="formCall.customerTelephone" autocomplete="off" />
-            </el-form-item>
-            <el-form-item label="运单" :label-width="formLabelWidth">
-              <el-input v-model="formCall.waybill" autocomplete="off" />
-            </el-form-item>
-            <el-form-item label="跟进记录" :label-width="formLabelWidth">
-              <el-input
-                v-model="formCall.followUpRecord"
-                :rows="2"
-                type="textarea"
-                placeholder="请填写内容"
-              />
-            </el-form-item>
-            <el-form-item label="历史跟进" :label-width="formLabelWidth">
-  
-  
-            </el-form-item>
-          </el-form>
-          <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogFormVisible = false">取消</el-button>
-  <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-          <el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
-        </span>
+        </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-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>
           </template>
-        </el-dialog>
-        <el-dialog v-model="dialogFormService" title="修改服务类型">
-          <el-form :model="formService">
-            <el-form-item label="服务类型" :label-width="formLabelWidth">
-  <!--            <el-input v-model="formService.typeService" autocomplete="off" />-->
-              <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
-                <el-option
-                    v-for="item in distributionType"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="费用" :label-width="formLabelWidth">
-              <el-input v-model="formService.cost" autocomplete="off" />
-            </el-form-item>
-            <el-form-item label="原因" :label-width="formLabelWidth">
-              <el-input
-                v-model="formService.cause"
-                :rows="2"
-                type="textarea"
-                placeholder="请填写原因"
-              />
-            </el-form-item>
-          </el-form>
-          <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogFormService = false">取消</el-button>
-  <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-          <el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
-        </span>
-          </template>
-        </el-dialog>
-        <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
-          <el-form :model="formCustomer">
-            <el-form-item label="姓名" :label-width="formLabelWidth">
-              <el-input v-model="formCustomer.name" autocomplete="off" />
-            </el-form-item>
-            <el-form-item label="电话" :label-width="formLabelWidth">
-              <el-input v-model="formCustomer.phone" autocomplete="off" />
-            </el-form-item>
-            <el-form-item label="地址" :label-width="formLabelWidth">
-              <el-input
-                v-model="formCustomer.address"
-                :rows="2"
-                type="textarea"
-                placeholder="请填写地址"
-              />
-            </el-form-item>
-          </el-form>
-          <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogFormCustomer = false">取消</el-button>
-  <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-          <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
-        </span>
-          </template>
-        </el-dialog>
-        <!-- 表单模块 -->
-        <el-dialog :title="title"
-                   v-model="box"
-                   width="50%"
-                   :before-close="beforeClose"
-                   append-to-body>
-          <el-form :disabled="view" ref="form" :model="form" label-width="80px">
-            <!-- 表单字段 -->
-            <el-form-item label="服务号" prop="serviceNumber">
-              <el-input v-model="form.serviceNumber" 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="mallName">
-              <el-input v-model="form.mallName" placeholder="请输入商场名称"/>
-            </el-form-item>
-            <el-form-item label="货物名称" prop="descriptionGoods">
-              <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
-            </el-form-item>
-            <el-form-item label="仓库" prop="warehouse">
-              <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
-            </el-form-item>
-            <el-form-item label="入库时间" prop="warehouseEntryTime">
-  <!--            <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
-              <el-date-picker
-                v-model="form.warehouseEntryTime"
-                type="datetime"
-                placeholder="请输入入库时间"
-                format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD hh:mm:ss"
-              />
-            </el-form-item>
-            <el-form-item label="在库时长" prop="storeTime">
-              <el-input v-model="form.storeTime" placeholder="请输入在库时长"/>
-            </el-form-item>
-            <el-form-item label="订单总件数" prop="totalNumber">
-              <el-input v-model="form.totalNumber" placeholder="请输入订单总件数"/>
-            </el-form-item>
-            <el-form-item label="在库件数" prop="handQuantity">
-              <el-input v-model="form.handQuantity" placeholder="请输入在库件数"/>
-            </el-form-item>
-            <el-form-item label="是否齐套" prop="completeSet">
-              <el-select v-model="form.completeSet" clearable placeholder="请选择是否齐套">
-  <!--              <el-option-->
-  <!--                v-for="item in completeSetData"-->
-  <!--                :key="item.dictKey"-->
-  <!--                :label="item.dictValue"-->
-  <!--                :value="item.dictKey">-->
-  <!--              </el-option>-->
-                <el-option label="是" value="2">是</el-option>
-                <el-option label="否" value="1">否</el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="品牌" prop="brand">
-              <el-input v-model="form.brand" placeholder="请输入品牌"/>
-            </el-form-item>
-            <el-form-item label="服务类型" prop="typeService">
-              <el-select v-model="form.typeService" clearable placeholder="请选择服务类型">
-  <!--              <el-option-->
-  <!--                v-for="item in typeServiceData"-->
-  <!--                :key="item.dictKey"-->
-  <!--                :label="item.dictValue"-->
-  <!--                :value="item.dictKey">-->
-  <!--              </el-option>-->
-                <el-option label="干" value="1">干</el-option>
-                <el-option label="仓" value="2">仓</el-option>
-                <el-option label="配" value="3">配</el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="顾客名字" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入顾客名字"/>
-            </el-form-item>
-            <el-form-item label="顾客电话" prop="customerTelephone">
-              <el-input v-model="form.customerTelephone" placeholder="请输入顾客电话"/>
-            </el-form-item>
-            <el-form-item label="顾客地址" prop="customerAddress">
-              <el-input v-model="form.customerAddress" placeholder="请输入顾客地址"/>
-            </el-form-item>
-            <el-form-item label="类型;1 预约单  2库存单" prop="genre">
-              <el-select v-model="form.genre" clearable placeholder="请选择类型;1 预约单  2库存单">
-  <!--              <el-option-->
-  <!--                v-for="item in genreData"-->
-  <!--                :key="item.dictKey"-->
-  <!--                :label="item.dictValue"-->
-  <!--                :value="item.dictKey">-->
-  <!--              </el-option>-->
-                <el-option label="库存单" value="2">库存单</el-option>
-                <el-option label="预约单" value="1">预约单</el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="状态;1 配送 2 待配送" prop="state">
-              <el-select v-model="form.state" clearable placeholder="请选择状态;1 配送 2 待配送">
-  <!--              <el-option-->
-  <!--                v-for="item in stateData"-->
-  <!--                :key="item.dictKey"-->
-  <!--                :label="item.dictValue"-->
-  <!--                :value="item.dictKey">-->
-  <!--              </el-option>-->
-                <el-option label="待配送" value="2">待配送</el-option>
-                <el-option label="配送" value="1">配送</el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <!-- 表单按钮 -->
-          <template #footer>
-            <span v-if="!view" class="dialog-footer">
-              <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
-              <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
-            </span>
-          </template>
-        </el-dialog>
-      </div>
-    </basic-container>
-    <edittablehead
-      @setcolum="setnewcolum"
-      @closce="showdrawer"
-      :drawerShow="drawerShow"
-      :columnList="columnList"
-    ></edittablehead>
-  </template>
-  
-  <script>
-  import { getClientList, getDetail, add, update, remove,addStock } from "@/api/distribution/distributionStockArticle";
-  import { getListOwn } from "@/api/distribution/distributionParcelList";
-  import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
-  import { addClient } from "@/api/distribution/distributionClientMessage";
-  import { addService } from "@/api/distribution/distributionServiceLog";
-  import option from "@/option/distribution/distributionStockArticle";
-  import { mapGetters } from "vuex";
-  import { getDictionaryBiz } from '@/api/system/dict';
-  import dayjs from 'dayjs';
-  
-  export default {
-    data () {
-      return {
-        columnList: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: 55,
-            checkarr: [],
-            fixed: true,
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'waybillNumber',
-            label: '运单号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderCode',
-            label: '订单自编号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'mallName',
-            label: '商场名称',
-            type: 2,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'descriptionGoods',
-            label: '货物名称',
-            type: 2,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'warehouse',
-            label: '仓库',
-            type: 2,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'warehouseEntryTime',
-            label: '入库时间',
-            type: 4,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'storeTime',
-            label: '在库时间',
-            type: 1,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'totalNumber',
-            label: '订单总件数',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'consigneeUnit',
-            label: '收货单位',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'consigneePerson',
-            label: '收货人',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'handQuantity',
-            label: '在库件数',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'availableQuantity',
-          //   label: '可用数量',
-          //   type: 2,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'handQuantity',
-            label: '未入库数量',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },  {
-            prop: 'sortingQuantity',
-            label: '分拣数量',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },  {
-            prop: 'deliveryQuantity',
-            label: '配送数量',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'transferQuantity',
-            label: '中转数量',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'signinQuantity',
-            label: '签收数量',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },{
-            prop: 'handQuantity',
-            label: '上架状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },{
-            prop: 'allocation',
-            label: '货区-货位-货架',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },{
-            prop: 'resource',
-            label: '订单来源',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'trays',
-            label: '所在托盘',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'freeze_status',
-            label: '冻结状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'state',
-            label: '状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'completeSetName',
-            label: '是否齐套',
-            type: 3,
-            values: '',
-            width: '150',
-            checkarr: [
-              {
-                value: '2',
-                label: '是',
-              },
-              {
-                value: '1',
-                label: '否',
-              },
-            ],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'brand',
-          //   label: '品牌',
-          //   type: 2,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          // {
-          //   prop: 'typeServerName',
-          //   label: '服务类型',
-          //   type: 3,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'customerName',
-            label: '顾客名字',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'customerTelephone',
-            label: '顾客电话',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'customerAddress',
-            label: '顾客地址',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'fee',
-            label: '增值服务',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'createUser',
-            label: '创建人',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'createTime',
-            label: '创建时间',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'inventoryDate',
-            label: '最新盘点时间',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          }, {
-            prop: 'inventoryPerson',
-            label: '盘点人',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '230',
-            checkarr: [],
-            fixed: 'right',
-            hide: true,
-          },
-          // 更多列的配置...
-        ],
-        columnListedit: [],
-        drawerShow: false,
-        height: 0,
-        // 弹框标题
-        title: '',
-        // 是否展示弹框
-        box: false,
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-        // 查询信息
-        query: {},
-        // 分页信息
-        page: {
-          currentPage: 1,
-          pageSize: 10,
-          total: 40
+        </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="[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 v-model="dialogFormVisible" title="通知提货">
+        <el-form :model="formCall">
+          <el-form-item label="顾客姓名" :label-width="formLabelWidth">
+            <el-input v-model="formCall.customerName" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="顾客电话" :label-width="formLabelWidth">
+            <el-input v-model="formCall.customerTelephone" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="运单" :label-width="formLabelWidth">
+            <el-input v-model="formCall.waybill" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="跟进记录" :label-width="formLabelWidth">
+            <el-input
+              v-model="formCall.followUpRecord"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写内容"
+            />
+          </el-form-item>
+          <el-form-item label="历史跟进" :label-width="formLabelWidth">
+
+
+          </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
+      </span>
+        </template>
+      </el-dialog>
+      <el-dialog v-model="dialogFormService" title="修改服务类型">
+        <el-form :model="formService">
+          <el-form-item label="服务类型" :label-width="formLabelWidth">
+            <!--            <el-input v-model="formService.typeService" autocomplete="off" />-->
+            <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
+              <el-option
+                v-for="item in distributionType"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="费用" :label-width="formLabelWidth">
+            <el-input v-model="formService.cost" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="原因" :label-width="formLabelWidth">
+            <el-input
+              v-model="formService.cause"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写原因"
+            />
+          </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormService = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
+      </span>
+        </template>
+      </el-dialog>
+      <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
+        <el-form :model="formCustomer">
+          <el-form-item label="姓名" :label-width="formLabelWidth">
+            <el-input v-model="formCustomer.name" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="电话" :label-width="formLabelWidth">
+            <el-input v-model="formCustomer.phone" autocomplete="off" />
+          </el-form-item>
+          <el-form-item label="地址" :label-width="formLabelWidth">
+            <el-input
+              v-model="formCustomer.address"
+              :rows="2"
+              type="textarea"
+              placeholder="请填写地址"
+            />
+          </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormCustomer = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
+      </span>
+        </template>
+      </el-dialog>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="服务号" prop="serviceNumber">
+            <el-input v-model="form.serviceNumber" 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="mallName">
+            <el-input v-model="form.mallName" placeholder="请输入商场名称"/>
+          </el-form-item>
+          <el-form-item label="货物名称" prop="descriptionGoods">
+            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
+          </el-form-item>
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+          </el-form-item>
+          <el-form-item label="入库时间" prop="warehouseEntryTime">
+            <!--            <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
+            <el-date-picker
+              v-model="form.warehouseEntryTime"
+              type="datetime"
+              placeholder="请输入入库时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD hh:mm:ss"
+            />
+          </el-form-item>
+          <el-form-item label="在库时长" prop="storeTime">
+            <el-input v-model="form.storeTime" placeholder="请输入在库时长"/>
+          </el-form-item>
+          <el-form-item label="订单总件数" prop="totalNumber">
+            <el-input v-model="form.totalNumber" placeholder="请输入订单总件数"/>
+          </el-form-item>
+          <el-form-item label="在库件数" prop="handQuantity">
+            <el-input v-model="form.handQuantity" placeholder="请输入在库件数"/>
+          </el-form-item>
+          <el-form-item label="是否齐套" prop="completeSet">
+            <el-select v-model="form.completeSet" clearable placeholder="请选择是否齐套">
+              <!--              <el-option-->
+              <!--                v-for="item in completeSetData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="是" value="2">是</el-option>
+              <el-option label="否" value="1">否</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="品牌" prop="brand">
+            <el-input v-model="form.brand" placeholder="请输入品牌"/>
+          </el-form-item>
+          <el-form-item label="服务类型" prop="typeService">
+            <el-select v-model="form.typeService" clearable placeholder="请选择服务类型">
+              <!--              <el-option-->
+              <!--                v-for="item in typeServiceData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="干" value="1">干</el-option>
+              <el-option label="仓" value="2">仓</el-option>
+              <el-option label="配" value="3">配</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="顾客名字" prop="customerName">
+            <el-input v-model="form.customerName" placeholder="请输入顾客名字"/>
+          </el-form-item>
+          <el-form-item label="顾客电话" prop="customerTelephone">
+            <el-input v-model="form.customerTelephone" placeholder="请输入顾客电话"/>
+          </el-form-item>
+          <el-form-item label="顾客地址" prop="customerAddress">
+            <el-input v-model="form.customerAddress" placeholder="请输入顾客地址"/>
+          </el-form-item>
+          <el-form-item label="类型;1 预约单  2库存单" prop="genre">
+            <el-select v-model="form.genre" clearable placeholder="请选择类型;1 预约单  2库存单">
+              <!--              <el-option-->
+              <!--                v-for="item in genreData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="库存单" value="2">库存单</el-option>
+              <el-option label="预约单" value="1">预约单</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态;1 配送 2 待配送" prop="state">
+            <el-select v-model="form.state" clearable placeholder="请选择状态;1 配送 2 待配送">
+              <!--              <el-option-->
+              <!--                v-for="item in stateData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
+              <el-option label="待配送" value="2">待配送</el-option>
+              <el-option label="配送" value="1">配送</el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
+</template>
+
+<script>
+import { getClientList, getDetail, add, update, remove,addStock } from "@/api/distribution/distributionStockArticle";
+import { getListOwn } from "@/api/distribution/distributionParcelList";
+import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
+import { addClient } from "@/api/distribution/distributionClientMessage";
+import { addService } from "@/api/distribution/distributionServiceLog";
+import option from "@/option/distribution/distributionStockArticle";
+import { mapGetters } from "vuex";
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+
+export default {
+  data () {
+    return {
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
         },
-        // 表单数据
-        form: {},
-        formCall: {},// 通知
-        formService: {}, // 服务
-        formCustomer: {}, // 客户
-        // 选择行
-        selectionList: [],
-        // 表单配置
-        option: option,
-        // 表单列表
-        data: [],
-        distributionType: [],
-        dialogTableVisible: false,
-        dialogFormVisible: false,
-        dialogFormCustomer: false, //多选客户弹窗
-        dialogFormCustomerOwn: false, //单独的客户标识
-        dialogFormService: false,
-        formLabelWidth: '120px',
-        handler:true, //首次
-        trade:false, // 商
-        municipal:true, // 市
-        taker:true, // 自提
-      }
-    },
-    mounted () {
-      this.init();
-      this.onLoad(this.page);
-      /**
-       * 初始化获取本地缓存的编辑隐藏的列表
-       *  固定搭配，不能更改
-       */
-        // let checkList=[]
-        // this.columnList.map(item => {
-        //     item.head = false;
-        // });
-      let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-      let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-      let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
-      if (checkListnewarr) {
-        this.columnList.map(item => {
-          item.head = false;
-        });
-        checkListnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              item.head = true;
-            }
-          });
-        });
-      }else{
-        let arr=[]
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'mallName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouse',
+          label: '所在仓库',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouseEntryTime',
+          label: '入库时间',
+          type: 4,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeTime',
+          label: '在库时间',
+          type: 1,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'consigneeUnit',
+          label: '收货单位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'consigneePerson',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'availableQuantity',
+          label: '可用数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'notReceived',
+          label: '未入库数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'sortingQuantity',
+          label: '分拣数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },  {
+          prop: 'deliveryQuantity',
+          label: '配送数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'transferQuantity',
+          label: '中转数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'signinQuantity',
+          label: '签收数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'groundingStatusName',
+          label: '上架状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+
+          ],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'allocation',
+          label: '货区-货位-货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },{
+          prop: 'resource',
+          label: '订单来源',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'trays',
+          label: '所在托盘',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'freezeStatusName',
+          label: '冻结状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+
+          ],
+          fixed: false,
+          sortable: true,
+        },
+
+        {
+          prop: 'reservationStatusName',
+          label: '预约状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'orderStatusName',
+          label: '订单状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'completeSetName',
+          label: '是否齐套',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              value: '2',
+              label: '是',
+            },
+            {
+              value: '1',
+              label: '否',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'brand',
+        //   label: '品牌',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'typeServerName',
+        //   label: '服务类型',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客地址',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fee',
+          label: '增值服务',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createUserName',
+          label: '创建人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        //  {
+        //   prop: 'inventoryDate',
+        //   label: '最新盘点时间',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // }, {
+        //   prop: 'inventoryPerson',
+        //   label: '盘点人',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '230',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      columnListedit: [],
+      drawerShow: false,
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      formCall: {},// 通知
+      formService: {}, // 服务
+      formCustomer: {}, // 客户
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+      distributionType: [],
+      dialogTableVisible: false,
+      dialogFormVisible: false,
+      dialogFormCustomer: false, //多选客户弹窗
+      dialogFormCustomerOwn: false, //单独的客户标识
+      dialogFormService: false,
+      formLabelWidth: '120px',
+      handler:true, //首次
+      trade:false, // 商
+      municipal:true, // 市
+      taker:true, // 自提
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+      // let checkList=[]
+      // this.columnList.map(item => {
+      //     item.head = false;
+      // });
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    if (checkListnewarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      checkListnewarr.map(ite => {
         this.columnList.map(item => {
-          if(item.head){
-            arr.push(item.label)
+          if (ite == item.label) {
+            item.head = true;
           }
         });
-        this.$functions.setStorage(window.location.pathname+'checkList',arr)
-      }
-      if (flexListnewarr) {
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.head){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+    }
+    if (flexListnewarr) {
+      this.columnList.map(item => {
+        item.fixed = false;
+      });
+      flexListnewarr.map(ite => {
         this.columnList.map(item => {
-          item.fixed = false;
-        });
-        flexListnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              if(item.type==6){
-                item.fixed = 'right';
-              }else{
-                item.fixed = true;
-              }
+          if (ite == item.label) {
+            if(item.type==6){
+              item.fixed = 'right';
+            }else{
+              item.fixed = true;
             }
-          });
-        });
-      }else{
-        let arr=[]
-        this.columnList.map(item => {
-          if(item.fixed){
-            arr.push(item.label)
           }
         });
-        this.$functions.setStorage(window.location.pathname+'flexList',arr)
-      }
-      if (sortlistnewarr) {
-        this.columnList.map(item => {
-          item.sortable = false;
-        });
-        sortlistnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              item.sortable = true;
-            }
-          });
-        });
-      }else{
-        let arr=[]
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.fixed){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+    }
+    if (sortlistnewarr) {
+      this.columnList.map(item => {
+        item.sortable = false;
+      });
+      sortlistnewarr.map(ite => {
         this.columnList.map(item => {
-          if(item.sortable){
-            arr.push(item.label)
+          if (ite == item.label) {
+            item.sortable = true;
           }
         });
-        this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      });
+    }else{
+      let arr=[]
+      this.columnList.map(item => {
+        if(item.sortable){
+          arr.push(item.label)
+        }
+      });
+      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+    }
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
+        viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
+        delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
+        editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false)
+      };
+    },
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
       }
+
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
-          viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
-          delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
-          editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false)
-        };
-      },
-      ids () {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      if(row.prop ==='freezeStatusName'){
+        this.query['freezeStatus'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
+      }else if(row.prop ==='completeSetName'){
+        this.query['completeSet'] = index;
+      }else if(row.prop ==='typeName'){
+        this.query['typeService'] = index;
+      }else if (row.prop ==='groundingStatusName'){
+        this.query['groundingStatus'] = index;
+      }else if (row.prop ==='reservationStatusName'){
+        this.query['reservationStatus'] = index;
+      }
+      else{
+        this.query[row.prop] = index;
       }
+      this.onLoad(this.page);
+
+
     },
-    methods: {
-      //通知提货
-      handleCallDeliveryOwn(row){
-        console.log("row",row);
-        this.formCustomer.name = row.row.customerName;
-        this.formCustomer.phone = row.row.customerTelephone;
-        this.formCustomer.address = row.row.customerAddress;
-        this.formCustomer.stockArticleId = row.row.id;
-        this.dialogFormCustomer = true;
-        this.dialogFormCustomerOwn = true;
-      },
-      showdrawer(value){
-        this.drawerShow=value
-      },
-      /**
-       * 弹窗的勾选回调，用于更改头部数组
-       * 固定搭配，只需要更换   columnList
-       */
-      setnewcolum(newarr, headarr,type) {
-        // console.log(newarr,'+++++++++++')
-        if(type==1){
-          this.columnList = newarr;
-          this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-        }else if(type==2){
-          this.columnList = newarr;
-          this.$functions.setStorage(window.location.pathname+'flexList', headarr);
-        }else if(type==3){
-          this.columnList = newarr;
-          this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
-        }
-  
-      },
-      selectionsc(value) {
-        console.log(value);
-      },
-      delectsolt(scope) {
-        const { row } = scope;
-        console.log(row);
-      },
-      editsolt(scope) {
-        const { row } = scope;
-        console.log(row);
-      },
-      btnsc(index, row) {
-        console.log(index, row);
-      },
-      selectsc(index, row) {
-        console.log(index, row);
-        if(row.prop ==='completeSetName'){
-          this.query['completeSet'] = index;
-        }else{
-          this.query[row.prop] = index;
-        }
-        this.onLoad(this.page);
-      },
-      timesc(index, row) {
-        console.log(index, row);
-        if (!!index){
-          index = dayjs(index).format('YYYY-MM-DD');
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+    handleMoke(){
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      let st = false;
+      this.selectionList.some( i =>{
+        if(i.stateName === "已预约"){
+          st = true;
+          this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
         }
-        this.query[row.prop] =  index
-        if (!index){
-          delete this.query[row.prop]
+        if(i.typeService === 3){
+          st = true;
+          this.$message.warning(i.orderCode+" - 为自提单，无法预约！！！");
         }
-        this.onLoad(this.page);
-      },
-      inputsc(index, row) {
-        console.log(index, row);
-        this.query[row.prop] = index;
-        this.onLoad(this.page);
-      },
-      handleMoke(){
-        // if (this.selectionList.length === 0) {
-        //   this.$message.warning("请选择至少一条数据");
-        //   return;
-        // }
-        let st = false;
-        this.selectionList.some( i =>{
-          if(i.stateName === "已预约"){
-            st = true;
-            this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！");
-          }
-        })
-        if(st){
-          return
-        }
-        // 判断orderId是否全都相等
-        const notEqualFlag = this.selectionList.some(
-          (item) =>
-            this.selectionList.filter((ele) =>
-              ele.customerName !== item.customerName
-              && ele.customerTelephone !== item.customerTelephone
-              && ele.customerAddress !== item.customerAddress ).length >= 1
-        );
-        console.log("notEqualFlag=====",notEqualFlag);
-        // 返回true,说明有不同
-        // 返回false,说明全都相等
+      })
+      if(st){
+        return
+      }
+      // 判断orderId是否全都相等
+      const notEqualFlag = this.selectionList.some(
+        (item) =>
+          this.selectionList.filter((ele) =>
+            ele.customerName !== item.customerName
+            && ele.customerTelephone !== item.customerTelephone
+            && ele.customerAddress !== item.customerAddress ).length >= 1
+      );
+      console.log("notEqualFlag=====",notEqualFlag);
+      // 返回true,说明有不同
+      // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/order_listFrom',
+          path: '/distribution/reservation/reservationFrom',
           query:{
             id: this.ids,
-            name: '添加预约单'
-  
           }
         });
-  
       }else{
         this.$message.warning("请选择相同收货信息的订单！！！")
-  
       }
-  
-      },
-      async handleStockList(){
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }else if (this.selectionList.length > 1){
-          this.getSock();
-        }else if (this.selectionList.length < 2){
-          //判断有没有包件
-          let params ={
-            stockArticleId : this.selectionList[0].id
-          }
-  
-        let a =  await  getListOwn(this.page.currentPage,this.page.pageSize,params);
-          console.log("aaaaaaa===",a.data.data);
-          if(a.data.data.records.length > 0){
-            this.$router.push({
-              path: '/distribution/inventory/distributionStockArticleFrom',
-              query: {
-                id : this.ids,
-                name : "转库存单"
-              }
-            });
-          }else{
-            this.getSock();
+
+    },
+    async handleStockList(){
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }else{
+        let st = false;
+        this.selectionList.forEach( i =>{
+
+          if(i.reservationStatusName == "已预约"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
           }
+        })
+        if(st){
+          return
         }
-      },
-      getSock(){
-        this.$confirm("确定将选择的订单转为库存品吗？", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        this.getSock();
+      }
+
+
+      /*else if (this.selectionList.length > 1){
+        this.getSock();
+      }else if (this.selectionList.length < 2){
+        //判断有没有包件
+        let params ={
+          stockArticleId : this.selectionList[0].id
+        }
+
+      let a =  await  getListOwn(this.page.currentPage,this.page.pageSize,params);
+        // console.log("aaaaaaa===",a.data.data);
+        if(a.data.data.records.length > 0){
+          this.$router.push({
+            path: '/distribution/inventory/distributionStockArticleFrom',
+            query: {
+              id : this.ids,
+              name : "转库存单"
+            }
+          });
+        }else{
+          this.getSock();
+        }
+      }*/
+    },
+    getSock(){
+      this.$confirm("确定将选择的订单转为库存品吗？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return addStock(this.ids);
         })
-          .then(() => {
-            return addStock(this.ids);
-          })
-          .then(() => {
-            this.selectionClear();
-            this.onLoad(this.page);
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    //确定通知提货按钮
+    callFordelivery(inde){
+      switch (inde) {
+        case '1':
+          console.log(this.formCall);
+          this.formCall.waybillNumber = this.ids;
+          addCallDelivery(this.formCall).then(() => {
             this.$message({
               type: "success",
               message: "操作成功!"
             });
-          });
-      },
-      //确定通知提货按钮
-      callFordelivery(inde){
-        switch (inde) {
-          case '1':
-            console.log(this.formCall);
-            this.formCall.waybillNumber = this.ids;
-            addCallDelivery(this.formCall).then(() => {
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-              this.dialogFormVisible = false;
-              this.formCall={}
-              this.onLoad(this.page);
-            });
-            break;
-          case '2':
-            this.formService.stockArticleId = this.ids;
-            // console.log("服务类型",this.formService);
-            addService(this.formService).then(() =>{
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-              this.dialogFormService = false;
-              this.formService={}
-              this.onLoad(this.page);
-            })
-            break;
-          case '3':
-            console.log("客户信息！！！",this.formCustomer);
-            if(!this.dialogFormCustomerOwn){
-              this.formCustomer.stockArticleId = this.ids;
-            }
-            addClient(this.formCustomer).then(() =>{
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-              this.dialogFormCustomer = false;
-              this.dialogFormCustomerOwn = false;
-              this.formCustomer={}
-              this.onLoad(this.page);
-            })
-            break;
-        }
-      },
-      //提货跳转
-      handlebill(row){
-        console.log(">>>>",this.ids);
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$router.push({
-          path: '/distribution/inventory/distrilbutionBillLading',
-          query:{
-            id: this.ids,
-  
-          }
-        });
-      },
-      //通知提货
-      handleCallDelivery(ind){
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        switch (ind) {
-            case '1':
-              let ids = [];
-              this.selectionList.forEach(ele => {
-                ids.push(ele.orderCode);
-              });
-              this.formCall.waybill = ids;
-              this.dialogFormVisible = true;
-              break;
-              case '2':
-  
-                this.dialogFormService = true;
-              break;
-              case '3':
-  
-                this.dialogFormCustomer = true;
-              break;
-        }
-  
-      },
-      init () {
-        this.height = this.setPx(document.body.clientHeight - 340);
-        getDictionaryBiz('distribution_type').then(res => {
-          this.distributionType = res.data.data;
-        /*  this.columnList[12].checkarr =res.data.data.map(item=>{
-            item.value=item.dictKey
-            item.label=item.dictValue
-            return item
-          });*/
-        });
-  
-      },
-      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.dialogFormVisible = false;
+            this.formCall={}
             this.onLoad(this.page);
+          });
+          break;
+        case '2':
+          this.formService.stockArticleId = this.ids;
+          // console.log("服务类型",this.formService);
+
+          addService(this.formService).then(() =>{
             this.$message({
               type: "success",
               message: "操作成功!"
             });
-          });
-        } else {
-          update(this.form).then(() => {
-            this.box = false;
+            this.dialogFormService = false;
+            this.formService={}
             this.onLoad(this.page);
+          })
+          break;
+        case '3':
+          console.log("客户信息！！！",this.formCustomer);
+          if(!this.dialogFormCustomerOwn){
+            this.formCustomer.stockArticleId = this.ids;
+          }
+          addClient(this.formCustomer).then(() =>{
             this.$message({
               type: "success",
               message: "操作成功!"
             });
+            this.dialogFormCustomer = false;
+            this.dialogFormCustomerOwn = false;
+            this.formCustomer={}
+            this.onLoad(this.page);
           })
+          break;
+      }
+    },
+    //提货跳转
+    handlebill(row){
+      console.log(">>>>",this.ids);
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$router.push({
+        path: '/distribution/inventory/distrilbutionBillLading',
+        query:{
+          id: this.ids,
+
         }
-      },
-  
-      //全部
-      handleEntire(){
-        this.handler = true;
-        this.taker = true;
-        this.trade = false;
-  
-      },
-      //商配
-      handleTrade(){
-        // this.handler = true;
-        this.trade = true;
-      },
-      //商配
-      handleMunicipal(){
-        // this.handler = true;
-        // this.taker = true;
-      },
-      //自提
-      handlePickUpStore(){
-        this.loading = true;
-        // console.log("this.query",this.query);
-        let params = {};
-        this.query.typeService = '1';
-        getList(this.page.currentPage, this.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();
-          this.handler = false;
-          this.taker = false;
-        });
-      }, //自提的通知
-      handleInform(index){
-  
-        this.loading = true;
-        // console.log("this.query",this.query);
-        let params = {};
-        this.query.typeService = '1';
-        switch (index) {
-            case '1':
-              this.query.notification = index;
-              break;
-            case '2':
-              this.query.notification = index;
-              break;
+      });
+    },
+    //通知提货
+    handleCallDeliveryOwn(row){
+      console.log("row",row);
+      this.formCustomer.name = row.row.customerName;
+      this.formCustomer.phone = row.row.customerTelephone;
+      this.formCustomer.address = row.row.customerAddress;
+      this.formCustomer.stockArticleId = row.row.id;
+      this.dialogFormCustomer = true;
+      this.dialogFormCustomerOwn = true;
+    },
+    //通知提货
+    handleCallDelivery(ind){
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      switch (ind) {
+        case '1':
+          let ids = [];
+          this.selectionList.forEach(ele => {
+            ids.push(ele.orderCode);
+          });
+          this.formCall.waybill = ids;
+          this.dialogFormVisible = true;
+          break;
+        case '2':
+          this.dialogFormService = true;
+          break;
+        case '3':
+          this.dialogFormCustomer = true;
+          break;
+      }
+
+    },
+    /**
+     * 根据属性找寻数组中对应的元素
+     */
+    checkcColumnList(prop,columnList){
+      for(var a=0;a<columnList.length;a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
         }
-        this.query.typeService = '1';
-        getList(this.page.currentPage, this.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();
-          this.handler = false;
-          this.taker = false;
+      }
+    },
+    init () {
+      this.height = this.setPx(document.body.clientHeight - 340);
+      getDictionaryBiz('distribution_type').then(res => {
+        this.distributionType = res.data.data;
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('order_status').then(res => {
+        this.deliveryOrderStatus = res.data.data;
+        this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
         });
-      },
-      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;
+      });
+      getDictionaryBiz('basic_grounding').then(res => {
+         this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
         });
-      },
-      handleView (row) {
-        // this.title = '查看'
-        // this.view = true;
-        // this.box = true;
-        // getDetail(row.id).then(res => {
-        //   this.form = res.data.data;
-        // });
-        this.$router.push({
-          path: '/distribution/inventory/distributionStockArticleDetails',
-          query: {
-            id : row.row.id,
-            name: "详情"+row.row.orderCode
-          },
+      });
+
+      getDictionaryBiz('freeze_status').then(res => {
+        this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+
+      getDictionaryBiz('order_reservation_status').then(res => {
+        this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
+      });
+
+    },
+    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: "操作成功!"
+          });
         })
-  
-  
-      },
-      handleDelete () {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+      }
+    },
+
+    //全部
+    handleEntire(){
+      this.handler = true;
+      this.taker = true;
+      this.trade = false;
+
+    },
+    //商配
+    handleTrade(){
+      // this.handler = true;
+      this.trade = true;
+    },
+    //商配
+    handleMunicipal(){
+      // this.handler = true;
+      // this.taker = true;
+    },
+
+    handleInform(index){
+
+      this.loading = true;
+      // console.log("this.query",this.query);
+      let params = {};
+      this.query.typeService = '1';
+      switch (index) {
+        case '1':
+          this.query.notification = index;
+          break;
+        case '2':
+          this.query.notification = index;
+          break;
+      }
+      this.query.typeService = '1';
+      getClientList(this.page.currentPage, this.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();
+        this.handler = false;
+        this.taker = false;
+      });
+    },
+    handleAdd () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.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;
+      // });
+      // console.log("查看===",row.row);
+      this.$router.push({
+        path: '/distribution/inventory/distributionStockArticleDetails',
+        query: {
+          id : row.row.id,
+          name: "详情 - "+row.row.orderCode
+        },
+      })
+
+
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.selectionClear();
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
-      },
-      rowDel (row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
           });
-      },
-      beforeClose (done) {
-        done()
-        this.form = {};
-        this.view = false;
-      },
-      selectionChange (list) {
-        // console.log("添加阿斯顿发生",list);
-        this.selectionList = list;
-      },
-      selectionClear () {
-        this.selectionList = [];
-        // this.$refs.table.clearSelection();
-      },
-      currentChange (currentPage) {
-        this.page.currentPage = currentPage;
-        this.onLoad(this.page);
-      },
-      sizeChange (pageSize) {
-        this.page.pageSize = pageSize;
-        this.onLoad(this.page);
-      },
-      onLoad (page, params = {}) {
-        this.loading = true;
-        this.query.genre = 1;
-        this.query.typeService = 2;
-        getClientList(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 scoped>
-  .el-button--text {
-    margin-right: 15px;
-  }
-  .el-select {
-    width: 300px;
-  }
-  .el-input {
-    width: 300px;
-  }
-  .dialog-footer button:first-child {
-    margin-right: 10px;
+    },
+    beforeClose (done) {
+      done()
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange (list) {
+      // console.log("添加阿斯顿发生",list);
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      this.query.genre = 1;
+      this.query.typeService = 2;
+      getClientList(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.data = this.data.map(i => {
+          // const freezeStatusMap = {
+          //   0: "未冻结",
+          //   1: "已冻结",
+          //   default: "无"
+          // };
+          const nuMap = {
+            '-1': "0"
+          };
+          // const groundingStatusMap = {
+          //   0: "未上架",
+          //   1: "部分上架",
+          //   2: "已上架",
+          //   3: "已下架",
+          //   default: "无"
+          // };
+          // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
+          // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
+          i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
+          i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
+          i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
+          i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
+          i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
+          i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
+          i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity);
+          return i;
+        });
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+
   }
-  </style>
-  
\ No newline at end of file
+};
+</script>
+<style scoped>
+.el-button--text {
+  margin-right: 15px;
+}
+.el-select {
+  width: 300px;
+}
+.el-input {
+  width: 300px;
+}
+.dialog-footer button:first-child {
+  margin-right: 10px;
+}
+</style>
diff --git a/src/views/reservation/reservation_list.vue b/src/views/reservation/reservation_list.vue
new file mode 100644
index 00000000..d684f55c
--- /dev/null
+++ b/src/views/reservation/reservation_list.vue
@@ -0,0 +1,1131 @@
+<template>
+    <basic-container>
+        <div class="avue-crud">
+            <el-row :hidden="!search" style="padding: 6px 18px">
+                <!-- 查询模块 -->
+                <el-form :inline="true" :model="query">
+                        <el-form-item label="预约单编号:">
+                            <el-input v-model="query.reservationCode" placeholder="请输入预约单编号"></el-input>
+                        </el-form-item>
+                        <el-form-item label="订单自编号:">
+                            <el-input v-model="query.stockArticleId" placeholder="请输入订单自编号"></el-input>
+                        </el-form-item>
+                        <el-form-item label="收货人:">
+                            <el-input v-model="query.consignee" placeholder="请输入收货人"></el-input>
+                        </el-form-item>
+                        <el-form-item label="收货地址:">
+                            <el-input v-model="query.deliveryAddress" placeholder="请输入收货地址"></el-input>
+                        </el-form-item>
+                        <el-form-item label="收件人电话:">
+                            <el-input v-model="query.deliveryPhone" placeholder="请输入收件人电话"></el-input>
+                        </el-form-item>
+
+<!--                        <el-form-item label="顾客姓名:">-->
+<!--                            <el-input v-model="query.customerName" 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 style="margin-top: 30px">
+                <el-button-group>
+                    <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
+                    <el-button type="primary" icon="el-icon-circle-check" @click="bbb"
+                    >已确认<i class="el-icon-arrow-right el-icon--right"></i
+                    ></el-button>
+                    <!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
+                </el-button-group>
+                <div class="avue-crud__header">
+                    <!-- 头部左侧按钮模块 -->
+                    <div class="avue-crud__left" style="margin-top: 20px">
+                        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
+                        <el-button
+                                v-if="this.query.reservationStatus === '1'"
+                                type="danger"
+                                icon="el-icon-delete"
+                                @click="handleConfirmReservations"
+                                plain
+                        >批量确认
+                        </el-button>
+                        <el-button
+                                v-if="this.query.reservationStatus === '2'"
+                                type="danger"
+                                icon="el-icon-delete"
+                                @click="handleStockUp()"
+                                plain
+                        >批量转备货
+                        </el-button
+                        >
+                        <el-button
+                                v-if="this.query.reservationStatus === '2'"
+                                type="danger"
+                                icon="el-icon-delete"
+                                @click="handleDeliverys"
+                                plain
+                        >批量转配送
+                        </el-button
+                        >
+                    </div>
+                    <!-- 头部右侧按钮模块 -->
+                    <div class="avue-crud__right">
+                        <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+                        <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+                        <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+                    </div>
+                </div>
+            </el-row>
+            <el-row>
+                <!-- 列表模块 -->
+                <tablecmt
+                        :columnList="columnList"
+                        :tableData="data"
+                        :loading="loading"
+                        @inputTxt="inputsc"
+                        @timeCheck="timesc"
+                        @btnCheck="btnsc"
+                        @selectCheck="selectsc"
+                        @selection="selectionChange"
+                >
+                    <template #default="slotProps">
+                        <el-button size="small" @click="viewReservation(slotProps.scope)">查看</el-button>
+                        <el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
+                        <br/>
+                        <el-button size="small" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
+                        <br/>
+<!--                        ${{slotProps.scope}}-->
+                        <el-button v-if="this.query.reservationStatus==='1'?true:false " type="small" @click="confirmReservation(slotProps.scope)">确认预约</el-button>
+                    </template>
+                </tablecmt>
+                <!--        <el-popover :visible="visible" placement="top-start" :width="160">-->
+                <!--          <p>Are you sure to delete this?</p>-->
+                <!--          <el-input v-model= 'this.message'-->
+                <!--                    type="textarea"-->
+                <!--                    :rows="1"-->
+                <!--                    placeholder="请输入取消原因"></el-input>-->
+                <!--          <div style="text-align: right; margin: 10%">-->
+                <!--            <el-button size="small" text @click="this.message='',visible = false">取消</el-button>-->
+                <!--            <el-button size="small" type="primary" @click="confirmReservation(slotProps.scope)"-->
+                <!--            >确认</el-button-->
+                <!--            >-->
+                <!--          </div>-->
+                <!--&lt;!&ndash;          <template #reference>&ndash;&gt;-->
+                <!--&lt;!&ndash;          </template>&ndash;&gt;-->
+                <!--        </el-popover>-->
+                <!-- <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="80px"
+                                             align="center"></el-table-column>
+
+                            <template v-for="(item,index) in option.column">
+                                <el-table-column v-if="item.hide!==true"
+                                                 :prop="item.prop"
+                                                 :label="item.label"
+                                                 :width="item.width"
+                                                 :key="index">
+                                </el-table-column>
+                            </template>
+                            <el-table-column prop="menu" label="操作" :width="220" align="center">
+                                <template #="{row}">
+                                    <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+                                    <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                                    <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>
+        </div>
+    </basic-container>
+    <edittablehead
+            @setcolum="setnewcolum"
+            @closce="showdrawer"
+            :drawerShow="drawerShow"
+            :columnList="columnList"
+    ></edittablehead>
+    <el-dialog v-model="dialogFormCustomer" title="指派叉车">
+        <el-form :model="info">
+            <el-form-item label="备货时间:" >
+                <el-date-picker
+                        v-model="info.stockupDate"
+                        type="date"
+                        placeholder="选择日期">
+                </el-date-picker>
+            </el-form-item>
+            <!--      <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
+            <!--        <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">-->
+            <!--          <el-option-->
+            <!--                  v-for="item in loaderData"-->
+            <!--                  :key="item.dictKey"-->
+            <!--                  :label="item.dictValue"-->
+            <!--                  :value="item.dictKey">-->
+            <!--          </el-option>-->
+            <!--        </el-select>-->
+            <!--      </el-form-item>-->
+            <el-form-item label="备货区域:" >
+                <el-select v-model="info.stockupArea" clearable placeholder="请选择备货区编号">
+                    <el-option
+                            v-for="item in goodsAreaIdData"
+                            :key="item.dictKey"
+                            :label="item.dictValue"
+                            :value="item.dictKey">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogFormCustomer = false">取消</el-button>
+          <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
+      </span>
+        </template>
+    </el-dialog>
+
+
+    <el-dialog title="预约取消"
+               v-model="dialogCancelReservation"
+               style="width: 30%;height: 40%" >
+        <el-form :model="cancel" >
+            <el-form-item label="原因:" >
+                <el-input v-model="cancel.message" autocomplete="off"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogCancelReservation = false">取 消</el-button>
+            <el-button type="primary" @click="cancelReservationConfirm(row)">确 定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+  import {
+    getList,
+    getDetail,
+    add,
+    update,
+    remove,
+    confirms,
+    addReservations,
+    cancelReservation
+  } from '@/api/distribution/distributionReservation';
+  import option from '@/option/distribution/distributionReservation';
+  import { mapGetters } from 'vuex';
+  import { getDictionaryBiz } from '@/api/system/dict';
+  import { addAssign, getListUser } from '@/api/distribution/distributionStockup';
+  import { getPostList } from '@/api/system/post';
+  import { getListOwn } from '@/api/system/user';
+  import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
+  import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+
+  export default {
+    data() {
+      return {
+        columnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true
+          },
+          {
+            prop: 'reservationCode',
+            label: '预约单编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'stockArticleId',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'consignee',
+            label: '收货人',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deliveryAddress',
+            label: '收货地址',
+            type: 2,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deliveryPhone',
+            label: '收件人电话',
+            type: 3,
+            values: '',
+            width: '180',
+            checkarr: [
+              {
+                label: '1231213',
+                value: '123121123'
+              },
+              {
+                label: '112121',
+                value: '12312123111123'
+              }
+            ],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'reservationDate',
+            label: '预约时间',
+            type: 5,
+            values: '',
+            width: '220',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'periodOfTime',
+            label: '时段',
+            type: 4,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deliveryWay',
+            label: '配送方式',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: true
+          },
+          {
+            prop: 'deliveryType',
+            label: '配送类型',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'serveType',
+            label: '服务类型',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'reservationNum',
+            label: '预约包件数',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'reservationStockListNum',
+            label: '预约库存品数',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'collectFee',
+            label: '到付运费',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'otherFee',
+            label: '其他费用',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'replaceFee',
+            label: '代付运费',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'fee',
+            label: '总费用',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'reservationStatus',
+            label: '预约信息状态',
+            type: 4,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'orderSource',
+            label: '订单来源',
+            type: 4,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'stockupStatus',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'goodsAreaName',
+            label: '备货区',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'goodsAreaId',
+          //   label: '备货区编号',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   hide:true,
+          // },
+          // {
+          //   prop: 'signingType',
+          //   label: '签收类型',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'notes',
+          //   label: '备注',
+          //   type: 1,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: false,
+          // },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true
+          }
+          // 更多列的配置...
+        ],
+        drawerShow: false,
+        dialogFormCustomer: false,
+        height: 0,
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 40
+        },
+        // 表单数据
+        form: {},
+        info: {},
+        cancel: {},
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: option,
+        // 表单列表
+        data: [],
+        dialogCancelReservation: false,
+        //配送方式字典列表
+        deliveryTypeData: [],
+        //配送类型字典列表
+        resvervationStatusData: [],
+        stockupStatusData: [],
+        orderSourceData: [],
+        periodOfTimeData: [],
+        deliveryWayData: [],
+        //控制编辑弹窗是否可编辑
+        isUpdate: false,
+        addvalueServeTypeData: [],
+        forkliftData: [],
+        loaderData: [],
+        goodsAreaIdData: [],
+        deptId: '',
+        cancelReservationRow:{},
+      };
+    },
+    mounted() {
+      this.init();
+      this.onLoad(this.page);
+      this.getDictionary();
+
+      /**
+       * 初始化获取本地缓存的编辑隐藏的列表
+       *  固定搭配，不能更改
+       */
+      let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+      let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+      let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
+      if (checkListnewarr) {
+        this.columnList.map(item => {
+          item.head = false;
+        });
+        checkListnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.head = true;
+            }
+          });
+        });
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.head) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'checkList', arr);
+      }
+      if (flexListnewarr) {
+        this.columnList.map(item => {
+          item.fixed = false;
+        });
+        flexListnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              if (item.type == 6) {
+                item.fixed = 'right';
+              } else {
+                item.fixed = true;
+              }
+            }
+          });
+        });
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.fixed) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
+      }
+      if (sortlistnewarr) {
+        this.columnList.map(item => {
+          item.sortable = false;
+        });
+        sortlistnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.sortable = true;
+            }
+          });
+        });
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.sortable) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
+      }
+    },
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(',');
+      }
+    },
+    methods: {
+      showdrawer(value) {
+        this.drawerShow = value;
+      },
+      /**
+       * 弹窗的勾选回调，用于更改头部数组
+       * 固定搭配，只需要更换   columnList
+       */
+      setnewcolum(newarr, headarr, type) {
+        // console.log(newarr,'+++++++++++')
+        if (type == 1) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+        } else if (type == 2) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+        } else if (type == 3) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
+        }
+
+      },
+      selectionsc(value) {
+        console.log(value);
+      },
+      delectsolt(scope) {
+        const { row } = scope;
+        console.log(row);
+      },
+      cancelReservation(scope){
+        const { row } = scope;
+        this.dialogCancelReservation = true;
+        this.cancelReservationRow = row;
+        console.log(row);
+      },
+      editsolt(scope) {
+        const { row } = scope;
+        this.$router.push({
+          path: '/distribution/reservation/reservationFrom',
+          query: {
+            reservationId: row.id
+          }
+        });
+        console.log(row);
+      },
+      viewReservation(scope) {
+        const { row } = scope;
+        this.$router.push({
+          path: '/distribution/reservation/reservationDetails',
+          query: {
+            id: row.id
+          }
+        });
+        console.log(row);
+      },
+      btnsc(index, row) {
+        console.log(index, row);
+      },
+      selectsc(index, row) {
+        console.log(index, row);
+      },
+      timesc(index, row) {
+        console.log(index, row);
+      },
+      inputsc(index, row) {
+        console.log(index, row);
+      },
+      init() {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      cancelReservationConfirm(){
+       if (!this.cancel.message){
+         this.$message.warning('请输入取消原因!!');
+         return;
+       }
+       let data = {};
+       if (this.cancelReservationRow){
+         data = this.cancelReservationRow;
+         data.cancelReason = this.cancel.message;
+       }else {
+         this.$message.error('请稍后再试!!');
+         return;
+       }
+       cancelReservation(data).then(res=>{
+         this.onLoad(this.page);
+         this.cancelReservationRow={};
+         this.dialogCancelReservation=false;
+       })
+      },
+      ddd() {
+        this.form.deliveryType === '';
+        console.log(' this.form.deliveryType===', this.form.deliveryType);
+      },
+      //数据字典数据获取
+      getDictionary() {
+        //服务内容
+        getDictionaryBiz('addvalue_serve_type').then(res => {
+          this.addvalueServeTypeData = res.data.data;
+        });
+        getDictionaryBiz('distribution_type').then(res => {
+          this.deliveryTypeData = res.data.data;
+        });
+        //订单来源
+        getDictionaryBiz('order_source').then(res => {
+          this.orderSourceData = res.data.data;
+          console.log(this.deliveryTypeData);
+        });
+        //预约状态
+        getDictionaryBiz('resvervation_status').then(res => {
+          this.resvervationStatusData = res.data.data;
+          console.log(this.deliveryTypeData);
+        });
+        //备货状态
+        getDictionaryBiz('stockup_status').then(res => {
+          this.stockupStatusData = res.data.data;
+          console.log(this.deliveryTypeData);
+        });
+        //时段
+        getDictionaryBiz('period_of_time').then(res => {
+          this.periodOfTimeData = res.data.data;
+          console.log(this.deliveryTypeData);
+        });
+        getDictionaryBiz('delivery_way').then(res => {
+          this.deliveryWayData = res.data.data;
+        });
+      },
+      //查询叉车人员
+      async getFork() {
+        let ides = '';
+        let ide = {};
+        await getListUser().then(res => {
+          // console.log("res>>>",res.data.data);
+          ides = res.data.data.tenantId;
+          this.deptId = res.data.data.deptId;
+        });
+        await getPostList(ides).then(res => {
+          // console.log(">>>>",res.data.data);
+          res.data.data.forEach(i => {
+            if (i.postName == '叉车') {
+              ide = i;
+            }
+          });
+        });
+        // console.log("ied>>>>>",ide);
+        let params = {
+          postId: ide.id, //岗位
+          deptId: this.deptId //部门
+          // roleId: '', //角色
+        };
+        getListOwn(Object.assign(params, this.query)).then(res => {
+          // console.log(".............",res.data.data);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let a = {
+              dictKey: i.id,
+              dictValue: i.name
+            };
+            fo.push(a);
+          });
+          this.forkliftData = fo;
+        });
+        await this.getStorageArea();
+        await this.getTeam();
+
+      },
+      //查询班组
+      async getTeam() {
+        let params = {
+          department: this.deptId
+        };
+        getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
+          // console.log(">><><",res.data.data.records);
+          let fo = [];
+          res.data.data.records.forEach(i => {
+            let a = {
+              dictKey: i.id,
+              dictValue: i.name + '-' + i.groupName
+            };
+            fo.push(a);
+          });
+          this.loaderData = fo;
+        });
+      },
+      //备货区
+      async getStorageArea() {
+        let params = {
+          department: this.deptId
+        };
+        stockUp(params).then(res => {
+          // console.log("res>>>",res.data.data);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let v = {
+              dictKey: i.id,
+              dictValue: i.name + '-' + i.headline
+            };
+            fo.push(v);
+          });
+          this.goodsAreaIdData = fo;
+        });
+      },
+      searchHide() {
+        this.search = !this.search;
+      },
+      searchChange() {
+        this.onLoad(this.page);
+      },
+      searchReset() {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+      handleConfirmReservations() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        let param = {};
+        param.ids = this.ids.toString();
+        addReservations(param).then(res => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+        });
+      },
+      confirmReservation(scope){
+        const { row } = scope;
+        let param = {};
+        param.ids = row.id;
+        addReservations(param).then(res => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+        });
+      },
+      handleSubmit() {
+        this.form.serveType = this.form.serveType.join(',');
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+        });
+      },
+      handleAdd() {
+        this.$router.push({
+          path: '/distribution/reservation/reservationFrom'
+        });
+      },
+      handleEdit(row) {
+        console.log(row);
+        this.$router.push({
+          path: '/distribution/reservation/reservationFrom',
+          query: {
+            reservationId: row.id
+          }
+        });
+      },
+      aaa() {
+        this.query.reservationStatus = '1';
+        this.onLoad(this.page);
+      },
+      bbb() {
+        this.query.reservationStatus = '2';
+        this.onLoad(this.page);
+      },
+      handleView(row) {
+        this.title = '查看';
+        this.view = true;
+        this.box = true;
+        getDetail(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      /**
+       * 批量转配送
+       */
+      handleDeliverys() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        let ids = [];
+        this.selectionList.forEach(item => {
+          if (item.id) {
+            ids.push(item.id);
+          }
+        });
+        ids = ids.join(',');
+        this.$router.push({
+          path: '/distribution/reservation/atlas',
+          query: {
+            id: ids,
+            type:'1'
+          }
+        });
+        // console.log(">>>>>>>>>>",ids);
+      },
+      handleStockUp() {
+        this.info={};
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        let data = this.selectionList;
+        let a=[];
+        data.forEach(d=>{
+          if (d.stockupStatus !== "未备货"){
+            a.push(d.reservationCode);
+          }
+        })
+        if (a.length>=1){
+          this.$message.warning(a.join(",")+'预约单存在备货任务,请勿重复添加');
+          return;
+        }
+        this.dialogFormCustomer = true;
+        this.getFork();
+        this.getTeam();
+      },
+      //确定指派
+      callFordelivery() {
+        this.info.ids = this.ids;
+        this.goodsAreaIdData.forEach(item=>{
+          console.log(item);
+          if (this.info.stockupArea === item.dictKey){
+            this.info.goodsAreaName = item.dictValue
+          }
+        })
+
+        confirms(this.info).then(res => {
+          this.$message({
+            type: 'success',
+            message: '操作成功！'
+          });
+          this.onLoad(this.page);
+          this.dialogFormCustomer = false;
+        });
+      },
+      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;
+        if (!this.query.reservationStatus) {
+          this.query.reservationStatus = '1';
+        }
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          console.log('>>>>>>>', data);
+          data.records.forEach(item => {
+            this.orderSourceData.forEach(a => {
+              if (item.orderSource === a.dictKey) {
+                item.orderSource = a.dictValue;
+              }
+            });
+            this.stockupStatusData.forEach(b => {
+              if (item.stockupStatus === b.dictKey) {
+                item.stockupStatus = b.dictValue;
+              }
+            });
+            this.resvervationStatusData.forEach(e => {
+              if (item.reservationStatus === e.dictKey) {
+                item.reservationStatus = e.dictValue;
+              }
+            });
+            this.deliveryTypeData.forEach(c => {
+              if (item.deliveryType === c.dictKey) {
+                item.deliveryType = c.dictValue;
+              }
+            });
+
+            this.deliveryWayData.forEach(c => {
+              if (item.deliveryWay === c.dictKey) {
+                item.deliveryWay = c.dictValue;
+              }
+            });
+            this.periodOfTimeData.forEach(d => {
+              console.log('11111111111');
+              if (item.periodOfTime === d.dictKey) {
+                item.periodOfTime = d.dictValue;
+              }
+            });
+            let pa = [];
+            if (item.serveType.length > 1) {
+              pa = item.serveType.split(',');
+            } else {
+              pa.push(item.serveType);
+            }
+            this.addvalueServeTypeData.forEach(f => {
+              pa.forEach((p, index) => {
+                if (p === f.dictKey) {
+                  pa[index] = f.dictValue;
+                }
+              });
+            });
+            item.serveType = pa.join(',');
+          });
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>