diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index cf1f0e14..a0b269ea 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -640,8 +640,8 @@ export const detailsColumnList = [
   },
 ];
 
-/** 运单池列表 */
-export const oldColumnList = [
+/** 三方详情列表 */
+export const TripartiteTransferColumnList = [
   {
     prop: '',
     label: '复选框',
@@ -658,11 +658,11 @@ export const oldColumnList = [
     fixed: true,
   },
   {
-    prop: 'orderCode',
+    prop: 'createTime',
     label: '开单日期',
     type: 1,
     values: '',
-    width: '150',
+    width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -671,98 +671,86 @@ export const oldColumnList = [
   {
     prop: 'orderCode',
     label: '订单自编号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
     fixed: false,
     sortable: true,
-    head: false,
   },
   {
-    prop: 'orderPackageCode',
+    prop: 'waybillNo',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
-    width: '200',
+    width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
+    isshowSummary: false,
   },
   {
-    prop: 'driverName',
+    prop: 'destination',
     label: '到站',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
+    isshowSummary: false,
   },
   {
-    prop: 'driverPhone',
-    label: '目的网点',
-    type: 1,
+    prop: 'destinationWarehouseName',
+    label: '目的站',
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
+    isshowSummary: false,
   },
   {
-    prop: 'warehouseName',
+    prop: 'shipper',
     label: '发货单位',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: false,
   },
   {
-    prop: 'lineNameTitle',
+    prop: 'consignee',
     label: '收货单位',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isColumnMerge: true,
     sortable: true,
   },
   {
-    prop: 'nodeNub',
+    prop: 'consigneeName',
     label: '收货人',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isColumnMerge: true,
     sortable: true,
   },
   {
-    prop: 'startTime',
-    label: '托盘码',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'endTime',
+    prop: 'productName',
     label: '品类名称',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'planVolume',
-    label: '件数',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -770,260 +758,132 @@ export const oldColumnList = [
     sortable: true,
   },
   {
-    prop: 'billladingStatus',
-    label: '在库数',
+    prop: 'waybillNum',
+    label: '运单总件数',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isColumnMerge: true,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'chargeType',
-    label: '单价',
+    prop: 'orderNum',
+    label: '件数',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
+  // {
+  //   prop: 'stockNum',
+  //   label: '在库数',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   isshowSummary: true,
+  //   sortable: true,
+  // },
   {
-    prop: 'totalFee',
-    label: '重量(kg)',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'remark',
-    label: '体积',
+    prop: 'loadingNum',
+    label: '装车数',
     type: 1,
     values: '',
     width: '150',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'carrierName',
-    label: '运费',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'waybillCount',
-    label: '客户车次',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'totalNum',
-    label: '运单备注',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-];
-
-/** 调度池列表 */
-export const newColumnList = [
-  {
-    prop: '',
-    label: '复选框',
-    type: 0,
-    width: 55,
-    fixed: true,
-  },
-  {
-    prop: '',
-    label: '序号',
-    type: 12,
-    values: '',
-    width: 55,
-    fixed: true,
-  },
-  {
-    prop: 'orderCode',
-    label: '开单日期',
+    prop: 'unloadNum',
+    label: '卸车数',
     type: 1,
     values: '',
     width: '150',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
-    head: false,
   },
   {
-    prop: 'orderCode',
-    label: '订单自编号',
+    prop: 'openPrice',
+    label: '运单开单价格',
     type: 1,
     values: '',
     width: '150',
     checkarr: [],
     fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'orderPackageCode',
-    label: '运单号',
-    type: 1,
-    values: '',
-    width: '200',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'driverName',
-    label: '到站',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'driverPhone',
-    label: '目的网点',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'warehouseName',
-    label: '发货单位',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'lineNameTitle',
-    label: '收货单位',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'nodeNub',
-    label: '收货人',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'startTime',
-    label: '托盘码',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
+    isColumnMerge: true,
     sortable: true,
   },
   {
-    prop: 'endTime',
-    label: '品类名称',
+    prop: 'weight',
+    label: '重量(KG)',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'planVolume',
-    label: '件数',
+    prop: 'volume',
+    label: '体积',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'billladingStatus',
-    label: '在库数',
+    prop: 'unloadIncome',
+    label: '卸车收入',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
+    isColumnMerge: true,
     sortable: true,
   },
   {
-    prop: 'chargeType',
-    label: '单价',
-    type: 1,
+    prop: 'orderFreight',
+    label: '订单运费',
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'totalFee',
-    label: '重量(kg)',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'remark',
-    label: '体积',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
-  {
-    prop: 'carrierName',
-    label: '运费',
-    type: 1,
+    prop: 'orderFreight',
+    label: '订单运费',
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isshowSummary: true,
     sortable: true,
   },
   {
-    prop: 'waybillCount',
+    prop: 'customerTrain',
     label: '客户车次',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -1031,13 +891,15 @@ export const newColumnList = [
     sortable: true,
   },
   {
-    prop: 'totalNum',
+    prop: 'remark',
     label: '运单备注',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
+    isColumnMerge: true,
+    isshowSummary: false,
   },
 ];
diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index 0369fee7..52bf3da0 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -250,7 +250,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'productName',
+    prop: 'goodsName',
     label: '品类名称',
     type: 2,
     values: '',
@@ -260,7 +260,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'waybillNum',
+    prop: 'totalNum',
     label: '运单总件数',
     type: 1,
     values: '',
@@ -282,31 +282,9 @@ export const columnList = [
     isshowSummary: true,
     sortable: true,
   },
-  // {
-  //   prop: 'stockNum',
-  //   label: '在库数',
-  //   type: 1,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   isshowSummary: true,
-  //   sortable: true,
-  // },
-  {
-    prop: 'loadingNum',
-    label: '装车数',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    isshowSummary: true,
-    sortable: true,
-  },
   {
-    prop: 'unloadNum',
-    label: '卸车数',
+    prop: 'stockNum',
+    label: '在库数',
     type: 1,
     values: '',
     width: '150',
@@ -315,8 +293,30 @@ export const columnList = [
     isshowSummary: true,
     sortable: true,
   },
+  // {
+  //   prop: 'realNum',
+  //   label: '装车数',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   isshowSummary: true,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'unloadNum',
+  //   label: '卸车数',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   isshowSummary: true,
+  //   sortable: true,
+  // },
   {
-    prop: 'openPrice',
+    prop: 'price',
     label: '运单开单价格',
     type: 1,
     values: '',
@@ -327,7 +327,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'weight',
+    prop: 'totalWeight',
     label: '重量(KG)',
     type: 1,
     values: '',
@@ -338,7 +338,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'volume',
+    prop: 'totalVolume',
     label: '体积',
     type: 1,
     values: '',
@@ -348,31 +348,20 @@ export const columnList = [
     isshowSummary: true,
     sortable: true,
   },
+  // {
+  //   prop: 'unloadIncome',
+  //   label: '卸车收入',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   isshowSummary: true,
+  //   isColumnMerge: true,
+  //   sortable: true,
+  // },
   {
-    prop: 'unloadIncome',
-    label: '卸车收入',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    isshowSummary: true,
-    isColumnMerge: true,
-    sortable: true,
-  },
-  {
-    prop: 'orderFreight',
-    label: '订单运费',
-    type: 2,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    isshowSummary: true,
-    sortable: true,
-  },
-  {
-    prop: 'orderFreight',
+    prop: 'freight',
     label: '订单运费',
     type: 2,
     values: '',
diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue
index 9f447e68..43718fda 100644
--- a/src/views/distribution/artery/TripartiteTransferDetails.vue
+++ b/src/views/distribution/artery/TripartiteTransferDetails.vue
@@ -78,6 +78,10 @@
                 </el-select>
               </el-form-item>
 
+              <el-form-item label="送货车辆" prop="carNumber" style="flex: 1">
+                <el-input v-model="form.carNumber"> </el-input>
+              </el-form-item>
+
               <el-form-item label="客户类型" prop="customerType">
                 <el-select
                   :teleported="false"
@@ -163,7 +167,7 @@
                 />
               </el-form-item>
 
-              <div style="flex: 1; padding-right: 0">
+              <div style="padding-right: 0; width: 100%">
                 <el-form-item
                   style="width: 100%; margin: 0"
                   label="备注"
@@ -323,7 +327,7 @@ import {
   handleTimeQuery,
   handleFilterData,
 } from '@/utils/util';
-import { columnList } from '@/option/distribution/addVehicleStowage';
+import { TripartiteTransferColumnList } from '@/option/distribution/TripartiteTransfer.js';
 import {
   postloadFindLoadInitData,
   postFindDriverListByName,
@@ -338,7 +342,7 @@ import { ElMessage } from 'element-plus';
 /** 被合并的列 */
 const mergeColumn = [];
 // 获取需要被合并的列
-columnList.map(val => {
+TripartiteTransferColumnList.map(val => {
   if (val.isColumnMerge) mergeColumn.push(val.prop);
 });
 
@@ -403,7 +407,7 @@ const details = reactive<any>({
   /** 修改的列表信息 */
   editColumnList: [],
   /** 运单池 */
-  columnList: deepClone(columnList),
+  columnList: deepClone(TripartiteTransferColumnList),
   /** 列表数据 */
   oldData: [], // 实际数据
   planData: [], // 计划数据
@@ -811,7 +815,7 @@ const arraySpanMethod = (row: any) => {
 
 /** 跳转到运单详情 */
 const handleGoWayBillDetail = ({ row }) => {
-  if (row.waybillNo === '————') return ElMessage.warning('暂无运单号');
+  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
 
   $router.push({
     path: '/distribution/inventory/BookingNote',
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 84360a64..41bb5d9a 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -1004,7 +1004,7 @@ const handleCheckTab = e => {
 };
 /** 跳转到运单详情 */
 const handleGoWayBillDetail = ({ row }) => {
-  if (row.waybillNo === '————') return ElMessage.warning('暂无运单号');
+  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
 
   $router.push({
     path: '/distribution/inventory/BookingNote',
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
index 9bf136c0..46405635 100644
--- a/src/views/distribution/artery/abnormalList.vue
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -108,7 +108,10 @@
 
           <template v-if="slotProps.scope.column.label === '操作'">
             <el-text
-              v-if="Number(slotProps.scope.row.abnormalStatus) === 0"
+              v-if="
+                Number(slotProps.scope.row.abnormalStatus) === 0 &&
+                [1, 4].includes(Number(slotProps.scope.row.abnormalType))
+              "
               @click="handleAnException(slotProps.scope)"
             >
               处理
@@ -145,15 +148,34 @@
     :align-center="true"
     v-model="details.popUpShow.abnormalVisited"
   >
-    <div class="flex-c-c fwb">
-      包条码 （{{ details.abnormalInfo.orderPackageCode }}） 无系统编号
-    </div>
+    <div class="flex-c-c fwb">包条码 （{{ details.abnormalInfo.orderPackageCode }}）</div>
     <div class="flex-c-c mt20">
-      <el-button @click="details.popUpShow.abnormalVisited = false">取 消</el-button>
-      <el-button type="primary" icon="Delete" @click="handleDeleteOrder">无效包条</el-button>
-      <el-button type="primary" icon="el-icon-search" @click="handleSynchronization">
-        同步数据
-      </el-button>
+      <!-- 系统无编码 -->
+      <template v-if="Number(details.abnormalInfo.abnormalType) === 1">
+        <el-button type="primary" icon="Delete" @click="() => handleAbnormal(1, '确认为无效包条')">
+          无效包条
+        </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          @click="() => handleAbnormal(2, '确认同步数据')"
+        >
+          同步数据
+        </el-button>
+      </template>
+      <!-- 无卸车记录 -->
+      <template v-else-if="Number(details.abnormalInfo.abnormalType) === 3">
+        <el-button type="primary" icon="Delete" @click="() => handleAbnormal(3, '确认为本车次少货')"
+          >本车次少货</el-button
+        >
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          @click="() => handleAbnormal(4, '确认为已入库')"
+        >
+          已入库
+        </el-button>
+      </template>
     </div>
   </el-dialog>
 
@@ -416,38 +438,9 @@ const handleAnException = ({ row }) => {
   details.popUpShow.abnormalVisited = true;
 };
 
-/** 删除包条 */
-const handleDeleteOrder = () => {
-  ElMessageBox.confirm('是否删除该条数据?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-    .then(async () => {
-      details.popUpShow.abnormalVisited = false;
-      try {
-        details.loadingObj.pageLoading = true;
-        const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType: 1 };
-        const res = await postDealAbnormal(submitData);
-
-        const { code, msg } = res.data;
-        if (code !== 200) return;
-
-        ElMessage.success(msg);
-        details.page.pageNum = 1;
-        onLoad();
-      } catch (error) {
-        console.log('error :>> ', error);
-      } finally {
-        details.loadingObj.pageLoading = false;
-      }
-    })
-    .catch(() => {});
-};
-
-/** 数据同步 */
-const handleSynchronization = () => {
-  ElMessageBox.confirm('是否数据同步?', '提示', {
+/** 处理 */
+const handleAbnormal = (dealType, title) => {
+  ElMessageBox.confirm(title, '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
@@ -456,7 +449,7 @@ const handleSynchronization = () => {
       details.popUpShow.abnormalVisited = false;
       try {
         details.loadingObj.pageLoading = true;
-        const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType: 2 };
+        const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType };
         const res = await postDealAbnormal(submitData);
 
         const { code, msg } = res.data;
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index 5c7ac63c..676a7830 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -195,7 +195,7 @@
                 placeholder="请选择车辆"
                 :disabled="details.form.deliveryType + '' !== '2'"
               >
-                <div v-loading="details.loadingObj.loading">
+                <div v-loading="details.loadingObj.carNumber">
                   <template v-if="details.carListByName.length > 0">
                     <div
                       v-for="val in details.carListByName"
@@ -685,6 +685,8 @@ const details = reactive<any>({
     carrierName: false,
     /** 司机 */
     driverName: false,
+    /** 车牌 */
+    carNumber: false,
     /** 提交 */
     submitLoading: false,
   },
@@ -970,11 +972,19 @@ remoteMethodDriver('');
 
 /** 查询车辆 */
 const handleFindCar = async value => {
-  const res = await postFindCarListByName({ carNumber: value });
-  const { code, data } = res.data;
-  if (code !== 200) return;
-  console.log('data :>> ', data);
-  details.carListByName = data;
+  try {
+    details.loadingObj.carNumber = true;
+
+    const res = await postFindCarListByName({ carNumber: value });
+
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.carListByName = data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.carNumber = false;
+  }
 };
 
 /** 选择车辆 */
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index bf0c7522..a4065477 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -1306,6 +1306,11 @@ const printTemplate = () => {
 const handleBatchRemove = async () => {
   if (details.selectionList.length === 0) return ElMessage.warning('请选择需要删除的数据');
 
+  for (let i = 0; i < details.selectionList.length; i++) {
+    const item = details.selectionList[i];
+    if (item.isData !== 0) return ElMessage.warning('只能删除系统无编码数据');
+  }
+
   ElMessageBox.confirm('是否批量删除数据', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index 29217da3..6ba2827c 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -745,7 +745,7 @@ export default {
 
     /** 跳转到运单详情 */
     handleGoWayBillDetail({ row }) {
-      if (row.waybillNo === '————') return this.$message.warning('暂无运单号');
+      if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
 
       this.$router.push({
         path: '/distribution/inventory/BookingNote',
diff --git a/src/views/waybill/ChangeOrder.vue b/src/views/waybill/ChangeOrder.vue
index fac91c7f..87ec0520 100644
--- a/src/views/waybill/ChangeOrder.vue
+++ b/src/views/waybill/ChangeOrder.vue
@@ -468,6 +468,8 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
 
 /** 查看运单 */
 const handleGoWaybillDetails = ({ row }) => {
+  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+
   console.log('row :>> ', row);
   $router.push({
     path: '/distribution/inventory/BookingNote',
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 84147a1b..f34934b2 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -840,6 +840,8 @@ const handleBatchRecover = () => {
 
 /** 查看运单 */
 const handleGoWaybillDetails = ({ row }) => {
+  if (row.waybillNo === '--') return ElMessage.warning('暂无运单号');
+
   console.log('row :>> ', row);
   $router.push({
     path: '/distribution/inventory/BookingNote',
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 6f6562b0..36644e6d 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -14,35 +14,43 @@
           </el-form-item>
 
           <el-form-item label="一级品类">
-            <el-input v-model="query.firstPackName" placeholder="请输入运单号" clearable></el-input>
+            <el-input v-model="query.firsts" placeholder="请输入一级品类" clearable></el-input>
           </el-form-item>
 
           <el-form-item label="二级品类">
-            <el-input
-              v-model="query.secondPackName"
-              placeholder="请输入运单号"
-              clearable
-            ></el-input>
+            <el-input v-model="query.sencods" placeholder="请输入二级品类" clearable></el-input>
           </el-form-item>
 
           <el-form-item label="三级品类">
-            <el-input v-model="query.thirdPackName" placeholder="请输入运单号" clearable></el-input>
+            <el-input v-model="query.thirds" placeholder="请输入三级品类" clearable></el-input>
           </el-form-item>
 
           <el-form-item label="包条码">
             <el-input
               v-model="query.orderPackageCode"
-              placeholder="请输入运单号"
+              placeholder="请输入包条码"
               clearable
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="客户车次号">
-            <el-input v-model="query.trainNumber" placeholder="请输入运单号" clearable></el-input>
+          <el-form-item label="干线车次号">
+            <el-input
+              v-model="query.trunklineCarsNo"
+              placeholder="请输入干线车次号"
+              clearable
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="配送车次号">
+            <el-input
+              v-model="query.deliveryTrainNumber"
+              placeholder="请输入配送车次号"
+              clearable
+            ></el-input>
           </el-form-item>
 
           <el-form-item label="服务号">
-            <el-input v-model="query.serviceNum" placeholder="请输入运单号" clearable></el-input>
+            <el-input v-model="query.serviceNumber" placeholder="请输入服务号" clearable></el-input>
           </el-form-item>
 
           <el-form-item label="创建时间">
@@ -436,6 +444,12 @@ const {
   popUpShow,
 } = toRefs(details);
 
+for (let i = 0; i < details.packageListColumnList.length; i++) {
+  const item = details.packageListColumnList[i];
+  if (item.type !== 0 && item.type !== 12 && item.type !== 6 && item.type !== 13) item.type = 1;
+  console.log('item :>> ', item);
+}
+
 /** vuex */
 const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
 console.log('permission :>> ', permission);
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index abe9f317..2b167503 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -769,11 +769,7 @@
           <div class="text_center" v-if="signforData_status !== '1'">
             <div class="data_box red mb10">
               <div class="data mr5px">
-                {{
-                  signforData.clerkOverTimeScale
-                    ? Number(signforData.clerkOverTimeScale * 100).toFixed(2)
-                    : 0
-                }}
+                {{ signforData.clerkOverTimeScale ? signforData.clerkOverTimeScale : 0 }}
               </div>
               <div class="">%</div>
             </div>
@@ -906,9 +902,7 @@
           <div class="text_center">
             <div class="data_box blue mb10">
               <div class="data mr5px">
-                {{
-                  billSignforData.signScale ? Number(billSignforData.signScale * 100).toFixed(2) : 0
-                }}
+                {{ billSignforData.signScale ? billSignforData.signScale : 0 }}
               </div>
               <div class="">%</div>
             </div>
@@ -930,11 +924,7 @@
           <div class="text_center">
             <div class="data_box purple mb10">
               <div class="data mr5px">
-                {{
-                  billSignforData.clerkSignforScale
-                    ? Number(billSignforData.clerkSignforScale * 100).toFixed(2)
-                    : 0
-                }}
+                {{ billSignforData.clerkSignforScale ? billSignforData.clerkSignforScale : 0 }}
               </div>
               <div class="">%</div>
             </div>
@@ -956,11 +946,7 @@
           <div class="text_center" v-if="billSignforData_status !== '3'">
             <div class="data_box red mb10">
               <div class="data mr5px">
-                {{
-                  billSignforData.clerkOverTimeScale
-                    ? Number(billSignforData.clerkOverTimeScale * 100).toFixed(2)
-                    : 0
-                }}
+                {{ billSignforData.clerkOverTimeScale ? billSignforData.clerkOverTimeScale : 0 }}
               </div>
               <div class="">%</div>
             </div>