diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 6045c1cb..32d57717 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -1,996 +1,1030 @@
 <template>
-  <basic-container>
-    <div class="avue-crud">
-      <el-row :hidden="!search" style="padding: 6px 18px">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
-          <!-- 查询按钮 -->
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row 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(row)"
-              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="editsolt(slotProps.scope)">编辑</el-button>
-            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
-              >Delete</el-button
-            >
-          </template>
-        </tablecmt>
-        <!-- <el-table ref="table" v-loading="loading"
-                          @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>
+    <basic-container>
+        <div class="avue-crud">
+            <el-row :hidden="!search" style="padding: 6px 18px">
+                <!-- 查询模块 -->
+                <el-form :inline="true" :model="query">
+                    <!-- 查询按钮 -->
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+                        <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-row>
+            <el-row 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(row)"
+                                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>
+                        <el-button size="small" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
                     </template>
-                    <el-table-column prop="menu" label="操作" :width="220" align="center">
-                        <template #="{row}">
-                            <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-                            <el-button type="primary" text icon="el-icon-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>
+                </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>
-      </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="叉车司机" :label-width="formLabelWidth">
-        <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="备货区域" :label-width="formLabelWidth">
-        <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>
+    </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="叉车司机" :label-width="formLabelWidth">
+                <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="备货区域" :label-width="formLabelWidth">
+                <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="dialogFormVisible = false"> 确定 </el-button>-->
         <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
       </span>
-    </template>
-  </el-dialog>
+        </template>
+    </el-dialog>
 </template>
 
 <script>
-import {
-  getList,
-  getDetail,
-  add,
-  update,
-  remove,
-  confirms,
-  addReservations,
-} 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';
+  import {
+    getList,
+    getDetail,
+    add,
+    update,
+    remove,
+    confirms,
+    addReservations
+  } 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,
+  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: '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: 'goodsAreaId',
+            label: '备货区编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'signingType',
+          //   label: '签收类型',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'notes',
+          //   label: '备注',
+          //   type: 1,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: false,
+          // },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true
+          }
+          // 更多列的配置...
+        ],
+        drawerShow: false,
+        dialogFormCustomer: false,
+        height: 0,
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 40
         },
-        {
-          prop: 'deliveryPhone',
-          label: '收件人电话',
-          type: 3,
-          values: '',
-          width: '180',
-          checkarr: [
-            {
-              label:'1231213',
-              value:'123121123'
-            },
-            {
-              label:'112121',
-              value:'12312123111123'
+        // 表单数据
+        form: {},
+        info: {},
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: option,
+        // 表单列表
+        data: [],
+        //配送方式字典列表
+        deliveryTypeData: [],
+        //配送类型字典列表
+        resvervationStatusData: [],
+        stockupStatusData: [],
+        orderSourceData: [],
+        periodOfTimeData: [],
+        deliveryWayData: [],
+        //控制编辑弹窗是否可编辑
+        isUpdate: false,
+        addvalueServeTypeData: [],
+        forkliftData: [],
+        loaderData: [],
+        goodsAreaIdData: [],
+        deptId: '',
+        visible: false,
+        message: ''
+      };
+    },
+    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;
             }
-          ],
-          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: '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: 'goodsAreaId',
-          label: '备货区编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [
-          ],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'signingType',
-        //   label: '签收类型',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        {
-          prop: 'serviceNumber',
-          label: '服务号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'notes',
-        //   label: '备注',
-        //   type: 1,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: false,
-        // },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: 'right',
-          hide: true,
-        },
-        // 更多列的配置...
-      ],
-      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: {},
-      // 选择行
-      selectionList: [],
-      // 表单配置
-      option: option,
-      // 表单列表
-      data: [],
-      //配送方式字典列表
-      deliveryTypeData: [],
-      //配送类型字典列表
-      resvervationStatusData: [],
-      stockupStatusData: [],
-      orderSourceData: [],
-      periodOfTimeData: [],
-      deliveryWayData: [],
-      //控制编辑弹窗是否可编辑
-      isUpdate: false,
-      addvalueServeTypeData: [],
-      forkliftData: [],
-      loaderData: [],
-      goodsAreaIdData: [],
-      deptId: '',
-    };
-  },
-  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 => {
+          });
+        });
+      } else {
+        let arr = [];
         this.columnList.map(item => {
-          if (ite == item.label) {
-            item.head = true;
+          if (item.head) {
+            arr.push(item.label);
           }
         });
-      });
-    }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.$functions.setStorage(window.location.pathname + 'checkList', arr);
+      }
+      if (flexListnewarr) {
         this.columnList.map(item => {
-          if (ite == item.label) {
-            if(item.type==6){
-              item.fixed = 'right';
-            }else{
-              item.fixed = true;
+          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 => {
+      } else {
+        let arr = [];
         this.columnList.map(item => {
-          if (ite == item.label) {
-            item.sortable = true;
+          if (item.fixed) {
+            arr.push(item.label);
           }
         });
-      });
-    }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);
-    },
-    editsolt(scope) {
-      const { row } = scope;
-      this.$router.push({
-        path: '/distribution/reservation/reservationFrom',
-        query: {
-          reservationId: 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);
-    },
-    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
+        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
       }
-      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
+      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);
           }
-          fo.push(a);
         });
-        this.loaderData = fo;
-      })
-    },
-    //备货区
-    async getStorageArea(){
-      let params ={
-        department: this.deptId
+        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
       }
-      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: '操作成功!',
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
         });
-      });
+        return ids.join(',');
+      }
     },
-    handleSubmit() {
-      this.form.serveType = this.form.serveType.join(',');
-      update(this.form).then(() => {
-        this.box = false;
-        this.onLoad(this.page);
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
+    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(){
+
+      },
+      editsolt(scope) {
+        const { row } = scope;
+        this.$router.push({
+          path: '/distribution/reservation/reservationFrom',
+          query: {
+            reservationId: row.id
+          }
         });
-      });
-    },
-    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);
+        console.log(row);
+      },
+      viewReservation(scope) {
+        const { row } = scope;
+        console.log(row);
+      },
+      btnsc(index, row) {
+        console.log(index, row);
+      },
+      selectsc(index, row) {
+        console.log(index, row);
+      },
+      timesc(index, row) {
+        console.log(index, row);
+      },
+      inputsc(index, row) {
+        console.log(index, row);
+      },
+      init() {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      confirmReservation(scope) {
+        if (!this.message) {
+          this.$message.warning('请输入取消预约原因');
+          return;
         }
-      });
-      ids = ids.join(',');
-      this.$router.push({
-        path: '/distribution/reservation/atlas',
-        query: {
-          id: ids,
-        },
-      });
-      // console.log(">>>>>>>>>>",ids);
-    },
-    handleStockUp(row) {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.dialogFormCustomer = true;
-      this.getFork();
-      this.getTeam()
-      // let param = {};
-      // param.ids = this.ids;
-      // const date = new Date();
-      // const year = date.getFullYear();
-      // const month = (date.getMonth() + 1).toString().padStart(2, '0');
-      // const day = date.getDate().toString().padStart(2, '0');
-      // const formattedDate = `${year}-${month}-${day}`;
-      // console.log(formattedDate);
-      // param.stockupDate = formattedDate;
-      // param.goodsAreaId = '46546456156';
-      // param.addvalueType = '1';
-      // confirms(param).then(() => {
-      //   this.selectionClear();
-      //   this.onLoad(this.page);
-      //   this.$message({
-      //     type: 'success',
-      //     message: '操作成功!',
-      //   });
-      // });
-    },
-    //确定指派
-    callFordelivery(){
-      this.form.ids = this.ids;
-      this.info.ids = this.ids;
-      console.log(this.info);
-      confirms(this.info).then(res=>{
-        this.$message({
-          type: "success",
-          message: "操作成功！"
+        const { row } = scope;
+        //发起取消预约的接口调用
+        row.cancelReason = this.message;
+        console.log(row);
+      },
+      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);
-        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(() => {
+      },
+      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: '操作成功!',
+            message: '操作成功!'
           });
         });
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
+      },
+      handleSubmit() {
+        this.form.serveType = this.form.serveType.join(',');
+        update(this.form).then(() => {
+          this.box = false;
           this.onLoad(this.page);
           this.$message({
             type: 'success',
-            message: '操作成功!',
+            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) {
+      },
+      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';
-      }
-      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.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
+          }
+        });
+        // console.log(">>>>>>>>>>",ids);
+      },
+      handleStockUp(row) {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        this.dialogFormCustomer = true;
+        this.getFork();
+        this.getTeam();
+        // let param = {};
+        // param.ids = this.ids;
+        // const date = new Date();
+        // const year = date.getFullYear();
+        // const month = (date.getMonth() + 1).toString().padStart(2, '0');
+        // const day = date.getDate().toString().padStart(2, '0');
+        // const formattedDate = `${year}-${month}-${day}`;
+        // console.log(formattedDate);
+        // param.stockupDate = formattedDate;
+        // param.goodsAreaId = '46546456156';
+        // param.addvalueType = '1';
+        // confirms(param).then(() => {
+        //   this.selectionClear();
+        //   this.onLoad(this.page);
+        //   this.$message({
+        //     type: 'success',
+        //     message: '操作成功!',
+        //   });
+        // });
+      },
+      //确定指派
+      callFordelivery() {
+        this.form.ids = this.ids;
+        this.info.ids = this.ids;
+        console.log(this.info);
+        confirms(this.info).then(res => {
+          this.$message({
+            type: 'success',
+            message: '操作成功！'
           });
-          this.resvervationStatusData.forEach(e => {
-            if (item.reservationStatus === e.dictKey) {
-              item.reservationStatus = e.dictValue;
-            }
+          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: '操作成功!'
+            });
           });
-          this.deliveryTypeData.forEach(c => {
-            if (item.deliveryType === c.dictKey) {
-              item.deliveryType = c.dictValue;
-            }
+      },
+      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);
+      },
 
-          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;
+      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(',');
           });
-          item.serveType = pa.join(',');
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
         });
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-  },
-};
+      }
+    }
+  };
 </script>
diff --git a/src/views/distribution/reservation/reservationFrom.vue b/src/views/distribution/reservation/reservationFrom.vue
index cb7a1951..f76af565 100644
--- a/src/views/distribution/reservation/reservationFrom.vue
+++ b/src/views/distribution/reservation/reservationFrom.vue
@@ -588,6 +588,8 @@
         let params = {};
         params.id = this.orderInfo.id;
         params.addvalue = addvalueInfos;
+        params.relatedId = 1;
+        console.log("params>>>>>>>>>>>>",params);
         addIncrement(params).then(res => {
           this.dialogVisible = false;
           this.$message({
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index da4c8ab6..be3ec3f1 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -416,38 +416,38 @@
                 </el-table>
             </el-tab-pane>
 
-            <el-tab-pane label="库存品">
-                <el-button  type="primary" link @click="handleAddInventory">新增</el-button>
-                <el-table ref="table"
-                          v-loading="loading"
-                          :data="inventoryData"
-                          :height="height"
-                          style="width: 100%;height: 100%"
-                          :border="option.border">
-                    <!--                    <el-table-column type="selection" v-if="stockList.selection" width="55" 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.columnStockLists">
-                        <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 label="预约数量" type="index" width="100px">
-                        <template #="{row}">
-                            <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="menu" label="操作" :width="220" align="center">
-                        <template #="{row}">
-                            <el-button type="primary" link icon="el-icon-edit" @click="removeStockList(row)">移除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-tab-pane>
+<!--            <el-tab-pane label="库存品">-->
+<!--                <el-button  type="primary" link @click="handleAddInventory">新增</el-button>-->
+<!--                <el-table ref="table"-->
+<!--                          v-loading="loading"-->
+<!--                          :data="inventoryData"-->
+<!--                          :height="height"-->
+<!--                          style="width: 100%;height: 100%"-->
+<!--                          :border="option.border">-->
+<!--                    &lt;!&ndash;                    <el-table-column type="selection" v-if="stockList.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
+<!--                    <el-table-column v-if="option.index" label="序号" type="index" width="80px"-->
+<!--                                     align="center"></el-table-column>-->
+<!--                    <template v-for="(item,index) in option.columnStockLists">-->
+<!--                        <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 label="预约数量" type="index" width="100px">-->
+<!--                        <template #="{row}">-->
+<!--                            <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+<!--                        <template #="{row}">-->
+<!--                            <el-button type="primary" link icon="el-icon-edit" @click="removeStockList(row)">移除-->
+<!--                            </el-button>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+<!--                </el-table>-->
+<!--            </el-tab-pane>-->
         </el-tabs>
 
         <el-form-item style="margin-left: 45%;margin-top: 10px">
@@ -784,6 +784,8 @@
         loadAndUnload:[],
         //服务类型
         serveType:[],
+        //外协数据来源
+        tripartiteSourceData:[],
 
 
       };
@@ -1208,6 +1210,10 @@
         getDictionaryBiz('delivery_way').then(res => {
           this.deliveryWayData = res.data.data;
         });
+        //三方外协来源
+        getDictionaryBiz('tripartite_source').then(res => {
+          this.tripartiteSourceData = res.data.data;
+        });
 
       },