diff --git a/src/api/distribution/TripartiteTransfer.js b/src/api/distribution/TripartiteTransfer.js
index a4076309..64ca64fe 100644
--- a/src/api/distribution/TripartiteTransfer.js
+++ b/src/api/distribution/TripartiteTransfer.js
@@ -78,7 +78,7 @@ export const postFindCarrierByName = data => {
 };
 
 /**
- * 通过名称查询承运商
+ * 文员签收
  */
 export const postSignCars = data => {
   return request({
@@ -89,7 +89,7 @@ export const postSignCars = data => {
 };
 
 /**
- * 通过名称查询承运商
+ * 结算提交
  */
 export const postSettlementCars = data => {
   return request({
diff --git a/src/option/distribution/BookingNote.js b/src/option/distribution/BookingNote.js
index cc547aa9..5919acc9 100644
--- a/src/option/distribution/BookingNote.js
+++ b/src/option/distribution/BookingNote.js
@@ -20,7 +20,7 @@ export const WaybillTrackingColumnList = [
     head: false,
   },
   {
-    prop: 'trackType',
+    prop: 'trackTypeName',
     label: '批次状态',
     type: 1,
     values: '',
diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index e6a0f35b..2879986f 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -158,7 +158,6 @@ export const columnList = [
     values: '',
     width: 55,
     fixed: true,
-    isshowSummary: true,
   },
   {
     prop: 'createTime',
@@ -190,6 +189,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
     isshowSummary: false,
   },
   {
@@ -201,6 +201,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
     isshowSummary: false,
   },
   {
@@ -212,6 +213,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
     isshowSummary: false,
   },
   {
@@ -233,6 +235,7 @@ export const columnList = [
     width: '130',
     checkarr: [],
     fixed: false,
+    isColumnMerge: true,
     sortable: true,
   },
   {
@@ -243,6 +246,7 @@ export const columnList = [
     width: '130',
     checkarr: [],
     fixed: false,
+    isColumnMerge: true,
     sortable: true,
   },
   {
@@ -255,6 +259,18 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'waybillNum',
+    label: '运单总件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    isColumnMerge: true,
+    isshowSummary: true,
+    sortable: true,
+  },
   {
     prop: 'totalNum',
     label: '件数',
@@ -278,17 +294,40 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'price',
-    label: '单价',
+    prop: 'loadingNum',
+    label: '装车数',
     type: 1,
     values: '',
     width: '150',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'totalWeight',
+    prop: 'unloadNum',
+    label: '卸车数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: true,
+    sortable: true,
+  },
+  {
+    prop: 'openPrice',
+    label: '运单开单价格',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isColumnMerge: true,
+    sortable: true,
+  },
+  {
+    prop: 'weight',
     label: '重量(KG)',
     type: 1,
     values: '',
@@ -299,7 +338,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'totalVolume',
+    prop: 'volume',
     label: '体积',
     type: 1,
     values: '',
@@ -310,14 +349,37 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'freight',
-    label: '运费',
+    prop: 'unloadIncome',
+    label: '卸车收入',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
     isshowSummary: true,
+    isColumnMerge: true,
+    sortable: true,
+  },
+  {
+    prop: 'orderFreight',
+    label: '订单运费',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: true,
+    sortable: true,
+  },
+  {
+    prop: 'orderFreight',
+    label: '订单运费',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
@@ -339,6 +401,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
     isshowSummary: false,
   },
 ];
@@ -863,6 +926,7 @@ export const detailsColumnList = [
     checkarr: [],
     fixed: false,
     isshowSummary: true,
+    isColumnMerge: true,
     sortable: true,
   },
   {
@@ -874,7 +938,6 @@ export const detailsColumnList = [
     checkarr: [],
     fixed: false,
     isshowSummary: true,
-    isColumnMerge: true,
     sortable: true,
   },
   {
@@ -973,18 +1036,18 @@ export const detailsColumnList = [
     isColumnMerge: true,
     sortable: true,
   },
-  {
-    prop: 'totalFee',
-    label: '审核状态',
-    type: 2,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    isshowSummary: true,
-    isColumnMerge: true,
-    sortable: true,
-  },
+  // {
+  //   prop: 'totalFee',
+  //   label: '审核状态',
+  //   type: 2,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   isshowSummary: true,
+  //   isColumnMerge: true,
+  //   sortable: true,
+  // },
   // {
   //   prop: 'freight',
   //   label: '作废运单号',
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index 2310250c..ab59ba77 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -360,12 +360,35 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'payWay',
+    prop: 'payTypeName',
+    label: '支付方式',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [
+      { label: '现金', value: 1 },
+      { label: '银行卡', value: 2 },
+      { label: '微信', value: 3 },
+      { label: '支付宝', value: 4 },
+      { label: '支票', value: 5 },
+      { label: '账本', value: 6 },
+    ],
+    fixed: false,
+    sortable: false,
+  },
+  {
+    prop: 'payWayName',
     label: '付款方式',
-    type: 1,
+    type: 3,
     values: '',
     width: '130',
-    checkarr: [],
+    checkarr: [
+      { label: '现付', value: 1 },
+      { label: '到付', value: 2 },
+      { label: '月结', value: 3 },
+      { label: '回付', value: 4 },
+      { label: '内部结算', value: 5 },
+    ],
     fixed: false,
     sortable: false,
   },
@@ -414,22 +437,35 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'deliveryWay',
+    prop: 'deliveryWayName',
     label: '送货方式',
-    type: 1,
+    type: 3,
     values: '',
     width: '130',
-    checkarr: [],
+    checkarr: [
+      { label: '自提', value: 1 },
+      { label: '送货', value: 2 },
+      { label: '送货上门', value: 3 },
+      { label: '送货上门(有电梯)', value: 4 },
+      { label: '送货上门(无电梯)', value: 5 },
+      { label: '送货卸货', value: 6 },
+      { label: '送货安装', value: 7 },
+    ],
     fixed: false,
     sortable: false,
   },
   {
-    prop: 'urgency',
+    prop: 'urgencyName',
     label: '紧急度',
-    type: 1,
+    type: 3,
     values: '',
     width: '130',
-    checkarr: [],
+    checkarr: [
+      { label: '正常', value: 1 },
+      { label: '急', value: 2 },
+      { label: '加急', value: 3 },
+      { label: '特急', value: 4 },
+    ],
     fixed: false,
     isshowSummary: false,
     sortable: true,
@@ -446,23 +482,41 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'receipt',
+    prop: 'receiptName',
     label: '回单要求',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [
+      { label: '签回单', value: 1 },
+      { label: '签原单', value: 2 },
+      { label: '打收条', value: 3 },
+      { label: '签信封', value: 4 },
+      { label: '签回单盖章', value: 5 },
+      { label: '1份回单', value: 6 },
+      { label: '2份回单', value: 7 },
+      { label: '3份回单', value: 8 },
+      { label: '4份回单', value: 9 },
+      { label: '5份回单', value: 10 },
+    ],
     fixed: false,
     isshowSummary: false,
     sortable: true,
   },
   {
-    prop: 'transportType',
+    prop: 'transportTypeName',
     label: '运输方式',
-    type: 1,
+    type: 3,
     values: '',
     width: '130',
-    checkarr: [],
+    checkarr: [
+      { label: '公路快运', value: 1 },
+      { label: '海运', value: 2 },
+      { label: '卡车航运', value: 3 },
+      { label: '空运', value: 4 },
+      { label: '普通汽班', value: 5 },
+      { label: '快递', value: 6 },
+    ],
     fixed: false,
     sortable: true,
   },
diff --git a/src/styles/common.scss b/src/styles/common.scss
index b776a6f3..af843f51 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -231,6 +231,10 @@ a {
   }
 }
 
+.text-left {
+  text-align: left;
+}
+
 // 二维码弹窗
 .el-dialog-QRCode-container {
   max-height: 80vh;
diff --git a/src/views/Pricesystem/Price/PriceBill.vue b/src/views/Pricesystem/Price/PriceBill.vue
index 8fca4845..069117bd 100644
--- a/src/views/Pricesystem/Price/PriceBill.vue
+++ b/src/views/Pricesystem/Price/PriceBill.vue
@@ -171,9 +171,11 @@
         <el-divider content-position="left">最低计费</el-divider>
         <el-form label-width="130px" :model="details.form" inline>
           <el-form-item
-            label="最低计费价格"
+            :label="
+              details.minCostType.find(val => val.value === Number(details.form.pickupMinCostType))
+                .label
+            "
             prop="minCost"
-            :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
           >
             <el-input-number
               v-model="details.form.minCost"
@@ -185,11 +187,7 @@
             />
           </el-form-item>
 
-          <el-form-item
-            label="加算价格"
-            prop="additionalCost"
-            :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
-          >
+          <el-form-item label="加算价格" prop="additionalCost">
             <el-input-number
               v-model="details.form.additionalCost"
               style="width: 13vw"
@@ -487,15 +485,16 @@
       <el-divider content-position="left">最低计费</el-divider>
       <el-form label-width="130px" :model="details.form" inline>
         <el-form-item
-          label="最低计费价格"
+          :label="
+            details.minCostType.find(val => val.value === Number(details.form.pickupMinCostType))
+              .label
+          "
           prop="minCost"
-          :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
         >
           <el-input-number
             v-model="details.form.minCost"
             style="width: 13vw"
             :controls="false"
-            :precision="2"
             :value-on-clear="0"
             :min="0"
           />
@@ -504,7 +503,7 @@
         <el-form-item
           label="加算价格"
           prop="additionalCost"
-          :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+          v-if="Number(details.form.pickupMinCostType) !== 1"
         >
           <el-input-number
             v-model="details.form.additionalCost"
@@ -706,6 +705,12 @@ const details = reactive({
   regionOptione: [],
   /** 提货路线type */
   lineType: 'add' as 'add' | 'edit',
+  minCostType: [
+    { label: '按价格最低计费', value: 1 },
+    { label: '按件最低计费', value: 2 },
+    { label: '按方数最低计费', value: 3 },
+    { label: '按重量最低计费', value: 4 },
+  ],
 });
 
 const tableNode = ref();
@@ -834,7 +839,7 @@ const handleVehicleTypeArr = response => {
 
   if (code !== 200) return;
 
-  details.vehicleTypeArr = data || [];
+  details.vehicleTypeArr = deepClone(data) || [];
 };
 
 /** 获取业务字典 */
@@ -1119,6 +1124,9 @@ const handleAdd = () => {
     }
   }
 
+  details.form.minCost = 0;
+  details.form.additionalCost = 0;
+
   details.popUpShow.addVsitied = true;
 };
 
diff --git a/src/views/Pricesystem/Price/PriceTrunkLine.vue b/src/views/Pricesystem/Price/PriceTrunkLine.vue
index 181b4212..baa85d24 100644
--- a/src/views/Pricesystem/Price/PriceTrunkLine.vue
+++ b/src/views/Pricesystem/Price/PriceTrunkLine.vue
@@ -175,9 +175,11 @@
         <el-divider content-position="left">最低计费</el-divider>
         <el-form label-width="130px" :model="details.form" inline>
           <el-form-item
-            label="最低计费价格"
+            :label="
+              details.minCostType.find(val => val.value === Number(details.form.pickupMinCostType))
+                .label
+            "
             prop="minCost"
-            :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
           >
             <el-input-number
               v-model="details.form.minCost"
@@ -192,7 +194,7 @@
           <el-form-item
             label="加算价格"
             prop="additionalCost"
-            :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+            v-if="Number(details.form.pickupMinCostType) !== 1"
           >
             <el-input-number
               v-model="details.form.additionalCost"
@@ -495,9 +497,11 @@
       <el-divider content-position="left">最低计费</el-divider>
       <el-form label-width="130px" :model="details.form" inline>
         <el-form-item
-          label="最低计费价格"
+          :label="
+            details.minCostType.find(val => val.value === Number(details.form.pickupMinCostType))
+              .label
+          "
           prop="minCost"
-          :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
         >
           <el-input-number
             v-model="details.form.minCost"
@@ -512,7 +516,7 @@
         <el-form-item
           label="加算价格"
           prop="additionalCost"
-          :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+          v-if="Number(details.form.pickupMinCostType) !== 1"
         >
           <el-input-number
             v-model="details.form.additionalCost"
@@ -714,6 +718,12 @@ const details = reactive({
   regionOptione: [],
   /** 提货路线type */
   lineType: 'add' as 'add' | 'edit',
+  minCostType: [
+    { label: '按价格最低计费', value: 1 },
+    { label: '按件最低计费', value: 2 },
+    { label: '按方数最低计费', value: 3 },
+    { label: '按重量最低计费', value: 4 },
+  ],
 });
 
 const tableNode = ref();
@@ -807,7 +817,7 @@ const handleVehicleTypeArr = response => {
 
   if (code !== 200) return;
 
-  details.vehicleTypeArr = data || [];
+  details.vehicleTypeArr = deepClone(data) || [];
 };
 
 /** 获取业务字典 */
@@ -1093,6 +1103,10 @@ const handleAdd = () => {
       item.price = 0;
     }
   }
+
+  details.form.minCost = 0;
+  details.form.additionalCost = 0;
+
   details.popUpShow.addVsitied = true;
 };
 
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 384b546d..236995a7 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -1697,10 +1697,9 @@ const editSubmit = async () => {
         // 本节点为新增
         val.updateType = 2;
         // 修改
-      } else if (_index !== i) {
+      } else {
         val.updateType = 1;
-        // 未变
-      } else val.updateType = 0;
+      }
       delete val.blackList;
       if (i === 0) return;
       // 删除无用数据
@@ -1743,8 +1742,8 @@ const editSubmit = async () => {
       }
 
       // 存在删除数据或新增数据, 则该节点存在更新
-      if ((val.updateType !== 2 && _addArr.length > 0) || val.MappingData.length > 0)
-        val.updateType = 1;
+      // if ((val.updateType !== 2 && _addArr.length > 0) || val.MappingData.length > 0)
+      //   val.updateType = 1;
 
       _lineCarsOrderList = [..._lineCarsOrderList, ..._addArr];
       _removeList = [..._removeList, ...val.MappingData];
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 87849a90..1e594adc 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -912,6 +912,9 @@ const editTransfer = async () => {
 
   if (_length > 1) return ElMessage.warning('只能选择一条数据修改');
 
+  if (Number(details.selectionList[0].isSettlement) === 1)
+    return ElMessage.warning('已结算, 无法修改');
+
   const _item = details.selectionList[0];
 
   $router.push({
diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue
index a957127e..7bbc818b 100644
--- a/src/views/distribution/artery/TripartiteTransferDetails.vue
+++ b/src/views/distribution/artery/TripartiteTransferDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
-      <el-tabs type="border-card" v-model="details.activeTab">
+      <el-tabs @tab-click="handleCheckTab" type="border-card" v-model="details.activeTab">
         <el-tab-pane label="详 情 信 息" name="tab1">
           <!-- 标题 基础信息 -->
           <el-divider content-position="left">
@@ -13,34 +13,18 @@
           <el-form disabled :inline="true" label-width="100px" :model="form" class="el-fr-d">
             <div class="fo-fl">
               <el-form-item label="中转承运商" prop="carrierName" style="flex: 1">
-                <el-select
-                  v-model="form.carrierName"
-                  filterable
-                  :teleported="false"
-                  remote
-                  reserve-keyword
-                  placeholder="中转承运商"
-                  @change="val => carrierNameChange()"
-                  :remote-method="remoteMethod"
-                  :loading="details.loadingObj.loading"
-                >
-                  <el-option
-                    v-for="val in details.carrierNameOptions"
-                    :key="val.carrierName"
-                    :label="val.carrierName"
-                    :value="val.carrierId"
-                  />
-                </el-select>
+                <el-input v-model="form.carrierName"> </el-input>
               </el-form-item>
+
               <el-form-item label="经办人" prop="operator">
                 <el-input v-model="form.operator" />
               </el-form-item>
+
               <el-form-item label="送货方式" prop="deliveryType">
                 <el-select
                   :teleported="false"
                   v-model="form.deliveryType"
                   class="m-2"
-                  placeholder="运费分摊方式"
                   size="default"
                 >
                   <el-option
@@ -51,14 +35,9 @@
                   />
                 </el-select>
               </el-form-item>
+
               <el-form-item label="付款方式" prop="payMethod">
-                <el-select
-                  :teleported="false"
-                  v-model="form.payMethod"
-                  class="m-2"
-                  placeholder="运费分摊方式"
-                  size="default"
-                >
+                <el-select :teleported="false" v-model="form.payMethod" class="m-2" size="default">
                   <el-option
                     v-for="item in details.pageInfo.payMethod || []"
                     :key="item.dictValue"
@@ -67,14 +46,9 @@
                   />
                 </el-select>
               </el-form-item>
+
               <el-form-item label="运费分摊方式" prop="chargeType">
-                <el-select
-                  :teleported="false"
-                  v-model="form.chargeType"
-                  class="m-2"
-                  placeholder="运费分摊方式"
-                  size="default"
-                >
+                <el-select :teleported="false" v-model="form.chargeType" class="m-2" size="default">
                   <el-option
                     v-for="item in details.pageInfo.chargeType || []"
                     :key="item.dictValue"
@@ -83,6 +57,7 @@
                   />
                 </el-select>
               </el-form-item>
+
               <el-form-item label="送货司机" prop="driverName">
                 <el-select
                   v-model="form.driverName"
@@ -91,7 +66,6 @@
                   remote
                   @change="handleNameChange"
                   reserve-keyword
-                  placeholder="输入司机名称"
                   :remote-method="remoteMethodDriver"
                   :loading="details.loadingObj.loading"
                 >
@@ -103,13 +77,13 @@
                   />
                 </el-select>
               </el-form-item>
+
               <el-form-item label="客户类型" prop="customerType">
                 <el-select
                   :teleported="false"
                   v-model="form.customerType"
                   class="m-2"
                   multiple
-                  placeholder="客户类型"
                   size="default"
                 >
                   <el-option
@@ -120,12 +94,12 @@
                   />
                 </el-select>
               </el-form-item>
+
               <el-form-item label="是否结算" prop="isSettlement">
                 <el-select
                   :teleported="false"
                   v-model="form.isSettlement"
                   class="m-2"
-                  placeholder="是否结算"
                   size="default"
                 >
                   <el-option
@@ -136,57 +110,59 @@
                   />
                 </el-select>
               </el-form-item>
+
               <el-form-item label="代收贷款" prop="replacePrice">
                 <el-input-number
                   v-model="form.replacePrice"
-                  placeholder="代收贷款"
                   :precision="2"
                   :min="0"
                   :step="1"
-                  controls-position="right"
+                  :controls="false"
                 />
               </el-form-item>
+
               <el-form-item label="承运单号" prop="carrierOrderCode">
-                <el-input v-model="form.carrierOrderCode" placeholder="承运单号" />
+                <el-input v-model="form.carrierOrderCode" />
               </el-form-item>
+
               <el-form-item label="承运时间" prop="carrierTimeStr">
                 <el-date-picker
                   v-model="form.carrierTimeStr"
                   type="date"
-                  placeholder="承运时间"
                   size="default"
                   :teleported="false"
                 />
               </el-form-item>
+
               <el-form-item label="客户收货时间" prop="receivingTimeStr">
                 <el-date-picker
                   v-model="form.receivingTimeStr"
                   type="date"
-                  placeholder="客户收货时间"
                   size="default"
                   :teleported="false"
                 />
               </el-form-item>
+
               <el-form-item label="运费" prop="countTransportCost">
                 <el-input-number
                   v-model="form.countTransportCost"
                   :precision="2"
-                  placeholder="运费"
                   :min="0"
                   :step="1"
-                  controls-position="right"
+                  :controls="false"
                 />
               </el-form-item>
+
               <el-form-item label="司机结算费" prop="settlementValue">
                 <el-input-number
                   v-model="form.settlementValue"
                   :precision="2"
                   :min="0"
-                  placeholder="司机结算费"
                   :step="1"
-                  controls-position="right"
+                  :controls="false"
                 />
               </el-form-item>
+
               <div style="flex: 1; padding-right: 0">
                 <el-form-item
                   style="width: 100%; margin: 0"
@@ -194,8 +170,8 @@
                   label-width="100px"
                   :inline="false"
                 >
-                  <el-input type="textarea" v-model="form.remark" placeholder="备注"
-                /></el-form-item>
+                  <el-input type="textarea" v-model="form.remark" />
+                </el-form-item>
               </div>
             </div>
           </el-form>
@@ -211,27 +187,30 @@
           <!-- 列表模块 -->
 
           <div v-h5uShow="!search">
-            <el-form :inline="true" label-width="80px" :model="details.oldQuery" class="el-fr-d">
-              <div class="fo-fl">
-                <el-form-item class="el-times" label="开单时间">
-                  <el-date-picker
-                    v-model="stockupDate"
-                    type="daterange"
-                    unlink-panels
-                    range-separator="-"
-                    start-placeholder="开单日期"
-                    end-placeholder="开单日期"
-                    :shortcuts="shortcuts"
-                    clearable
-                  />
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" icon="el-icon-search" @click="searchReset()"
-                    >搜 索</el-button
-                  >
-                  <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
-                </el-form-item>
-              </div>
+            <el-form
+              :inline="true"
+              label-width="80px"
+              :model="details.oldQuery"
+              class="header_search"
+            >
+              <el-form-item class="el-times" label="开单时间">
+                <el-date-picker
+                  v-model="stockupDate"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="-"
+                  start-placeholder="开单日期"
+                  end-placeholder="开单日期"
+                  :shortcuts="shortcuts"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="searchReset()"
+                  >搜 索</el-button
+                >
+                <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
+              </el-form-item>
             </el-form>
           </div>
 
@@ -259,36 +238,45 @@
             @selectCheck="selectsc"
             @selection="selectionChange"
           >
-          </tablecmt>
-          <!-- 分页模块 -->
-          <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-            <el-pagination
-              style="zoom: 0.9"
-              align="right"
-              background
-              @size-change="sizeChange"
-              @current-change="currentChange"
-              :current-page="oldPage.pageNum"
-              :page-sizes="[30, 50, 80, 120]"
-              :page-size="oldPage.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="oldPage.total"
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '运单号'">
+                <el-text @click="handleGoWaybillDetails(slotProps.scope)">
+                  {{ slotProps.scope.row.waybillNo }}
+                </el-text>
+              </template></template
             >
-            </el-pagination>
-          </div>
+          </tablecmt>
         </el-tab-pane>
 
         <el-tab-pane label="操 作 日 志" name="tab2">
           <div style="min-height: 300px">
-            <el-steps direction="vertical" space="80px">
-              <el-step title="32131">
-                <template #description> {{ new Date() }} </template>
-                <template #icon>
-                  <el-icon color="#172e60" size="20px"><HelpFilled /></el-icon>
+            <el-steps direction="vertical" space="120px" :active="details.loadLogsList.length">
+              <el-step :title="item.abstText" v-for="item in details.loadLogsList" :key="item">
+                <template #description>
+                  <div class="fz-0-9">
+                    <el-row>
+                      <div class="flex-c-c mr10">
+                        <el-icon color="#172e60" class="mr10" size="20px"><Clock /></el-icon>
+                        <span>操作时间：</span>
+                        <span>{{ item.updateTime }}</span>
+                      </div>
+                      <div class="flex-c-c mr10">
+                        <el-icon color="#172e60" size="20px"><Location /></el-icon>
+                        <span>操作网点：</span>
+                        <span>{{ item.nodeName }}</span>
+                      </div>
+                      <div class="flex-c-c mr10">
+                        <el-icon color="#172e60" size="20px"><User /></el-icon>
+                        <span>操作人：</span>
+                        <span>{{ item.createUserName }}</span>
+                      </div>
+                    </el-row>
+
+                    <div class="word-break-break-all mt10">
+                      {{ item.content }}
+                    </div>
+                  </div>
                 </template>
-              </el-step>
-              <el-step title="32131">
-                <template #description> {{ new Date() }} </template>
                 <template #icon>
                   <el-icon color="#172e60" size="20px"><HelpFilled /></el-icon>
                 </template>
@@ -317,7 +305,7 @@ import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
 import { downloadXls, computeNumber, setNodeHeight, debounce, deepClone } from '@/utils/util';
-import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage';
+import { columnList } from '@/option/distribution/addVehicleStowage';
 import {
   postloadFindLoadInitData,
   postFindWarehouseListByName,
@@ -327,7 +315,9 @@ import {
   postFindUseOrderList,
   postSelectEditDetailByLoadId,
 } from '@/api/distribution/AddVehicleStowage';
+import { postCarsLoadDetailInfo } from '@/api/distribution/VehicleStowageDetails.js';
 import { postSaveNewTripartiteTransfer } from '@/api/distribution/addTripartiteTransfer.js';
+import { postFindCarsLoadLogs } from '@/api/distribution/VehicleStowageDetails.js';
 import type { FormInstance, FormRules } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
 import { useStore } from 'vuex';
@@ -344,7 +334,6 @@ const ruleFormRef = ref();
 
 // 表格实例
 const oldColumnListNode = ref();
-const newColumnListNode = ref();
 
 const details = reactive<any>({
   activeTab: 'tab1',
@@ -388,8 +377,6 @@ const details = reactive<any>({
   editColumnList: [],
   /** 运单池 */
   columnList: deepClone(columnList),
-  /** 调度池 */
-  newColumnList: deepClone(newColumnList),
   /** 列表数据 */
   oldData: [],
   /** 渲染数据 */
@@ -489,8 +476,19 @@ const details = reactive<any>({
   driverListByName: [],
   /** 被选中在调度池的订单列表 */
   orderCodeList: [],
+  /** 配载日志 */
+  loadLogsList: [],
 });
 
+for (let i = 0; i < details.columnList.length; i++) {
+  const value = details.columnList[i];
+
+  if (value.prop === 'waybillNo') {
+    value.type = 13;
+    break;
+  }
+}
+
 const {
   search,
   query,
@@ -601,7 +599,8 @@ const onLoad = debounce(async () => {
       // 获取下拉列表
       postloadFindLoadInitData(),
       // 获取表单数据
-      postSelectEditDetailByLoadId({ loadId: $route.query.loadId }),
+      // postSelectEditDetailByLoadId({ loadId: $route.query.loadId }),
+      postCarsLoadDetailInfo({ loadId: $route.query.loadId }),
     ]);
 
     console.log('promiseAll :>> ', promiseAll);
@@ -624,20 +623,37 @@ const onLoad = debounce(async () => {
     details.customerType = data.customerType;
     console.log('data :>> ', data);
 
-    details.form = data1.carsLoadEntity;
-    details.form.customerType = data1.carsLoadEntity.customerType.split(',');
+    details.form = data1;
+    details.form.customerType = data1.customerType.split(',');
 
     details.form.startWarehouseName = data.startWarehouseInfo.warehouseName;
     details.form.startWarehouseId = data.startWarehouseInfo.warehouseId;
-    details.form.endWarehouseNames = data.startWarehouseInfo.warehouseName;
-    details.form.endWarehouseIds = data.startWarehouseInfo.warehouseId;
-    details.form.carsLineName = data.startWarehouseInfo.warehouseName;
     details.form.carrierTimeStr = details.form.carrierTime;
     details.form.receivingTimeStr = details.form.receivingTime;
 
     delete details.form.carrierTime;
     delete details.form.receivingTime;
-    await initOriginWarehouseOrder();
+
+    data1.carsLoadWaybillInfoList.forEach(val => {
+      details.oldData.push(
+        ...val.carsLoadOrderInfoList.map((item, index) => {
+          item = { ...val, ...item };
+          const _planArr: any = { ...val, ...item };
+          delete item.carsLoadOrderInfoList;
+          delete item.carsLoadOrderInfoListPlan;
+
+          if (index === 0) item.mergeColumnIndex = val.carsLoadOrderInfoList.length;
+          else {
+            item.mergeColumnIndex = 0;
+            for (let value of mergeColumn) {
+              item[value] = '';
+            }
+          }
+          return item;
+        })
+      );
+    });
+    // await initOriginWarehouseOrder();
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -667,27 +683,6 @@ const initOriginWarehouseOrder = async (params = {}) => {
   }
 };
 
-/** 请求添加在调度池中的数据 */
-const initDispatchOrder = async () => {
-  // 开启列表加载动画
-  const submitData = {
-    loadId: $route.query.loadId,
-    finalNodeId: details.form.startWarehouseId,
-  };
-  const res = await postFindUseOrderList(submitData);
-  const { code, data } = res.data;
-  if (code !== 200) return;
-  details.newData = data;
-  details.newRenderData = data;
-  details.MappingData = JSON.parse(JSON.stringify(data));
-
-  details.orderCodeList = [];
-
-  details.orderCodeList = [
-    ...new Set([...details.orderCodeList, ...data.map(val => val.orderCode + ',' + val.waybillNo)]),
-  ];
-};
-
 /** 搜索 */
 const searchChange = () => {
   onLoad();
@@ -705,9 +700,6 @@ const searchReset = () => {
 const clearSelectionList = () => {
   details.selectionList = [];
   details.newSelectionList = [];
-  console.log('newColumnListNode :>> ', newColumnListNode);
-  console.log('oldColumnListNode :>> ', oldColumnListNode);
-  newColumnListNode.value.handleCheckSelect([]);
   oldColumnListNode.value.handleCheckSelect([]);
 };
 
@@ -730,17 +722,6 @@ const searchHide = async () => {
   setNodeHeight(details.listNode, '50vh');
 };
 
-/** 远程搜索承运商 */
-const remoteMethod = value => {
-  if (!value) return;
-  debounce(async () => {
-    const res = await postFindCarrierByName({ carrierName: value });
-    const { code, data } = res.data;
-    if (code !== 200) return;
-    details.carrierNameOptions = data;
-  }, 500)();
-};
-
 /** 查询司机信息 */
 const remoteMethodDriver = async val => {
   const res = await postFindDriverListByName({ driverName: val });
@@ -851,50 +832,6 @@ const setnewcolum = (newarr, headarr, type) => {
   }
 };
 
-/** 加入调度池 */
-const handleAddWaybill = () => {
-  details.newData = details.selectionList.map(val => {
-    val.planNum = val.stockNum;
-    val.loadingNum = 0;
-
-    return val;
-  });
-  details.orderCodeList = [
-    ...new Set([
-      ...details.orderCodeList,
-      ...details.selectionList.map(val => val.orderCode + ',' + val.waybillNo),
-    ]),
-  ];
-  console.log('details.orderCodeList :>> ', details.orderCodeList);
-
-  const orderCodes = details.selectionList.map(val => val.orderCode);
-  clearSelectionList();
-  details.page.pageNum = 1;
-  initOriginWarehouseOrder();
-};
-
-/** 移除调度池 */
-const handleRemoveWaybill = () => {
-  // 将被选中的数据筛选出去
-  details.newData = details.newData.filter((val, index) => {
-    const _flag = !details.newSelectionList.includes(val);
-    if (!_flag) {
-      const _code = val.orderCode + ',' + val.waybillNo;
-      const _index = details.orderCodeList.indexOf(_code);
-      // 删除映射的订单号+运单号
-      details.orderCodeList.splice(_index, 1);
-    }
-    return _flag;
-  });
-  clearSelectionList();
-  initOriginWarehouseOrder();
-};
-
-/** 新增承运商 */
-const handleAddCarrier = () => {
-  $router.push({ path: '/basicdata/carrier/basicdataCarrier' });
-};
-
 /** 选择承运商 */
 const carrierNameChange = () => {};
 
@@ -908,70 +845,57 @@ const handleNameChange = () => {
   form.value.driverMobile = _value.driverPhone;
 };
 
+/** 请求日志跟踪 */
+const handleSignLoadScanLogs = async () => {
+  try {
+    details.loadingObj.pageLoading = true;
+
+    const submitData = { loadId: $route.query.loadId };
+    const res = await postFindCarsLoadLogs(submitData);
+
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.loadLogsList = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+const handleCheckTab = e => {
+  console.log('e :>> ', e);
+  switch (e.props.name) {
+    // 日志跟踪
+    case 'tab2':
+      handleSignLoadScanLogs();
+      break;
+
+    default:
+      break;
+  }
+};
+
+/** 查看运单 */
+const handleGoWaybillDetails = ({ row }) => {
+  console.log('row :>> ', row);
+  $router.push({
+    path: '/distribution/inventory/BookingNote',
+    query: {
+      name: `查看 -- 【${row.waybillNo}】`,
+      waybillNo: row.waybillNo,
+      id: row.waybillId,
+      waybillType: row.waybillType,
+    },
+  });
+};
+
 /** 关闭页面 */
 const back = () => {
   $store.commit('DEL_TAG_CURRENT');
   $router.push({ path: '/distribution/artery/TripartiteTransfer' });
 };
 
-/** 提交 */
-const handleSubmit = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  console.log('111 :>> ', 111);
-  formEl.validate(async (valid, fields) => {
-    if (valid) {
-      const submitData = {
-        ...form.value,
-        carsLoadLineList: JSON.parse(JSON.stringify(details.newData)),
-      };
-      console.log('submitData :>> ', submitData);
-
-      // 目的仓
-
-      // let _lineCarsOrderList = [];
-      // submitData.carsLoadLineList.forEach((val, i) => {
-      //   val.nodeType = '1';
-      //   val.sort = i + 1;
-      //   delete val.blackList;
-      //   if (i === 0) return;
-      //   // 删除无用数据
-      //   delete val.query;
-      //   delete val.selectionList;
-      //   delete val.loading;
-      //   delete val.data;
-      //   delete val.filterData;
-
-      //   _lineCarsOrderList = [
-      //     ..._lineCarsOrderList,
-      //     ...val.lineCarsOrderList.map(value => {
-      //       value.nodeId = submitData.startWarehouseId;
-      //       value.nodeName = submitData.startWarehouseName;
-      //       value.finalNodeId = val.nodeId;
-      //       value.totalNum = 20;
-      //       return value;
-      //     }),
-      //   ];
-      //   delete val.lineCarsOrderList;
-      // });
-
-      // submitData.carsLoadLineList[0].lineCarsOrderList = _lineCarsOrderList;
-
-      // console.log('submitData :>> ', submitData);
-      // const res = await postSaveNewTripartiteTransfer(submitData);
-      // const { code, msg } = res.data;
-      // if (code !== 200) return;
-      // ElMessage({
-      //   message: msg,
-      //   type: 'success',
-      // });
-      // back();
-      // console.log('res :>> ', res);
-    } else {
-      console.log('error submit!', fields);
-    }
-  });
-};
-
 watch($route, () => {
   if ($route.path !== '/distribution/artery/TripartiteTransferDetails') return;
   onLoad();
@@ -1013,59 +937,6 @@ watch($route, () => {
   width: 100%;
 }
 
-// 新增行
-.add_row {
-  display: flex;
-  justify-content: space-between;
-}
-
-.add_row_title {
-  text-align: center;
-  margin-bottom: 10px;
-  font-size: 18px;
-  font-weight: bold;
-}
-
-// 统计行
-.statistics_row {
-  margin: 10px 0;
-  font-size: 14px;
-  zoom: 0.9;
-  display: flex;
-
-  > div {
-    margin-right: 20px;
-  }
-}
-
-// 卡片容器
-.crad_container {
-  display: flex;
-
-  .card_container_item {
-    flex: 1;
-    // padding: 10px;
-    border-radius: 5px;
-    box-shadow: 0 0 5px #ccc;
-
-    &:first-child {
-      margin-right: 20px;
-    }
-
-    .card_container_item_title {
-      padding: 10px;
-      border-bottom: 1px solid #ccc;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-
-    .card_container_item_box {
-      padding: 10px;
-    }
-  }
-}
-
 .pointer {
   cursor: pointer;
 }
@@ -1099,11 +970,6 @@ watch($route, () => {
   height: 30px;
 }
 
-// 数字输入框
-:deep(.nodeInfo .el-table .cell) {
-  overflow: initial;
-}
-
 :deep(.slotbuts) {
   height: 30px;
 
@@ -1112,22 +978,21 @@ watch($route, () => {
   }
 }
 
-// 错误提示
-:deep(.el-form-item__error) {
-  z-index: 99;
-  --el-color-danger: #f00;
+// 禁用样式
+:deep(.el-input.is-disabled .el-input__wrapper) {
+  background-color: #fff;
+  color: #000 !important;
+  -webkit-text-fill-color: #000 !important;
 }
 
-:deep(.el-form-item.is-error .el-input__wrapper) {
-  --el-color-danger: #f00;
+:deep(.el-input.is-disabled .el-input__inner) {
+  color: #000 !important;
+  -webkit-text-fill-color: #000 !important;
+  text-align: left;
 }
 
-:deep(
-    .el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before,
-    .el-form-item.is-required:not(.is-no-asterisk).asterisk-left
-      > .el-form-item__label-wrap
-      > .el-form-item__label:before
-  ) {
-  --el-color-danger: #f00;
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+  background-color: #fff;
+  color: #000 !important;
 }
 </style>
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 533b7b8e..82528195 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -68,7 +68,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="经办人">
-                <el-input readonly v-model="form.userName" />
+                <el-input readonly v-model="form.operator" />
               </el-form-item>
               <el-form-item label="合计运输费" prop="customerType">
                 <el-input readonly v-model="form.countTransportCost" />
@@ -1002,6 +1002,7 @@ const handleGoWayBillDetail = ({ row }) => {
       name: `查看 -- 【${row.waybillNo}】`,
       waybillNo: row.waybillNo,
       id: row.waybillId,
+      waybillType: row.waybillType,
     },
   });
 };
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 481f1ecb..2ab5413d 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -1530,6 +1530,7 @@ const onLoad = async () => {
   }
 };
 
+/** 查看运单跟踪 */
 const handleFindInfo = async type => {
   try {
     details.loadingObj.pageLaoding = true;
@@ -1543,6 +1544,31 @@ const handleFindInfo = async type => {
     if (code !== 200) return;
 
     details.data = data || [];
+
+    // 批次状态
+    const _batchStatus = [
+      { label: '创建运单', value: 10 },
+      { label: '已入库', value: 20 },
+      { label: '干线装车', value: 30 },
+      { label: '干线发车', value: 40 },
+      { label: '干线取消发车', value: 50 },
+      { label: '干线到达', value: 60 },
+      { label: '干线取消达到', value: 70 },
+      { label: '干线卸车', value: 80 },
+      { label: '修改运单', value: 888 },
+      { label: '审核运单', value: 999 },
+    ];
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+      for (let i = 0; i < _batchStatus.length; i++) {
+        const item = _batchStatus[i];
+
+        if (item.value === Number(value.trackType)) continue;
+        value.trackTypeName = item.label;
+        break;
+      }
+    }
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -1712,7 +1738,7 @@ const back = () => {
 
 /** 前往修改页面 */
 const handleEdit = () => {
-  if (Number($route.query.waybillType) === 1) {
+  if (Number(details.query.waybillType) === 1 || details.query.orderCode) {
     // 暂存单转运单的数据
 
     $store.commit('DEL_ONCE_TAG', '/distribution/inventory/CreateOrder');
@@ -1724,9 +1750,10 @@ const handleEdit = () => {
         id: $route.query.id,
         type: 'edit',
         backPath: '/waybill/WaybillOrderList',
+        orderStatus: Number(details.query.waybillType) === 1 ? 'haveData' : 'notHaveData',
       },
     });
-  } else if (Number($route.query.waybillType) === 2) {
+  } else if (Number(details.query.waybillType) === 2 && !details.query.orderCode) {
     // 零担开单的数据
 
     $router.push({
diff --git a/src/views/distribution/inventory/CreateOrder - 副本.vue b/src/views/distribution/inventory/CreateOrder - 副本.vue
new file mode 100644
index 00000000..43c5ef72
--- /dev/null
+++ b/src/views/distribution/inventory/CreateOrder - 副本.vue	
@@ -0,0 +1,3454 @@
+<template>
+  <div v-loading="details.loadingObj.submitLoadingBtn">
+    <basic-container>
+      <el-divider style="font-size: 28px">货物托运单</el-divider>
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :rules="details.rules"
+        :model="query"
+        class="table_form"
+        label-width="100px"
+      >
+        <!-- 顶部 -->
+        <div class="flex-c-sb form_top">
+          <div>
+            <div class="flex-c-sb">
+              <div class="flex-c-c">
+                <el-icon color="#172e60"><User /></el-icon>
+                品牌:
+                <span class="red">{{ query.brand }}</span>
+              </div>
+              <div class="flex-c-c">
+                <el-icon color="#172e60"><Van /></el-icon>
+                车次号:
+                <span class="red">{{ query.trainNumber }}</span>
+              </div>
+            </div>
+            <div class="mt10">
+              <el-form-item class="mt10" label="运单号: " prop="waybillNo" label-width="80px">
+                <div>
+                  <el-input v-model.trim="query.waybillNo" placeholder="运单号" clearable />
+                </div>
+              </el-form-item>
+            </div>
+          </div>
+
+          <div class="flex-c-c">
+            <div style="margin-right: 10px" class="flex-c-c">
+              <el-icon><User /></el-icon>
+              <span style="margin-left: 10px">{{ query.openOrderUserName }}</span>
+            </div>
+            <el-date-picker
+              v-model="query.openOrderDate"
+              :readonly="$route.query.type !== 'add'"
+              prefix-icon="Calendar"
+              type="datetime"
+              placeholder="创建时间"
+            />
+          </div>
+        </div>
+
+        <!-- 第一排 -->
+        <div class="table-row mt15 border-top">
+          <el-form-item label="发站仓:" prop="departureWarehouseName" class="el-times">
+            <el-input
+              disabled
+              v-model="query.departureWarehouseName"
+              placeholder="发站仓"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="发站:" prop="departure">
+            <div class="w100">
+              <el-cascader
+                pleceholder="请选择到站地址"
+                :options="details.regionOptione"
+                style="width: 100%"
+                v-model="query.departure"
+                :props="{
+                  checkStrictly: true,
+                }"
+                @change="() => handleFindPrice()"
+                filterable
+                clearable
+              >
+                <template #default="{ node, data }">
+                  <span>{{ data.label }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </div>
+          </el-form-item>
+
+          <el-form-item label="到站:" prop="destination">
+            <div class="w100">
+              <el-cascader
+                pleceholder="请选择到站地址"
+                :options="details.regionOptione"
+                style="width: 100%"
+                v-model="query.destination"
+                :props="{
+                  checkStrictly: true,
+                }"
+                @change="() => handleFindPrice()"
+                filterable
+                clearable
+              >
+                <template #default="{ node, data }">
+                  <span>{{ data.label }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </div>
+          </el-form-item>
+
+          <el-form-item label="目的仓:" class="el-times" prop="queryDestinationWarehouseName">
+            <el-select
+              class="w100"
+              v-model="query.queryDestinationWarehouseName"
+              filterable
+              remote
+              reserve-keyword
+              placeholder="目的仓"
+              @change="
+                val => {
+                  destinationWarehouseNameChange(val);
+                  handleFindPrice();
+                }
+              "
+              :remote-method="remoteMethod"
+              :loading="details.loadingObj.loading"
+            >
+              <el-option
+                v-for="item in details.options || []"
+                :key="item.value"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="货号:" prop="goodsCode">
+            <el-input v-model="query.goodsCode" readonly placeholder="货号"></el-input>
+          </el-form-item>
+        </div>
+
+        <!-- 订单自编号 -->
+        <div class="table-row">
+          <el-form-item label="订单自编号:" class="el-times">
+            <el-input
+              v-model="details.query.orderCode"
+              type="textarea"
+              placeholder="订单自编号"
+              disabled
+            ></el-input>
+            <el-button
+              v-if="details.pageInfo.type !== 'edit'"
+              class="mt10"
+              type="primary"
+              @click="handleChooseOrder"
+              icon="Plus"
+            >
+              选取订单
+            </el-button>
+          </el-form-item>
+        </div>
+
+        <!-- 发货方 && 收货方 -->
+        <div class="table-row">
+          <div style="margin-right: 10px">
+            <div class="flex-c table-row-title">发货方</div>
+            <div>
+              <el-row>
+                <el-form-item
+                  label="发货单位:"
+                  prop="shipper"
+                  :class="!query.shipperId ? 'is-error' : ''"
+                >
+                  <SelectBox
+                    :focus="handleCloseSelcet"
+                    :input="() => handleFindClientInfo('shipper', 1)"
+                    v-model="query.shipper"
+                    placeholder="发货单位"
+                    ref="shipper"
+                    :minWidth="true"
+                  >
+                    <el-table
+                      :data="details.shipperOptions"
+                      style="width: 100%"
+                      @row-click="
+                        (column, prop, order) => {
+                          handleChooseShipper(column, prop, order);
+                          handleFindPrice();
+                        }
+                      "
+                      v-loading="details.loadingObj.consignerLoading"
+                    >
+                      <el-table-column prop="clientName" label="发货单位" width="130" />
+                      <el-table-column prop="linkMan" label="发货人" width="130" />
+                      <el-table-column prop="linkPhone" label="发货联系电话" width="130" />
+                      <el-table-column prop="linkAddress" label="发货地址" width="200" />
+                    </el-table>
+                  </SelectBox>
+                </el-form-item>
+
+                <el-form-item label="发货人:" prop="shipperName">
+                  <SelectBox
+                    :focus="handleCloseSelcet"
+                    :input="() => handleFindClientInfo('shipperName')"
+                    v-model="query.shipperName"
+                    placeholder="发货人"
+                    ref="shipperName"
+                    :minWidth="true"
+                  >
+                    <el-table
+                      :data="details.shipperNameOptions"
+                      style="width: 100%"
+                      @row-click="handleChooseShipper"
+                      v-loading="details.loadingObj.consignerLoading"
+                    >
+                      <el-table-column prop="clientName" label="发货单位" width="130" />
+                      <el-table-column prop="linkMan" label="发货人" width="130" />
+                      <el-table-column prop="linkPhone" label="发货联系电话" width="130" />
+                      <el-table-column prop="linkAddress" label="发货地址" width="200" />
+                    </el-table>
+                  </SelectBox>
+                </el-form-item>
+              </el-row>
+
+              <el-row>
+                <el-form-item label="联系电话:" prop="shipperMobile">
+                  <SelectBox
+                    :focus="handleCloseSelcet"
+                    :input="() => handleFindClientInfo('shipperMobile')"
+                    v-model="query.shipperMobile"
+                    placeholder="联系电话"
+                    ref="shipperMobile"
+                    :minWidth="true"
+                  >
+                    <el-table
+                      :data="details.shipperMobileOptions"
+                      style="width: 100%"
+                      @row-click="handleChooseShipper"
+                      v-loading="details.loadingObj.consignerLoading"
+                    >
+                      <el-table-column prop="clientName" label="发货单位" width="130" />
+                      <el-table-column prop="linkMan" label="发货人" width="130" />
+                      <el-table-column prop="linkPhone" label="发货联系电话" width="130" />
+                      <el-table-column prop="linkAddress" label="发货地址" width="200" />
+                    </el-table>
+                  </SelectBox>
+                </el-form-item>
+              </el-row>
+
+              <el-row>
+                <el-form-item label="发货地址:">
+                  <el-input
+                    v-model="query.shipperAddress"
+                    @change="e => handleRefreshText('shipperAddress', e, '')"
+                    placeholder="发货地址"
+                  ></el-input>
+                </el-form-item>
+              </el-row>
+            </div>
+          </div>
+          <div class="border-left">
+            <div class="flex-c table-row-title">收货方</div>
+            <div>
+              <el-row>
+                <el-form-item
+                  label="收货单位:"
+                  prop="consignee"
+                  :class="!query.consigneeId ? 'is-error' : ''"
+                >
+                  <SelectBox
+                    :focus="handleCloseSelcet"
+                    :input="() => handleFindClientInfo('consignee', 1)"
+                    v-model="query.consignee"
+                    placeholder="收货单位"
+                    ref="consignee"
+                    :minWidth="true"
+                  >
+                    <el-table
+                      :data="details.consigneeOptions"
+                      style="width: 100%"
+                      @row-click="
+                        (column, prop, order) => {
+                          handleChooseConsigner(column, prop, order);
+                          handleFindPrice();
+                        }
+                      "
+                      v-loading="details.loadingObj.consignerLoading"
+                    >
+                      <el-table-column prop="clientName" label="收货单位" width="130" />
+                      <el-table-column prop="linkMan" label="收货人" width="130" />
+                      <el-table-column prop="linkPhone" label="收货联系电话" width="130" />
+                      <el-table-column prop="linkAddress" label="收货地址" width="200" />
+                    </el-table>
+                  </SelectBox>
+                </el-form-item>
+
+                <el-form-item label="收货人:" prop="consigneeName">
+                  <SelectBox
+                    :focus="handleCloseSelcet"
+                    :input="() => handleFindClientInfo('consigneeName')"
+                    v-model="query.consigneeName"
+                    placeholder="收货人"
+                    ref="consigneeName"
+                    :minWidth="true"
+                  >
+                    <el-table
+                      :data="details.consigneeNameOptions"
+                      style="width: 100%"
+                      @row-click="
+                        (column, prop, order) => {
+                          handleChooseConsigner(column, prop, order);
+                        }
+                      "
+                      v-loading="details.loadingObj.consignerLoading"
+                    >
+                      <el-table-column prop="clientName" label="收货单位" width="130" />
+                      <el-table-column prop="linkMan" label="收货人" width="130" />
+                      <el-table-column prop="linkPhone" label="收货联系电话" width="130" />
+                      <el-table-column prop="linkAddress" label="收货地址" width="200" />
+                    </el-table>
+                  </SelectBox>
+                </el-form-item>
+              </el-row>
+
+              <el-row>
+                <el-form-item label="联系电话:" prop="consigneeMobile">
+                  <SelectBox
+                    :focus="handleCloseSelcet"
+                    :input="() => handleFindClientInfo('consigneeMobile')"
+                    v-model="query.consigneeMobile"
+                    placeholder="联系电话"
+                    ref="consigneeMobile"
+                    :minWidth="true"
+                  >
+                    <el-table
+                      :data="details.consigneeMobileOptions"
+                      style="width: 100%"
+                      @row-click="
+                        (column, prop, order) => {
+                          handleChooseConsigner(column, prop, order);
+                        }
+                      "
+                      v-loading="details.loadingObj.consignerLoading"
+                    >
+                      <el-table-column prop="clientName" label="收货单位" width="130" />
+                      <el-table-column prop="linkMan" label="收货人" width="130" />
+                      <el-table-column prop="linkPhone" label="收货联系电话" width="130" />
+                      <el-table-column prop="linkAddress" label="收货地址" width="200" />
+                    </el-table>
+                  </SelectBox>
+                </el-form-item>
+              </el-row>
+
+              <el-row>
+                <el-form-item label="收货地址:">
+                  <el-input
+                    v-model="query.consigneeAddress"
+                    @change="e => handleRefreshText('consigneeAddress', e, '')"
+                    placeholder="发货地址"
+                  ></el-input>
+                </el-form-item>
+              </el-row>
+            </div>
+          </div>
+        </div>
+
+        <div class="table-row table_row_number">
+          <div class="flex-c-c title">提 货</div>
+          <el-form-item label="是否提货:" label-width="fit-content" prop="num" class="flex1">
+            <el-radio-group
+              @change="
+                () => {
+                  if (!details.query.isPickUp) details.query.pickupFee = 0;
+                }
+              "
+              v-model="query.isPickUp"
+              class="flex-a"
+            >
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="是否整车:" label-width="fit-content" prop="num" class="flex1">
+            <el-radio-group
+              :disabled="!query.isPickUp"
+              v-model="query.pickupCompleteOrNot"
+              class="flex-a"
+              @change="
+                () => {
+                  details.query.pickupFee = 0;
+                  handlePrice();
+                }
+              "
+            >
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="车型:" label-width="fit-content" prop="num" class="flex1">
+            <el-select
+              class="w100"
+              :disabled="!query.isPickUp || !query.pickupCompleteOrNot"
+              v-model="query.pickupVehicleType"
+              filterable
+              clearable
+              placeholder="请选择车型"
+              @change="
+                () => {
+                  details.query.pickupFee = 0;
+                  handlePrice();
+                }
+              "
+            >
+              <el-option
+                v-for="item in details.vehicleTypeArr"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+                :disabled="item.isCheck === true"
+              />
+            </el-select>
+          </el-form-item>
+
+          <div class="flex-c-c title">干 线</div>
+
+          <el-form-item label="是否整车:" label-width="fit-content" prop="num" class="flex1">
+            <el-radio-group
+              v-model="query.trunklineCompleteOrNot"
+              class="flex-a"
+              @change="
+                () => {
+                  details.query.totalFreight = 0;
+                  handlePrice();
+                }
+              "
+            >
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="车型:" label-width="fit-content" prop="num" class="flex1">
+            <el-select
+              class="w100"
+              :disabled="!query.trunklineCompleteOrNot"
+              v-model="query.trunklineVehicleType"
+              filterable
+              clearable
+              placeholder="请选择车型"
+              @change="
+                () => {
+                  details.query.totalFreight = 0;
+                  handlePrice();
+                }
+              "
+            >
+              <el-option
+                v-for="item in details.vehicleTypeArr"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+                :disabled="item.isCheck === true"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+
+        <!-- 计价方式行 -->
+        <div
+          class="table-row table_row_number"
+          style="display: flex"
+          v-for="(item, index) in details.goodsList"
+          :key="item"
+        >
+          <!-- 加减按钮 -->
+          <div style="width: 55px; flex: none" class="flex-c-c">
+            <el-button
+              v-if="index === 0"
+              @click="handleAdd"
+              icon="Plus"
+              type="primary"
+              size="small"
+              circle
+            ></el-button>
+
+            <el-button
+              v-else
+              @click="handleRemove(index)"
+              icon="Minus"
+              type="primary"
+              size="small"
+              circle
+            ></el-button>
+          </div>
+
+          <div>
+            <el-form-item
+              label="计价方式:"
+              label-width="fit-content"
+              prop="chargeType"
+              class="el-times"
+            >
+              <el-radio-group
+                v-model="item.chargeType"
+                @change="handleComputed(item)"
+                style="display: flex"
+              >
+                <el-radio :label="1">件</el-radio>
+                <el-radio :label="2">方</el-radio>
+                <el-radio :label="3">公斤</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </div>
+
+          <!-- 货物名称 -->
+          <el-form-item
+            label="货物名称:"
+            label-width="fit-content"
+            prop="goodsName"
+            class="el-times"
+          >
+            <SelectBox
+              ref="goodsNameRef"
+              className="goodsName"
+              :input="() => debounce(handleFindGoods(item.goodsName, item, 1), 1000)"
+              :focus="handleCloseSelcet"
+              v-model="item.goodsName"
+              placeholder="货物名称"
+            >
+              <div v-loading="item.loading">
+                <template v-if="item.goodsListOptions.length > 0">
+                  <div
+                    :class="{ goodsNameRow: true, active: val.goodsId === item.goodsId }"
+                    v-for="val in item.goodsListOptions"
+                    :key="val.goodsId"
+                    @click="handleChooseGoods(item, val)"
+                  >
+                    {{ val.goodsName }}
+                  </div>
+                </template>
+                <template v-else>
+                  <div class="goodsNameRow" @click="handleCloseSelcet">暂无数据</div>
+                </template>
+              </div>
+            </SelectBox>
+          </el-form-item>
+
+          <el-form-item label="件数:" label-width="fit-content" prop="num" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="item.num"
+              controls-position="right"
+              :min="0"
+              :max="info.maxNum + item.num - details.totalObj.totalCount"
+              :precision="0"
+              :step="1"
+              :value-on-clear="0"
+              @change="handleComputed(item)"
+            />
+          </el-form-item>
+
+          <el-form-item label="体积(方):" label-width="fit-content" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="item.volume"
+              controls-position="right"
+              :min="0"
+              :precision="4"
+              :step="0.1"
+              :value-on-clear="0"
+              @change="handleComputed(item)"
+            />
+          </el-form-item>
+
+          <el-form-item label="重量(kg):" label-width="fit-content" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="item.weight"
+              controls-position="right"
+              :min="0"
+              :precision="3"
+              :step="0.1"
+              :value-on-clear="0"
+              @change="handleComputed(item)"
+            />
+          </el-form-item>
+
+          <el-form-item label="单价:" label-width="fit-content" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="item.price"
+              controls-position="right"
+              :min="0"
+              :precision="2"
+              :step="0.1"
+              :value-on-clear="0"
+              @change="handleComputed(item)"
+            />
+          </el-form-item>
+
+          <el-form-item label="运费小计:" label-width="fit-content" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="item.subtotalFreight"
+              :precision="2"
+              :min="0"
+              :step="0.1"
+              :value-on-clear="0"
+              :disabled="item.price > 0 || Number(item.price) !== Number(item.price)"
+              @change="
+                () => {
+                  handleTrunkLinePrice(
+                    details.priceTemplate.trunkLine,
+                    details.priceTemplate.template
+                  );
+                }
+              "
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 合计行 -->
+        <div class="table-row table_row_number table_row_total">
+          <div style="width: 55px; flex: none" class="flex-c-c"></div>
+          <div>合计</div>
+          <!-- 货物名称 -->
+          <div>{{ details.goodsList.length }}</div>
+          <!-- 件数 -->
+          <div>
+            {{ details.totalObj.totalCount }}(最大数: <span class="red">{{ info.maxNum }}</span
+            >)
+          </div>
+          <!-- 体积 -->
+          <div>{{ details.totalObj.totalVolume }}</div>
+          <!-- 重量 -->
+          <div>{{ details.totalObj.totalWeghit }}</div>
+          <div></div>
+          <!-- 运费 -->
+          <div>{{ details.totalObj.totalFreight }}</div>
+        </div>
+
+        <!-- 合计运费 && 支付方式 -->
+        <div class="table-row">
+          <!-- 合计运费 -->
+          <div style="margin-right: 10px; width: 60%; flex: none">
+            <div style="flex: 1">
+              <div class="table-row-title" style="margin-bottom: 10px">
+                <div class="table-row-title-item fwb">
+                  合计费用
+                  <span class="red" style="margin-left: 10px">{{ totalCost }}</span>
+                </div>
+              </div>
+              <div>
+                <el-form label-width="fit-content">
+                  <el-row>
+                    <el-form-item label="运费:">
+                      <!-- <el-input
+                        controls-position="right"
+                        v-model="details.totalObj.totalFreight"
+                        disabled
+                      ></el-input> -->
+
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.totalFreight"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="送货费:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.deliveryFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="提货费:">
+                      <el-input-number
+                        :disabled="!query.isPickUp"
+                        :controls="false"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.pickupFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="仓库管理费:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.warehouseManagementFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="仓储费:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.storageFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+                  </el-row>
+
+                  <el-row>
+                    <el-form-item label="装卸费:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.handlingFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="其它费用:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.otherFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="保价费:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        v-model="query.insuranceFee"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="申明价值:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        v-model="query.claimingValue"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+                  </el-row>
+
+                  <el-row>
+                    <el-form-item label="安装费:">
+                      <el-input-number
+                        :controls="false"
+                        controls-position="right"
+                        :precision="2"
+                        :min="0"
+                        :step="0.1"
+                        v-model="query.installFee"
+                        :value-on-clear="0"
+                      ></el-input-number>
+                    </el-form-item>
+                  </el-row>
+                </el-form>
+              </div>
+            </div>
+          </div>
+
+          <!-- 付款方式 -->
+          <div class="border-left">
+            <div style="flex: 1">
+              <div class="table-row-title" style="margin-bottom: 10px">
+                <div class="table-row-title-item fwb">付款方式</div>
+              </div>
+              <div>
+                <el-row>
+                  <el-form-item label-width="fit-content" label="支付方式:">
+                    <el-select v-model="query.payType" class="m-2" placeholder="支付方式">
+                      <el-option
+                        v-for="item in query.payTypeList || []"
+                        :key="item.dictValue"
+                        :label="item.dictValue"
+                        :value="item.dictKey"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label-width="fit-content" label="付款方式:" prop="payWay">
+                    <el-select
+                      v-model="query.payWay"
+                      class="m-2"
+                      @change="handlePayWay"
+                      placeholder="付款方式"
+                    >
+                      <el-option
+                        v-for="item in query.payWayList || []"
+                        :key="item.dictValue"
+                        :label="item.dictValue"
+                        :value="item.dictKey"
+                      />
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item label-width="fit-content" label="现付:">
+                    <el-input-number
+                      :controls="false"
+                      controls-position="right"
+                      :precision="2"
+                      :min="0"
+                      :step="0.1"
+                      v-model="query.xianPay"
+                      :value-on-clear="0"
+                    ></el-input-number>
+                  </el-form-item>
+                </el-row>
+
+                <el-row>
+                  <el-form-item label-width="fit-content" label="到付:">
+                    <el-input-number
+                      :controls="false"
+                      controls-position="right"
+                      :precision="2"
+                      :min="0"
+                      :step="0.1"
+                      v-model="query.daoPay"
+                      :value-on-clear="0"
+                    ></el-input-number>
+                  </el-form-item>
+
+                  <el-form-item label-width="fit-content" label="月结:">
+                    <el-input-number
+                      :controls="false"
+                      controls-position="right"
+                      :precision="2"
+                      :min="0"
+                      :step="0.1"
+                      v-model="query.yuePay"
+                      :value-on-clear="0"
+                    ></el-input-number>
+                  </el-form-item>
+
+                  <el-form-item label-width="fit-content" label="回付:">
+                    <el-input-number
+                      :controls="false"
+                      controls-position="right"
+                      :precision="2"
+                      :min="0"
+                      :step="0.1"
+                      v-model="query.huiPay"
+                      :value-on-clear="0"
+                    ></el-input-number>
+                  </el-form-item>
+                </el-row>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 计价方式行 -->
+        <div class="table-row table_row_number">
+          <div>
+            <el-form-item label="开单人:" label-width="fit-content" class="el-times">
+              <el-input v-model="query.openOrderUserName" disabled />
+            </el-form-item>
+          </div>
+
+          <el-form-item label="三方操作费:" label-width="fit-content" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="query.thirdOperationFee"
+              controls-position="right"
+              :precision="0"
+              :step="0.1"
+              :value-on-clear="0"
+            />
+          </el-form-item>
+
+          <el-form-item
+            label="送货方式:"
+            prop="deliveryWay"
+            label-width="fit-content"
+            class="el-times"
+          >
+            <el-select v-model="query.deliveryWay" class="m-2" placeholder="送货方式">
+              <el-option
+                v-for="item in query.deliveryWayList || []"
+                :key="item.dictValue"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="紧急度:" prop="urgency" label-width="fit-content" class="el-times">
+            <el-select v-model="query.urgency" class="m-2" placeholder="紧急度">
+              <el-option
+                v-for="item in query.urgencyList || []"
+                :key="item.dictValue"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="回单" label-width="fit-content" class="el-times">
+            <el-input-number
+              :controls="false"
+              v-model="query.receiptNum"
+              controls-position="right"
+              :precision="0"
+              :step="1"
+              :min="0"
+              :value-on-clear="0"
+            />
+          </el-form-item>
+
+          <el-form-item label="回单要求:" label-width="fit-content" class="el-times">
+            <el-select
+              v-model="query.receipt"
+              class="m-2"
+              filterable
+              multiple
+              placeholder="回单要求"
+            >
+              <el-option
+                v-for="item in query.receiptList || []"
+                :key="item.dictValue"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="运输方式:" label-width="fit-content" class="el-times">
+            <el-select v-model="query.transportType" class="m-2" placeholder="运输方式">
+              <el-option
+                v-for="item in query.transportTypeList || []"
+                :key="item.dictValue"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+
+        <!-- 备注 -->
+        <div class="table-row">
+          <el-form-item label="备注:" class="el-times">
+            <el-input v-model="query.remark" type="textarea" placeholder="备注"></el-input>
+          </el-form-item>
+
+          <div class="flex-c-c">
+            <el-button icon="Close" @click="back">关闭</el-button>
+
+            <el-button
+              type="primary"
+              :loading="details.loadingObj.submitLoadingBtn"
+              icon="Position"
+              @click="handleSubmit(ruleFormRef)"
+              >提交</el-button
+            >
+            <el-button type="primary" icon="Refresh" @click="resetForm(ruleFormRef)"
+              >重置</el-button
+            >
+          </div>
+        </div>
+      </el-form>
+    </basic-container>
+
+    <!-- 选取订单 -->
+    <el-dialog
+      class="el-dialog-columnList"
+      title="选取订单"
+      :visible.sync="details.popUpShow.columnListVisited"
+      width="80%"
+      v-model="details.popUpShow.columnListVisited"
+    >
+      <div style="display: flex">
+        <el-tabs
+          v-model="details.orderStatus"
+          tab-position="left"
+          style="height: 100%; width: fit-content; flex: none"
+          class="demo-tabs"
+          @tab-click="handleClickAll"
+        >
+          <el-tab-pane name="haveData" label="有数据"></el-tab-pane>
+          <el-tab-pane name="notHaveData" label="无数据"></el-tab-pane>
+        </el-tabs>
+
+        <div class="overflow">
+          <!-- <div class="flex-c-sb">
+            <div class="avue-crud__left"></div>
+            <div class="avue-crud__right">
+              <el-button icon="el-icon-refresh" @click="init" circle></el-button>
+              <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+              <el-button icon="Search" @click="searchHide" circle></el-button>
+            </div>
+          </div> -->
+          <!-- 表格 -->
+          <!-- 列表模块 -->
+          <tablecmt
+            :columnList="details.columnList"
+            :tableData="
+              details.orderStatus === 'haveData' ? details.haveDataData : details.notHaveDataData
+            "
+            :loading="
+              details.orderStatus === 'haveData'
+                ? details.loadingObj.haveDataList
+                : details.loadingObj.notHaveDataList
+            "
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+            :isShowRefresh="false"
+          >
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '操作'">
+                <el-text
+                  v-if="details.orderStatus === 'haveData'"
+                  @click="handleShowPackageOrderList(slotProps.scope)"
+                >
+                  包明细
+                </el-text>
+              </template>
+            </template>
+          </tablecmt>
+        </div>
+      </div>
+
+      <!-- 分页模块 -->
+      <el-pagination
+        align="right"
+        class="mt10"
+        background
+        @size-change="sizeChange"
+        @current-change="currentChange"
+        :current-page="page.pageNum"
+        :page-sizes="[30, 50, 80, 120]"
+        :page-size="page.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"
+      >
+      </el-pagination>
+
+      <div class="flex-c-c mt10">
+        <el-button @click="details.popUpShow.columnListVisited = false">取 消</el-button>
+        <el-button type="primary" @click="handleChoose">确 认</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 提示是否继续开单 -->
+    <el-dialog
+      title="提示"
+      :center="true"
+      :align-center="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      :visible.sync="details.popUpShow.titleVisited"
+      width="30%"
+      v-model="details.popUpShow.titleVisited"
+    >
+      <div style="text-align: center">是否继续开单</div>
+      <div class="flex-c-c mt20">
+        <el-button icon="CircleClose" @click="back">取 消</el-button>
+        <el-button type="primary" icon="CircleCheck" @click="handleRepetition">确 认</el-button>
+        <!-- <el-button type="primary" icon="Printer" @click="handlePrint">打 印</el-button> -->
+      </div>
+    </el-dialog>
+
+    <!-- 改单原因 -->
+    <el-dialog
+      title="修改信息"
+      :center="true"
+      :align-center="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      :visible.sync="details.popUpShow.causeVisited"
+      width="50%"
+      v-model="details.popUpShow.causeVisited"
+    >
+      <el-form :model="details.causeForm" ref="causeFormRef" label-width="120px">
+        <el-form-item
+          label="修改原因："
+          style="margin-right: 0"
+          prop="editResonCode"
+          :rules="[{ required: true, message: '请选择修改原因', trigger: ['blur', 'change'] }]"
+        >
+          <el-select
+            v-model="details.causeForm.editResonCode"
+            clearable
+            placeholder="请选择修改原因"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in query.editWaybillReasonTypeList"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="备注：" style="margin-right: 0">
+          <el-input type="textarea" v-model="details.causeForm.remark" placeholder="请输入描述" />
+        </el-form-item>
+      </el-form>
+
+      <tablecmt
+        style="height: 40vh"
+        ref="tableNode"
+        :columnList="details.changeColumnList"
+        :tableData="details.changeData"
+        :loading="loadingObj.list"
+      >
+        <template #default="slotProps"> </template>
+      </tablecmt>
+
+      <div class="flex-c-c mt20">
+        <el-button icon="CircleClose" @click="() => (details.popUpShow.causeVisited = false)"
+          >取 消</el-button
+        >
+        <el-button type="primary" icon="CircleCheck" @click="handleSubmitCause">确 认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts">
+export default {
+  name: '/distribution/inventory/CreateOrder',
+};
+</script>
+
+<script setup lang="ts">
+import {
+  ref,
+  reactive,
+  toRefs,
+  computed,
+  onMounted,
+  nextTick,
+  getCurrentInstance,
+  watch,
+} from 'vue';
+import functions from '@/utils/functions';
+import dayjs from 'dayjs';
+import { mapGetters, useStore } from 'vuex';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import {
+  downloadXls,
+  computeNumber,
+  deepClone,
+  isNumber,
+  setNodeHeight,
+  debounce,
+  getObjType,
+} from '@/utils/util';
+import { columnList } from '@/option/waybill/TemporaryStorageList';
+import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
+import { getLazyTreeAll } from '@/api/base/region';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import type { FormInstance, FormRules, Action } from 'element-plus';
+import { useRouter, useRoute } from 'vue-router';
+import {
+  postOpenOrderFindClientInfo,
+  getOpenOrderAdvanceToWaybillInfo,
+  postOpenOrderOpenWaybill,
+  getOpenOrderAdvanceFindWarehouseList,
+  postFindWaybillDetail,
+  postUpdateWaybill,
+  postUpdateWaybillVerify,
+  postOpenOrderOpenZeroWaybill,
+  postFindCategoryInfo,
+  postFindArrPrice,
+} from '@/api/distribution/CreateOrder.js';
+
+// 获取vue实例
+const instance = getCurrentInstance();
+
+// 获取表单实例
+const ruleFormRef = ref<FormInstance>();
+const causeFormRef = ref<FormInstance>();
+
+// 获取路由实例
+const $router = useRouter();
+const $route = useRoute();
+
+// 获取vuex
+let $store = useStore();
+
+const tableNode = ref();
+
+const details = reactive<any>({
+  /** 页面数据 */
+  pageInfo: {},
+  deepQuery: {},
+  /** 表格搜索条件 */
+  query: {
+    /** 品牌 */
+    brand: '',
+    /** 创建时间 */
+    openOrderDate: new Date(),
+    /** 客户车次号 */
+    customerTrain: '',
+    /** 运单号 */
+    waybillNo: '',
+    /** 发站仓id */
+    departureWarehouseId: '',
+    /** 发站仓名称 */
+    departureWarehouseName: '',
+    /** 到站 */
+    destination: [],
+    /** 订单自编号 */
+    orderCode: '',
+    /** 目的站名称 */
+    destinationWarehouseName: '',
+    /** 目的仓Id */
+    destinationWarehouseId: '',
+    queryDestinationWarehouseName: '',
+    /** 货号 */
+    goodsCode: '',
+    /** 发货单位id */
+    shipperId: '',
+    /** 发货单位 */
+    shipper: '',
+    /** 发货人 */
+    shipperName: '',
+    /** 发货人电话 */
+    shipperMobile: '',
+    /** 发货人地址 */
+    shipperAddress: '',
+    /** 收货单位id */
+    consigneeId: '',
+    /** 收货单位 */
+    consignee: '',
+    /** 收货人 */
+    consigneeName: '',
+    /** 收货人电话 */
+    consigneeMobile: '',
+    /** 收货人地址 */
+    consigneeAddress: '',
+    /** 货物品类 */
+    waybillDetailList: [],
+    /** 送货费 */
+    deliveryFee: 0,
+    /** 提货费 */
+    pickupFee: 0,
+    /** 仓库管理费 */
+    warehouseManagementFee: 0,
+    /** 仓储费 */
+    storageFee: 0,
+    /** 装卸费 */
+    handlingFee: 0,
+    /** 其他费 */
+    otherFee: 0,
+    /** 保价费 */
+    insuranceFee: 0,
+    /** 安装费 */
+    installFee: 0,
+    /** 申明价值 */
+    claimingValue: 0,
+    /** 支付方式 */
+    payType: '',
+    /** 付款方式 */
+    payWay: '2',
+    /** 现付 */
+    xianPay: 0,
+    /** 到付 */
+    daoPay: 0,
+    /** 月付 */
+    yuePay: 0,
+    /** 回付 */
+    huiPay: 0,
+    huilaiPay: 0,
+    /** 三方操作费 */
+    thirdOperationFee: 0,
+    /** 送货方式 */
+    deliveryWay: '1',
+    /** 紧急度 */
+    urgency: '1',
+    /** 回单方式(多选) */
+    receipt: '',
+    /** 运输方式 */
+    transportType: '',
+    /** 开单人 */
+    openOrderUserName: '',
+    /** 回单数 */
+    receiptNum: 0,
+    /** 备注 */
+    remark: '',
+    /** 运单类型 */
+    waybillType: 1,
+  },
+  /** 合计 */
+  totalObj: {
+    /** 总件数 */
+    totalCount: computed(() => {
+      let _deliveryFee = 0;
+      let _warehouseManagementFee = 0;
+      let _storageFee = 0;
+
+      for (let index = 0; index < details.goodsList.length; index++) {
+        const element = details.goodsList[index];
+
+        _deliveryFee = computeNumber(
+          _deliveryFee,
+          '+',
+          computeNumber(element.deliveryFee || 0, '*', element.num || 0).result
+        ).result;
+
+        _warehouseManagementFee = computeNumber(
+          _warehouseManagementFee,
+          '+',
+          computeNumber(element.warehouseManagementFee || 0, '*', element.num || 0).result
+        ).result;
+
+        _storageFee = computeNumber(
+          _storageFee,
+          '+',
+          computeNumber(element.storageFee || 0, '*', element.num || 0).result
+        ).result;
+      }
+
+      details.query.deliveryFee = _deliveryFee;
+      details.query.warehouseManagementFee = _warehouseManagementFee;
+      details.query.storageFee = _storageFee;
+
+      return details.goodsList.reduce((curr, item) => {
+        if (item.num) return curr + item.num;
+        return curr;
+      }, 0);
+    }),
+    /** 总重量 */
+    totalWeghit: computed(() => {
+      return details.goodsList.reduce((curr, item) => {
+        if (item.weight) return computeNumber(curr, '+', item.weight).result;
+        return curr;
+      }, 0);
+    }),
+    /** 总体积 */
+    totalVolume: computed(() => {
+      return details.goodsList.reduce((curr, item) => {
+        if (item.volume) return computeNumber(curr, '+', item.volume).result;
+        return curr;
+      }, 0);
+    }),
+    /** 总运费 */
+    totalFreight: computed(() => {
+      return details.goodsList.reduce((curr, item) => {
+        if (item.subtotalFreight) return computeNumber(curr, '+', item.subtotalFreight).result;
+        return curr;
+      }, 0);
+    }),
+  },
+  /** 暂存单Id集合 */
+  advanceIds: [],
+  /** 货物集合 */
+  goodsList: [
+    {
+      index: 0,
+      /** 货物名称  */
+      goodsName: '',
+      /** 品类Id */
+      goodsId: '',
+      /** 计费方式 */
+      chargeType: 1,
+      /** 件数 */
+      num: 0,
+      /** 重量(kg) */
+      weight: 0,
+      /** 体积(方) */
+      volume: 0,
+      /** 单价 */
+      price: 0,
+      /** 运费小计 */
+      subtotalFreight: 0,
+    },
+  ],
+  options: [],
+  /** 价格模板数据 */
+  priceTemplate: {} as any,
+  /** 车型 */
+  vehicleTypeArr: [],
+  /** 到站地区数组 */
+  regionOptione: [],
+  /** 支付字典 */
+  payOption: [
+    {
+      label: '现金',
+      value: 1,
+    },
+    {
+      label: '银行卡',
+      value: 2,
+    },
+    {
+      label: '微信',
+      value: 3,
+    },
+    {
+      label: '支付宝',
+      value: 4,
+    },
+    {
+      label: '支票',
+      value: 5,
+    },
+    {
+      label: '账本',
+      value: 6,
+    },
+  ],
+  /** 开单付款字典 */
+  paymentOption: [
+    {
+      label: '现付',
+      value: 1,
+    },
+    {
+      label: '到付',
+      value: 2,
+    },
+    {
+      label: '月结',
+      value: 3,
+    },
+    {
+      label: '回付',
+      value: 4,
+    },
+    {
+      label: '内部结算',
+      value: 5,
+    },
+    {
+      label: '多笔付',
+      value: 6,
+    },
+  ],
+  /** 紧急度 */
+  emergencyOption: [
+    {
+      label: '正常',
+      value: 1,
+    },
+    {
+      label: '急',
+      value: 2,
+    },
+    {
+      label: '特急',
+      value: 3,
+    },
+    {
+      label: '加急',
+      value: 4,
+    },
+  ],
+  /** 送货方式字典 */
+  shippingOption: [
+    {
+      label: '自提',
+      value: 1,
+    },
+    {
+      label: '送货',
+      value: 2,
+    },
+    {
+      label: '送货上门',
+      value: 3,
+    },
+    {
+      label: '送货上门(有电梯)',
+      value: 4,
+    },
+    {
+      label: '送货上门(无电梯)',
+      value: 5,
+    },
+    {
+      label: '送货卸货',
+      value: 6,
+    },
+    {
+      label: '送货安装',
+      value: 7,
+    },
+  ],
+  /**  开单回单方式 */
+  receiptOption: [
+    {
+      label: '签回单',
+      value: 1,
+    },
+    {
+      label: '打收条',
+      value: 2,
+    },
+    {
+      label: '签信封',
+      value: 3,
+    },
+    {
+      label: '签回单盖章',
+      value: 4,
+    },
+    {
+      label: '1份回单',
+      value: 5,
+    },
+    {
+      label: '2份回单',
+      value: 6,
+    },
+    {
+      label: '3份回单',
+      value: 7,
+    },
+    {
+      label: '4份回单',
+      value: 8,
+    },
+    {
+      label: '5份回单',
+      value: 9,
+    },
+  ],
+  /** 运输方式 */
+  transportationOption: [
+    {
+      label: '公路快运',
+      value: 1,
+    },
+    {
+      label: '海运',
+      value: 2,
+    },
+    {
+      label: '卡车航班',
+      value: 3,
+    },
+    {
+      label: '空运',
+      value: 4,
+    },
+    {
+      label: '普通汽班',
+      value: 5,
+    },
+    {
+      label: '快递',
+      value: 6,
+    },
+  ],
+  /** 收货方 -- 收货单位 */
+  consigneeOptions: [],
+  /** 收货方 -- 收货人 */
+  consigneeNameOptions: [],
+  /** 收货方 -- 收货电话 */
+  consigneeMobileOptions: [],
+  /** 发货方 -- 收货单位 */
+  shipperOptions: [],
+  /** 收货方 -- 收货人 */
+  shipperNameOptions: [],
+  /** 收货方 -- 收货电话 */
+  shipperMobileOptions: [],
+  /** 必填 */
+  rules: {
+    /** 发站仓名称 */
+    departureWarehouseName: [
+      {
+        required: true,
+        message: '请填写或选择发站仓',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 发站 */
+    departure: [
+      {
+        required: true,
+        message: '请填写或选择发站地',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 到站 */
+    destination: [
+      {
+        required: true,
+        message: '请填写或选择到站地',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 目的站名称 */
+    queryDestinationWarehouseName: [
+      {
+        required: true,
+        message: '请选择目的仓',
+        trigger: ['blur', 'change'],
+      },
+    ],
+    /** 发货单位 */
+    shipper: [
+      {
+        required: true,
+        message: '请选择或输入发货单位',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 发货人 */
+    shipperName: [
+      {
+        required: true,
+        message: '请选择或输入收货人',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 发货人电话 */
+    shipperMobile: [
+      {
+        required: true,
+        message: '请选择或输入发货人电话',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 收货单位 */
+    consignee: [
+      {
+        required: true,
+        message: '请选择或输入收货单位',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 收货人 */
+    consigneeName: [
+      {
+        required: true,
+        message: '请选择或输入收货人',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 收货人电话 */
+    consigneeMobile: [
+      {
+        required: true,
+        message: '请选择或输入收货人电话',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 付款方式 */
+    payWay: [
+      {
+        required: true,
+        message: '请选择付款方式',
+        trigger: ['change'],
+      },
+    ],
+    /** 送货方式 */
+    deliveryWay: [
+      {
+        required: true,
+        message: '请选择送货方式',
+        trigger: ['change', 'blur'],
+      },
+    ],
+    /** 紧急度 */
+    urgency: [
+      {
+        required: true,
+        message: '请选择紧急度',
+        trigger: ['change', 'blur'],
+      },
+    ],
+  },
+  /** 列表 */
+  columnList: deepClone(columnList),
+  /** 列表数据 */
+  haveDataData: [],
+  notHaveDataData: [],
+  /** 页面loading */
+  loadingObj: {
+    loading: false,
+    /** 列表加载loading */
+    haveDataList: false,
+    notHaveDataList: false,
+    /** 配载信息loading */
+    stowageLoading: false,
+    /** 收货方 */
+    consignerLoading: false,
+    /** 提交按钮 */
+    submitLoadingBtn: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 弹窗表格query */
+  tableQuery: {},
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 订单选择 */
+    columnListVisited: false,
+    /** 是否继续开单 */
+    titleVisited: false,
+    /** 改单原因 */
+    causeVisited: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  // 页面请求的问题
+  form: {},
+  /** 修改 -- 深拷贝goodsList, 区别：新增 / 删除 / 修改 */
+  deepCloneGoodsList: [],
+  /** 提交数据 */
+  submitData: {},
+  /** tab标签有无数据 */
+  orderStatus: 'haveData',
+  priceArr: [
+    /** 单价 */
+    { name: '运费', key: 'price' },
+    /** 送货费 */
+    { name: '配送费', key: 'deliveryFee' },
+    // { name: '提货费', key: 'pickupFee' },
+    /** 仓库管理费 */
+    { name: '仓库管理费', key: 'warehouseManagementFee' },
+    /** 仓储费 */
+    { name: '仓库存储费', key: 'storageFee' },
+    /** 装卸费 */
+    // { name: '仓库存储费', key: 'storageFee' },
+  ],
+  /** 提交类型 */
+  submitType: 'haveData' as 'haveData' | 'notHaveData',
+  /** 修改原因 */
+  causeForm: {},
+  /** 修改列表 */
+  changeColumnList: [
+    {
+      prop: 'itemName',
+      label: '修改项',
+      type: 1,
+      values: '',
+      width: '',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'oldValue',
+      label: '修改前',
+      type: 1,
+      values: '',
+      width: '',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+    },
+    {
+      prop: 'newValue',
+      label: '修改后',
+      type: 1,
+      values: '',
+      width: '',
+      checkarr: [],
+      fixed: false,
+      sortable: false,
+    },
+  ],
+  /** 修改数据 */
+  changeData: [],
+});
+
+const info = ref<any>({});
+
+const { query, data, drawerShow, page, loadingObj } = toRefs(details);
+
+// 组件实例
+const consignee = ref();
+const consigneeName = ref();
+const consigneeMobile = ref();
+// 存放收货方节点的数组
+const consigneeNodeList = [consignee, consigneeName, consigneeMobile];
+
+const shipper = ref();
+const shipperName = ref();
+const shipperMobile = ref();
+// 存放发货方节点的数组
+const shipperNodeList = [shipper, shipperName, shipperMobile];
+
+// 货物数组
+const goodsNameRef = ref();
+
+// 合计费用
+const totalCost = computed(() => {
+  const _num = computeNumber(0, '+', details.query.totalFreight || 0)
+    .next('+', details.query.deliveryFee || 0)
+    .next('+', details.query.pickupFee || 0)
+    .next('+', details.query.warehouseManagementFee || 0)
+    .next('+', details.query.storageFee || 0)
+    .next('+', details.query.handlingFee || 0)
+    .next('+', details.query.otherFee || 0)
+    .next('+', details.query.insuranceFee || 0)
+    .next('+', details.query.installFee || 0)
+    .next('+', details.query.claimingValue || 0).result;
+
+  handlePayWay(_num);
+  return _num;
+});
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+
+onMounted(() => {});
+
+// 改单时, 对数据库内到站值进行转译
+const handleTranslationLocation = () => {
+  // 获取数据库中地址值
+  const _location = details.query.destination;
+
+  let _arr = [];
+
+  // 循环查找匹配的到站地址
+  for (const iterator of details.regionOptione) {
+    let isBreak = false;
+
+    if (iterator.label === _location) {
+      _arr = [iterator.value];
+      isBreak = true;
+    } else if (getObjType(iterator.children) === 'array') {
+      for (const item of iterator.children) {
+        if (item.label === _location) {
+          _arr = [iterator.value, item.value];
+          isBreak = true;
+          break;
+        } else if (getObjType(item.children) === 'array') {
+          for (const value of item.children) {
+            if (value.label === _location) {
+              _arr = [iterator.value, item.value, value.value];
+              isBreak = true;
+              break;
+            }
+          }
+        }
+      }
+      if (isBreak) break;
+    }
+
+    if (isBreak) break;
+  }
+
+  details.query.destination = _arr;
+};
+
+// 获取省市区信息
+getLazyTreeAll().then(res => {
+  if (res.data.success) {
+    details.regionOptione = res.data.data;
+
+    if (details.query.destination) handleTranslationLocation();
+  }
+});
+
+/** 获取车型 */
+getDictionaryBiz('price_vehicle_type').then(res => {
+  const { code, data } = res.data;
+  if (code !== 200) return;
+
+  details.vehicleTypeArr = data || [];
+});
+
+/** 初始化获取暂存单转运单信息 */
+const onLoad = async (idsArr = []) => {
+  try {
+    details.query = deepClone(details.deepQuery);
+
+    let ids = [];
+    if (idsArr.length === 0) ids = JSON.parse(details.pageInfo.ids);
+    else ids = idsArr;
+    const res = await getOpenOrderAdvanceToWaybillInfo({ advanceIds: ids });
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    // 存储请求的数据
+    info.value = deepClone(data);
+    for (let key in data) {
+      details.query[key] = data[key] || '';
+    }
+
+    details.query.shipperAddress = data.shipperAddress || '';
+    details.query.consigneeAddress = data.consigneeAddress || '';
+    details.query.shipperId = data.shipperClientId || '';
+    details.query.consigneeId = data.consigneeClientId || '';
+
+    details.query.destination = data.destinationArray;
+    details.query.queryDestinationWarehouseName = data.destinationWarehouseName || '';
+    // 是否提货
+    details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0;
+    // 是否整车 -- 提货
+    details.query.pickupCompleteOrNot = details.query.pickupCompleteOrNot
+      ? details.query.pickupCompleteOrNot
+      : 0;
+    // 是否整车 -- 干线
+    details.query.trunklineCompleteOrNot = details.query.trunklineCompleteOrNot
+      ? details.query.trunklineCompleteOrNot
+      : 0;
+
+    if (data.goodsList.length === 0) {
+      details.goodsList = [
+        {
+          index: 0,
+          /** 货物名称  */
+          goodsName: '',
+          /** 品类Id */
+          goodsId: '',
+          /** 计费方式 */
+          chargeType: 1,
+          /** 件数 */
+          num: 0,
+          /** 重量(kg) */
+          weight: 0,
+          /** 体积(方) */
+          volume: 0,
+          /** 单价 */
+          price: 0,
+          /** 运费小计 */
+          subtotalFreight: 0,
+          /** 货物list */
+          goodsListOptions: [],
+        },
+      ];
+    } else {
+      details.goodsList = data.goodsList.map(val => {
+        val.num = isNumber(val.num) ? Number(val.num) : 0;
+        val.price = isNumber(val.price) ? Number(val.price) : 0;
+        val.volume = isNumber(val.volume) ? Number(val.volume) : 0;
+        val.weight = isNumber(val.weight) ? Number(val.weight) : 0;
+
+        val.chargeType = val.chargeType || 1;
+
+        val.goodsListOptions = [];
+        // 计算运费小计
+        handleComputed(val);
+        // 计算件数最大值
+        return val;
+      });
+    }
+
+    info.value.maxNum = data.totalNum;
+    details.query.goodsCode = '-' + data.totalNum;
+
+    if (data.defaultPayWay) {
+      data.payWay = data.defaultPayWay;
+    } else {
+      details.query.payWay = data.payWayList.find(val => val.dictValue === '到付').dictKey || '2';
+    }
+    details.query.transportType = details.query.transportType || '1';
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    return null;
+  }
+};
+
+/** 获取页面信息 */
+const initPageInfo = async (idsArr = []) => {
+  try {
+    details.loadingObj.submitLoadingBtn = true;
+
+    details.pageInfo = { ...$route.query };
+    if (details.pageInfo.type !== 'edit') await onLoad(idsArr);
+    else {
+      const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id });
+      const { code, data } = res.data;
+      if (code !== 200) return;
+
+      details.query = { ...data, ...data.warehouseWaybill };
+      delete details.query.warehouseWaybill;
+
+      // 是否提货
+      details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0;
+      // 是否整车 -- 提货
+      details.query.pickupCompleteOrNot = details.query.pickupCompleteOrNot
+        ? details.query.pickupCompleteOrNot
+        : 0;
+      // 是否整车 -- 干线
+      details.query.trunklineCompleteOrNot = details.query.trunklineCompleteOrNot
+        ? details.query.trunklineCompleteOrNot
+        : 0;
+
+      details.query.openOrderUserName = details.query.agent;
+      details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
+      details.query.openOrderDate = data.warehouseWaybill.createTime;
+      details.query.orderCode = data.warehouseWaybill.orderNo;
+      details.query.transportType = details.query.transportType ? details.query.transportType : '1';
+      details.query.receipt = data.warehouseWaybill.receipt
+        ? data.warehouseWaybill.receipt.split(',')
+        : [];
+
+      details.query.xianPay = isNumber(data.warehouseWaybill.xpay)
+        ? Number(data.warehouseWaybill.xpay)
+        : data.warehouseWaybill.xpay;
+      details.query.huiPay = isNumber(data.warehouseWaybill.hpay)
+        ? Number(data.warehouseWaybill.hpay)
+        : data.warehouseWaybill.hpay;
+      details.query.yuePay = isNumber(data.warehouseWaybill.ypay)
+        ? Number(data.warehouseWaybill.ypay)
+        : data.warehouseWaybill.ypay;
+      details.query.daoPay = isNumber(data.warehouseWaybill.dpay)
+        ? Number(data.warehouseWaybill.dpay)
+        : data.warehouseWaybill.dpay;
+      // 转译到站
+      if (details.regionOptione.length !== 0) handleTranslationLocation();
+
+      // 初始化goodsList
+      if (data.warehouseWaybill.detailList.length === 0)
+        details.goodsList = [
+          {
+            index: 0,
+            /** 货物名称  */
+            goodsName: '',
+            /** 品类Id */
+            goodsId: '',
+            /** 计费方式 */
+            chargeType: 1,
+            /** 件数 */
+            num: 0,
+            /** 重量(kg) */
+            weight: 0,
+            /** 体积(方) */
+            volume: 0,
+            /** 单价 */
+            price: 0,
+            /** 运费小计 */
+            subtotalFreight: 0,
+            /** 货物名称list */
+            goodsListOptions: [],
+          },
+        ];
+      else {
+        info.value.maxNum = 0;
+        details.deepCloneGoodsList = [];
+        details.goodsList = data.warehouseWaybill.detailList.map(val => {
+          val.num = Number(val.num);
+          val.volume = Number(val.volume);
+          val.weight = Number(val.weight);
+          val.price = Number(val.price);
+          val.subtotalFreight = Number(val.subtotalFreight);
+
+          val.goodsName = val.productName;
+
+          val.goodsListOptions = [];
+
+          // 计算运费小计
+          if (!val.subtotalFreight) handleComputed(val);
+
+          // 计算件数最大值
+          info.value.maxNum += val.num;
+          details.deepCloneGoodsList.push({ ...val });
+          return val;
+        });
+      }
+    }
+
+    const { shipper, shipperName, shipperMobile, consignee, consigneeName, consigneeMobile } =
+      details.query;
+
+    for (let index = 0; index < details.goodsList.length; index++) {
+      const element = details.goodsList[index];
+
+      const { arrPirce } = element;
+      if (arrPirce && arrPirce.length > 0) {
+        // 价格赋值
+        for (let i = 0; i < details.priceArr.length; i++) {
+          const value = details.priceArr[i];
+          element[value.key] = 0;
+
+          for (let index = 0; index < arrPirce.length; index++) {
+            const item = arrPirce[index];
+
+            if (item.itemName === value.name)
+              element[value.key] = isNumber(item.cost) ? Number(item.cost) : 0;
+          }
+        }
+      }
+
+      handleComputed(element);
+      handleFindGoods(element.goodsName, element);
+    }
+
+    if (shipper) handleFindClientInfo('shipper');
+    if (shipperName) handleFindClientInfo('shipperName');
+    if (shipperMobile) handleFindClientInfo('shipperMobile');
+    if (consignee) handleFindClientInfo('consignee');
+    if (consigneeName) handleFindClientInfo('consigneeName');
+    if (consigneeMobile) handleFindClientInfo('consigneeMobile');
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.submitLoadingBtn = false;
+  }
+};
+
+const handleCloseSelcet = () => {
+  shipperNodeList.forEach(val => val.value.handleClose());
+  consigneeNodeList.forEach(val => val.value.handleClose());
+  goodsNameRef.value.forEach(val => val.handleClose());
+};
+
+/** 新增货物 */
+const handleAdd = () => {
+  if (info.value.maxNum <= details.totalObj.totalCount) {
+    ElMessage({
+      message: '件数已用完, 无法再新增',
+      type: 'warning',
+    });
+    return;
+  }
+
+  const _flag = details.goodsList.every(val => {
+    // 件数和名称必填
+    if (val.goodsName === '' || !val.num) {
+      ElMessage({
+        message: '请填写完整件数和名称',
+        type: 'warning',
+      });
+      return false;
+    }
+    if (val.chargeType === 2 && val.volume === 0) {
+      ElMessage({
+        message: '请填写方数',
+        type: 'warning',
+      });
+      return false;
+    }
+    if (val.chargeType === 3 && val.weight === 0) {
+      ElMessage({
+        message: '请填写重量',
+        type: 'warning',
+      });
+      return false;
+    }
+    return true;
+  });
+
+  if (!_flag) return;
+
+  details.goodsList.push({
+    /** 货物名称  */
+    goodsName: '',
+    /** 品类Id */
+    goodsId: '',
+    /** 货物品类 */
+    waybillDetailList: '',
+    /** 计费方式 */
+    chargeType: 1,
+    /** 件数 */
+    num: 0,
+    /** 重量(kg) */
+    weight: 0,
+    /** 体积(方) */
+    volume: 0,
+    /** 单价 */
+    price: 0,
+    /** 运费小计 */
+    subtotalFreight: 0,
+    goodsListOptions: [],
+  });
+};
+
+/** 请求订单数据 */
+const initOrderList = async (params = {}) => {
+  const status = details.orderStatus;
+
+  try {
+    if (status === 'haveData') details.loadingObj.haveDataList = true;
+    else details.loadingObj.notHaveDataList = true;
+
+    params.freezeStatus = '0';
+
+    params.hasPackage = status === 'haveData' ? 1 : 0;
+
+    const res = await getopenOrderAdvancePageList(details.page, {
+      ...details.tableQuery,
+      ...details.form,
+      ...params,
+    });
+    // 获取暂存单列表
+    const { code, data } = res.data;
+    if (code !== 200) return;
+
+    if (status === 'haveData') details.haveDataData = data.records;
+    else details.notHaveDataData = data.records;
+    details.data = data.records;
+    details.page.total = data.total;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    // 开启列表loading动画
+    if (status === 'haveData') details.loadingObj.haveDataList = false;
+    else details.loadingObj.notHaveDataList = false;
+    return null;
+  }
+};
+
+const init = (params = {}) => {
+  details.page.pageNum = 1;
+  details.page.total = 0;
+  initOrderList(params);
+};
+
+/** 开启订单列表 */
+const handleChooseOrder = async () => {
+  try {
+    details.popUpShow.columnListVisited = true;
+    // 开启列表loading动画
+    details.loadingObj.loading = true;
+
+    await init();
+
+    nextTick(() => {
+      const _node = document.querySelector('.el-dialog-columnList .maboxhi');
+      setNodeHeight(_node, '60vh');
+    });
+
+    // return res.data;
+  } catch (error) {
+  } finally {
+    // 开启列表loading动画
+    details.loadingObj.loading = false;
+  }
+};
+
+/** 选择订单 */
+const handleChoose = () => {
+  try {
+    if (details.selectionList.length === 0) {
+      return ElMessage({
+        type: 'warning',
+        message: '请选择一条数据',
+      });
+    }
+
+    const _dealerName = details.selectionList[0].dealerName;
+    const _flag = details.selectionList.every(item => _dealerName === item.dealerName);
+
+    if (!_flag) {
+      return ElMessage({
+        type: 'warning',
+        message: '请选择统一商场开单',
+      });
+    }
+
+    const ids = details.selectionList.map(val => val.id);
+    // 请求页面数据
+    initPageInfo(ids);
+    details.submitType = details.orderStatus;
+    details.popUpShow.columnListVisited = false;
+    details.popUpShow.titleVisited = false;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+  }
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  details.tableQuery[row.prop] = index;
+  init();
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.tableQuery[row.prop] = index;
+  if (!index) {
+    delete details.tableQuery[row.prop];
+  }
+  init();
+};
+
+/** 表格表头输入框搜索 */
+const btnsc = () => {};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  details.tableQuery[row.prop] = index;
+  if (!index) delete details.tableQuery[row.prop];
+  if (row.prop === 'certificateTypeName') {
+    details.query['certificateType'] = index;
+    if (!index) delete details.query['certificateType'];
+  }
+  init();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  initOrderList();
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.pageNum = current;
+  initOrderList();
+};
+
+/** 查看包明细 */
+const handleShowPackageOrderList = ({ row }) => {
+  $router.push({
+    path: '/waybill/orderPackageListDetails?name=包明细',
+    query: {
+      id: row.id,
+      name: `订单 -- ${row.orderCode} 包明细`,
+    },
+  });
+};
+
+/** 移除 */
+const handleRemove = (index: number) => {
+  details.goodsList.splice(index, 1);
+};
+
+/** 查询目的仓 */
+const remoteMethod = val => {
+  debounce(async () => {
+    if (val) {
+      try {
+        details.loadingObj.loading = true;
+        const res = await getOpenOrderAdvanceFindWarehouseList({ warehouseName: val });
+        const { data, code } = res.data;
+        if (code !== 200) return;
+        details.options = data || [];
+      } catch (error) {
+      } finally {
+        details.loadingObj.loading = false;
+      }
+    }
+  }, 500)();
+};
+
+/** 目的仓选择时给目的仓名称赋值 */
+const destinationWarehouseNameChange = val => {
+  const _item = details.options.find(value => value.warehouseId === val);
+  details.query.destinationWarehouseName = _item.warehouseName;
+  details.query.destinationWarehouseId = _item.warehouseId;
+  details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
+};
+
+/** 计算行合计 */
+const handleComputed = (row: any) => {
+  if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result;
+  else if (row.chargeType === 2)
+    row.subtotalFreight = computeNumber(row.volume, '*', row.price).result;
+  else if (row.chargeType === 3)
+    row.subtotalFreight = computeNumber(row.weight, '*', row.price).result;
+
+  row.totalPickupPrice = computeNumber(row.num, '*', row.pickupPrice || 0).result;
+
+  console.log('row :>> ', row);
+
+  handleTrunkLinePrice(details.priceTemplate.trunkLine, details.priceTemplate.template);
+};
+
+/** 查询客户信息 */
+const handleFindClientInfo = async (type, isClearId = 0) => {
+  try {
+    // 是否清除id
+    if (isClearId === 1) {
+      type === 'consignee' ? (details.query.consigneeId = '') : (details.query.shipperId = '');
+    }
+
+    if (!details.query[type]) return (details[type + 'Options'] = []);
+
+    details.loadingObj.consignerLoading = true;
+
+    const nameReg = new RegExp('Name');
+    const MobileReg = new RegExp('Mobile');
+
+    const submitData: any = {};
+    if (nameReg.test(type)) submitData.linkMan = details.query[type];
+    else if (MobileReg.test(type)) submitData.linkPhone = details.query[type];
+    else submitData.clientName = details.query[type];
+
+    const res = await postOpenOrderFindClientInfo(submitData);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details[type + 'Options'] = data || [];
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.consignerLoading = false;
+  }
+};
+
+/** 客户选择 */
+const handleChooseShipper = (column, prop, order) => {
+  // 赋值
+  details.query.shipper = column.clientName;
+  details.query.shipperId = column.clientId;
+  details.query.shipperAddress = column.linkAddress;
+  details.query.shipperName = column.linkMan;
+  details.query.shipperMobile = column.linkPhone;
+
+  handleFindClientInfo('shipper');
+  handleFindClientInfo('shipperName');
+  handleFindClientInfo('shipperMobile');
+  handleCloseSelcet();
+};
+
+/** 收货客户选择 */
+const handleChooseConsigner = (column, prop, order) => {
+  // 赋值
+  details.query.consignee = column.clientName;
+  details.query.consigneeId = column.clientId;
+  details.query.consigneeAddress = column.linkAddress;
+  details.query.consigneeName = column.linkMan;
+  details.query.consigneeMobile = column.linkPhone;
+
+  handleFindClientInfo('consignee');
+  handleFindClientInfo('consigneeName');
+  handleFindClientInfo('consigneeMobile');
+  handleCloseSelcet();
+};
+
+/** 切换tabBar */
+const handleClickAll = e => {
+  const _name = e.props.name;
+  details.orderStatus = _name;
+  init();
+};
+
+/** 返回上一个页面 */
+function back() {
+  $store.commit('DEL_TAG_CURRENT');
+  if (details.pageInfo.backPath) return $router.push(details.pageInfo.backPath);
+  $router.back();
+}
+
+/** 检测支付金额 */
+const handleDetectionPayWay = () => {
+  const minNum = 0;
+  const payType = Number(details.query.payWay);
+  let content = '';
+
+  switch (payType) {
+    // 现付
+    case 1:
+      if (Number(details.query.xianPay) <= minNum) content = '请输入大于0的现付金额';
+      break;
+
+    // 到付
+    case 2:
+      if (Number(details.query.daoPay) <= minNum) content = '请输入大于0的到付金额';
+      break;
+
+    // 月结
+    case 3:
+      if (Number(details.query.yuePay) <= minNum) content = '请输入大于0的月结金额';
+      break;
+
+    // 回付
+    case 4:
+      if (Number(details.query.huiPay) <= minNum) content = '请输入大于0的回付金额';
+      break;
+
+    default:
+      break;
+  }
+
+  return content;
+};
+
+/** 处理付款方式对应费用 */
+const handlePayWay = (number?: number) => {
+  const payType = Number(details.query.payWay);
+  const enumPayType = {
+    1: 'xianPay',
+    2: 'daoPay',
+    3: 'yuePay',
+    4: 'huiPay',
+  };
+
+  for (const key in enumPayType) {
+    const value = enumPayType[key];
+    details.query[value] = 0;
+  }
+
+  const _item = enumPayType[payType];
+
+  if (_item) {
+    details.query[_item] = isNumber(number) ? number : totalCost.value;
+  }
+};
+
+/** 处理提货费用 */
+const handlePickUpPrice = (pickup, template) => {
+  // 是否存在提货费用
+  if (!details.query.isPickUp) return (details.query.pickupFee = 0);
+
+  // 是否存在模板和维护价格
+  if (!pickup || !template) return;
+
+  // 是否整车
+  if (details.query.pickupCompleteOrNot) {
+    // 是否存在模板和维护价格
+    if (!pickup || !template) return (details.query.pickupFee = 0);
+
+    const { fullVehicle } = pickup;
+
+    if (getObjType(fullVehicle) !== 'array') return;
+
+    let item = {};
+
+    for (let i = 0; i < fullVehicle.length; i++) {
+      const value = fullVehicle[i];
+
+      if (Number(value.vehicleType) !== Number(details.query.pickupVehicleType)) continue;
+      item = value;
+      break;
+    }
+
+    details.query.pickupFee = details.query.pickupFee ? details.query.pickupFee : item.price || 0;
+  } else {
+    // 非整车
+    let _total = 0;
+
+    for (let i = 0; i < details.goodsList.length; i++) {
+      _total += computeNumber(_total, '+', details.goodsList[i].totalPickupPrice || 0).result;
+    }
+
+    details.query.pickupFee = _total;
+  }
+};
+
+/** 处理干线费用 */
+const handleTrunkLinePrice = (trunkLine, template) => {
+  // 是否整车
+  if (details.query.trunklineCompleteOrNot) {
+    // 是否存在模板和维护价格
+    if (!trunkLine || !template) return;
+
+    const { fullVehicle } = trunkLine;
+
+    if (getObjType(fullVehicle) !== 'array') return;
+
+    let item: any = {};
+
+    for (let i = 0; i < fullVehicle.length; i++) {
+      const value = fullVehicle[i];
+
+      if (Number(value.vehicleType) !== Number(details.query.trunklineVehicleType)) continue;
+      item = value;
+      break;
+    }
+
+    details.query.totalFreight = details.query.totalFreight
+      ? details.query.totalFreight
+      : item.price || 0;
+  } else {
+    // 非整车
+    let _total = 0;
+
+    for (let i = 0; i < details.goodsList.length; i++) {
+      const value = details.goodsList[i];
+      if (value.subtotalFreight) _total += computeNumber(_total, '+', value.subtotalFreight).result;
+    }
+
+    // 是否存在最低计费
+    if ((trunkLine || template) && template.trunklineIsMinCost) {
+      switch (Number(template.trunklineMinCostType)) {
+        // 价格
+        case 1:
+          details.query.totalFreight = template.minCost > _total ? template.minCost : _total;
+          break;
+
+        // 件
+        case 2:
+          details.query.totalFreight =
+            template.minCost > details.totalObj.totalCount
+              ? _total + (template.additionalCost || 0)
+              : _total;
+          break;
+
+        // 方
+        case 3:
+          details.query.totalFreight =
+            template.minCost > details.totalObj.totalVolume
+              ? _total + (template.additionalCost || 0)
+              : _total;
+          break;
+
+        // 重量
+        case 4:
+          details.query.totalFreight =
+            template.minCost > details.totalObj.totalFreight
+              ? _total + (template.additionalCost || 0)
+              : _total;
+          break;
+
+        default:
+          break;
+      }
+    } else details.query.totalFreight = _total;
+  }
+};
+
+/** 处理配送费 */
+const handleDispatchPrice = (dispatch, template) => {
+  // 是否存在模板和维护价格
+  if (!dispatch || !template) return;
+};
+
+/** 处理模板费用 */
+const handlePrice = () => {
+  const { dispatch, pickup, template, trunkLine } = details.priceTemplate;
+
+  /** 处理提货费用 */
+  handlePickUpPrice(pickup, template);
+  /** 处理干线费用 */
+  handleTrunkLinePrice(trunkLine, template);
+  /** 处理配送费 */
+  handleDispatchPrice(dispatch, template);
+};
+
+/** 重置值 */
+const handleRefreshText = (key, value, refreshValue?: string | number) => {
+  if (value) return;
+  query.value[key] = refreshValue ? refreshValue : '';
+};
+
+/** 重置数据 */
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.resetFields();
+  details.goodsList = [
+    {
+      index: 0,
+      /** 货物名称  */
+      goodsName: '',
+      /** 品类Id */
+      goodsId: '',
+      /** 计费方式 */
+      chargeType: 1,
+      /** 件数 */
+      num: 0,
+      /** 重量(kg) */
+      weight: 0,
+      /** 体积(方) */
+      volume: 0,
+      /** 单价 */
+      price: 0,
+      /** 运费小计 */
+      subtotalFreight: 0,
+      goodsListOptions: [],
+    },
+  ];
+  initPageInfo();
+};
+
+/** 提交 */
+const handleSubmit = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.validate(async valid => {
+    if (!valid) return false;
+    try {
+      // 开启loading
+      details.loadingObj.submitLoadingBtn = true;
+
+      // 检测货物名称和件数是否正确填写
+      const _flag = details.goodsList.every(val => {
+        if (!val.goodsName || !isNumber(val.num) || val.num === 0) return false;
+        return true;
+      });
+
+      if (!_flag) {
+        return ElMessage({
+          type: 'warning',
+          message: '请填写正确的货物名称和件数',
+        });
+      }
+
+      const submitData = {
+        ...details.query,
+        waybillDetailList: details.goodsList,
+        advanceIds: info.value.advanceIds,
+        ...details.totalObj,
+        huilaiPay: 1,
+        addList: [],
+        removeList: [],
+      };
+
+      submitData.customerTrain = details.query.trainNumber;
+
+      const { destination } = submitData;
+
+      if (destination.length === 1) {
+        return ElMessage({ message: '请选择正确到站地址', type: 'warning' });
+      }
+
+      // 筛选到站
+      const _findeLocation = details.regionOptione
+        .find(val => val.value === destination[0])
+        .children.find(val => val.value === destination[1]);
+
+      let _item: any = {};
+      if (destination.length === 2) {
+        _item = _findeLocation;
+      } else {
+        _item = _findeLocation.children.find(val => val.value === destination[2]);
+      }
+
+      submitData.destination = _item.label;
+      submitData.destinationCode = _item.value;
+
+      let numFlag = false;
+
+      for (const iterator of details.goodsList) {
+        if (iterator.subtotalFreight <= 0 || !iterator.subtotalFreight) {
+          numFlag = true;
+          break;
+        }
+      }
+
+      if (numFlag) return ElMessage.warning('小计费用存在异常');
+
+      const _content = handleDetectionPayWay();
+      if (_content) return ElMessage.warning(_content);
+      submitData.goodsName = submitData.waybillDetailList.map(val => val.goodsName).join(',');
+
+      let res: any = {};
+      // 新增提交
+      if (details.pageInfo.type !== 'edit') {
+        submitData.addList = details.goodsList;
+        submitData.removeList = [];
+
+        delete submitData.goodsList;
+
+        submitData.waybillType = 1;
+        if (typeof submitData.receipt === 'object')
+          submitData.receipt = submitData.receipt.join(',');
+
+        // 记录提交参数
+        details.submitData = submitData;
+
+        // 有数据开单
+        if (details.submitType === 'haveData') res = await postOpenOrderOpenWaybill(submitData);
+        else {
+          submitData.waybillType = 2;
+
+          res = await postOpenOrderOpenZeroWaybill(submitData);
+        }
+      } else {
+        submitData.waybillId = details.pageInfo.id;
+
+        const oldGoodsList = [...details.deepCloneGoodsList];
+
+        for (let iterator of details.goodsList) {
+          // 查看每一项是否存在Id updateType: 1新增; 2修改
+          if (iterator.id) {
+            // 存在则证明为老数据
+
+            // 根据存在的数据, 筛选被删除的数据
+            const _item = oldGoodsList.splice(
+              oldGoodsList.findIndex(val => val.id === iterator.id),
+              1
+            );
+
+            // 检测是否被修改
+            let _flag = false;
+
+            for (const key in iterator) {
+              _flag = iterator[key] !== _item[key];
+              // 检测到不一致则退出循环
+              if (_flag) break;
+            }
+
+            if (_flag) submitData.addList.push({ ...iterator, updateType: 2 });
+          } else {
+            submitData.addList.push({ ...iterator, updateType: 1 });
+          }
+        }
+
+        submitData.removeList = oldGoodsList;
+
+        delete submitData.goodsList;
+
+        submitData.waybillType = 1;
+        if (typeof submitData.receipt === 'object')
+          submitData.receipt = submitData.receipt.join(',');
+
+        // 记录提交参数
+        details.submitData = submitData;
+        const response = await postUpdateWaybillVerify(submitData);
+        if (response.data.code !== 200) return;
+
+        if (!response.data.data || response.data.data.length === 0)
+          return ElMessage.warning('没有更改的数据');
+
+        details.changeData = response.data.data;
+        details.popUpShow.causeVisited = true;
+        await nextTick();
+
+        setNodeHeight(tableNode.value.$el, '40vh');
+
+        // ElMessageBox.alert(response.data.data.replaceAll(';', ' <br /> '), '被更改数据', {
+        //   dangerouslyUseHTMLString: true,
+        //   confirmButtonText: '确认',
+        //   callback: async (action: Action) => {
+        //     try {
+        //       details.loadingObj.submitLoadingBtn = true;
+
+        //       const res = await postUpdateWaybill(submitData);
+        //       const { code, msg } = res.data;
+        //       if (code !== 200) return;
+        //       if (msg) ElMessage.success(msg);
+
+        //       back();
+        //     } catch (error) {
+        //       console.log('error :>> ', error);
+        //     } finally {
+        //       details.loadingObj.submitLoadingBtn = false;
+        //     }
+        //   },
+        // });
+      }
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      if (msg) ElMessage.success(msg);
+
+      // 开启提示框, 是否继续开单
+      if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true;
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      $store.commit('EDIT_REFRESHITEM', { title: 'TemporaryStorageList', status: true });
+      details.loadingObj.submitLoadingBtn = false;
+    }
+  });
+};
+
+/** 重复开单 */
+const handleRepetition = () => {
+  handleChooseOrder();
+  resetForm(ruleFormRef.value);
+};
+
+/** 查询货物 */
+const handleFindGoods = async (goodsName, item, isClearId = 0) => {
+  if (isClearId) item.goodsId = '';
+
+  if (!goodsName) return (item.goodsListOptions = []);
+
+  try {
+    item.loading = true;
+    const res = await postFindCategoryInfo({ goodsName });
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+    item.goodsListOptions = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    item.loading = false;
+  }
+};
+
+/** 转译始发地和目的地
+ * @param {Array} 循环数组
+ * @param {String} province 省
+ * @param {String} city 市
+ * @param {String} region 区
+ */
+const handleTranslation = (province, city, region) => {
+  let name = [];
+
+  for (let i = 0; i < details.regionOptione.length; i++) {
+    const value = details.regionOptione[i];
+
+    if (value.value !== province + '') continue;
+    name.push(value.value);
+
+    if (!value.children || value.children.length === 0) return name;
+
+    for (let index = 0; index < value.children.length; index++) {
+      const element = value.children[index];
+
+      if (element.value !== city + '') continue;
+      name.push(element.value);
+
+      if (!element.children || element.children.length === 0) return name;
+
+      for (let j = 0; j < element.children.length; j++) {
+        const item = element.children[j];
+
+        if (item.value === region + '') {
+          name.push(item.value);
+          break;
+        }
+      }
+      break;
+    }
+    break;
+  }
+
+  return name;
+};
+
+/** 价格赋值 */
+const handleAssignmentItemPrice = value => {
+  // 处理品类费用
+  const { pickup, template, trunkLine } = details.priceTemplate;
+
+  // 干线
+  if (trunkLine && template) {
+    const { pieceCategory, cubeCategory, weightCategory } = trunkLine;
+
+    // 是否区分品类
+    if (template.trunklineIsByCategory) {
+      // 品类是否存在id
+      if (!value.goodsId) value.price = 0;
+      else {
+        let _item: any = {};
+        // 件
+        if (getObjType(pieceCategory) === 'array') {
+          for (let j = 0; j < pieceCategory.length; j++) {
+            const item = pieceCategory[j];
+
+            if (item.categoryId !== value.goodsId) continue;
+            _item = item;
+
+            _item.chargeType = 1;
+            break;
+          }
+        }
+
+        // 方
+        if (getObjType(cubeCategory) === 'array' && !_item.chargeType) {
+          for (let j = 0; j < cubeCategory.length; j++) {
+            const item = cubeCategory[j];
+
+            if (item.categoryId !== value.goodsId) continue;
+            _item = item;
+
+            _item.chargeType = 2;
+            break;
+          }
+        }
+
+        // 重量
+        if (getObjType(weightCategory) === 'array' && !_item.chargeType) {
+          for (let j = 0; j < weightCategory.length; j++) {
+            const item = weightCategory[j];
+
+            if (item.categoryId !== value.goodsId) continue;
+            _item = item;
+
+            _item.chargeType = 3;
+            break;
+          }
+        }
+
+        if (!_item.chargeType) value.price = 0;
+        else {
+          value.chargeType = _item.chargeType;
+          value.price = _item.price;
+        }
+      }
+    } else {
+      // 不区分品类
+      switch (value.chargeType) {
+        // 件
+        case 1:
+          value.price =
+            getObjType(pieceCategory) === 'array' && pieceCategory.length > 0
+              ? pieceCategory[0].price || 0
+              : 0;
+          break;
+
+        // 方
+        case 2:
+          value.price =
+            getObjType(cubeCategory) === 'array' && cubeCategory.length > 0
+              ? cubeCategory[0].price || 0
+              : 0;
+          break;
+
+        // 公斤
+        case 3:
+          value.price =
+            getObjType(weightCategory) === 'array' && weightCategory.length > 0
+              ? weightCategory[0].price || 0
+              : 0;
+          break;
+
+        default:
+          break;
+      }
+    }
+    // 是否为区分品类
+  } else value.price = 0;
+
+  // 提货
+  if (pickup && template) {
+    const { pieceCategory } = pickup;
+    // 是否区分品类
+    if (template.pickupIsByCategory) {
+      // 品类是否存在id
+      if (!value.goodsId) value.pickupPrice = 0;
+      else {
+        let _item: any = {};
+        // 件
+        if (getObjType(pieceCategory) === 'array') {
+          for (let j = 0; j < pieceCategory.length; j++) {
+            const item = pieceCategory[j];
+
+            if (item.categoryId !== value.goodsId) continue;
+            _item = item;
+
+            _item.chargeType = 1;
+            break;
+          }
+        }
+
+        value.pickupPrice = _item.chargeType ? _item.price : 0;
+      }
+    } else {
+      value.pickupPrice =
+        getObjType(pieceCategory) === 'array' && pieceCategory.length > 0
+          ? pieceCategory[0].price || 0
+          : 0;
+    }
+  } else value.pickupPrice = 0;
+
+  // 计算每行价格
+  handleComputed(value);
+};
+
+/** 获取价格 */
+const handleFindPrice = async () => {
+  try {
+    if (!details.query.brandId || !details.query.consigneeId) return;
+    let startArea = [];
+    let endArea = [];
+
+    details.query.departure && (startArea = handleTranslation(...details.query.departure));
+    details.query.destination && (endArea = handleTranslation(...details.query.destination));
+
+    const submitData = {
+      // 品牌
+      brandId: details.query.brandId,
+      // 收货方
+      clientId: details.query.consigneeId,
+      // 发货方
+      sendOrgId: details.query.shipperId,
+      // 发站
+      startProvinceId: startArea[0],
+      startCityId: startArea[1],
+      startCountyId: startArea[2],
+      // 到站
+      endProvinceId: endArea[0],
+      endCityId: endArea[1],
+      endCountyId: endArea[2],
+    };
+
+    console.log('submitData :>> ', submitData);
+
+    const res = await postFindArrPrice(submitData);
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+
+    details.priceTemplate = data || {};
+
+    // 赋值
+    for (let i = 0; i < details.goodsList.length; i++) {
+      handleAssignmentItemPrice(details.goodsList[i]);
+    }
+  } catch (error) {
+    console.log('error :>> ', error);
+  }
+};
+
+/** 选择货物 */
+const handleChooseGoods = (item, val) => {
+  // if (item.id)
+  let message = '';
+  for (let i = 0; i < details.goodsList.length; i++) {
+    const value = details.goodsList[i];
+
+    if (value.goodsId === val.goodsId) {
+      message = '该货物已添加';
+      break;
+    }
+  }
+
+  if (message) {
+    // item.goodsName = '';
+    return ElMessage.warning(message);
+  }
+
+  item.goodsName = val.goodsName;
+  item.goodsId = val.goodsId;
+  handleAssignmentItemPrice(item);
+  handleCloseSelcet();
+};
+
+details.deepQuery = deepClone(details.query);
+
+details.orderStatus = $route.query.orderStatus;
+details.submitType = $route.query.orderStatus;
+
+initPageInfo();
+
+/** 改单提交 */
+const handleSubmitCause = () => {
+  causeFormRef.value.validate(async valid => {
+    if (!valid) return;
+
+    const submitData = { ...details.submitData, ...details.causeForm };
+    for (let i = 0; i < details.query.editWaybillReasonTypeList.length; i++) {
+      const value = details.query.editWaybillReasonTypeList[i];
+
+      if (value.dictKey !== details.causeForm.editResonCode) continue;
+
+      submitData.editReson = value.dictValue;
+      break;
+    }
+
+    try {
+      details.loadingObj.submitLoadingBtn = true;
+      details.popUpShow.causeVisited = false;
+
+      const res = await postUpdateWaybill(submitData);
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      if (msg) ElMessage.success(msg);
+
+      back();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.submitLoadingBtn = false;
+    }
+  });
+};
+
+// watch(
+//   $route,
+//   async () => {
+//     if ($route.path !== '/distribution/inventory/CreateOrder') return;
+//     // 深拷贝基础数据
+//     details.deepQuery = deepClone(details.query);
+
+//     details.orderStatus = $route.query.orderStatus;
+
+//     initPageInfo();
+//   },
+//   { immediate: true }
+// );
+</script>
+
+<style scoped lang="scss">
+$borderColor: #172e60;
+$borderType: 1px solid $borderColor;
+
+.table_form {
+  :deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
+    height: 100% !important;
+  }
+
+  :deep(.el-input__wrapper) {
+    box-shadow: none;
+    border-bottom: 1px solid $borderColor;
+    border-radius: 0;
+  }
+}
+:deep(.table_form .el-form-item) {
+  flex: 1 !important;
+  margin: 0 !important;
+}
+
+.border-left {
+  border-left: $borderType;
+}
+
+// 页面字体大小
+.avue-crud {
+  font-size: 12px !important;
+}
+
+.form_top {
+  margin-bottom: 10px;
+}
+
+.border-top {
+  border-top: $borderType;
+}
+
+.table-row {
+  width: 100%;
+  display: flex;
+  // border-top: 1px dashed  $borderColor;
+  border-left: $borderType;
+  border-bottom: none;
+  box-sizing: border-box;
+
+  .title {
+    width: fit-content;
+    flex: none;
+    padding: 0 20px;
+    font-size: 0.9rem;
+    background: var(--el-color-primary);
+    color: #fff;
+  }
+
+  .flex-a {
+    display: flex;
+    width: 100%;
+    justify-content: space-around;
+  }
+
+  &:first-child {
+    display: block;
+    border-top: $borderType;
+    border-left: $borderType;
+
+    > div {
+      width: 100%;
+      border: none;
+    }
+  }
+
+  &:last-child {
+    display: block;
+    border-bottom: $borderType;
+    border-right: $borderType;
+    box-sizing: border-box;
+
+    > div {
+      width: 100%;
+      border: none;
+    }
+  }
+
+  > div {
+    flex: 1;
+    padding: 5px;
+    border-bottom: $borderType;
+    border-right: $borderType;
+    display: inline-flex;
+    box-sizing: border-box;
+  }
+}
+
+.table-row-title {
+  background: #f5f7fa;
+  margin-right: 10px;
+  padding: 10px;
+
+  & + div {
+    flex: 1;
+
+    :deep(.el-form-item) {
+      flex: 1;
+      margin-right: 10px;
+    }
+
+    :deep(.el-row) {
+      margin-bottom: 10px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+
+.table-row-title-item {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+
+  // &::before {
+  //   content: '';
+  //   display: block;
+  //   width: 2px;
+  //   height: 25px;
+  //   background-color: var(--el-color-primary);
+  //   margin-right: 10px;
+  // }
+}
+
+.table_row_number {
+  > div {
+    flex-grow: 1;
+    justify-content: center;
+  }
+}
+
+.table_row_total {
+  line-height: 32px;
+  text-align: center;
+  background: #efefef;
+}
+
+.flex-c {
+  display: flex;
+  align-items: center;
+}
+
+:deep(.el-select.m-2) {
+  width: 100%;
+}
+
+:deep(.el-radio) {
+  margin: 0;
+}
+
+:deep(.el-form-item__error) {
+  z-index: 99;
+  --el-color-danger: #f00;
+}
+
+:deep(.el-form-item.is-error .el-input__wrapper) {
+  --el-color-danger: #f00;
+}
+
+:deep(
+    .el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before,
+    .el-form-item.is-required:not(.is-no-asterisk).asterisk-left
+      > .el-form-item__label-wrap
+      > .el-form-item__label:before
+  ) {
+  --el-color-danger: #f00;
+}
+
+// 底部
+.footer {
+  height: 80px;
+}
+
+// 提交按钮容器
+.submitDataContainer {
+  width: 80%;
+  position: fixed;
+  bottom: 20px;
+  z-index: 999;
+  text-align: center;
+}
+
+.w100 {
+  width: 100%;
+}
+
+.mt15 {
+  margin-top: 15px;
+}
+
+.mt20 {
+  margin-top: 20px;
+  color: var(--el-color-primary);
+}
+
+.red {
+  color: var(--token-simulation-red-base-62);
+}
+
+:deep(.el-divider__text.is-center) {
+  font-size: 28px;
+}
+
+.overflow {
+  overflow: hidden;
+}
+
+:deep(.el-form-item__label) {
+  color: var(--el-color-primary);
+  font-weight: bold;
+}
+
+.fwb {
+  display: flex;
+  align-items: center;
+  font-weight: bold;
+  color: var(--el-color-danger) !important;
+  position: relative;
+
+  &::before {
+    content: '';
+    margin-right: 10px;
+    display: block;
+    width: 2px;
+    height: 1rem;
+    background: #f00;
+  }
+}
+
+.goodsNameRow {
+  background: #fff;
+  transition: all 0.3s;
+  padding: 10px 0;
+  cursor: pointer;
+
+  &:hover {
+    background: #f5f7fa;
+  }
+
+  &.active {
+    background: #f5f7fa;
+  }
+}
+
+.is-error {
+  :deep(.el-input__wrapper) {
+    border-color: #f00 !important;
+  }
+
+  :deep(.el-input__inner) {
+    color: #f00 !important;
+  }
+}
+</style>
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 915f5b8a..da77ec06 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -427,9 +427,38 @@ const onLoad = async (page?: any, params = {}) => {
     console.log('res :>> ', res);
     const { code, data } = res.data;
     if (code !== 200) return;
+
+    // 转译
+    const _translationArr = [];
+
+    for (let i = 0; i < details.columnList.length; i++) {
+      const value = details.columnList[i];
+
+      if (value.type === 3) _translationArr.push(value);
+    }
+
     details.data = data.records;
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      for (let index = 0; index < _translationArr.length; index++) {
+        const item = _translationArr[index];
+
+        for (let j = 0; j < item.checkarr.length; j++) {
+          const val = item.checkarr[j];
+
+          if (Number(value[item.prop.replace('Name', '')]) !== val.value) continue;
+          value[item.prop] = val.label;
+          break;
+        }
+      }
+    }
+
+    console.log('details.data :>> ', details.data);
     details.page.total = data.total;
   } catch (error) {
+    console.log('error :>> ', error);
   } finally {
     details.loadingObj.list = false;
   }