diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 34e573b4..c5e0ac3a 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -40,7 +40,7 @@
             <!-- <el-text class="mx-1">{{ column.label }}</el-text> -->
             <el-input
               v-if="column.type == 2 || column.type == 13"
-              v-model="column.values"
+              v-model.trim="column.values"
               clearable
               :placeholder="`请输入${column.label}`"
               @change="inputchange($event, column)"
@@ -116,7 +116,7 @@
             <el-input
               @blur="handleNumberRange(column, scope.row)"
               v-if="column.type == 10"
-              v-model="scope.row[column.prop]"
+              v-model.trim="scope.row[column.prop]"
               type="number"
               :min="0"
               :max="scope.row.residueNumber"
@@ -350,6 +350,8 @@ function handleCheckSelect(select: []) {
         selecttable.value.toggleRowSelection(item, true);
       }
     });
+  } else {
+    selecttable.value.clearSelection();
   }
 }
 function godowns(url) {
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 86759b17..ed49b168 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -8,7 +8,7 @@
         <!-- 表单内容 -->
         <el-form label-width="80px">
           <!-- 仓库节点 -->
-          <el-steps finish-status="success" :active="details.nodeInfoData.length" space="300px">
+          <el-steps finish-status="success" :active="details.active" space="300px">
             <el-step v-for="(item, index) in details.nodeInfoData" :key="item">
               <template #icon>
                 <el-icon size="20px" v-if="index === 0"><LocationFilled /></el-icon>
@@ -275,6 +275,7 @@
 
               <!-- 列表模块 -->
               <tablecmt
+                ref="oldColumnListNode"
                 class="columnList"
                 :columnList="details.columnList"
                 :tableData="details.data"
@@ -362,7 +363,7 @@
 
               <!-- 控件 -->
               <div style="margin-bottom: 10px" class="flex-c-sb">
-                <el-button type="text" class="pointer" @click="handleRemoveWaybill">
+                <el-button type="text" class="pointer" @click="handleRemoveWaybill(index)">
                   <el-icon><CaretLeft /></el-icon>
                   移除调度池
                 </el-button>
@@ -375,6 +376,7 @@
               </div>
               <tablecmt
                 class="columnList"
+                ref="newColumnListNode"
                 :columnList="details.newColumnList"
                 :tableData="item.data"
                 :loading="item.loading"
@@ -407,7 +409,7 @@ import {
   postFindWarehouseListByName,
   postFindAllOrderList,
 } from '@/api/distribution/AddVehicleStowage';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useStore } from 'vuex';
 
@@ -416,6 +418,7 @@ const nodeInfokeys = nodeInfoColumnList.slice(1).map(val => val.prop);
 
 // 获取路由实例
 const $router = useRouter();
+const $route = useRoute();
 
 // vuex 实例
 const $store = useStore();
@@ -522,6 +525,20 @@ const details = reactive<any>({
   /** 页面信息 */
   pageInfo: {},
   options: [],
+  /** 当前页面类型 -- 1: 新增; 2: 编辑 */
+  pageType: 1,
+  /** 编辑模式下当前仓的位置索引 */
+  warehouseIndex: computed(() => {
+    if (Number(details.pageType) === 1) return 0;
+    else if (Number(details.pageType) === 2) return 0;
+  }),
+  /** 步骤条激活位置 */
+  active: computed(() => {
+    if (Number(details.pageType) === 1) return details.nodeInfoData.length;
+    else if (Number(details.pageType) === 2) return 0;
+  }),
+  /** 被选中的orderCode组成的list */
+  orderCodeList: [],
 });
 
 const {
@@ -543,6 +560,9 @@ const {
 // 列表组件实例 -- 节点信息
 const nodeInfoRef = ref(null);
 
+const oldColumnListNode = ref();
+const newColumnListNode = ref();
+
 /** vuex */
 const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
 console.log('permission :>> ', permission);
@@ -570,6 +590,20 @@ onMounted(() => {
   setTabelHeight();
 });
 
+// 清空复选框
+const clearSelectionList = () => {
+  details.selectionList = [];
+  console.log('newColumnListNode :>> ', newColumnListNode);
+  console.log('oldColumnListNode :>> ', oldColumnListNode);
+  newColumnListNode.value.forEach(val => {
+    console.log('val :>> ', val);
+    val.handleCheckSelect([]);
+  });
+  oldColumnListNode.value.forEach(val => {
+    val.handleCheckSelect([]);
+  });
+};
+
 /** 设置节点费用禁用 */
 const handleEditForbidden = (_arr: []) => {
   if (_arr.length === 0) return;
@@ -855,17 +889,31 @@ const handleAddWaybill = (index: number) => {
     });
   }
   details.nodeInfoData[index].data = details.selectionList;
+  details.orderCodeList = [
+    ...new Set([
+      ...details.orderCodeList,
+      ...details.selectionList.map(val => val.orderCode + ',' + val.waybillNo),
+    ]),
+  ];
+  console.log('details.orderCodeList :>> ', details.orderCodeList);
+
+  const orderCodes = details.selectionList.map(val => val.orderCode);
+  clearSelectionList();
+  details.page.pageNum = 1;
+  initOriginWarehouseOrder({ orderCodes: details.orderCodeList });
 };
 
 /** 移除调度池 */
 const handleRemoveWaybill = (index: number) => {
   const _node = details.nodeInfoData[index];
+  console.log('details.nodeInfoData[index] :>> ', details.nodeInfoData[index]);
   if (!_node.nodeName || !_node.nodeId) {
     return ElMessage({
       type: 'warning',
       message: '未选择目的仓或目的仓信息异常',
     });
   }
+  clearSelectionList();
 };
 </script>
 
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 713bb94b..526f0ebe 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -705,7 +705,10 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
 
 /** 新增配载 */
 const handleAdd = () => {
-  $router.push({ path: '/distribution/artery/AddVehicleStowage' });
+  $router.push({
+    path: '/distribution/artery/AddVehicleStowage',
+    query: { name: '新增配载', type: 1 },
+  });
 };
 </script>
 
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 668ed5b0..f5992fa4 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -3139,33 +3139,48 @@ export default {
       //  this.wid= row.id
       // this.getWrapdetails(this.wpage)
     },
+    handleOne(row) {
+      console.log('签收>>>>>>>>>>', row);
+      this.loading = true;
+      this.$confirm('确认一键装车？')
+    .then(_ => {
+
+        let data = {};
+        data.reservationId = row.id;
+        data.deliveryId = this.deliverydata.id;
+        console.log('------------->data', data);
+        getOneclick(data).then(res => {
+          this.$message.success(res.data.msg);
+          this.onLoad();
+        });
+      })
+              .catch(_ => {})
+              .finally(()=>{
+                this.loading = false;
+
+              });
+
+    },
     //一键签收
     handleSignone(row) {
       console.log('一键签收222>>>>>>>>>>', row);
+      if (row.loadingStatus != '已装车'){
+        ElMessage({
+          message: '请先进行装车',
+          type: 'warning',
+        });
+        return;
+      }
       this.reservationId = row.reservationId; //存储当前行的ID
       this.signtitle = '一键签收';
       this.signform = row;
       this.TcForm = row;
+
       this.signBox = true;
     },
     inventoryDetail(row) {
       console.log('一键签收当前行参数>>>>>>>>>>', row);
     },
-    handleOne(row) {
-      console.log('签收>>>>>>>>>>', row);
-      this.$confirm('确认一键装车？')
-        .then(_ => {
-          let data = {};
-          data.reservationId = row.id;
-          data.deliveryId = this.deliverydata.id;
-          console.log('------------->data', data);
-          getOneclick(data).then(res => {
-            this.$message.success(res.data.msg);
-            this.onLoad();
-          });
-        })
-        .catch(_ => {});
-    },
     getWrapdetails(page) {
       let params = {};
       params.reservationId = this.wid;
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index cd7dfd54..24bd0583 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -759,64 +759,83 @@ export default {
 
       const idList= this.selectionList.map(item=>{
         console.log('>>>>>>>>>',item);
-        return{id:item.id,reservationCode:item.reservationCode,client:item.consignee}
+        return item.id;
       })
 
-      const _arr = [];
-              console.log(idList);
-      if (idList.length > 0){
-        // this.fullscreenLoading = true;
-        // this.dialogVisible = true;
-
-        idList.forEach(item=>{
-         return  _arr.push(handlePicture(item.id));
-        })
-
-
-        console.log('arr>>>>>>>>>>>>>>>>>>>>',_arr);
-        function delayedTimer() {
-          console.log('Delayed timer executed!');
-        }
-        const timerId = setTimeout(delayedTimer, 500);
-        Promise.all(_arr).then((response)=>{
-
-           console.log('response>>>>>>>>>>>>>>>>>>>>>',response);
-          response.forEach((res, index) =>{
-            console.log('res>>>>>>>>>>>>>>>>>>>>>',res.data);
-            if (res.data.size > 0){
-              const _item = idList[index];
-              const blob = new Blob([res.data], {type: 'application/zip'});
-              let a = document.createElement("a");
-              a.href = window.URL.createObjectURL(blob);
-              // a.href = 'http://192.168.10.25:2888/D:/Test';
-              a.download = _item.client +'-'+_item.reservationCode  +".zip";
-              // a.download = 'aaa' + ".zip";
-              a.style.display = "none";
-              document.body.appendChild(a);
-              a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
-              a.remove();
-            }
-          })
-           for (let i = 0; i < 100; i++) {
-             this.fileSize = i;
-           }
-           // this.dialogVisible = false;
-          setTimeout(() => {
-            clearTimeout(timerId);
-            console.log('延迟执行完成');
-            this.fullscreenLoading = false;
+      console.log("ids-------------->",idList);
+      handlePicture(idList.join(",")).then(res=>{
+              if (res.data.size > 0){
+                // const _item = this.selectionList[index];
+                const blob = new Blob([res.data], {type: 'application/zip'});
+                let a = document.createElement("a");
+                a.href = window.URL.createObjectURL(blob);
+                // a.href = 'http://192.168.10.25:2888/D:/Test';
+                // a.download = _item.client +'-'+_item.reservationCode  +".zip";
+                a.download = (new Date()).valueOf() + ".zip";
+                a.style.display = "none";
+                document.body.appendChild(a);
+                a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
+                a.remove();
+              }
+      })
 
-            this.$notify({
-              title: '提示',
-              message: ('i', { style: 'color: teal'}, '开始下载...')
-            });
-          }, 3000);
-         })
 
+      // const _arr = [];
+      //         console.log(idList);
+      // if (idList.length > 0){
+      //   // this.fullscreenLoading = true;
+      //   // this.dialogVisible = true;
+      //
+      //   idList.forEach(item=>{
+      //
+      //    return  _arr.push(handlePicture(item.id));
+      //   })
+      //
+      //
+      //   console.log('arr>>>>>>>>>>>>>>>>>>>>',_arr);
+      //   function delayedTimer() {
+      //     console.log('Delayed timer executed!');
+      //   }
+      //   const timerId = setTimeout(delayedTimer, 500);
+      //   Promise.all(_arr).then((response)=>{
+      //
+      //      console.log('response>>>>>>>>>>>>>>>>>>>>>',response);
+      //     response.forEach((res, index) =>{
+      //       console.log('res>>>>>>>>>>>>>>>>>>>>>',res.data);
+      //       if (res.data.size > 0){
+      //         const _item = idList[index];
+      //         const blob = new Blob([res.data], {type: 'application/zip'});
+      //         let a = document.createElement("a");
+      //         a.href = window.URL.createObjectURL(blob);
+      //         // a.href = 'http://192.168.10.25:2888/D:/Test';
+      //         a.download = _item.client +'-'+_item.reservationCode  +".zip";
+      //         // a.download = 'aaa' + ".zip";
+      //         a.style.display = "none";
+      //         document.body.appendChild(a);
+      //         a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
+      //         a.remove();
+      //       }
+      //     })
+      //      for (let i = 0; i < 100; i++) {
+      //        this.fileSize = i;
+      //      }
+      //      // this.dialogVisible = false;
+      //     setTimeout(() => {
+      //       clearTimeout(timerId);
+      //       console.log('延迟执行完成');
+      //       this.fullscreenLoading = false;
+      //
+      //       this.$notify({
+      //         title: '提示',
+      //         message: ('i', { style: 'color: teal'}, '开始下载...')
+      //       });
+      //     }, 3000);
+      //    })
+      //
 
         // 在 3 秒之后，自动清除定时器
 
-      }
+      // }
 
 
 
diff --git a/src/views/mail/order/add.vue b/src/views/mail/order/add.vue
index 72380b26..83bcd030 100644
--- a/src/views/mail/order/add.vue
+++ b/src/views/mail/order/add.vue
@@ -2,11 +2,11 @@
   <basic-container>
     <div class="avue-crud">
       <el-form
-        ref="form"
-        :model="form"
-        prop="consignee"
-        label-width="80px"
-        :rules="reservationRules"
+              ref="form"
+              :model="form"
+              prop="consignee"
+              label-width="80px"
+              :rules="reservationRules"
       >
         <el-row>
           <el-col :span="10">
@@ -17,12 +17,12 @@
           <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"
+                      v-model="form.reservationDate"
+                      type="date"
+                      clearable
+                      placeholder="选择日期时间"
+                      format="YYYY/MM/DD"
+                      value-format="YYYY-MM-DD"
               >
               </el-date-picker>
             </el-form-item>
@@ -38,7 +38,7 @@
             <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;
+                >{{ item.dictValue }}&emsp;
                 </el-radio>
               </el-radio-group>
               <!--                            :label="item.dictValue"-->
@@ -95,7 +95,7 @@
               <!--                            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;
+                >{{ item.dictValue }}&emsp;
                 </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -110,7 +110,7 @@
             <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;
+                >{{ item.dictValue }}&emsp;
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
@@ -128,46 +128,46 @@
         <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"
+                  :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)"
-                >查看包件
+                      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)"
-                >在库录入
+                      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)"
-                >预约录入
+                      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)"
-                >移除
+                      type="primary"
+                      link
+                      icon="el-icon-edit"
+                      @click="removeStockArticle(slotProps.scope.row)"
+              >移除
               </el-text>
             </template>
           </tablecmt>
@@ -185,7 +185,7 @@
                                                          :label="item.label"
                                                          :width="item.width"
                                                          :key="index">
-  
+
                                         </el-table-column>
                                     </template>
                                     <el-table-column prop="menu" label="操作" :width="220" align="center">
@@ -195,7 +195,7 @@
                                             </el-button>
                                             <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
                                             </el-button>
-  
+
                                         </template>
                                     </el-table-column>
                                 </el-table> -->
@@ -204,14 +204,14 @@
         <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"
+                  :columnList="stockcolumnList"
+                  :tableData="inventoryData"
+                  :loading="loading"
+                  @inputTxt="inputsc"
+                  @timeCheck="timesc"
+                  @btnCheck="btnsc"
+                  @selectCheck="selectsc"
+                  @selection="selectionChange"
           >
             <template #default="slotProps">
               <!--              <el-text-->
@@ -223,11 +223,11 @@
               <!--              >查看详情</el-text>-->
 
               <el-text
-                type="primary"
-                link
-                icon="el-icon-edit"
-                @click="removeStockList(slotProps.scope.row)"
-                >移除
+                      type="primary"
+                      link
+                      icon="el-icon-edit"
+                      @click="removeStockList(slotProps.scope.row)"
+              >移除
               </el-text>
             </template>
           </tablecmt>
@@ -235,7 +235,7 @@
       </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>
@@ -243,53 +243,53 @@
       <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 :inline="true" :model="query">-->
+<!--            <el-form-item label="订单自编号:">-->
+<!--              <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash; <el-form-item label="商场名称:">-->
+<!--                <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>-->
+<!--              </el-form-item> &ndash;&gt;-->
+<!--            <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>
+<!--            &lt;!&ndash; 查询按钮 &ndash;&gt;-->
+<!--            <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"
+                  :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)"
-                >移除
+                      type="primary"
+                      link
+                      icon="el-icon-edit"
+                      @click="removeStockList(slotProps.scope.row)"
+              >移除
               </el-text>
             </template>
           </tablecmt>
@@ -298,22 +298,22 @@
             <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"
+                      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>
@@ -349,7 +349,7 @@
               </el-col>
               <el-col :xl="4" :lg="7" :md="8" :sm="24">
                 <span
-                  >可用数量：{{
+                >可用数量：{{
                     item.handQuantity - item.deliveryQuantity - item.outboundQuantity
                   }}</span
                 >
@@ -357,32 +357,32 @@
               </el-col>
             </el-row>
             <el-input-number
-              v-if="this.isrReservationEntry"
-              v-model="item.reservationNum"
-              min="0"
-              :max="item.zeroOrderMax"
-              placeholder="请输入预约数量"
+                    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="请输入预约数量"
+                    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"
-            >修改(零担订单)
+                  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>
@@ -391,55 +391,56 @@
       <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>
+<!--          <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>-->
+<!--            &lt;!&ndash; 查询按钮 &ndash;&gt;-->
+<!--            <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"
+                  :columnList="inventoryInfocolumnList"
+                  :tableData="inventoryInfo"
+                  :checkselect="inventorySelectList"
+                  :loading="loading"
+                  @inputTxt="inputscInventory"
+                  @timeCheck="timescInventory"
+                  @btnCheck="btnscInventory"
+                  @selectCheck="searchStockList"
+                  @selection="selectionChange"
           >
+<!--            ref="multipleTable"-->
+
             <template #default="slotProps">
               <el-text
-                type="primary"
-                link
-                icon="el-icon-edit"
-                @click="removeStockList(slotProps.scope.row)"
-                >移除
+                      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>
@@ -451,13 +452,13 @@
           <!-- 列表模块 -->
           <!--                :isselectfun="checkPackage"-->
           <tablecmt
-            :columnList="columnParcels"
-            :tableData="packageData"
-            :checkselect="packageDataSec"
-            :loading="loading"
-            @selection="selectionPackageChange"
-            @select="tableAllSelection"
-            @cell-mouse-enter="hove"
+                  :columnList="columnParcels"
+                  :tableData="packageData"
+                  :checkselect="packageDataSec"
+                  :loading="loading"
+                  @selection="selectionPackageChange"
+                  @select="tableAllSelection"
+                  @cell-mouse-enter="hove"
           >
             <template #default="slotProps">
               <!-- <el-text
@@ -505,7 +506,7 @@
                     </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>
@@ -513,78 +514,78 @@
       </template>
 
       <el-dialog
-        v-model="dialogVisible"
-        title="增值服务"
-        width="30%"
-        :model="addvalue"
-        :before-close="handleClose"
+              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 }}
+                    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;件数:
+              >&nbsp;件数:
                 <el-input
-                  type="number"
-                  v-model="item.f"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 1)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.f"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 1)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 1"
-                >公里:
+              >公里:
                 <el-input
-                  type="primary"
-                  v-model="item.a"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 2)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="primary"
+                        v-model="item.a"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 2)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 3"
-                >距离:
+              >距离:
                 <el-input
-                  type="number"
-                  v-model="item.b"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 3)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.b"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 3)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 5"
-                >人数:
+              >人数:
                 <el-input
-                  type="number"
-                  v-model="item.c"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 4)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.c"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 4)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 0"
-                >楼层:
+              >楼层:
                 <el-input
-                  type="number"
-                  v-model="item.d"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 5)"
-                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.d"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 5)"
+                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="item"
-                >预计费用:
+              >预计费用:
                 <el-input
-                  type="number"
-                  v-model="item.e"
-                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                  @change="textbox($event, index, 6)"
-                  style="width: 20%; border: none; border-bottom: 2px solid #eee"
+                        type="number"
+                        v-model="item.e"
+                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                        @change="textbox($event, index, 6)"
+                        style="width: 20%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
             </el-checkbox>
@@ -602,2059 +603,2063 @@
 </template>
 
 <script>
-import {
-  autonomouslySave,
-  update,
-  remove,
-  getReservationInfo,
-  getReservationZeroOrderDetail,
-  getReservationPackageListByOrderId,
-} from '@/api/distribution/distributionReservation';
-import {
-  getStockArticleList,
-  getPackageListByStockArticleId,
-  getClientList,
-  selectUpdateAvailableStockArticle,
-  getZeroOrderDetail,
-} from '@/api/distribution/distributionStockArticle';
-import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
-import { addIncrement } from '@/api/distribution/distributionStockArticle';
-import {
-  getStockListClient,
-  selectInventoryDetail,
-} from '@/api/distribution/distributionStockList';
+  import {
+    autonomouslySave,
+    update,
+    remove,
+    getReservationInfo,
+    getReservationZeroOrderDetail,
+    getReservationPackageListByOrderId,
+  } from '@/api/distribution/distributionReservation';
+  import {
+    getStockArticleList,
+    getPackageListByStockArticleId,
+    getClientList,
+    selectUpdateAvailableStockArticle,
+    getZeroOrderDetail,
+  } from '@/api/distribution/distributionStockArticle';
+  import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
+  import { addIncrement } from '@/api/distribution/distributionStockArticle';
+  import {
+    getInventoryList,
+    getStockListClient,
+    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';
+  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: 'warehouseId',
-          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: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'waybillNumber',
-          label: '运单号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '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: 55,
-          checkarr: [],
-          fixed: true,
-        },
-        {
-          prop: 'serviceNumber',
-          label: '服务号',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'serviceTypeName',
-          label: '服务类型',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          head: false,
-        },
-        // {
-        //   prop: 'orderCode',
-        //   label: '订单自编号',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        {
-          prop: 'descriptionGoods',
-          label: '物料名称',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'cargoNumber',
-          label: '物料编码',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'warehouse',
-        //   label: '入库时间',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        {
-          prop: 'despatch',
-          label: '物流车次',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'incomingBatch',
-          label: '入库批次',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'mallName',
-        //   label: '商城名称',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        {
-          prop: 'quantityStock',
-          label: '库存数量',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'quantityOccupied',
-          label: '冻结数量',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'outboundQuantity',
-          label: '出库数量',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        /* {
-           prop: 'despatch',
-           label: '物流发运车次',
-           type: 2,
-           values: '',
-           width: '130',
-           checkarr: [],
-           fixed: false,
-           sortable: true,
-         },*/
-        // {
-        //   prop: 'category',
-        //   label: '品分类',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        {
-          prop: 'brandName',
-          label: '品牌',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'marketName',
-          label: '商场/客户',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'storeName',
-          label: '门店名称',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'storeCode',
-        //   label: '门店编码',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        // {
-        //   prop: 'marketCode',
-        //   label: '商场编码',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        // {
-        //   prop: 'shoppingMall',
-        //   label: '所属商场',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
-        {
-          prop: 'warehouseName',
-          label: '仓库名称',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'cargoUnit',
-          label: '物料单位',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'unpackingQuantity',
-          label: '拆包数量',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'unpack',
-          label: '拆包状态',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [
-            {
-              value: `true`,
-              label: '是',
-            },
-            {
-              value: `false`,
-              label: '否',
-            },
-          ],
-          fixed: false,
-          sortable: true,
-        },
+  export default {
+    data() {
+      return {
+        columnList: [
+          {
+            prop: 'waybillNumber',
+            label: '运单号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'serviceNumber',
+            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: '',
-        //   label: '操作',
-        //   type: 6,
-        //   values: '',
-        //   width: '200',
-        //   checkarr: [],
-        //   fixed: 'right',
-        //   hide: true,
-        // },
-        // 更多列的配置...
-      ],
-      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: '',
-      /** 被选中仓库信息 */
-      warehouseId: '',
-      // 包件复选框列表
-      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();
+          {
+            prop: 'incomingBatch',
+            label: '入库批次',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          // {
+          //   prop: 'serviceTypeName',
+          //   label: '服务类型',
+          //   type: 1,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: true,
+          //   sortable: true,
+          //   head: false,
+          // },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          // {
+          //   prop: 'warehouse',
+          //   label: '入库时间',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'warehouseName',
+            label: '仓库名称',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'cargoNumber',
+            label: '物料编码',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'marketName',
+            label: '商场/客户',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'storeName',
+            label: '门店名称',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'brandName',
+            label: '品牌',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          // {
+          //   prop: 'mallName',
+          //   label: '商城名称',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'despatch',
+            label: '物流车次',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'quantityStock',
+            label: '库存数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'quantityOccupied',
+            label: '冻结数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          /* {
+             prop: 'despatch',
+             label: '物流发运车次',
+             type: 2,
+             values: '',
+             width: '130',
+             checkarr: [],
+             fixed: false,
+             sortable: true,
+           },*/
+          // {
+          //   prop: 'category',
+          //   label: '品分类',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'outboundQuantity',
+            label: '出库数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
 
-    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,
+          // {
+          //   prop: 'storeCode',
+          //   label: '门店编码',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          // {
+          //   prop: 'marketCode',
+          //   label: '商场编码',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          // {
+          //   prop: 'shoppingMall',
+          //   label: '所属商场',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'cargoUnit',
+            label: '物料单位',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'unpackingQuantity',
+            label: '拆包数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'unpack',
+            label: '拆包状态',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [
+              {
+                value: `true`,
+                label: '是',
+              },
+              {
+                value: `false`,
+                label: '否',
+              },
+            ],
+            fixed: false,
+            sortable: true,
+          },
+
+          // {
+          //   prop: '',
+          //   label: '操作',
+          //   type: 6,
+          //   values: '',
+          //   width: '200',
+          //   checkarr: [],
+          //   fixed: 'right',
+          //   hide: true,
+          // },
+          // 更多列的配置...
+        ],
+        stockArtcolumnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: '50',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'waybillNumber',
+            label: '运单号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '260',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '260',
+            checkarr: [],
+            fixed: true,
+            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: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'incomingBatch',
+            label: '入库批次',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          // {
+          //   prop: 'serviceTypeName',
+          //   label: '服务类型',
+          //   type: 1,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: true,
+          //   sortable: true,
+          //   head: false,
+          // },
+          {
+            prop: 'orderCode',
+            label: '订单自编号',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'descriptionGoods',
+            label: '物料名称',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          // {
+          //   prop: 'warehouse',
+          //   label: '入库时间',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'warehouseName',
+            label: '仓库名称',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'cargoNumber',
+            label: '物料编码',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'marketName',
+            label: '商场/客户',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'storeName',
+            label: '门店名称',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'brandName',
+            label: '品牌',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          // {
+          //   prop: 'mallName',
+          //   label: '商城名称',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'despatch',
+            label: '物流车次',
+            type: 2,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'quantityStock',
+            label: '库存数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'quantityOccupied',
+            label: '冻结数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          /* {
+             prop: 'despatch',
+             label: '物流发运车次',
+             type: 2,
+             values: '',
+             width: '130',
+             checkarr: [],
+             fixed: false,
+             sortable: true,
+           },*/
+          // {
+          //   prop: 'category',
+          //   label: '品分类',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'outboundQuantity',
+            label: '出库数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+
+          // {
+          //   prop: 'storeCode',
+          //   label: '门店编码',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          // {
+          //   prop: 'marketCode',
+          //   label: '商场编码',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          // {
+          //   prop: 'shoppingMall',
+          //   label: '所属商场',
+          //   type: 2,
+          //   values: '',
+          //   width: '130',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
+          {
+            prop: 'cargoUnit',
+            label: '物料单位',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'unpackingQuantity',
+            label: '拆包数量',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'unpack',
+            label: '拆包状态',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [
+              {
+                value: `true`,
+                label: '是',
+              },
+              {
+                value: `false`,
+                label: '否',
+              },
+            ],
+            fixed: false,
+            sortable: true,
+          },
+
+          // {
+          //   prop: '',
+          //   label: '操作',
+          //   type: 6,
+          //   values: '',
+          //   width: '200',
+          //   checkarr: [],
+          //   fixed: 'right',
+          //   hide: true,
+          // },
+          // 更多列的配置...
+        ],
+        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: '',
+        /** 被选中仓库信息 */
+        warehouseId: '',
+        // 包件复选框列表
+        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: {},
+      };
     },
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
+    created() {
+      this.$watch(
+              () => this.$route.params,
+              () => {
+                this.fetchData();
+              },
+              // 组件创建完后获取数据，
+              // 此时 data 已经被 observed 了
+              { immediate: true }
+      );
     },
-  },
-  methods: {
-    handleToggleAllSelection() {
-      this.$refs.selecttable.toggleAllSelection();
+    mounted() {
+      this.init();
+
+      this.onLoad(this.page);
+      this.getDictionary();
     },
-    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;
+    watch: {
+      '$route.query.reservationId': {
+        handler(newVal, oldVal) {
+          console.log(newVal, oldVal);
+          this.fetchData();
+          this.onLoad(this.page);
+        },
+        deep: true,
+        immediate: true,
+      },
     },
-    init() {
-      this.height = this.setPx(document.body.clientHeight - 340);
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(',');
+      },
     },
-    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];
+    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.floorList.length > 1) {
-          addvalueInfo.floor = this.floorList[1];
-          this.floorList = [];
+        if (this.$route.query.reservationId) {
+          this.reservationId = this.$route.query.reservationId;
         }
-        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.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);
         });
-      });
-      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;
-      getStockListClient(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;
+        let params = {};
+        params.id = this.orderInfo.id;
+        params.addvalue = addvalueInfos;
+        params.relatedId = 1;
+        console.log('params>>>>>>>>>>>>', params);
+        addIncrement(params).then(res => {
+          this.dialogVisible = false;
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-          this.page.total = inventoryList.total;
-          console.log('res :>> ', res);
+        });
+        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;
+        getStockListClient(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;
+                  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;
         }
-      );
-      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;
+        console.log('>>>>>', this.form);
+        if (value.length < 1) {
+          this.costList = [];
+          this.costListName = [];
         }
-      });
-    },
-    textbox(e, index, a) {
-      console.log('e,index', e, index, a);
-      if (a === 6) {
-        this.feeList[index + 1] = e;
-        return;
-      }
-      if (a === 5)
-        if (index === 0 && a === 5) {
-          this.floorList[index + 1] = e;
+        this.deliveryWayData.forEach(i => {
+          if (value.includes(i.dictKey)) {
+            console.log(i);
+            i.pitch = true;
+            this.costListName = value;
+          }
+        });
+      },
+      textbox(e, index, a) {
+        console.log('e,index', e, index, a);
+        if (a === 6) {
+          this.feeList[index + 1] = e;
           return;
         }
-      this.costList[index + 1] = e;
+        if (a === 5)
+          if (index === 0 && a === 5) {
+            this.floorList[index + 1] = e;
+            return;
+          }
+        this.costList[index + 1] = e;
 
-      //费用列表
-    },
-    //数据字典数据获取
-    getDictionary() {
-      getDictionaryBiz('addvalue_serve_type').then(res => {
-        this.addvalueServeTypeData = res.data.data;
-      });
-      getDictionaryBiz('delivery_way').then(res => {
-        this.deliveryWayData = res.data.data;
-      });
-      getDictionaryBiz('distribution_type').then(res => {
-        this.deliveryTypeData = res.data.data;
-      });
-      getDictionaryBiz('period_of_time').then(res => {
-        this.periodOfTimeData = res.data.data;
-      });
-      getDictionaryBiz('yes_no').then(res => {
-        this.whetherData = res.data.data;
-      });
-    },
-    addvalueServe(row) {
-      //查询订单的增值服务，
-      this.addvalueServeType = [];
-      this.addvalue = {};
-      this.dialogVisible = true;
-      this.costList = [];
-      this.feeList = [];
-      this.floorList = [];
-      this.orderInfo = row;
-    },
-    searchHide() {
-      this.search = !this.search;
-    },
-    searchChange() {
-      this.onLoad(this.page);
-    },
-    searchReset() {
-      this.query = {};
-      this.page.currentPage = 1;
-      this.onLoad(this.page);
-    },
-    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);
+        //费用列表
+      },
+      //数据字典数据获取
+      getDictionary() {
+        getDictionaryBiz('addvalue_serve_type').then(res => {
+          this.addvalueServeTypeData = res.data.data;
         });
-      } else {
-        getZeroOrderDetail(row.id).then(res => {
-          if (res.data.data != null) {
+        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.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 = 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;
-    },
+        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);
-        }
-      });
-    },
+      // 选择包件信息
+      // 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 (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.records;
-            // 新增默认勾选全部
-            this.packageDataSec = this.packageData;
+            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;
-        });
-      }
-    },
-
-    // 选择包件信息
-    // 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;
-    //   }
-    // },
-    // 全选表格新增
+        } 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;
+          });
+        }
+      },
 
-    checkPackage(row, index) {
-      //区分编辑还是新增
-      //编辑需要对这个预约单下的包件信息均可进行调整
-      console.log(row, 'rowrowrowrowrowrow');
-      // if (!this.reservationId) {
-      //   if (
-      //     row.orderPackageReservationStatusName === '已预约' ||
-      //     row.orderPackageReservationStatusName === '20'
-      //   ) {
-      //     return true;
+      // 选择包件信息
+      // 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;
       //   }
-      // }
-      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();
+      // },
+      // 全选表格新增
+
+      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;
         }
-      );
-    },
-    stockArticleSearchReset() {
-      this.selectionList = [];
-      this.query = {};
-      this.handleAddOrder();
-    },
-    stockListSearchReset() {
-      this.selectionList = [];
-      this.query = {};
-      this.handleAddInventory();
-    },
-    // 提交包件数
-    onSubmitPackage() {
-      // this.packageListInfo
+      },
+      //搜索订单
+      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;
+        getStockListClient(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;
+        if (this.packageDataSec.length === 0) {
+          this.$message.warning('请选择包件!!!');
+          return;
         }
-      });
-      console.log('this.orderData------------>', this.orderData);
-      this.isaddvalue = false;
-    },
-    onSubmit() {
-      // 日期必填
-      if (!this.form.reservationDate) {
-        this.$message({
-          type: 'warning',
-          message: '预约时间暂未选择',
+        this.orderData.forEach(item => {
+          if (item.id === this.obj.id) {
+            item.packageList = this.packageDataSec;
+          }
         });
-        return;
-      }
-      // 提交按钮
-      //新增预约单
-      let orderIds = [];
-      let inventoryIds = [];
-      let inventoryList = [];
-      let stockArticleList = [];
-      let operation = true;
-      this.inventoryData.forEach(item => {
-        if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
+        console.log('this.orderData------------>', this.orderData);
+        this.isaddvalue = false;
+      },
+      onSubmit() {
+        // 日期必填
+        if (!this.form.reservationDate) {
           this.$message({
             type: 'warning',
-            message: '请输入' + item.orderCode + '正确数量!',
+            message: '预约时间暂未选择',
           });
-          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: '操作成功!',
-          });
+        // 提交按钮
+        //新增预约单
+        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);
         });
-      } else {
-        this.form.reservationStatus = '20';
-        autonomouslySave(this.form).then(() => {
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
-          this.$router.go(-1);
+        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;
+          }
         });
-      }
-    },
-    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 = '';
-        this.warehouseId = '';
-      }
-      // 当列表没有数据时, 表单清空
-      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 = '';
-        this.warehouseId = '';
-      }
-      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: '操作成功!',
-          });
+        this.form.stockArticleList = order;
+        this.deliveryWayData.forEach(item => {
+          if (this.form.deliveryWay === item.dictValue) {
+            this.form.deliveryWay = item.dictKey;
+          }
         });
-    },
-    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.deliveryTypeData.forEach(item => {
+          if (this.form.deliveryType === item.dictValue) {
+            this.form.deliveryType = item.dictKey;
           }
         });
-        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;
+        this.periodOfTimeData.forEach(item => {
+          if (this.form.periodOfTime === item.dictValue) {
+            this.form.periodOfTime = item.dictKey;
+          }
         });
-
-        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;
+        this.form.serveType = this.serveType.sort().join(',');
+        //服务号
+        this.orderData.forEach(item => {
+          console.log('-------------->item', item);
+          if (!item.packageListInfo) {
+            item.packageListInfo = item.parcelListVOS;
           }
-          return true;
         });
+        console.log('------------------->this.form.inventoryList', this.form.inventoryList);
+        console.log('------------------->this.form.stockArticleList', this.form.stockArticleList);
 
-        if (b > this.obj.handQuantity) {
+        if (
+                JSON.stringify(this.form.inventoryList) === '[]' &&
+                JSON.stringify(this.form.stockArticleList) === '[]'
+        ) {
           this.$message({
-            type: 'error',
-            message: '录入数量超过订单在库数量!',
+            type: 'warning',
+            message: '无效的预约计划!',
           });
+          operation = false;
           return;
         }
-        if (!f) {
-          this.$message({
-            type: 'error',
-            message: '请检查修改数量!',
+        // 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;
         }
-      }
-      updateEntryNum(this.zeroOrderData).then(res => {
-        if (res) {
-          this.$message({
-            type: 'success',
-            message: '操作成功',
-          });
+        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 = '';
+          this.warehouseId = '';
         }
-      });
-      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;
+        // 当列表没有数据时, 表单清空
+        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);
         });
-      } else {
-        //在库数量录入
+        // 当两个列表没有数据时, 清空限制
+        if (this.inventoryData.length === 0 && this.orderData.length === 0) {
+          this.marketName = '';
+          this.warehouseId = '';
+        }
+        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 > 0) {
-          let n = 0;
+        if (a.length > 1) {
+          let b = 0;
+          //计算该品类已使用数量
+
           a.forEach(item => {
-            n += item.number;
+            b += item.number;
           });
-          if (n > this.obj.handQuantity) {
-            this.$message({
-              type: 'error',
-              message: '录入数量超过订单在库数量!',
-            });
-            return;
-          }
-          let b = a.every(item => {
+
+          let f = a.every(item => {
+            console.log('this.number--------------------->', item.number);
             console.log(
-              '最大数量-------------->',
-              item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number
+                    'number--------------------->',
+                    item.deliveryQuantity + item.outboundQuantity
             );
             if (
-              item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number >
-              item.quantity
+                    item.number < item.deliveryQuantity + item.outboundQuantity ||
+                    item.number > item.quantity
             ) {
               return false;
             }
             return true;
           });
-          console.log('----------------->', b);
-          if (!b) {
+
+          if (b > this.obj.handQuantity) {
             this.$message({
               type: 'error',
-              message: '请输入正确数量!',
+              message: '录入数量超过订单在库数量!',
+            });
+            return;
+          }
+          if (!f) {
+            this.$message({
+              type: 'error',
+              message: '请检查修改数量!',
             });
             return;
           }
         }
-        entryNum(this.zeroOrderData).then(res => {
+        updateEntryNum(this.zeroOrderData).then(res => {
           if (res) {
             this.$message({
               type: 'success',
@@ -2662,316 +2667,385 @@ export default {
             });
           }
         });
-        console.log('this.zeroOrderData------------->', this.zeroOrderData);
-      }
+        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('该库存品数量输入有误!!!');
+        this.zeroOrderShow = false;
+      },
+      // 增加库存品
+      onSubmitInventory() {
+        if (this.inventoryList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
           return;
         }
-      });
-      console.log('this.inventoryList :>> ', this.inventoryList);
-      // 检测商场是否选择统一商场
-      let _marketName = '';
-      let _warehouseName = '';
-      const _isUnifyMarketName = this.inventoryList.every(value => {
-        if (_marketName === '') {
-          _marketName = value.marketName;
-          _warehouseName = value.warehouseId;
+        this.inventoryList.forEach(item => {
+          if (item.reservationNum > item.applyNum) {
+            this.$message.warning('该库存品数量输入有误!!!');
+            return;
+          }
+        });
+        console.log('this.inventoryList :>> ', this.inventoryList);
+        // 检测商场是否选择统一商场
+        let _marketName = '';
+        let _warehouseName = '';
+        const _isUnifyMarketName = this.inventoryList.every(value => {
+          if (_marketName === '') {
+            _marketName = value.marketName;
+            _warehouseName = value.warehouseId;
+          }
+          return _marketName === value.marketName && _warehouseName === value.warehouseId;
+        });
+        if (!_isUnifyMarketName) {
+          this.$message.warning('请选择统一仓库操作!!!');
+          return;
         }
-        return _marketName === value.marketName && _warehouseName === value.warehouseId;
-      });
-      if (!_isUnifyMarketName) {
-        this.$message.warning('请选择统一仓库操作!!!');
-        return;
-      }
-      this.marketName = _marketName;
-      this.warehouseId = _warehouseName;
-      console.log('this.inventoryList :>> ', this.inventoryList);
-      this.inventoryData = [...this.inventoryData, ...this.inventoryList];
+        this.marketName = _marketName;
+        this.warehouseId = _warehouseName;
+        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;
-      let _warehouseId = list[0].warehouseId;
+        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;
+        let _warehouseId = list[0].warehouseId;
 
-      // 循环查看数据是否符合要求
-      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;
-        }
-        if (item.warehouseId !== _warehouseId) {
-          console.log('item.warehouseId :>> ', item.warehouseId);
-          console.log('_warehouseId :>> ', _warehouseId);
-          this.$message.warning('请选择统一仓库!!!');
-          return false;
-        }
-        return true;
-      });
+        // 循环查看数据是否符合要求
+        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;
+          }
+          if (item.warehouseId !== _warehouseId) {
+            console.log('item.warehouseId :>> ', item.warehouseId);
+            console.log('_warehouseId :>> ', _warehouseId);
+            this.$message.warning('请选择统一仓库!!!');
+            return false;
+          }
+          return true;
+        });
 
-      if (!isRturn) return;
+        if (!isRturn) return;
 
-      // 设置商场名称
-      if (this.marketName === '') {
-        this.marketName = _marketName;
-        this.warehouseId = _warehouseId;
-      }
-      // this.marketName = list[0].marketName;
+        // 设置商场名称
+        if (this.marketName === '') {
+          this.marketName = _marketName;
+          this.warehouseId = _warehouseId;
+        }
+        // this.marketName = list[0].marketName;
 
-      this.form.consignee = _name;
-      this.form.deliveryAddress = _address;
-      this.form.deliveryPhone = _phone;
+        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);
+        //这里需要对选择的订单进行筛选
+        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.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.query = {};
+      },
+      inputscStockArtic(index, row) {
+        console.log(index, row);
+        this.query[row.prop] = index;
+        this.onLoadOrder(this.page);
+      },
+      inputscInventory(index, row){
+        this.query[row.prop] = index;
+       this.searchStockList(this.page);
+
+      },
+      timescInventory(index, row){
+        console.log('index-------------->',index);
+        console.log('row-------------->',row);
+      },
+      btnscInventory(){
+
+      },
+      selectscInventory(){},
+      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 getClientList(
+                page.currentPage,
+                page.pageSize,
+                Object.assign(params, this.query)
+        );
+        console.log('res ===>>', res);
+        const { records, total } = res.data.data;
+
+        this.stockArticleInfo = 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 = total;
         });
-        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 getClientList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
-      );
-      console.log('res ===>>', res);
-      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;
-    },
+        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;
+      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.warehouseId = reservation.warehouseId;
-          this.orderData = reservation.stockArticleList;
-          this.inventoryData = reservation.inventoryList;
-          this.inventoryData.forEach(item => {
-            item.applyNum = item.quantityStock - item.quantityOccupied;
+            this.form.consignee = name;
+            this.form.deliveryPhone = phone;
+            this.form.deliveryType = typeService;
+            this.form.deliveryAddress = address;
+            this.orderData = data;
           });
-          this.form.deliveryType = reservation.deliveryType;
-          this.form.periodOfTime = reservation.periodOfTime;
-          if (reservation.serveType) {
-            //过滤字符串中的','
-            this.serveType = Array.from(reservation.serveType).filter(s => {
-              return s !== ',';
+        }
+        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.warehouseId = reservation.warehouseId;
+            this.orderData = reservation.stockArticleList;
+            this.inventoryData = reservation.inventoryList;
+            this.inventoryData.forEach(item => {
+              item.applyNum = item.quantityStock - item.quantityOccupied;
             });
-          }
-          this.form = reservation;
-        });
-      } else {
-        this.form.deliveryType = '2';
-      }
-      this.loading = false;
+            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::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
 
-input[type='number'] {
-  -moz-appearance: textfield;
-}
+  input[type='number'] {
+    -moz-appearance: textfield;
+  }
 </style>
 
 <style lang="scss" scoped>
-.el-btn-xz {
-  width: 68px;
-  height: 26px;
-  border: 1px solid;
-  margin-bottom: 8px;
-  border-radius: 4px;
-}
+  .el-btn-xz {
+    width: 68px;
+    height: 26px;
+    border: 1px solid;
+    margin-bottom: 8px;
+    border-radius: 4px;
+  }
 </style>