From b9c0d1e90307606324d0ecf6dc003646f02a1005 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 19 Nov 2024 10:06:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=95=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/waybill/CreateZeroOrder.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index a3885c4c..a1e87bd9 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -487,7 +487,7 @@
           :key="item"
         >
           <!-- 加减按钮 -->
-          <div style="width: 55px; flex: none" class="flex-c-c" v-if="query.zeroEditStatus === 1">
+          <div style="width: 55px; flex: none" class="flex-c-c" v-if="query.zeroEditStatus !== 0">
             <el-button
               v-if="index === 0"
               @click="handleAdd"
@@ -637,7 +637,7 @@
           <div
             style="width: 55px; flex: none"
             class="flex-c-c"
-            v-if="query.zeroEditStatus === 1"
+            v-if="query.zeroEditStatus !== 0"
           ></div>
           <div style="width: 230px; flex: none">合计</div>
           <!-- 货物名称 -->

From d225d756d365fc05ec4509443246081fd3492762 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 19 Nov 2024 14:50:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/Pricesystem/index.js               |    4 +-
 src/option/basicdata/BackStockTask.js         |    2 +-
 src/option/distribution/BookingNote.js        |    2 +-
 .../distribution/DeliveryExceptionReview.js   |    2 +-
 src/option/distribution/OrderInTransit.js     |    2 +-
 src/option/distribution/SeparateTheList.js    |    2 +-
 .../distribution/SeparateTheListInfo.js       |    2 +-
 src/option/distribution/TripartiteTransfer.js |    6 +-
 src/option/distribution/Unstoreddetails.js    |    2 +-
 .../distribution/VehicleStowageZeroLoading.js |    4 +-
 src/option/distribution/abnormalList.js       |    2 +-
 src/option/distribution/addVehicleStowage.js  |    6 +-
 .../arteryDistrilbutionBillLadingList.js      |    2 +-
 src/option/distribution/createTask.js         |    4 +-
 .../distribution/directGoMarketDetails.js     |    4 +-
 .../distributionDeliveryListdis.js            |    2 +-
 .../distributionDeliveryListmar.js            |    2 +-
 .../distribution/distributionReservation.js   |    4 +-
 .../distributionStockArticleDetails.js        |    4 +-
 .../distributionStockArticleSelf.js           |    2 +-
 .../distribution/distrilbutionBillLading.js   |    4 +-
 src/option/finance/CustomerSettlement.js      |    2 +-
 src/option/finance/MerchantDepositSlip.js     |    4 +-
 .../finance/ReconciliationDepositSlip.js      |    6 +-
 src/option/finance/WaybillAudit.js            |    2 +-
 src/option/mt/Mengtiandatapushback.js         |    2 +-
 src/option/reportforms/InventoryReceipt.js    |    2 +-
 src/option/reportforms/Selfpickupreport.js    |    2 +-
 src/option/reportforms/Selfpickuptask.js      |    2 +-
 src/option/reportforms/Stockordertable.js     |    2 +-
 src/option/signfor/asurcharge.js              |    4 +-
 src/option/storagecost/Financialreview.js     |    2 +-
 .../storagecost/Monthlyorderwarehousing.js    |    2 +-
 .../storagecost/OrderTotalCostDetail.js       |    2 +-
 src/option/storagecost/OrderTotalWarehouse.js |    2 +-
 src/option/storagecost/Traincostbreakdown.js  |    2 +-
 src/option/turndelivery/deliveryDiscuss.js    |    4 +-
 src/option/warehouse/PreStoragePackage.js     |    2 +-
 src/option/warehouse/PreStorageTrainNumber.js |    2 +-
 src/option/warehouse/Prewarehouseorder.js     |    4 +-
 .../warehouse/distributionStockArticle.js     |    2 +-
 .../warehouse/warehouseRetentionRecord.js     |    2 +-
 src/option/waybill/FreezeOrder.js             |    2 +-
 src/option/waybill/TemporaryStorageList.js    |   26 +-
 .../waybill/WarehousingByTrainNumber.js       |    2 +-
 src/option/waybill/WaybillOrderList.js        |    2 +-
 src/option/waybill/orderDetails.js            |    2 +-
 src/option/waybill/orderPackageList.js        |    2 +-
 src/option/waybill/orderPackageListDetails.js |    2 +-
 src/views/basic/coderule/basicTenantCode.vue  |    6 +-
 src/views/basic/coderule/basicTenantCode1.vue |    6 +-
 src/views/basicdata/brand/basicZonePrice.vue  |    2 +-
 .../basicdata/team/basicdataTeamStaff.vue     |    4 +-
 .../BasicdataGoodsAllocationDetails.vue       |    4 +-
 .../goodsShelf/basicdataGoodsShelfView.vue    |   18 +-
 .../warehouse/tray/basicdataTrayedt.vue       |    2 +-
 .../distribution/artery/AddVehicleStowage.vue |    2 +-
 .../checkInventoryTask/createTask2.vue        |    4 +-
 .../checkInventoryTask/createTaskTemp.vue     |    4 +-
 .../deliverylist/distributionDeliveryList.vue |    2 +-
 .../distributionDeliveryListedt.vue           |   12 +-
 .../distributionStockArticleWhole.vue         |    2 +-
 .../distributionStockListDetails.vue          |   18 +-
 .../inventory/distrilbutionBillLading.vue     |   16 +-
 .../inventory/distrilbutionBillLadingList.vue |   23 +-
 .../inventory/distrilbutionBillLadingView.vue |    4 +-
 .../reservation/reservationAddFrom copy.vue   |    8 +-
 .../reservation/reservationAddFrom.vue        |   10 +-
 .../reservation/reservationDetails.vue        |    6 +-
 .../signdetail/distributionSigndetailCopy.vue |    2 +-
 .../signfor/distributionSignforedt.vue        |    6 +-
 .../signfor/distributionSignforedtTT.vue      |    2 +-
 .../signfor/distributionSignfortreat.vue      |    2 +-
 .../stockup/distributionStockupDetails.vue    |    6 +-
 .../distributionStockupDetailsSelf.vue        |    6 +-
 src/views/mail/order/add.vue                  | 5269 ++++++++---------
 src/views/mail/order/list.vue                 |    2 +-
 .../parcelList/distributionParcelList.vue     |    2 +-
 .../updownGoods/warehouseUpdownGoodsLog.vue   |    4 +-
 .../warehouseRetentionDetails.vue             |    8 +-
 .../warehouseStock/warehouseStock.vue         |    2 +-
 src/views/warehouse/warehouseWaybill.vue      |    2 +-
 82 files changed, 2818 insertions(+), 2804 deletions(-)

diff --git a/src/option/Pricesystem/index.js b/src/option/Pricesystem/index.js
index b6e5a085..e56e95ab 100644
--- a/src/option/Pricesystem/index.js
+++ b/src/option/Pricesystem/index.js
@@ -118,15 +118,13 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: 'right',
     sortable: false,
   },
 ];
 
-
-
 export const HistoricalList = [
   {
     prop: '',
diff --git a/src/option/basicdata/BackStockTask.js b/src/option/basicdata/BackStockTask.js
index 339c9db8..5ed35eba 100644
--- a/src/option/basicdata/BackStockTask.js
+++ b/src/option/basicdata/BackStockTask.js
@@ -49,7 +49,7 @@ export default [
     prop: 'orderCode',
     type: 30,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/BookingNote.js b/src/option/distribution/BookingNote.js
index 92bf3fba..b00c0cc2 100644
--- a/src/option/distribution/BookingNote.js
+++ b/src/option/distribution/BookingNote.js
@@ -143,7 +143,7 @@ export const ChangeOrderColumnList = [
     label: '修改内容',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/DeliveryExceptionReview.js b/src/option/distribution/DeliveryExceptionReview.js
index ce76f6fc..588eb56c 100644
--- a/src/option/distribution/DeliveryExceptionReview.js
+++ b/src/option/distribution/DeliveryExceptionReview.js
@@ -54,7 +54,7 @@ export const AbnormalReview = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: false,
diff --git a/src/option/distribution/OrderInTransit.js b/src/option/distribution/OrderInTransit.js
index b7457999..d598eabb 100644
--- a/src/option/distribution/OrderInTransit.js
+++ b/src/option/distribution/OrderInTransit.js
@@ -44,7 +44,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/SeparateTheList.js b/src/option/distribution/SeparateTheList.js
index fb8bd3fe..05b67b2d 100644
--- a/src/option/distribution/SeparateTheList.js
+++ b/src/option/distribution/SeparateTheList.js
@@ -31,7 +31,7 @@ export const columnList = [
     label: '原订单编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     fixed: true,
     sortable: true,
     head: false,
diff --git a/src/option/distribution/SeparateTheListInfo.js b/src/option/distribution/SeparateTheListInfo.js
index b327b57f..850d7ae3 100644
--- a/src/option/distribution/SeparateTheListInfo.js
+++ b/src/option/distribution/SeparateTheListInfo.js
@@ -31,7 +31,7 @@ export const columnList = [
     label: '原订单编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     fixed: false,
     sortable: true,
     head: false,
diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index b64f8b87..6659366a 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -251,7 +251,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: 'right',
     sortable: false,
@@ -302,7 +302,7 @@ export const detailsColumnList = [
     label: '订单号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -763,7 +763,7 @@ export const TripartiteTransferColumnList = [
     label: '订单号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/Unstoreddetails.js b/src/option/distribution/Unstoreddetails.js
index a783d8af..e6c56dc7 100644
--- a/src/option/distribution/Unstoreddetails.js
+++ b/src/option/distribution/Unstoreddetails.js
@@ -25,7 +25,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/VehicleStowageZeroLoading.js b/src/option/distribution/VehicleStowageZeroLoading.js
index ed2e62a0..26a58625 100644
--- a/src/option/distribution/VehicleStowageZeroLoading.js
+++ b/src/option/distribution/VehicleStowageZeroLoading.js
@@ -31,7 +31,7 @@ export const columnList = [
     label: '订单号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -86,7 +86,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: 'right',
     sortable: false,
diff --git a/src/option/distribution/abnormalList.js b/src/option/distribution/abnormalList.js
index cf8ae127..bb4c85c7 100644
--- a/src/option/distribution/abnormalList.js
+++ b/src/option/distribution/abnormalList.js
@@ -103,7 +103,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index e4e43a74..d18b6f72 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -175,7 +175,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -439,7 +439,7 @@ export const newColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -684,7 +684,7 @@ export const detailsColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index 14076196..9eca0763 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -378,7 +378,7 @@ export const columnDetailList = [
     label: '合同号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/createTask.js b/src/option/distribution/createTask.js
index 59aa471b..b6942654 100644
--- a/src/option/distribution/createTask.js
+++ b/src/option/distribution/createTask.js
@@ -205,7 +205,7 @@ export const columnListInventory = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -539,7 +539,7 @@ export const comparativecolumnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/directGoMarketDetails.js b/src/option/distribution/directGoMarketDetails.js
index cec1fb15..daed1d7e 100644
--- a/src/option/distribution/directGoMarketDetails.js
+++ b/src/option/distribution/directGoMarketDetails.js
@@ -182,7 +182,7 @@ export const detailsColumnList = [
     label: '订单号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -377,7 +377,7 @@ export const oldColumnList = [
     label: '合同号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/distribution/distributionDeliveryListdis.js b/src/option/distribution/distributionDeliveryListdis.js
index 97c34f14..fe2f75a6 100644
--- a/src/option/distribution/distributionDeliveryListdis.js
+++ b/src/option/distribution/distributionDeliveryListdis.js
@@ -56,7 +56,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/distributionDeliveryListmar.js b/src/option/distribution/distributionDeliveryListmar.js
index 0eb072cd..ab3fbf2b 100644
--- a/src/option/distribution/distributionDeliveryListmar.js
+++ b/src/option/distribution/distributionDeliveryListmar.js
@@ -65,7 +65,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/distributionReservation.js b/src/option/distribution/distributionReservation.js
index ff876b54..cca04561 100644
--- a/src/option/distribution/distributionReservation.js
+++ b/src/option/distribution/distributionReservation.js
@@ -353,7 +353,7 @@ export default {
     {
       label: '订单自编号',
       prop: 'orderCode',
-      width: '300',
+      width: '200',
     },
     {
       label: '商场名称',
@@ -498,7 +498,7 @@ export default {
     {
       label: '订单自编号',
       prop: 'orderCode',
-      width: '300',
+      width: '200',
     },
     // {
     //   prop: 'incomingBatch',
diff --git a/src/option/distribution/distributionStockArticleDetails.js b/src/option/distribution/distributionStockArticleDetails.js
index c8ff5612..ed0eea4d 100644
--- a/src/option/distribution/distributionStockArticleDetails.js
+++ b/src/option/distribution/distributionStockArticleDetails.js
@@ -36,7 +36,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -271,7 +271,7 @@ export const zerocolumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/distributionStockArticleSelf.js b/src/option/distribution/distributionStockArticleSelf.js
index 89b28e1a..6abeab29 100644
--- a/src/option/distribution/distributionStockArticleSelf.js
+++ b/src/option/distribution/distributionStockArticleSelf.js
@@ -44,7 +44,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/distribution/distrilbutionBillLading.js b/src/option/distribution/distrilbutionBillLading.js
index b52af539..3208ce27 100644
--- a/src/option/distribution/distrilbutionBillLading.js
+++ b/src/option/distribution/distrilbutionBillLading.js
@@ -271,7 +271,7 @@ export default {
       label: '订单自编号',
       type: 2,
       values: '',
-      width: '300',
+      width: '200',
       checkarr: [],
       fixed: false,
       sortable: true,
@@ -1115,7 +1115,7 @@ export default {
     {
       prop: 'orderCode',
       label: '订单自编号',
-      width: '300',
+      width: '200',
     },
     {
       prop: 'mallName',
diff --git a/src/option/finance/CustomerSettlement.js b/src/option/finance/CustomerSettlement.js
index c4895ef2..8b6e2f37 100644
--- a/src/option/finance/CustomerSettlement.js
+++ b/src/option/finance/CustomerSettlement.js
@@ -52,7 +52,7 @@ export const columnList = [
     label: '订单编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/finance/MerchantDepositSlip.js b/src/option/finance/MerchantDepositSlip.js
index 90697a9f..66de373a 100644
--- a/src/option/finance/MerchantDepositSlip.js
+++ b/src/option/finance/MerchantDepositSlip.js
@@ -41,7 +41,7 @@ export const columnList = [
     label: '订单编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -474,7 +474,7 @@ export const orderColumnList = [
     label: '订单编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js
index 0bf2596b..0b76931d 100644
--- a/src/option/finance/ReconciliationDepositSlip.js
+++ b/src/option/finance/ReconciliationDepositSlip.js
@@ -30,7 +30,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -688,7 +688,7 @@ export const columnListB = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -1330,7 +1330,7 @@ export const confirmColumnList = [
     label: '订单号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js
index 8ec1fd87..7842d58c 100644
--- a/src/option/finance/WaybillAudit.js
+++ b/src/option/finance/WaybillAudit.js
@@ -41,7 +41,7 @@ export const columnList = [
     label: '订单编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/mt/Mengtiandatapushback.js b/src/option/mt/Mengtiandatapushback.js
index 5e1d747b..0af12948 100644
--- a/src/option/mt/Mengtiandatapushback.js
+++ b/src/option/mt/Mengtiandatapushback.js
@@ -41,7 +41,7 @@ export const columnList = [
     label: '订单号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/reportforms/InventoryReceipt.js b/src/option/reportforms/InventoryReceipt.js
index 678593ea..42009916 100644
--- a/src/option/reportforms/InventoryReceipt.js
+++ b/src/option/reportforms/InventoryReceipt.js
@@ -96,7 +96,7 @@ export const columnList = [
     label: '订单自编码',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/reportforms/Selfpickupreport.js b/src/option/reportforms/Selfpickupreport.js
index 5f0284bf..f25d002d 100644
--- a/src/option/reportforms/Selfpickupreport.js
+++ b/src/option/reportforms/Selfpickupreport.js
@@ -86,7 +86,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/reportforms/Selfpickuptask.js b/src/option/reportforms/Selfpickuptask.js
index 31b7ec5e..37563f4f 100644
--- a/src/option/reportforms/Selfpickuptask.js
+++ b/src/option/reportforms/Selfpickuptask.js
@@ -52,7 +52,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/reportforms/Stockordertable.js b/src/option/reportforms/Stockordertable.js
index f377d195..1992a894 100644
--- a/src/option/reportforms/Stockordertable.js
+++ b/src/option/reportforms/Stockordertable.js
@@ -41,7 +41,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/signfor/asurcharge.js b/src/option/signfor/asurcharge.js
index fc7b6571..8a1e5809 100644
--- a/src/option/signfor/asurcharge.js
+++ b/src/option/signfor/asurcharge.js
@@ -19,7 +19,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -192,7 +192,7 @@ export const columnListTC = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/storagecost/Financialreview.js b/src/option/storagecost/Financialreview.js
index d8a2c6f7..3f993797 100644
--- a/src/option/storagecost/Financialreview.js
+++ b/src/option/storagecost/Financialreview.js
@@ -74,7 +74,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/storagecost/Monthlyorderwarehousing.js b/src/option/storagecost/Monthlyorderwarehousing.js
index d1af6cff..ab908326 100644
--- a/src/option/storagecost/Monthlyorderwarehousing.js
+++ b/src/option/storagecost/Monthlyorderwarehousing.js
@@ -30,7 +30,7 @@ export const columnList = [
     label: '订单编号 ',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/storagecost/OrderTotalCostDetail.js b/src/option/storagecost/OrderTotalCostDetail.js
index 5427b602..5c20ef2e 100644
--- a/src/option/storagecost/OrderTotalCostDetail.js
+++ b/src/option/storagecost/OrderTotalCostDetail.js
@@ -30,7 +30,7 @@ export const columnList = [
     label: '订单编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/storagecost/OrderTotalWarehouse.js b/src/option/storagecost/OrderTotalWarehouse.js
index e5692f43..d8f8dc3d 100644
--- a/src/option/storagecost/OrderTotalWarehouse.js
+++ b/src/option/storagecost/OrderTotalWarehouse.js
@@ -30,7 +30,7 @@ export const columnList = [
     label: '订单编号 ',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js
index 5750a254..e7c7e9e5 100644
--- a/src/option/storagecost/Traincostbreakdown.js
+++ b/src/option/storagecost/Traincostbreakdown.js
@@ -63,7 +63,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/turndelivery/deliveryDiscuss.js b/src/option/turndelivery/deliveryDiscuss.js
index 0245a112..06d6cf13 100644
--- a/src/option/turndelivery/deliveryDiscuss.js
+++ b/src/option/turndelivery/deliveryDiscuss.js
@@ -48,7 +48,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -426,7 +426,7 @@ export const newMenuData = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/warehouse/PreStoragePackage.js b/src/option/warehouse/PreStoragePackage.js
index 1b8cbe88..1838e5b0 100644
--- a/src/option/warehouse/PreStoragePackage.js
+++ b/src/option/warehouse/PreStoragePackage.js
@@ -37,7 +37,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/warehouse/PreStorageTrainNumber.js b/src/option/warehouse/PreStorageTrainNumber.js
index 3f604f2f..e882989a 100644
--- a/src/option/warehouse/PreStorageTrainNumber.js
+++ b/src/option/warehouse/PreStorageTrainNumber.js
@@ -48,7 +48,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/warehouse/Prewarehouseorder.js b/src/option/warehouse/Prewarehouseorder.js
index 607e3c7f..11b61a26 100644
--- a/src/option/warehouse/Prewarehouseorder.js
+++ b/src/option/warehouse/Prewarehouseorder.js
@@ -19,7 +19,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -580,7 +580,7 @@ export const packageColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/warehouse/distributionStockArticle.js b/src/option/warehouse/distributionStockArticle.js
index d8f3fd47..d8239a1a 100644
--- a/src/option/warehouse/distributionStockArticle.js
+++ b/src/option/warehouse/distributionStockArticle.js
@@ -41,7 +41,7 @@ export const columnList = [
     label: '订单自编号',
     type: 13,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/warehouse/warehouseRetentionRecord.js b/src/option/warehouse/warehouseRetentionRecord.js
index 152b693c..ba70da08 100644
--- a/src/option/warehouse/warehouseRetentionRecord.js
+++ b/src/option/warehouse/warehouseRetentionRecord.js
@@ -56,7 +56,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/waybill/FreezeOrder.js b/src/option/waybill/FreezeOrder.js
index 7e6509cc..f652ba10 100644
--- a/src/option/waybill/FreezeOrder.js
+++ b/src/option/waybill/FreezeOrder.js
@@ -19,7 +19,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/waybill/TemporaryStorageList.js b/src/option/waybill/TemporaryStorageList.js
index bf26a28c..d67e314a 100644
--- a/src/option/waybill/TemporaryStorageList.js
+++ b/src/option/waybill/TemporaryStorageList.js
@@ -19,7 +19,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -600,7 +600,7 @@ export const packageColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -650,6 +650,28 @@ export const packageColumnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'volume',
+    label: '方数',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'weight',
+    label: '重量',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'brand',
     label: '品牌',
diff --git a/src/option/waybill/WarehousingByTrainNumber.js b/src/option/waybill/WarehousingByTrainNumber.js
index 1687d945..7f554701 100644
--- a/src/option/waybill/WarehousingByTrainNumber.js
+++ b/src/option/waybill/WarehousingByTrainNumber.js
@@ -20,7 +20,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index fb292131..2987d539 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -30,7 +30,7 @@ export const columnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/waybill/orderDetails.js b/src/option/waybill/orderDetails.js
index 48f24651..6d067178 100644
--- a/src/option/waybill/orderDetails.js
+++ b/src/option/waybill/orderDetails.js
@@ -31,7 +31,7 @@ export const packageListColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/waybill/orderPackageList.js b/src/option/waybill/orderPackageList.js
index 487e893f..35ef01b9 100644
--- a/src/option/waybill/orderPackageList.js
+++ b/src/option/waybill/orderPackageList.js
@@ -31,7 +31,7 @@ export const packageListColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/option/waybill/orderPackageListDetails.js b/src/option/waybill/orderPackageListDetails.js
index e58f685a..e3c2592e 100644
--- a/src/option/waybill/orderPackageListDetails.js
+++ b/src/option/waybill/orderPackageListDetails.js
@@ -31,7 +31,7 @@ export const packageListColumnList = [
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
diff --git a/src/views/basic/coderule/basicTenantCode.vue b/src/views/basic/coderule/basicTenantCode.vue
index c1813170..64fd444b 100644
--- a/src/views/basic/coderule/basicTenantCode.vue
+++ b/src/views/basic/coderule/basicTenantCode.vue
@@ -259,7 +259,7 @@ const details = reactive<any>({
       label: '编码类型',
       type: 3,
       values: '',
-      width: '300',
+      width: '200',
       checkarr: [],
       fixed: false,
       sortable: true,
@@ -281,7 +281,7 @@ const details = reactive<any>({
       label: '编码',
       type: 2,
       values: '',
-      width: '300',
+      width: '200',
       checkarr: [],
       fixed: false,
       sortable: true,
@@ -291,7 +291,7 @@ const details = reactive<any>({
       label: '操作',
       type: 6,
       values: '',
-      width: '300',
+      width: '200',
       checkarr: [],
       fixed: 'right',
       sortable: false,
diff --git a/src/views/basic/coderule/basicTenantCode1.vue b/src/views/basic/coderule/basicTenantCode1.vue
index cb3c1577..ffb801ba 100644
--- a/src/views/basic/coderule/basicTenantCode1.vue
+++ b/src/views/basic/coderule/basicTenantCode1.vue
@@ -189,7 +189,7 @@ export default {
           label: '编码类型',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -211,7 +211,7 @@ export default {
           label: '编码',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -221,7 +221,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: 'right',
           sortable: false,
diff --git a/src/views/basicdata/brand/basicZonePrice.vue b/src/views/basicdata/brand/basicZonePrice.vue
index 92917536..c850de4d 100644
--- a/src/views/basicdata/brand/basicZonePrice.vue
+++ b/src/views/basicdata/brand/basicZonePrice.vue
@@ -418,7 +418,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: 'right',
           hide: true,
diff --git a/src/views/basicdata/team/basicdataTeamStaff.vue b/src/views/basicdata/team/basicdataTeamStaff.vue
index 14fc9b7c..4ad1e5cd 100644
--- a/src/views/basicdata/team/basicdataTeamStaff.vue
+++ b/src/views/basicdata/team/basicdataTeamStaff.vue
@@ -196,7 +196,7 @@ export default {
           label: '所属部门名称',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -206,7 +206,7 @@ export default {
           label: '仓库名称',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
index edb6a2eb..18b50306 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
@@ -218,7 +218,7 @@ const details = reactive({
       label: '订单自编号',
       type: 2,
       values: '',
-      width: '300',
+      width: '200',
       checkarr: [],
       fixed: false,
       sortable: true,
@@ -363,7 +363,7 @@ const details = reactive({
       label: '订单号',
       type: 2,
       values: '',
-      width: '300',
+      width: '200',
       checkarr: [],
       fixed: false,
       sortable: true,
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index f77f47e9..520967a8 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -988,7 +988,7 @@ const showupt = value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1056,7 +1056,7 @@ const showupt = value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1157,7 +1157,7 @@ const showupt = value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1370,7 +1370,7 @@ const showupt = value => {
           label: '订单自编码',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1425,7 +1425,7 @@ const showupt = value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1537,7 +1537,7 @@ const showupt = value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1853,7 +1853,7 @@ const showdown = async value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -2020,7 +2020,7 @@ const showdown = async value => {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -2155,7 +2155,7 @@ const showdown = async value => {
           label: '订单号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 116233a0..6e25e597 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -640,7 +640,7 @@ export default {
           label: '订单自编号',
           type: 30,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index a2aa9928..7b41dffb 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -252,7 +252,7 @@
           </div>
 
           <!-- 备注 -->
-          <el-form-item label="备注">
+          <el-form-item label="备注" style="width: 100%">
             <el-input autosize v-model="form.remark" type="textarea" placeholder="备注" />
           </el-form-item>
         </el-form>
diff --git a/src/views/distribution/checkInventoryTask/createTask2.vue b/src/views/distribution/checkInventoryTask/createTask2.vue
index 5ab2080f..dc03d23b 100644
--- a/src/views/distribution/checkInventoryTask/createTask2.vue
+++ b/src/views/distribution/checkInventoryTask/createTask2.vue
@@ -836,7 +836,7 @@ const InventoryDetails = ref([
     label: '订单自编号',
     type: 5,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     search: true,
@@ -1069,7 +1069,7 @@ const contrast = ref([
     label: '订单自编号',
     type: 4,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     search: true,
diff --git a/src/views/distribution/checkInventoryTask/createTaskTemp.vue b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
index 180a0e58..dc68fbce 100644
--- a/src/views/distribution/checkInventoryTask/createTaskTemp.vue
+++ b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
@@ -965,7 +965,7 @@ const InventoryDetails = ref([
     label: '订单自编号',
     type: 5,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     search: true,
@@ -1264,7 +1264,7 @@ const contrast = ref([
     label: '订单自编号',
     type: 4,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     search: true,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index d2f0206f..6c68e6cc 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -437,7 +437,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 9f2748cf..bf3d63bd 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -1370,7 +1370,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1614,7 +1614,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1985,7 +1985,7 @@ export default {
           label: '服务号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -2445,7 +2445,7 @@ export default {
             prop: 'orderCode',
             type: 2,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: true,
             sortable: true,
@@ -2849,7 +2849,7 @@ export default {
             label: '订单自编号',
             type: 1,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: false,
             sortable: true,
@@ -3009,7 +3009,7 @@ export default {
             label: '订单自编码',
             type: 2,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: false,
             sortable: true,
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
index b5438d18..001c4727 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
@@ -451,7 +451,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index a85c8bc3..029129e1 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -248,8 +248,7 @@
               @selectCheck="selectsc"
               @selection="selectionChange"
             >
-              <template #default="slotProps">
-              </template>
+              <template #default="slotProps"> </template>
             </tablecmt>
             <!-- <div class="avue-crud__pagination" style="width: 100%">
               <el-pagination
@@ -363,19 +362,18 @@ export default {
       locations: 0, //货位总数
       isShowPrint: false,
       html: '',
-      
+
       columnListarrs: {
-        
         // 冻结明细
-        FreezeDetails:[
-        {
+        FreezeDetails: [
+          {
             prop: '',
             label: '复选框',
             type: 0,
             width: 55,
             fixed: true,
           },
-        {
+          {
             prop: '',
             label: '序号',
             type: 12,
@@ -561,7 +559,7 @@ export default {
             label: '订单自编号',
             type: 1,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: false,
             sortable: true,
@@ -1213,13 +1211,13 @@ export default {
         console.log('拆包明细');
         // this.getOnChai(this.page2);
         this.getunpacking(this.page3);
-      }else if (this.leibiao == 'FreezeDetails') {
+      } else if (this.leibiao == 'FreezeDetails') {
         this.getFreezeDetails(this.page4);
       }
       const _node = document.querySelectorAll('.tableNode');
       setNodeHeight(_node, '', true);
     },
-    getFreezeDetails(page){
+    getFreezeDetails(page) {
       let data = {
         stockListId: this.$route.query.id,
         // current: page.currentPage,
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index a2a9a53f..355a6b9f 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -848,7 +848,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1298,7 +1298,7 @@ export default {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1693,7 +1693,7 @@ export default {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -2903,8 +2903,8 @@ export default {
               let data = {
                 billLodingIds: this.$route.query.id,
               };
-              console.log(data,'data');
-              
+              console.log(data, 'data');
+
               this.Selfpickuploading = true; //关闭加载效果
               $_distrilbutionBillLading(data)
                 .then(res => {
@@ -3120,7 +3120,7 @@ export default {
             }
             console.log(submitFormData, '最后要提交的参数');
             this.Selfpickuploading = true; //开启加载效果
-            
+
             add(submitFormData)
               .then(res => {
                 this.Selfpickuploading = false; //开启加载效果
@@ -3273,8 +3273,8 @@ export default {
             console.log(_unBillPackageEntityList, '删除的');
             up.billPackageEntityList = _billPackageEntityList;
             up.unBillPackageEntityList = _unBillPackageEntityList;
-            console.log(this.data,'data===>>>');
-            
+            console.log(this.data, 'data===>>>');
+
             if (this.data?.length) {
               up.consigneeUnit = this.data[0].marketName;
             } else if (this.dataList?.length) {
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index fdb0d749..f2c13a68 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -10,7 +10,6 @@
           <el-form-item label="入库时间:" class="el-times">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
 
-
             <el-date-picker
               v-model="stockupDate"
               type="daterange"
@@ -76,9 +75,7 @@
               @click="handleBillAdd"
               >创建自提</el-button
             >
-            <el-button type="primary"  @click="pickupCancellation"
-              >批量取消</el-button
-            >
+            <el-button type="primary" @click="pickupCancellation">批量取消</el-button>
             <!-- <el-button
               type="primary"
               icon="el-icon-plus"
@@ -108,7 +105,7 @@
 
       <!-- 列表模块 -->
       <tablecmt
-      class="tableNode"
+        class="tableNode"
         :columnList="columnList"
         :tableData="data"
         :loading="loading"
@@ -266,14 +263,14 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 import dayjs from 'dayjs';
-import { downloadXls, handleClearTableQuery ,setNodeHeight} from '@/utils/util';
+import { downloadXls, handleClearTableQuery, setNodeHeight } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import MyPrint from '@/components/MyPrint/MyPrint.vue';
 export default {
   name: '/distribution/inventory/distrilbutionBillLadingList',
   data() {
     return {
-      Deliverytime:[],//提货时间
+      Deliverytime: [], //提货时间
       columnList: [
         {
           prop: '',
@@ -309,7 +306,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -887,7 +884,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(async() => {
+        .then(async () => {
           // 批量取消
           let data = {
             billLodingIds: '',
@@ -895,7 +892,7 @@ export default {
           data.billLodingIds = this.selectionList.map(res => res.id).join(',');
           console.log(data, '处理好的值');
           this.loading = true; //开启加载
-          await  $_distrilbutionBillLading(data)
+          await $_distrilbutionBillLading(data)
             .then(res => {
               console.log(res, '批量取消车成功');
               this.onLoad(this.page);
@@ -1141,11 +1138,11 @@ export default {
           params.startDate = startDate;
           params.entDate = entDate;
         }
-        if(this.Deliverytime?.length){
+        if (this.Deliverytime?.length) {
           let startDate = this.Deliverytime[0];
           let entDate = this.Deliverytime[1];
           params.pickUpTimeStart = startDate;
-          params.pickUpTimeEnd = entDate
+          params.pickUpTimeEnd = entDate;
         }
 
         getListOwnNUm(params).then(res => {
@@ -1158,7 +1155,7 @@ export default {
             console.log(',.,.已签收', this.signedFor, '全部', this.sumTotal);
           }
         });
-        this.data=[]
+        this.data = [];
         const res = await getListOwn(
           page.currentPage,
           page.pageSize,
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 3fcc1c5e..58e1402d 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -310,7 +310,7 @@ export default {
             label: '订单自编号',
             type: 2,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: true,
             sortable: true,
@@ -665,7 +665,7 @@ export default {
             label: '订单自编号',
             type: 2,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: false,
             sortable: true,
diff --git a/src/views/distribution/reservation/reservationAddFrom copy.vue b/src/views/distribution/reservation/reservationAddFrom copy.vue
index 14f87eb5..533062de 100644
--- a/src/views/distribution/reservation/reservationAddFrom copy.vue	
+++ b/src/views/distribution/reservation/reservationAddFrom copy.vue	
@@ -620,7 +620,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -845,7 +845,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1128,7 +1128,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1418,7 +1418,7 @@ export default {
           label: '订单自编码',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 7b3594d4..23c2a397 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -539,7 +539,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -773,7 +773,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1058,7 +1058,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1347,7 +1347,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -1665,7 +1665,7 @@ export default {
           label: '订单自编码',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
diff --git a/src/views/distribution/reservation/reservationDetails.vue b/src/views/distribution/reservation/reservationDetails.vue
index 25e41d87..5812a317 100644
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@@ -435,7 +435,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -628,7 +628,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -753,7 +753,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
diff --git a/src/views/distribution/signdetail/distributionSigndetailCopy.vue b/src/views/distribution/signdetail/distributionSigndetailCopy.vue
index 8d60ce48..064341e1 100644
--- a/src/views/distribution/signdetail/distributionSigndetailCopy.vue
+++ b/src/views/distribution/signdetail/distributionSigndetailCopy.vue
@@ -349,7 +349,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 2f38b7ea..c5d712f5 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -832,7 +832,7 @@ const menuData1 = ref([
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -1081,7 +1081,7 @@ const menuData2 = ref([
     label: '订单自编号',
     type: 2,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -1640,7 +1640,7 @@ const menuDataB1 = ref([
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '300',
+    width: '200',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/views/distribution/signfor/distributionSignforedtTT.vue b/src/views/distribution/signfor/distributionSignforedtTT.vue
index 5197092d..c7bdff03 100644
--- a/src/views/distribution/signfor/distributionSignforedtTT.vue
+++ b/src/views/distribution/signfor/distributionSignforedtTT.vue
@@ -737,7 +737,7 @@ export default {
             label: '订单自编号',
             type: 2,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: true,
             sortable: true,
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 36a68dde..3c553d8e 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -1067,7 +1067,7 @@ export default {
           label: '订单自编码',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index 871c0559..154c1af9 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -552,7 +552,7 @@ export default {
             label: '订单自编号',
             type: 1,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: true,
             sortable: true,
@@ -817,7 +817,7 @@ export default {
             label: '订单编号',
             type: 1,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: false,
             sortable: true,
@@ -992,7 +992,7 @@ export default {
             label: '订单编号',
             type: 1,
             values: '',
-            width: '300',
+            width: '200',
             checkarr: [],
             fixed: false,
             sortable: true,
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 1b15c8ad..5be40e70 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -541,7 +541,7 @@ export default {
           label: '订单编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -964,7 +964,7 @@ export default {
           label: '订单自编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1209,7 +1209,7 @@ export default {
           label: '订单编号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/mail/order/add.vue b/src/views/mail/order/add.vue
index 0e4ab841..a2727331 100644
--- a/src/views/mail/order/add.vue
+++ b/src/views/mail/order/add.vue
@@ -1,12 +1,12 @@
 <template>
   <basic-container>
-    <div class="avue-crud"  v-loading="subloading"  element-loading-text="正在拼命加载中">
+    <div class="avue-crud" v-loading="subloading" element-loading-text="正在拼命加载中">
       <el-form
-              ref="form"
-              :model="form"
-              prop="consignee"
-              label-width="80px"
-              :rules="reservationRules"
+        ref="form"
+        :model="form"
+        prop="consignee"
+        label-width="80px"
+        :rules="reservationRules"
       >
         <el-row>
           <el-col :span="10">
@@ -17,12 +17,12 @@
           <el-col :span="10">
             <el-form-item label="预约时间:" label-width="100px">
               <el-date-picker
-                      v-model="form.reservationDate"
-                      type="date"
-                      clearable
-                      placeholder="选择日期时间"
-                      format="YYYY/MM/DD"
-                      value-format="YYYY-MM-DD"
+                v-model="form.reservationDate"
+                type="date"
+                clearable
+                placeholder="选择日期时间"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
               >
               </el-date-picker>
             </el-form-item>
@@ -38,7 +38,7 @@
             <el-form-item label="时&emsp;&emsp;段:" prop="periodOfTime" label-width="100px">
               <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
                 <el-radio :label="item.dictKey" :value="item.dictKey"
-                >{{ item.dictValue }}&emsp;
+                  >{{ item.dictValue }}&emsp;
                 </el-radio>
               </el-radio-group>
               <!--                            :label="item.dictValue"-->
@@ -95,7 +95,7 @@
               <!--                            v-for="item in this.deliveryWayData"-->
               <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
                 <el-radio :label="item.dictKey" :value="item.dictKey"
-                >{{ item.dictValue }}&emsp;
+                  >{{ item.dictValue }}&emsp;
                 </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -110,7 +110,7 @@
             <el-form-item label="服务类型:" prop="serveType" label-width="120px">
               <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
                 <el-checkbox :label="item.dictKey" :value="item.dictKey"
-                >{{ item.dictValue }}&emsp;
+                  >{{ item.dictValue }}&emsp;
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
@@ -123,51 +123,51 @@
           </el-col>
         </el-row>
       </el-form>
-     
-      <el-tabs type="border-card" @tab-click="handleClick" >
+
+      <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"
+            :columnList="columnList"
+            :tableData="orderData"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
             <template #default="slotProps">
               <el-text
-                      v-if="slotProps.scope.row.resource !== '零担'"
-                      type="primary"
-                      link
-                      icon="el-icon-view"
-                      @click="viewStockArticlePackage(slotProps.scope.row)"
-              >查看包件
+                v-if="slotProps.scope.row.resource !== '零担'"
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="viewStockArticlePackage(slotProps.scope.row)"
+                >查看包件
               </el-text>
               <el-text
-                      v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
-                      type="primary"
-                      link
-                      icon="el-icon-view"
-                      @click="entryNum(slotProps.scope.row)"
-              >在库录入
+                v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="entryNum(slotProps.scope.row)"
+                >在库录入
               </el-text>
               <el-text
-                      v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
-                      type="primary"
-                      link
-                      icon="el-icon-view"
-                      @click="entryReservationNum(slotProps.scope.row)"
-              >预约录入
+                v-if="slotProps.scope.row.resource === '零担' || slotProps.scope.row.isZero === '1'"
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="entryReservationNum(slotProps.scope.row)"
+                >预约录入
               </el-text>
               <el-text
-                      type="primary"
-                      link
-                      icon="el-icon-edit"
-                      @click="removeStockArticle(slotProps.scope.row)"
-              >移除
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockArticle(slotProps.scope.row)"
+                >移除
               </el-text>
             </template>
           </tablecmt>
@@ -204,17 +204,16 @@
         <el-tab-pane label="库存品">
           <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
           <tablecmt
-                  :columnList="stockcolumnList"
-                  :tableData="inventoryData"
-                  :loading="loading"
-                  @inputTxt="inputsc"
-                  @timeCheck="timesc"
-                  @btnCheck="btnsc"
-                  @selectCheck="selectsc"
-                  @selection="selectionChange"
+            :columnList="stockcolumnList"
+            :tableData="inventoryData"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
           >
             <template #default="slotProps">
-
               <!--              <el-text-->
               <!--                      v-if="inventoryShow"-->
               <!--                      type="primary"-->
@@ -224,20 +223,23 @@
               <!--              >查看详情</el-text>-->
 
               <el-text
-                      type="primary"
-                      link
-                      icon="el-icon-edit"
-                      @click="removeStockList(slotProps.scope.row)"
-              >移除
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockList(slotProps.scope.row)"
+                >移除
               </el-text>
             </template>
           </tablecmt>
         </el-tab-pane>
       </el-tabs>
       <el-form-item style="margin-left: 45%; margin-top: 5px">
-        <el-button type="primary" icon="el-icon-circle-close" @click="onSubmit"
-        :disabled="subloading"
-        >提交(配送订单预约)
+        <el-button
+          type="primary"
+          icon="el-icon-circle-close"
+          @click="onSubmit"
+          :disabled="subloading"
+          >提交(配送订单预约)
         </el-button>
         <el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button>
       </el-form-item>
@@ -245,55 +247,54 @@
       <template v-if="orderShow">
         <el-dialog v-model="orderShow" title="在库订单信息" width="80%" :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>-->
-<!--            &lt;!&ndash; <el-form-item label="商场名称:">-->
-<!--                <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>-->
-<!--              </el-form-item> &ndash;&gt;-->
-<!--            <el-form-item label="货物名称:">-->
-<!--              <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="品牌:">-->
-<!--              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="顾客姓名:">-->
-<!--              <el-input v-model="query.customerName" placeholder="请输入顾客姓名"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="顾客电话:">-->
-<!--              <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>-->
-<!--            </el-form-item>-->
+          <!--          <el-form :inline="true" :model="query">-->
+          <!--            <el-form-item label="订单自编号:">-->
+          <!--              <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            &lt;!&ndash; <el-form-item label="商场名称:">-->
+          <!--                <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>-->
+          <!--              </el-form-item> &ndash;&gt;-->
+          <!--            <el-form-item label="货物名称:">-->
+          <!--              <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="品牌:">-->
+          <!--              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="顾客姓名:">-->
+          <!--              <el-input v-model="query.customerName" placeholder="请输入顾客姓名"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="顾客电话:">-->
+          <!--              <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>-->
+          <!--            </el-form-item>-->
 
-<!--            &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>-->
+          <!--            &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
-                  
-                  class="tableNode"
-                  :columnList="stockArtcolumnList"
-                  :tableData="stockArticleInfo"
-                  :checkselect="orderSelectList"
-                  :loading="loading"
-                  @inputTxt="inputscStockArtic"
-                  @timeCheck="timescStockArtic"
-                  @btnCheck="btnscStockArtic"
-                  @selectCheck="selectscStockArtic"
-                  @selection="selectionChange"
+            class="tableNode"
+            :columnList="stockArtcolumnList"
+            :tableData="stockArticleInfo"
+            :checkselect="orderSelectList"
+            :loading="loading"
+            @inputTxt="inputscStockArtic"
+            @timeCheck="timescStockArtic"
+            @btnCheck="btnscStockArtic"
+            @selectCheck="selectscStockArtic"
+            @selection="selectionChange"
           >
             <template #default="slotProps">
               <!-- orderSelectList -->
               <el-text
-                      type="primary"
-                      link
-                      icon="el-icon-edit"
-                      @click="removeStockList(slotProps.scope.row)"
-              >移除
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockList(slotProps.scope.row)"
+                >移除
               </el-text>
             </template>
           </tablecmt>
@@ -302,22 +303,22 @@
             <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
               <el-pagination
-                      align="right"
-                      background
-                      @size-change="sizeOrderChange"
-                      @current-change="currentOrderChange"
-                      :current-page="page.currentPage"
-                      :page-sizes="[30, 50, 80, 120]"
-                      :page-size="page.pageSize"
-                      layout="total, sizes, prev, pager, next, jumper"
-                      :total="page.total"
+                align="right"
+                background
+                @size-change="sizeOrderChange"
+                @current-change="currentOrderChange"
+                :current-page="page.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
               >
               </el-pagination>
             </div>
           </el-row>
           <el-form-item style="margin-left: 45%; margin-top: 5px">
             <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
-            >提交(订单)
+              >提交(订单)
             </el-button>
             <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
           </el-form-item>
@@ -353,7 +354,7 @@
               </el-col>
               <el-col :xl="4" :lg="7" :md="8" :sm="24">
                 <span
-                >可用数量：{{
+                  >可用数量：{{
                     item.handQuantity - item.deliveryQuantity - item.outboundQuantity
                   }}</span
                 >
@@ -361,32 +362,32 @@
               </el-col>
             </el-row>
             <el-input-number
-                    v-if="this.isrReservationEntry"
-                    v-model="item.reservationNum"
-                    min="0"
-                    :max="item.zeroOrderMax"
-                    placeholder="请输入预约数量"
+              v-if="this.isrReservationEntry"
+              v-model="item.reservationNum"
+              min="0"
+              :max="item.zeroOrderMax"
+              placeholder="请输入预约数量"
             ></el-input-number>
             <el-input-number
-                    v-else
-                    v-model="item.number"
-                    min="0"
-                    :max="item.quantity"
-                    placeholder="请输入预约数量"
+              v-else
+              v-model="item.number"
+              min="0"
+              :max="item.quantity"
+              placeholder="请输入预约数量"
             ></el-input-number>
             <!--                    <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity "  placeholder="请输入预约数量"></el-input-number>-->
           </div>
         </template>
         <el-form-item style="margin-left: 37%; margin-top: 5px">
           <el-button
-                  v-if="!isrReservationEntry"
-                  type="primary"
-                  icon="el-icon-circle-close"
-                  @click="onSubmitUpdateZeroOrder"
-          >修改(零担订单)
+            v-if="!isrReservationEntry"
+            type="primary"
+            icon="el-icon-circle-close"
+            @click="onSubmitUpdateZeroOrder"
+            >修改(零担订单)
           </el-button>
           <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitZeroOrder"
-          >提交(零担订单)
+            >提交(零担订单)
           </el-button>
           <el-button icon="el-icon-circle-close" @click="zeroOrderShow = false">返 回</el-button>
         </el-form-item>
@@ -395,57 +396,57 @@
       <template v-if="stockListShow">
         <el-dialog v-model="stockListShow" title="库存品信息" width="80%">
           <!--                :before-close="handleClose"-->
-<!--          <el-form :inline="true" :model="query">-->
-<!--            <el-form-item label="商场名称:">-->
-<!--              <el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="物料名称:">-->
-<!--              <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="商场编码:">-->
-<!--              <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="订单自编号:">-->
-<!--              <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>-->
-<!--            </el-form-item>-->
-<!--            <el-form-item label="品牌:">-->
-<!--              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>-->
-<!--            </el-form-item>-->
-<!--            &lt;!&ndash; 查询按钮 &ndash;&gt;-->
-<!--            <el-form-item>-->
-<!--              <el-button type="primary" icon="el-icon-search" @click="searchStockList"-->
-<!--              >搜 索-->
-<!--              </el-button>-->
-<!--              <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>-->
-<!--            </el-form-item>-->
-<!--          </el-form>-->
+          <!--          <el-form :inline="true" :model="query">-->
+          <!--            <el-form-item label="商场名称:">-->
+          <!--              <el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="物料名称:">-->
+          <!--              <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="商场编码:">-->
+          <!--              <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="订单自编号:">-->
+          <!--              <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            <el-form-item label="品牌:">-->
+          <!--              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--            &lt;!&ndash; 查询按钮 &ndash;&gt;-->
+          <!--            <el-form-item>-->
+          <!--              <el-button type="primary" icon="el-icon-search" @click="searchStockList"-->
+          <!--              >搜 索-->
+          <!--              </el-button>-->
+          <!--              <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>-->
+          <!--            </el-form-item>-->
+          <!--          </el-form>-->
           <tablecmt
-                  class="kcptableNode"
-                  :columnList="inventoryInfocolumnList"
-                  :tableData="inventoryInfo"
-                  :checkselect="inventorySelectList"
-                  :loading="loading"
-                  @inputTxt="inputscInventory"
-                  @timeCheck="timescInventory"
-                  @btnCheck="btnscInventory"
-                  @selectCheck="searchStockList"
-                  @selection="selectionInventoryChange"
+            class="kcptableNode"
+            :columnList="inventoryInfocolumnList"
+            :tableData="inventoryInfo"
+            :checkselect="inventorySelectList"
+            :loading="loading"
+            @inputTxt="inputscInventory"
+            @timeCheck="timescInventory"
+            @btnCheck="btnscInventory"
+            @selectCheck="searchStockList"
+            @selection="selectionInventoryChange"
           >
-<!--            ref="multipleTable"-->
+            <!--            ref="multipleTable"-->
 
             <template #default="slotProps">
               <el-text
-                      type="primary"
-                      link
-                      icon="el-icon-edit"
-                      @click="removeStockList(slotProps.scope.row)"
-              >移除
+                type="primary"
+                link
+                icon="el-icon-edit"
+                @click="removeStockList(slotProps.scope.row)"
+                >移除
               </el-text>
             </template>
           </tablecmt>
           <el-form-item style="margin-left: 45%; margin-top: 5px">
             <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
-            >提交(库存品)
+              >提交(库存品)
             </el-button>
             <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
           </el-form-item>
@@ -457,14 +458,14 @@
           <!-- 列表模块 -->
           <!--                :isselectfun="checkPackage"-->
           <tablecmt
-                  class="tcpack"
-                  :columnList="columnParcels"
-                  :tableData="packageData"
-                  :checkselect="packageDataSec"
-                  :loading="loading"
-                  @selection="selectionPackageChange"
-                  @select="tableAllSelection"
-                  @cell-mouse-enter="hove"
+            class="tcpack"
+            :columnList="columnParcels"
+            :tableData="packageData"
+            :checkselect="packageDataSec"
+            :loading="loading"
+            @selection="selectionPackageChange"
+            @select="tableAllSelection"
+            @cell-mouse-enter="hove"
           >
             <template #default="slotProps">
               <!-- <el-text
@@ -512,7 +513,7 @@
                     </el-table> -->
           <el-form-item style="margin-left: 45%; margin-top: 5px">
             <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
-            >提交(包件)
+              >提交(包件)
             </el-button>
             <el-button icon="el-icon-circle-close" @click="isaddvalue = false">返 回</el-button>
           </el-form-item>
@@ -520,78 +521,78 @@
       </template>
 
       <el-dialog
-              v-model="dialogVisible"
-              title="增值服务"
-              width="30%"
-              :model="addvalue"
-              :before-close="handleClose"
+        v-model="dialogVisible"
+        title="增值服务"
+        width="30%"
+        :model="addvalue"
+        :before-close="handleClose"
       >
         <el-form-item label="增值服务" prop="freightMark">
           <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
             <el-checkbox
-                    style="width: 100%; margin-bottom: 3%"
-                    v-for="(item, index) in addvalueServeTypeData"
-                    :key="item.dictKey"
-                    :label="item.dictKey"
-            >{{ item.dictValue }}
+              style="width: 100%; margin-bottom: 3%"
+              v-for="(item, index) in addvalueServeTypeData"
+              :key="item.dictKey"
+              :label="item.dictKey"
+              >{{ item.dictValue }}
               <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
-              >&nbsp;件数:
+                >&nbsp;件数:
                 <el-input
-                        type="number"
-                        v-model="item.f"
-                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                        @change="textbox($event, index, 1)"
-                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                  type="number"
+                  v-model="item.f"
+                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                  @change="textbox($event, index, 1)"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 1"
-              >公里:
+                >公里:
                 <el-input
-                        type="primary"
-                        v-model="item.a"
-                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                        @change="textbox($event, index, 2)"
-                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                  type="primary"
+                  v-model="item.a"
+                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                  @change="textbox($event, index, 2)"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 3"
-              >距离:
+                >距离:
                 <el-input
-                        type="number"
-                        v-model="item.b"
-                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                        @change="textbox($event, index, 3)"
-                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                  type="number"
+                  v-model="item.b"
+                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                  @change="textbox($event, index, 3)"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 5"
-              >人数:
+                >人数:
                 <el-input
-                        type="number"
-                        v-model="item.c"
-                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                        @change="textbox($event, index, 4)"
-                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                  type="number"
+                  v-model="item.c"
+                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                  @change="textbox($event, index, 4)"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="index === 0"
-              >楼层:
+                >楼层:
                 <el-input
-                        type="number"
-                        v-model="item.d"
-                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                        @change="textbox($event, index, 5)"
-                        style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                  type="number"
+                  v-model="item.d"
+                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                  @change="textbox($event, index, 5)"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
               <span v-if="item"
-              >预计费用:
+                >预计费用:
                 <el-input
-                        type="number"
-                        v-model="item.e"
-                        :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                        @change="textbox($event, index, 6)"
-                        style="width: 20%; border: none; border-bottom: 2px solid #eee"
+                  type="number"
+                  v-model="item.e"
+                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                  @change="textbox($event, index, 6)"
+                  style="width: 20%; border: none; border-bottom: 2px solid #eee"
                 />
               </span>
             </el-checkbox>
@@ -609,382 +610,381 @@
 </template>
 
 <script>
-  import {
-    add,
-    update,
-    remove,
-    getReservationInfo,
-    getReservationZeroOrderDetail,
-    getReservationPackageListByOrderId,
-  } from '@/api/distribution/distributionReservation';
-  import {
-    getStockArticleList,
-    getPackageListByStockArticleId,
-    getClientList,
-    selectUpdateAvailableStockArticle,
-    getZeroOrderDetail,
-    $_clientList,
-  } from '@/api/distribution/distributionStockArticle';
-  import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
-  import { addIncrement } from '@/api/distribution/distributionStockArticle';
-  import {
-    getInventoryList,
-    getStockListClient,
-    selectInventoryDetail,
-  } from '@/api/distribution/distributionStockList';
-  import {setNodeHeight } from '@/utils/util';	
-  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 {
+  add,
+  update,
+  remove,
+  getReservationInfo,
+  getReservationZeroOrderDetail,
+  getReservationPackageListByOrderId,
+} from '@/api/distribution/distributionReservation';
+import {
+  getStockArticleList,
+  getPackageListByStockArticleId,
+  getClientList,
+  selectUpdateAvailableStockArticle,
+  getZeroOrderDetail,
+  $_clientList,
+} from '@/api/distribution/distributionStockArticle';
+import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
+import { addIncrement } from '@/api/distribution/distributionStockArticle';
+import {
+  getInventoryList,
+  getStockListClient,
+  selectInventoryDetail,
+} from '@/api/distribution/distributionStockList';
+import { setNodeHeight } from '@/utils/util';
+import option from '@/option/distribution/distributionStockArticle';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
 
-  export default {
-    data() {
-      return {
-        subloading:false,//提交加载效果
-        columnList: [
-          {
-            prop: 'waybillNumber',
-            label: '运单号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderCode',
-            label: '订单自编号',
-            type: 2,
-            values: '',
-            width: '300',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'mallName',
-            label: '商场名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'storeName',
-            label: '门店名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'resource',
-            label: '订单来源',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'descriptionGoods',
-            label: '货物名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'warehouse',
-            label: '仓库',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderStatusName',
-            label: '订单状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'storeTime',
-            label: '在库时间',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'totalNumber',
-            label: '订单总件数',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'handQuantity',
-            label: '在库件数',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'reservationNum',
-            label: '预约数量',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'customerName',
-            label: '顾客名字',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'customerTelephone',
-            label: '顾客电话',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'customerAddress',
-            label: '顾客地址',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: 'right',
-            hide: true,
-          },
-        ],
-        stockcolumnList: [
-
-          {
-            prop: 'incomingBatch',
-            label: '入库批次',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'serviceTypeName',
-          //   label: '服务类型',
-          //   type: 1,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: true,
-          //   sortable: true,
-          //   head: false,
-          // },
-          {
-            prop: 'orderCode',
-            label: '订单自编号',
-            type: 2,
-            values: '',
-            width: '300',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'descriptionGoods',
-            label: '物料名称',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'warehouse',
-          //   label: '入库时间',
-          //   type: 2,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'warehouseName',
-            label: '仓库名称',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'cargoNumber',
-            label: '物料编码',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'marketName',
-            label: '商场/客户',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'storeName',
-            label: '门店名称',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'brandName',
-            label: '品牌',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'mallName',
-          //   label: '商城名称',
-          //   type: 2,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'despatch',
-            label: '物流车次',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'quantityStock',
-            label: '库存数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'quantityOccupied',
-            label: '冻结数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          /* {
+export default {
+  data() {
+    return {
+      subloading: false, //提交加载效果
+      columnList: [
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'mallName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'resource',
+          label: '订单来源',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '货物名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderStatusName',
+          label: '订单状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'storeTime',
+          label: '在库时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'reservationNum',
+          label: '预约数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客地址',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+      ],
+      stockcolumnList: [
+        {
+          prop: 'incomingBatch',
+          label: '入库批次',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'serviceTypeName',
+        //   label: '服务类型',
+        //   type: 1,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: true,
+        //   sortable: true,
+        //   head: false,
+        // },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'warehouse',
+        //   label: '入库时间',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'cargoNumber',
+          label: '物料编码',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场/客户',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'mallName',
+        //   label: '商城名称',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'despatch',
+          label: '物流车次',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'quantityOccupied',
+          label: '冻结数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        /* {
              prop: 'despatch',
              label: '物流发运车次',
              type: 2,
@@ -994,549 +994,549 @@
              fixed: false,
              sortable: true,
            },*/
-          // {
-          //   prop: 'category',
-          //   label: '品分类',
-          //   type: 2,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'outboundQuantity',
-            label: '出库数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'reservationNum',
-            label: '预约数量',
-            type: 10,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false
-          },
+        // {
+        //   prop: 'category',
+        //   label: '品分类',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'outboundQuantity',
+          label: '出库数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'reservationNum',
+          label: '预约数量',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: 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,
-            sortable: true,
-          },
-          {
-            prop: 'unpackName',
-            label: '拆包状态',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [
-              {
-                value: `true`,
-                label: '是',
-              },
-              {
-                value: `false`,
-                label: '否',
-              },
-            ],
-            fixed: false,
-            sortable: true,
-          },
+        // {
+        //   prop: 'storeCode',
+        //   label: '门店编码',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'marketCode',
+        //   label: '商场编码',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        // {
+        //   prop: 'shoppingMall',
+        //   label: '所属商场',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'cargoUnit',
+          label: '物料单位',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'unpackingQuantity',
+          label: '拆包数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '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: '50',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'waybillNumber',
-            label: '运单号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderCode',
-            label: '订单自编号',
-            type: 2,
-            values: '',
-            width: '300',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '260',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'mallName',
-            label: '商场名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'storeName',
-            label: '门店名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'descriptionGoods',
-            label: '物料名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          // {
-          //   prop: 'reservationStatusName',
-          //   label: '预约状态',
-          //   type: 3,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [
-          //     {
-          //       label: '未预约',
-          //       value: '10',
-          //     },
-          //     {
-          //       label: '部分预约',
-          //       value: '20',
-          //     },
-          //   ],
-          //   fixed: false,
-          //   sortable: true,
-          //   head: false,
-          // },
-          {
-            prop: 'freezeStatusName',
-            label: '冻结状态',
-            type: 3,
-            values: '',
-            width: '150',
-            checkarr: [
-              {
-                label: '未冻结',
-                value: '10',
-              },
-              {
-                label: '部分冻结',
-                value: '20',
-              },
-              {
-                label: '已冻结',
-                value: '30',
-              },
-            ],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'warehouse',
-            label: '仓库',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'warehouseEntryTime',
-            label: '入库时间',
-            type: 4,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'storeTime',
-            label: '在库时间',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'totalNumber',
-            label: '订单总件数',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'handQuantity',
-            label: '在库件数',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'completeSetName',
-            label: '是否齐套',
-            type: 3,
-            values: '',
-            width: '150',
-            checkarr: [
-              {
-                label: '否',
-                value: '1',
-              },
-              {
-                label: '是',
-                value: '2',
-              },
-            ],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'brand',
-            label: '品牌',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'customerName',
-            label: '顾客名字',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'customerTelephone',
-            label: '顾客电话',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'customerAddress',
-            label: '顾客地址',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'allocation',
-            label: '库位信息',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'trays',
-            label: '托盘信息',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-        ],
-        inventoryInfocolumnList: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: 55,
-            checkarr: [],
-            fixed: true,
-          },
-          {
-            prop: 'incomingBatch',
-            label: '入库批次',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          // {
-          //   prop: 'serviceTypeName',
-          //   label: '服务类型',
-          //   type: 1,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: true,
-          //   sortable: true,
-          //   head: false,
-          // },
-          {
-            prop: 'orderCode',
-            label: '订单自编号',
-            type: 2,
-            values: '',
-            width: '300',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'descriptionGoods',
-            label: '物料名称',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'warehouse',
-          //   label: '入库时间',
-          //   type: 2,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'warehouseName',
-            label: '仓库名称',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'cargoNumber',
-            label: '物料编码',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'marketName',
-            label: '商场/客户',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'storeName',
-            label: '门店名称',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'brandName',
-            label: '品牌',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          // {
-          //   prop: 'mallName',
-          //   label: '商城名称',
-          //   type: 2,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'despatch',
-            label: '物流车次',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'quantityStock',
-            label: '库存数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'quantityOccupied',
-            label: '冻结数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          /* {
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+        // 更多列的配置...
+      ],
+      stockArtcolumnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: '50',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '260',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'mallName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: 'reservationStatusName',
+        //   label: '预约状态',
+        //   type: 3,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [
+        //     {
+        //       label: '未预约',
+        //       value: '10',
+        //     },
+        //     {
+        //       label: '部分预约',
+        //       value: '20',
+        //     },
+        //   ],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        {
+          prop: 'freezeStatusName',
+          label: '冻结状态',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              label: '未冻结',
+              value: '10',
+            },
+            {
+              label: '部分冻结',
+              value: '20',
+            },
+            {
+              label: '已冻结',
+              value: '30',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouseEntryTime',
+          label: '入库时间',
+          type: 4,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'storeTime',
+          label: '在库时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库件数',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'completeSetName',
+          label: '是否齐套',
+          type: 3,
+          values: '',
+          width: '150',
+          checkarr: [
+            {
+              label: '否',
+              value: '1',
+            },
+            {
+              label: '是',
+              value: '2',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerName',
+          label: '顾客名字',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerTelephone',
+          label: '顾客电话',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'customerAddress',
+          label: '顾客地址',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'allocation',
+          label: '库位信息',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'trays',
+          label: '托盘信息',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
+      inventoryInfocolumnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'incomingBatch',
+          label: '入库批次',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: 'serviceTypeName',
+        //   label: '服务类型',
+        //   type: 1,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: true,
+        //   sortable: true,
+        //   head: false,
+        // },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'warehouse',
+        //   label: '入库时间',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'cargoNumber',
+          label: '物料编码',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'marketName',
+          label: '商场/客户',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'storeName',
+          label: '门店名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'mallName',
+        //   label: '商城名称',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
+        {
+          prop: 'despatch',
+          label: '物流车次',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'quantityStock',
+          label: '库存数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'quantityOccupied',
+          label: '冻结数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        /* {
              prop: 'despatch',
              label: '物流发运车次',
              type: 2,
@@ -1546,765 +1546,767 @@
              fixed: false,
              sortable: true,
            },*/
-          // {
-          //   prop: 'category',
-          //   label: '品分类',
-          //   type: 2,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true,
-          // },
-          {
-            prop: 'outboundQuantity',
-            label: '出库数量',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
-          {
-            prop: 'reservationNum',
-            label: '预约数量',
-            type: 10,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: 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,
-            sortable: true,
-          },
-          {
-            prop: 'unpack',
-            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,
+          sortable: true,
+        },
+        {
+          prop: 'reservationNum',
+          label: '预约数量',
+          type: 10,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: 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,
+          sortable: true,
+        },
+        {
+          prop: 'unpack',
+          label: '拆包状态',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [
+            {
+              value: `true`,
+              label: '是',
+            },
+            {
+              value: `false`,
+              label: '否',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+
+        // {
+        //   prop: '',
+        //   label: '操作',
+        //   type: 6,
+        //   values: '',
+        //   width: '200',
+        //   checkarr: [],
+        //   fixed: 'right',
+        //   hide: true,
+        // },
+        // 更多列的配置...
+      ],
+      columnParcels: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: '50',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStatusName',
+          label: '包件状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageFreezeStatusName',
+          label: '冻结状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageGroundingStatusName',
+          label: '上架状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageStockupStatusName',
+          label: '备货状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageReservationStatusName',
+          label: '预约状态',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderPackageCode',
+          label: '包条码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'goodsAllocation',
+          label: '货位信息',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'firsts',
+          label: '一级品',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'second',
+          label: '二级品',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'thirdProduct',
+          label: '三级品',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'materialName',
+          label: '物料名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'quantity',
+          label: '数量',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'trainNumber',
+          label: '客户车次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: '',
+        //   label: '操作',
+        //   type: 6,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: 'right',
+        //   hide: true,
+        // },
+      ],
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+      //增值服务弹窗
+      dialogVisible: false,
+      textarea: '',
+      //增值服务字典列表
+      addvalueServeTypeData: [],
+      //配送方式字典列表
+      deliveryWayData: [],
+      whetherData: [],
+      //配送类型字典列表
+      deliveryTypeData: [],
+      //增值服务列表
+      addvalueServeType: [],
+      obj: {},
+      //增值表单输入框对象
+      addvalue: {},
+      costList: [], //字典
+      //增值服务对象
+      addvalueObj: {},
+      //费用列表
+      feeList: [],
+      //楼层
+      floorList: [],
+      //订单行数据
+      orderInfo: {},
+      //服务类型
+      serveType: [],
+      //增加订单弹窗
+      orderShow: false,
+      zeroOrderData: [],
+      zeroOrderShow: false,
+      //是否是预约录入
+      isrReservationEntry: false,
+      // zeroPackageNum:0,
+      //在库订单信息
+      stockArticleInfo: [],
+      //库存品信息
+      inventoryInfo: [],
+      //时段
+      periodOfTimeData: [],
+      //路由订单编号
+      orderIds: '',
+      //预约编号
+      reservationId: '',
+      zeroOrderMax: 0,
+      // 商城名称
+      marketName: '',
+      /** 被选中仓库信息 */
+      warehouseId: '',
+      // 包件复选框列表
+      packageDataSec: [],
+      inventoryData: [],
+      orderData: [],
+      stockListShow: false,
+      isaddvalue: false,
+      packageData: [],
+      packageList: [],
+      inventoryList: [],
+      inventorySelectList: [],
+      orderList: [],
+      orderSelectList: [],
+      inventoryTable: [],
+      inventoryShow: false,
+      reservationRules: {
+        consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
+        deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
+        deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }],
+        // enableStatus: [
+        //   { required: true, message: '请选择启用状态!', trigger: 'change' }
+        // ],
+      },
+      obj: {},
+    };
+  },
+  created() {
+    this.$watch(
+      () => this.$route.params,
+      () => {
+        this.fetchData();
+      },
+      // 组件创建完后获取数据，
+      // 此时 data 已经被 observed 了
+      { immediate: true }
+    );
+  },
+  mounted() {
+    this.init();
 
-          // {
-          //   prop: '',
-          //   label: '操作',
-          //   type: 6,
-          //   values: '',
-          //   width: '200',
-          //   checkarr: [],
-          //   fixed: 'right',
-          //   hide: true,
-          // },
-          // 更多列的配置...
-        ],
-        columnParcels: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: '50',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'warehouse',
-            label: '仓库',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'waybillNumber',
-            label: '运单号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderPackageStatusName',
-            label: '包件状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderPackageFreezeStatusName',
-            label: '冻结状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderPackageGroundingStatusName',
-            label: '上架状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderPackageStockupStatusName',
-            label: '备货状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderPackageReservationStatusName',
-            label: '预约状态',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'orderPackageCode',
-            label: '包条码',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'goodsAllocation',
-            label: '货位信息',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'pallet',
-            label: '所在托盘',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'firsts',
-            label: '一级品',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'second',
-            label: '二级品',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'thirdProduct',
-            label: '三级品',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'materialName',
-            label: '物料名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'quantity',
-            label: '数量',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            prop: 'trainNumber',
-            label: '客户车次号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: true,
-            sortable: true,
-            head: false,
-          },
-          // {
-          //   prop: '',
-          //   label: '操作',
-          //   type: 6,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [],
-          //   fixed: 'right',
-          //   hide: true,
-          // },
-        ],
-        height: 0,
-        // 弹框标题
-        title: '',
-        // 是否展示弹框
-        box: false,
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-        // 查询信息
-        query: {},
-        // 分页信息
-        page: {
-          currentPage: 1,
-          pageSize: 30,
-          total: 40,
-        },
-        // 表单数据
-        form: {},
-        // 选择行
-        selectionList: [],
-        // 表单配置
-        option: option,
-        // 表单列表
-        data: [],
-        //增值服务弹窗
-        dialogVisible: false,
-        textarea: '',
-        //增值服务字典列表
-        addvalueServeTypeData: [],
-        //配送方式字典列表
-        deliveryWayData: [],
-        whetherData: [],
-        //配送类型字典列表
-        deliveryTypeData: [],
-        //增值服务列表
-        addvalueServeType: [],
-        obj: {},
-        //增值表单输入框对象
-        addvalue: {},
-        costList: [], //字典
-        //增值服务对象
-        addvalueObj: {},
-        //费用列表
-        feeList: [],
-        //楼层
-        floorList: [],
-        //订单行数据
-        orderInfo: {},
-        //服务类型
-        serveType: [],
-        //增加订单弹窗
-        orderShow: false,
-        zeroOrderData: [],
-        zeroOrderShow: false,
-        //是否是预约录入
-        isrReservationEntry: false,
-        // zeroPackageNum:0,
-        //在库订单信息
-        stockArticleInfo: [],
-        //库存品信息
-        inventoryInfo: [],
-        //时段
-        periodOfTimeData: [],
-        //路由订单编号
-        orderIds: '',
-        //预约编号
-        reservationId: '',
-        zeroOrderMax: 0,
-        // 商城名称
-        marketName: '',
-        /** 被选中仓库信息 */
-        warehouseId: '',
-        // 包件复选框列表
-        packageDataSec: [],
-        inventoryData: [],
-        orderData: [],
-        stockListShow: false,
-        isaddvalue: false,
-        packageData: [],
-        packageList: [],
-        inventoryList: [],
-        inventorySelectList: [],
-        orderList: [],
-        orderSelectList: [],
-        inventoryTable: [],
-        inventoryShow: false,
-        reservationRules: {
-          consignee: [{ required: true, message: '请填写收货人名称!!!', trigger: 'change' }],
-          deliveryAddress: [{ required: true, message: '请填写收货人地址!!!', trigger: 'blur' }],
-          deliveryPhone: [{ required: true, message: '请填写收货人电话!!!', trigger: 'change' }],
-          // enableStatus: [
-          //   { required: true, message: '请选择启用状态!', trigger: 'change' }
-          // ],
-        },
-        obj: {},
-      };
+    this.onLoad(this.page);
+    this.getDictionary();
+  },
+  watch: {
+    '$route.query.reservationId': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal);
+        this.fetchData();
+        this.onLoad(this.page);
+      },
+      deep: true,
+      immediate: true,
     },
-    created() {
-      this.$watch(
-              () => this.$route.params,
-              () => {
-                this.fetchData();
-              },
-              // 组件创建完后获取数据，
-              // 此时 data 已经被 observed 了
-              { immediate: true }
-      );
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
     },
-    mounted() {
-      this.init();
-
-      this.onLoad(this.page);
-      this.getDictionary();
+  },
+  methods: {
+    handleToggleAllSelection() {
+      this.$refs.selecttable.toggleAllSelection();
     },
-    watch: {
-      '$route.query.reservationId': {
-        handler(newVal, oldVal) {
-          console.log(newVal, oldVal);
-          this.fetchData();
-          this.onLoad(this.page);
-        },
-        deep: true,
-        immediate: true,
-      },
+    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;
     },
-    computed: {
-      ...mapGetters(['permission']),
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(',');
-      },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
     },
-    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;
+    aaa() {
+      let addvalueInfos = [];
+      this.form.addvalueType.forEach((item, index) => {
+        let addvalueInfo = {};
+        addvalueInfo.addvalueId = item;
+        if (item == 1 || item == 3 || item == 5 || item == 7) {
+          addvalueInfo.number = this.costList[item];
         }
-        if (this.$route.query.reservationId) {
-          this.reservationId = this.$route.query.reservationId;
+        if (item == 2) {
+          addvalueInfo.kilometer = this.costList[item];
         }
-        this.loading = false;
-      },
-      init() {
-        this.height = this.setPx(document.body.clientHeight - 340);
-      },
-      aaa() {
-        let addvalueInfos = [];
-        this.form.addvalueType.forEach((item, index) => {
-          let addvalueInfo = {};
-          addvalueInfo.addvalueId = item;
-          if (item == 1 || item == 3 || item == 5 || item == 7) {
-            addvalueInfo.number = this.costList[item];
-          }
-          if (item == 2) {
-            addvalueInfo.kilometer = this.costList[item];
-          }
-          if (item == 4) {
-            addvalueInfo.distance = this.costList[item];
-          }
-          if (item == 6) {
-            addvalueInfo.peopleNum = this.costList[item];
-          }
-          if (this.floorList.length > 1) {
-            addvalueInfo.floor = this.floorList[1];
-            this.floorList = [];
-          }
-          addvalueInfo.fee = this.feeList[item];
-          addvalueInfos.push(addvalueInfo);
+        if (item == 4) {
+          addvalueInfo.distance = this.costList[item];
+        }
+        if (item == 6) {
+          addvalueInfo.peopleNum = this.costList[item];
+        }
+        if (this.floorList.length > 1) {
+          addvalueInfo.floor = this.floorList[1];
+          this.floorList = [];
+        }
+        addvalueInfo.fee = this.feeList[item];
+        addvalueInfos.push(addvalueInfo);
+      });
+      let params = {};
+      params.id = this.orderInfo.id;
+      params.addvalue = addvalueInfos;
+      params.relatedId = 1;
+      console.log('params>>>>>>>>>>>>', params);
+      addIncrement(params).then(res => {
+        this.dialogVisible = false;
+        this.$message({
+          type: 'success',
+          message: '操作成功!',
         });
-        let params = {};
-        params.id = this.orderInfo.id;
-        params.addvalue = addvalueInfos;
-        params.relatedId = 1;
-        console.log('params>>>>>>>>>>>>', params);
-        addIncrement(params).then(res => {
-          this.dialogVisible = false;
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
+      });
+      this.onLoad(this.page);
+    },
+    tableAllSelection() {},
+    handleClick(tab, event) {
+      this.query = {};
+    },
+    //查询出所有的市配订单
+    async handleAddOrder() {
+      this.loading = true;
+      //这里只需要对订单进行正常的搜索即可
+      await this.onLoadOrder(this.page);
+      this.loading = false;
+      this.orderShow = true;
+    },
+    checkOrder(row, index) {
+      if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    handleAddInventory() {
+      let page = this.page;
+      let params = {};
+      this.query.serviceType = '2';
+      params.marketName = this.marketName;
+      this.loading = true;
+      getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query))
+        .then(res => {
+          const inventoryList = res.data.data;
+          inventoryList.records.forEach(item => {
+            item.reservationNum = '0';
+            item.applyNum = item.quantityStock - item.quantityOccupied;
+            if (item.unpack) {
+              item.unpackName = '是';
+            } else {
+              item.unpackName = '否';
+            }
           });
-        });
-        this.onLoad(this.page);
-      },
-      tableAllSelection() {},
-      handleClick(tab, event) {
-        this.query = {};
-      },
-      //查询出所有的市配订单
-      async handleAddOrder() {
-        this.loading = true;
-        //这里只需要对订单进行正常的搜索即可
-        await this.onLoadOrder(this.page);
-        this.loading = false;
-        this.orderShow = true;
-      },
-      checkOrder(row, index) {
-        if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
-          return false;
-        } else {
-          return true;
-        }
-      },
-      handleAddInventory() {
-        let page = this.page;
-        let params = {};
-        this.query.serviceType = '2';
-        params.marketName = this.marketName;
-        this.loading=true;
-        getStockListClient(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-                res => {
-                  const inventoryList = res.data.data;
-                  inventoryList.records.forEach(item => {
-                    item.reservationNum = '0';
-                    item.applyNum = item.quantityStock - item.quantityOccupied;
-                    if (item.unpack){
-                      item.unpackName = '是'
-                    }else {
-                      item.unpackName = '否'
-                    }
-                  });
-                  this.page.total = inventoryList.total;
-                  console.log('res :>> ', res);
+          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;
-                }
-        ).catch(error=>{
+          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;
+        })
+        .catch(error => {
           console.log(error);
-        }).finally(()=>{
-          this.loading=false;
-          let ctime= setTimeout(()=>{
-          const _node = document.querySelector('.kcptableNode');
-          setNodeHeight(_node, '', true);
-          clearTimeout(ctime)
-          },50)
+        })
+        .finally(() => {
+          this.loading = false;
+          let ctime = setTimeout(() => {
+            const _node = document.querySelector('.kcptableNode');
+            setNodeHeight(_node, '', true);
+            clearTimeout(ctime);
+          }, 50);
         });
-        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.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;
-      },
-
-      // 选择包件信息
-      // 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);
           }
         });
-      },
+      }
+      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;
+    },
 
-      // if (row) {
-      //   this.selectionPackageChange(row)
-      //   console.log(  this.selectionPackageChange(),'12312312312321函数');
-      // }
-      async viewStockArticlePackage(row) {
-        this.loading = true;
-        this.packageList = row.packageList;
-        this.obj = row;
-        let page = this.page;
-        this.toggleAllSelection;
-        if (this.reservationId) {
-          const res = await getReservationPackageListByOrderId(
-                  this.reservationId,
-                  row.id,
-                  page.currentPage,
-                  page.pageSize
+    // 选择包件信息
+    // 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,
+            '包含================================================================>'
           );
-          if (res.data.data) {
-            this.packageData = res.data.data.data.packageList;
-            let idList = res.data.data.data.reservationPackageList.map(v => {
-              return v.id;
-            });
-            this.packageDataSec = this.packageData.filter(val => idList.includes(val.id));
-          }
-          this.isaddvalue = true;
-          this.loading = false;
-        } else {
-          console.log(">>>>> id ，",row.id);
-         await getPackageListByStockArticleId(page.currentPage, page.pageSize, {id:row.id}).then(res => {
+          this.selectionPackageChange(item);
+        }
+      });
+    },
+
+    // if (row) {
+    //   this.selectionPackageChange(row)
+    //   console.log(  this.selectionPackageChange(),'12312312312321函数');
+    // }
+    async viewStockArticlePackage(row) {
+      this.loading = true;
+      this.packageList = row.packageList;
+      this.obj = row;
+      let page = this.page;
+      this.toggleAllSelection;
+      if (this.reservationId) {
+        const res = await getReservationPackageListByOrderId(
+          this.reservationId,
+          row.id,
+          page.currentPage,
+          page.pageSize
+        );
+        if (res.data.data) {
+          this.packageData = res.data.data.data.packageList;
+          let idList = res.data.data.data.reservationPackageList.map(v => {
+            return v.id;
+          });
+          this.packageDataSec = this.packageData.filter(val => idList.includes(val.id));
+        }
+        this.isaddvalue = true;
+        this.loading = false;
+      } else {
+        console.log('>>>>> id ，', row.id);
+        await getPackageListByStockArticleId(page.currentPage, page.pageSize, { id: row.id }).then(
+          res => {
             console.log('res---------------->', res);
             // console.log(res.data.data.records);
             if (res.data.data) {
@@ -2314,453 +2316,509 @@
             }
             this.isaddvalue = true;
             this.loading = false;
-          });
-        }
-        let ctime= setTimeout(()=>{
-          const _node = document.querySelector('.tcpack');
-          setNodeHeight(_node, '', true);
-          clearTimeout(ctime)
-          },50)
-      },
+          }
+        );
+      }
+      let ctime = setTimeout(() => {
+        const _node = document.querySelector('.tcpack');
+        setNodeHeight(_node, '', true);
+        clearTimeout(ctime);
+      }, 50);
+    },
 
-      // 选择包件信息
-      // selectionPackageChange(list) {
-      //   console.log(list,'list22');
-      //   console.log('-----------<>', list);
-      //   if (this.reservationId) {
-      //     this.packageDataSec = list;
-      //   } else {
-      //     //新增
-      //     let a = [];
-      //     list.forEach(item => {
-      //       if (
-      //         item.orderPackageReservationStatus === '10' ||
-      //         item.orderPackageReservationStatusName === '未预约'
-      //       ) {
-      //         a.push(item);
-      //       }
-      //     });
-      //     this.packageDataSec = a;
-      //   }
-      // },
-      // 全选表格新增
+    // 选择包件信息
+    // selectionPackageChange(list) {
+    //   console.log(list,'list22');
+    //   console.log('-----------<>', list);
+    //   if (this.reservationId) {
+    //     this.packageDataSec = list;
+    //   } else {
+    //     //新增
+    //     let a = [];
+    //     list.forEach(item => {
+    //       if (
+    //         item.orderPackageReservationStatus === '10' ||
+    //         item.orderPackageReservationStatusName === '未预约'
+    //       ) {
+    //         a.push(item);
+    //       }
+    //     });
+    //     this.packageDataSec = a;
+    //   }
+    // },
+    // 全选表格新增
 
-      checkPackage(row, index) {
-        //区分编辑还是新增
-        //编辑需要对这个预约单下的包件信息均可进行调整
-        console.log(row, 'rowrowrowrowrowrow');
-        // if (!this.reservationId) {
-        //   if (
-        //     row.orderPackageReservationStatusName === '已预约' ||
-        //     row.orderPackageReservationStatusName === '20'
-        //   ) {
-        //     return true;
-        //   }
-        // }
-        if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
-          return false;
-        } else {
-          return true;
-        }
-      },
-      //搜索订单
-      searchStockArticle() {
-        let params = {};
-        let page = this.page;
-        this.query.typeService = 2;
-        this.query.genre = 1;
-        // if (this.reservationId) {
-        //   this.onLoadEditOrder(this.page);
-        // } else {
-        this.onLoadOrder(this.page);
-        // }
-        // selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        //   const data = res.data.data;
-        //   data.records.forEach(item => {
-        //     item.reservationNum = item.handQuantity;
-        //   });
-        //   this.page.total = data.total;
-        //   this.stockArticleInfo = data.records;
-        //   this.loading = false;
-        //   // this.selectionClear();
-        // });
-      },
-      searchStockList() {
-        let params = {};
-        let page = this.page;
-        this.query.serviceType = 2;
-        this.loading=true;
-        getStockListClient(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;
+    checkPackage(row, index) {
+      //区分编辑还是新增
+      //编辑需要对这个预约单下的包件信息均可进行调整
+      console.log(row, 'rowrowrowrowrowrow');
+      // if (!this.reservationId) {
+      //   if (
+      //     row.orderPackageReservationStatusName === '已预约' ||
+      //     row.orderPackageReservationStatusName === '20'
+      //   ) {
+      //     return true;
+      //   }
+      // }
+      if (row.orderPackageFreezeStatus === '10' || row.orderPackageFreezeStatusName === '已冻结') {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    //搜索订单
+    searchStockArticle() {
+      let params = {};
+      let page = this.page;
+      this.query.typeService = 2;
+      this.query.genre = 1;
+      // if (this.reservationId) {
+      //   this.onLoadEditOrder(this.page);
+      // } else {
+      this.onLoadOrder(this.page);
+      // }
+      // selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   const data = res.data.data;
+      //   data.records.forEach(item => {
+      //     item.reservationNum = item.handQuantity;
+      //   });
+      //   this.page.total = data.total;
+      //   this.stockArticleInfo = data.records;
+      //   this.loading = false;
+      //   // this.selectionClear();
+      // });
+    },
+    searchStockList() {
+      let params = {};
+      let page = this.page;
+      this.query.serviceType = 2;
+      this.loading = true;
+      getStockListClient(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();
-                }
-        ).catch(error=>{
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(error => {
           console.log(error);
-        }).finally(()=>{
-          this.loading=false;
-          let ctime= setTimeout(()=>{
-                  const _node = document.querySelector('.kcptableNode');
-                  setNodeHeight(_node, '', true);
-                  clearTimeout(ctime)
-                  },50)
-
+        })
+        .finally(() => {
+          this.loading = false;
+          let ctime = setTimeout(() => {
+            const _node = document.querySelector('.kcptableNode');
+            setNodeHeight(_node, '', true);
+            clearTimeout(ctime);
+          }, 50);
         });
-      },
-      stockArticleSearchReset() {
-        this.selectionList = [];
-        this.query = {};
-        this.handleAddOrder();
-      },
-      stockListSearchReset() {
-        this.selectionList = [];
-        this.query = {};
-        this.handleAddInventory();
-      },
-      // 提交包件数
-      onSubmitPackage() {
-        // this.packageListInfo
+    },
+    stockArticleSearchReset() {
+      this.selectionList = [];
+      this.query = {};
+      this.handleAddOrder();
+    },
+    stockListSearchReset() {
+      this.selectionList = [];
+      this.query = {};
+      this.handleAddInventory();
+    },
+    // 提交包件数
+    onSubmitPackage() {
+      // this.packageListInfo
 
-        if (this.packageDataSec.length === 0) {
-          this.$message.warning('请选择包件!!!');
-          return;
+      if (this.packageDataSec.length === 0) {
+        this.$message.warning('请选择包件!!!');
+        return;
+      }
+      this.orderData.forEach(item => {
+        if (item.id === this.obj.id) {
+          item.packageList = this.packageDataSec;
         }
-        this.orderData.forEach(item => {
-          if (item.id === this.obj.id) {
-            item.packageList = this.packageDataSec;
-          }
+      });
+      console.log('this.orderData------------>', this.orderData);
+      this.isaddvalue = false;
+      this.obj.reservationNum = this.packageListInfo.length;
+    },
+    onSubmit() {
+      // 日期必填
+      if (!this.form.reservationDate) {
+        this.$message({
+          type: 'warning',
+          message: '预约时间暂未选择',
         });
-        console.log('this.orderData------------>', this.orderData);
-        this.isaddvalue = false;
-        this.obj.reservationNum =   this.packageListInfo.length
-      },
-      onSubmit() {
-       
-        // 日期必填
-        if (!this.form.reservationDate) {
-          this.$message({
-            type: 'warning',
-            message: '预约时间暂未选择',
-          });
-          return;
-        }
-        // 提交按钮
-        //新增预约单
-        let orderIds = [];
-        let inventoryIds = [];
-        let inventoryList = [];
-        let stockArticleList = [];
-        // let operation = true;
-        // this.inventoryData.forEach(item => {
-        //   if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
-        //     this.$message({
-        //       type: 'warning',
-        //       message: '存在无效的预约数量',
-        //     });
-        //     operation = false;
-        //     return;
-        //   }
-        //   item.reservationNum = item.reservationNum;
-        //   inventoryIds.push(item.id);
-        //   inventoryList.push(item);
-        // });
-        // if(!operation){
-        //   return
-        // }
-        let operation = true;
-        for (let i = 0; i < this.inventoryData.length; i++) {
+        return;
+      }
+      // 提交按钮
+      //新增预约单
+      let orderIds = [];
+      let inventoryIds = [];
+      let inventoryList = [];
+      let stockArticleList = [];
+      // let operation = true;
+      // this.inventoryData.forEach(item => {
+      //   if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
+      //     this.$message({
+      //       type: 'warning',
+      //       message: '存在无效的预约数量',
+      //     });
+      //     operation = false;
+      //     return;
+      //   }
+      //   item.reservationNum = item.reservationNum;
+      //   inventoryIds.push(item.id);
+      //   inventoryList.push(item);
+      // });
+      // if(!operation){
+      //   return
+      // }
+      let operation = true;
+      for (let i = 0; i < this.inventoryData.length; i++) {
         const item = this.inventoryData[i];
         if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
-         this.$message({
-           type: 'warning',
+          this.$message({
+            type: 'warning',
             message: '存在无效的预约数量',
           });
           operation = false;
           break; // 立即跳出循环
-       }
-      inventoryIds.push(item.id);
+        }
+        inventoryIds.push(item.id);
         inventoryList.push(item);
       }
 
       if (!operation) {
         return;
       }
-        orderIds.join(',');
-        inventoryIds.join(',');
-        this.form.stockArticleIds = orderIds.toString();
-        this.form.inventoryIds = inventoryIds.toString();
-        this.form.inventoryList = inventoryList;
-        console.log('-------------->', this.orderData);
-        let order = this.orderData;
-        order.forEach(o => {
-          if (!o.packageListInfo) {
-            o.packageListInfo = o.packageList;
-          }
+      orderIds.join(',');
+      inventoryIds.join(',');
+      this.form.stockArticleIds = orderIds.toString();
+      this.form.inventoryIds = inventoryIds.toString();
+      this.form.inventoryList = inventoryList;
+      console.log('-------------->', this.orderData);
+      let order = this.orderData;
+      order.forEach(o => {
+        if (!o.packageListInfo) {
+          o.packageListInfo = o.packageList;
+        }
+      });
+      this.form.stockArticleList = order;
+      this.deliveryWayData.forEach(item => {
+        if (this.form.deliveryWay === item.dictValue) {
+          this.form.deliveryWay = item.dictKey;
+        }
+      });
+      this.deliveryTypeData.forEach(item => {
+        if (this.form.deliveryType === item.dictValue) {
+          this.form.deliveryType = item.dictKey;
+        }
+      });
+      this.periodOfTimeData.forEach(item => {
+        if (this.form.periodOfTime === item.dictValue) {
+          this.form.periodOfTime = item.dictKey;
+        }
+      });
+      this.form.serveType = this.serveType.sort().join(',');
+      //服务号
+      this.orderData.forEach(item => {
+        console.log('-------------->item', item);
+        if (!item.packageListInfo) {
+          item.packageListInfo = item.parcelListVOS;
+        }
+      });
+      console.log('------------------->this.form.inventoryList', this.form.inventoryList);
+      console.log('------------------->this.form.stockArticleList', this.form.stockArticleList);
+
+      if (
+        JSON.stringify(this.form.inventoryList) === '[]' &&
+        JSON.stringify(this.form.stockArticleList) === '[]'
+      ) {
+        this.$message({
+          type: 'warning',
+          message: '无效的预约计划!',
         });
-        this.form.stockArticleList = order;
-        this.deliveryWayData.forEach(item => {
-          if (this.form.deliveryWay === item.dictValue) {
-            this.form.deliveryWay = item.dictKey;
-          }
+        operation = false;
+        return;
+      }
+      this.subloading = true; //开启加载效果
+      // this.form.stockArticleList = this.packageList;
+      console.log('>>>>>>>>', this.form);
+      console.log('this.reservationId >>>>>', this.reservationId);
+      if (this.reservationId) {
+        console.log('>>>>>>>> update');
+        this.form.warehouseId = this.warehouseId;
+        this.form.id = this.reservationId;
+        update(this.form).then(res => {
+          if (res.data.code !== 200) return;
+
+          this.$router.go(-1);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
         });
-        this.deliveryTypeData.forEach(item => {
-          if (this.form.deliveryType === item.dictValue) {
-            this.form.deliveryType = item.dictKey;
-          }
+      } else {
+        console.log('>>>>>>>> add');
+        this.form.warehouseId = this.warehouseId;
+        add(this.form).then(res => {
+          if (res.data.code !== 200) return;
+
+          this.subloading = false; //关闭加载效果
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$router.go(-1);
         });
-        this.periodOfTimeData.forEach(item => {
-          if (this.form.periodOfTime === item.dictValue) {
-            this.form.periodOfTime = item.dictKey;
+      }
+    },
+    inputsc() {},
+    timesc() {},
+    selectsc() {},
+    btnsc() {},
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
+    // 移除包件
+    removeStockArticle(row) {
+      if (this.inventoryData.length == 0 && this.orderData.length == 1 && this.reservationId) {
+        this.$message.warning('如需移除请取消该预约计划!!');
+        return;
+      }
+      this.orderData.forEach((item, index) => {
+        if (item.id === row.id) {
+          this.orderData.splice(index, 1);
+        }
+        console.log(item);
+      });
+      // 当两个列表没有数据时, 清空限制
+      if (this.inventoryData.length === 0 && this.orderData.length === 0) {
+        this.marketName = '';
+        this.warehouseId = '';
+      }
+      // 当列表没有数据时, 表单清空
+      if (this.orderData.length === 0) {
+        this.form.consignee = '';
+        this.form.deliveryAddress = '';
+        this.form.deliveryPhone = '';
+      }
+      console.log('>>>>>>>>>>>>>>>row', row);
+    },
+    removeStockList(row) {
+      if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) {
+        this.$message.warning('最少剩下一个数据');
+        return;
+      }
+      this.inventoryData.forEach((item, index) => {
+        if (item.id === row.id) {
+          this.inventoryData.splice(index, 1);
+        }
+        console.log('item>>>>>>>>>>>', item);
+      });
+      // 当两个列表没有数据时, 清空限制
+      if (this.inventoryData.length === 0 && this.orderData.length === 0) {
+        this.marketName = '';
+        this.warehouseId = '';
+      }
+      console.log('>>>>>>>>>>>>>>>row', row);
+    },
+    showStockListEdit(row) {
+      console.log('>>>>>>>>>>>>>>>row', row);
+      //查看库存品详情
+      let a = {};
+      a.reservationId = this.reservationId;
+      a.inventoryId = row.id;
+      selectInventoryDetail(1, 20, a).then(res => {
+        console.log('------------>', res);
+      });
+    },
+    handleView(row) {
+      this.title = '查看';
+      this.view = true;
+      this.box = true;
+      getDetailDelivery(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+    beforeClose(done) {
+      done();
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange(list) {
+      this.orderList = list;
+      console.log('list :>> ', list);
+    },
+    // 选择包件信息
+    selectionPackageChange(list) {
+      console.log('掉用了此函数', list);
+      console.log(list, 'list22');
+      console.log('-----------<>', list);
+      this.packageListInfo = list;
+      console.log(this.packageListInfo, 'packageListInfo');
+      if (this.reservationId) {
+        this.packageDataSec = list;
+      } else {
+        //新增
+        let a = [];
+        list.forEach(item => {
+          if (
+            item.orderPackageReservationStatus === '10' ||
+            item.orderPackageReservationStatusName === '未预约'
+          ) {
+            a.push(item);
           }
         });
-        this.form.serveType = this.serveType.sort().join(',');
-        //服务号
-        this.orderData.forEach(item => {
-          console.log('-------------->item', item);
-          if (!item.packageListInfo) {
-            item.packageListInfo = item.parcelListVOS;
+        this.packageDataSec = a;
+      }
+    },
+    selectionInventoryChange(list) {
+      // if (this.reservationId){
+      console.log('list-----------<>', list);
+      this.inventoryList = list;
+      // }else {
+      //   //新增
+      //   let a = [];
+      //   list.forEach(item=>{
+      //     if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){
+      //       a.push(item);
+      //     }
+      //   })
+      //   this.inventoryList = a;
+      // }
+    },
+    onSubmitUpdateZeroOrder() {
+      console.log('this.obj--------------------->', this.obj);
+      console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
+      console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
+
+      this.isrReservationEntry = false;
+      let a = this.zeroOrderData;
+      if (a.length > 1) {
+        let b = 0;
+        //计算该品类已使用数量
+
+        a.forEach(item => {
+          b += item.number;
+        });
+
+        let f = a.every(item => {
+          console.log('this.number--------------------->', item.number);
+          console.log(
+            'number--------------------->',
+            item.deliveryQuantity + item.outboundQuantity
+          );
+          if (
+            item.number < item.deliveryQuantity + item.outboundQuantity ||
+            item.number > item.quantity
+          ) {
+            return false;
           }
+          return true;
         });
-        console.log('------------------->this.form.inventoryList', this.form.inventoryList);
-        console.log('------------------->this.form.stockArticleList', this.form.stockArticleList);
 
-        if (
-                JSON.stringify(this.form.inventoryList) === '[]' &&
-                JSON.stringify(this.form.stockArticleList) === '[]'
-        ) {
+        if (b > this.obj.handQuantity) {
           this.$message({
-            type: 'warning',
-            message: '无效的预约计划!',
+            type: 'error',
+            message: '录入数量超过订单在库数量!',
           });
-          operation = false;
           return;
         }
-        this.subloading=true;//开启加载效果
-        // this.form.stockArticleList = this.packageList;
-        console.log('>>>>>>>>', this.form);
-        console.log("this.reservationId >>>>>",this.reservationId)
-        if (this.reservationId) {
-          console.log('>>>>>>>> update');
-          this.form.warehouseId = this.warehouseId;
-          this.form.id = this.reservationId;
-          update(this.form).then((res) => {
-            if(res.data.code !== 200) return
-
-            this.$router.go(-1);
-            this.$message({
-              type: 'success',
-              message: '操作成功!',
-            });
-          });
-        } else {
-          console.log('>>>>>>>> add');
-          this.form.warehouseId = this.warehouseId;
-          add(this.form).then((res) => {
-            if(res.data.code !== 200) return
-           
-        this.subloading=false;//关闭加载效果
-            this.$message({
-              type: 'success',
-              message: '操作成功!',
-            });
-            this.$router.go(-1);
+        if (!f) {
+          this.$message({
+            type: 'error',
+            message: '请检查修改数量!',
           });
-        }
-      },
-      inputsc() {},
-      timesc() {},
-      selectsc() {},
-      btnsc() {},
-      handleClose(done) {
-        this.$confirm('确认关闭？')
-                .then(_ => {
-                  done();
-                })
-                .catch(_ => {});
-      },
-      // 移除包件
-      removeStockArticle(row) {
-        if (this.inventoryData.length == 0 && this.orderData.length == 1 && this.reservationId) {
-          this.$message.warning('如需移除请取消该预约计划!!');
           return;
         }
-        this.orderData.forEach((item, index) => {
-          if (item.id === row.id) {
-            this.orderData.splice(index, 1);
-          }
-          console.log(item);
-        });
-        // 当两个列表没有数据时, 清空限制
-        if (this.inventoryData.length === 0 && this.orderData.length === 0) {
-          this.marketName = '';
-          this.warehouseId = '';
-        }
-        // 当列表没有数据时, 表单清空
-        if (this.orderData.length === 0) {
-          this.form.consignee = '';
-          this.form.deliveryAddress = '';
-          this.form.deliveryPhone = '';
-        }
-        console.log('>>>>>>>>>>>>>>>row', row);
-      },
-      removeStockList(row) {
-        if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) {
-          this.$message.warning('最少剩下一个数据');
-          return;
+      }
+      updateEntryNum(this.zeroOrderData).then(res => {
+        if (res) {
+          this.$message({
+            type: 'success',
+            message: '操作成功',
+          });
         }
-        this.inventoryData.forEach((item, index) => {
-          if (item.id === row.id) {
-            this.inventoryData.splice(index, 1);
+      });
+      this.zeroOrderShow = false;
+      console.log('-------------->', this.zeroOrderData);
+    },
+    onSubmitZeroOrder() {
+      if (this.isrReservationEntry) {
+        //零担预约数量录入
+        this.orderData.forEach(item => {
+          if (this.obj.id === item.id) {
+            item.parcelNumberVOS = this.zeroOrderData;
           }
-          console.log('item>>>>>>>>>>>', item);
         });
-        // 当两个列表没有数据时, 清空限制
-        if (this.inventoryData.length === 0 && this.orderData.length === 0) {
-          this.marketName = '';
-          this.warehouseId = '';
-        }
-        console.log('>>>>>>>>>>>>>>>row', row);
-      },
-      showStockListEdit(row) {
-        console.log('>>>>>>>>>>>>>>>row', row);
-        //查看库存品详情
-        let a = {};
-        a.reservationId = this.reservationId;
-        a.inventoryId = row.id;
-        selectInventoryDetail(1, 20, a).then(res => {
-          console.log('------------>', res);
-        });
-      },
-      handleView(row) {
-        this.title = '查看';
-        this.view = true;
-        this.box = true;
-        getDetailDelivery(row.id).then(res => {
-          this.form = res.data.data;
-        });
-      },
-      rowDel(row) {
-        this.$confirm('确定将选择数据删除?', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-                .then(() => {
-                  return remove(row.id);
-                })
-                .then(() => {
-                  this.onLoad(this.page);
-                  this.$message({
-                    type: 'success',
-                    message: '操作成功!',
-                  });
-                });
-      },
-      beforeClose(done) {
-        done();
-        this.form = {};
-        this.view = false;
-      },
-      selectionChange(list) {
-        this.orderList = list;
-        console.log('list :>> ', list);
-      },
-      // 选择包件信息
-      selectionPackageChange(list) {
-        console.log('掉用了此函数', list);
-        console.log(list, 'list22');
-        console.log('-----------<>', list);
-        this.packageListInfo = list;
-        console.log(this.packageListInfo, 'packageListInfo');
-        if (this.reservationId) {
-          this.packageDataSec = list;
-        } else {
-          //新增
-          let a = [];
-          list.forEach(item => {
-            if (
-                    item.orderPackageReservationStatus === '10' ||
-                    item.orderPackageReservationStatusName === '未预约'
-            ) {
-              a.push(item);
-            }
-          });
-          this.packageDataSec = a;
-        }
-      },
-      selectionInventoryChange(list) {
-        // if (this.reservationId){
-        console.log('list-----------<>', list);
-        this.inventoryList = list;
-        // }else {
-        //   //新增
-        //   let a = [];
-        //   list.forEach(item=>{
-        //     if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约'){
-        //       a.push(item);
-        //     }
-        //   })
-        //   this.inventoryList = a;
-        // }
-      },
-      onSubmitUpdateZeroOrder() {
-        console.log('this.obj--------------------->', this.obj);
-        console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
-        console.log('this.zeroOrderData--------------------->', this.zeroOrderData);
-
-        this.isrReservationEntry = false;
+      } else {
+        //在库数量录入
         let a = this.zeroOrderData;
-        if (a.length > 1) {
-          let b = 0;
-          //计算该品类已使用数量
-
+        if (a.length > 0) {
+          let n = 0;
           a.forEach(item => {
-            b += item.number;
+            n += item.number;
           });
-
-          let f = a.every(item => {
-            console.log('this.number--------------------->', item.number);
+          if (n > this.obj.handQuantity) {
+            this.$message({
+              type: 'error',
+              message: '录入数量超过订单在库数量!',
+            });
+            return;
+          }
+          let b = a.every(item => {
             console.log(
-                    'number--------------------->',
-                    item.deliveryQuantity + item.outboundQuantity
+              '最大数量-------------->',
+              item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number
             );
             if (
-                    item.number < item.deliveryQuantity + item.outboundQuantity ||
-                    item.number > item.quantity
+              item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number >
+              item.quantity
             ) {
               return false;
             }
             return true;
           });
-
-          if (b > this.obj.handQuantity) {
-            this.$message({
-              type: 'error',
-              message: '录入数量超过订单在库数量!',
-            });
-            return;
-          }
-          if (!f) {
+          console.log('----------------->', b);
+          if (!b) {
             this.$message({
               type: 'error',
-              message: '请检查修改数量!',
+              message: '请输入正确数量!',
             });
             return;
           }
         }
-        updateEntryNum(this.zeroOrderData).then(res => {
+        entryNum(this.zeroOrderData).then(res => {
           if (res) {
             this.$message({
               type: 'success',
@@ -2768,394 +2826,335 @@
             });
           }
         });
-        this.zeroOrderShow = false;
-        console.log('-------------->', this.zeroOrderData);
-      },
-      onSubmitZeroOrder() {
-        if (this.isrReservationEntry) {
-          //零担预约数量录入
-          this.orderData.forEach(item => {
-            if (this.obj.id === item.id) {
-              item.parcelNumberVOS = this.zeroOrderData;
-            }
-          });
-        } else {
-          //在库数量录入
-          let a = this.zeroOrderData;
-          if (a.length > 0) {
-            let n = 0;
-            a.forEach(item => {
-              n += item.number;
-            });
-            if (n > this.obj.handQuantity) {
-              this.$message({
-                type: 'error',
-                message: '录入数量超过订单在库数量!',
-              });
-              return;
-            }
-            let b = a.every(item => {
-              console.log(
-                      '最大数量-------------->',
-                      item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number
-              );
-              if (
-                      item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number >
-                      item.quantity
-              ) {
-                return false;
-              }
-              return true;
-            });
-            console.log('----------------->', b);
-            if (!b) {
-              this.$message({
-                type: 'error',
-                message: '请输入正确数量!',
-              });
-              return;
-            }
-          }
-          entryNum(this.zeroOrderData).then(res => {
-            if (res) {
-              this.$message({
-                type: 'success',
-                message: '操作成功',
-              });
-            }
-          });
-          console.log('this.zeroOrderData------------->', this.zeroOrderData);
-        }
+        console.log('this.zeroOrderData------------->', this.zeroOrderData);
+      }
 
-        this.zeroOrderShow = false;
-      },
-      // 增加库存品
-      onSubmitInventory() {
-        if (this.inventoryList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
+      this.zeroOrderShow = false;
+    },
+    // 增加库存品
+    onSubmitInventory() {
+      if (this.inventoryList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.inventoryList.forEach(item => {
+        if (item.reservationNum > item.applyNum) {
+          this.$message.warning('该库存品数量输入有误!!!');
           return;
         }
-        this.inventoryList.forEach(item => {
-          if (item.reservationNum > item.applyNum) {
-            this.$message.warning('该库存品数量输入有误!!!');
-            return;
-          }
-        });
-        console.log('this.inventoryList :>> ', this.inventoryList);
-        // 检测商场是否选择统一商场
-        let _marketName = '';
-        let _warehouseName = '';
-        const _isUnifyMarketName = this.inventoryList.every(value => {
-          if (_marketName === '') {
-            _marketName = value.marketName;
-            _warehouseName = value.warehouseId;
-          }
-          return _marketName === value.marketName && _warehouseName === value.warehouseId;
-        });
-        if (!_isUnifyMarketName) {
-          this.$message.warning('请选择统一仓库操作!!!');
-          return;
+      });
+      console.log('this.inventoryList :>> ', this.inventoryList);
+      // 检测商场是否选择统一商场
+      let _marketName = '';
+      let _warehouseName = '';
+      const _isUnifyMarketName = this.inventoryList.every(value => {
+        if (_marketName === '') {
+          _marketName = value.marketName;
+          _warehouseName = value.warehouseId;
         }
-        this.marketName = _marketName;
-        this.warehouseId = _warehouseName;
-        console.log('this.inventoryList :>> ', this.inventoryList);
-        this.inventoryData = [...this.inventoryData, ...this.inventoryList];
-
-        this.stockListShow = false;
-      },
-      /**
-       * 增加订单提交
-       */
-      onSubmitOrder() {
-        console.log('orderList-------------》', this.orderList);
-        if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
-        const list = [...this.orderList, ...this.orderData];
-        let _name = list[0].customerName;
-        let _address = list[0].customerAddress;
-        let _phone = list[0].customerTelephone;
-        let _marketName = list[0].mallName;
-        let _warehouseId = list[0].warehouseId;
-
-        // 循环查看数据是否符合要求
-        const isRturn = list.every(item => {
-          if (item.mallName !== _marketName) {
-            this.$message.warning('请选择统一商场!!!');
-            return false;
-          }
-          if (
-                  item.customerName !== _name ||
-                  item.customerAddress !== _address ||
-                  item.customerTelephone !== _phone
-          ) {
-            this.$message.warning('请选择统一顾客订单!!!');
-            return false;
-          }
-          if (item.warehouseId !== _warehouseId) {
-            console.log('item.warehouseId :>> ', item.warehouseId);
-            console.log('_warehouseId :>> ', _warehouseId);
-            this.$message.warning('请选择统一仓库!!!');
-            return false;
-          }
-          return true;
-        });
+        return _marketName === value.marketName && _warehouseName === value.warehouseId;
+      });
+      if (!_isUnifyMarketName) {
+        this.$message.warning('请选择统一仓库操作!!!');
+        return;
+      }
+      this.marketName = _marketName;
+      this.warehouseId = _warehouseName;
+      console.log('this.inventoryList :>> ', this.inventoryList);
+      this.inventoryData = [...this.inventoryData, ...this.inventoryList];
 
-        if (!isRturn) return;
+      this.stockListShow = false;
+    },
+    /**
+     * 增加订单提交
+     */
+    onSubmitOrder() {
+      console.log('orderList-------------》', this.orderList);
+      if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
+      const list = [...this.orderList, ...this.orderData];
+      let _name = list[0].customerName;
+      let _address = list[0].customerAddress;
+      let _phone = list[0].customerTelephone;
+      let _marketName = list[0].mallName;
+      let _warehouseId = list[0].warehouseId;
 
-        // 设置商场名称
-        if (this.marketName === '') {
-          this.marketName = _marketName;
-          this.warehouseId = _warehouseId;
+      // 循环查看数据是否符合要求
+      const isRturn = list.every(item => {
+        if (item.mallName !== _marketName) {
+          this.$message.warning('请选择统一商场!!!');
+          return false;
         }
-        // this.marketName = list[0].marketName;
-
-        this.form.consignee = _name;
-        this.form.deliveryAddress = _address;
-        this.form.deliveryPhone = _phone;
-
-        //这里需要对选择的订单进行筛选
-        const _ids = this.orderData.map(val => val.id);
-        this.orderData = [
-          ...this.orderData,
-          ...this.orderList.filter(item => !_ids.includes(item.id)),
-        ];
-        this.orderShow = false;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.query = {};
-        // this.$refs.table.clearSelection();
-      },
-      currentOrderChange(currentPage) {
-        this.page.currentPage = currentPage;
-        // if (this.reservationId) {
-        //   this.onLoadEditOrder(this.page, this.reservationId);
-        // } else {
-        //   this.onLoadOrder(this.page);
-        // }
-        this.onLoadOrder(this.page);
-      },
-      sizeOrderChange(pageSize) {
-        this.page.pageSize = pageSize;
-        // if (this.reservationId) {
-        //   this.onLoadEditOrder(this.page, this.reservationId);
-        // } else {
-        //   this.onLoadOrder(this.page);
-        // }
-        this.onLoadOrder(this.page);
-      },
-      onLoadEditOrder(params = {}) {
-        this.query.typeService = 2;
-        this.query.genre = '1';
-        const page = this.page;
-        let a = [];
-        if (this.orderData) {
-          this.orderData.forEach(item => {
-            a.push(item.id);
-          });
+        if (
+          item.customerName !== _name ||
+          item.customerAddress !== _address ||
+          item.customerTelephone !== _phone
+        ) {
+          this.$message.warning('请选择统一顾客订单!!!');
+          return false;
         }
-        this.query.orderIds = a.join(',');
-        this.query.reservationId = this.reservationId;
-        selectUpdateAvailableStockArticle(
-                page.currentPage,
-                page.pageSize,
-                this.reservationId,
-                Object.assign(params, this.query)
-        ).then(res => {
-          console.log('res123123------------>', res);
-          const data = res.data.data;
-          console.log('data :>> ', data);
-          this.stockArticleInfo = data.records;
-          this.stockArticleInfo.forEach((item, index) => {
-            //检查订单是否冻结
-            this.checkOrder(item, index);
-            if (this.orderData) {
-              this.orderData.forEach(o => {
-                if (o.id === item.id) {
-                  //回显选择的包件信息
-                  this.$nextTick(() => {
-                    this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
-                  });
-                }
-              });
-            } else {
-              this.orderList = [];
-            }
-          });
-          this.page.total = data.total;
-        });
-        // this.query = {};
-      },
-      inputscStockArtic(index, row) {
-        console.log(index, row);
-        this.query[row.prop] = index;
-        this.onLoadOrder(this.page);
-      },
-      inputscInventory(index, row){
-        this.query[row.prop] = index;
-       this.searchStockList(this.page);
+        if (item.warehouseId !== _warehouseId) {
+          console.log('item.warehouseId :>> ', item.warehouseId);
+          console.log('_warehouseId :>> ', _warehouseId);
+          this.$message.warning('请选择统一仓库!!!');
+          return false;
+        }
+        return true;
+      });
 
-      },
-      timescInventory(index, row){
-        console.log('index-------------->',index);
-        console.log('row-------------->',row);
-      },
-      btnscInventory(){
+      if (!isRturn) return;
 
-      },
-      selectscInventory(){},
-      timescStockArtic(index, row) {
-        console.log(index, row);
-        if (!!index) {
-          index = dayjs(index).format('YYYY-MM-DD');
-        }
-        this.query[row.prop] = index;
-        if (!index) {
-          delete this.query[row.prop];
-        }
-        this.onLoadOrder(this.page);
-      },
-      btnscStockArtic(index, row) {
-        console.log(index, row);
-        this.onLoad(this.page);
-      },
-      selectscStockArtic(index, row) {
-        console.log(index, row);
-        if (row.prop === 'reservationStatusName') {
-          this.query['reservationStatus'] = index;
-        } else if (row.prop === 'freezeStatusName') {
-          this.query['freezeStatus'] = index;
-        } else if (row.prop === 'completeSetName') {
-          this.query['completeSet'] = index;
-        } else {
-          this.query[row.prop] = index;
-        }
-        this.onLoadOrder(this.page);
-      },
-      async onLoadOrder(page, params = {}) {
-        this.query.typeService = 2;
-        this.query.genre = '1';
-        this.query.marketName = this.marketName;
-        if (this.orderData.length !== 0) {
-          this.query.orderIds = this.orderData.map(val => val.id).join(',');
-        }
-    
-        this.loading=true;
-        const res = await  $_clientList(
-                page.currentPage,
-                page.pageSize,
-                Object.assign(params, this.query)
-        );
-  
-        this.loading=false;
-        console.log('res ===>>', res);
-        const { records, total } = res.data.data;
+      // 设置商场名称
+      if (this.marketName === '') {
+        this.marketName = _marketName;
+        this.warehouseId = _warehouseId;
+      }
+      // this.marketName = list[0].marketName;
 
-        this.stockArticleInfo = records;
-       let time= setTimeout(()=>{
-          const _node = document.querySelector('.tableNode');
-          setNodeHeight(_node, '', true);
-          clearTimeout(time)
-        },50)
+      this.form.consignee = _name;
+      this.form.deliveryAddress = _address;
+      this.form.deliveryPhone = _phone;
+
+      //这里需要对选择的订单进行筛选
+      const _ids = this.orderData.map(val => val.id);
+      this.orderData = [
+        ...this.orderData,
+        ...this.orderList.filter(item => !_ids.includes(item.id)),
+      ];
+      this.orderShow = false;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.query = {};
+      // this.$refs.table.clearSelection();
+    },
+    currentOrderChange(currentPage) {
+      this.page.currentPage = currentPage;
+      // if (this.reservationId) {
+      //   this.onLoadEditOrder(this.page, this.reservationId);
+      // } else {
+      //   this.onLoadOrder(this.page);
+      // }
+      this.onLoadOrder(this.page);
+    },
+    sizeOrderChange(pageSize) {
+      this.page.pageSize = pageSize;
+      // if (this.reservationId) {
+      //   this.onLoadEditOrder(this.page, this.reservationId);
+      // } else {
+      //   this.onLoadOrder(this.page);
+      // }
+      this.onLoadOrder(this.page);
+    },
+    onLoadEditOrder(params = {}) {
+      this.query.typeService = 2;
+      this.query.genre = '1';
+      const page = this.page;
+      let a = [];
+      if (this.orderData) {
+        this.orderData.forEach(item => {
+          a.push(item.id);
+        });
+      }
+      this.query.orderIds = a.join(',');
+      this.query.reservationId = this.reservationId;
+      selectUpdateAvailableStockArticle(
+        page.currentPage,
+        page.pageSize,
+        this.reservationId,
+        Object.assign(params, this.query)
+      ).then(res => {
+        console.log('res123123------------>', res);
+        const data = res.data.data;
+        console.log('data :>> ', data);
+        this.stockArticleInfo = data.records;
         this.stockArticleInfo.forEach((item, index) => {
           //检查订单是否冻结
           this.checkOrder(item, index);
-          this.page.total = total;
+          if (this.orderData) {
+            this.orderData.forEach(o => {
+              if (o.id === item.id) {
+                //回显选择的包件信息
+                this.$nextTick(() => {
+                  this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
+                });
+              }
+            });
+          } else {
+            this.orderList = [];
+          }
         });
-        if (this.orderData.length !== 0) {
-          const ids = this.orderData.map(val => val.id);
-          this.stockArticleInfo = this.stockArticleInfo.filter(val => !ids.includes(val.id));
-        }
-        this.orderList = [];
-        return null;
-      },
+        this.page.total = data.total;
+      });
+      // this.query = {};
+    },
+    inputscStockArtic(index, row) {
+      console.log(index, row);
+      this.query[row.prop] = index;
+      this.onLoadOrder(this.page);
+    },
+    inputscInventory(index, row) {
+      this.query[row.prop] = index;
+      this.searchStockList(this.page);
+    },
+    timescInventory(index, row) {
+      console.log('index-------------->', index);
+      console.log('row-------------->', row);
+    },
+    btnscInventory() {},
+    selectscInventory() {},
+    timescStockArtic(index, row) {
+      console.log(index, row);
+      if (!!index) {
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
+      }
+      this.onLoadOrder(this.page);
+    },
+    btnscStockArtic(index, row) {
+      console.log(index, row);
+      this.onLoad(this.page);
+    },
+    selectscStockArtic(index, row) {
+      console.log(index, row);
+      if (row.prop === 'reservationStatusName') {
+        this.query['reservationStatus'] = index;
+      } else if (row.prop === 'freezeStatusName') {
+        this.query['freezeStatus'] = index;
+      } else if (row.prop === 'completeSetName') {
+        this.query['completeSet'] = index;
+      } else {
+        this.query[row.prop] = index;
+      }
+      this.onLoadOrder(this.page);
+    },
+    async onLoadOrder(page, params = {}) {
+      this.query.typeService = 2;
+      this.query.genre = '1';
+      this.query.marketName = this.marketName;
+      if (this.orderData.length !== 0) {
+        this.query.orderIds = this.orderData.map(val => val.id).join(',');
+      }
 
-      onLoad() {
-        // this.loading = true;
-        this.form.deliveryType = '2';
-        this.form.deliveryWay = '10';
-        this.form.periodOfTime = '3';
-        this.form.otherFee = 0;
-        this.form.replaceFee = 0;
-        this.form.collectionFee = 0;
-        this.form.isUrgent = '1';
-        // this.form.reservationDate = new Date();
-        if (this.orderIds) {
-          getStockArticleList(this.orderIds).then(res => {
-            console.log(res.data.data);
-            const data = res.data.data;
-            let name = '';
-            let phone = '';
-            let address = '';
-            let typeService = '';
-            console.log('>>>>>>>>>>>>>', data);
-            for (let i = 0; i < data.length; i++) {
-              if (i === 0) {
-                name = data[0].customerName;
-                phone = data[0].customerTelephone;
-                address = data[0].customerAddress;
-                typeService = data[0].typeService.toString();
-                // typeName = data[0].typeName;
-              }
+      this.loading = true;
+      const res = await $_clientList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      );
+
+      this.loading = false;
+      console.log('res ===>>', res);
+      const { records, total } = res.data.data;
+
+      this.stockArticleInfo = records;
+      let time = setTimeout(() => {
+        const _node = document.querySelector('.tableNode');
+        setNodeHeight(_node, '', true);
+        clearTimeout(time);
+      }, 50);
+      this.stockArticleInfo.forEach((item, index) => {
+        //检查订单是否冻结
+        this.checkOrder(item, index);
+        this.page.total = total;
+      });
+      if (this.orderData.length !== 0) {
+        const ids = this.orderData.map(val => val.id);
+        this.stockArticleInfo = this.stockArticleInfo.filter(val => !ids.includes(val.id));
+      }
+      this.orderList = [];
+      return null;
+    },
+
+    onLoad() {
+      // this.loading = true;
+      this.form.deliveryType = '2';
+      this.form.deliveryWay = '10';
+      this.form.periodOfTime = '3';
+      this.form.otherFee = 0;
+      this.form.replaceFee = 0;
+      this.form.collectionFee = 0;
+      this.form.isUrgent = '1';
+      // this.form.reservationDate = new Date();
+      if (this.orderIds) {
+        getStockArticleList(this.orderIds).then(res => {
+          console.log(res.data.data);
+          const data = res.data.data;
+          let name = '';
+          let phone = '';
+          let address = '';
+          let typeService = '';
+          console.log('>>>>>>>>>>>>>', data);
+          for (let i = 0; i < data.length; i++) {
+            if (i === 0) {
+              name = data[0].customerName;
+              phone = data[0].customerTelephone;
+              address = data[0].customerAddress;
+              typeService = data[0].typeService.toString();
+              // typeName = data[0].typeName;
             }
-            this.form.consignee = name;
-            this.form.deliveryPhone = phone;
-            this.form.deliveryType = typeService;
-            this.form.deliveryAddress = address;
-            this.orderData = data;
+          }
+          this.form.consignee = name;
+          this.form.deliveryPhone = phone;
+          this.form.deliveryType = typeService;
+          this.form.deliveryAddress = address;
+          this.orderData = data;
+        });
+      }
+      if (this.reservationId) {
+        this.inventoryShow = true;
+        getReservationInfo(this.reservationId).then(res => {
+          const reservation = res.data.data;
+          const stockArticleListInfo = res.data.data.stockArticleList;
+          // stockArticleListInfo.forEach(item=>{
+          //
+          // })
+          console.log('reservation>>>>>>>>', reservation);
+          // 添加限制的商场名称
+          this.marketName = reservation.mallName;
+          this.warehouseId = reservation.warehouseId;
+          this.orderData = reservation.stockArticleList;
+          this.inventoryData = reservation.inventoryList;
+          this.inventoryData.forEach(item => {
+            item.applyNum = item.quantityStock - item.quantityOccupied;
           });
-        }
-        if (this.reservationId) {
-          this.inventoryShow = true;
-          getReservationInfo(this.reservationId).then(res => {
-            const reservation = res.data.data;
-            const stockArticleListInfo = res.data.data.stockArticleList;
-            // stockArticleListInfo.forEach(item=>{
-            //
-            // })
-            console.log('reservation>>>>>>>>', reservation);
-            // 添加限制的商场名称
-            this.marketName = reservation.mallName;
-            this.warehouseId = reservation.warehouseId;
-            this.orderData = reservation.stockArticleList;
-            this.inventoryData = reservation.inventoryList;
-            this.inventoryData.forEach(item => {
-              item.applyNum = item.quantityStock - item.quantityOccupied;
+          this.form.deliveryType = reservation.deliveryType;
+          this.form.periodOfTime = reservation.periodOfTime;
+          if (reservation.serveType) {
+            //过滤字符串中的','
+            this.serveType = Array.from(reservation.serveType).filter(s => {
+              return s !== ',';
             });
-            this.form.deliveryType = reservation.deliveryType;
-            this.form.periodOfTime = reservation.periodOfTime;
-            if (reservation.serveType) {
-              //过滤字符串中的','
-              this.serveType = Array.from(reservation.serveType).filter(s => {
-                return s !== ',';
-              });
-            }
-            this.form = reservation;
-          });
-        } else {
-          this.form.deliveryType = '2';
-        }
-        this.loading = false;
-      },
+          }
+          this.form = reservation;
+        });
+      } else {
+        this.form.deliveryType = '2';
+      }
+      this.loading = false;
     },
-  };
+  },
+};
 </script>
 <style lang="scss">
-  input::-webkit-outer-spin-button,
-  input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-  }
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
 
-  input[type='number'] {
-    -moz-appearance: textfield;
-  }
+input[type='number'] {
+  -moz-appearance: textfield;
+}
 </style>
 
 <style lang="scss" scoped>
-  .el-btn-xz {
-    width: 68px;
-    height: 26px;
-    border: 1px solid;
-    margin-bottom: 8px;
-    border-radius: 4px;
-  }
+.el-btn-xz {
+  width: 68px;
+  height: 26px;
+  border: 1px solid;
+  margin-bottom: 8px;
+  border-radius: 4px;
+}
 </style>
diff --git a/src/views/mail/order/list.vue b/src/views/mail/order/list.vue
index d3996f35..b433f9ae 100644
--- a/src/views/mail/order/list.vue
+++ b/src/views/mail/order/list.vue
@@ -409,7 +409,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index c5ed5a0a..62a5477b 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -257,7 +257,7 @@ export default {
           label: '订单自编号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           sortable: true,
diff --git a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
index f682c46a..427ca8be 100644
--- a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
+++ b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
@@ -259,7 +259,7 @@ export default {
           label: '订单自编码',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -534,7 +534,7 @@ export default {
           label: '订单号',
           type: 1,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue
index d902c8e3..14be6ed4 100644
--- a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue
+++ b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue
@@ -306,7 +306,7 @@ export default {
           label: '订单自编号',
           type: 4,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           search: true,
@@ -473,7 +473,7 @@ export default {
           label: '订单自编号',
           type: 4,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           search: true,
@@ -627,7 +627,7 @@ export default {
           label: '订单自编号',
           type: 4,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           search: true,
@@ -750,7 +750,7 @@ export default {
           label: '订单自编号',
           type: 4,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: true,
           search: true,
diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue
index e2e64310..717f2dfe 100644
--- a/src/views/warehouse/warehouseStock/warehouseStock.vue
+++ b/src/views/warehouse/warehouseStock/warehouseStock.vue
@@ -152,7 +152,7 @@ export default {
           label: '订单自编码',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index 52f66606..3b796739 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -444,7 +444,7 @@ export default {
           label: '订单号',
           type: 2,
           values: '',
-          width: '300',
+          width: '200',
           checkarr: [],
           fixed: false,
           sortable: true,

From e149204d778fbae2fc97e6053b58ef88acb7a18d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 19 Nov 2024 16:00:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E6=98=8E=E7=BB=86=20--?=
 =?UTF-8?q?=20=E8=A3=85=E5=8D=B8=E7=8A=B6=E6=80=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=BB=9E=E7=95=99=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue          |  25 +-
 .../finance/ReconciliationDepositSlip.js      | 232 +++++++++++++++++-
 .../artery/truckLoadingDetails.vue            |   1 +
 3 files changed, 233 insertions(+), 25 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index ac7dc8a9..11487f0a 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -123,14 +123,6 @@
                   v-model="scope.row[column.prop]"
                 />
 
-                <!-- <el-text
-              class="mx-2 tabculconte"
-              v-for="item in column.checkarr"
-              v-if="Number(column.type) < 6 && Number(column.type) > 0"
-              >
-              <span v-if="item.value==scope.row[column.prop]">{{ item.label }}</span>
-              </el-text
-              > -->
                 <el-text
                   style=""
                   class="mx-2 tabculconte colors"
@@ -161,16 +153,7 @@
                   :disabled="!scope.row.disabled"
                   clearable
                 />
-                <!-- <el-image
-              preview-teleported
-              v-else-if="column.type == 7"
-              style="width: 60px; height: 60px; margin-left: 10px"
-              :initial-index="index"
-              :z-index="100"
-              v-for="(item, index) in scope.row[column.prop].split(',')"
-              :src="item"
-              :preview-src-list="scope.row[column.prop].split(',')"
-              /> -->
+
                 <el-image
                   preview-teleported
                   v-else-if="column.type == 7"
@@ -229,15 +212,11 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, getCurrentInstance, onMounted, defineExpose, inject, watch } from 'vue';
+import { ref, getCurrentInstance, onMounted, defineExpose, watch } from 'vue';
 import type { PropType } from 'vue';
 import { computeNumber } from '@/utils/util.js';
-import { useRoute } from 'vue-router';
 import { postSaveTableSeting } from '@/api/basic/table';
 
-const $route = useRoute();
-
-const functions = inject('functions') as any;
 const { proxy } = getCurrentInstance() as any;
 const selecttable = ref(null);
 
diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js
index 0b76931d..81c299bb 100644
--- a/src/option/finance/ReconciliationDepositSlip.js
+++ b/src/option/finance/ReconciliationDepositSlip.js
@@ -19,7 +19,7 @@ export const columnList = [
     label: '品牌',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -186,6 +186,39 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'totalNum',
+    label: '货物品类',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '品类件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '干线品类单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'totalWeight',
     label: '总重量',
@@ -449,6 +482,18 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '配送专车费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'installFee',
     label: '安装费',
@@ -473,6 +518,42 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '回扣',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '申明价值',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '保价费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'shipperPerson',
     label: '发货人',
@@ -609,6 +690,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '送货时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'signTime',
     label: '签收时间',
@@ -620,6 +712,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signNum',
+    label: '配送司机',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'syncFeeStatus',
     label: '是否计算价格',
@@ -677,7 +791,7 @@ export const columnListB = [
     label: '品牌',
     type: 2,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -844,6 +958,39 @@ export const columnListB = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'totalNum',
+    label: '货物品类',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '品类件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNum',
+    label: '干线品类单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'totalWeight',
     label: '总重量',
@@ -1108,6 +1255,18 @@ export const columnListB = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '配送专车费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'installFee',
     label: '安装费',
@@ -1132,6 +1291,42 @@ export const columnListB = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '回扣',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '申明价值',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '保价费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'shipperPerson',
     label: '发货人',
@@ -1268,6 +1463,17 @@ export const columnListB = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '送货时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'signTime',
     label: '签收时间',
@@ -1279,6 +1485,28 @@ export const columnListB = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'signNum',
+    label: '签收人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'signNum',
+    label: '配送司机',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'syncFeeStatus',
     label: '是否计算价格',
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index e8a66e81..3f6b728c 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -489,6 +489,7 @@ const details = reactive<any>({
     { label: '装车', value: 1 },
     { label: '卸车', value: 2 },
     { label: '签收', value: 3 },
+    { label: '滞留', value: 4 },
   ],
   /** 有无数据 */
   isDataOption: [