From 96d2b146a6eb9feccdafcc1ab42a3eadd405c6ce Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 5 Sep 2023 16:05:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=83=A8=E9=97=A8=E5=92=8C=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/website.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/website.js b/src/config/website.js
index cf884c79..99e6d0f4 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -11,7 +11,7 @@ export default {
   tenantMode: true, // 是否开启租户模式
   tenantId: '000000', // 管理组租户编号
   captchaMode: false, // 是否开启验证码模式
-  switchMode: true, // 是否开启部门切换模式
+  switchMode: false, // 是否开启部门切换模式
   lockPage: '/lock',
   tokenTime: 3000,
   tokenHeader: 'Blade-Auth',

From b54839da414eb6234507974566228377009440b8 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 6 Sep 2023 09:45:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 09e9149e..d50e3c5d 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -373,7 +373,7 @@ export default {
           head: false,
         },
         {
-          prop: 'warehouseId',
+          prop: 'warehouseCode',
           label: '仓库编号',
           type: 2,
           values: '',

From e0d0a524020a5452b5e98fd0b0acdbf1d303660f Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 6 Sep 2023 16:53:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=81=E9=A2=84=E7=BA=A6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/reservation/reservation.vue  | 2840 +++++-----
 .../reservation/reservationAddFrom.vue        | 4797 +++++++++--------
 .../reservation/reservationSubmitFrom.vue     |   76 +-
 3 files changed, 3980 insertions(+), 3733 deletions(-)

diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 8252fb9d..7c8c2912 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -1,1458 +1,1522 @@
 <template>
-  <basic-container>
-    <div class="avue-crud">
-      <el-row v-if="!search" style="padding: 6px 18px">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
-          <el-form-item label="预约单编号:">
-            <el-input v-model="query.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>
+    <basic-container>
+        <div class="avue-crud">
+            <el-row v-if="!search" style="padding: 6px 18px">
+                <!-- 查询模块 -->
+                <el-form :inline="true" :model="query">
+                    <el-form-item label="预约单编号:">
+                        <el-input v-model="query.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-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="待确认" name="nocheck">
-          <el-row>
-            <el-button-group>
-              <!--                    <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">
-                <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-text
-                  size="small"
-                  type="primary"
-                  link
-                  icon="el-icon-view"
-                  @click="viewReservation(slotProps.scope)"
-                  >查看</el-text
-                >
-                <el-text
-                  size="small"
-                  type="primary"
-                  link
-                  icon="el-icon-view"
-                  @click="editsolt(slotProps.scope)"
-                  >编辑</el-text
-                >
-                <el-text
-                  size="small"
-                  type="primary"
-                  link
-                  icon="el-icon-view"
-                  @click="cancelReservation(slotProps.scope)"
-                  >取消预约</el-text
-                >
-                <el-text
-                  v-if="this.query.reservationStatus === '1' ? true : false"
-                  size="small"
-                  @click="confirmReservation(slotProps.scope)"
-                  >确认预约</el-text
-                >
-              </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>
+                    <!--                        <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-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
+                <el-tab-pane label="待确认" name="nocheck">
+                    <el-row>
+                        <el-button-group>
+                            <!--                    <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">
+                                <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-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="viewReservation(slotProps.scope)"
+                                >查看
+                                </el-text
+                                >
+                                <el-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="editsolt(slotProps.scope)"
+                                >编辑
+                                </el-text
+                                >
+                                <el-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="cancelReservation(slotProps.scope)"
+                                >取消预约
+                                </el-text
+                                >
+                                <el-text
+                                        v-if="this.query.reservationStatus === '1' ? true : false"
+                                        size="small"
+                                        @click="confirmReservation(slotProps.scope)"
+                                >确认预约
+                                </el-text
+                                >
                             </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-tab-pane>
-        <el-tab-pane label="已确认" name="yescheck">
-          <el-row>
-            <el-button-group>
-              <!--                    <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">
-                <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-text
-                  size="small"
-                  type="primary"
-                  link
-                  icon="el-icon-view"
-                  @click="viewReservation(slotProps.scope)"
-                  >查看</el-text
-                >
-                <el-text
-                  size="small"
-                  type="primary"
-                  link
-                  icon="el-icon-view"
-                  @click="editsolt(slotProps.scope)"
-                  >编辑</el-text
-                >
-                <el-text
-                  size="small"
-                  type="primary"
-                  link
-                  icon="el-icon-view"
-                  @click="cancelReservation(slotProps.scope)"
-                  >取消预约</el-text
-                >
-                <el-text
-                  v-if="this.query.reservationStatus === '1' ? true : false"
-                  size="small"
-                  @click="confirmReservation(slotProps.scope)"
-                  >确认预约</el-text
-                >
-              </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>
+                        </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 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-tab-pane>
+                <el-tab-pane label="已确认" name="yescheck">
+                    <el-row>
+                        <el-button-group>
+                            <!--                    <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">
+                                <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-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="viewReservation(slotProps.scope)"
+                                >查看
+                                </el-text
+                                >
+                                <el-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="editsolt(slotProps.scope)"
+                                >编辑
+                                </el-text
+                                >
+                                <el-text
+                                        size="small"
+                                        type="primary"
+                                        link
+                                        icon="el-icon-view"
+                                        @click="cancelReservation(slotProps.scope)"
+                                >取消预约
+                                </el-text
+                                >
+                                <el-text
+                                        v-if="this.query.reservationStatus === '1' ? true : false"
+                                        size="small"
+                                        @click="confirmReservation(slotProps.scope)"
+                                >确认预约
+                                </el-text
+                                >
                             </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-tab-pane>
-      </el-tabs>
+                        </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-tab-pane>
+            </el-tabs>
 
-      <el-row>
-        <div class="avue-crud__pagination" style="width: 100%">
-          <!-- 分页模块 -->
-          <el-pagination
-            align="right"
-            background
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
-          </el-pagination>
+            <el-row>
+                <div class="avue-crud__pagination" style="width: 100%">
+                    <!-- 分页模块 -->
+                    <el-pagination
+                            align="right"
+                            background
+                            @size-change="sizeChange"
+                            @current-change="currentChange"
+                            :current-page="page.currentPage"
+                            :page-sizes="[30, 50, 80, 120]"
+                            :page-size="page.pageSize"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="page.total"
+                    >
+                    </el-pagination>
+                </div>
+            </el-row>
         </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>
+    </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="dialogFormVisible = false"> 确定 </el-button>-->
         <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
       </span>
-    </template>
-  </el-dialog>
+        </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>
+    <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';
-import dayjs from 'dayjs';
-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: 'serviceNumber',
-          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: 'mallName',
-          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: '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: 2,
-          values: '',
-          width: '180',
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'reservationDate',
-          label: '预约时间',
-          type: 5,
-          values: '',
-          width: '220',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'periodOfTime',
-        //   label: '时段1',
-        //   type: 3,
-        //   values: '',
-        //   width: '180',
-        //   checkarr: [
-        //     {
-        //       label: '上午',
-        //       value: '1'
-        //     },
-        //     {
-        //       label: '下午',
-        //       value: '2'
-        //     },
-        //     {
-        //       label: '全天',
-        //       value: '3'
-        //     },
-        //   ],
-        //   fixed: false,
-        //   sortable: true,
-        //   head:true,
-        // },
-        {
-          prop: 'periodOfTimeName',
-          label: '时段',
-          type: 3,
-          values: '',
-          width: '180',
-          checkarr: [
-            {
-              label: '上午',
-              value: '1',
-            },
-            {
-              label: '下午',
-              value: '2',
-            },
-            {
-              label: '全天',
-              value: '3',
-            },
-          ],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'deliveryWay',
-          label: '配送方式',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: true,
-        },
-        // {
-        //   prop: 'deliveryType',
-        //   label: '配送类型',
-        //   type: 3,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [
-        //     {
-        //       label: '商配',
-        //       value: '1',
-        //     },
-        //     {
-        //       label: '市配',
-        //       value: '2'
-        //     },
-        //   ],
-        //   fixed: false,
-        //   sortable: true
-        // },
-        // {
-        //   prop: 'serveType',
-        //   label: '服务类型1',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        //   hide:true,
-        // },
-        {
-          prop: 'serveTypeName',
-          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: 'collectionFee',
-          label: '待收货款',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'otherFee',
-          label: '其他费用',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'replaceFee',
-          label: '代收运费',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'fee',
-        //   label: '总费用',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true
-        // },
-        // {
-        //   prop: 'reservationStatus',
-        //   label: '预约信息状态1',
-        //   type: 4,
-        //   values: '',
-        //   width: '180',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        //   hide: true,
-        //
-        // },
-        {
-          prop: 'reservationStatusName',
-          label: '预约信息状态',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [
-            //   {
-            //   label: '待确认',
-            //   value: '1'
-            // },
-            //   {
-            //     label: '已确认',
-            //     value: '2'
-            //   },
-          ],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'orderSource',
-        //   label: '订单来源',
-        //   type: 4,
-        //   values: '',
-        //   width: '180',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true
-        // },
-        // {
-        //   prop: 'stockupStatus',
-        //   label: '备货状态',
-        //   type: 3,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [
-        //         {
-        //           label: '待备货',
-        //           value: '1',
-        //         },{
-        //           label: '已备货',
-        //           value: '2',
-        //         },
-        //         {
-        //           label: '部分备货',
-        //           value: '3'
-        //         },
-        //   ],
-        //   fixed: false,
-        //   sortable: true
-        // },
-        {
-          prop: 'stockupStatusName',
-          label: '备货状态',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [
-            {
-              label: '待备货',
-              value: '1',
-            },
-            {
-              label: '已备货',
-              value: '2',
-            },
-            {
-              label: '部分备货',
-              value: '3',
-            },
-          ],
-          fixed: false,
-          sortable: true,
-        },
+  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';
+  import dayjs from 'dayjs';
+
+  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: 'serviceNumber',
+            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: 'mallName',
+            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: '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: 2,
+            values: '',
+            width: '180',
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'reservationDate',
+            label: '预约时间',
+            type: 4,
+            values: '',
+            width: '220',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'periodOfTime',
+          //   label: '时段1',
+          //   type: 3,
+          //   values: '',
+          //   width: '180',
+          //   checkarr: [
+          //     {
+          //       label: '上午',
+          //       value: '1'
+          //     },
+          //     {
+          //       label: '下午',
+          //       value: '2'
+          //     },
+          //     {
+          //       label: '全天',
+          //       value: '3'
+          //     },
+          //   ],
+          //   fixed: false,
+          //   sortable: true,
+          //   head:true,
+          // },
+          {
+            prop: 'periodOfTimeName',
+            label: '时段',
+            type: 3,
+            values: '',
+            width: '180',
+            checkarr: [
+              {
+                label: '上午',
+                value: '1'
+              },
+              {
+                label: '下午',
+                value: '2'
+              },
+              {
+                label: '全天',
+                value: '3'
+              }
+            ],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deliveryWay',
+            label: '配送方式',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: true
+          },
+          // {
+          //   prop: 'deliveryType',
+          //   label: '配送类型',
+          //   type: 3,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [
+          //     {
+          //       label: '商配',
+          //       value: '1',
+          //     },
+          //     {
+          //       label: '市配',
+          //       value: '2'
+          //     },
+          //   ],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          // {
+          //   prop: 'serveType',
+          //   label: '服务类型1',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   hide:true,
+          // },
+          {
+            prop: 'serveTypeName',
+            label: '服务类型',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [
+              {
+                label: '上楼',
+                value: '1'
+              },
+              {
+                label: '超区',
+                value: '2'
+              },
+              {
+                label: '拆样',
+                value: '3'
+              },
+              {
+                label: '返货',
+                value: '4'
+              },
+              {
+                label: '平移',
+                value: '5'
+              },
+              {
+                label: '分拣',
+                value: '6'
+              },
+              {
+                label: '专车',
+                value: '7'
+              }
+            ],
+            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: 'collectionFee',
+            label: '待收货款',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'otherFee',
+            label: '其他费用',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'replaceFee',
+            label: '代收运费',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'fee',
+          //   label: '总费用',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          // {
+          //   prop: 'reservationStatus',
+          //   label: '预约信息状态1',
+          //   type: 4,
+          //   values: '',
+          //   width: '180',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          //   hide: true,
+          //
+          // },
+          {
+            prop: 'reservationStatusName',
+            label: '预约信息状态',
+            type: 1,
+            values: '',
+            width: '180',
+            checkarr: [
+              //   {
+              //   label: '待确认',
+              //   value: '1'
+              // },
+              //   {
+              //     label: '已确认',
+              //     value: '2'
+              //   },
+            ],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'orderSource',
+          //   label: '订单来源',
+          //   type: 4,
+          //   values: '',
+          //   width: '180',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          // {
+          //   prop: 'stockupStatus',
+          //   label: '备货状态',
+          //   type: 3,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [
+          //         {
+          //           label: '待备货',
+          //           value: '1',
+          //         },{
+          //           label: '已备货',
+          //           value: '2',
+          //         },
+          //         {
+          //           label: '部分备货',
+          //           value: '3'
+          //         },
+          //   ],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          {
+            prop: 'stockupStatusName',
+            label: '备货状态',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [
+              {
+                label: '待备货',
+                value: '10'
+              },
+              {
+                label: '部分备货',
+                value: '20'
+              },
+              {
+                label: '已备货',
+                value: '30'
+              }
+            ],
+            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: '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: 'notes',
-        //   label: '备注',
-        //   type: 1,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: false,
-        // },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: 'right',
-          hide: 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: 30,
+          total: 40
         },
-        // 更多列的配置...
-      ],
-      drawerShow: false,
-      dialogFormCustomer: false,
-      height: 0,
-      // 弹框标题
-      title: '',
-      // 是否展示弹框
-      box: false,
-      // 是否显示查询
-      search: true,
-      // 加载中
-      loading: true,
-      // 是否为查看模式
-      view: false,
-      // 查询信息
-      query: {},
-      // 分页信息
-      page: {
-        currentPage: 1,
-        pageSize: 30,
-        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: {},
+        activeName: 'nocheck'
+      };
+    },
+    watch: {
+      // '$route.query.reservationId': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal);
+        // this.fetchData();
+        this.onLoad(this.page);
       },
-      // 表单数据
-      form: {},
-      info: {},
-      cancel: {},
-      // 选择行
-      selectionList: [],
-      // 表单配置
-      option: option,
-      // 表单列表
-      data: [],
-      dialogCancelReservation: false,
-      //配送方式字典列表
-      deliveryTypeData: [],
-      //配送类型字典列表
-      resvervationStatusData: [],
-      stockupStatusData: [],
-      orderSourceData: [],
-      periodOfTimeData: [],
-      deliveryWayData: [],
-      //控制编辑弹窗是否可编辑
-      isUpdate: false,
-      addvalueServeTypeData: [],
-      forkliftData: [],
-      loaderData: [],
-      goodsAreaIdData: [],
-      deptId: '',
-      cancelReservationRow: {},
-      activeName: 'nocheck',
-    };
-  },
-  watch: {
-    // '$route.query.reservationId': {
-    handler(newVal, oldVal) {
-      console.log(newVal, oldVal);
-      // this.fetchData();
-      this.onLoad(this.page);
+      deep: false,
+      immediate: true
+      // }
     },
-    deep: false,
-    immediate: true,
-    // }
-  },
-  mounted() {
-    this.init();
-    this.onLoad(this.page);
-    this.getDictionary();
+    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 => {
+      /**
+       * 初始化获取本地缓存的编辑隐藏的列表
+       *  固定搭配，不能更改
+       */
+      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 => {
-          if (ite == item.label) {
-            item.head = true;
+          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);
           }
         });
-      });
-    } 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);
+        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
       }
-    },
-    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/reservationAddFrom',
-        query: {
-          reservationId: row.id,
-          name: '编辑预约单',
-        },
-      });
-      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);
-    },
-    handleClick() {
-      if(this.activeName=='yescheck'){
-        this.activeName='nocheck'
-      }else if(this.activeName=='nocheck'){
-        this.activeName='yescheck'
-      }
-      if(this.activeName=='yescheck'){
-        this.bbb()
-      }else if(this.activeName=='nocheck'){
-        this.aaa()
-      }
-    },
-    cancelReservationConfirm() {
-      if (!this.cancel.message) {
-        this.$message.warning('请输入取消原因!!');
-        return;
-      }
-      let data = {};
-      if (this.cancelReservationRow) {
-        data = this.cancelReservationRow;
-        data.cancelReason = this.cancel.message;
+      if (sortlistnewarr) {
+        this.columnList.map(item => {
+          item.sortable = false;
+        });
+        sortlistnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.sortable = true;
+            }
+          });
+        });
       } 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;
-      });
-      //预约状态
-      getDictionaryBiz('resvervation_status').then(res => {
-        this.resvervationStatusData = res.data.data;
-      });
-      //备货状态
-      getDictionaryBiz('stockup_status').then(res => {
-        this.stockupStatusData = res.data.data;
-      });
-      //时段
-      getDictionaryBiz('period_of_time').then(res => {
-        this.periodOfTimeData = res.data.data;
-      });
-      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;
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.sortable) {
+            arr.push(item.label);
           }
         });
-      });
-      // 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();
+        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
+      }
     },
-    //查询班组
-    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);
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
         });
-        this.loaderData = fo;
-      });
+        return ids.join(',');
+      }
     },
-    //备货区
-    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);
+    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/reservationAddFrom',
+          query: {
+            reservationId: row.id,
+            name: '编辑预约单'
+          }
         });
-        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: '操作成功!',
+        console.log(row);
+      },
+      viewReservation(scope) {
+        const { row } = scope;
+        this.$router.push({
+          path: '/distribution/reservation/reservationDetails',
+          query: {
+            id: row.id
+          }
         });
-      });
-    },
-    confirmReservation(scope) {
-      const { row } = scope;
-      let param = {};
-      param.ids = row.id;
-      addReservations(param).then(res => {
-        this.selectionClear();
+        console.log(row);
+      },
+      btnsc(index, row) {
+        console.log(index, row);
+      },
+      selectsc(index, row) {
+        console.log(index, row);
+        if (row.prop === 'periodOfTimeName') {
+          this.query['periodOfTime'] = index;
+        } else if (row.prop === 'stockupStatusName') {
+          this.query['stockupStatus'] = index;
+        }else if (row.prop === 'serveTypeName') {
+          this.query['serveType'] = index;
+          console.log(this.query, '----------->');
+        }
+
+        else {
+          this.query[row.prop] = index;
+        }
         this.onLoad(this.page);
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-        });
-      });
-    },
-    handleSubmit() {
-      this.form.serveType = this.form.serveType.join(',');
-      update(this.form).then(() => {
-        this.box = false;
+      },
+      timesc(index, row) {
+        console.log(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);
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
-        });
-      });
-    },
-    handleAdd() {
-      this.$router.push({
-        path: '/distribution/reservation/reservationAddFrom',
-      });
-    },
-    handleEdit(row) {
-      console.log(row);
-      this.$router.push({
-        path: '/distribution/reservation/reservationAddFrom',
-        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);
+      },
+      inputsc(index, row) {
+        console.log(index, row);
+        this.query[row.prop] = index;
+        this.onLoad(this.page);
+      },
+      init() {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      handleClick() {
+        if (this.activeName == 'yescheck') {
+          this.activeName = 'nocheck';
+        } else if (this.activeName == 'nocheck') {
+          this.activeName = 'yescheck';
         }
-      });
-      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 = [];
-      let b = [];
-      console.log('>>>>>>>>>>>>>', data);
-      data.forEach(d => {
-        if (d.stockupStatus === '20' || d.stockupStatusName === '待备货') {
-          a.push(d.reservationCode);
+        if (this.activeName == 'yescheck') {
+          this.bbb();
+        } else if (this.activeName == 'nocheck') {
+          this.aaa();
         }
-        if (d.stockupStatus === '30' || d.stockupStatusName === '已备货') {
-          b.push(d.reservationCode);
+      },
+      cancelReservationConfirm() {
+        if (!this.cancel.message) {
+          this.$message.warning('请输入取消原因!!');
+          return;
         }
-      });
-      if (a.length >= 1) {
-        this.$message.warning(a.join(',') + '预约单存在备货任务,请勿重复添加');
-        return;
-      }
-      if (b.length >= 1) {
-        this.$message.warning(a.join(',') + '预约单备货任务已完成,请勿重复添加');
-        return;
-      }
-      this.dialogFormCustomer = true;
-      this.info.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-
-      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;
+        let data = {};
+        if (this.cancelReservationRow) {
+          data = this.cancelReservationRow;
+          data.cancelReason = this.cancel.message;
+        } else {
+          this.$message.error('请稍后再试!!');
+          return;
         }
-      });
-      confirms(this.info).then(res => {
-        this.$message({
-          type: 'success',
-          message: '操作成功！',
+        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;
+        });
+        //预约状态
+        getDictionaryBiz('resvervation_status').then(res => {
+          this.resvervationStatusData = res.data.data;
+        });
+        //备货状态
+        getDictionaryBiz('stockup_status').then(res => {
+          this.stockupStatusData = res.data.data;
         });
+        //时段
+        getDictionaryBiz('period_of_time').then(res => {
+          this.periodOfTimeData = res.data.data;
+        });
+        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(() => {
+      },
+      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: '操作成功!',
+            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) {
+      },
+      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/reservationAddFrom'
+        });
+      },
+      handleEdit(row) {
+        console.log(row);
+        this.$router.push({
+          path: '/distribution/reservation/reservationAddFrom',
+          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.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 = [];
+        let b = [];
+        console.log('>>>>>>>>>>>>>', data);
+        data.forEach(d => {
+          if (d.stockupStatus === '20' || d.stockupStatusName === '待备货') {
+            a.push(d.reservationCode);
+          }
+          if (d.stockupStatus === '30' || d.stockupStatusName === '已备货') {
+            b.push(d.reservationCode);
+          }
+        });
+        if (a.length >= 1) {
+          this.$message.warning(a.join(',') + '预约单存在备货任务,请勿重复添加');
+          return;
+        }
+        if (b.length >= 1) {
+          this.$message.warning(a.join(',') + '预约单备货任务已完成,请勿重复添加');
+          return;
+        }
+        this.dialogFormCustomer = true;
+        this.info.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+
+        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.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.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>
 <style lang="scss">
-// .el-tab-pane{
-//   margin-top: -20px;
-// }
+    // .el-tab-pane{
+    //   margin-top: -20px;
+    // }
 </style>
\ No newline at end of file
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 9355f872..c3cda935 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -1,2437 +1,2572 @@
 <template>
-  <basic-container>
-    <div class="avue-crud">
-      <el-form
-        ref="form"
-        :model="form"
-        prop="consignee"
-        label-width="80px"
-        :rules="reservationRules"
-      >
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="收货人:" prop="consignee" label-width="100px">
-              <el-input v-model="form.consignee" clearable placeholder="请输入收货人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="预约时间:" prop="reservationDate" label-width="100px">
-              <el-date-picker
-                v-model="form.reservationDate"
-                type="date"
-                clearable
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="收货地址:" prop="deliveryAddress" label-width="100px">
-              <el-input v-model="form.deliveryAddress" clearable placeholder="请输入收件地址" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="时&emsp;&emsp;段:" prop="periodOfTime" label-width="100px">
-              <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
-                <el-radio :label="item.dictKey" :value="item.dictKey"
-                  >{{ item.dictValue }}&emsp;
-                </el-radio>
-              </el-radio-group>
-              <!--                            :label="item.dictValue"-->
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px">
-              <el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话" />
-            </el-form-item>
-          </el-col>
+    <basic-container>
+        <div class="avue-crud">
+            <el-form
+                    ref="form"
+                    :model="form"
+                    prop="consignee"
+                    label-width="80px"
+                    :rules="reservationRules"
+            >
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="收货人:" prop="consignee" label-width="100px">
+                            <el-input v-model="form.consignee" clearable placeholder="请输入收货人"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="预约时间:" prop="reservationDate" label-width="100px">
+                            <el-date-picker
+                                    v-model="form.reservationDate"
+                                    type="date"
+                                    clearable
+                                    placeholder="选择日期时间"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="收货地址:" prop="deliveryAddress" label-width="100px">
+                            <el-input v-model="form.deliveryAddress" clearable placeholder="请输入收件地址"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="时&emsp;&emsp;段:" prop="periodOfTime" label-width="100px">
+                            <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
+                                <el-radio :label="item.dictKey" :value="item.dictKey"
+                                >{{ item.dictValue }}&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                            <!--                            :label="item.dictValue"-->
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-          <el-col :span="10">
-            <el-form-item label="配送类型:" prop="serveType" label-width="100px">
-              <!--                            v-for="item in this.deliveryTypeData"-->
-              <el-radio-group v-model="form.deliveryType">
-                <el-radio :label="'2'" :value="'2'">市配&emsp; </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px">
+                            <el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话"/>
+                        </el-form-item>
+                    </el-col>
 
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
-              <el-input v-model="form.replaceFee" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="配送方式:" prop="serveType" label-width="100px">
-              <!--                            v-for="item in this.deliveryWayData"-->
-              <el-radio-group v-model="form.deliveryWay">
-                <el-radio :label="'10'" :value="'10'">送货&emsp; </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+                    <el-col :span="10">
+                        <el-form-item label="配送类型:" prop="serveType" label-width="100px">
+                            <!--                            v-for="item in this.deliveryTypeData"-->
+                            <el-radio-group v-model="form.deliveryType">
+                                <el-radio :label="'2'" :value="'2'">市配&emsp;</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-        <el-row>
-          <!--                    <el-col :span="10">-->
-          <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
-          <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
-          <!--                        </el-form-item>-->
-          <!--                    </el-col>-->
-          <el-col :span="10">
-            <el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
-              <el-input type="number" v-model="form.collectionFee" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="加&emsp;&emsp;急:" prop="serveType" label-width="100px">
-              <!--                            v-for="item in this.deliveryWayData"-->
-              <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
-                <el-radio :label="item.dictKey" :value="item.dictKey"
-                  >{{ item.dictValue }}&emsp;
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
+                            <el-input v-model="form.replaceFee" :disabled="true"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="配送方式:" prop="serveType" label-width="100px">
+                            <!--                            v-for="item in this.deliveryWayData"-->
+                            <el-radio-group v-model="form.deliveryWay">
+                                <el-radio :label="'10'" :value="'10'">送货&emsp;</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-          <el-col :span="10">
-            <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
-              <el-input v-model="form.otherFee" placeholder="请输入其他费用" />
-            </el-form-item>
-          </el-col>
-          <!--                    <el-col :span="10">-->
-          <!--                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">-->
-          <!--                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
-          <!--                                <el-checkbox :label="item.dictKey"-->
-          <!--                                             :value="item.dictKey">{{item.dictValue}}&emsp;-->
-          <!--                                </el-checkbox>-->
-          <!--                            </el-checkbox-group>-->
-          <!--                        </el-form-item>-->
-          <!--                    </el-col>-->
-          <el-col :span="10">
-            <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
-              <el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="form.remarks">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+                <el-row>
+                    <!--                    <el-col :span="10">-->
+                    <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
+                    <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
+                    <el-col :span="10">
+                        <el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
+                            <el-input type="number" v-model="form.collectionFee"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="加&emsp;&emsp;急:" prop="serveType" label-width="100px">
+                            <!--                            v-for="item in this.deliveryWayData"-->
+                            <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
+                                <el-radio :label="item.dictKey" :value="item.dictKey"
+                                >{{ item.dictValue }}&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
 
-      <el-tabs type="border-card">
-        <el-tab-pane label="订单">
-          <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
-          <tablecmt
-            :columnList="columnList"
-            :tableData="orderData"
-            :loading="loading"
-            @inputTxt="inputsc"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionChange"
-          >
-            <template #default="slotProps">
-              <el-text
-                type="primary"
-                link
-                icon="el-icon-view"
-                @click="viewStockArticlePackage(slotProps.scope.row)"
-                >查看包件</el-text
-              >
-              <el-text
-                type="primary"
-                link
-                icon="el-icon-edit"
-                @click="removeStockArticle(slotProps.scope.row)"
-                >移除</el-text
-              >
-            </template>
-          </tablecmt>
-          <!-- <el-table ref="table"
-                              v-loading="loading"
-                              :data="orderData"
-                              :height="height"
-                              style="width: 100%"
-                              :border="option.border">
-                        <el-table-column v-if="option.index" label="序号" type="index" width="80px"
-                                         align="center"></el-table-column>
-                        <template v-for="(item,index) in option.columnReservations">
-                            <el-table-column v-if="item.hide!==true"
-                                             :prop="item.prop"
-                                             :label="item.label"
-                                             :width="item.width"
-                                             :key="index">
+                    <el-col :span="10">
+                        <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
+                            <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
+                        </el-form-item>
+                    </el-col>
+                                        <el-col :span="10">
+                                            <el-form-item label="服务类型:" prop="serveType" label-width="120px">
+                                                <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
+                                                    <el-checkbox :label="item.dictKey"
+                                                                 :value="item.dictKey">{{item.dictValue}}&emsp;
+                                                    </el-checkbox>
+                                                </el-checkbox-group>
+                                            </el-form-item>
+                                        </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
+                            <el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="form.remarks">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
 
-                            </el-table-column>
+            <el-tabs type="border-card">
+                <el-tab-pane label="订单">
+                    <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
+                    <tablecmt
+                            :columnList="columnList"
+                            :tableData="orderData"
+                            :loading="loading"
+                            @inputTxt="inputsc"
+                            @timeCheck="timesc"
+                            @btnCheck="btnsc"
+                            @selectCheck="selectsc"
+                            @selection="selectionChange"
+                    >
+                        <template #default="slotProps">
+                            <el-text
+                                    type="primary"
+                                    link
+                                    icon="el-icon-view"
+                                    @click="viewStockArticlePackage(slotProps.scope.row)"
+                            >查看包件
+                            </el-text
+                            >
+                            <el-text
+                                    type="primary"
+                                    link
+                                    icon="el-icon-edit"
+                                    @click="removeStockArticle(slotProps.scope.row)"
+                            >移除
+                            </el-text
+                            >
                         </template>
-                        <el-table-column prop="menu" label="操作" :width="220" align="center">
-                            <template #="{row}">
-                                <el-button type="primary" link icon="el-icon-view"
-                                           @click="viewStockArticlePackage(row)">查看包件
-                                </el-button>
-                                <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
-                                </el-button>
+                    </tablecmt>
+                    <!-- <el-table ref="table"
+                                        v-loading="loading"
+                                        :data="orderData"
+                                        :height="height"
+                                        style="width: 100%"
+                                        :border="option.border">
+                                  <el-table-column v-if="option.index" label="序号" type="index" width="80px"
+                                                   align="center"></el-table-column>
+                                  <template v-for="(item,index) in option.columnReservations">
+                                      <el-table-column v-if="item.hide!==true"
+                                                       :prop="item.prop"
+                                                       :label="item.label"
+                                                       :width="item.width"
+                                                       :key="index">
 
-                            </template>
-                        </el-table-column>
-                    </el-table> -->
-        </el-tab-pane>
+                                      </el-table-column>
+                                  </template>
+                                  <el-table-column prop="menu" label="操作" :width="220" align="center">
+                                      <template #="{row}">
+                                          <el-button type="primary" link icon="el-icon-view"
+                                                     @click="viewStockArticlePackage(row)">查看包件
+                                          </el-button>
+                                          <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
+                                          </el-button>
 
-        <el-tab-pane label="库存品">
-          <el-button link @click="handleAddInventory">新 增</el-button>
-          <tablecmt
-            :columnList="stockcolumnList"
-            :tableData="inventoryData"
-            :loading="loading"
-            @inputTxt="inputsc"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionChange"
-          >
-            <template #default="slotProps">
-<!--              <el-text-->
-<!--                      v-if="inventoryShow"-->
-<!--                      type="primary"-->
-<!--                      link-->
-<!--                      icon="el-icon-edit"-->
-<!--                      @click="showStockListEdit(slotProps.scope.row)"-->
-<!--              >查看详情</el-text>-->
+                                      </template>
+                                  </el-table-column>
+                              </el-table> -->
+                </el-tab-pane>
 
-              <el-text
-                type="primary"
-                link
-                icon="el-icon-edit"
-                @click="removeStockList(slotProps.scope.row)"
-                >移除</el-text
-              >
+                <el-tab-pane label="库存品">
+                    <el-button link @click="handleAddInventory">新 增</el-button>
+                    <tablecmt
+                            :columnList="stockcolumnList"
+                            :tableData="inventoryData"
+                            :loading="loading"
+                            @inputTxt="inputsc"
+                            @timeCheck="timesc"
+                            @btnCheck="btnsc"
+                            @selectCheck="selectsc"
+                            @selection="selectionChange"
+                    >
+                        <template #default="slotProps">
+                            <!--              <el-text-->
+                            <!--                      v-if="inventoryShow"-->
+                            <!--                      type="primary"-->
+                            <!--                      link-->
+                            <!--                      icon="el-icon-edit"-->
+                            <!--                      @click="showStockListEdit(slotProps.scope.row)"-->
+                            <!--              >查看详情</el-text>-->
 
-            </template>
-          </tablecmt>
-        </el-tab-pane>
-      </el-tabs>
-      <el-form-item style="margin-left: 45%; margin-top: 5px">
-        <el-button type="primary" icon="el-icon-circle-close" @click="onSubmit"
-          >提交(配送订单预约)</el-button
-        >
-        <el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button>
-      </el-form-item>
+                            <el-text
+                                    type="primary"
+                                    link
+                                    icon="el-icon-edit"
+                                    @click="removeStockList(slotProps.scope.row)"
+                            >移除
+                            </el-text
+                            >
 
-      <el-dialog v-model="orderShow" title="在库订单信息" width="100%" :model="addvalue">
-        <!--                :before-close="handleClose"-->
-        <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.mallName" 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.brand" 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 label="顾客电话:">
-            <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
-          </el-form-item>
+                        </template>
+                    </tablecmt>
+                </el-tab-pane>
+            </el-tabs>
+            <el-form-item style="margin-left: 45%; margin-top: 5px">
+                <el-button type="primary" icon="el-icon-circle-close" @click="onSubmit"
+                >提交(配送订单预约)
+                </el-button
+                >
+                <el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button>
+            </el-form-item>
 
-          <!-- 查询按钮 -->
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="searchStockArticle"
-              >搜 索</el-button
-            >
-            <el-button icon="el-icon-delete" @click="stockArticleSearchReset()">清 空</el-button>
-          </el-form-item>
-        </el-form>
-        <tablecmt
-          :columnList="stockArtcolumnList"
-          :tableData="stockArticleInfo"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-            <el-text
-              type="primary"
-              link
-              icon="el-icon-edit"
-              @click="removeStockList(slotProps.scope.row)"
-              >移除</el-text
-            >
-          </template>
-        </tablecmt>
+            <el-dialog v-model="orderShow" title="在库订单信息" width="100%" :model="addvalue">
+                <!--                :before-close="handleClose"-->
+                <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.mallName" 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.brand" 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 label="顾客电话:">
+                        <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
+                    </el-form-item>
 
-        <el-row>
-          <div class="avue-crud__pagination" style="width: 100%">
-            <!-- 分页模块 -->
-            <el-pagination
-              align="right"
-              background
-              @size-change="sizeOrderChange"
-              @current-change="currentOrderChange"
-              :current-page="page.currentPage"
-              :page-sizes="[30, 50, 80, 120]"
-              :page-size="page.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="page.total"
-            >
-            </el-pagination>
-          </div>
-        </el-row>
-        <el-form-item style="margin-left: 45%; margin-top: 5px">
-          <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
-            >提交(订单)</el-button
-          >
-          <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
-        </el-form-item>
-      </el-dialog>
+                    <!-- 查询按钮 -->
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" @click="searchStockArticle"
+                        >搜 索
+                        </el-button
+                        >
+                        <el-button icon="el-icon-delete" @click="stockArticleSearchReset()">清 空</el-button>
+                    </el-form-item>
+                </el-form>
+                <tablecmt
+                        :columnList="stockArtcolumnList"
+                        :tableData="stockArticleInfo"
+                        :loading="loading"
+                        @inputTxt="inputscStockArtic"
+                        @timeCheck="timescStockArtic"
+                        @btnCheck="btnscStockArtic"
+                        @selectCheck="selectscStockArtic"
+                        @selection="selectionChange"
+                >
+                    <template #default="slotProps">
+                        <el-text
+                                type="primary"
+                                link
+                                icon="el-icon-edit"
+                                @click="removeStockList(slotProps.scope.row)"
+                        >移除
+                        </el-text
+                        >
+                    </template>
+                </tablecmt>
 
-      <el-dialog v-model="stockListShow" title="库存品信息" width="100%">
-        <!--                :before-close="handleClose"-->
-        <el-form :inline="true" :model="query">
-          <el-form-item label="商场名称:">
-            <el-input v-model="query.marketName" 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.marketCode" placeholder="请输入服务类型"></el-input>
-          </el-form-item>
-          <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.brand" placeholder="请输入服务类型"></el-input>
-          </el-form-item>
-          <!-- 查询按钮 -->
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="searchStockList"
-              >搜 索</el-button
-            >
-            <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>
-          </el-form-item>
-        </el-form>
-        <tablecmt
-          :columnList="inventoryInfocolumnList"
-          :tableData="inventoryInfo"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionInventoryChange"
-        >
-          <template #default="slotProps">
-            <el-text
-              type="primary"
-              link
-              icon="el-icon-edit"
-              @click="removeStockList(slotProps.scope.row)"
-              >移除</el-text
-            >
-          </template>
-        </tablecmt>
-        <el-form-item style="margin-left: 45%; margin-top: 5px">
-          <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
-            >提交(库存品)</el-button
-          >
-          <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
-        </el-form-item>
-      </el-dialog>
+                <el-row>
+                    <div class="avue-crud__pagination" style="width: 100%">
+                        <!-- 分页模块 -->
+                        <el-pagination
+                                align="right"
+                                background
+                                @size-change="sizeOrderChange"
+                                @current-change="currentOrderChange"
+                                :current-page="page.currentPage"
+                                :page-sizes="[30, 50, 80, 120]"
+                                :page-size="page.pageSize"
+                                layout="total, sizes, prev, pager, next, jumper"
+                                :total="page.total"
+                        >
+                        </el-pagination>
+                    </div>
+                </el-row>
+                <el-form-item style="margin-left: 45%; margin-top: 5px">
+                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
+                    >提交(订单)
+                    </el-button
+                    >
+                    <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
+                </el-form-item>
+            </el-dialog>
 
-      <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
-        <!-- 列表模块 -->
-        <tablecmt
-          :columnList="columnParcels"
-          :tableData="packageData"
-          :checkselect="packageData"
-          :isselectfun="checkPackage"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionPackageChange"
-        >
-          <template #default="slotProps">
-            <!-- <el-text
-              type="primary"
-              link
-              icon="el-icon-edit"
-              @click="removeStockList(slotProps.scope.row)"
-              >移除</el-text
-            > -->
-          </template>
-        </tablecmt>
-        <!-- <el-table
-          ref="packageList"
-          v-loading="loading"
-          @selection-change="selectionPackageChange"
-          :data="packageData"
-          :height="height"
-          style="width: 100%"
-          :border="option.border"
-        >
-          <el-table-column
-            type="selection"
-            v-if="option.selection"
-            :selectable="checkPackage"
-            align="center"
-            width="55"
-          ></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="60" align="center">
-          </el-table-column>
-          <template v-for="(item, index) in option.columnParcels">
-            <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 }">
-             </template>
-          </el-table-column>
-        </el-table> -->
-        <el-form-item style="margin-left: 45%; margin-top: 5px">
-          <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
-            >提交(包件)</el-button
-          >
-          <el-button icon="el-icon-circle-close" @click="isaddvalue = false">返 回</el-button>
-        </el-form-item>
-      </el-dialog>
+            <el-dialog v-model="stockListShow" title="库存品信息" width="100%">
+                <!--                :before-close="handleClose"-->
+                <el-form :inline="true" :model="query">
+                    <el-form-item label="商场名称:">
+                        <el-input v-model="query.marketName" 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.marketCode" placeholder="请输入商场编码"></el-input>
+                    </el-form-item>
+                    <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.brand" placeholder="请输入品牌"></el-input>
+                    </el-form-item>
+                    <!-- 查询按钮 -->
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" @click="searchStockList"
+                        >搜 索
+                        </el-button
+                        >
+                        <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>
+                    </el-form-item>
+                </el-form>
+                <tablecmt
+                        :columnList="inventoryInfocolumnList"
+                        :tableData="inventoryInfo"
+                        :loading="loading"
+                        @inputTxt="inputsc"
+                        @timeCheck="timesc"
+                        @btnCheck="btnsc"
+                        @selectCheck="selectsc"
+                        @selection="selectionInventoryChange"
+                >
+                    <template #default="slotProps">
+                        <el-text
+                                type="primary"
+                                link
+                                icon="el-icon-edit"
+                                @click="removeStockList(slotProps.scope.row)"
+                        >移除
+                        </el-text
+                        >
+                    </template>
+                </tablecmt>
+                <el-form-item style="margin-left: 45%; margin-top: 5px">
+                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
+                    >提交(库存品)
+                    </el-button
+                    >
+                    <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
+                </el-form-item>
+            </el-dialog>
+
+            <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
+                <!-- 列表模块 -->
+                <tablecmt
+                        :columnList="columnParcels"
+                        :tableData="packageData"
+                        :checkselect="packageData"
+                        :isselectfun="checkPackage"
+                        :loading="loading"
+                        @inputTxt="inputsc"
+                        @timeCheck="timesc"
+                        @btnCheck="btnsc"
+                        @selectCheck="selectsc"
+                        @selection="selectionPackageChange"
+                >
+                    <template #default="slotProps">
+                        <!-- <el-text
+                          type="primary"
+                          link
+                          icon="el-icon-edit"
+                          @click="removeStockList(slotProps.scope.row)"
+                          >移除</el-text
+                        > -->
+                    </template>
+                </tablecmt>
+                <!-- <el-table
+                  ref="packageList"
+                  v-loading="loading"
+                  @selection-change="selectionPackageChange"
+                  :data="packageData"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border"
+                >
+                  <el-table-column
+                    type="selection"
+                    v-if="option.selection"
+                    :selectable="checkPackage"
+                    align="center"
+                    width="55"
+                  ></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="60" align="center">
+                  </el-table-column>
+                  <template v-for="(item, index) in option.columnParcels">
+                    <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 }">
+                     </template>
+                  </el-table-column>
+                </el-table> -->
+                <el-form-item style="margin-left: 45%; margin-top: 5px">
+                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
+                    >提交(包件)
+                    </el-button
+                    >
+                    <el-button icon="el-icon-circle-close" @click="isaddvalue = false">返 回</el-button>
+                </el-form-item>
+            </el-dialog>
 
-      <el-dialog
-        v-model="dialogVisible"
-        title="增值服务"
-        width="30%"
-        :model="addvalue"
-        :before-close="handleClose"
-      >
-        <el-form-item label="增值服务" prop="freightMark">
-          <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
-            <el-checkbox
-              style="width: 100%; margin-bottom: 3%"
-              v-for="(item, index) in addvalueServeTypeData"
-              :key="item.dictKey"
-              :label="item.dictKey"
-              >{{ item.dictValue }}
-              <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
-                >&nbsp;件数:
+            <el-dialog
+                    v-model="dialogVisible"
+                    title="增值服务"
+                    width="30%"
+                    :model="addvalue"
+                    :before-close="handleClose"
+            >
+                <el-form-item label="增值服务" prop="freightMark">
+                    <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
+                        <el-checkbox
+                                style="width: 100%; margin-bottom: 3%"
+                                v-for="(item, index) in addvalueServeTypeData"
+                                :key="item.dictKey"
+                                :label="item.dictKey"
+                        >{{ item.dictValue }}
+                            <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
+                            >&nbsp;件数:
                 <el-input
-                  type="number"
-                  v-model="item.f"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 1)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.f"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 1)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
-              <span v-if="index === 1"
-                >公里:
+                            <span v-if="index === 1"
+                            >公里:
                 <el-input
-                  type="primary"
-                  v-model="item.a"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 2)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="primary"
+                        v-model="item.a"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 2)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
-              <span v-if="index === 3"
-                >距离:
+                            <span v-if="index === 3"
+                            >距离:
                 <el-input
-                  type="number"
-                  v-model="item.b"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 3)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.b"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 3)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
-              <span v-if="index === 5"
-                >人数:
+                            <span v-if="index === 5"
+                            >人数:
                 <el-input
-                  type="number"
-                  v-model="item.c"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 4)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.c"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 4)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
-              <span v-if="index === 0"
-                >楼层:
+                            <span v-if="index === 0"
+                            >楼层:
                 <el-input
-                  type="number"
-                  v-model="item.d"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 5)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.d"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 5)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
-              <span v-if="item"
-                >预计费用:
+                            <span v-if="item"
+                            >预计费用:
                 <el-input
-                  type="number"
-                  v-model="item.e"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 6)"
-                  style="width: 20%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.e"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 6)"
+                        style="width: 20%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <template #footer>
+                        </el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <template #footer>
           <span class="dialog-footer">
             <el-button @click="dialogVisible = false">取消</el-button>
             <el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>
           </span>
-        </template>
-      </el-dialog>
-    </div>
-  </basic-container>
+                </template>
+            </el-dialog>
+        </div>
+    </basic-container>
 </template>
 
 <script>
-import {
-  autonomouslySave,
-  update,
-  remove,
-  getReservationInfo,
-} from '@/api/distribution/distributionReservation';
-import {
-  getStockArticleList,
-  selectStockArticleList,
-  selectStockArticleInfoList,
-  selectUpdateAvailableStockArticle,
-} from '@/api/distribution/distributionStockArticle';
-import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
-import { addIncrement } from '@/api/distribution/distributionStockArticle';
-import { getInventoryList,selectInventoryDetail } from '@/api/distribution/distributionStockList';
+  import {
+    autonomouslySave,
+    update,
+    remove,
+    getReservationInfo
+  } from '@/api/distribution/distributionReservation';
+  import {
+    getStockArticleList,
+    selectStockArticleList,
+    selectStockArticleInfoList,
+    selectUpdateAvailableStockArticle
+  } from '@/api/distribution/distributionStockArticle';
+  import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
+  import { addIncrement } from '@/api/distribution/distributionStockArticle';
+  import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList';
 
-import option from '@/option/distribution/distributionStockArticle';
-import { mapGetters } from 'vuex';
-import { getDictionaryBiz } from '@/api/system/dict';
+  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: 'serviceNumber',
-          label: '服务号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'mallName',
-          label: '商场名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeName',
-          label: '门店名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '货物名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'warehouse',
-          label: '仓库',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderStatusName',
-          label: '订单状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeTime',
-          label: '在库时间',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'totalNumber',
-          label: '订单总件数',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'handQuantity',
-          label: '在库件数',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'customerName',
-          label: '顾客名字',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'customerTelephone',
-          label: '顾客电话',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'customerAddress',
-          label: '顾客地址',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: 'right',
-          hide: true,
-        },
-      ],
-      stockcolumnList: [
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'marketCode',
-          label: '商场编码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'marketName',
-          label: '商场名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeCode',
-          label: '门店编码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeName',
-          label: '门店名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoNumber',
-          label: '货物编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'materialId',
-          label: '物料ID',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '物料名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '物料单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'category',
-          label: '品分类',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'warehouseName',
-          label: '仓库名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'quantityStock',
-          label: '库存数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'applyNum',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'quantityOccupied',
-          label: '冻结数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'outboundQuantity',
-          label: '出库数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'brand',
-          label: '品牌',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoNumber',
-          label: '规格',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'reservationNum',
-          label: '预约数量',
-          type: 10,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: 'right',
-          hide: true,
-        },
-      ],
-      stockArtcolumnList: [
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: '50',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'mallName',
-          label: '商场名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeName',
-          label: '门店名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '货物名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'reservationStatusName',
-          label: '预约状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'freezeStatusName',
-          label: '冻结状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'warehouse',
-          label: '仓库',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'warehouseEntryTime',
-          label: '入库时间',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeTime',
-          label: '在库时间',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'totalNumber',
-          label: '订单总件数',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'handQuantity',
-          label: '在库件数',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'completeSetName',
-          label: '是否齐套',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'brand',
-          label: '品牌',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'customerName',
-          label: '顾客名字',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'customerTelephone',
-          label: '顾客电话',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'customerAddress',
-          label: '顾客地址',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-      ],
-      inventoryInfocolumnList: [
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: '50',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'marketCode',
-          label: '商场编码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'marketName',
-          label: '商场名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeCode',
-          label: '门店编码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'storeName',
-          label: '门店名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoNumber',
-          label: '货物编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'materialId',
-          label: '物料ID',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'descriptionGoods',
-          label: '物料名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '物料单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'category',
-          label: '品分类',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'warehouseName',
-          label: '仓库名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'quantityStock',
-          label: '库存数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'applyNum',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'quantityOccupied',
-          label: '冻结数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'outboundQuantity',
-          label: '出库数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'brand',
-          label: '品牌',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoNumber',
-          label: '规格',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '单位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'reservationNum',
-          label: '预约数量',
-          type: 10,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-      ],
-      columnParcels: [
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: '50',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'warehouse',
-          label: '仓库',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'waybillNumber',
-          label: '运单号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageStatusName',
-          label: '包件状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageFreezeStatusName',
-          label: '冻结状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageGroundingStatusName',
-          label: '上架状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageStockupStatusName',
-          label: '备货状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageReservationStatusName',
-          label: '预约状态',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderPackageCode',
-          label: '包条码',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'goodsAllocation',
-          label: '货位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'pallet',
-          label: '所在托盘',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'firsts',
-          label: '一级品',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'second',
-          label: '二级品',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'thirdProduct',
-          label: '三级品',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'materialName',
-          label: '物料名称',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'quantity',
-          label: '数量',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'trainNumber',
-          label: '客户车次号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        // {
-        //   prop: '',
-        //   label: '操作',
-        //   type: 6,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: 'right',
-        //   hide: true,
-        // },
-      ],
-      height: 0,
-      // 弹框标题
-      title: '',
-      // 是否展示弹框
-      box: false,
-      // 是否显示查询
-      search: true,
-      // 加载中
-      loading: true,
-      // 是否为查看模式
-      view: false,
-      // 查询信息
-      query: {},
-      // 分页信息
-      page: {
-        currentPage: 1,
-        pageSize: 30,
-        total: 40,
-      },
-      // 表单数据
-      form: {},
-      // 选择行
-      selectionList: [],
-      // 表单配置
-      option: option,
-      // 表单列表
-      data: [],
-      //增值服务弹窗
-      dialogVisible: false,
-      textarea: '',
-      //增值服务字典列表
-      addvalueServeTypeData: [],
-      //配送方式字典列表
-      deliveryWayData: [],
-      whetherData: [],
-      //配送类型字典列表
-      deliveryTypeData: [],
-      //增值服务列表
-      addvalueServeType: [],
-      //增值表单输入框对象
-      addvalue: {},
-      costList: [], //字典
-      //增值服务对象
-      addvalueObj: {},
-      //费用列表
-      feeList: [],
-      //楼层
-      floorList: [],
-      //订单行数据
-      orderInfo: {},
-      //服务类型
-      serveType: [],
-      //增加订单弹窗
-      orderShow: false,
-      //在库订单信息
-      stockArticleInfo: [],
-      //库存品信息
-      inventoryInfo: [],
-      //时段
-      periodOfTimeData: [],
-      //路由订单编号
-      orderIds: '',
-      //预约编号
-      reservationId: '',
-      inventoryData: [],
-      orderData: [],
-      stockListShow: false,
-      isaddvalue: false,
-      packageData: [],
-      packageList: [],
-      inventoryList: [],
-      orderList: [],
-      inventoryTable: [],
-      inventoryShow:false,
-      reservationRules: {
-        consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
-        deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
-        deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }],
-        // enableStatus: [
-        //   { required: true, message: '请选择启用状态!', trigger: 'change' }
-        // ],
-      },
-      obj: {},
-    };
-  },
-  created() {
-    this.$watch(
-      () => this.$route.params,
-      () => {
-        this.fetchData();
-      },
-      // 组件创建完后获取数据，
-      // 此时 data 已经被 observed 了
-      { immediate: true }
-    );
-  },
-  mounted() {
-    this.init();
-    let arr = [];
-    this.option.columnParcels.map(item => {
-      if (!item.hide) {
-        arr.push({
-          prop: item.prop,
-          label: item.label,
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        });
-      }
-    });
-    console.log(JSON.stringify(arr));
-    this.onLoad(this.page);
-    this.getDictionary();
-  },
-  watch: {
-    '$route.query.reservationId': {
-      handler(newVal, oldVal) {
-        console.log(newVal, oldVal);
-        this.fetchData();
-        this.onLoad(this.page);
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
-    },
-  },
-  methods: {
-    fetchData() {
-      this.error = this.post = null;
-      this.loading = true;
-      if (this.$route.query.id) {
-        this.orderIds = this.$route.query.id;
-      }
-      if (this.$route.query.reservationId) {
-        this.reservationId = this.$route.query.reservationId;
-      }
-      this.loading = false;
+  export default {
+    data() {
+      return {
+        columnList: [
+          {
+            prop: 'waybillNumber',
+            label: '运单号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'mallName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeName',
+            label: '门店名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '货物名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'warehouse',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderStatusName',
+            label: '订单状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeTime',
+            label: '在库时间',
+            type: 5,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'totalNumber',
+            label: '订单总件数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'handQuantity',
+            label: '在库件数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'customerName',
+            label: '顾客名字',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'customerTelephone',
+            label: '顾客电话',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'customerAddress',
+            label: '顾客地址',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true
+          }
+        ],
+        stockcolumnList: [
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'marketCode',
+            label: '商场编码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'marketName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeCode',
+            label: '门店编码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeName',
+            label: '门店名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoNumber',
+            label: '货物编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'materialId',
+            label: '物料ID',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoUnit',
+            label: '物料单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'category',
+            label: '品分类',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'warehouseName',
+            label: '仓库名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'quantityStock',
+            label: '库存数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'applyNum',
+            label: '可用数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'quantityOccupied',
+            label: '冻结数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'outboundQuantity',
+            label: '出库数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'brand',
+            label: '品牌',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoNumber',
+            label: '规格',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoUnit',
+            label: '单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'reservationNum',
+            label: '预约数量',
+            type: 10,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true
+          }
+        ],
+        stockArtcolumnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: '50',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'waybillNumber',
+            label: '运单号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'mallName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeName',
+            label: '门店名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '货物名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'reservationStatusName',
+            label: '预约状态',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [
+              {
+                label: '未预约',
+                value: '10'
+              },
+              {
+                label: '部分预约',
+                value: '20'
+              },
+            ],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'freezeStatusName',
+            label: '冻结状态',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [
+              {
+                label: '未冻结',
+                value: '10'
+              },
+              {
+                label: '部分冻结',
+                value: '20'
+              },
+              {
+                label: '已冻结',
+                value: '30'
+              }
+            ],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'warehouse',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'warehouseEntryTime',
+            label: '入库时间',
+            type: 4,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeTime',
+            label: '在库时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'totalNumber',
+            label: '订单总件数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'handQuantity',
+            label: '在库件数',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'completeSetName',
+            label: '是否齐套',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [
+              {
+                label: '否',
+                value: '1'
+              },
+              {
+                label: '是',
+                value: '2'
+              },
+            ],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'brand',
+            label: '品牌',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'customerName',
+            label: '顾客名字',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'customerTelephone',
+            label: '顾客电话',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'customerAddress',
+            label: '顾客地址',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'allocation',
+            label: '库位信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'trays',
+            label: '托盘信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          }
+        ],
+        inventoryInfocolumnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: '50',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'marketCode',
+            label: '商场编码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'marketName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeCode',
+            label: '门店编码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'storeName',
+            label: '门店名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoNumber',
+            label: '货物编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'materialId',
+            label: '物料ID',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoUnit',
+            label: '物料单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'category',
+            label: '品分类',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'warehouseName',
+            label: '仓库名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'quantityStock',
+            label: '库存数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'applyNum',
+            label: '可用数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'quantityOccupied',
+            label: '冻结数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'outboundQuantity',
+            label: '出库数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'brand',
+            label: '品牌',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoNumber',
+            label: '规格',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'cargoUnit',
+            label: '单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'reservationNum',
+            label: '预约数量',
+            type: 10,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          }
+        ],
+        columnParcels: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: '50',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'warehouse',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'waybillNumber',
+            label: '运单号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderPackageStatusName',
+            label: '包件状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderPackageFreezeStatusName',
+            label: '冻结状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderPackageGroundingStatusName',
+            label: '上架状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderPackageStockupStatusName',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderPackageReservationStatusName',
+            label: '预约状态',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'orderPackageCode',
+            label: '包条码',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'goodsAllocation',
+            label: '货位信息',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'pallet',
+            label: '所在托盘',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'firsts',
+            label: '一级品',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'second',
+            label: '二级品',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'thirdProduct',
+            label: '三级品',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'materialName',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'quantity',
+            label: '数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
+          {
+            prop: 'trainNumber',
+            label: '客户车次号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+          }
+          // {
+          //   prop: '',
+          //   label: '操作',
+          //   type: 6,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: 'right',
+          //   hide: true,
+          // },
+        ],
+        height: 0,
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 30,
+          total: 40
+        },
+        // 表单数据
+        form: {},
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: option,
+        // 表单列表
+        data: [],
+        //增值服务弹窗
+        dialogVisible: false,
+        textarea: '',
+        //增值服务字典列表
+        addvalueServeTypeData: [],
+        //配送方式字典列表
+        deliveryWayData: [],
+        whetherData: [],
+        //配送类型字典列表
+        deliveryTypeData: [],
+        //增值服务列表
+        addvalueServeType: [],
+        //增值表单输入框对象
+        addvalue: {},
+        costList: [], //字典
+        //增值服务对象
+        addvalueObj: {},
+        //费用列表
+        feeList: [],
+        //楼层
+        floorList: [],
+        //订单行数据
+        orderInfo: {},
+        //服务类型
+        serveType: [],
+        //增加订单弹窗
+        orderShow: false,
+        //在库订单信息
+        stockArticleInfo: [],
+        //库存品信息
+        inventoryInfo: [],
+        //时段
+        periodOfTimeData: [],
+        //路由订单编号
+        orderIds: '',
+        //预约编号
+        reservationId: '',
+        inventoryData: [],
+        orderData: [],
+        stockListShow: false,
+        isaddvalue: false,
+        packageData: [],
+        packageList: [],
+        inventoryList: [],
+        orderList: [],
+        inventoryTable: [],
+        inventoryShow: false,
+        reservationRules: {
+          consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
+          deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
+          deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }]
+          // enableStatus: [
+          //   { required: true, message: '请选择启用状态!', trigger: 'change' }
+          // ],
+        },
+        obj: {}
+      };
     },
-    init() {
-      this.height = this.setPx(document.body.clientHeight - 340);
+    created() {
+      this.$watch(
+        () => this.$route.params,
+        () => {
+          this.fetchData();
+        },
+        // 组件创建完后获取数据，
+        // 此时 data 已经被 observed 了
+        { immediate: true }
+      );
     },
-    aaa() {
-      let addvalueInfos = [];
-      this.form.addvalueType.forEach((item, index) => {
-        let addvalueInfo = {};
-        addvalueInfo.addvalueId = item;
-        if (item == 1 || item == 3 || item == 5 || item == 7) {
-          addvalueInfo.number = this.costList[item];
-        }
-        if (item == 2) {
-          addvalueInfo.kilometer = this.costList[item];
-        }
-        if (item == 4) {
-          addvalueInfo.distance = this.costList[item];
-        }
-        if (item == 6) {
-          addvalueInfo.peopleNum = this.costList[item];
-        }
-        if (this.floorList.length > 1) {
-          addvalueInfo.floor = this.floorList[1];
-          this.floorList = [];
+    mounted() {
+      this.init();
+      let arr = [];
+      this.option.columnParcels.map(item => {
+        if (!item.hide) {
+          arr.push({
+            prop: item.prop,
+            label: item.label,
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          });
         }
-        addvalueInfo.fee = this.feeList[item];
-        addvalueInfos.push(addvalueInfo);
-      });
-      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({
-          type: 'success',
-          message: '操作成功!',
-        });
       });
+      console.log(JSON.stringify(arr));
       this.onLoad(this.page);
+      this.getDictionary();
     },
-    //查询出所有的市配订单
-    handleAddOrder() {
-      this.loading = true;
-      //这里只需要对订单进行正常的搜索即可
-      this.onLoadOrder(this.page);
-      this.loading = false;
-      this.orderShow = true;
+    watch: {
+      '$route.query.reservationId': {
+        handler(newVal, oldVal) {
+          console.log(newVal, oldVal);
+          this.fetchData();
+          this.onLoad(this.page);
+        },
+        deep: true,
+        immediate: true
+      }
     },
-    checkOrder(row, index) {
-      if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
-        return false;
-      } else {
-        return true;
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(',');
       }
-      return false;
     },
-    handleAddInventory() {
-      let page = this.page;
-      let params = {};
-      this.query.serviceType = '2';
-      getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-        res => {
-          const inventoryList = res.data.data;
-          inventoryList.records.forEach(item => {
-            item.reservationNum = '0';
-            item.applyNum = item.quantityStock - item.quantityOccupied;
+    methods: {
+      fetchData() {
+        this.error = this.post = null;
+        this.loading = true;
+        if (this.$route.query.id) {
+          this.orderIds = this.$route.query.id;
+        }
+        if (this.$route.query.reservationId) {
+          this.reservationId = this.$route.query.reservationId;
+        }
+        this.loading = false;
+      },
+      init() {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      aaa() {
+        let addvalueInfos = [];
+        this.form.addvalueType.forEach((item, index) => {
+          let addvalueInfo = {};
+          addvalueInfo.addvalueId = item;
+          if (item == 1 || item == 3 || item == 5 || item == 7) {
+            addvalueInfo.number = this.costList[item];
+          }
+          if (item == 2) {
+            addvalueInfo.kilometer = this.costList[item];
+          }
+          if (item == 4) {
+            addvalueInfo.distance = this.costList[item];
+          }
+          if (item == 6) {
+            addvalueInfo.peopleNum = this.costList[item];
+          }
+          if (this.floorList.length > 1) {
+            addvalueInfo.floor = this.floorList[1];
+            this.floorList = [];
+          }
+          addvalueInfo.fee = this.feeList[item];
+          addvalueInfos.push(addvalueInfo);
+        });
+        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({
+            type: 'success',
+            message: '操作成功!'
           });
-          this.page.total = inventoryList.total;
-          this.inventoryInfo = inventoryList.records;
-          //存在库存品，需要将库存品进行回显勾选
-          if (this.inventoryData) {
-            this.inventoryInfo.forEach((item, index) => {
-              this.inventoryData.forEach(inventory => {
-                if (item.id === inventory.id) {
-                  item = inventory;
-                  this.$nextTick(() => {
-                    this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index], true);
-                  });
-                }
-              });
+        });
+        this.onLoad(this.page);
+      },
+      //查询出所有的市配订单
+      handleAddOrder() {
+        this.loading = true;
+        //这里只需要对订单进行正常的搜索即可
+        this.onLoadOrder(this.page);
+        this.loading = false;
+        this.orderShow = true;
+      },
+      checkOrder(row, index) {
+        if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
+          return false;
+        } else {
+          return true;
+        }
+        return false;
+      },
+      handleAddInventory() {
+        let page = this.page;
+        let params = {};
+        this.query.serviceType = '2';
+        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+          res => {
+            const inventoryList = res.data.data;
+            inventoryList.records.forEach(item => {
+              item.reservationNum = '0';
+              item.applyNum = item.quantityStock - item.quantityOccupied;
             });
+            this.page.total = inventoryList.total;
+            this.inventoryInfo = inventoryList.records;
+            //存在库存品，需要将库存品进行回显勾选
+            if (this.inventoryData) {
+              this.inventoryInfo.forEach((item, index) => {
+                this.inventoryData.forEach(inventory => {
+                  if (item.id === inventory.id) {
+                    item = inventory;
+                    this.$nextTick(() => {
+                      this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index], true);
+                    });
+                  }
+                });
+              });
+            }
+            console.log('------------->', this.inventoryData);
+            this.loading = false;
+            this.selectionClear();
           }
-          console.log('------------->', this.inventoryData);
-          this.loading = false;
-          this.selectionClear();
+        );
+        this.query = {};
+        this.inventoryList = [];
+        this.stockListShow = true;
+      },
+      handleCheckedCitiesChange(value) {
+        if (value) {
+          this.form.addvalueType = value;
         }
-      );
-      this.query = {};
-      this.inventoryList = [];
-      this.stockListShow = true;
-    },
-    handleCheckedCitiesChange(value) {
-      if (value) {
-        this.form.addvalueType = value;
-      }
-      console.log('>>>>>', this.form);
-      if (value.length < 1) {
-        this.costList = [];
-        this.costListName = [];
-      }
-      this.deliveryWayData.forEach(i => {
-        if (value.includes(i.dictKey)) {
-          console.log(i);
-          i.pitch = true;
-          this.costListName = value;
+        console.log('>>>>>', this.form);
+        if (value.length < 1) {
+          this.costList = [];
+          this.costListName = [];
         }
-      });
-    },
-    textbox(e, index, a) {
-      console.log('e,index', e, index, a);
-      if (a === 6) {
-        this.feeList[index + 1] = e;
-        return;
-      }
-      if (a === 5)
-        if (index === 0 && a === 5) {
-          this.floorList[index + 1] = e;
+        this.deliveryWayData.forEach(i => {
+          if (value.includes(i.dictKey)) {
+            console.log(i);
+            i.pitch = true;
+            this.costListName = value;
+          }
+        });
+      },
+      textbox(e, index, a) {
+        console.log('e,index', e, index, a);
+        if (a === 6) {
+          this.feeList[index + 1] = e;
           return;
         }
-      this.costList[index + 1] = e;
+        if (a === 5)
+          if (index === 0 && a === 5) {
+            this.floorList[index + 1] = e;
+            return;
+          }
+        this.costList[index + 1] = e;
 
-      //费用列表
-    },
-    //数据字典数据获取
-    getDictionary() {
-      getDictionaryBiz('addvalue_serve_type').then(res => {
-        this.addvalueServeTypeData = res.data.data;
-      });
-      getDictionaryBiz('delivery_way').then(res => {
-        this.deliveryWayData = res.data.data;
-      });
-      getDictionaryBiz('distribution_type').then(res => {
-        this.deliveryTypeData = res.data.data;
-      });
-      getDictionaryBiz('period_of_time').then(res => {
-        this.periodOfTimeData = res.data.data;
-      });
-      getDictionaryBiz('yes_no').then(res => {
-        this.whetherData = res.data.data;
-      });
-    },
-    addvalueServe(row) {
-      //查询订单的增值服务，
-      this.addvalueServeType = [];
-      this.addvalue = {};
-      this.dialogVisible = true;
-      this.costList = [];
-      this.feeList = [];
-      this.floorList = [];
-      this.orderInfo = row;
-    },
-    searchHide() {
-      this.search = !this.search;
-    },
-    searchChange() {
-      this.onLoad(this.page);
-    },
-    searchReset() {
-      this.query = {};
-      this.page.currentPage = 1;
-      this.onLoad(this.page);
-    },
-    viewStockArticlePackage(row) {
-      this.loading = true;
-      this.packageList = row.packageList;
-      this.obj = row;
-      console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
-      if (this.reservationId) {
-        //这里就是编辑的数据回显问题
-        let packageInfo = row.parcelListVOS;
-        // this.packageData = row.parcelListVOS;
-        let packageListData = this.packageData;
-        if (row.packageList) {
-          let packageListInfo = row.packageList;
-          packageInfo.forEach((item, index) => {
-            packageListInfo.forEach(p => {
-              if (item.id === p.id) {
-                this.$nextTick(() => {
-                  // this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-                });
-              }
+        //费用列表
+      },
+      //数据字典数据获取
+      getDictionary() {
+        getDictionaryBiz('addvalue_serve_type').then(res => {
+          this.addvalueServeTypeData = res.data.data;
+        });
+        getDictionaryBiz('delivery_way').then(res => {
+          this.deliveryWayData = res.data.data;
+        });
+        getDictionaryBiz('distribution_type').then(res => {
+          this.deliveryTypeData = res.data.data;
+        });
+        getDictionaryBiz('period_of_time').then(res => {
+          this.periodOfTimeData = res.data.data;
+        });
+        getDictionaryBiz('yes_no').then(res => {
+          this.whetherData = res.data.data;
+        });
+      },
+      addvalueServe(row) {
+        //查询订单的增值服务，
+        this.addvalueServeType = [];
+        this.addvalue = {};
+        this.dialogVisible = true;
+        this.costList = [];
+        this.feeList = [];
+        this.floorList = [];
+        this.orderInfo = row;
+      },
+      searchHide() {
+        this.search = !this.search;
+      },
+      searchChange() {
+        this.onLoad(this.page);
+      },
+      searchReset() {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+      viewStockArticlePackage(row) {
+        this.loading = true;
+        this.packageList = row.packageList;
+        this.obj = row;
+        console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
+        if (this.reservationId) {
+          //这里就是编辑的数据回显问题
+          let packageInfo = row.parcelListVOS;
+          // this.packageData = row.parcelListVOS;
+          let packageListData = this.packageData;
+          if (row.packageList) {
+            let packageListInfo = row.packageList;
+            packageInfo.forEach((item, index) => {
+              packageListInfo.forEach(p => {
+                if (item.id === p.id) {
+                  this.$nextTick(() => {
+                    // this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+                  });
+                }
+              });
             });
-          });
-        } else {
-          //新增订单，默认全选
-          packageInfo.forEach((item, index) => {
-            this.$nextTick(() => {
-              this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+          } else {
+            //新增订单，默认全选
+            packageInfo.forEach((item, index) => {
+              this.$nextTick(() => {
+                this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+              });
             });
+          }
+          this.packageData = row.parcelListVOS;
+        } else {
+          this.packageData = row.parcelListVOS;
+          //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
+          let data = row.parcelListVOS;
+          data.forEach((item, index) => {
+            if (
+              item.orderPackageReservationStatusName === '已预约' ||
+              item.orderPackageReservationStatus === '20'
+            ) {
+              //   //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态
+              this.$nextTick(() => {
+                this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+              });
+              console.log('::', item);
+              this.checkPackage(item, index);
+            } else if (
+              item.orderPackageFreezeStatusName !== '已冻结' ||
+              item.orderPackageFreezeStatus !== '20'
+            ) {
+              this.$nextTick(() => {
+                this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+              });
+            }
           });
         }
-        this.packageData = row.parcelListVOS;
-      } else {
-        this.packageData = row.parcelListVOS;
-        //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
-        let data = row.parcelListVOS;
-        data.forEach((item, index) => {
+        this.isaddvalue = true;
+        this.loading = false;
+      },
+      checkPackage(row, index) {
+        //区分编辑还是新增
+        //编辑需要对这个预约单下的包件信息均可进行调整
+        console.log(row, 'rowrowrowrowrowrow');
+        if (!this.reservationId) {
           if (
-            item.orderPackageReservationStatusName === '已预约' ||
-            item.orderPackageReservationStatus === '20'
+            row.orderPackageReservationStatusName === '已预约' ||
+            row.orderPackageReservationStatusName === '20'
           ) {
-            //   //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态
-            this.$nextTick(() => {
-              this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+            return true;
+          }
+        }
+        if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
+          return false;
+        } else {
+          return true;
+        }
+      },
+      //搜索订单
+      searchStockArticle() {
+        let params = {};
+        let page = this.page;
+        this.query.typeService = 2;
+        this.query.genre = 1;
+        // if (this.reservationId) {
+        //   this.onLoadEditOrder(this.page);
+        // } else {
+        this.onLoadOrder(this.page);
+        // }
+        // selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        //   const data = res.data.data;
+        //   data.records.forEach(item => {
+        //     item.reservationNum = item.handQuantity;
+        //   });
+        //   this.page.total = data.total;
+        //   this.stockArticleInfo = data.records;
+        //   this.loading = false;
+        //   // this.selectionClear();
+        // });
+      },
+      searchStockList() {
+        let params = {};
+        let page = this.page;
+        this.query.serviceType = 2;
+        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+          res => {
+            const inventoryList = res.data.data;
+            inventoryList.records.forEach(item => {
+              item.reservationNum = '0';
             });
-            console.log('::', item);
-            this.checkPackage(item, index);
-          } else if (
-            item.orderPackageFreezeStatusName !== '已冻结' ||
-            item.orderPackageFreezeStatus !== '20'
-          ) {
-            this.$nextTick(() => {
-              this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+            this.page.total = inventoryList.total;
+            this.inventoryInfo = inventoryList.records;
+            this.loading = false;
+            this.selectionClear();
+          }
+        );
+      },
+      stockArticleSearchReset() {
+        this.selectionList = [];
+        this.query = {};
+        this.handleAddOrder();
+      },
+      stockListSearchReset() {
+        this.selectionList = [];
+        this.query = {};
+        this.handleAddInventory();
+      },
+      onSubmitPackage() {
+        if (this.packageList.length === 0) {
+          this.$message.warning('请选择包件!!!');
+          return;
+        }
+        this.orderData.forEach(item => {
+          if (item.id === this.obj.id) {
+            item.packageList = this.packageList;
+          }
+        });
+        console.log('this.orderData------------>', this.orderData);
+        this.isaddvalue = false;
+      },
+      onSubmit() {
+        //新增预约单
+        let orderIds = [];
+        let inventoryIds = [];
+        let inventoryList = [];
+        let stockArticleList = [];
+        let operation = true;
+        this.inventoryData.forEach(item => {
+          if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
+            this.$message({
+              type: 'warning',
+              message: '请输入' + item.orderCode + '正确数量!'
             });
+            operation = false;
           }
+          item.reservationNum = item.reservationNum;
+          inventoryIds.push(item.id);
+          inventoryList.push(item);
         });
-      }
-      this.isaddvalue = true;
-      this.loading = false;
-    },
-    checkPackage(row, index) {
-      //区分编辑还是新增
-      //编辑需要对这个预约单下的包件信息均可进行调整
-      console.log(row,'rowrowrowrowrowrow')
-      if (!this.reservationId) {
-        if (
-          row.orderPackageReservationStatusName === '已预约' ||
-          row.orderPackageReservationStatusName === '20'
-        ) {
-          return true;
-        }
-      }
-      if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
-        return false;
-      } else {
-        return true;
-      }
-    },
-    //搜索订单
-    searchStockArticle() {
-      let params = {};
-      let page = this.page;
-      this.query.typeService = 2;
-      this.query.genre = 1;
-      // if (this.reservationId) {
-      //   this.onLoadEditOrder(this.page);
-      // } else {
-      this.onLoadOrder(this.page);
-      // }
-      // selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //   const data = res.data.data;
-      //   data.records.forEach(item => {
-      //     item.reservationNum = item.handQuantity;
-      //   });
-      //   this.page.total = data.total;
-      //   this.stockArticleInfo = data.records;
-      //   this.loading = false;
-      //   // this.selectionClear();
-      // });
-    },
-    searchStockList() {
-      let params = {};
-      let page = this.page;
-      this.query.serviceType = 2;
-      getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-        res => {
-          const inventoryList = res.data.data;
-          inventoryList.records.forEach(item => {
-            item.reservationNum = '0';
+        orderIds.join(',');
+        inventoryIds.join(',');
+        this.form.stockArticleIds = orderIds.toString();
+        this.form.inventoryIds = inventoryIds.toString();
+        this.form.inventoryList = inventoryList;
+        console.log('-------------->', this.orderData);
+        let order = this.orderData;
+        order.forEach(o => {
+          if (!o.packageListInfo) {
+            o.packageListInfo = o.packageList;
+          }
+        });
+        this.form.stockArticleList = order;
+        this.deliveryWayData.forEach(item => {
+          if (this.form.deliveryWay === item.dictValue) {
+            this.form.deliveryWay = item.dictKey;
+          }
+        });
+        this.deliveryTypeData.forEach(item => {
+          if (this.form.deliveryType === item.dictValue) {
+            this.form.deliveryType = item.dictKey;
+          }
+        });
+        this.periodOfTimeData.forEach(item => {
+          if (this.form.periodOfTime === item.dictValue) {
+            this.form.periodOfTime = item.dictKey;
+          }
+        });
+        this.form.serveType = this.serveType.sort().join(',');
+        //服务号
+        this.orderData.forEach(item => {
+          console.log('-------------->item', item);
+          if (!item.packageListInfo) {
+            item.packageListInfo = item.parcelListVOS;
+          }
+        });
+        // this.form.stockArticleList = this.packageList;
+        console.log('>>>>>>>>', this.form);
+        if (this.reservationId) {
+          this.form.id = this.reservationId;
+          update(this.form).then(() => {
+            this.$router.go(-1);
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
           });
-          this.page.total = inventoryList.total;
-          this.inventoryInfo = inventoryList.records;
-          this.loading = false;
-          this.selectionClear();
-        }
-      );
-    },
-    stockArticleSearchReset() {
-      this.selectionList = [];
-      this.query = {};
-      this.handleAddOrder();
-    },
-    stockListSearchReset() {
-      this.selectionList = [];
-      this.query = {};
-      this.handleAddInventory();
-    },
-    onSubmitPackage() {
-      if (this.packageList.length === 0) {
-        this.$message.warning('请选择包件!!!');
-        return;
-      }
-      this.orderData.forEach(item => {
-        if (item.id === this.obj.id) {
-          item.packageList = this.packageList;
-        }
-      });
-      console.log('this.orderData------------>', this.orderData);
-      this.isaddvalue = false;
-    },
-    onSubmit() {
-      //新增预约单
-      let orderIds = [];
-      let inventoryIds = [];
-      let inventoryList = [];
-      let stockArticleList = [];
-      let operation = true;
-      this.inventoryData.forEach(item => {
-        if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
-          this.$message({
-            type: 'warning',
-            message: '请输入' + item.orderCode + '正确数量!',
+        } else {
+          this.form.reservationStatus = '20';
+          autonomouslySave(this.form).then(() => {
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.$router.go(-1);
           });
-          operation = false;
-        }
-        item.reservationNum = item.reservationNum;
-        inventoryIds.push(item.id);
-        inventoryList.push(item);
-      });
-      orderIds.join(',');
-      inventoryIds.join(',');
-      this.form.stockArticleIds = orderIds.toString();
-      this.form.inventoryIds = inventoryIds.toString();
-      this.form.inventoryList = inventoryList;
-      console.log('-------------->', this.orderData);
-      let order = this.orderData;
-      order.forEach(o => {
-        if (!o.packageListInfo) {
-          o.packageListInfo = o.packageList;
-        }
-      });
-      this.form.stockArticleList = order;
-      this.deliveryWayData.forEach(item => {
-        if (this.form.deliveryWay === item.dictValue) {
-          this.form.deliveryWay = item.dictKey;
-        }
-      });
-      this.deliveryTypeData.forEach(item => {
-        if (this.form.deliveryType === item.dictValue) {
-          this.form.deliveryType = item.dictKey;
-        }
-      });
-      this.periodOfTimeData.forEach(item => {
-        if (this.form.periodOfTime === item.dictValue) {
-          this.form.periodOfTime = item.dictKey;
-        }
-      });
-      this.form.serveType = this.serveType.sort().join(',');
-      //服务号
-      this.orderData.forEach(item => {
-        console.log('-------------->item', item);
-        if (!item.packageListInfo) {
-          item.packageListInfo = item.parcelListVOS;
         }
-      });
-      // this.form.stockArticleList = this.packageList;
-      console.log('>>>>>>>>', this.form);
-      if (this.reservationId) {
-        this.form.id = this.reservationId;
-        update(this.form).then(() => {
-          this.$router.go(-1);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {
           });
+      },
+      removeStockArticle(row) {
+        this.orderData.forEach((item, index) => {
+          if (item.id === row.id) {
+            this.orderData.splice(index, 1);
+          }
+          console.log(item);
         });
-      } else {
-        this.form.reservationStatus = '20';
-        autonomouslySave(this.form).then(() => {
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$router.go(-1);
+        console.log('>>>>>>>>>>>>>>>row', row);
+      },
+      removeStockList(row) {
+        this.inventoryData.forEach((item, index) => {
+          if (item.id === row.id) {
+            this.inventoryData.splice(index, 1);
+          }
+          console.log(item);
         });
-      }
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {});
-    },
-    removeStockArticle(row) {
-      this.orderData.forEach((item, index) => {
-        if (item.id === row.id) {
-          this.orderData.splice(index, 1);
-        }
-        console.log(item);
-      });
-      console.log('>>>>>>>>>>>>>>>row', row);
-    },
-    removeStockList(row) {
-      this.inventoryData.forEach((item, index) => {
-        if (item.id === row.id) {
-          this.inventoryData.splice(index, 1);
-        }
-        console.log(item);
-      });
-      console.log('>>>>>>>>>>>>>>>row', row);
-    },
-    showStockListEdit(row){
-      console.log('>>>>>>>>>>>>>>>row', row);
-      //查看库存品详情
-      let a ={};
-      a.reservationId = this.reservationId;
-      a.inventoryId = row.id;
-      selectInventoryDetail(1,20,a).then(res=>{
-        console.log("------------>",res);
-      })
-    },
-    handleView(row) {
-      this.title = '查看';
-      this.view = true;
-      this.box = true;
-      getDetailDelivery(row.id).then(res => {
-        this.form = res.data.data;
-      });
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
+        console.log('>>>>>>>>>>>>>>>row', row);
+      },
+      showStockListEdit(row) {
+        console.log('>>>>>>>>>>>>>>>row', row);
+        //查看库存品详情
+        let a = {};
+        a.reservationId = this.reservationId;
+        a.inventoryId = row.id;
+        selectInventoryDetail(1, 20, a).then(res => {
+          console.log('------------>', res);
         });
-    },
-    beforeClose(done) {
-      done();
-      this.form = {};
-      this.view = false;
-    },
-    selectionChange(list) {
-      this.orderList = list;
-    },
-    selectionPackageChange(list) {
-      console.log('-----------<>', list);
-      if (this.reservationId) {
-        this.packageList = list;
-      } else {
-        //新增
-        let a = [];
-        list.forEach(item => {
-          console.log('--------------->', item);
-          if (
-            item.orderPackageReservationStatus === '10' ||
-            item.orderPackageReservationStatusName === '未预约'
-          ) {
-            a.push(item);
-          }
+      },
+      handleView(row) {
+        this.title = '查看';
+        this.view = true;
+        this.box = true;
+        getDetailDelivery(row.id).then(res => {
+          this.form = res.data.data;
         });
-        this.packageList = a;
-      }
-    },
-    selectionInventoryChange(list) {
-      // if (this.reservationId){
-      console.log('-----------<>', list);
-      this.inventoryList = list;
-      // }else {
-      //   //新增
-      //   let a = [];
-      //   list.forEach(item=>{
-      //     if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){
-      //       a.push(item);
-      //     }
-      //   })
-      //   this.inventoryList = a;
-      // }
-    },
+      },
+      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.orderList = list;
+      },
+      selectionPackageChange(list) {
+        console.log('-----------<>', list);
+        if (this.reservationId) {
+          this.packageList = list;
+        } else {
+          //新增
+          let a = [];
+          list.forEach(item => {
+            console.log('--------------->', item);
+            if (
+              item.orderPackageReservationStatus === '10' ||
+              item.orderPackageReservationStatusName === '未预约'
+            ) {
+              a.push(item);
+            }
+          });
+          this.packageList = a;
+        }
+      },
+      selectionInventoryChange(list) {
+        // if (this.reservationId){
+        console.log('-----------<>', list);
+        this.inventoryList = list;
+        // }else {
+        //   //新增
+        //   let a = [];
+        //   list.forEach(item=>{
+        //     if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){
+        //       a.push(item);
+        //     }
+        //   })
+        //   this.inventoryList = a;
+        // }
+      },
 
-    // 增加库存品
-    onSubmitInventory() {
-      if (this.inventoryList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.inventoryList.forEach(item => {
-        if (item.reservationNum > item.applyNum) {
-          this.$message.warning('该库存品数量输入有误!!!');
+      // 增加库存品
+      onSubmitInventory() {
+        if (this.inventoryList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
           return;
         }
-      });
-      this.inventoryData = this.inventoryList;
+        this.inventoryList.forEach(item => {
+          if (item.reservationNum > item.applyNum) {
+            this.$message.warning('该库存品数量输入有误!!!');
+            return;
+          }
+        });
+        this.inventoryData = this.inventoryList;
 
-      // if (this.orderData.length) {
-      //   this.inventoryList.some(i => {
-      //     let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
-      //     if (!a) {
-      //       this.inventoryData.push(i);
-      //     }
-      //   });
-      // } else {
-      //   this.inventoryData = this.selectionList;
-      // }
+        // if (this.orderData.length) {
+        //   this.inventoryList.some(i => {
+        //     let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
+        //     if (!a) {
+        //       this.inventoryData.push(i);
+        //     }
+        //   });
+        // } else {
+        //   this.inventoryData = this.selectionList;
+        // }
 
-      this.stockListShow = false;
-    },
-    /**
-     * 增加订单提交
-     */
-    onSubmitOrder() {
-      console.log('-------------》', this.orderList);
-      const list = this.orderList;
-      let name = list[0].customerName;
-      let address = list[0].customerAddress;
-      let phone = list[0].customerTelephone;
-      if (!!this.form.consignee) {
-        if (this.form.consignee !== name) {
-          this.$message.warning('请选择统一顾客订单!!!');
-          return;
+        this.stockListShow = false;
+      },
+      /**
+       * 增加订单提交
+       */
+      onSubmitOrder() {
+        console.log('-------------》', this.orderList);
+        const list = this.orderList;
+        let name = list[0].customerName;
+        let address = list[0].customerAddress;
+        let phone = list[0].customerTelephone;
+        if (!!this.form.consignee) {
+          if (this.form.consignee !== name) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
         }
-      }
-      if (!!this.form.customerAddress) {
-        if (this.form.customerAddress !== address) {
-          this.$message.warning('请选择统一顾客订单!!!');
-          return;
+        if (!!this.form.customerAddress) {
+          if (this.form.customerAddress !== address) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
         }
-      }
-      if (!!this.form.customerTelephone) {
-        if (this.form.customerTelephone !== phone) {
-          this.$message.warning('请选择统一顾客订单!!!');
-          return;
+        if (!!this.form.customerTelephone) {
+          if (this.form.customerTelephone !== phone) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
         }
-      }
-      //市配  --- 最终客户校验
-      for (let i = 1; i < list.length; i++) {
-        if (
-          list[i].customerName !== name ||
-          list[i].customerAddress !== address ||
-          list[i].customerTelephone !== phone
-        ) {
-          this.$message.warning('请选择统一顾客订单!!!');
-          return;
+        //市配  --- 最终客户校验
+        for (let i = 1; i < list.length; i++) {
+          if (
+            list[i].customerName !== name ||
+            list[i].customerAddress !== address ||
+            list[i].customerTelephone !== phone
+          ) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return;
+          }
         }
-      }
 
-      this.form.consignee = name;
-      this.form.deliveryAddress = address;
-      this.form.deliveryPhone = phone;
-      //这里需要对选择的订单进行筛选
-      const info = [];
-      this.stockArticleInfo.forEach((item, index) => {
-        this.orderList.forEach(order => {
-          // const newDate1 = this.orderData.map(item => { // map遍历本地数据
-          //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
-          //     return item;
-          // });
-          //   }              info.push(order);
-          //清理原来订单列表的订单数据
-          info.push(order);
-          this.stockArticleInfo.splice(index, 1);
-        });
-      });
-      if (this.orderData.length >= 1) {
-        let newDate1 = this.orderData.map(item => {
-          // map遍历本地数据
-          if (this.orderList.find(o => o.id !== item.id)) {
-            // 如果在接口数据中包含本地数据，则返回这条本地数据
-            return item;
-          }
-        });
-        console.log('newDate1-------------->', newDate1.length);
-        if (newDate1.length >= 1) {
-          console.log('newDate1-------------->', newDate1);
-          newDate1.forEach(a => {
-            this.orderData.push(a);
+        this.form.consignee = name;
+        this.form.deliveryAddress = address;
+        this.form.deliveryPhone = phone;
+        //这里需要对选择的订单进行筛选
+        const info = [];
+        this.stockArticleInfo.forEach((item, index) => {
+          this.orderList.forEach(order => {
+            // const newDate1 = this.orderData.map(item => { // map遍历本地数据
+            //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+            //     return item;
+            // });
+            //   }              info.push(order);
+            //清理原来订单列表的订单数据
+            info.push(order);
+            this.stockArticleInfo.splice(index, 1);
           });
-        }
-        console.log('this.orderData------------->', this.orderData);
-      } else {
-        this.orderData = this.orderList;
-      }
-      // this.orderData.push(info);
-      this.orderShow = false;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.query = {};
-      // this.$refs.table.clearSelection();
-    },
-    currentOrderChange(currentPage) {
-      this.page.currentPage = currentPage;
-      // if (this.reservationId) {
-      //   this.onLoadEditOrder(this.page, this.reservationId);
-      // } else {
-      //   this.onLoadOrder(this.page);
-      // }
-      this.onLoadOrder(this.page);
-    },
-    sizeOrderChange(pageSize) {
-      this.page.pageSize = pageSize;
-      // if (this.reservationId) {
-      //   this.onLoadEditOrder(this.page, this.reservationId);
-      // } else {
-      //   this.onLoadOrder(this.page);
-      // }
-      this.onLoadOrder(this.page);
-    },
-    onLoadEditOrder(params = {}) {
-      this.query.typeService = 2;
-      this.query.genre = '1';
-      const page = this.page;
-      let a = [];
-      if (this.orderData) {
-        this.orderData.forEach(item => {
-          a.push(item.id);
         });
-      }
-      this.query.orderIds = a.join(',');
-      this.query.reservationId = this.reservationId;
-      selectUpdateAvailableStockArticle(
-        page.currentPage,
-        page.pageSize,
-        this.reservationId,
-        Object.assign(params, this.query)
-      ).then(res => {
-        console.log('res------------>', res);
-        const data = res.data.data;
-        this.stockArticleInfo = data.records;
-        this.stockArticleInfo.forEach((item, index) => {
-          //检查订单是否冻结
-          this.checkOrder(item, index);
-          if (this.orderData) {
-            this.orderData.forEach(o => {
-              if (o.id === item.id) {
-                //回显选择的包件信息
-                this.$nextTick(() => {
-                  this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
-                });
-              }
+        if (this.orderData.length >= 1) {
+          let newDate1 = this.orderData.map(item => {
+            // map遍历本地数据
+            if (this.orderList.find(o => o.id !== item.id)) {
+              // 如果在接口数据中包含本地数据，则返回这条本地数据
+              return item;
+            }
+          });
+          console.log('newDate1-------------->', newDate1.length);
+          if (newDate1.length >= 1) {
+            console.log('newDate1-------------->', newDate1);
+            newDate1.forEach(a => {
+              this.orderData.push(a);
             });
-          } else {
-            this.orderList = [];
           }
-        });
-        this.page.total = data.total;
-      });
-      // this.query = {};
-    },
-    onLoadOrder(page, params = {}) {
-      this.query.typeService = 2;
-      this.query.genre = '1';
-      // const page = this.page;
-      let a = [];
-      if (this.orderData) {
-        this.orderData.forEach(item => {
-          a.push(item.id);
-        });
-      }
-      this.query.orderIds = a.join(',');
-      console.log('-------------->', this.query);
-      selectStockArticleInfoList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
-      ).then(res => {
-        console.log('res------------>', res);
-        const data = res.data.data;
-        this.stockArticleInfo = data.records;
-        this.stockArticleInfo.forEach((item, index) => {
-          //检查订单是否冻结
-          this.checkOrder(item, index);
-          // if (this.orderData) {
-          //   this.orderData.forEach(o => {
-          //     if (o.id === item.id) {
-          //       this.$nextTick(() => {
-          //         this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
-          //       });
-          //     }
-          //   });
-          // }else {
-          //   this.orderList = [];
-          // }
+          console.log('this.orderData------------->', this.orderData);
+        } else {
+          this.orderData = this.orderList;
+        }
+        // this.orderData.push(info);
+        this.orderShow = false;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.query = {};
+        // this.$refs.table.clearSelection();
+      },
+      currentOrderChange(currentPage) {
+        this.page.currentPage = currentPage;
+        // if (this.reservationId) {
+        //   this.onLoadEditOrder(this.page, this.reservationId);
+        // } else {
+        //   this.onLoadOrder(this.page);
+        // }
+        this.onLoadOrder(this.page);
+      },
+      sizeOrderChange(pageSize) {
+        this.page.pageSize = pageSize;
+        // if (this.reservationId) {
+        //   this.onLoadEditOrder(this.page, this.reservationId);
+        // } else {
+        //   this.onLoadOrder(this.page);
+        // }
+        this.onLoadOrder(this.page);
+      },
+      onLoadEditOrder(params = {}) {
+        this.query.typeService = 2;
+        this.query.genre = '1';
+        const page = this.page;
+        let a = [];
+        if (this.orderData) {
+          this.orderData.forEach(item => {
+            a.push(item.id);
+          });
+        }
+        this.query.orderIds = a.join(',');
+        this.query.reservationId = this.reservationId;
+        selectUpdateAvailableStockArticle(
+          page.currentPage,
+          page.pageSize,
+          this.reservationId,
+          Object.assign(params, this.query)
+        ).then(res => {
+          console.log('res------------>', res);
+          const data = res.data.data;
+          this.stockArticleInfo = data.records;
+          this.stockArticleInfo.forEach((item, index) => {
+            //检查订单是否冻结
+            this.checkOrder(item, index);
+            if (this.orderData) {
+              this.orderData.forEach(o => {
+                if (o.id === item.id) {
+                  //回显选择的包件信息
+                  this.$nextTick(() => {
+                    this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
+                  });
+                }
+              });
+            } else {
+              this.orderList = [];
+            }
+          });
           this.page.total = data.total;
         });
-        this.orderList = [];
-      });
-    },
+        // this.query = {};
+      },
+      inputscStockArtic(index, row) {
+        console.log(index, row);
+        this.query[row.prop] = index;
+        this.onLoadOrder(this.page);
+      },
+      timescStockArtic(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.onLoadOrder(this.page);
+      },
+      btnscStockArtic(index, row) {
+        console.log(index, row);
+        this.onLoad(this.page);
+      },
+      selectscStockArtic(index, row) {
+        console.log(index, row);
+        if(row.prop ==='reservationStatusName'){
+          this.query['reservationStatus'] = index;
+        }else if(row.prop ==='freezeStatusName'){
+          this.query['freezeStatus'] = index;
+        }else if(row.prop ==='completeSetName'){
+          this.query['completeSet'] = index;
+        }
+        // else if(row.prop ==='groundingStatusName'){
+        //   this.query['groundingStatus'] = index;
+        // }else if(row.prop ==='stockupStatusName'){
+        //   this.query['stockupStatus'] = index;
+        // }else if(row.prop ==='orderStatusName'){
+        //   this.query['orderStatus'] = index;
+        // }else if(row.prop ==='typeServerName'){
+        //   this.query['typeService'] = index;
+        // }
+        // else if(row.prop ==='orderReceiveStatusName'){
+        //   this.query['orderReceiveStatus'] = index;
+        // }
 
-    onLoad() {
-      // this.loading = true;
-      this.form.deliveryType = '2';
-      this.form.deliveryWay = '10';
-      this.form.periodOfTime = '3';
-      this.form.otherFee = 0;
-      this.form.replaceFee = 0;
-      this.form.collectionFee = 0;
-      this.form.isUrgent = '1';
-      this.form.reservationDate = new Date();
-      if (this.orderIds) {
-        getStockArticleList(this.orderIds).then(res => {
-          console.log(res.data.data);
+        else{
+          this.query[row.prop] = index;
+        }
+        this.onLoadOrder(this.page);
+      },
+      onLoadOrder(page, params = {}) {
+        this.query.typeService = 2;
+        this.query.genre = '1';
+        // const page = this.page;
+        let a = [];
+        if (this.orderData) {
+          this.orderData.forEach(item => {
+            a.push(item.id);
+          });
+        }
+        this.query.orderIds = a.join(',');
+        console.log('-------------->', this.query);
+        selectStockArticleInfoList(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(params, this.query)
+        ).then(res => {
+          console.log('res------------>', res);
           const data = res.data.data;
-          let name = '';
-          let phone = '';
-          let address = '';
-          let typeService = '';
-          console.log('>>>>>>>>>>>>>', data);
-          for (let i = 0; i < data.length; i++) {
-            if (i === 0) {
-              name = data[0].customerName;
-              phone = data[0].customerTelephone;
-              address = data[0].customerAddress;
-              typeService = data[0].typeService.toString();
-              // typeName = data[0].typeName;
-            }
-          }
-          this.form.consignee = name;
-          this.form.deliveryPhone = phone;
-          this.form.deliveryType = typeService;
-          this.form.deliveryAddress = address;
-          this.orderData = data;
-        });
-      }
-      if (this.reservationId) {
-        this.inventoryShow = true;
-        getReservationInfo(this.reservationId).then(res => {
-          const reservation = res.data.data;
-          const stockArticleListInfo = res.data.data.stockArticleList;
-          // stockArticleListInfo.forEach(item=>{
-          //
-          // })
-          console.log('>>>>>>>>', reservation);
-          this.orderData = reservation.stockArticleList;
-          this.inventoryData = reservation.inventoryList;
-          this.inventoryData.forEach(item => {
-            item.applyNum = item.quantityStock - item.quantityOccupied;
+          this.stockArticleInfo = data.records;
+          this.stockArticleInfo.forEach((item, index) => {
+            //检查订单是否冻结
+            this.checkOrder(item, index);
+            // if (this.orderData) {
+            //   this.orderData.forEach(o => {
+            //     if (o.id === item.id) {
+            //       this.$nextTick(() => {
+            //         this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
+            //       });
+            //     }
+            //   });
+            // }else {
+            //   this.orderList = [];
+            // }
+            this.page.total = data.total;
           });
-          this.form.deliveryType = reservation.deliveryType;
-          this.form.periodOfTime = reservation.periodOfTime;
-          if (reservation.serveType) {
-            //过滤字符串中的','
-            this.serveType = Array.from(reservation.serveType).filter(s => {
-              return s !== ',';
-            });
-          }
-          this.form = reservation;
+          this.orderList = [];
         });
-      } else {
+      },
+
+      onLoad() {
+        // this.loading = true;
         this.form.deliveryType = '2';
+        this.form.deliveryWay = '10';
+        this.form.periodOfTime = '3';
+        this.form.otherFee = 0;
+        this.form.replaceFee = 0;
+        this.form.collectionFee = 0;
+        this.form.isUrgent = '1';
+        this.form.reservationDate = new Date();
+        if (this.orderIds) {
+          getStockArticleList(this.orderIds).then(res => {
+            console.log(res.data.data);
+            const data = res.data.data;
+            let name = '';
+            let phone = '';
+            let address = '';
+            let typeService = '';
+            console.log('>>>>>>>>>>>>>', data);
+            for (let i = 0; i < data.length; i++) {
+              if (i === 0) {
+                name = data[0].customerName;
+                phone = data[0].customerTelephone;
+                address = data[0].customerAddress;
+                typeService = data[0].typeService.toString();
+                // typeName = data[0].typeName;
+              }
+            }
+            this.form.consignee = name;
+            this.form.deliveryPhone = phone;
+            this.form.deliveryType = typeService;
+            this.form.deliveryAddress = address;
+            this.orderData = data;
+          });
+        }
+        if (this.reservationId) {
+          this.inventoryShow = true;
+          getReservationInfo(this.reservationId).then(res => {
+            const reservation = res.data.data;
+            const stockArticleListInfo = res.data.data.stockArticleList;
+            // stockArticleListInfo.forEach(item=>{
+            //
+            // })
+            console.log('>>>>>>>>', reservation);
+            this.orderData = reservation.stockArticleList;
+            this.inventoryData = reservation.inventoryList;
+            this.inventoryData.forEach(item => {
+              item.applyNum = item.quantityStock - item.quantityOccupied;
+            });
+            this.form.deliveryType = reservation.deliveryType;
+            this.form.periodOfTime = reservation.periodOfTime;
+            if (reservation.serveType) {
+              //过滤字符串中的','
+              this.serveType = Array.from(reservation.serveType).filter(s => {
+                return s !== ',';
+              });
+            }
+            this.form = reservation;
+          });
+        } else {
+          this.form.deliveryType = '2';
+        }
+        this.loading = false;
       }
-      this.loading = false;
-    },
-  },
-};
+    }
+  };
 </script>
 <style>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+    }
 
-input[type='number'] {
-  -moz-appearance: textfield;
-}
+    input[type='number'] {
+        -moz-appearance: textfield;
+    }
 </style>
diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue
index 28dd3e3c..39d59f83 100644
--- a/src/views/distribution/reservation/reservationSubmitFrom.vue
+++ b/src/views/distribution/reservation/reservationSubmitFrom.vue
@@ -117,15 +117,15 @@
                             <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
                         </el-form-item>
                     </el-col>
-<!--                    <el-col :span="10">-->
-<!--                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">-->
-<!--                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
-<!--                                <el-checkbox :label="item.dictKey"-->
-<!--                                             :value="item.dictKey">{{item.dictValue}}&emsp;-->
-<!--                                </el-checkbox>-->
-<!--                            </el-checkbox-group>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
+                    <el-col :span="10">
+                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">
+                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
+                                <el-checkbox :label="item.dictKey"
+                                             :value="item.dictKey">{{item.dictValue}}&emsp;
+                                </el-checkbox>
+                            </el-checkbox-group>
+                        </el-form-item>
+                    </el-col>
 
 
                     <el-col :span="10">
@@ -318,19 +318,19 @@
                 <!--                :before-close="handleClose"-->
                 <el-form :inline="true" :model="query">
                     <el-form-item label="商场名称:">
-                        <el-input v-model="query.marketName" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>
                     </el-form-item>
                     <el-form-item label="物料名称:">
-                        <el-input v-model="query.descriptionGoods" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>
                     </el-form-item>
                     <el-form-item label="商场编码:">
-                        <el-input v-model="query.marketCode" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>
                     </el-form-item>
                     <el-form-item label="订单自编号:">
-                        <el-input v-model="query.orderCode" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
                     </el-form-item>
                     <el-form-item label="品牌:">
-                        <el-input v-model="query.brand" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
                     </el-form-item>
                     <!-- 查询按钮 -->
                     <el-form-item>
@@ -500,6 +500,7 @@
   import option from '@/option/distribution/distributionStockArticle';
   import { mapGetters } from 'vuex';
   import { getDictionaryBiz } from '@/api/system/dict';
+  import dayjs from 'dayjs';
 
   export default {
     data() {
@@ -1322,6 +1323,53 @@
         this.page.pageSize = pageSize;
         this.onLoad(this.page);
       },
+      // inputscStockArtic(index, row) {
+      //   console.log(index, row);
+      //   this.query[row.prop] = index;
+      //   this.onLoadOrder(this.page);
+      // },
+      // timescStockArtic(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.onLoadOrder(this.page);
+      // },
+      // btnscStockArtic(index, row) {
+      //   console.log(index, row);
+      //   this.onLoad(this.page);
+      // },
+      // selectscStockArtic(index, row) {
+      //   console.log(index, row);
+      //   if(row.prop ==='reservationStatusName'){
+      //     this.query['reservationStatus'] = index;
+      //   }else if(row.prop ==='freezeStatusName'){
+      //     this.query['freezeStatus'] = index;
+      //   }else if(row.prop ==='completeSetName'){
+      //     this.query['completeSet'] = index;
+      //   }
+      //     // else if(row.prop ==='groundingStatusName'){
+      //     //   this.query['groundingStatus'] = index;
+      //     // }else if(row.prop ==='stockupStatusName'){
+      //     //   this.query['stockupStatus'] = index;
+      //     // }else if(row.prop ==='orderStatusName'){
+      //     //   this.query['orderStatus'] = index;
+      //     // }else if(row.prop ==='typeServerName'){
+      //     //   this.query['typeService'] = index;
+      //     // }
+      //     // else if(row.prop ==='orderReceiveStatusName'){
+      //     //   this.query['orderReceiveStatus'] = index;
+      //   // }
+      //
+      //   else{
+      //     this.query[row.prop] = index;
+      //   }
+      //   this.onLoadOrder(this.page);
+      // },
       onLoadOrder(page, params = {}) {
         this.query.typeService = 2;
         this.query.genre = '1';