diff --git a/src/api/distribution/arteryDistrilbutionBillLadingList.js b/src/api/distribution/arteryDistrilbutionBillLadingList.js
index d5d6a502..13dc43dc 100644
--- a/src/api/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/api/distribution/arteryDistrilbutionBillLadingList.js
@@ -153,3 +153,14 @@ export const postFindWaybillBillladingList = data => {
     data,
   });
 };
+
+/**
+ * 查询提货日志
+ */
+export const postFindBillladingLogList = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/findBillladingLogList',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/api/waybill/WaybillOrderList.js b/src/api/waybill/WaybillOrderList.js
index 264d4985..c740037b 100644
--- a/src/api/waybill/WaybillOrderList.js
+++ b/src/api/waybill/WaybillOrderList.js
@@ -27,7 +27,7 @@ export const postSaveWaybillReturn = data => {
 };
 
 /**
- * 上传回单
+ * 打印运单
  */
 export const postPrintBatch = params => {
   return request({
@@ -36,3 +36,36 @@ export const postPrintBatch = params => {
     params,
   });
 };
+
+/**
+ * 批量作废
+ */
+export const postAbolishWaybill = data => {
+  return request({
+    url: '/api/logpm-trunkline/openOrder/abolishWaybill',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 批量冻结
+ */
+export const postFreezeWaybill = data => {
+  return request({
+    url: '/api/logpm-trunkline/openOrder/freezeWaybill',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 批量恢复
+ */
+export const postUnFreezeWaybill = data => {
+  return request({
+    url: '/api/logpm-trunkline/openOrder/unFreezeWaybill',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 35dee326..b5ea54d2 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -54,7 +54,7 @@
               clearable
               :placeholder="`请输入${column.label}`"
               @change="inputchange($event, column)"
-              @keyup.enter="handleInput($event, column)"
+              @keyup.enter="handleInput"
             />
             <el-select
               v-if="column.type == 3 || column.type == 14"
@@ -75,10 +75,9 @@
             <el-date-picker
               v-model="column.values"
               v-if="column.type == 4"
-         
               type="date"
               clearable
-              style="width: auto;height:23px !important"
+              style="width: auto; height: 23px !important"
               :placeholder="`请选择${column.label}`"
               @change="timechange($event, column)"
             />
@@ -87,7 +86,7 @@
               v-if="column.type == 5"
               type="datetime"
               clearable
-              style="width: auto;"
+              style="width: auto"
               size="default"
               :placeholder="`请选择${column.label}`"
               format="YYYY/MM/DD HH:mm:ss"
@@ -358,7 +357,7 @@ let props = defineProps({
     default: false,
   },
   initFn: {
-    type: Function as PropType<Function>,
+    type: (Boolean as PropType<boolean>) || (Function as PropType<Function>),
     required: false,
     default: false,
   },
@@ -555,7 +554,6 @@ const handleSelectionChange = (param: TableDataType[]) => {
     } catch (error) {
       console.log('error :>> ', error);
     } finally {
-      console.log('123 :>> ', param);
       emit('selection', param);
     }
   }, 50);
@@ -571,7 +569,6 @@ const handleUserSelcet = list => {
     for (const item of props.tableData) {
       if (item === iterator) _flag = true;
 
-      console.log('_flag :>> ', _flag);
       if (_flag) break;
     }
   }
@@ -855,8 +852,7 @@ defineExpose({ handleCheckSelect, handleClearSelect });
 .el-table__body tr.hover-row > td {
   background-color: #d3d8e1 !important;
 }
-:deep(.el-date-editor.el-input,
-.el-date-editor.el-input__wrapper) {
+:deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
   height: 23px;
 }
 .copys {
diff --git a/src/option/waybill/WarehousingByTrainNumber.js b/src/option/waybill/WarehousingByTrainNumber.js
index 835d06d6..340c1dbd 100644
--- a/src/option/waybill/WarehousingByTrainNumber.js
+++ b/src/option/waybill/WarehousingByTrainNumber.js
@@ -18,7 +18,7 @@ export const columnList = [
   {
     prop: 'orderCode',
     label: '订单自编号',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -90,7 +90,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'legacyStatus',
+    prop: 'legacyStatusName',
     label: '是否遗留',
     type: 3,
     values: '',
@@ -153,7 +153,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'matingType',
+    prop: 'matingTypeName',
     label: '是否齐套',
     type: 3,
     values: '',
@@ -218,7 +218,7 @@ export const columnList = [
   {
     prop: 'createTime',
     label: '创建时间',
-    type: 1,
+    type: 4,
     values: '',
     width: '130',
     checkarr: [],
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index 6066bfbb..e10fc3f8 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -635,6 +635,78 @@ export const columnList = [
     isshowSummary: false,
     sortable: true,
   },
+  {
+    prop: 'freezeStatusName',
+    label: '是否冻结',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '是', value: '1' },
+      { label: '否', value: '0' },
+    ],
+    fixed: false,
+    isshowSummary: false,
+    sortable: true,
+  },
+  {
+    prop: 'freezeUserName',
+    label: '冻结人',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: false,
+    sortable: true,
+  },
+  {
+    prop: 'freezeTime',
+    label: '冻结时间',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: false,
+    sortable: true,
+  },
+  {
+    prop: 'abolishStatusName',
+    label: '是否作废',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '是', value: '1' },
+      { label: '否', value: '0' },
+    ],
+    fixed: false,
+    isshowSummary: false,
+    sortable: true,
+  },
+  {
+    prop: 'abolishUserName',
+    label: '作废人',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: false,
+    sortable: true,
+  },
+  {
+    prop: 'abolishTime',
+    label: '作废时间',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: false,
+    sortable: true,
+  },
   /*   {
     prop: 'carrierName',
     label: '审核状态',
diff --git a/src/utils/util.js b/src/utils/util.js
index 07b4a9f3..5f9eb052 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -3,6 +3,7 @@ import sha256 from 'crypto-js/sha256';
 import Base64 from 'crypto-js/enc-base64';
 import store from '@/store/index';
 import { nextTick } from 'vue';
+import dayjs from 'dayjs';
 //表单序列化
 export const serialize = data => {
   let list = [];
@@ -674,8 +675,7 @@ export function checkParams(data, targetParam) {
   }
 }
 
-/**
- * 去除表格表头搜索框的值
+/** 去除表格表头搜索框的值
  * @param {Array} tableColumnList
  * @returns
  */
@@ -688,8 +688,7 @@ export function handleClearTableQuery(tableColumnList) {
   }
 }
 
-/**
- * 文本换行
+/** 文本换行
  * @param {string} className 类名
  * @param {number} num 多少字进行换行
  * @returns
@@ -716,8 +715,7 @@ export function hanleTextLineFeed(className, num) {
   }
 }
 
-/**
- * 转译数据中下拉框的值
+/** 转译数据中下拉框的值
  * @param {Array} data
  * @param {Array} columnList
  * @param {Function} fn 执行的函数
@@ -727,7 +725,9 @@ export function handleTranslationDataSeclect(data, columnList, fn = (value, item
     return console.log('columnList 参数类型错误 >>>', columnList);
   if (getObjType(data) !== 'array') return console.log('data 参数类型错误 >>>', data);
 
-  const filterArr = columnList.filter(val => val.type === 3);
+  const filterArr = columnList.filter(
+    val => getObjType(val.checkarr) === 'array' && val.checkarr.length > 0
+  );
 
   for (let i = 0; i < data.length; i++) {
     const value = data[i];
@@ -749,3 +749,137 @@ export function handleTranslationDataSeclect(data, columnList, fn = (value, item
     }
   }
 }
+/** 处理表格输入框查询条件
+ * @param {*} value 输入的值
+ * @param {object} col 每列的配置
+ * @param {object} query 存储查询条件的对象
+ * @param {Boolean} isRegExp 是否将输入的值转换为正则表达式
+ * @returns
+ */
+export const handleInputQuery = (value, col, query, isRegExp = false) => {
+  if (getObjType(query) !== 'object') return;
+  if (getObjType(col) !== 'object') return;
+  if (!value && value !== 0) {
+    delete query[col.prop];
+    return;
+  }
+
+  const _value = isRegExp ? new RegExp('^' + value) : value;
+  query[col.prop] = _value;
+};
+
+/** 处理表格下拉框查询条件
+ * @param {*} value 下拉框选择的值
+ * @param {object} col 每列的配置
+ * @param {object} query 存储查询条件的对象
+ * @returns
+ */
+export const handleSelectQuery = (value, col, query) => {
+  if (getObjType(query) !== 'object') return;
+  if (getObjType(col) !== 'object') return;
+
+  const _key = col.prop.replace('Name', '');
+
+  if (!value && value !== 0) {
+    delete query[_key];
+    return;
+  }
+
+  query[_key] = value;
+};
+
+/** 处理表格下拉框查询条件
+ * @param {*} value 下拉框选择的值
+ * @param {object} col 每列的配置
+ * @param {object} query 存储查询条件的对象
+ * @returns
+ */
+export const handleTimeQuery = (value, col, query) => {
+  if (getObjType(query) !== 'object') return;
+  if (getObjType(col) !== 'object') return;
+
+  if (!value && value !== 0) {
+    delete query[col.prop];
+    return;
+  }
+
+  query[col.prop] = dayjs(value).format('YYYY-MM-DD');
+};
+
+/** 前端筛选数据
+ * @param {Array} data 所有数据
+ * @param {any} renderData 渲染数据
+ * @param {Object} option inputQuery -- 输入框查询条件, selectQuery -- 下拉框查询条件, timeQuery -- 时间查询条件
+ * @returns
+ */
+export const handleFilterData = (data, renderData, { inputQuery, selectQuery, timeQuery }) => {
+  const newData = [];
+
+  let isReturn = true;
+
+  if (getObjType(inputQuery) === 'object' && Object.keys(inputQuery).length > 0) isReturn = false;
+
+  if (isReturn && getObjType(selectQuery) === 'object' && Object.keys(selectQuery).length > 0)
+    isReturn = false;
+
+  if (isReturn && getObjType(timeQuery) === 'object' && Object.keys(timeQuery).length > 0)
+    isReturn = false;
+
+  if (isReturn) return (renderData.value = data);
+
+  for (let i = 0; i < data.length; i++) {
+    const element = data[i];
+
+    let _flag = true;
+
+    // 筛选输入框
+    for (const key in inputQuery) {
+      if (!_flag) break;
+      if (!inputQuery[key].test(element[key])) {
+        _flag = false;
+        break;
+      }
+    }
+
+    // 筛选下拉框
+    for (const key in selectQuery) {
+      if (!_flag) break;
+      if (element[key] + '' !== selectQuery[key] + '') {
+        _flag = false;
+        break;
+      }
+    }
+
+    // 筛选时间
+    for (const key in timeQuery) {
+      if (!_flag) break;
+
+      const value = timeQuery[key];
+      if (!value) continue;
+
+      const type = getObjType(value);
+
+      let _startTime = 0;
+      let _endTime = 0;
+
+      if (type === 'string') {
+        _startTime = Date.parse(value);
+        _endTime = Date.parse(value) + 1000 * 60 * 60 * 24 - 1;
+      } else if (type === 'array') {
+        _startTime = Date.parse(value[0]);
+        _endTime = Date.parse(value[1]) + 1000 * 60 * 60 * 24 - 1;
+      } else continue;
+
+      const _time = Date.parse(element[key.replace('Arr', '')]);
+
+      if (_time !== _time) _flag = false;
+      else if (_time < _startTime || _time > _endTime) _flag = false;
+
+      if (!_flag) break;
+    }
+
+    if (_flag) newData.push(element);
+  }
+
+  renderData.value = newData;
+};
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index b8d5ad8d..1b7ff261 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -1035,7 +1035,7 @@ const onLoad = async () => {
               console.log('this :>> ', this);
 
               // 动态设置正则
-              const reg = new RegExp(value, 'i');
+              const reg = new RegExp('^' + value);
 
               this.query[prop] = reg;
 
@@ -1379,7 +1379,7 @@ const handleAddNode = async (index: number) => {
       console.log('this :>> ', this);
 
       // 动态设置正则
-      const reg = new RegExp(value, 'i');
+      const reg = new RegExp('^' + value);
 
       this.query[prop] = reg;
 
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 63314df3..53cb37e6 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -1214,7 +1214,7 @@ const handleSubmit = async () => {
 /** 输入筛选 */
 const packageInputsc = (value, row) => {
   // 动态设置正则
-  const reg = new RegExp(value, 'i');
+  const reg = new RegExp('^' + value);
 
   details.packageQuery[row.prop] = reg;
 
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index e409211c..636c4ad1 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -1128,7 +1128,7 @@ const handleSubmit = async () => {
 /** 输入筛选 */
 const packageInputsc = (value, row) => {
   // 动态设置正则
-  const reg = new RegExp(value, 'i');
+  const reg = new RegExp('^' + value);
 
   details.packageQuery[row.prop] = reg;
 
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 84592671..91a9c761 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -233,12 +233,12 @@
                         <span>{{ item.updateTime }}</span>
                       </div>
                       <div class="flex-c-c mr10">
-                        <el-icon color="#172e60" size="20px"><Location /></el-icon>
+                        <el-icon class="mr10" 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>
+                        <el-icon class="mr10" color="#172e60" size="20px"><User /></el-icon>
                         <span>操作人：</span>
                         <span>{{ item.createUserName }}</span>
                       </div>
@@ -884,7 +884,7 @@ const inputsc = async (value, row) => {
 
   try {
     // 动态设置正则
-    const reg = new RegExp(value, 'i');
+    const reg = new RegExp('^' + value);
 
     details.query[row.prop] = reg;
 
diff --git a/src/views/distribution/artery/handleLoadingDestination.vue b/src/views/distribution/artery/handleLoadingDestination.vue
index 520daf34..668e64a1 100644
--- a/src/views/distribution/artery/handleLoadingDestination.vue
+++ b/src/views/distribution/artery/handleLoadingDestination.vue
@@ -219,7 +219,7 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (value, row) => {
   // 动态设置正则
-  const reg = new RegExp(value, 'i');
+  const reg = new RegExp('^' + value);
 
   details.query[row.prop] = reg;
 
diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue
index a7bab771..6baf5a8d 100644
--- a/src/views/distribution/artery/zeroAdditionalRecording.vue
+++ b/src/views/distribution/artery/zeroAdditionalRecording.vue
@@ -537,7 +537,7 @@ const handleFilterData = () => {
 /** 表格表头输入框搜索 */
 const newInputsc = (value, { prop }) => {
   // 动态设置正则
-  const reg = new RegExp(value, 'i');
+  const reg = new RegExp('^' + value);
 
   details.newQuery[prop] = reg;
 
diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index ffd5ea56..b17ce96e 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -1438,7 +1438,7 @@ const onLoad = async () => {
 
     details.pageInfo = { ...$route.query };
 
-    const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id });
+    const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id, isEdit: 0 });
     const { code, data } = res.data;
     if (code !== 200) return;
 
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 847a74cb..56b713f4 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2046,14 +2046,17 @@ const initPageInfo = async (idsArr = []) => {
     });
 
     details.pageInfo = { ...$route.query };
+    // 新增
     if (details.pageInfo.type !== 'edit') await onLoad(idsArr);
+    // 改单
     else {
-      const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id });
+      const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id, isEdit: 1 });
       const { code, data } = res.data;
       if (code !== 200) return;
 
       details.query = { ...data, ...data.warehouseWaybill };
       delete details.query.warehouseWaybill;
+      details.query.trainNumber = details.query.customerTrain;
 
       // 是否提货
       details.query.isPickUp =
diff --git a/src/views/distribution/inventory/CreateOrder2.vue b/src/views/distribution/inventory/CreateOrder2.vue
deleted file mode 100644
index 14cf3724..00000000
--- a/src/views/distribution/inventory/CreateOrder2.vue
+++ /dev/null
@@ -1,3011 +0,0 @@
-<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="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="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-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);
-                          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-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);
-                          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-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"
-          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 style="width: 230px; flex: none">
-            <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"
-              controls-position="right"
-              :precision="2"
-              :min="0"
-              :step="0.1"
-              :value-on-clear="0"
-              :disabled="item.price > 0 || Number(item.price) !== Number(item.price)"
-            />
-          </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 style="width: 230px; flex: none">合计</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-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
-                        :controls="false"
-                        controls-position="right"
-                        :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';
-
-console.log('111 :>> ', 111);
-
-// 获取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();
-
-console.log('$store :>> ', $store);
-
-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: [],
-  /** 到站地区数组 */
-  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'],
-      },
-    ],
-    /** 到站 */
-    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.totalObj.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();
-  }
-});
-
-/** 初始化获取暂存单转运单信息 */
-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 || '';
-
-    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;
-      console.log('details.query :>> ', details.query);
-      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 = '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.weight === 0) {
-      ElMessage({
-        message: '请填写重量',
-        type: 'warning',
-      });
-      return false;
-    }
-    if (val.chargeType === 3 && val.price === 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,
-  });
-};
-
-/** 请求订单数据 */
-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.subtotalFreight = 1;
-};
-
-/** 查询客户信息 */
-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 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;
-  }
-};
-
-/** 获取价格 */
-const handleFindPrice = async (condition?: any) => {
-  try {
-    // item.loading = true;
-
-    const { destination } = details.query;
-
-    if (!destination || destination.length <= 1) return;
-    if (!details.query.consigneeId) return;
-    if (!details.query.departureWarehouseId) return;
-    if (!details.query.destinationWarehouseId) return;
-
-    const submitData = {
-      consigneeId: details.query.consigneeId,
-      departureWarehouseId: details.query.departureWarehouseId,
-      destinationWarehouseId: details.query.destinationWarehouseId,
-      destinationCode: '',
-      goodsIds: [] as any[],
-    };
-
-    // 货物id
-    if (condition) {
-      const { goodsId } = condition;
-      if (!goodsId) return;
-      submitData.goodsIds = [goodsId];
-    } else {
-      const _goodsIdsArr = [];
-
-      // 筛选有goodsId的货物信息
-      for (let index = 0; index < details.goodsList.length; index++) {
-        const { goodsId } = details.goodsList[index];
-        if (goodsId) _goodsIdsArr.push(goodsId);
-      }
-
-      if (_goodsIdsArr.length === 0) return;
-      submitData.goodsIds = _goodsIdsArr;
-    }
-
-    // 筛选到站
-    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.destinationCode = _item.value;
-
-    const res = await postFindArrPrice(submitData);
-    // const { code, data } = res.data;
-    const { code, data } = res.data;
-
-    if (code !== 200 || data.length === 0) return;
-
-    if (condition) {
-      // 循环赋值
-      for (let i = 0; i < details.priceArr.length; i++) {
-        const value = details.priceArr[i];
-        condition[value.key] = 0;
-
-        for (let index = 0; index < data[0].arrPrice.length; index++) {
-          const element = data[0].arrPrice[index];
-
-          if (element.itemName === value.name)
-            condition[value.key] = isNumber(element.cost) ? Number(element.cost) : 0;
-        }
-      }
-      handleComputed(condition);
-    } else {
-      for (let idx = 0; idx < details.goodsList.length; idx++) {
-        const val = details.goodsList[idx];
-
-        if (!val.goodsId) continue;
-
-        let _data = null;
-
-        for (let index = 0; index < data.length; index++) {
-          const element = data[index];
-          if (element.goodsId === val.goodsId) {
-            _data = element;
-            break;
-          }
-        }
-
-        // 循环赋值
-        for (let i = 0; i < details.priceArr.length; i++) {
-          const value = details.priceArr[i];
-          val[value.key] = 0;
-
-          for (let index = 0; index < _data.arrPrice.length; index++) {
-            const element = _data.arrPrice[index];
-
-            if (element.itemName === value.name)
-              val[value.key] = isNumber(element.cost) ? Number(element.cost) : 0;
-          }
-        }
-        handleComputed(val);
-      }
-    }
-  } catch (error) {
-    console.log('error :>> ', error);
-  } finally {
-    // item.loading = false;
-  }
-};
-
-/** 选择货物 */
-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;
-  handleFindPrice(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;
-.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: 1px dashed $borderColor;
-}
-
-// 页面字体大小
-.avue-crud {
-  font-size: 12px !important;
-}
-
-.form_top {
-  margin-bottom: 10px;
-}
-
-.border-top {
-  border-top: 1px dashed $borderColor;
-}
-
-.table-row {
-  width: 100%;
-  display: flex;
-  // border-top: 1px dashed  $borderColor;
-  border-left: 1px dashed $borderColor;
-  border-bottom: none;
-  box-sizing: border-box;
-
-  &:first-child {
-    display: block;
-    border-top: 1px dashed $borderColor;
-    border-left: 1px dashed $borderColor;
-
-    > div {
-      width: 100%;
-      border: none;
-    }
-  }
-
-  &:last-child {
-    display: block;
-    border-bottom: 1px dashed $borderColor;
-    border-right: 1px dashed $borderColor;
-    box-sizing: border-box;
-
-    > div {
-      width: 100%;
-      border: none;
-    }
-  }
-
-  > div {
-    flex: 1;
-    padding: 5px;
-    border-bottom: 1px dashed $borderColor;
-    border-right: 1px dashed $borderColor;
-    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/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
index 9c5368cf..26326ab8 100644
--- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -771,7 +771,7 @@ const newInputsc = (value, row) => {
   // newRenderData
   try {
     // 动态设置正则
-    const reg = new RegExp(value, 'i');
+    const reg = new RegExp('^' + value);
 
     details.addInfo.newQuery[row.prop] = reg;
 
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index bcedc3da..ce1b9ce4 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
-      <el-tabs v-model="activeTab">
+      <el-tabs v-model="activeTab" @tab-click="handleCheckTab">
         <el-tab-pane label="详 情 信 息" name="tab1">
           <el-divider>提货基本信息</el-divider>
           <el-row :gutter="24" class="rows">
@@ -141,15 +141,33 @@
 
         <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="loadLogsList.length">
+              <el-step :title="item.abstText" v-for="item in 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.createTime }}</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 class="mr10" 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>
@@ -259,6 +277,7 @@ import {
   postBillladingDetail,
   postFindChargeTypeList,
   postUpdateBillladingWaybillNum,
+  postFindBillladingLogList,
 } from '@/api/distribution/arteryDistrilbutionBillLadingList';
 import { ElMessage } from 'element-plus';
 import { getToken } from '@/utils/auth';
@@ -534,6 +553,8 @@ export default {
       /** 查询所有计费模式 */
       chargeTypeList: [],
       options: [],
+      /** 提货日志 */
+      loadLogsList: [],
     };
   },
   watch: {
@@ -614,7 +635,7 @@ export default {
     inputsc(value, row) {
       try {
         // 动态设置正则
-        const reg = new RegExp(value, 'i');
+        const reg = new RegExp('^' + value);
 
         this.query[row.prop] = reg;
 
@@ -803,6 +824,36 @@ export default {
         this.loadingObj.pageLoading = false;
       }
     },
+
+    /** 请求日志跟踪 */
+    async handleSignLoadScanLogs() {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        const submitData = { billladingId: this.$route.query.id };
+        const res = await postFindBillladingLogList(submitData);
+
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        this.loadLogsList = data;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+    },
+    handleCheckTab(e) {
+      console.log('e :>> ', e);
+      switch (e.props.name) {
+        // 日志跟踪
+        case 'tab2':
+          this.handleSignLoadScanLogs();
+          break;
+
+        default:
+          break;
+      }
+    },
   },
 };
 </script>
@@ -856,4 +907,20 @@ export default {
   margin-top: 20px;
   text-align: center;
 }
+
+// tab样式
+:deep(.el-tabs__item.is-active) {
+  color: var(--el-color-primary);
+  font-weight: bold;
+}
+
+:deep(.el-tabs__item:hover) {
+  color: var(--el-color-primary);
+  font-weight: bold;
+}
+
+:deep(.el-tabs__item) {
+  color: #959a9e;
+  transition: all 0.3s;
+}
 </style>
diff --git a/src/views/distribution/reservation/reservationAddFrom copy.vue b/src/views/distribution/reservation/reservationAddFrom copy.vue
index c40e10de..ecf6e800 100644
--- a/src/views/distribution/reservation/reservationAddFrom copy.vue	
+++ b/src/views/distribution/reservation/reservationAddFrom copy.vue	
@@ -2450,7 +2450,7 @@ export default {
       // 输入值后并搜索
       if (type === 1) {
         // 动态设置正则
-        const reg = new RegExp(value, 'i');
+        const reg = new RegExp('^' + value);
 
         this.orderQuery[row.prop] = reg;
 
@@ -2477,7 +2477,7 @@ export default {
       // 输入值后并搜索
       if (type === 1) {
         // 动态设置正则
-        const reg = new RegExp(value, 'i');
+        const reg = new RegExp('^' + value);
 
         this.stockQuery[row.prop] = reg;
 
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index e6c2772e..4c05d670 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -125,7 +125,7 @@
       </el-form>
 
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-        <el-tab-pane name='orderTab' label="订单">
+        <el-tab-pane name="orderTab" label="订单">
           <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
           <tablecmt
             class="tablesc"
@@ -174,7 +174,7 @@
           </tablecmt>
         </el-tab-pane>
 
-        <el-tab-pane name='InventoryTab' label="库存品">
+        <el-tab-pane name="InventoryTab" label="库存品">
           <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
           <tablecmt
             class="tablesc"
@@ -513,13 +513,13 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
 import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus';
 import error from '@/error';
 export default {
   name: '/distribution/reservation/reservationAddFrom',
   data() {
     return {
-      activeName:'orderTab',
+      activeName: 'orderTab',
       Inventoryloading: true, //库存品加载
       packageQuery: {},
       reservationloading: false,
@@ -2022,7 +2022,7 @@ export default {
   },
   mounted() {
     this.init();
-  this.Copyfrom= JSON.parse(JSON.stringify(this.form))
+    this.Copyfrom = JSON.parse(JSON.stringify(this.form));
     this.onLoad(this.page);
     this.getDictionary();
 
@@ -2542,8 +2542,8 @@ export default {
       this.$store.commit('DEL_TAG_CURRENT');
     },
     // 最后提交
-  async  onSubmit(formEl) {
-this.$refs.ruleForm.validate(async valid => {
+    async onSubmit(formEl) {
+      this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           console.log('submit!');
           try {
@@ -2645,72 +2645,76 @@ this.$refs.ruleForm.validate(async valid => {
             // this.form.stockArticleList = this.packageList;
             console.log('>>>>>>>>', this.form);
             if (this.reservationId) {
-// 判断是否都没有选择包件
-const checkInfoValues = this.form.stockArticleList.every(item => !item.packageListInfo  ||  !item.packageListInfo.length);
-if(checkInfoValues){
-ElMessageBox.prompt('当前所有订单都没有选择包件是否确认"取消本次计划"?', '请填写取消原因', {
-    confirmButtonText: '确认',
-    cancelButtonText: '关闭',
-    inputPattern: /^\S+$/,
-    inputErrorMessage: '请填写取消原因',
-  })
-    .then((value) => {
-      let data={
-        cancelReason:value.value,
-        id:this.$route.query.reservationId
-      }
-      this.reservationloading=true
-      cancelReservation(data).then(res=>{
-        console.log(res);
-        if(res.data.code ==200){
-          ElMessage({
-          message: res.data.msg,
-          type: 'success',
-        })
-      this.$router.push('/distribution/reservation/reservation');
-      this.$store.commit('DEL_TAG_CURRENT');
-        }
-        
-      }).catch((error)=>{
-        this.reservationloading=false 
-        console.log(error);
-      })
-      console.log(data,'要提交的数据');
-    })
-    .catch(() => {
-
-    })
-
-}else{
-  for(let i=0;i< this.form.stockArticleList.length;i++){
-    if(!this.form.stockArticleList[i].packageListInfo || !this.form.stockArticleList[i].packageListInfo.length ){
-  ElMessageBox.confirm(
-    `订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    }
-  )
-    .then(() => {
-      this.renderOrderData.splice(i, 1);
-      this.form.stockArticleList.splice(i,1)
-    })
-    .catch(() => {
-
-    })
-    return
-  }
-  }
+              // 判断是否都没有选择包件
+              const checkInfoValues = this.form.stockArticleList.every(
+                item => !item.packageListInfo || !item.packageListInfo.length
+              );
+              if (checkInfoValues) {
+                ElMessageBox.prompt(
+                  '当前所有订单都没有选择包件是否确认"取消本次计划"?',
+                  '请填写取消原因',
+                  {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '关闭',
+                    inputPattern: /^\S+$/,
+                    inputErrorMessage: '请填写取消原因',
+                  }
+                )
+                  .then(value => {
+                    let data = {
+                      cancelReason: value.value,
+                      id: this.$route.query.reservationId,
+                    };
+                    this.reservationloading = true;
+                    cancelReservation(data)
+                      .then(res => {
+                        console.log(res);
+                        if (res.data.code == 200) {
+                          ElMessage({
+                            message: res.data.msg,
+                            type: 'success',
+                          });
+                          this.$router.push('/distribution/reservation/reservation');
+                          this.$store.commit('DEL_TAG_CURRENT');
+                        }
+                      })
+                      .catch(error => {
+                        this.reservationloading = false;
+                        console.log(error);
+                      });
+                    console.log(data, '要提交的数据');
+                  })
+                  .catch(() => {});
+              } else {
+                for (let i = 0; i < this.form.stockArticleList.length; i++) {
+                  if (
+                    !this.form.stockArticleList[i].packageListInfo ||
+                    !this.form.stockArticleList[i].packageListInfo.length
+                  ) {
+                    ElMessageBox.confirm(
+                      `订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`,
+                      '提示',
+                      {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                      }
+                    )
+                      .then(() => {
+                        this.renderOrderData.splice(i, 1);
+                        this.form.stockArticleList.splice(i, 1);
+                      })
+                      .catch(() => {});
+                    return;
+                  }
+                }
+              }
+              // 开启提交按钮loading
+              this.loadingObj.submitBtnLoading = true;
+              this.reservationloading = true; //开启全屏加载
+              this.form.id = this.reservationId;
 
-}
-            // 开启提交按钮loading
-            this.loadingObj.submitBtnLoading = true;
-            this.reservationloading = true; //开启全屏加载
- this.form.id = this.reservationId;
- 
- const res = await update(this.form);
+              const res = await update(this.form);
               console.log('res :>> ', res);
               if (res.data.code !== 200) return;
               this.$message({
@@ -2718,49 +2722,44 @@ ElMessageBox.prompt('当前所有订单都没有选择包件是否确认"取消
                 message: '操作成功!',
               });
               this.back();
-           } else {
-                        // 开启提交按钮loading
-            this.loadingObj.submitBtnLoading = true;
-            this.reservationloading = true; //开启全屏加载
-             this.form.reservationStatus = '20';
+            } else {
+              // 开启提交按钮loading
+              this.loadingObj.submitBtnLoading = true;
+              this.reservationloading = true; //开启全屏加载
+              this.form.reservationStatus = '20';
               const res = await autonomouslySave(this.form);
               console.log('res :>> ', res);
               if (res.data.code !== 200) return;
-       ElMessageBox.confirm(
-        '当前预约已完成，是否继续添加预约?',
-        '提示',
-      {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      }
-  )
-    .then(() => {
-this.form=this.Copyfrom
-this.Copyfrom= JSON.parse(JSON.stringify(this.form))
-this.$refs.ruleForm.resetFields(); // 调用重置验证状态的方法
-this.renderOrderData=[]//订单重置
-this.serveType=[];//服务类型重置
-this.renderInventoryData=[]//库存品重置
-this.orderList=[]
-this.orderData = []
-this.packageListInfo=[]
-this.stockArticleInfo=[]
-this.inventoryDat= []
-this.inventoryData=[]
-this.inventoryList=[]
-delete this.query.marketName
-this.marketName=''
-this.activeName='orderTab',
-console.log(this.orderList,'');
-    })
-    .catch(() => {
-      this.$message({
-                type: 'success',
-                message: '操作成功!',
-              });
-              this.back();
-    })
+              ElMessageBox.confirm('当前预约已完成，是否继续添加预约?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+              })
+                .then(() => {
+                  this.form = this.Copyfrom;
+                  this.Copyfrom = JSON.parse(JSON.stringify(this.form));
+                  this.$refs.ruleForm.resetFields(); // 调用重置验证状态的方法
+                  this.renderOrderData = []; //订单重置
+                  this.serveType = []; //服务类型重置
+                  this.renderInventoryData = []; //库存品重置
+                  this.orderList = [];
+                  this.orderData = [];
+                  this.packageListInfo = [];
+                  this.stockArticleInfo = [];
+                  this.inventoryDat = [];
+                  this.inventoryData = [];
+                  this.inventoryList = [];
+                  delete this.query.marketName;
+                  this.marketName = '';
+                  (this.activeName = 'orderTab'), console.log(this.orderList, '');
+                })
+                .catch(() => {
+                  this.$message({
+                    type: 'success',
+                    message: '操作成功!',
+                  });
+                  this.back();
+                });
 
               // this.$message({
               //   type: 'success',
@@ -2926,7 +2925,7 @@ console.log(this.orderList,'');
       // 输入值后并搜索
       if (type === 1) {
         // 动态设置正则
-        const reg = new RegExp(value, 'i');
+        const reg = new RegExp('^' + value);
 
         this.orderQuery[row.prop] = reg;
 
@@ -2953,7 +2952,7 @@ console.log(this.orderList,'');
       // 输入值后并搜索
       if (type === 1) {
         // 动态设置正则
-        const reg = new RegExp(value, 'i');
+        const reg = new RegExp('^' + value);
 
         this.stockQuery[row.prop] = reg;
 
@@ -3384,7 +3383,7 @@ console.log(this.orderList,'');
 
         if (code !== 200) return;
 
-        console.log('this.orderList',this.orderList)
+        console.log('this.orderList', this.orderList);
         const _chooseArr = [...this.orderList];
 
         this.stockArticleInfo = records;
@@ -3441,13 +3440,12 @@ console.log(this.orderList,'');
       this.form.isUrgent = '1';
       // this.form.reservationDate = new Date();
 
-
       if (this.orderIds) {
-        this.reservationloading=true
-        if(res.data.code !==200){
-            this.reservationloading=false
-            return
-          }
+        this.reservationloading = true;
+        if (res.data.code !== 200) {
+          this.reservationloading = false;
+          return;
+        }
         getStockArticleList(this.orderIds).then(res => {
           console.log(res.data.data);
           const data = res.data.data;
@@ -3471,17 +3469,16 @@ console.log(this.orderList,'');
           this.form.deliveryAddress = address;
           this.orderData = data;
           this.renderOrderData = [...this.orderData];
-          this.reservationloading=false
-
-        })
+          this.reservationloading = false;
+        });
       }
       if (this.reservationId) {
-        this.reservationloading=true
+        this.reservationloading = true;
         this.inventoryShow = true;
         getReservationInfo(this.reservationId).then(res => {
-          if(res.data.code !==200){
-            this.reservationloading=false
-            return
+          if (res.data.code !== 200) {
+            this.reservationloading = false;
+            return;
           }
           const reservation = res.data.data;
           const stockArticleListInfo = res.data.data.stockArticleList;
@@ -3508,8 +3505,8 @@ console.log(this.orderList,'');
             });
           }
           this.form = reservation;
-          this.reservationloading=false
-        })
+          this.reservationloading = false;
+        });
       } else {
         this.form.deliveryType = '2';
       }
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index f5dc1fe8..cfb1bc03 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -792,8 +792,6 @@ const TabTitle = ref([
 ]);
 // 订单列表
 const menuData1 = ref([
-
-
   {
     prop: 'waybillNumber',
     label: '运单号',
@@ -965,7 +963,6 @@ const menuData1 = ref([
     sortable: true,
     head: false,
   },
-  
 
   {
     prop: 'consigneeMobile',
@@ -1012,7 +1009,6 @@ const menuData1 = ref([
     head: false,
   },
   {
-    
     prop: 'descriptionGoods',
     label: '货物名称',
     type: 2,
@@ -1035,9 +1031,6 @@ const menuData1 = ref([
     isshowSummary: true,
     head: false,
   },
-
-
-
 ]);
 // 包件列表
 // 包件列表
@@ -1236,7 +1229,7 @@ const menuData2 = ref([
     sortable: true,
     head: false,
   },
-    // {
+  // {
   //   prop: 'orderPackageGroundingStatusName',
   //   label: '上架状态',
   //   type: 1,
@@ -1350,11 +1343,6 @@ const menuData2 = ref([
   //   head: false,
   // },
 
-
-
-
-
-
   {
     prop: 'scanStatus',
     label: '装车方式',
@@ -2188,12 +2176,12 @@ const tabClick = val => {
 
 // 导出
 const Signforexport = () => {
-  if(SignforMenu.value.label == '库存品列表'){
+  if (SignforMenu.value.label == '库存品列表') {
     ElMessage({
-    message: '库存品导出维护中',
-    type: 'warning',
-  })
-  return
+      message: '库存品导出维护中',
+      type: 'warning',
+    });
+    return;
   }
   console.log(SignforMenu.value);
   ElMessageBox.confirm(`是否导出${SignforMenu.value.label}`, '提示', {
@@ -2404,7 +2392,7 @@ const inputsc = (value, row, type) => {
     const _item = Tabs.value.find(val => val.type === type);
 
     // 动态设置正则
-    const reg = new RegExp(value, 'i');
+    const reg = new RegExp('^' + value);
 
     _item.query[row.prop] = reg;
 
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 4243c36e..fa5fd52c 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -1666,13 +1666,18 @@ const initPageInfo = async () => {
     });
 
     console.log('$route :>> ', $route);
+    // 新增
     if ($route.query.type !== 'edit') await onLoad();
+    // 编辑
     else {
-      const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id });
+      const res = await postFindWaybillDetail({ waybillId: details.pageInfo.id, isEdit: 1 });
       const { code, data } = res.data;
       if (code !== 200) return;
 
       details.query = { ...data, ...data.warehouseWaybill };
+
+      details.query.trainNumber = details.query.customerTrain;
+
       details.info = data;
       details.query.openOrderUserName = data.warehouseWaybill.agent;
       delete details.query.warehouseWaybill;
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index 61c4e33f..df9d7408 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -362,12 +362,9 @@
 
         <P>请确认传入的文件为Excel文件格式</P>
 
-        <a
-          href="http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx"
-          style="text-decoration: none"
-        >
-          <el-button type="primary" icon="Download"> 模版下载 </el-button>
-        </a>
+        <el-button type="primary" icon="Download" @click="handleDownLoadFile">
+          {{ details.ouPaiChooseType === 1 ? '包条码导入模板' : '无包条码导入模板' }}
+        </el-button>
 
         <div v-loading="details.loadingObj.UploadLoadong" class="mt10">
           <el-upload
@@ -479,7 +476,7 @@ import {
 } from '@/api/waybill/TemporaryStorageList';
 import { getLazyTreeAll } from '@/api/base/region';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
+import { downloadXls, setNodeHeight, deepClone, downloadFileBase64 } from '@/utils/util';
 import { columnList } from '@/option/waybill/TemporaryStorageList';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
@@ -1309,6 +1306,20 @@ const handleOpenAddTagDlog = () => {
   ruleFormRef.value.resetFields();
 };
 
+/** 下载导入模板 */
+const handleDownLoadFile = () => {
+  const url =
+    details.ouPaiChooseType === 1
+      ? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx'
+      : 'http://47.108.51.143:9000/bladex/upload/20240508/%E6%97%A0%E5%8C%85%E6%9D%A1%E7%A0%81%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7%29.xlsx?Content-Disposition=attachment%3B%20filename%3D%22upload%2F20240508%2F%E6%97%A0%E5%8C%85%E6%9D%A1%E7%A0%81%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7%29.xlsx%22&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240508%2F%2Fs3%2Faws4_request&X-Amz-Date=20240508T024854Z&X-Amz-Expires=432000&X-Amz-SignedHeaders=host&X-Amz-Signature=cebd92541903249d5c5fdf1a2dfa03bdb5d56beba7b73c97ac419c209cd1f2fa';
+  const name =
+    details.ouPaiChooseType === 1
+      ? '包条导入模版（货无忧-生成包条）.xlsx'
+      : '无包条导入模版（货无忧-生成包条）.xlsx';
+
+  downloadFileBase64(url, name);
+};
+
 onActivated(() => {
   console.log('activated');
   console.log('this.$store :>> ', $store);
diff --git a/src/views/waybill/WarehousingByTrainNumber.vue b/src/views/waybill/WarehousingByTrainNumber.vue
index 4940f311..4f281c11 100644
--- a/src/views/waybill/WarehousingByTrainNumber.vue
+++ b/src/views/waybill/WarehousingByTrainNumber.vue
@@ -46,33 +46,29 @@
       </el-row>
 
       <!-- 表格 -->
-      <el-row>
-        <!-- 列表模块 -->
-        <tablecmt
-          ref="tableNodeRef"
-          :columnList="details.columnList"
-          :tableData="details.data"
-          :loading="loadingObj.list"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-          :isselectfun="handleIsSelect"
-        >
-          <template #default="slotProps">
-            <template v-if="slotProps.scope.column.label === '操作'">
-              <el-text
-                v-if="Number(slotProps.scope.row.isIncoming) === 1"
-                @click="handlePutInStorage(slotProps.scope)"
-              >
-                入库
-              </el-text>
-              <el-text @click="handleGoDetails(slotProps.scope)">包明细</el-text>
-            </template>
+      <tablecmt
+        ref="tableNodeRef"
+        :columnList="details.columnList"
+        :tableData="renderData"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+        :isselectfun="handleIsSelect"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text
+              v-if="Number(slotProps.scope.row.isIncoming) === 1"
+              @click="handlePutInStorage(slotProps.scope)"
+            >
+              入库
+            </el-text>
+            <el-text @click="handleGoDetails(slotProps.scope)">包明细</el-text>
           </template>
-        </tablecmt>
-      </el-row>
+        </template>
+      </tablecmt>
 
       <!-- 分页模块 -->
       <el-row class="el-fy">
@@ -93,9 +89,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import { ref, reactive, toRefs, computed, shallowRef, onMounted, nextTick } from 'vue';
 import functions from '@/utils/functions.js';
-import dayjs from 'dayjs';
+
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -103,12 +99,18 @@ import {
   postFindIncomingOrderList,
   postIncomingBatchOrder,
 } from '@/api/distribution/WarehousingByTrainNumber';
-import { downloadXls, setNodeHeight, getHtmls, deepClone } from '@/utils/util';
+import {
+  setNodeHeight,
+  deepClone,
+  handleTranslationDataSeclect,
+  handleFilterData,
+  handleInputQuery,
+  handleSelectQuery,
+  handleTimeQuery,
+} from '@/utils/util';
 import { columnList } from '@/option/waybill/WarehousingByTrainNumber';
 import { useRouter } from 'vue-router';
-import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { submit } from '@/api/base/region';
 
 // 获取路由实例
 const $router = useRouter();
@@ -121,8 +123,13 @@ const details = reactive<any>({
   searchType: 'orderCode',
   /** 是否开启搜索 */
   search: false,
-  /** 表格搜索条件 */
   query: {},
+  /** 表格搜索条件 -- 输入框 */
+  inputQuery: {},
+  /** 表格搜索条件 -- 下拉框 */
+  selectQuery: {},
+  /** 表格搜索条件 -- 时间选择 */
+  timeQuery: {},
   /** 时间快捷选择设置 */
   shortcuts: [
     {
@@ -189,6 +196,8 @@ const details = reactive<any>({
   listNode: '',
   form: {},
 });
+/** 渲染数据 */
+const renderData = shallowRef([]);
 
 const { search, query, loadingObj, selectionList, drawerShow } = toRefs(details);
 
@@ -215,6 +224,15 @@ const onLoad = async (params = {}) => {
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = data;
+
+    handleTranslationDataSeclect(details.data, details.columnList);
+    handleFilterData(details.data, renderData, {
+      inputQuery: details.inputQuery,
+      selectQuery: details.selectQuery,
+      timeQuery: details.timeQuery,
+    });
+
+    console.log('details.renderData :>> ', details.renderData);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -229,6 +247,9 @@ const searchChange = () => {
   for (let i = 0; i < details.columnList.length; i++) {
     details.columnList[i].values = '';
   }
+  details.timeQuery = {};
+  details.inputQuery = {};
+  details.selectQuery = {};
 
   onLoad();
 };
@@ -255,36 +276,36 @@ const searchHide = () => {
 };
 
 /** 表格表头输入框搜索 */
-const inputsc = (index, row) => {
-  details.query[row.prop] = index;
-  if (!index && index !== 0) delete details.query[row.prop];
-  onLoad();
+const inputsc = (index, col) => {
+  handleInputQuery(index, col, details.inputQuery, true);
+
+  handleFilterData(details.data, renderData, {
+    inputQuery: details.inputQuery,
+    selectQuery: details.selectQuery,
+    timeQuery: details.timeQuery,
+  });
 };
 
 /** 表格表头时间选择 */
-const timesc = (index, row) => {
-  console.log(index, row);
-  if (!!index) {
-    index = dayjs(index).format('YYYY-MM-DD');
-  }
-  details.query[row.prop] = index;
-  if (!index) {
-    delete details.query[row.prop];
-  }
-  onLoad();
-};
+const timesc = (index, col) => {
+  handleTimeQuery(index, col, details.timeQuery);
 
-/** 表格表头输入框搜索 */
-const btnsc = () => {};
+  handleFilterData(details.data, renderData, {
+    inputQuery: details.inputQuery,
+    selectQuery: details.selectQuery,
+    timeQuery: details.timeQuery,
+  });
+};
 
 /** 表格表头下拉框选择 */
-const selectsc = (index, row) => {
-  const _prop = row.prop.replace('Name', '');
-
-  details.query[_prop] = index;
-  if (!index) delete details.query[_prop];
+const selectsc = (index, col) => {
+  handleSelectQuery(index, col, details.selectQuery);
 
-  onLoad();
+  handleFilterData(details.data, renderData, {
+    inputQuery: details.inputQuery,
+    selectQuery: details.selectQuery,
+    timeQuery: details.timeQuery,
+  });
 };
 
 /** 表格表头复选框选择 */
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 3a01a002..cedefce5 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -80,6 +80,13 @@
         @btnCheck="btnsc"
         @selectCheck="selectsc"
         @selection="selectionChange"
+        :isselectfun="row => row.abolishStatus + '' !== '1'"
+        :tableRowClassName="
+          (row, index) => {
+            if (row.abolishStatus + '' === '1') return 'abolish';
+            else return '';
+          }
+        "
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '运单号'">
@@ -88,7 +95,15 @@
             </el-text>
           </template>
 
-          <template v-else-if="slotProps.scope.column.label === '操作'">
+          <template
+            v-else-if="
+              slotProps.scope.column.label === '操作' &&
+              // 作废
+              slotProps.scope.row.abolishStatus + '' !== '1' &&
+              // 冻结
+              slotProps.scope.row.freezeStatus + '' !== '1'
+            "
+          >
             <el-text @click="handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
             <el-text @click="handleViewOrderDetails(slotProps.scope)"> 查看订单 </el-text>
           </template>
@@ -257,8 +272,10 @@ import {
   postWarehouseWaybillPageWaybillList,
   postSaveWaybillReturn,
   postPrintBatch,
+  postAbolishWaybill,
+  postFreezeWaybill,
+  postUnFreezeWaybill,
 } from '@/api/waybill/WaybillOrderList.js';
-import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import {
   downloadXls,
   setNodeHeight,
@@ -270,7 +287,7 @@ import {
 import { columnList } from '@/option/waybill/WaybillOrderList';
 import { useRouter } from 'vue-router';
 import print from '@/utils/print';
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import type { UploadProps, UploadUserFile } from 'element-plus';
 import { utils } from 'sortablejs';
@@ -680,6 +697,36 @@ const handleBatchDelete = () => {
       message: '最少选择一条数据',
     });
   }
+
+  ElMessageBox.confirm('确定要批量作废吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await postAbolishWaybill({
+        waybillIds: details.selectionList.map(val => val.id),
+      });
+      console.log('res :>> ', res);
+
+      if (res.data.code !== 200) return;
+
+      ElMessage({
+        type: 'success',
+        message: '批量作废成功',
+      });
+
+      details.selectionList = [];
+
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
 };
 
 /** 批量冻结 */
@@ -690,6 +737,36 @@ const handleBatchFreeze = () => {
       message: '最少选择一条数据',
     });
   }
+
+  ElMessageBox.confirm('确定要批量冻结吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await postFreezeWaybill({
+        waybillIds: details.selectionList.map(val => val.id),
+      });
+      console.log('res :>> ', res);
+
+      if (res.data.code !== 200) return;
+
+      ElMessage({
+        type: 'success',
+        message: '批量冻结成功',
+      });
+
+      details.selectionList = [];
+
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
 };
 
 /** 批量恢复 */
@@ -700,6 +777,36 @@ const handleBatchRecover = () => {
       message: '最少选择一条数据',
     });
   }
+
+  ElMessageBox.confirm('确定要批量恢复吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await postUnFreezeWaybill({
+        waybillIds: details.selectionList.map(val => val.id),
+      });
+      console.log('res :>> ', res);
+
+      if (res.data.code !== 200) return;
+
+      ElMessage({
+        type: 'success',
+        message: '批量恢复成功',
+      });
+
+      details.selectionList = [];
+
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
 };
 
 /** 查看运单 */
@@ -792,6 +899,27 @@ const handleUploadReceiptSubmit = async () => {
     padding: 5px 10px;
   }
 }
+
+:deep(.el-table tr) {
+  // 作废样式
+  &.abolish {
+    .tabculconte,
+    .el-tooltip,
+    .el-button--text,
+    .el-text {
+      // color: #e54b4b !important;
+      color: #f00 !important;
+    }
+  }
+
+  // &.hover-row {
+  //   .tabculconte,
+  //   .el-tooltip,
+  //   .el-button--text {
+  //     color: var(--el-color-primary) !important;
+  //   }
+  // }
+}
 </style>
 
 <style>
diff --git a/src/views/waybill/orderDetails.vue b/src/views/waybill/orderDetails.vue
index 32962cb3..3c4a4ea6 100644
--- a/src/views/waybill/orderDetails.vue
+++ b/src/views/waybill/orderDetails.vue
@@ -270,7 +270,7 @@ const handleFilterData = debounce(() => {
   for (const key in details.query) {
     const value = details.query[key];
 
-    if (value) _regArr[key] = new RegExp(value, 'i');
+    if (value) _regArr[key] = new RegExp('^' + value);
   }
 
   if (Object.keys(_regArr).length === 0 && Object.keys(details.timeQuery).length === 0)
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index a8ea8fba..857c3f68 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -291,7 +291,14 @@ import {
   getShowAdvancePackgeCode,
 } from '@/api/waybill/orderPackageListDetails.js';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
-import { downloadXls, setNodeHeight, getHtmls, deepClone, getObjType } from '@/utils/util';
+import {
+  downloadXls,
+  setNodeHeight,
+  getHtmls,
+  deepClone,
+  getObjType,
+  handleTranslationDataSeclect,
+} from '@/utils/util';
 import { packageListColumnList, packageDetailColumnList } from '@/option/waybill/orderPackageList';
 import { flowNodeColumnList } from '@/option/waybill/orderPackageListDetails.js';
 import { useRouter } from 'vue-router';
@@ -423,16 +430,6 @@ onMounted(() => {
   }, 100);
 });
 
-// 转译
-const translationArr = [];
-
-for (let i = 0; i < details.packageListColumnList.length; i++) {
-  const element = details.packageListColumnList[i];
-
-  if (getObjType(element.checkarr) !== 'array' || element.checkarr.length === 0) continue;
-  translationArr.push(element);
-}
-
 /** 请求页面数据 */
 const onLoad = async (params = {}) => {
   try {
@@ -458,21 +455,7 @@ const onLoad = async (params = {}) => {
     details.packageListData = data.records;
     details.page.total = data.total;
 
-    for (let i = 0; i < details.packageListData.length; i++) {
-      const value = details.packageListData[i];
-
-      for (let j = 0; j < translationArr.length; j++) {
-        const element = translationArr[j];
-
-        for (let index = 0; index < element.checkarr.length; index++) {
-          const val = element.checkarr[index];
-
-          if (Number(value[element.prop.replace('Name', '')] || 0) === val.value) {
-            value[element.prop] = val.label;
-          }
-        }
-      }
-    }
+    handleTranslationDataSeclect(details.packageListData, details.packageListColumnList);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue
index 2a4e62d0..242266f4 100644
--- a/src/views/waybill/orderPackageListDetails.vue
+++ b/src/views/waybill/orderPackageListDetails.vue
@@ -476,7 +476,7 @@ const handleFilterPackageData = debounce(() => {
   for (const key in details.query) {
     const value = details.query[key];
 
-    if (value) _regArr[key] = new RegExp(value, 'i');
+    if (value) _regArr[key] = new RegExp('^' + value);
   }
 
   if (Object.keys(_regArr).length === 0 && Object.keys(details.timeQuery).length === 0)