From 6263a0d3ce9ebd7f5bc2df102a163d654c16a51a Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Mon, 20 Nov 2023 20:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6=E7=AB=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionReservation.js   |   11 +
 .../basicdata/basicdataTripartiteMall.js      |    6 +
 src/router/views/index.js                     |   24 +-
 .../brand/basicdataTripartiteMall.vue         |   29 +-
 .../inventory/list.vue}                       |    0
 src/views/mail/order/add.vue                  | 2900 +++++++++++++++++
 .../order_list.vue => mail/order/list.vue}    |    3 +-
 .../reservation/list.vue}                     |  109 +-
 src/views/reservation/order_listFrom.vue      | 1170 -------
 .../parcelList/distributionParcelList.vue     |   28 +
 10 files changed, 3003 insertions(+), 1277 deletions(-)
 rename src/views/{reservation/lnventory_list.vue => mail/inventory/list.vue} (100%)
 create mode 100644 src/views/mail/order/add.vue
 rename src/views/{reservation/order_list.vue => mail/order/list.vue} (99%)
 rename src/views/{reservation/reservation_list.vue => mail/reservation/list.vue} (92%)
 delete mode 100644 src/views/reservation/order_listFrom.vue

diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js
index 554c0661..f9ffb5e7 100644
--- a/src/api/distribution/distributionReservation.js
+++ b/src/api/distribution/distributionReservation.js
@@ -12,6 +12,17 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getReservationList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/reservation/reservation_list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  })
+}
 
 export const getDetail = (id) => {
   return request({
diff --git a/src/option/basicdata/basicdataTripartiteMall.js b/src/option/basicdata/basicdataTripartiteMall.js
index 49c74db3..607f1958 100644
--- a/src/option/basicdata/basicdataTripartiteMall.js
+++ b/src/option/basicdata/basicdataTripartiteMall.js
@@ -100,5 +100,11 @@ export default {
       label: "三方编码",
       prop: "tripartiteCoding",
     },
+    {
+      label: '品牌',
+      width: 120,
+      prop: 'brandName',
+    
+    },
   ]
 }
diff --git a/src/router/views/index.js b/src/router/views/index.js
index a4eb708b..12acb239 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -514,14 +514,14 @@ export default [
     ],
   },
   {
-    path: '/distribution/reservation/reservationAddFrom',
+    path: '/distribution/reservation/reservationAddFromByClient',
     component: Layout,
-    redirect: '/distribution/reservation/reservationAddFrom',
+    redirect: '/distribution/reservation/reservationAddFromByClient',
     children: [
       {
-        path: '/distribution/reservation/reservationAddFrom',
+        path: '/distribution/reservation/reservationAddFromByClient',
         name: 'name',
-        component: () => import('@/views/distribution/reservation/reservationAddFrom.vue'),
+        component: () => import('@/views/distribution/reservation/reservationAddFromByClient.vue'),
       },
     ],
   },
@@ -1080,6 +1080,22 @@ export default [
       },
     ],
   },
+// 下面的代码为 商场客户端的页面
+
+{
+  path: '/mail/order/add',
+  component: Layout,
+  redirect: '/mail/order/add',
+  children: [
+    {
+      path: '/mail/order/add',
+      name: '新建商场预约单',
+      component: () => import('@/views/mail/order/add.vue'),
+    },
+  ],
+},
+
+
   // {
   //   path: '/distribution/turndelivery/devtmp',
   //   component: Layout,
diff --git a/src/views/basicdata/brand/basicdataTripartiteMall.vue b/src/views/basicdata/brand/basicdataTripartiteMall.vue
index 73115466..36330dfa 100644
--- a/src/views/basicdata/brand/basicdataTripartiteMall.vue
+++ b/src/views/basicdata/brand/basicdataTripartiteMall.vue
@@ -88,6 +88,16 @@
           <el-form-item label="三方编码" prop="tripartiteCoding">
             <el-input v-model="form.tripartiteCoding" placeholder="请输入三方编码"/>
           </el-form-item>
+          <el-form-item label="品牌" prop="tripartiteCoding">
+            <el-select v-model="form.brandId" class="m-2" placeholder="请选择品牌" clearable>
+              <el-option
+                v-for="item in brandList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
@@ -103,6 +113,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataTripartiteMall";
+import { getList as getBrandList } from '@/api/basicdata/basicBrand';
 import option from "@/option/basicdata/basicdataTripartiteMall";
 import { mapGetters } from "vuex";
 
@@ -136,6 +147,7 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      brandList:[]
     }
   },
   mounted () {
@@ -168,8 +180,10 @@ export default {
       this.onLoad(this.page);
     },
     handleSubmit () {
+      const submitForm = this.form
+      submitForm.brandName = this.brandList.find(item => item.value == this.form.brandId).label
       if (!this.form.id) {
-        add(this.form).then(() => {
+        add(submitForm).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
@@ -178,7 +192,7 @@ export default {
           });
         });
       } else {
-        update(this.form).then(() => {
+        update(submitForm).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
@@ -278,6 +292,17 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
+      getBrandList().then((res)=>{
+      console.log('res ===>', res)
+      const {code, data: {records}} = res.data
+      if (code !== 200) return
+      this.brandList = records.map(val => {
+          return {
+            value: val.id,
+            label: val.brandName
+          }
+        })
+      })
     }
   }
 };
diff --git a/src/views/reservation/lnventory_list.vue b/src/views/mail/inventory/list.vue
similarity index 100%
rename from src/views/reservation/lnventory_list.vue
rename to src/views/mail/inventory/list.vue
diff --git a/src/views/mail/order/add.vue b/src/views/mail/order/add.vue
new file mode 100644
index 00000000..e68b6528
--- /dev/null
+++ b/src/views/mail/order/add.vue
@@ -0,0 +1,2900 @@
+<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="预约时间:" label-width="100px">
+                <el-date-picker
+                  v-model="form.reservationDate"
+                  type="date"
+                  clearable
+                  placeholder="选择日期时间"
+                  format="YYYY/MM/DD"
+                  value-format="YYYY-MM-DD"
+                >
+                </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>
+  
+            <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="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-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-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-tabs type="border-card">
+          <el-tab-pane label="订单">
+            <el-button class="el-btn-xz" 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
+                  v-if="slotProps.scope.row.resource !== '零担'"
+                  type="primary"
+                  link
+                  icon="el-icon-view"
+                  @click="viewStockArticlePackage(slotProps.scope.row)"
+                  >查看包件
+                </el-text>
+                <el-text
+                  v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
+                  type="primary"
+                  link
+                  icon="el-icon-view"
+                  @click="entryNum(slotProps.scope.row)"
+                  >在库录入
+                </el-text>
+                <el-text
+                  v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
+                  type="primary"
+                  link
+                  icon="el-icon-view"
+                  @click="entryReservationNum(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-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>
+  
+                                        </template>
+                                    </el-table-column>
+                                </el-table> -->
+          </el-tab-pane>
+  
+          <el-tab-pane label="库存品">
+            <el-button class="el-btn-xz" 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>-->
+  
+                <el-text
+                  type="primary"
+                  link
+                  icon="el-icon-edit"
+                  @click="removeStockList(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>
+  
+        <template v-if="orderShow">
+          <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-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"
+              :checkselect="orderSelectList"
+              :loading="loading"
+              @inputTxt="inputscStockArtic"
+              @timeCheck="timescStockArtic"
+              @btnCheck="btnscStockArtic"
+              @selectCheck="selectscStockArtic"
+              @selection="selectionChange"
+            >
+              <template #default="slotProps">
+                <!-- orderSelectList -->
+                <el-text
+                  type="primary"
+                  link
+                  icon="el-icon-edit"
+                  @click="removeStockList(slotProps.scope.row)"
+                  >移除
+                </el-text>
+              </template>
+            </tablecmt>
+  
+            <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>
+        </template>
+  
+        <el-dialog v-model="zeroOrderShow" title="零担品类信息" width="50%" :model="zeroOrderData">
+          <el-row :gutter="24" class="rows">
+            <el-col :xl="4" :lg="7" :md="8" :sm="24">
+              <h3>
+                <span>在库总数：{{ this.obj.handQuantity }}</span>
+              </h3>
+            </el-col>
+          </el-row>
+  
+          <template v-if="zeroOrderData != null">
+            <div v-for="(item, index) in zeroOrderData" :key="index">
+              <el-row :gutter="24" class="rows">
+                <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                  <span>名称：{{ item.firsts }}</span>
+                </el-col>
+                <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                  <span>总数量：{{ item.quantity }} </span>
+                </el-col>
+                <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                  <span>在库数量：{{ item.handQuantity }} </span>
+                </el-col>
+                <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                  <span>冻结数量：{{ item.deliveryQuantity }} </span>
+                </el-col>
+                <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                  <span>出库数量：{{ item.outboundQuantity }} </span>
+                </el-col>
+                <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                  <span
+                    >可用数量：{{
+                      item.handQuantity - item.deliveryQuantity - item.outboundQuantity
+                    }}</span
+                  >
+                  <!--                                <span>可用数量：{{(item.quantity)}}</span>-->
+                </el-col>
+              </el-row>
+              <el-input-number
+                v-if="this.isrReservationEntry"
+                v-model="item.reservationNum"
+                min="0"
+                :max="item.zeroOrderMax"
+                placeholder="请输入预约数量"
+              ></el-input-number>
+              <el-input-number
+                v-else
+                v-model="item.number"
+                min="0"
+                :max="item.quantity"
+                placeholder="请输入预约数量"
+              ></el-input-number>
+              <!--                    <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity "  placeholder="请输入预约数量"></el-input-number>-->
+            </div>
+          </template>
+          <el-form-item style="margin-left: 37%; margin-top: 5px">
+            <el-button
+              v-if="!isrReservationEntry"
+              type="primary"
+              icon="el-icon-circle-close"
+              @click="onSubmitUpdateZeroOrder"
+              >修改(零担订单)
+            </el-button>
+            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
+              >提交(零担订单)
+            </el-button>
+            <el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button>
+          </el-form-item>
+        </el-dialog>
+  
+        <template v-if="stockListShow">
+          <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"
+              :checkselect="inventorySelectList"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionInventoryChange"
+              ref="multipleTable"
+            >
+              <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>
+        </template>
+  
+        <template v-if="isaddvalue">
+          <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
+            <!-- 列表模块 -->
+            <!--                :isselectfun="checkPackage"-->
+            <tablecmt
+              :columnList="columnParcels"
+              :tableData="packageData"
+              :checkselect="packageDataSec"
+              :loading="loading"
+              @selection="selectionPackageChange"
+              @select="tableAllSelection"
+              @cell-mouse-enter="hove"
+            >
+              <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>
+        </template>
+  
+        <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"
+                  />
+                </span>
+                <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"
+                  />
+                </span>
+                <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"
+                  />
+                </span>
+                <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"
+                  />
+                </span>
+                <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"
+                  />
+                </span>
+                <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"
+                  />
+                </span>
+              </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>
+  
+  <script>
+  import {
+    autonomouslySave,
+    update,
+    remove,
+    getReservationInfo,
+    getReservationZeroOrderDetail,
+    getReservationPackageListByOrderId,
+  } from '@/api/distribution/distributionReservation';
+  import {
+    getStockArticleList,
+    getPackageListByStockArticleId,
+    selectStockArticleInfoList,
+    selectUpdateAvailableStockArticle,
+    getZeroOrderDetail,
+  } 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 dayjs from 'dayjs';
+  import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
+  
+  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: 'resource',
+            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: 'reservationNum',
+            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: 'incomingBatch',
+            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: '260',
+            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: [],
+        obj: {},
+        //增值表单输入框对象
+        addvalue: {},
+        costList: [], //字典
+        //增值服务对象
+        addvalueObj: {},
+        //费用列表
+        feeList: [],
+        //楼层
+        floorList: [],
+        //订单行数据
+        orderInfo: {},
+        //服务类型
+        serveType: [],
+        //增加订单弹窗
+        orderShow: false,
+        zeroOrderData: [],
+        zeroOrderShow: false,
+        //是否是预约录入
+        isrReservationEntry: false,
+        // zeroPackageNum:0,
+        //在库订单信息
+        stockArticleInfo: [],
+        //库存品信息
+        inventoryInfo: [],
+        //时段
+        periodOfTimeData: [],
+        //路由订单编号
+        orderIds: '',
+        //预约编号
+        reservationId: '',
+        zeroOrderMax: 0,
+        // 商城名称
+        marketName: '',
+        // 包件复选框列表
+        packageDataSec: [],
+        inventoryData: [],
+        orderData: [],
+        stockListShow: false,
+        isaddvalue: false,
+        packageData: [],
+        packageList: [],
+        inventoryList: [],
+        inventorySelectList: [],
+        orderList: [],
+        orderSelectList: [],
+        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();
+  
+      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: {
+      handleToggleAllSelection() {
+        this.$refs.selecttable.toggleAllSelection();
+      },
+      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.onLoad(this.page);
+      },
+      tableAllSelection() {},
+      //查询出所有的市配订单
+      async handleAddOrder() {
+        this.loading = true;
+        //这里只需要对订单进行正常的搜索即可
+        await this.onLoadOrder(this.page);
+        this.loading = false;
+        this.orderShow = true;
+      },
+      checkOrder(row, index) {
+        if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
+          return false;
+        } else {
+          return true;
+        }
+      },
+      handleAddInventory() {
+        let page = this.page;
+        let params = {};
+        this.query.serviceType = '2';
+        params.marketName = this.marketName;
+        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;
+            console.log('res :>> ', res);
+  
+            // 过滤掉已选择的数量
+  
+            const _inventoryInfo = inventoryList.records;
+            this.inventoryInfo = _inventoryInfo;
+            if (this.inventoryData.length !== 0) {
+              // 获取ids的映射数组
+              const ids = this.inventoryData.map(val => val.id);
+              // 赋值给回显勾选的数组
+              this.inventoryInfo = _inventoryInfo.filter(val => {
+                // 循环获取符合条件的库存品组成数组
+                return !ids.includes(val.id);
+              });
+            }
+            this.loading = false;
+            this.selectionClear();
+            this.stockListShow = true;
+          }
+        );
+        this.query = {};
+        this.inventoryList = [];
+      },
+      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;
+          }
+        });
+      },
+      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;
+            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);
+      },
+      entryReservationNum(row) {
+        this.obj = row;
+        if (this.reservationId) {
+          //查询零担计划数量详情
+          console.log('order------------>', row.id);
+          getReservationZeroOrderDetail(this.reservationId, row.id).then(res => {
+            let a = res.data.data;
+            a.forEach(item => {
+              item.zeroOrderMax =
+                item.handQuantity -
+                item.deliveryQuantity -
+                item.outboundQuantity +
+                item.reservationNum;
+            });
+            this.zeroOrderData = res.data.data;
+            // console.log(res.data.data);
+          });
+        } else {
+          getZeroOrderDetail(row.id).then(res => {
+            if (res.data.data != null) {
+              let a = res.data.data;
+              a.forEach(item => {
+                item.zeroOrderMax = item.handQuantity - item.deliveryQuantity - item.outboundQuantity;
+              });
+              this.zeroOrderData = res.data.data;
+            }
+          });
+        }
+        this.zeroOrderShow = true;
+        this.isrReservationEntry = true;
+      },
+      entryNum(row) {
+        this.obj = row;
+        getZeroOrderDetail(row.id).then(res => {
+          if (res.data.data != null) {
+            this.zeroOrderData = res.data.data;
+          }
+        });
+        this.zeroOrderShow = true;
+        this.isrReservationEntry = false;
+      },
+  
+      // 选择包件信息
+      // selectionPackageChange(list) {
+      //   console.log(list,'list22');
+      //   console.log('-----------<>', list);
+      //   this.packageListInfo=list
+      //   console.log(this.packageListInfo,'packageListInfo');
+      //   if (this.reservationId) {
+      //     this.packageDataSec = list;
+      //   } else {
+      //     //新增
+      //     let a = [];
+      //     list.forEach(item => {
+      //       if (
+      //         item.orderPackageReservationStatus === '10' ||
+      //         item.orderPackageReservationStatusName === '未预约'
+      //       ) {
+      //         a.push(item);
+      //       }
+      //     });
+      //     this.packageDataSec = a;
+      //   }
+      // },
+      // 查看包件
+      // 自动选中
+      selectMatchingRows(val) {
+        console.log(val, '数组');
+        console.log(this.packageData);
+        const selectedIds = val; // 需要匹配选中的ID
+        // const matchedArray = this.packageData.filter(item => selectedIds.includes(item.id));
+        // console.log(matchedArray,"处理好的数据");
+        this.packageData.forEach(item => {
+          if (selectedIds.includes(item.id)) {
+            console.log(
+              item,
+              '包含================================================================>'
+            );
+            this.selectionPackageChange(item);
+          }
+        });
+      },
+  
+      // if (row) {
+      //   this.selectionPackageChange(row)
+      //   console.log(  this.selectionPackageChange(),'12312312312321函数');
+      // }
+      async viewStockArticlePackage(row) {
+        this.loading = true;
+        this.packageList = row.packageList;
+        this.obj = row;
+        let page = this.page;
+        this.toggleAllSelection;
+        console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
+        if (this.reservationId) {
+          const res = await getReservationPackageListByOrderId(
+            this.reservationId,
+            row.id,
+            page.currentPage,
+            page.pageSize
+          );
+          console.log('->>>>>>>>>>>>>>>>>>查看包件', res);
+          if (res.data.data) {
+            this.packageData = res.data.data.data.packageList;
+            let idList = res.data.data.data.reservationPackageList.map(v => {
+              return v.id;
+            });
+            this.packageDataSec = this.packageData.filter(val => idList.includes(val.id));
+          }
+          this.isaddvalue = true;
+          this.loading = false;
+        } else {
+          getPackageListByStockArticleId(page.currentPage, page.pageSize, row.id).then(res => {
+            console.log('res---------------->', res);
+            // console.log(res.data.data.records);
+            if (res.data.data) {
+              this.packageData = res.data.data.records;
+              // 新增默认勾选全部
+              this.packageDataSec = this.packageData;
+            }
+            this.isaddvalue = true;
+            this.loading = false;
+          });
+        }
+      },
+  
+      // 选择包件信息
+      // selectionPackageChange(list) {
+      //   console.log(list,'list22');
+      //   console.log('-----------<>', list);
+      //   if (this.reservationId) {
+      //     this.packageDataSec = list;
+      //   } else {
+      //     //新增
+      //     let a = [];
+      //     list.forEach(item => {
+      //       if (
+      //         item.orderPackageReservationStatus === '10' ||
+      //         item.orderPackageReservationStatusName === '未预约'
+      //       ) {
+      //         a.push(item);
+      //       }
+      //     });
+      //     this.packageDataSec = a;
+      //   }
+      // },
+      // 全选表格新增
+  
+      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';
+            });
+            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() {
+        // this.packageListInfo
+  
+        if (this.packageDataSec.length === 0) {
+          this.$message.warning('请选择包件!!!');
+          return;
+        }
+        this.orderData.forEach(item => {
+          if (item.id === this.obj.id) {
+            item.packageList = this.packageDataSec;
+          }
+        });
+        console.log('this.orderData------------>', this.orderData);
+        this.isaddvalue = false;
+      },
+      onSubmit() {
+        // 日期必填
+        if (!this.form.reservationDate) {
+          this.$message({
+            type: 'warning',
+            message: '预约时间暂未选择',
+          });
+          return;
+        }
+        // 提交按钮
+        //新增预约单
+        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;
+            return;
+          }
+          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;
+          }
+        });
+        console.log('------------------->this.form.inventoryList', this.form.inventoryList);
+        console.log('------------------->this.form.stockArticleList', this.form.stockArticleList);
+  
+        if (
+          JSON.stringify(this.form.inventoryList) === '[]' &&
+          JSON.stringify(this.form.stockArticleList) === '[]'
+        ) {
+          this.$message({
+            type: 'warning',
+            message: '无效的预约计划!',
+          });
+          operation = false;
+          return;
+        }
+        // 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: '操作成功!',
+            });
+          });
+        } else {
+          this.form.reservationStatus = '20';
+          autonomouslySave(this.form).then(() => {
+            this.$message({
+              type: 'success',
+              message: '操作成功!',
+            });
+            this.$router.go(-1);
+          });
+        }
+      },
+      inputsc() {},
+      timesc() {},
+      selectsc() {},
+      btnsc() {},
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 移除包件
+      removeStockArticle(row) {
+        if (this.inventoryData.length == 0 && this.orderData.length == 1 && this.reservationId) {
+          this.$message.warning('如需移除请取消该预约计划!!');
+          return;
+        }
+        this.orderData.forEach((item, index) => {
+          if (item.id === row.id) {
+            this.orderData.splice(index, 1);
+          }
+          console.log(item);
+        });
+        // 当两个列表没有数据时, 清空限制
+        if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = '';
+        // 当列表没有数据时, 表单清空
+        if (this.orderData.length === 0) {
+          this.form.consignee = '';
+          this.form.deliveryAddress = '';
+          this.form.deliveryPhone = '';
+        }
+        console.log('>>>>>>>>>>>>>>>row', row);
+      },
+      removeStockList(row) {
+        if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) {
+          this.$message.warning('最少剩下一个数据');
+          return;
+        }
+        this.inventoryData.forEach((item, index) => {
+          if (item.id === row.id) {
+            this.inventoryData.splice(index, 1);
+          }
+          console.log('item>>>>>>>>>>>', item);
+        });
+        // 当两个列表没有数据时, 清空限制
+        if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = '';
+        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: '操作成功!',
+            });
+          });
+      },
+      beforeClose(done) {
+        done();
+        this.form = {};
+        this.view = false;
+      },
+      selectionChange(list) {
+        this.orderList = list;
+        console.log('list :>> ', list);
+      },
+      // 选择包件信息
+      selectionPackageChange(list) {
+        console.log('掉用了此函数', list);
+        console.log(list, 'list22');
+        console.log('-----------<>', list);
+        this.packageListInfo = list;
+        console.log(this.packageListInfo, 'packageListInfo');
+        if (this.reservationId) {
+          this.packageDataSec = list;
+        } else {
+          //新增
+          let a = [];
+          list.forEach(item => {
+            if (
+              item.orderPackageReservationStatus === '10' ||
+              item.orderPackageReservationStatusName === '未预约'
+            ) {
+              a.push(item);
+            }
+          });
+          this.packageDataSec = a;
+        }
+      },
+      selectionInventoryChange(list) {
+        // if (this.reservationId){
+        console.log('list-----------<>', list);
+        this.inventoryList = list;
+        // }else {
+        //   //新增
+        //   let a = [];
+        //   list.forEach(item=>{
+        //     if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){
+        //       a.push(item);
+        //     }
+        //   })
+        //   this.inventoryList = a;
+        // }
+      },
+      onSubmitUpdateZeroOrder() {
+        console.log('this.obj--------------------->', this.obj);
+        console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
+        console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
+  
+        this.isrReservationEntry = false;
+        let a = this.zeroOrderData;
+        if (a.length > 1) {
+          let b = 0;
+          //计算该品类已使用数量
+  
+          a.forEach(item => {
+            b += item.number;
+          });
+  
+          let f = a.every(item => {
+            console.log('this.number--------------------->', item.number);
+            console.log(
+              'number--------------------->',
+              item.deliveryQuantity + item.outboundQuantity
+            );
+            if (
+              item.number < item.deliveryQuantity + item.outboundQuantity ||
+              item.number > item.quantity
+            ) {
+              return false;
+            }
+            return true;
+          });
+  
+          if (b > this.obj.handQuantity) {
+            this.$message({
+              type: 'error',
+              message: '录入数量超过订单在库数量!',
+            });
+            return;
+          }
+          if (!f) {
+            this.$message({
+              type: 'error',
+              message: '请检查修改数量!',
+            });
+            return;
+          }
+        }
+        updateEntryNum(this.zeroOrderData).then(res => {
+          if (res) {
+            this.$message({
+              type: 'success',
+              message: '操作成功',
+            });
+          }
+        });
+        this.zeroOrderShow = false;
+        console.log('-------------->', this.zeroOrderData);
+      },
+      onSubmitZeroOrder() {
+        if (this.isrReservationEntry) {
+          //零担预约数量录入
+          this.orderData.forEach(item => {
+            if (this.obj.id === item.id) {
+              item.parcelNumberVOS = this.zeroOrderData;
+            }
+          });
+        } else {
+          //在库数量录入
+          let a = this.zeroOrderData;
+          if (a.length > 0) {
+            let n = 0;
+            a.forEach(item => {
+              n += item.number;
+            });
+            if (n > this.obj.handQuantity) {
+              this.$message({
+                type: 'error',
+                message: '录入数量超过订单在库数量!',
+              });
+              return;
+            }
+            let b = a.every(item => {
+              console.log(
+                '最大数量-------------->',
+                item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number
+              );
+              if (
+                item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number >
+                item.quantity
+              ) {
+                return false;
+              }
+              return true;
+            });
+            console.log('----------------->', b);
+            if (!b) {
+              this.$message({
+                type: 'error',
+                message: '请输入正确数量!',
+              });
+              return;
+            }
+          }
+          entryNum(this.zeroOrderData).then(res => {
+            if (res) {
+              this.$message({
+                type: 'success',
+                message: '操作成功',
+              });
+            }
+          });
+          console.log('this.zeroOrderData------------->', this.zeroOrderData);
+        }
+  
+        this.zeroOrderShow = false;
+      },
+      // 增加库存品
+      onSubmitInventory() {
+        if (this.inventoryList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        this.inventoryList.forEach(item => {
+          if (item.reservationNum > item.applyNum) {
+            this.$message.warning('该库存品数量输入有误!!!');
+            return;
+          }
+        });
+        console.log('this.inventoryList :>> ', this.inventoryList);
+        // 检测商场是否选择统一商场
+        let _marketName = '';
+        const _isUnifyMarketName = this.inventoryList.every(value => {
+          if (_marketName === '') _marketName = value.marketName;
+          return _marketName === value.marketName;
+        });
+        if (!_isUnifyMarketName) {
+          this.$message.warning('请选择统一商场!!!');
+          return;
+        }
+        this.marketName = _marketName;
+        console.log('this.inventoryList :>> ', this.inventoryList);
+        this.inventoryData = [...this.inventoryData, ...this.inventoryList];
+  
+        this.stockListShow = false;
+      },
+      /**
+       * 增加订单提交
+       */
+      onSubmitOrder() {
+        console.log('orderList-------------》', this.orderList);
+        if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
+        const list = [...this.orderList, ...this.orderData];
+        let _name = list[0].customerName;
+        let _address = list[0].customerAddress;
+        let _phone = list[0].customerTelephone;
+        let _marketName = list[0].mallName;
+  
+        // 循环查看数据是否符合要求
+        const isRturn = list.every(item => {
+          if (item.mallName !== _marketName) {
+            this.$message.warning('请选择统一商场!!!');
+            return false;
+          }
+          if (
+            item.customerName !== _name ||
+            item.customerAddress !== _address ||
+            item.customerTelephone !== _phone
+          ) {
+            this.$message.warning('请选择统一顾客订单!!!');
+            return false;
+          }
+          return true;
+        });
+  
+        if (!isRturn) return;
+  
+        // 设置商场名称
+        if (this.marketName === '') this.marketName = _marketName;
+        // this.marketName = list[0].marketName;
+  
+        this.form.consignee = _name;
+        this.form.deliveryAddress = _address;
+        this.form.deliveryPhone = _phone;
+  
+        //这里需要对选择的订单进行筛选
+        const _ids = this.orderData.map(val => val.id);
+        this.orderData = [
+          ...this.orderData,
+          ...this.orderList.filter(item => !_ids.includes(item.id)),
+        ];
+        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('res123123------------>', res);
+          const data = res.data.data;
+          console.log('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.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 {
+          this.query[row.prop] = index;
+        }
+        this.onLoadOrder(this.page);
+      },
+      async onLoadOrder(page, params = {}) {
+        this.query.typeService = 2;
+        this.query.genre = '1';
+        this.query.marketName = this.marketName;
+        if (this.orderData.length !== 0) {
+          this.query.orderIds = this.orderData.map(val => val.id).join(',');
+        }
+        const res = await selectStockArticleInfoList(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(params, this.query)
+        );
+        const { records, total } = res.data.data;
+  
+        this.stockArticleInfo = records;
+        this.stockArticleInfo.forEach((item, index) => {
+          //检查订单是否冻结
+          this.checkOrder(item, index);
+          this.page.total = total;
+        });
+        if (this.orderData.length !== 0) {
+          const ids = this.orderData.map(val => val.id);
+          this.stockArticleInfo = this.stockArticleInfo.filter(val => !ids.includes(val.id));
+        }
+        this.orderList = [];
+        return null;
+      },
+  
+      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>>>>>>>>', reservation);
+            // 添加限制的商场名称
+            this.marketName = reservation.mallName;
+            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;
+      },
+    },
+  };
+  </script>
+  <style lang="scss">
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
+  
+  input[type='number'] {
+    -moz-appearance: textfield;
+  }
+  </style>
+  
+  <style lang="scss" scoped>
+  .el-btn-xz {
+    width: 68px;
+    height: 26px;
+    border: 1px solid;
+    margin-bottom: 8px;
+    border-radius: 4px;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/reservation/order_list.vue b/src/views/mail/order/list.vue
similarity index 99%
rename from src/views/reservation/order_list.vue
rename to src/views/mail/order/list.vue
index 2b12e8aa..69e2f5e9 100644
--- a/src/views/reservation/order_list.vue
+++ b/src/views/mail/order/list.vue
@@ -969,12 +969,11 @@ export default {
             && ele.customerTelephone !== item.customerTelephone
             && ele.customerAddress !== item.customerAddress ).length >= 1
       );
-      console.log("notEqualFlag=====",notEqualFlag);
       // 返回true,说明有不同
       // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/order_listFrom',
+          path: '/mail/order/add',
           query:{
             id: this.ids,
           }
diff --git a/src/views/reservation/reservation_list.vue b/src/views/mail/reservation/list.vue
similarity index 92%
rename from src/views/reservation/reservation_list.vue
rename to src/views/mail/reservation/list.vue
index 85d2ebe5..3aec78f7 100644
--- a/src/views/reservation/reservation_list.vue
+++ b/src/views/mail/reservation/list.vue
@@ -44,30 +44,8 @@
                 <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
                   >添加预约
                 </el-button>
-                <el-button
-                  v-if="this.queryA.reservationStatus === '1'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleConfirmReservations"
-                  plain
-                  >批量确认
-                </el-button>
-                <el-button
-                  v-if="this.queryA.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleStockUp()"
-                  plain
-                  >批量转备货
-                </el-button>
-                <el-button
-                  v-if="this.queryA.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDeliverys"
-                  plain
-                  >批量转配送
-                </el-button>
+           
+             
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain
                   >导出
                 </el-button>
@@ -102,14 +80,7 @@
                     @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"
@@ -118,12 +89,7 @@
                     @click="cancelReservation(slotProps.scope)"
                     >取消预约
                   </el-text>
-                  <el-text
-                    v-if="this.queryA.reservationStatus === '1' ? true : false"
-                    size="small"
-                    @click="confirmReservation(slotProps.scope)"
-                    >确认预约
-                  </el-text>
+              
                 </template>
               </tablecmt>
             </template>
@@ -137,41 +103,7 @@
             <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.queryB.reservationStatus === '1'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleConfirmReservations"
-                  plain
-                  >批量确认
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleStockUp()"
-                  plain
-                  >批量转备货
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDeliverys"
-                  plain
-                  >批量转配送
-                </el-button>
-                <el-button
-                  v-if="this.queryB.reservationStatus === '2'"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="batchPrintData"
-                  plain
-                  >批量打印
-                </el-button>
+                
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(2)" plain
                   >导出
                 </el-button>
@@ -337,7 +269,7 @@
 
 <script>
 import {
-  getList,
+  getReservationList,
   getDetail,
   add,
   update,
@@ -1281,26 +1213,10 @@ export default {
     },
     handleAdd() {
       this.$router.push({
-        path: '/distribution/reservation/reservationAddFrom',
-      });
-    },
-    handleEdit(row) {
-      console.log(row);
-      this.$router.push({
-        path: '/distribution/reservation/reservationAddFrom',
-        query: {
-          reservationId: row.id,
-        },
+        path: '/mail/order/add',
       });
     },
-    aaa() {
-      this.queryA.reservationStatus = '1';
-      this.onLoad(this.page);
-    },
-    bbb() {
-      this.queryB.reservationStatus = '2';
-      this.onLoad(this.page);
-    },
+
     handleView(row) {
       this.title = '查看';
       this.view = true;
@@ -1455,7 +1371,7 @@ export default {
         query.reservationStatus = this.queryA.reservationStatus || '1';
       }
       // if (this.queryA.reservationStatus)
-      getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+      getReservationList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
         const data = res.data.data;
         console.log('>>>>>>>', data);
         if (data.records) {
@@ -1465,11 +1381,7 @@ export default {
                 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;
@@ -1487,7 +1399,6 @@ export default {
               }
             });
             this.periodOfTimeData.forEach(d => {
-              console.log('11111111111');
               if (item.periodOfTime === d.dictKey) {
                 item.periodOfTime = d.dictValue;
               }
diff --git a/src/views/reservation/order_listFrom.vue b/src/views/reservation/order_listFrom.vue
deleted file mode 100644
index 65245192..00000000
--- a/src/views/reservation/order_listFrom.vue
+++ /dev/null
@@ -1,1170 +0,0 @@
-<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="deliveryAddress" 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>
-
-                    <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="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-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="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="配送方式:" prop="serveType" label-width="100px">
-                            <!--                            v-for="item in this.deliveryWayData"-->
-                            <el-radio-group v-model="form.deliveryWay">
-                                <el-radio :label="'1'"
-                                          :value="'1'">送货&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="collectFee" label-width="100px">
-                            <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="加&emsp;&emsp;急:" prop="deliveryAddress" label-width="100px">
-                            <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>
-                            <!--                            :label="item.dictValue"-->
-                        </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-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-row>
-            </el-form>
-
-
-            <el-tabs type="border-card">
-                <el-tab-pane label="订单">
-                    <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
-                    <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-table-column>
-                        </template>
-                        <el-table-column label="包件数量" type="index" width="100px">
-                            <template #="{row}">
-                                <el-input v-model="row.reservationNum" type="number" :disabled="true"
-                                          placeholder="请输入内容"></el-input>
-                            </template>
-                        </el-table-column>
-                        <!-- 操作栏模块 -->
-                        <el-table-column prop="menu" label="操作" :width="220" align="center">
-                            <template #="{row}">
-                                <el-button type="primary" link icon="el-icon-view"
-                                           @click="viewStockArticlePackage(row)">查看包件
-                                </el-button>
-
-                                <!--                                2023 07 25 取消增值服务  -->
-                                <!--                                <el-button type="primary" link icon="el-icon-delete" @click="addvalueServe(row)">增值服务-->
-                                <!--                                </el-button>-->
-                                <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
-                                </el-button>
-
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-tab-pane>
-
-                <el-tab-pane label="库存品">
-                    <el-button link @click="handleAddInventory">新 增</el-button>
-                    <el-table ref="table"
-                              v-loading="loading"
-                              :data="inventoryData"
-                              :height="height"
-                              style="width: 100%"
-                              :border="option.border">
-                        <!--                    <el-table-column type="selection" v-if="stockList.selection" width="55" align="center"></el-table-column>-->
-                        <el-table-column v-if="option.index" label="序号" type="index" width="80px"
-                                         align="center"></el-table-column>
-                        <template v-for="(item,index) in option.stockListColumn">
-                            <el-table-column v-if="item.hide!==true"
-                                             :prop="item.prop"
-                                             :label="item.label"
-                                             :width="item.width"
-                                             :key="index">
-                            </el-table-column>
-                        </template>
-                        <el-table-column label="预约数量" type="index" width="100px">
-                            <template #="{row}">
-                                <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="menu" label="操作" :width="220" align="center">
-                            <template #="{row}">
-                                <el-button type="primary" link icon="el-icon-edit" @click="removeStockList(row)">移除
-                                </el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-tab-pane>
-
-            </el-tabs>
-            <el-form-item style="margin-left: 45%;margin-top: 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-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-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>
-
-
-                <el-table ref="table"
-                          v-loading="loading"
-                          @selection-change="selectionChange"
-                          :data="stockArticleInfo"
-                          :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 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>
-                <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="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>
-                <el-table ref="table"
-                          v-loading="loading"
-                          @selection-change="selectionChange"
-                          :data="inventoryInfo"
-                          :height="height"
-                          style="width: 90%;height: 100%"
-                          :border="option.border">
-                    <el-table-column type="selection" v-if="option.selection" width="55"
-                                     align="center"></el-table-column>
-                    <el-table-column v-if="option.index" label="序号" type="index" width="80px"
-                                     align="center"></el-table-column>
-                    <template v-for="(item,index) in option.stockListColumn">
-                        <el-table-column v-if="item.hide!==true"
-                                         :prop="item.prop"
-                                         :label="item.label"
-                                         :width="item.width"
-                                         :key="index">
-                        </el-table-column>
-                    </template>
-                    <el-table-column label="预约数量" type="index" width="100px">
-                        <template #="{row}">
-                            <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <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"
-                    :before-close="handleClose">
-                <!-- 列表模块 -->
-                <el-table ref="table" v-loading="loading"
-                          @selection-change="selectionChange"
-                          :data="packageData"
-                          :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="60" align="center">
-                    </el-table-column>
-                    <template v-for="(item,index) in option.columnParcels">
-                        <!-- table字段 -->
-                        <el-table-column v-if="item.hide!==true"
-                                         :prop="item.prop"
-                                         :label="item.label"
-                                         :width="item.width"
-                                         :key="index">
-                        </el-table-column>
-                    </template>
-                    <!-- 操作栏模块 -->
-                    <el-table-column prop="menu" label="操作" :width="220" align="center">
-                        <template #="{row}">
-                            <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-                            <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
-                            <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-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-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;"/>
-                     </span>
-                            <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;"/>
-                     </span>
-                            <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;"/>
-                     </span>
-                            <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;"/>
-                     </span>
-                            <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;"/>
-                     </span>
-                            <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;"/>
-                     </span>
-                        </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>
-
-
-<script>
-  import { add, getReservationInfo, remove, update } from '@/api/distribution/distributionReservation';
-  import {
-    addIncrement,
-    getStockArticleList,
-    selectStockArticleList
-  } from '@/api/distribution/distributionStockArticle';
-  import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
-  import { getInventoryList } from '@/api/distribution/distributionStockList';
-  import { getListOwn } from '@/api/distribution/distributionParcelList';
-  // import option from "@/option/distribution/distributionDelivery";
-  import option from '@/option/distribution/distributionStockArticle';
-  import { mapGetters } from 'vuex';
-  import { getDictionaryBiz } from '@/api/system/dict';
-
-  export default {
-    data() {
-      return {
-        height: 0,
-        // 弹框标题
-        title: '',
-        // 是否展示弹框
-        box: false,
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-        // 查询信息
-        query: {},
-        // 分页信息
-        page: {
-          currentPage: 1,
-          pageSize: 30,
-          total: 40
-        },
-        // 表单数据
-        form: {},
-        // 选择行
-        selectionList: [],
-        // 表单配置
-        option: option,
-        // 表单列表
-        data: [],
-        //增值服务弹窗
-        dialogVisible: false,
-        textarea: '',
-        //增值服务字典列表
-        addvalueServeTypeData: [],
-        //配送方式字典列表
-        deliveryWayData: [],
-        //配送类型字典列表
-        deliveryTypeData: [],
-        //增值服务列表
-        addvalueServeType: [],
-        //增值表单输入框对象
-        addvalue: {},
-        costList: [], //字典
-        //增值服务对象
-        addvalueObj: {},
-        //费用列表
-        feeList: [],
-        //楼层
-        floorList: [],
-        //订单行数据
-        orderInfo: {},
-        //服务类型
-        serveType: [],
-        //增加订单弹窗
-        orderShow: false,
-        //在库订单信息
-        stockArticleInfo: [],
-        //库存品信息
-        inventoryInfo: [],
-        //时段
-        periodOfTimeData: [],
-        whetherData:[],
-        //路由订单编号
-        orderIds: '',
-        //预约编号
-        reservationId: '',
-        inventoryData: [],
-        orderData: [],
-        stockListShow: false,
-        isaddvalue: false,
-        packageData: [],
-        packageList: [],
-        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' }
-          ],
-        },
-      };
-    },
-    created() {
-      this.$watch(
-        () => this.$route.params,
-        () => {
-          this.fetchData();
-        },
-        // 组件创建完后获取数据，
-        // 此时 data 已经被 observed 了
-        { immediate: true }
-      );
-    },
-    mounted() {
-      this.init();
-      this.onLoad(this.page);
-      this.getDictionary();
-    },
-    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;
-        }
-      },
-      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.onLoad(this.page);
-      },
-      //查询出所有的市配订单
-      handleAddOrder() {
-        console.log('$$$$$$', this.reservationId);
-        if (this.reservationId) {
-          //这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息
-
-          this.query.typeService = 2;
-          this.query.genre = '1';
-          //查询所有订单列表信息
-
-          let page = this.page;
-          let params = {};
-          selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-            console.log('$$$$$$$$>', res);
-
-            let orderData = res.data.data;
-            console.log('$$$$$$$$', orderData);
-            orderData.records.forEach((item, index) => {
-              item.reservationNum = item.handQuantity;
-              // if ()
-              //订单已预约
-              // if (item.reservationStatus !== '30' ){
-              //   a.push(item)
-              // }
-            });
-            this.page.total = orderData.total;
-            this.stockArticleInfo = orderData;
-            this.loading = false;
-            this.selectionClear();
-          });
-        } else {
-          this.query.typeService = 2;
-          this.query.genre = '1';
-          let page = this.page;
-          let params = {};
-          selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-            let data = res.data.data;
-            let a = [];
-            console.log('$$$$$$$$', data);
-            data.records.forEach((item, index) => {
-              item.reservationNum = item.handQuantity;
-              //订单已预约
-              if (item.reservationStatus !== '30') {
-                a.push(item);
-              }
-            });
-            console.log('$$$$$$$$', a);
-            this.page.total = data.total;
-            this.stockArticleInfo = a;
-            this.loading = false;
-            this.selectionClear();
-          });
-          this.selectionList = [];
-        }
-
-        this.orderShow = true;
-      },
-      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;
-          this.loading = false;
-          this.selectionClear();
-        });
-        this.query = {};
-        this.selectionList = [];
-        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;
-          }
-        });
-
-      },
-      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;
-            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;
-        console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
-        this.isaddvalue = true;
-        getListOwn('1', '10', { stockArticleId: row.id }).then(res => {
-          const packages = res.data.data;
-          console.log('>>>>>>>', packages);
-          this.packageData = packages.records;
-          this.loading = false;
-        });
-      },
-      //搜索订单
-      searchStockArticle() {
-        let params = {};
-        let page = this.page;
-        this.query.typeService = 2;
-        this.query.genre = 1;
-        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';
-          });
-          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() {
-        this.orderData.forEach(item => {
-          item.reservationNum = 0;
-          this.selectionList.forEach(list => {
-            if (item.id === list.stockArticleId) {
-              item.reservationNum += list.quantity;
-            }
-          });
-          item.packageList = this.selectionList;
-        });
-        this.isaddvalue = false;
-      },
-      onSubmit() {
-        //新增预约单
-        let orderIds = [];
-        let inventoryIds = [];
-        let inventoryList = [];
-        let stockArticleList = [];
-        let operation = true;
-        this.orderData.forEach(item => {
-          if (item.reservationNum === '0') {
-            this.$message({
-              type: 'warning',
-              message: '请选择' + item.orderCode + '包件数量!'
-            });
-            operation = false;
-          }
-          orderIds.push(item.id);
-          item.reservationNum = item.reservationNum;
-          stockArticleList.push(item);
-        });
-        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);
-        });
-        orderIds.join(',');
-        inventoryIds.join(',');
-        this.form.stockArticleIds = orderIds.toString();
-        this.form.inventoryIds = inventoryIds.toString();
-        this.form.inventoryList = inventoryList;
-        this.form.stockArticleList = stockArticleList;
-        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.join(',');
-        //服务号
-
-        // this.form.packageList = this.packageList;
-        console.log('>>>>>>>>', this.form);
-        if (operation) {
-          if (this.reservationId) {
-            update(this.form).then(() => {
-              this.$router.go(-1);
-              this.$message({
-                type: 'success',
-                message: '操作成功!'
-              });
-            });
-          } else {
-            add(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);
-        });
-        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);
-      },
-      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: '操作成功!'
-            });
-          });
-      },
-      beforeClose(done) {
-        done();
-        this.form = {};
-        this.view = false;
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-
-      // 增加库存品
-      onSubmitInventory() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        if (this.orderData.length) {
-          this.selectionList.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() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        let a = [];
-        a = this.selectionList;
-        let b = false;
-        this.selectionList.forEach(item => {
-          a.forEach(a => {
-            if (item.customerName !== a.customerName || item.customerTelephone !== a.customerTelephone || item.customerAddress !== a.customerAddress) {
-              b = true;
-            }
-          });
-        });
-        if (b) {
-          this.$message({
-            type: 'warning',
-            message: '请选择同一顾客订单!'
-          });
-          return;
-        }
-        if (this.orderData.length >= 1) {
-          let flag = false;
-          this.selectionList.some(i => {
-            //过滤选择数据中不是同一用户的数据
-            let b = this.orderData.filter(a => {
-              return i.customerName !== a.customerName && i.customerTelephone !== a.customerTelephone && i.customerAddress !== a.customerAddress;
-            }).length >= 1;
-            console.log('>>>>>>>>>>>>>>>', b);
-            //控制选择记录是否插入订单列表中
-            let a = this.orderData.filter((ele) => ele.id == i.id).length >= 1;
-
-            if (!b) {
-              if (!a) {
-                this.orderData.push(i);
-              } else {
-                flag = true;
-              }
-            }
-          });
-          if (flag) {
-            this.$message({
-              type: 'warning',
-              message: '请选择同一顾客订单!'
-            });
-          }
-        } else {
-          this.orderData = this.selectionList;
-          let a = 0;
-          this.orderData.forEach(item => {
-            if (item.collectFee) {
-              a += parseInt(item.collectFee);
-            }
-          });
-          this.form.collectFee = a;
-        }
-        this.orderShow = false;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.query = {};
-        // this.$refs.table.clearSelection();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-        this.onLoad(this.page);
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-        this.onLoad(this.page);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        this.form.deliveryType = '1';
-        this.form.deliveryWay = '1';
-        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) {
-          getReservationInfo(this.reservationId).then(res => {
-            const reservation = res.data.data;
-            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;
-
-
-      }
-    }
-
-  };
-</script>
-<style>
-
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-
-    input[type="number"] {
-        -moz-appearance: textfield;
-    }
-</style>
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index e9763ebb..45bec5d7 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -260,6 +260,18 @@ export default {
           fixed: false,
           sortable: true,
         },
+
+        {
+          prop: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
         {
           prop: 'orderPackageGroundingStatusName',
           label: '上架状态',
@@ -511,6 +523,22 @@ export default {
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
+
+      getDictionaryBiz('order_package_code').then(res => {
+        this.distributionType = res.data.data;
+        this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
+
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
     },
     searchHide() {
       this.search = !this.search;