From 7146c6a47e5932cc06adeec4073b7450157f10af Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 23 Dec 2023 09:12:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E8=A1=A5=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/zeroAdditionalRecording.js   | 44 +++++++++++++++++++
 .../artery/zeroAdditionalRecording.vue        | 10 ++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/api/distribution/zeroAdditionalRecording.js b/src/api/distribution/zeroAdditionalRecording.js
index bb1e45fc..d6832cc2 100644
--- a/src/api/distribution/zeroAdditionalRecording.js
+++ b/src/api/distribution/zeroAdditionalRecording.js
@@ -11,3 +11,47 @@ export const postloadZeroSuppleList = (data = {}) => {
   });
 };
 
+/** 在调度池的零担列表 */
+export const postUseZeroList = (data = {}) => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/useZeroList',
+    method: 'post',
+    data,
+  });
+};
+
+/** 添加零担补录 */
+export const postAddZeroSupple = (data = {}) => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/addZeroSupple',
+    method: 'post',
+    data,
+  });
+};
+
+/** 更新零担补录的数量 */
+export const postUpdateZeroSuppleNum = (data = {}) => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/updateZeroSuppleNum',
+    method: 'post',
+    data,
+  });
+};
+
+/** 通过id删除零担补录 */
+export const postDeleteZeroSuppleById = (data = {}) => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/DeleteZeroSuppleById',
+    method: 'post',
+    data,
+  });
+};
+
+/** 查询当前节点以后的节点id */
+export const postFindNextNodeList = (data = {}) => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/findNextNodeList',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index d2bc5782..179abdec 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -208,7 +208,14 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { postloadZeroSuppleList } from '@/api/distribution/zeroAdditionalRecording';
+import {
+  postloadZeroSuppleList,
+  postUseZeroList,
+  postAddZeroSupple,
+  postUpdateZeroSuppleNum,
+  postDeleteZeroSuppleById,
+  postFindNextNodeList,
+} from '@/api/distribution/zeroAdditionalRecording';
 import { downloadXls } from '@/utils/util';
 import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording';
 import { ElMessage } from 'element-plus';
@@ -338,6 +345,7 @@ const onLoad = async (params = {}) => {
     const submitData = {
       ...details.page,
       ...details.query,
+      orderCodes: details.orderCodeList,
       ...params,
     };
 

From b632e2e0a4a4dc90469489ec4060f556dad26be7 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sat, 23 Dec 2023 10:12:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue  |  2 +-
 .../aftersales/aftersalesWorkOrderInfo.vue    | 93 +++++++++++++++++++
 vite.config.js                                |  2 +-
 3 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 6b94c1cc..c8b0d566 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -1390,7 +1390,7 @@ const ButtonPermissions = computed(() => {
     case 3: //待处理
       return {
         add: false, //新增按钮
-        batchReject: UserPermissions.value == '仓库客服', //批量打回
+        batchReject: UserPermissions.value == '职能客服', //批量打回
         assignment: UserPermissions.value == '客服经理', //工单指派
         applyArbitration: false, //申请仲裁
         batchFinish: false, //批量完结
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 51a06465..2d5146f4 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -627,6 +627,99 @@ const ImgSuccess = (response, uploadFile) => {
     console.log(Indexform.value['packList'], '图片列表');
   }
 };
+// 详情按钮权限
+const ButtonPermissions = computed(() => {
+  // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑
+  switch (TabPermissions.value) {
+    case 0: //全部
+      return {
+        reply:true, //回复按钮(都可以查看)
+        ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
+        end: UserPermissions.value != '仓库客服', //完结按钮
+        repulse: UserPermissions.value != '仓库客服', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '仓库客服', //客服仲裁完结
+        edit: false, //编辑
+      };
+    case 1: //处理中
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false,  //处理结果按钮
+        end: false,  //完结按钮
+        repulse:false, //打回按钮
+        ArbitrationCompleted:false, //客服仲裁完结
+        edit: false,//编辑
+      };
+    case 2: //处理完毕
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: UserPermissions.value == '仓库客服' && AppealStatusT.value, //编辑
+      };
+    case 3: //待处理
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: UserPermissions.value == '仓库客服',//处理结果按钮
+        end: UserPermissions.value == '客服经理', //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false,//客服仲裁完结
+        edit: false,  //编辑
+      };
+    case 4: //理赔金额未出
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false,  //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: UserPermissions.value == '仓库客服',  //编辑
+      };
+    case 5: //仲裁中
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+    case 6: //完结
+      return {
+        reply: false,//回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false,  //编辑
+      };
+    case 7: //超时未处理
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false,//打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+    // 其他任何情况下的默认情况
+    default:
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false,//完结按钮
+        repulse: false,//打回按钮
+        ArbitrationCompleted: false,//客服仲裁完结
+        edit: false,//编辑
+      };
+  }
+});
+
+
+
+
+
 
 // 上传图片规则
 const beforeAvatarUpload = rawFile => {
diff --git a/vite.config.js b/vite.config.js
index b5a294af..187bfd53 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -25,7 +25,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
-          target: 'http://192.168.6.122:9777',
+          target: 'http://192.168.6.148:9777',
           // target: 'http://192.168.6.116:8777',  
           // tjj
           // sst

From b8389e67798ce08226693997d21c7346c32c9ae5 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sat, 23 Dec 2023 10:51:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue  |   3 +-
 .../aftersales/aftersalesWorkOrderAdd.vue     |  58 ++++---
 .../aftersales/aftersalesWorkOrderInfo.vue    | 155 ++++++++++--------
 3 files changed, 120 insertions(+), 96 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index c8b0d566..558d7624 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -1366,7 +1366,7 @@ const ButtonPermissions = computed(() => {
         batchReject: UserPermissions.value == '职能客服', //批量打回
         assignment: UserPermissions.value == '客服经理', //工单指派
         applyArbitration: UserPermissions.value == '仓库客服', //申请仲裁
-        batchFinish: UserPermissions.value == '职能客服', //批量完结
+        batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
       };
     case 1: //处理中
@@ -1737,6 +1737,7 @@ const view = val => {
       workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
       businessId: val.row.businessId,
       ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
+      RouteIndexs:TabPermissions.value,//当前记录参数
     },
   });
   return;
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 425a2550..d90a714d 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -159,7 +159,7 @@
           <el-option
             v-for="item in DeliveryDriver"
             :key="item.value"
-            :label="item.driverName + '-'+ item.trainNumber"
+            :label="item.driverName + '-' + item.trainNumber"
             :value="item.id"
           />
         </el-select>
@@ -185,7 +185,6 @@
           clearable
           @change="DeliveryTrainnumber"
         />
-     
       </el-form-item>
 
       <el-form-item
@@ -273,8 +272,6 @@
         <el-input v-model="Indexform.processNumber" placeholder="请输入钉钉流程号" />
       </el-form-item> -->
 
-
-
       <!-- 必填 -->
       <el-form-item label="异常问题描述">
         <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
@@ -653,7 +650,6 @@ const ImgSuccess = (response, uploadFile) => {
     console.log(response);
     console.log(Indexform.value['packList'], '图片列表');
     amplifysrcList.value.push(response.data.link);
-    
   }
 };
 
@@ -672,9 +668,9 @@ const beforeAvatarUpload = rawFile => {
 // 点击图片列表回调
 const pictureList = val => {
   console.log(val, '图片列表');
-  dialogImgList.value=true;
+  dialogImgList.value = true;
   console.log(val, '图片列表');
-  amplifyurl.value=val.url;
+  amplifyurl.value = val.url;
 };
 // 点击图片移除
 const ImgListRemove = val => {
@@ -745,7 +741,7 @@ const DiscoveringNodesChange = val => {
 function DeliveryTrainnumber() {
   let data = {
     trainNumber: Indexform.value.trainNumber,
-    taskTime:Indexform.value.deliveryTime
+    taskTime: Indexform.value.deliveryTime,
   };
   data.current = 1; //页码
   data.size = 999; //条数
@@ -848,7 +844,20 @@ const ConfirmForm = () => {
       });
     }
   }
-
+  if (SelectType.value == 1 && DataSubmit['decreaseImageEntityList'].length < 2) {
+    ElMessage({
+      message: '货损至少提供2张图片附件',
+      type: 'warning',
+    });
+    return;
+  }
+  if (SelectType.value == 3 && !DataSubmit['decreaseImageEntityList'].length) {
+    ElMessage({
+      message: '窜货必须提供图片附件',
+      type: 'warning',
+    });
+    return;
+  }
   console.log(DataSubmit['decreaseImageEntityList'], '处理好的图片');
   //司机信息处理
   if (Indexform.value.deliveryDriver) {
@@ -1027,12 +1036,12 @@ const ConfirmForm = () => {
   });
 };
 // 选择司机带出车次号日期
-const changeDeliveryDriver=(val)=>{
-console.log(val);
-console.log(DeliveryDriver.value,'司机信息');
-Indexform.value.trainNumber= DeliveryDriver.value.find(res=>res.id==val).trainNumber;//车次号
-Indexform.value.deliveryTime= DeliveryDriver.value.find(res=>res.id==val).taskTime;//日期
-}
+const changeDeliveryDriver = val => {
+  console.log(val);
+  console.log(DeliveryDriver.value, '司机信息');
+  Indexform.value.trainNumber = DeliveryDriver.value.find(res => res.id == val).trainNumber; //车次号
+  Indexform.value.deliveryTime = DeliveryDriver.value.find(res => res.id == val).taskTime; //日期
+};
 // 少货件数对应事件
 const ShortageTtems = val => {
   ShortageList.value = []; //进入之前重置参数
@@ -1152,12 +1161,12 @@ const ChangePackageInfo = (val, index) => {
       PackageInfo.value[index].orderId = packageData.orderId; //运单号
       PackageInfo.value[index].brandName = packageData.brandName; //品牌
       PackageInfo.value[index].state = false; //状态
-      res.data.data.find(item=>{
-        if(item.workOrderId && item.workOrderNumber){
+      res.data.data.find(item => {
+        if (item.workOrderId && item.workOrderNumber) {
           HistoricalPackageList.value = res.data.data;
-        PackageInfo.value[index].state = true; //状态
+          PackageInfo.value[index].state = true; //状态
         }
-      })
+      });
     }
     // packageCode; //包件码
     // //订单自编码
@@ -1216,7 +1225,7 @@ const ViewPackageDetails = val => {
   flex-wrap: wrap;
   justify-content: flex-start;
   border: 1px solid #ccc;
-    border-bottom: none;
+  border-bottom: none;
   .el-form-item {
     height: 46px;
     display: flex;
@@ -1351,11 +1360,11 @@ const ViewPackageDetails = val => {
     width: 80%;
     display: flex;
     justify-content: space-between;
-    .el_zb{
+    .el_zb {
       width: 140px;
       margin-right: 50px;
       text-align: right;
-      :deep(.el-input){
+      :deep(.el-input) {
         margin-left: 10px;
         text-align: right;
       }
@@ -1443,11 +1452,10 @@ const ViewPackageDetails = val => {
   border-bottom: 1px solid #e4e7ed !important;
 }
 :deep(.topClass) {
-  border-bottom:none;
+  border-bottom: none;
   .el-tabs__content {
     padding: 0;
   }
- 
 }
 .foot_btn {
   position: fixed;
@@ -1471,7 +1479,7 @@ const ViewPackageDetails = val => {
   align-items: center;
   justify-content: center;
 }
-.box-card{
+.box-card {
   height: 100% !important;
   overflow-y: scroll;
 }
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 2d5146f4..af9d159b 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -432,26 +432,26 @@
         <el-icon><Plus /></el-icon>
       </el-upload>
 
-      <el-dialog v-model="dialogImgList"  width="30%">  
-      <el-image
-      :src="amplifyurl"
-      :zoom-rate="1.2"
-      :max-scale="7"
-      :min-scale="0.2"
-      :preview-src-list="amplifysrcList"
-      :initial-index="4"
-      fit="cover"
-    />
+      <el-dialog v-model="dialogImgList" width="30%">
+        <el-image
+          :src="amplifyurl"
+          :zoom-rate="1.2"
+          :max-scale="7"
+          :min-scale="0.2"
+          :preview-src-list="amplifysrcList"
+          :initial-index="4"
+          fit="cover"
+        />
       </el-dialog>
     </div>
 
     <div class="foot_btn">
-      <el-button type="primary" @click="addireply">回复</el-button>
-      <el-button type="primary" @click="addingRecord">处理结果</el-button>
-      <el-button type="primary" @click="EndJump">完结 </el-button>
-      <el-button type="primary" @click="BatchReturn">打回 </el-button>
-      <el-button type="primary" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
-      <el-button type="primary" @click="EditInformation">信息编辑</el-button>
+      <el-button type="primary" v-if="ButtonPermissions.reply"   @click="addireply">回复</el-button>
+      <el-button type="primary" v-if="ButtonPermissions.ProcessingResults" @click="addingRecord">处理结果</el-button>
+      <el-button type="primary" v-if="ButtonPermissions.end" @click="EndJump">完结 </el-button>
+      <el-button type="primary" v-if="ButtonPermissions.repulse" @click="BatchReturn">打回 </el-button>
+      <el-button type="primary" v-if="ButtonPermissions.ArbitrationCompleted" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
+      <el-button type="primary" v-if="ButtonPermissions.edit" @click="EditInformation">信息编辑</el-button>
     </div>
   </el-card>
   <!-- 批量打回弹窗 -->
@@ -495,14 +495,12 @@
 </template>
 
 <script setup>
-
-
 import { ElMessage } from 'element-plus';
 import { ElMessageBox } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
-import {AddressClosed} from '@/utils/util'
+import { AddressClosed } from '@/utils/util';
 import {
   $_getList,
   $_submit,
@@ -522,7 +520,7 @@ const Indexform = ref({
   packList: [],
   decreaseImageEntityList: [], //处理好的图片数据
 }); //首页新增表单
-const dialogImgList=ref(false)
+const dialogImgList = ref(false);
 const IndexException = ref([]); //异常类型下拉选择
 const DiscoveringNodes = ref([]); //发现节点下拉选择
 const ProcessingResults = ref([]); //处理结果列表选项
@@ -552,8 +550,10 @@ const HistorIndex = ref(0); //历史包件索引
 const TotalClaimAmount = ref(0); //总金额
 const dialogReturn = ref(false); //打回弹窗
 const repulse = ref(false); //加载效果
-const amplifyurl= ref('');//当前点击的图片
-const amplifysrcList = ref([]);//图片循环列表
+const amplifyurl = ref(''); //当前点击的图片
+const amplifysrcList = ref([]); //图片循环列表
+const RouteIndexs = ref(''); //进入前的页面索引
+const UserPermissions = ref('');//当前状态
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' },
@@ -606,6 +606,24 @@ function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
+
+  // 获取角色权限
+  getDictionaryBiz('after_sales_visits').then(res => {
+    console.log(res, '角色字典');
+    const matchingItem = res.data.data.find(
+      item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
+    );
+    if (matchingItem) {
+      UserPermissions.value = matchingItem.dictValue;
+    } else {
+      UserPermissions.value = '仓库客服';
+    }
+    console.log(UserPermissions.value, '当前角色权限');
+  });
+
+
+
+
 // 图片上传必须携带TOKEN
 const headers = computed(() => {
   return { 'Blade-Auth': 'Bearer ' + getToken() };
@@ -630,76 +648,76 @@ const ImgSuccess = (response, uploadFile) => {
 // 详情按钮权限
 const ButtonPermissions = computed(() => {
   // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑
-  switch (TabPermissions.value) {
-    case 0: //全部
+  switch (RouteIndexs.value !='null') {
+    case RouteIndexs.value == 0: //全部
       return {
-        reply:true, //回复按钮(都可以查看)
+        reply: true, //回复按钮(都可以查看)
         ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
-        end: UserPermissions.value != '仓库客服', //完结按钮
-        repulse: UserPermissions.value != '仓库客服', //打回按钮
-        ArbitrationCompleted: UserPermissions.value == '仓库客服', //客服仲裁完结
-        edit: false, //编辑
+        end: UserPermissions.value == '职能客服', //完结按钮
+        repulse: UserPermissions.value == '客服经理', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: UserPermissions.value != '仓库客服', //编辑
       };
-    case 1: //处理中
-      return {
-        reply: false, //回复按钮
-        ProcessingResults: false,  //处理结果按钮
-        end: false,  //完结按钮
-        repulse:false, //打回按钮
-        ArbitrationCompleted:false, //客服仲裁完结
-        edit: false,//编辑
-      };
-    case 2: //处理完毕
+    case RouteIndexs.value == 1: //处理中
       return {
         reply: false, //回复按钮
         ProcessingResults: false, //处理结果按钮
         end: false, //完结按钮
         repulse: false, //打回按钮
         ArbitrationCompleted: false, //客服仲裁完结
-        edit: UserPermissions.value == '仓库客服' && AppealStatusT.value, //编辑
+        edit: false, //编辑
       };
-    case 3: //待处理
+    case RouteIndexs.value == 2: //处理完毕
       return {
         reply: false, //回复按钮
-        ProcessingResults: UserPermissions.value == '仓库客服',//处理结果按钮
-        end: UserPermissions.value == '客服经理', //完结按钮
-        repulse: false, //打回按钮
-        ArbitrationCompleted: false,//客服仲裁完结
-        edit: false,  //编辑
+        ProcessingResults: false, //处理结果按钮
+        end: UserPermissions.value == '职能客服', //完结按钮
+        repulse: UserPermissions.value == '客服经理', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 3: //待处理
+      return {
+        reply: UserPermissions.value == '仓库客服', //回复按钮
+        ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
+        end: UserPermissions.value == '职能客服', //完结按钮
+        repulse: UserPermissions.value == '职能客服', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: false, //编辑
       };
-    case 4: //理赔金额未出
+    case RouteIndexs.value == 4: //理赔金额未出
       return {
         reply: false, //回复按钮
         ProcessingResults: false, //处理结果按钮
         end: false, //完结按钮
-        repulse: false,  //打回按钮
+        repulse: false, //打回按钮
         ArbitrationCompleted: false, //客服仲裁完结
-        edit: UserPermissions.value == '仓库客服',  //编辑
+        edit: false, //编辑
       };
-    case 5: //仲裁中
+    case RouteIndexs.value == 5: //仲裁中
       return {
         reply: false, //回复按钮
         ProcessingResults: false, //处理结果按钮
         end: false, //完结按钮
         repulse: false, //打回按钮
-        ArbitrationCompleted: false, //客服仲裁完结
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
         edit: false, //编辑
       };
-    case 6: //完结
+    case RouteIndexs.value == 6: //完结
       return {
-        reply: false,//回复按钮
+        reply: false, //回复按钮
         ProcessingResults: false, //处理结果按钮
         end: false, //完结按钮
         repulse: false, //打回按钮
         ArbitrationCompleted: false, //客服仲裁完结
-        edit: false,  //编辑
+        edit: false, //编辑
       };
-    case 7: //超时未处理
+    case RouteIndexs.value == 7: //超时未处理
       return {
         reply: false, //回复按钮
         ProcessingResults: false, //处理结果按钮
         end: false, //完结按钮
-        repulse: false,//打回按钮
+        repulse: false, //打回按钮
         ArbitrationCompleted: false, //客服仲裁完结
         edit: false, //编辑
       };
@@ -708,19 +726,14 @@ const ButtonPermissions = computed(() => {
       return {
         reply: false, //回复按钮
         ProcessingResults: false, //处理结果按钮
-        end: false,//完结按钮
-        repulse: false,//打回按钮
-        ArbitrationCompleted: false,//客服仲裁完结
-        edit: false,//编辑
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
       };
   }
 });
 
-
-
-
-
-
 // 上传图片规则
 const beforeAvatarUpload = rawFile => {
   if (rawFile.type !== 'image/png') {
@@ -734,9 +747,9 @@ const beforeAvatarUpload = rawFile => {
 };
 // 点击图片列表回调
 const pictureList = val => {
-  dialogImgList.value=true;
+  dialogImgList.value = true;
   console.log(val, '图片列表');
-  amplifyurl.value=val.url;
+  amplifyurl.value = val.url;
 };
 // 点击图片移除
 const ImgListRemove = val => {
@@ -805,6 +818,10 @@ const ResponsiblePartychange = (val, index) => {
   });
 };
 const onLoad = () => {
+  if($route.query.RouteIndexs!='null'){
+    RouteIndexs.value = $route.query.RouteIndexs;//记录当前状态
+  }
+ 
   console.log($route.query.id, '页面初始化');
   routerState.value = $route.query.routerState;
   updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
@@ -1189,7 +1206,6 @@ const addingRecord = () => {
 };
 // 客服仲裁完结
 const CustomerServiceCompleted = () => {
-
   $router.push({
     path: '/aftersales/aftersalesWorkOrdermodify',
     query: {
@@ -1202,7 +1218,6 @@ const CustomerServiceCompleted = () => {
       index: '1',
     },
   });
-
 };
 // 编辑信息
 const EditInformation = () => {
@@ -1566,7 +1581,7 @@ const EndJump = () => {
     height: 30px !important;
   }
 }
-:deep(.el-image){
+:deep(.el-image) {
   width: 100% !important;
   height: 300px !important;
 }

From 38756a91968e1143a7783c60a0daa976f2d624dd Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 23 Dec 2023 10:55:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8C=85=E4=BB=B6=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockArticle.js  |    2 +-
 .../inventory/distrilbutionBillLading.vue     |   75 +-
 .../reservation/reservationAddFrom.vue        | 4795 +++++++++--------
 3 files changed, 2441 insertions(+), 2431 deletions(-)

diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index ce96367d..960addcc 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -305,7 +305,7 @@ export const getPackageListByStockArticleId = (current, size, orderId) => {
     url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId',
     method: 'get',
     params: {
-      orderId,
+      ...orderId,
       current,
       size,
     },
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 142bc4f5..35165a51 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -91,9 +91,9 @@
           </el-col>
         </el-row>
         <el-row :gutter="20" class="toscontent">
-          <el-col :span="24" >
-            <el-form-item label="物品明细" prop="certificateType" >
-              <el-tabs type="border-card"  @tab-click="handleChlickTab" style="width: 100%;">
+          <el-col :span="24">
+            <el-form-item label="物品明细" prop="certificateType">
+              <el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%">
                 <el-tab-pane label="定制品">
                   <el-button
                     type="primary"
@@ -179,7 +179,7 @@
               </el-tabs>
             </el-form-item>
           </el-col>
-          <el-col v-if = !view :span="8">
+          <el-col v-if="!view" :span="8">
             <el-form-item label="提货证件" label-width="120px">
               <el-upload
                 v-model:file-list="fileListSell"
@@ -202,8 +202,8 @@
                 </template>
               </el-upload>
             </el-form-item>
-          </el-col >
-          <el-col v-if = !view :span="8">
+          </el-col>
+          <el-col v-if="!view" :span="8">
             <el-form-item label="文员确定图片" label-width="120px">
               <el-upload
                 v-model:file-list="fileListClerk"
@@ -227,7 +227,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-          <el-col v-if = !view :span="8">
+          <el-col v-if="!view" :span="8">
             <el-form-item label="库管签收图片" label-width="120px">
               <el-upload
                 v-model:file-list="fileListLibrary"
@@ -253,7 +253,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <div v-if = view>
+      <div v-if="view">
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="提货证件" label-width="120px">
@@ -306,7 +306,6 @@
           <el-col :span="8">
             <el-form-item label="库管签收图片" label-width="120px">
               <el-upload
-
                 v-model:file-list="fileListLibrary"
                 class="upload-demo"
                 :action="action"
@@ -321,7 +320,7 @@
                 :on-remove="handleRemove"
                 list-type="picture"
               >
-                <el-button type="primary"  :disabled = "!view">上传</el-button>
+                <el-button type="primary" :disabled="!view">上传</el-button>
                 <template #tip>
                   <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                 </template>
@@ -331,8 +330,8 @@
         </el-row>
       </div>
 
-<!--      &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
-      <div class="foot"   :disabled="view"  >
+      <!--      &lt;!&ndash; 表单按钮 &ndash;&gt; v-if="!view || viewSC"-->
+      <div class="foot" :disabled="view">
         <div class="dialog-footer">
           <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
             >提 交</el-button
@@ -575,7 +574,6 @@
         <img w-full :src="Imgurl" alt="Preview Image" />
       </el-dialog>
     </div>
-
   </basic-container>
 </template>
 
@@ -602,8 +600,8 @@ import { nextTick, ref } from 'vue';
 export default {
   data() {
     return {
-      dialogImg:false,
-      Imgurl:undefined,
+      dialogImg: false,
+      Imgurl: undefined,
       OrdercolumnList: [
         {
           prop: 'serviceNumber',
@@ -1824,7 +1822,7 @@ export default {
       this.onLoad(this.page);
     } else if (this.$route.query.type == '3') {
       this.onLoadCj();
-    }else if (this.$route.query.type == '4') {
+    } else if (this.$route.query.type == '4') {
       //查询提货编辑数据
       this.view = true;
       this.getDetailOen();
@@ -2135,6 +2133,7 @@ export default {
     },
     //订单选择确定
     callFordeliveryOrder() {
+      console.log('111 :>> ', 111);
       let st = false;
       let sts = false;
       let ad = false;
@@ -2142,9 +2141,11 @@ export default {
       let consigneeMobile = '';
       this.selectionList.some(i => {
         if (this.dataList.length > 0) {
-          let w = this.dataList.find(
-            c => c.consigneeMobile == i.consigneeMobile && c.consigneePerson == i.consigneePerson
-          );
+          let w = this.dataList.find(c => {
+            console.log('i :>> ', i);
+            console.log('c :>> ', c);
+            return c.consigneeMobile == i.consigneeMobile && c.consigneePerson == i.consigneePerson;
+          });
           if (!w) {
             ad = true;
           }
@@ -2346,8 +2347,8 @@ export default {
     },
     handlePreview(file) {
       console.log(file);
-        this.Imgurl =file.url;
-        this.dialogImg =true;
+      this.Imgurl = file.url;
+      this.dialogImg = true;
     },
     textbox(e, index) {
       let nu = index + 1;
@@ -3117,23 +3118,23 @@ export default {
 .el-input-number {
   width: 100%;
 }
-:deep(.maboxhi){
-   height: 100% !important;
+:deep(.maboxhi) {
+  height: 100% !important;
 }
-.toscontent{
-   :deep(.el-form-item__content){
-      height: 400px;
-      overflow-y: scroll;
-      align-items: flex-start;
-     }
-   :deep(.el-tabs){
-      height: 100% !important;
-     }
+.toscontent {
+  :deep(.el-form-item__content) {
+    height: 400px;
+    overflow-y: scroll;
+    align-items: flex-start;
+  }
+  :deep(.el-tabs) {
+    height: 100% !important;
+  }
 }
-.LoadIMG{
-   img{
-      width: 100%;
-      height: 100%;
-   }
+.LoadIMG {
+  img {
+    width: 100%;
+    height: 100%;
+  }
 }
 </style>
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 29d44c40..99cf6c33 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -1,498 +1,470 @@
 <template>
-    <basic-container>
-        <div class="avue-crud">
-            <el-form
-                    ref="form"
-                    :model="form"
-                    prop="consignee"
-                    label-width="80px"
-                    :rules="reservationRules"
-            >
-                <el-row>
-                    <el-col :span="10">
-                        <el-form-item label="收货人:" prop="consignee" label-width="100px">
-                            <el-input v-model="form.consignee" clearable placeholder="请输入收货人"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="预约时间:" label-width="100px">
-                            <el-date-picker
-                                    v-model="form.reservationDate"
-                                    type="date"
-                                    clearable
-                                    placeholder="选择日期时间"
-                                    format="YYYY/MM/DD"
-                                    value-format="YYYY-MM-DD"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="10">
-                        <el-form-item label="收货地址:" prop="deliveryAddress" label-width="100px">
-                            <el-input v-model="form.deliveryAddress" clearable placeholder="请输入收件地址"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="时&emsp;&emsp;段:" prop="periodOfTime" label-width="100px">
-                            <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
-                                <el-radio :label="item.dictKey" :value="item.dictKey"
-                                >{{ item.dictValue }}&emsp;
-                                </el-radio>
-                            </el-radio-group>
-                            <!--                            :label="item.dictValue"-->
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="10">
-                        <el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px">
-                            <el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话"/>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="10">
-                        <el-form-item label="配送类型:" prop="serveType" label-width="100px">
-                            <!--                            v-for="item in this.deliveryTypeData"-->
-                            <el-radio-group v-model="form.deliveryType">
-                                <el-radio :label="'2'" :value="'2'">市配&emsp;</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="10">
-                        <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
-                            <el-input v-model="form.replaceFee" :disabled="true"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="配送方式:" prop="serveType" label-width="100px">
-                            <!--                            v-for="item in this.deliveryWayData"-->
-                            <el-radio-group v-model="form.deliveryWay">
-                                <el-radio :label="'10'" :value="'10'">送货&emsp;</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <!--                    <el-col :span="10">-->
-                    <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
-                    <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
-                    <el-col :span="10">
-                        <el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
-                            <el-input type="number" v-model="form.collectionFee"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="加&emsp;&emsp;急:" prop="serveType" label-width="100px">
-                            <!--                            v-for="item in this.deliveryWayData"-->
-                            <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
-                                <el-radio :label="item.dictKey" :value="item.dictKey"
-                                >{{ item.dictValue }}&emsp;
-                                </el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="10">
-                        <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
-                            <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">
-                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
-                                <el-checkbox :label="item.dictKey" :value="item.dictKey"
-                                >{{ item.dictValue }}&emsp;
-                                </el-checkbox>
-                            </el-checkbox-group>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
-                            <el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="form.remarks">
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-
-            <el-tabs type="border-card" @tab-click="handleClick">
-                <el-tab-pane label="订单">
-                    <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
-                    <tablecmt
-                            :columnList="columnList"
-                            :tableData="orderData"
-                            :loading="loading"
-                            @inputTxt="inputsc"
-                            @timeCheck="timesc"
-                            @btnCheck="btnsc"
-                            @selectCheck="selectsc"
-                            @selection="selectionChange"
-                    >
-                        <template #default="slotProps">
-                            <el-text
-                                    v-if="slotProps.scope.row.resource !== '零担'"
-                                    type="primary"
-                                    link
-                                    icon="el-icon-view"
-                                    @click="viewStockArticlePackage(slotProps.scope.row)"
-                            >查看包件
-                            </el-text>
-                            <el-text
-                                    v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
-                                    type="primary"
-                                    link
-                                    icon="el-icon-view"
-                                    @click="entryNum(slotProps.scope.row)"
-                            >在库录入
-                            </el-text>
-                            <el-text
-                                    v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
-                                    type="primary"
-                                    link
-                                    icon="el-icon-view"
-                                    @click="entryReservationNum(slotProps.scope.row)"
-                            >预约录入
-                            </el-text>
-                            <el-text
-                                    type="primary"
-                                    link
-                                    icon="el-icon-edit"
-                                    @click="removeStockArticle(slotProps.scope.row)"
-                            >移除
-                            </el-text>
-                        </template>
-                    </tablecmt>
-                    <!-- <el-table ref="table"
-                                                  v-loading="loading"
-                                                  :data="orderData"
-                                                  :height="height"
-                                                  style="width: 100%"
-                                                  :border="option.border">
-                                            <el-table-column v-if="option.index" label="序号" type="index" width="80px"
-                                                             align="center"></el-table-column>
-                                            <template v-for="(item,index) in option.columnReservations">
-                                                <el-table-column v-if="item.hide!==true"
-                                                                 :prop="item.prop"
-                                                                 :label="item.label"
-                                                                 :width="item.width"
-                                                                 :key="index">
-
-                                                </el-table-column>
-                                            </template>
-                                            <el-table-column prop="menu" label="操作" :width="220" align="center">
-                                                <template #="{row}">
-                                                    <el-button type="primary" link icon="el-icon-view"
-                                                               @click="viewStockArticlePackage(row)">查看包件
-                                                    </el-button>
-                                                    <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
-                                                    </el-button>
-
-                                                </template>
-                                            </el-table-column>
-                                        </el-table> -->
-                </el-tab-pane>
-
-                <el-tab-pane label="库存品">
-                    <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
-                    <tablecmt
-                            :columnList="stockcolumnList"
-                            :tableData="inventoryData"
-                            :loading="loading"
-                            @inputTxt="inputsc"
-                            @timeCheck="timesc"
-                            @btnCheck="btnsc"
-                            @selectCheck="selectsc"
-                            @selection="selectionChange"
-                    >
-                        <template #default="slotProps">
-                            <!--              <el-text-->
-                            <!--                      v-if="inventoryShow"-->
-                            <!--                      type="primary"-->
-                            <!--                      link-->
-                            <!--                      icon="el-icon-edit"-->
-                            <!--                      @click="showStockListEdit(slotProps.scope.row)"-->
-                            <!--              >查看详情</el-text>-->
-
-                            <el-text
-                                    type="primary"
-                                    link
-                                    icon="el-icon-edit"
-                                    @click="removeStockList(slotProps.scope.row)"
-                            >移除
-                            </el-text>
-                        </template>
-                    </tablecmt>
-                </el-tab-pane>
-            </el-tabs>
-
-            <div class="submit-container">
-                <el-button
-                        :loading="loadingObj.submitBtnLoading"
-                        type="primary"
-                        icon="el-icon-circle-close"
-                        @click="onSubmit"
-                >提交(配送订单预约)
-                </el-button>
-                <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
-            </div>
-
-            <!-- 底部站位 -->
-            <div class="footer-container"></div>
-            <!-- 在库订单信息 -->
-            <template v-if="orderShow">
-                <el-dialog
-                        v-model="orderShow"
-                        title="在库订单信息"
-                        class="orderShow"
-                        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"-->
-                    <!--                :disabled="Boolean(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.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>-->
-
-                    <!--            &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"
-                    >
-                        <template #default="slotProps">
-                            <el-text
-                                    type="primary"
-                                    link
-                                    icon="el-icon-edit"
-                                    @click="updateClient(slotProps.scope.row)"
-                            >修改客户
-                            </el-text>
-                        </template>
-                    </tablecmt>
-
-                    <el-row>
-                        <div class="avue-crud__pagination" style="width: 100%">
-                            <!-- 分页模块 -->
-                            <el-pagination
-                                    align="right"
-                                    background
-                                    @size-change="sizeOrderChange"
-                                    @current-change="currentOrderChange"
-                                    :current-page="page.currentPage"
-                                    :page-sizes="[30, 50, 80, 120]"
-                                    :page-size="page.pageSize"
-                                    layout="total, sizes, prev, pager, next, jumper"
-                                    :total="page.total"
-                            >
-                            </el-pagination>
-                        </div>
-                    </el-row>
-                    <el-form-item style="margin-left: 45%; margin-top: 5px">
-                        <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
-                        >提交(订单)
-                        </el-button>
-                        <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
-                    </el-form-item>
-                </el-dialog>
+  <basic-container>
+    <div class="avue-crud">
+      <el-form
+        ref="form"
+        :model="form"
+        prop="consignee"
+        label-width="80px"
+        :rules="reservationRules"
+      >
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="收货人:" prop="consignee" label-width="100px">
+              <el-input v-model="form.consignee" clearable placeholder="请输入收货人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="预约时间:" label-width="100px">
+              <el-date-picker
+                v-model="form.reservationDate"
+                type="date"
+                clearable
+                placeholder="选择日期时间"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="收货地址:" prop="deliveryAddress" label-width="100px">
+              <el-input v-model="form.deliveryAddress" clearable placeholder="请输入收件地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="时&emsp;&emsp;段:" prop="periodOfTime" label-width="100px">
+              <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
+                <el-radio :label="item.dictKey" :value="item.dictKey"
+                  >{{ item.dictValue }}&emsp;
+                </el-radio>
+              </el-radio-group>
+              <!--                            :label="item.dictValue"-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px">
+              <el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item label="配送类型:" prop="serveType" label-width="100px">
+              <!--                            v-for="item in this.deliveryTypeData"-->
+              <el-radio-group v-model="form.deliveryType">
+                <el-radio :label="'2'" :value="'2'">市配&emsp;</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
+              <el-input v-model="form.replaceFee" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="配送方式:" prop="serveType" label-width="100px">
+              <!--                            v-for="item in this.deliveryWayData"-->
+              <el-radio-group v-model="form.deliveryWay">
+                <el-radio :label="'10'" :value="'10'">送货&emsp;</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <!--                    <el-col :span="10">-->
+          <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
+          <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
+          <el-col :span="10">
+            <el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
+              <el-input type="number" v-model="form.collectionFee" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="加&emsp;&emsp;急:" prop="serveType" label-width="100px">
+              <!--                            v-for="item in this.deliveryWayData"-->
+              <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
+                <el-radio :label="item.dictKey" :value="item.dictKey"
+                  >{{ item.dictValue }}&emsp;
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
+              <el-input v-model="form.otherFee" placeholder="请输入其他费用" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="服务类型:" prop="serveType" label-width="120px">
+              <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
+                <el-checkbox :label="item.dictKey" :value="item.dictKey"
+                  >{{ item.dictValue }}&emsp;
+                </el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
+              <el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="form.remarks">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-tabs type="border-card" @tab-click="handleClick">
+        <el-tab-pane label="订单">
+          <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
+          <tablecmt
+            :columnList="columnList"
+            :tableData="orderData"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              <el-text
+                v-if="slotProps.scope.row.resource !== '零担'"
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="viewStockArticlePackage(slotProps.scope.row)"
+                >查看包件
+              </el-text>
+              <el-text
+                v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="entryNum(slotProps.scope.row)"
+                >在库录入
+              </el-text>
+              <el-text
+                v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="entryReservationNum(slotProps.scope.row)"
+                >预约录入
+              </el-text>
+              <el-text
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockArticle(slotProps.scope.row)"
+                >移除
+              </el-text>
             </template>
-
-            <el-dialog v-model="zeroOrderShow" title="零担品类信息" width="50%" :model="zeroOrderData">
-                <el-row :gutter="24" class="rows">
-                    <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                        <h3>
-                            <span>在库总数：{{ this.obj.handQuantity }}</span>
-                        </h3>
-                    </el-col>
-                </el-row>
-
-                <template v-if="zeroOrderData != null">
-                    <div v-for="(item, index) in zeroOrderData" :key="index">
-                        <el-row :gutter="24" class="rows">
-                            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                                <span>名称：{{ item.firsts }}</span>
-                            </el-col>
-                            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                                <span>总数量：{{ item.quantity }} </span>
-                            </el-col>
-                            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                                <span>在库数量：{{ item.handQuantity }} </span>
-                            </el-col>
-                            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                                <span>冻结数量：{{ item.deliveryQuantity }} </span>
-                            </el-col>
-                            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                                <span>出库数量：{{ item.outboundQuantity }} </span>
-                            </el-col>
-                            <el-col :xl="4" :lg="7" :md="8" :sm="24">
+          </tablecmt>
+        </el-tab-pane>
+
+        <el-tab-pane label="库存品">
+          <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
+          <tablecmt
+            :columnList="stockcolumnList"
+            :tableData="inventoryData"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              <!--              <el-text-->
+              <!--                      v-if="inventoryShow"-->
+              <!--                      type="primary"-->
+              <!--                      link-->
+              <!--                      icon="el-icon-edit"-->
+              <!--                      @click="showStockListEdit(slotProps.scope.row)"-->
+              <!--              >查看详情</el-text>-->
+
+              <el-text
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockList(slotProps.scope.row)"
+                >移除
+              </el-text>
+            </template>
+          </tablecmt>
+        </el-tab-pane>
+      </el-tabs>
+
+      <div class="submit-container">
+        <el-button
+          :loading="loadingObj.submitBtnLoading"
+          type="primary"
+          icon="el-icon-circle-close"
+          @click="onSubmit"
+          >提交(配送订单预约)
+        </el-button>
+        <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
+      </div>
+
+      <!-- 底部站位 -->
+      <div class="footer-container"></div>
+      <!-- 在库订单信息 -->
+      <template v-if="orderShow">
+        <el-dialog
+          v-model="orderShow"
+          title="在库订单信息"
+          class="orderShow"
+          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"-->
+          <!--                :disabled="Boolean(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.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>-->
+
+          <!--            &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"
+          >
+            <template #default="slotProps">
+              <el-text
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="updateClient(slotProps.scope.row)"
+                >修改客户
+              </el-text>
+            </template>
+          </tablecmt>
+
+          <el-row>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeOrderChange"
+                @current-change="currentOrderChange"
+                :current-page="page.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+              >
+              </el-pagination>
+            </div>
+          </el-row>
+          <el-form-item style="margin-left: 45%; margin-top: 5px">
+            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
+              >提交(订单)
+            </el-button>
+            <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
+          </el-form-item>
+        </el-dialog>
+      </template>
+
+      <el-dialog v-model="zeroOrderShow" title="零担品类信息" width="50%" :model="zeroOrderData">
+        <el-row :gutter="24" class="rows">
+          <el-col :xl="4" :lg="7" :md="8" :sm="24">
+            <h3>
+              <span>在库总数：{{ this.obj.handQuantity }}</span>
+            </h3>
+          </el-col>
+        </el-row>
+
+        <template v-if="zeroOrderData != null">
+          <div v-for="(item, index) in zeroOrderData" :key="index">
+            <el-row :gutter="24" class="rows">
+              <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                <span>名称：{{ item.firsts }}</span>
+              </el-col>
+              <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                <span>总数量：{{ item.quantity }} </span>
+              </el-col>
+              <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                <span>在库数量：{{ item.handQuantity }} </span>
+              </el-col>
+              <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                <span>冻结数量：{{ item.deliveryQuantity }} </span>
+              </el-col>
+              <el-col :xl="4" :lg="7" :md="8" :sm="24">
+                <span>出库数量：{{ item.outboundQuantity }} </span>
+              </el-col>
+              <el-col :xl="4" :lg="7" :md="8" :sm="24">
                 <span
-                >可用数量：{{
+                  >可用数量：{{
                     item.handQuantity - item.deliveryQuantity - item.outboundQuantity
                   }}</span
                 >
-                                <!--                                <span>可用数量：{{(item.quantity)}}</span>-->
-                            </el-col>
-                        </el-row>
-                        <el-input-number
-                                v-if="this.isrReservationEntry"
-                                v-model="item.reservationNum"
-                                min="0"
-                                :max="item.zeroOrderMax"
-                                placeholder="请输入预约数量"
-                        ></el-input-number>
-                        <el-input-number
-                                v-else
-                                v-model="item.number"
-                                min="0"
-                                :max="item.quantity"
-                                placeholder="请输入预约数量"
-                        ></el-input-number>
-                        <!--                    <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity "  placeholder="请输入预约数量"></el-input-number>-->
-                    </div>
-                </template>
-                <el-form-item style="margin-left: 37%; margin-top: 5px">
-                    <el-button
-                            v-if="!isrReservationEntry"
-                            type="primary"
-                            icon="el-icon-circle-close"
-                            @click="onSubmitUpdateZeroOrder"
-                    >修改(零担订单)
-                    </el-button>
-                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
-                    >提交(零担订单)
-                    </el-button>
-                    <el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button>
-                </el-form-item>
-            </el-dialog>
-
-            <!-- 库存品信息 -->
-            <template v-if="stockListShow">
-                <el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="100%">
-                    <!--                :before-close="handleClose"-->
-                    <!--          <el-form :inline="true" :model="query">-->
-                    <!--            <el-form-item label="商场名称:">-->
-                    <!--              <el-input-->
-                    <!--                v-model="query.marketName"-->
-                    <!--                :disabled="Boolean(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="handleAddInventory"-->
-                    <!--                >搜 索-->
-                    <!--              </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="inputscInventory"
-                            @selectCheck="searchStockList"
-                            @selection="selectionInventoryChange"
-                            ref="multipleTable"
-                    >
-                        <!--            @selection="selectionChange"-->
-
-                        <template #default="slotProps">
-                            <el-text
-                                    type="primary"
-                                    link
-                                    icon="el-icon-edit"
-                                    @click="removeStockList(slotProps.scope.row)"
-                            >移除
-                            </el-text>
-                        </template>
-                    </tablecmt>
-                    <el-form-item style="margin-left: 45%; margin-top: 5px">
-                        <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
-                        >提交(库存品)
-                        </el-button>
-                        <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
-                    </el-form-item>
-                </el-dialog>
+                <!--                                <span>可用数量：{{(item.quantity)}}</span>-->
+              </el-col>
+            </el-row>
+            <el-input-number
+              v-if="this.isrReservationEntry"
+              v-model="item.reservationNum"
+              min="0"
+              :max="item.zeroOrderMax"
+              placeholder="请输入预约数量"
+            ></el-input-number>
+            <el-input-number
+              v-else
+              v-model="item.number"
+              min="0"
+              :max="item.quantity"
+              placeholder="请输入预约数量"
+            ></el-input-number>
+            <!--                    <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity "  placeholder="请输入预约数量"></el-input-number>-->
+          </div>
+        </template>
+        <el-form-item style="margin-left: 37%; margin-top: 5px">
+          <el-button
+            v-if="!isrReservationEntry"
+            type="primary"
+            icon="el-icon-circle-close"
+            @click="onSubmitUpdateZeroOrder"
+            >修改(零担订单)
+          </el-button>
+          <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
+            >提交(零担订单)
+          </el-button>
+          <el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button>
+        </el-form-item>
+      </el-dialog>
+
+      <!-- 库存品信息 -->
+      <template v-if="stockListShow">
+        <el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="100%">
+          <!--                :before-close="handleClose"-->
+          <!--          <el-form :inline="true" :model="query">-->
+          <!--            <el-form-item label="商场名称:">-->
+          <!--              <el-input-->
+          <!--                v-model="query.marketName"-->
+          <!--                :disabled="Boolean(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="handleAddInventory"-->
+          <!--                >搜 索-->
+          <!--              </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="inputscInventory"
+            @selectCheck="searchStockList"
+            @selection="selectionInventoryChange"
+            ref="multipleTable"
+          >
+            <!--            @selection="selectionChange"-->
+
+            <template #default="slotProps">
+              <el-text
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockList(slotProps.scope.row)"
+                >移除
+              </el-text>
             </template>
-
-            <template v-if="isaddvalue">
-                <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
-                    <!-- 列表模块 -->
-                    <!--                :isselectfun="checkPackage"-->
-                    <tablecmt
-                            :columnList="columnParcels"
-                            :tableData="packageData"
-                            :checkselect="packageDataSec"
-                            :loading="loading"
-                            @inputTxt="inputscPackage"
-                            @selection="selectionPackageChange"
-                            @select="tableAllSelection"
-                            @cell-mouse-enter="hove"
-                    >
-                        <template #default="slotProps">
-                            <!-- <el-text
+          </tablecmt>
+          <el-form-item style="margin-left: 45%; margin-top: 5px">
+            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
+              >提交(库存品)
+            </el-button>
+            <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
+          </el-form-item>
+        </el-dialog>
+      </template>
+
+      <template v-if="isaddvalue">
+        <el-dialog v-model="isaddvalue" title="包件信息" width="100%" :model="addvalue">
+          <!-- 列表模块 -->
+          <!--                :isselectfun="checkPackage"-->
+          <tablecmt
+            :columnList="columnParcels"
+            :tableData="packageData"
+            :checkselect="packageDataSec"
+            :loading="loading"
+            @inputTxt="inputscPackage"
+            @selection="selectionPackageChange"
+            @select="tableAllSelection"
+            @cell-mouse-enter="hove"
+          >
+            <template #default="slotProps">
+              <!-- <el-text
                                           type="primary"
                                           link
                                           icon="el-icon-edit"
                                           @click="removeStockList(slotProps.scope.row)"
                                           >移除</el-text
                                         > -->
-                        </template>
-                    </tablecmt>
-                    <!-- <el-table
+            </template>
+          </tablecmt>
+          <!-- <el-table
                               ref="packageList"
                               v-loading="loading"
                               @selection-change="selectionPackageChange"
@@ -526,436 +498,480 @@
                                  </template>
                               </el-table-column>
                             </el-table> -->
-                    <el-form-item style="margin-left: 45%; margin-top: 5px">
-                        <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
-                        >提交(包件)
-                        </el-button>
-                        <el-button icon="el-icon-circle-close" @click="isaddvalue = false">返 回</el-button>
-                    </el-form-item>
-                </el-dialog>
-            </template>
-
-            <el-dialog v-model="dialogVisible" title="客户信息" width="30%" :model="clientData">
-                <el-row :gutter="24" class="rows">
-                    <el-col :xl="6" :lg="7" :md="8" :sm="24">
-                        <div class="clientRow">
-                            <span>商场名称：{{ clientData.mallName }} </span>
-                        </div>
-                    </el-col>
-                </el-row>
-                <el-form :label-position="right" label-width="80px" :model="formLabelAlign">
-                    <el-form-item label="用户名称:">
-                        <el-input v-model="clientData.customerName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="用户电话:">
-                        <el-input v-model="clientData.customerTelephone"></el-input>
-                    </el-form-item>
-                    <el-form-item label="用户地址:">
-                        <el-input v-model="clientData.customerAddress"></el-input>
-                    </el-form-item>
-                </el-form>
-
-                <template #footer>
+          <el-form-item style="margin-left: 45%; margin-top: 5px">
+            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
+              >提交(包件)
+            </el-button>
+            <el-button icon="el-icon-circle-close" @click="isaddvalue = false">返 回</el-button>
+          </el-form-item>
+        </el-dialog>
+      </template>
+
+      <el-dialog v-model="dialogVisible" title="客户信息" width="30%" :model="clientData">
+        <el-row :gutter="24" class="rows">
+          <el-col :xl="6" :lg="7" :md="8" :sm="24">
+            <div class="clientRow">
+              <span>商场名称：{{ clientData.mallName }} </span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-form :label-position="right" label-width="80px" :model="formLabelAlign">
+          <el-form-item label="用户名称:">
+            <el-input v-model="clientData.customerName"></el-input>
+          </el-form-item>
+          <el-form-item label="用户电话:">
+            <el-input v-model="clientData.customerTelephone"></el-input>
+          </el-form-item>
+          <el-form-item label="用户地址:">
+            <el-input v-model="clientData.customerAddress"></el-input>
+          </el-form-item>
+        </el-form>
+
+        <template #footer>
           <span class="dialog-footer">
             <el-button @click="dialogVisible = false">取消</el-button>
             <el-button type="primary" @click="submitClient"> 确定(修改客户) </el-button>
           </span>
-                </template>
-            </el-dialog>
-        </div>
-    </basic-container>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
 </template>
 
 <script>
-  import {
-    autonomouslySave,
-    update,
-    remove,
-    getReservationInfo,
-    getReservationZeroOrderDetail,
-    getReservationPackageListByOrderId
-  } from '@/api/distribution/distributionReservation';
-  import {
-    getStockArticleList,
-    getPackageListByStockArticleId,
-    selectStockArticleInfoList,
-    selectUpdateAvailableStockArticle,
-    getZeroOrderDetail,
-    updateClient
-  } from '@/api/distribution/distributionStockArticle';
-  import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
-  import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList';
-
-  import option from '@/option/distribution/distributionStockArticle';
-  import { mapGetters } from 'vuex';
-  import { getDictionaryBiz } from '@/api/system/dict';
-  import dayjs from 'dayjs';
-  import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
-  import { setNodeHeight } from '@/utils/util.js';
-
-  export default {
-    data() {
-      return {
-        packageQuery: {},
-        orderRow:{},
-        columnList: [
-          {
-            prop: 'waybillNumber',
-            label: '运单号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderCode',
-            label: '订单自编号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '150',
-            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: '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,
-            isshowSummary: true,
-            head: false
-          },
-          {
-            prop: 'handQuantity',
-            label: '在库件数',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            isshowSummary: true,
-            head: false
-          },
-          {
-            prop: 'reservationNum',
-            label: '预约数量',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            isshowSummary: 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: 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,
-            isshowSummary: true,
-            sortable: true
-          },
-          {
-            prop: 'quantityOccupied',
-            label: '冻结数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            isshowSummary: true,
-            sortable: true
-          },
-          /* {
+import {
+  autonomouslySave,
+  update,
+  remove,
+  getReservationInfo,
+  getReservationZeroOrderDetail,
+  getReservationPackageListByOrderId,
+} from '@/api/distribution/distributionReservation';
+import {
+  getStockArticleList,
+  getPackageListByStockArticleId,
+  selectStockArticleInfoList,
+  selectUpdateAvailableStockArticle,
+  getZeroOrderDetail,
+  updateClient,
+} from '@/api/distribution/distributionStockArticle';
+import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
+import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList';
+
+import option from '@/option/distribution/distributionStockArticle';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
+import { setNodeHeight } from '@/utils/util.js';
+
+export default {
+  data() {
+    return {
+      packageQuery: {},
+      orderRow: {},
+      columnList: [
+        {
+          prop: '',
+          label: '复选框',
+          type: 0,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          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: '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,
+          isshowSummary: true,
+          head: false,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: true,
+          head: false,
+        },
+        {
+          prop: 'reservationNum',
+          label: '预约数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: 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: 0,
+        //   values: '',
+        //   width: 55,
+        //   checkarr: [],
+        //   fixed: true,
+        // },
+        {
+          prop: '',
+          label: '复选框',
+          type: 0,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          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,
+          isshowSummary: true,
+          sortable: true,
+        },
+        {
+          prop: 'quantityOccupied',
+          label: '冻结数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          isshowSummary: true,
+          sortable: true,
+        },
+        /* {
              prop: 'despatch',
              label: '物流发运车次',
              type: 2,
@@ -965,566 +981,566 @@
              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,
-            isshowSummary: true,
-            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: 'reservationNum',
-            label: '预约数量',
-            type: 10,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            isshowSummary: true,
-            head: false
-          },
-          {
-            prop: 'cargoUnit',
-            label: '物料单位',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'unpackingQuantity',
-            label: '拆包数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            isshowSummary: true,
-            sortable: true
-          },
-          {
-            prop: 'unpackName',
-            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: '55',
-            checkarr: [],
-            fixed: false,
-            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,
-            isshowSummary: true,
-            head: false
-          },
-          {
-            prop: 'handQuantity',
-            label: '在库件数',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            isshowSummary: 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
-          },
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '200',
-            checkarr: [],
-            fixed: 'right',
-            hide: true
-          }
-        ],
-        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,
-            isshowSummary: true,
-            sortable: true
-          },
-          {
-            prop: 'quantityOccupied',
-            label: '冻结数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            isshowSummary: true,
-            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,
+          isshowSummary: true,
+          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: 'reservationNum',
+          label: '预约数量',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: true,
+          head: false,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '物料单位',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'unpackingQuantity',
+          label: '拆包数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          isshowSummary: true,
+          sortable: true,
+        },
+        {
+          prop: 'unpackName',
+          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: '55',
+          checkarr: [],
+          fixed: false,
+          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,
+          isshowSummary: true,
+          head: false,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: 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,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ],
+      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,
+          isshowSummary: true,
+          sortable: true,
+        },
+        {
+          prop: 'quantityOccupied',
+          label: '冻结数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          isshowSummary: true,
+          sortable: true,
+        },
+        /* {
              prop: 'despatch',
              label: '物流发运车次',
              type: 2,
@@ -1534,779 +1550,778 @@
              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,
-            isshowSummary: true,
-            sortable: true
-          },
-          {
-            prop: 'reservationNum',
-            label: '预约数量',
-            type: 10,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            isshowSummary: true,
-            head: false
-          },
-
-          // {
-          //   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,
-            isshowSummary: true,
-            sortable: true
-          },
-          {
-            prop: 'unpackName',
-            label: '拆包状态',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [
-              {
-                value: `true`,
-                label: '是'
-              },
-              {
-                value: `false`,
-                label: '否'
-              }
-            ],
-            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,
+          isshowSummary: true,
+          sortable: true,
+        },
+        {
+          prop: 'reservationNum',
+          label: '预约数量',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: true,
+          head: false,
+        },
 
-          // {
-          //   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: 'waybillNumber',
-            label: '运单号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderCode',
-            label: '订单自编码',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderPackageCode',
-            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: 'sendWarehouseName',
-            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: 'orderPackageStatusName',
-            label: '包件状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderPackageFreezeStatusName',
-            label: '冻结状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderPackageGroundingStatusName',
-            label: '上架状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderPackageStockupStatusName',
-            label: '备货状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'orderPackageReservationStatusName',
-            label: '预约状态',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'materialName',
-            label: '物料名称',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'quantity',
-            label: '数量',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            isshowSummary: true,
-            head: false
-          },
-          {
-            prop: 'goodsAllocation',
-            label: '货位信息',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
-          {
-            prop: 'pallet',
-            label: '所在托盘',
-            type: 1,
-            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,
-        clientData: {},
-        textarea: '',
-        //增值服务字典列表
-        addvalueServeTypeData: [],
-        //配送方式字典列表
-        deliveryWayData: [],
-        whetherData: [],
-        //配送类型字典列表
-        deliveryTypeData: [],
-        //增值服务列表
-        addvalueServeType: [],
-        obj: {},
-        //增值表单输入框对象
-        addvalue: {},
-        costList: [], //字典
-        //增值服务对象
-        addvalueObj: {},
-        //费用列表
-        feeList: [],
-        //楼层
-        floorList: [],
-        //订单行数据
-        orderInfo: {},
-        //服务类型
-        serveType: [],
-        //增加订单弹窗
-        orderShow: false,
-        zeroOrderData: [],
-        zeroOrderShow: false,
-        //是否是预约录入
-        isrReservationEntry: false,
-        // zeroPackageNum:0,
-        //在库订单信息
-        stockArticleInfo: [],
-        //库存品信息
-        inventoryInfo: [],
-        //时段
-        periodOfTimeData: [],
-        //路由订单编号
-        orderIds: '',
-        //预约编号
-        reservationId: '',
-        zeroOrderMax: 0,
-        // 商城名称
-        marketName: '',
-        // 包件复选框列表
-        packageDataSec: [],
-        inventoryData: [],
-        orderData: [],
-        stockListShow: false,
-        isaddvalue: false,
-        packageData: [],
-        packageList: [],
-        inventoryList: [],
-        inventorySelectList: [],
-        orderList: [],
-        orderSelectList: [],
-        inventoryTable: [],
-        inventoryShow: false,
-        reservationRules: {
-          consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
-          deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
-          deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }]
-          // enableStatus: [
-          //   { required: true, message: '请选择启用状态!', trigger: 'change' }
-          // ],
-        },
-        obj: {},
-        /** loading */
-        loadingObj: {
-          /** 提交按钮 */
-          submitBtnLoading: false
-        }
-      };
-    },
-    created() {
-      this.$watch(
-              () => this.$route.params,
-              () => {
-                this.fetchData();
-              },
-              // 组件创建完后获取数据，
-              // 此时 data 已经被 observed 了
-              { immediate: true }
-      );
-    },
-    mounted() {
-      this.init();
+        // {
+        //   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,
+          isshowSummary: true,
+          sortable: true,
+        },
+        {
+          prop: 'unpackName',
+          label: '拆包状态',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [
+            {
+              value: `true`,
+              label: '是',
+            },
+            {
+              value: `false`,
+              label: '否',
+            },
+          ],
+          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);
+        // {
+        //   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,
         },
-        deep: true,
-        immediate: true
-      }
-    },
-    computed: {
-      ...mapGetters(['permission']),
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(',');
-      }
-    },
-    methods: {
-      handleToggleAllSelection() {
-        this.$refs.selecttable.toggleAllSelection();
-      },
-      fetchData() {
-        this.error = this.post = null;
-        this.loading = true;
-        if (this.$route.query.id) {
-          this.orderIds = this.$route.query.id;
-        }
-        if (this.$route.query.reservationId) {
-          this.reservationId = this.$route.query.reservationId;
-        }
-        this.loading = false;
-      },
-      init() {
-        this.height = this.setPx(document.body.clientHeight - 340);
-      },
-      tableAllSelection() {
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageCode',
+          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: 'sendWarehouseName',
+          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: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageFreezeStatusName',
+          label: '冻结状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageGroundingStatusName',
+          label: '上架状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStockupStatusName',
+          label: '备货状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageReservationStatusName',
+          label: '预约状态',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialName',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'quantity',
+          label: '数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          isshowSummary: true,
+          head: false,
+        },
+        {
+          prop: 'goodsAllocation',
+          label: '货位信息',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 1,
+          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,
       },
-      handleClick(tab, event) {
-        this.query = {};
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+      //增值服务弹窗
+      dialogVisible: false,
+      clientData: {},
+      textarea: '',
+      //增值服务字典列表
+      addvalueServeTypeData: [],
+      //配送方式字典列表
+      deliveryWayData: [],
+      whetherData: [],
+      //配送类型字典列表
+      deliveryTypeData: [],
+      //增值服务列表
+      addvalueServeType: [],
+      obj: {},
+      //增值表单输入框对象
+      addvalue: {},
+      costList: [], //字典
+      //增值服务对象
+      addvalueObj: {},
+      //费用列表
+      feeList: [],
+      //楼层
+      floorList: [],
+      //订单行数据
+      orderInfo: {},
+      //服务类型
+      serveType: [],
+      //增加订单弹窗
+      orderShow: false,
+      zeroOrderData: [],
+      zeroOrderShow: false,
+      //是否是预约录入
+      isrReservationEntry: false,
+      // zeroPackageNum:0,
+      //在库订单信息
+      stockArticleInfo: [],
+      //库存品信息
+      inventoryInfo: [],
+      //时段
+      periodOfTimeData: [],
+      //路由订单编号
+      orderIds: '',
+      //预约编号
+      reservationId: '',
+      zeroOrderMax: 0,
+      // 商城名称
+      marketName: '',
+      // 包件复选框列表
+      packageDataSec: [],
+      inventoryData: [],
+      orderData: [],
+      stockListShow: false,
+      isaddvalue: false,
+      packageData: [],
+      packageList: [],
+      inventoryList: [],
+      inventorySelectList: [],
+      orderList: [],
+      orderSelectList: [],
+      inventoryTable: [],
+      inventoryShow: false,
+      reservationRules: {
+        consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
+        deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
+        deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }],
+        // enableStatus: [
+        //   { required: true, message: '请选择启用状态!', trigger: 'change' }
+        // ],
       },
-      //查询出所有的市配订单
-      async handleAddOrder() {
-        this.loading = true;
-        //这里只需要对订单进行正常的搜索即可
-        await this.onLoadOrder(this.page);
-        this.loading = false;
-        this.orderShow = true;
-        this.$nextTick(() => {
-          const _node = document.querySelector('.orderShow .maboxhi');
-          console.log('123 :>> ', 123);
-          console.log('_node :>> ', _node);
-          _node.style.transition = 'all 0.3s';
-          setNodeHeight(_node, '500px');
-        });
+      obj: {},
+      /** loading */
+      loadingObj: {
+        /** 提交按钮 */
+        submitBtnLoading: false,
       },
-      checkOrder(row, index) {
-        if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
-          return false;
-        } else {
-          return true;
-        }
+    };
+  },
+  created() {
+    this.$watch(
+      () => this.$route.params,
+      () => {
+        this.fetchData();
       },
-      handleAddInventory() {
-        let page = this.page;
-        let params = {};
-        this.query.serviceType = '2';
-        if (this.marketName) this.query.marketName = this.marketName;
-        console.log('this.query :>> ', this.query);
-        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-                res => {
-                  const inventoryList = res.data.data;
-                  inventoryList.records.forEach(item => {
-                    item.reservationNum = '0';
-                    item.applyNum = item.quantityStock - item.quantityOccupied;
-                    if (item.unpack) {
-                      item.unpackName = '是';
-                    } else {
-                      item.unpackName = '否';
-                    }
-                  });
-                  this.page.total = inventoryList.total;
-                  console.log('res :>> ', res);
-
-                  // 过滤掉已选择的数量
-
-                  const _inventoryInfo = inventoryList.records;
-                  this.inventoryInfo = _inventoryInfo;
-                  if (this.inventoryData.length !== 0) {
-                    // 获取ids的映射数组
-                    const ids = this.inventoryData.map(val => val.id);
-                    // 赋值给回显勾选的数组
-                    this.inventoryInfo = _inventoryInfo.filter(val => {
-                      // 循环获取符合条件的库存品组成数组
-                      return !ids.includes(val.id);
-                    });
-                  }
-                  this.loading = false;
-                  this.selectionClear();
-                  this.stockListShow = true;
-
-                  this.$nextTick(() => {
-                    const _node = document.querySelector('.stockListShow .maboxhi');
-                    _node.style.transition = 'all 0.3s';
-                    setNodeHeight(_node, '500px');
-                  });
-                }
-        );
-        this.query = {};
-        this.inventoryList = [];
+      // 组件创建完后获取数据，
+      // 此时 data 已经被 observed 了
+      { immediate: true }
+    );
+  },
+  mounted() {
+    this.init();
+
+    this.onLoad(this.page);
+    this.getDictionary();
+  },
+  watch: {
+    '$route.query.reservationId': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal);
+        this.fetchData();
+        this.onLoad(this.page);
       },
-      handleCheckedCitiesChange(value) {
-        if (value) {
-          this.form.addvalueType = value;
+      deep: true,
+      immediate: true,
+    },
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    handleToggleAllSelection() {
+      this.$refs.selecttable.toggleAllSelection();
+    },
+    fetchData() {
+      this.error = this.post = null;
+      this.loading = true;
+      if (this.$route.query.id) {
+        this.orderIds = this.$route.query.id;
+      }
+      if (this.$route.query.reservationId) {
+        this.reservationId = this.$route.query.reservationId;
+      }
+      this.loading = false;
+    },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    tableAllSelection() {},
+    handleClick(tab, event) {
+      this.query = {};
+    },
+    //查询出所有的市配订单
+    async handleAddOrder() {
+      this.loading = true;
+      //这里只需要对订单进行正常的搜索即可
+      await this.onLoadOrder(this.page);
+      this.loading = false;
+      this.orderShow = true;
+      this.$nextTick(() => {
+        const _node = document.querySelector('.orderShow .maboxhi');
+        console.log('123 :>> ', 123);
+        console.log('_node :>> ', _node);
+        _node.style.transition = 'all 0.3s';
+        setNodeHeight(_node, '500px');
+      });
+    },
+    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';
+      if (this.marketName) this.query.marketName = this.marketName;
+      console.log('this.query :>> ', this.query);
+      getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          const inventoryList = res.data.data;
+          inventoryList.records.forEach(item => {
+            item.reservationNum = '0';
+            item.applyNum = item.quantityStock - item.quantityOccupied;
+            if (item.unpack) {
+              item.unpackName = '是';
+            } else {
+              item.unpackName = '否';
+            }
+          });
+          this.page.total = inventoryList.total;
+          console.log('res :>> ', res);
+
+          // 过滤掉已选择的数量
+
+          const _inventoryInfo = inventoryList.records;
+          this.inventoryInfo = _inventoryInfo;
+          if (this.inventoryData.length !== 0) {
+            // 获取ids的映射数组
+            const ids = this.inventoryData.map(val => val.id);
+            // 赋值给回显勾选的数组
+            this.inventoryInfo = _inventoryInfo.filter(val => {
+              // 循环获取符合条件的库存品组成数组
+              return !ids.includes(val.id);
+            });
+          }
+          this.loading = false;
+          this.selectionClear();
+          this.stockListShow = true;
+
+          this.$nextTick(() => {
+            const _node = document.querySelector('.stockListShow .maboxhi');
+            _node.style.transition = 'all 0.3s';
+            setNodeHeight(_node, '500px');
+          });
         }
-        console.log('>>>>>', this.form);
-        if (value.length < 1) {
-          this.costList = [];
-          this.costListName = [];
+      );
+      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;
         }
-        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;
+      });
+    },
+    textbox(e, index, a) {
+      console.log('e,index', e, index, a);
+      if (a === 6) {
+        this.feeList[index + 1] = e;
+        return;
+      }
+      if (a === 5)
+        if (index === 0 && a === 5) {
+          this.floorList[index + 1] = e;
           return;
         }
-        if (a === 5)
-          if (index === 0 && a === 5) {
-            this.floorList[index + 1] = e;
-            return;
-          }
-        this.costList[index + 1] = e;
+      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;
+      //费用列表
+    },
+    //数据字典数据获取
+    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);
         });
-      },
-      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 => {
+      } 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 +
-                      item.reservationNum;
+              item.zeroOrderMax = item.handQuantity - item.deliveryQuantity - item.outboundQuantity;
             });
             this.zeroOrderData = res.data.data;
-            // console.log(res.data.data);
-          });
-        } else {
-          getZeroOrderDetail(row.id).then(res => {
-            if (res.data.data != null) {
-              let a = res.data.data;
-              a.forEach(item => {
-                item.zeroOrderMax = item.handQuantity - item.deliveryQuantity - item.outboundQuantity;
-              });
-              this.zeroOrderData = res.data.data;
-            }
-          });
-        }
-        this.zeroOrderShow = true;
-        this.isrReservationEntry = true;
-      },
-      entryNum(row) {
-        this.obj = row;
-        getZeroOrderDetail(row.id).then(res => {
-          if (res.data.data != null) {
-            this.zeroOrderData = res.data.data;
           }
         });
-        this.zeroOrderShow = true;
-        this.isrReservationEntry = false;
-      },
-      submitClient() {
-        console.log('this.client===============>', this.clientData);
-        updateClient(this.clientData).then(res => {
-          console.log('res>>>>>>>>>>>', res.data.data);
-          this.onLoadOrder(this.page);
-          this.dialogVisible = false;
-        });
-      },
+      }
+      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;
+    },
+    submitClient() {
+      console.log('this.client===============>', this.clientData);
+      updateClient(this.clientData).then(res => {
+        console.log('res>>>>>>>>>>>', res.data.data);
+        this.onLoadOrder(this.page);
+        this.dialogVisible = 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函数');
-      // }
-      viewStockArticlePackage(row) {
-        this.loading = true;
-        this.packageList = row.packageList;
-        this.obj = row;
-        let page = this.page;
-        this.toggleAllSelection;
-        this.packageQuery = {};
-        this.orderRow = row;
-        console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
-        this.getPackageList(row);
-        // 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;
-        // });
-      },
+    // if (row) {
+    //   this.selectionPackageChange(row)
+    //   console.log(  this.selectionPackageChange(),'12312312312321函数');
+    // }
+    viewStockArticlePackage(row) {
+      this.loading = true;
+      this.packageList = row.packageList;
+      this.obj = row;
+      let page = this.page;
+      this.toggleAllSelection;
+      this.packageQuery = {};
+      this.orderRow = row;
+      console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
+      this.getPackageList(row);
+      // getPackageListByStockArticleId(page.currentPage, page.pageSize, row.id).then(res => {
+      //   console.log('res---------------->', res);
+      //   // console.log(res.data.data.records);
+      //   if (res.data.data) {
+      //     this.packageData = res.data.data.records;
+      //     // 新增默认勾选全部
+      //     this.packageDataSec = this.packageData;
+      //   }
+      //   this.isaddvalue = true;
+      //   this.loading = false;
+      // });
+    },
 
     // 选择包件信息
     // selectionPackageChange(list) {
@@ -2375,21 +2390,21 @@
       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';
-                  if (item.unpack) {
-                    item.unpackName = '是';
-                  } else {
-                    item.unpackName = '否';
-                  }
-                });
-                this.page.total = inventoryList.total;
-                this.inventoryInfo = inventoryList.records;
-                this.loading = false;
-                this.selectionClear();
-              }
+        res => {
+          const inventoryList = res.data.data;
+          inventoryList.records.forEach(item => {
+            item.reservationNum = '0';
+            if (item.unpack) {
+              item.unpackName = '是';
+            } else {
+              item.unpackName = '否';
+            }
+          });
+          this.page.total = inventoryList.total;
+          this.inventoryInfo = inventoryList.records;
+          this.loading = false;
+          this.selectionClear();
+        }
       );
     },
     stockArticleSearchReset() {
@@ -2431,7 +2446,7 @@
         if (!this.form.reservationDate) {
           this.$message({
             type: 'warning',
-            message: '预约时间暂未选择'
+            message: '预约时间暂未选择',
           });
           return;
         }
@@ -2446,7 +2461,7 @@
           if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
             this.$message({
               type: 'warning',
-              message: '存在无效的预约数量'
+              message: '存在无效的预约数量',
             });
             operation = false;
             return;
@@ -2495,12 +2510,12 @@
         console.log('------------------->this.form.stockArticleList', this.form.stockArticleList);
 
         if (
-                JSON.stringify(this.form.inventoryList) === '[]' &&
-                JSON.stringify(this.form.stockArticleList) === '[]'
+          JSON.stringify(this.form.inventoryList) === '[]' &&
+          JSON.stringify(this.form.stockArticleList) === '[]'
         ) {
           this.$message({
             type: 'warning',
-            message: '无效的预约计划!'
+            message: '无效的预约计划!',
           });
           operation = false;
           return;
@@ -2514,7 +2529,7 @@
           if (res.data.code !== 200) return;
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
           this.back();
         } else {
@@ -2524,7 +2539,7 @@
           if (res.data.code !== 200) return;
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            message: '操作成功!',
           });
           this.back();
         }
@@ -2535,21 +2550,16 @@
         this.loadingObj.submitBtnLoading = false;
       }
     },
-    inputsc() {
-    },
-    timesc() {
-    },
-    selectsc() {
-    },
-    btnsc() {
-    },
+    inputsc() {},
+    timesc() {},
+    selectsc() {},
+    btnsc() {},
     handleClose(done) {
       this.$confirm('确认关闭？')
-              .then(_ => {
-                done();
-              })
-              .catch(_ => {
-              });
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
     },
     // 移除包件
     removeStockArticle(row) {
@@ -2622,18 +2632,18 @@
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
-              .then(() => {
-                return remove(row.id);
-              })
-              .then(() => {
-                this.onLoad(this.page);
-                this.$message({
-                  type: 'success',
-                  message: '操作成功!'
-                });
-              });
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
     },
     beforeClose(done) {
       done();
@@ -2658,8 +2668,8 @@
         let a = [];
         list.forEach(item => {
           if (
-                  item.orderPackageReservationStatus === '10' ||
-                  item.orderPackageReservationStatusName === '未预约'
+            item.orderPackageReservationStatus === '10' ||
+            item.orderPackageReservationStatusName === '未预约'
           ) {
             a.push(item);
           }
@@ -2700,12 +2710,12 @@
         let f = a.every(item => {
           console.log('this.number--------------------->', item.number);
           console.log(
-                  'number--------------------->',
-                  item.deliveryQuantity + item.outboundQuantity
+            'number--------------------->',
+            item.deliveryQuantity + item.outboundQuantity
           );
           if (
-                  item.number < item.deliveryQuantity + item.outboundQuantity ||
-                  item.number > item.quantity
+            item.number < item.deliveryQuantity + item.outboundQuantity ||
+            item.number > item.quantity
           ) {
             return false;
           }
@@ -2715,14 +2725,14 @@
         if (b > this.obj.handQuantity) {
           this.$message({
             type: 'error',
-            message: '录入数量超过订单在库数量!'
+            message: '录入数量超过订单在库数量!',
           });
           return;
         }
         if (!f) {
           this.$message({
             type: 'error',
-            message: '请检查修改数量!'
+            message: '请检查修改数量!',
           });
           return;
         }
@@ -2731,7 +2741,7 @@
         if (res) {
           this.$message({
             type: 'success',
-            message: '操作成功'
+            message: '操作成功',
           });
         }
       });
@@ -2757,18 +2767,18 @@
           if (n > this.obj.handQuantity) {
             this.$message({
               type: 'error',
-              message: '录入数量超过订单在库数量!'
+              message: '录入数量超过订单在库数量!',
             });
             return;
           }
           let b = a.every(item => {
             console.log(
-                    '最大数量-------------->',
-                    item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number
+              '最大数量-------------->',
+              item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number
             );
             if (
-                    item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number >
-                    item.quantity
+              item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number >
+              item.quantity
             ) {
               return false;
             }
@@ -2778,7 +2788,7 @@
           if (!b) {
             this.$message({
               type: 'error',
-              message: '请输入正确数量!'
+              message: '请输入正确数量!',
             });
             return;
           }
@@ -2787,7 +2797,7 @@
           if (res) {
             this.$message({
               type: 'success',
-              message: '操作成功'
+              message: '操作成功',
             });
           }
         });
@@ -2858,9 +2868,9 @@
         }
 
         if (
-                item.customerName.trim() !== _name ||
-                item.customerAddress.trim() !== _address ||
-                item.customerTelephone.trim() !== _phone
+          item.customerName.trim() !== _name ||
+          item.customerAddress.trim() !== _address ||
+          item.customerTelephone.trim() !== _phone
         ) {
           console.log('123');
           this.$message.warning('请选择统一顾客订单!!!');
@@ -2881,7 +2891,7 @@
       const _ids = this.orderData.map(val => val.id);
       this.orderData = [
         ...this.orderData,
-        ...this.orderList.filter(item => !_ids.includes(item.id))
+        ...this.orderList.filter(item => !_ids.includes(item.id)),
       ];
       this.orderShow = false;
     },
@@ -2921,10 +2931,10 @@
       this.query.orderIds = a.join(',');
       this.query.reservationId = this.reservationId;
       selectUpdateAvailableStockArticle(
-              page.currentPage,
-              page.pageSize,
-              this.reservationId,
-              Object.assign(params, this.query)
+        page.currentPage,
+        page.pageSize,
+        this.reservationId,
+        Object.assign(params, this.query)
       ).then(res => {
         console.log('res123123------------>', res);
         const data = res.data.data;
@@ -2968,14 +2978,17 @@
       this.getPackageList(this.orderRow);
     },
 
-      /** 新增 */
-    async getAddPackageList(row, param){
-      try{
-
+    /** 新增 */
+    async getAddPackageList(row, param) {
+      try {
         let page = this.page;
         this.packageQuery.id = row.id;
         //新增
-        const res=  await getPackageListByStockArticleId(page.currentPage, page.pageSize, Object.assign(param, this.packageQuery))
+        const res = await getPackageListByStockArticleId(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(param, this.packageQuery)
+        );
         console.log('res---------------->', res);
         // console.log(res.data.data.records);
         if (res.data.data) {
@@ -2984,57 +2997,53 @@
           this.packageDataSec = this.packageData;
         }
         this.isaddvalue = true;
-
-      }catch(err){
-        console.log('err >>>>', err)
-      }finally {
-        return null
+      } catch (err) {
+        console.log('err >>>>', err);
+      } finally {
+        return null;
       }
-
-
     },
 
-      /** 修改 */
-      async getEditPackageList (row, param){
-        try{
-          let page = this.page;
-          this.packageQuery.reservationId = this.reservationId;
-          this.packageQuery.orderId = row.id;
-          this.packageQuery.reservationId = this.reservationId;
-          const res = await getReservationPackageListByOrderId(
-                  page.currentPage,
-                  page.pageSize,
-                  Object.assign(param, this.packageQuery)
-          );
-
-          const { code , data} = res.data
-          if (code !== 200 && data) return
-          console.log('data>>>', data)
-          console.log('->>>>>>>>>>>>>>>>>>查看包件', res);
-
-          this.packageData = data.data.packageList;
-          let idList = data.data.reservationPackageList.map(v => {
-            return v.id;
-          });
-          this.packageDataSec = this.packageData.filter(val => idList.includes(val.id));
-
-          this.isaddvalue = true;
-        }catch(err){
-          console.log('err >>>>', err)
-        }finally {
-          return null
-        }
+    /** 修改 */
+    async getEditPackageList(row, param) {
+      try {
+        console.log('row :>> ', row);
+        let page = this.page;
+        this.packageQuery.reservationId = this.reservationId;
+        this.packageQuery.orderId = row.id;
+        this.packageQuery.reservationId = this.reservationId;
+        console.log('this.packageQuery :>> ', this.packageQuery);
+        const res = await getReservationPackageListByOrderId(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(param, this.packageQuery)
+        );
 
+        const { code, data } = res.data;
+        if (code !== 200 && data) return;
+        console.log('data>>>', data);
+        console.log('->>>>>>>>>>>>>>>>>>查看包件', res);
 
-      },
-
-   async getPackageList(row, param = {}) {
+        this.packageData = data.data.packageList;
+        let idList = data.data.reservationPackageList.map(v => {
+          return v.id;
+        });
+        this.packageDataSec = this.packageData.filter(val => idList.includes(val.id));
 
-     this.loading = true;
+        this.isaddvalue = true;
+      } catch (err) {
+        console.log('err >>>>', err);
+      } finally {
+        return null;
+      }
+    },
 
-      if (this.reservationId) await this.getEditPackageList(row, param)
-       else await this.getAddPackageList(row, param)
-      this.loading = false
+    async getPackageList(row, param = {}) {
+      this.loading = true;
+      console.log('111 :>> ', 111);
+      if (this.reservationId) await this.getEditPackageList(row, param);
+      else await this.getAddPackageList(row, param);
+      this.loading = false;
     },
 
     timescStockArtic(index, row) {
@@ -3061,17 +3070,17 @@
       } else if (row.prop === 'completeSetName') {
         this.query['completeSet'] = index;
       }
-              // else if(row.prop ==='groundingStatusName'){
-              //   this.query['groundingStatus'] = index;
-              // }else if(row.prop ==='stockupStatusName'){
-              //   this.query['stockupStatus'] = index;
-              // }else if(row.prop ==='orderStatusName'){
-              //   this.query['orderStatus'] = index;
-              // }else if(row.prop ==='typeServerName'){
-              //   this.query['typeService'] = index;
-              // }
-              // else if(row.prop ==='orderReceiveStatusName'){
-              //   this.query['orderReceiveStatus'] = index;
+      // else if(row.prop ==='groundingStatusName'){
+      //   this.query['groundingStatus'] = index;
+      // }else if(row.prop ==='stockupStatusName'){
+      //   this.query['stockupStatus'] = index;
+      // }else if(row.prop ==='orderStatusName'){
+      //   this.query['orderStatus'] = index;
+      // }else if(row.prop ==='typeServerName'){
+      //   this.query['typeService'] = index;
+      // }
+      // else if(row.prop ==='orderReceiveStatusName'){
+      //   this.query['orderReceiveStatus'] = index;
       // }
       else {
         this.query[row.prop] = index;
@@ -3089,9 +3098,9 @@
         }
         console.log('--------------query>', this.query);
         const res = await selectStockArticleInfoList(
-                page.currentPage,
-                page.pageSize,
-                Object.assign(params, this.query)
+          page.currentPage,
+          page.pageSize,
+          Object.assign(params, this.query)
         );
         const { records, total } = res.data.data;
 
@@ -3183,54 +3192,54 @@
         this.form.deliveryType = '2';
       }
       this.loading = false;
-    }
-  }
-  };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-
-    input[type='number'] {
-        -moz-appearance: textfield;
-    }
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+
+input[type='number'] {
+  -moz-appearance: textfield;
+}
 </style>
 
 <style lang="scss" scoped>
-    .el-btn-xz {
-        width: 68px;
-        height: 26px;
-        border: 1px solid;
-        margin-bottom: 8px;
-        border-radius: 4px;
-    }
-
-    .clientRow {
-        display: block;
-        min-height: 1px;
-        margin-bottom: 32px;
-        font-size: larger;
-        margin-left: 24px;
-        font-weight: bold;
-        width: 2000px;
-    }
-
-    // 提交按钮容器
-    .submit-container {
-        position: fixed;
-        bottom: 20px;
-        left: 0;
-        z-index: 999;
-        width: 100%;
-        text-align: center;
-        box-sizing: border-box;
-    }
-
-    // 底部站位
-    .footer-container {
-        height: 60px;
-    }
+.el-btn-xz {
+  width: 68px;
+  height: 26px;
+  border: 1px solid;
+  margin-bottom: 8px;
+  border-radius: 4px;
+}
+
+.clientRow {
+  display: block;
+  min-height: 1px;
+  margin-bottom: 32px;
+  font-size: larger;
+  margin-left: 24px;
+  font-weight: bold;
+  width: 2000px;
+}
+
+// 提交按钮容器
+.submit-container {
+  position: fixed;
+  bottom: 20px;
+  left: 0;
+  z-index: 999;
+  width: 100%;
+  text-align: center;
+  box-sizing: border-box;
+}
+
+// 底部站位
+.footer-container {
+  height: 60px;
+}
 </style>