From 5c89140b21241426067a10ca6ed4448ff8f8e4e2 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 13 Aug 2026 20:55:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/business/waybill-manage.js         |  2 +-
 .../components/business-crud-page.vue         |  8 +++
 .../components/master-order-detail.vue        | 25 +++++++--
 .../components/master-order-dispatch.vue      | 54 +++++++++++++------
 src/views/business/voucher-manage.vue         | 43 ++++++++++-----
 5 files changed, 99 insertions(+), 33 deletions(-)

diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js
index dc1d2b4..a629a5a 100644
--- a/src/option/business/waybill-manage.js
+++ b/src/option/business/waybill-manage.js
@@ -432,7 +432,7 @@ export const option = {
       {
         label: '运费',
         prop: 'freight',
-        formatter: row => formatFreightTotal(row),
+        formatter: row => formatFreight(row),
         minWidth: 120,
         addDisplay: false,
         editDisplay: false,
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index 3f514d6..7521056 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -11082,6 +11082,14 @@ export default {
         this.$message.warning('请选择至少一条数据');
         return;
       }
+      const nonRoadWaybills = this.selectionList.filter(row => {
+        const transportType = String(row.transportType || '').trim();
+        return transportType !== '公路运输' && transportType.toLowerCase() !== 'road';
+      });
+      if (nonRoadWaybills.length) {
+        this.$message.warning('公路配置仅支持运输方式为“公路运输”的运单');
+        return;
+      }
       if (typeof this.api.roadLoading !== 'function') {
         this.$message.warning('公路配载功能暂未配置');
         return;
diff --git a/src/views/business/components/master-order-detail.vue b/src/views/business/components/master-order-detail.vue
index b526abb..9051f12 100644
--- a/src/views/business/components/master-order-detail.vue
+++ b/src/views/business/components/master-order-detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="master-detail">
     <section v-if="master" class="detail-overview">
-      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)">{{ statusName(master.businessStatus) }}</el-tag></div><el-button @click="$emit('back')">返回</el-button></div>
+      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div><el-button @click="$emit('back')">返回</el-button></div>
       <dl class="detail-meta"><div><dt>客户</dt><dd>{{ master.customerName || '-' }}</dd></div><div><dt>合同编号</dt><dd>{{ master.contractNo || '-' }}</dd></div><div><dt>项目</dt><dd>{{ master.projectName || '-' }}</dd></div><div class="detail-meta__attachments"><dt>附件</dt><dd><template v-if="attachments.length"><el-link v-for="file in attachments" :key="file.url || file.link || file.name || file.originalName" type="primary" @click="previewAttachment(file)">{{ attachmentName(file) }}</el-link></template><span v-else>-</span></dd></div></dl>
       <div class="route-map"><template v-for="(route, index) in segments" :key="route.segmentNo"><div class="route-map__node"><span :class="['route-badge', index ? 'middle' : 'start']">{{ index ? '经' : '起' }}</span><strong>{{ route.departureName || '-' }}</strong><small>{{ route.departureAddress || '-' }}</small><small class="route-map__progress">{{ index ? `已到达 ${quantity(segments[index - 1].arrivedQuantity)}/${quantity(master.totalQuantity)}` : `已调度 ${quantity(route.dispatchedQuantity)}/${quantity(master.totalQuantity)}` }}</small><small v-if="index" class="route-map__progress">已调度 {{ quantity(route.dispatchedQuantity) }}/{{ quantity(master.totalQuantity) }}</small></div><div class="route-map__line"></div><div v-if="index === segments.length - 1" class="route-map__node"><span class="route-badge end">终</span><strong>{{ route.arrivalName || '-' }}</strong><small>{{ route.arrivalAddress || '-' }}</small><small class="route-map__progress">已到达 {{ quantity(route.arrivedQuantity) }}/{{ quantity(master.totalQuantity) }}</small></div></template></div>
     </section>
@@ -14,7 +14,7 @@
     <section v-if="master" class="execution-detail-card">
       <div class="execution-detail-heading"><h3>分段执行明细</h3></div>
       <section v-for="(route, index) in segments" :key="route.segmentNo" class="segment-detail">
-      <header @click="toggleSegment(route.segmentNo)"><h3><span class="segment-index">{{ segmentNumber(route, index) }}</span><span class="segment-detail__transport-type">{{ segmentTransportType(route) || '-' }}</span><span class="segment-detail__progress-bar"><span :style="{ width: `${segmentProgress(route)}%` }"></span></span><span>{{ route.departureName || '-' }} → {{ route.arrivalName || '-' }}</span><span class="segment-detail__progress">已调度 <em>{{ quantity(route.dispatchedQuantity) }}</em> / {{ quantity(plannedQuantity(route)) }} {{ plannedUnit(route) }}</span></h3><div class="segment-detail__header-right"><el-tooltip :content="isSegmentExpanded(route.segmentNo) ? '折叠' : '展开'" placement="top"><el-button circle :icon="isSegmentExpanded(route.segmentNo) ? ArrowUp : ArrowDown" @click.stop="toggleSegment(route.segmentNo)" /></el-tooltip></div></header>
+      <header @click="toggleSegment(route.segmentNo)"><h3><span class="segment-index">{{ segmentNumber(route, index) }}</span><span>{{ route.departureName || '-' }} → {{ route.arrivalName || '-' }}</span><span class="segment-detail__transport-type">{{ segmentTransportType(route) || '-' }}</span><span class="segment-detail__progress-bar"><span :style="{ width: `${segmentProgress(route)}%` }"></span></span><span class="segment-detail__progress">已调度 <em>{{ quantity(route.dispatchedQuantity) }}</em> / {{ quantity(plannedQuantity(route)) }} {{ plannedUnit(route) }}</span></h3><div class="segment-detail__header-right"><el-tooltip :content="isSegmentExpanded(route.segmentNo) ? '折叠' : '展开'" placement="top"><el-button circle :icon="isSegmentExpanded(route.segmentNo) ? ArrowUp : ArrowDown" @click.stop="toggleSegment(route.segmentNo)" /></el-tooltip></div></header>
       <div v-show="isSegmentExpanded(route.segmentNo)" class="segment-execution">
         <div class="segment-stats"><div><span>总量</span><strong>{{ quantity(master.totalQuantity) }}<small>吨</small></strong></div><div><span>已调度</span><strong class="dispatched">{{ quantity(route.dispatchedQuantity) }}<small>吨</small></strong></div><div><span>剩余</span><strong class="remaining">{{ quantity(remainingQuantity(route)) }}<small>吨</small></strong></div></div>
         <el-table :data="route.waybills || []" border class="waybill-table"><el-table-column label="运单号" min-width="180"><template #default="{ row }"><el-link type="primary" @click="openWaybill(row)">{{ row.waybillNo }}</el-link></template></el-table-column><el-table-column prop="carrierName" label="承运商" min-width="190" /><el-table-column label="司机/车牌" min-width="180"><template #default="{ row }">{{ driverVehicle(row) }}</template></el-table-column><el-table-column prop="cargoType" label="货物类型" min-width="120" /><el-table-column label="数量(吨)" width="130"><template #default="{ row }">{{ quantity(row.quantity) }}</template></el-table-column><el-table-column label="状态" width="130"><template #default="{ row }"><el-tag :type="waybillStatusType(row.businessStatus)" size="small">{{ waybillStatusName(row.businessStatus) }}</el-tag></template></el-table-column><el-table-column prop="createTime" label="创建时间" min-width="180" /></el-table>
@@ -25,7 +25,22 @@
     </section>
     <section v-if="master" class="master-goods-card">
       <div class="master-goods-card__heading"><h3>货物信息</h3></div>
-      <el-table :data="master.goods || []" border><el-table-column type="index" label="序号" width="64" /><el-table-column prop="cargoName" label="货物名称" min-width="150" /><el-table-column prop="cargoType" label="货物类型" min-width="130" /><el-table-column label="数量" width="130"><template #default="{ row }">{{ quantity(row.quantity) }} {{ row.quantityUnit || '' }}</template></el-table-column><el-table-column prop="packageType" label="包装" min-width="120" /><el-table-column prop="brand" label="品牌" min-width="120" /><el-table-column prop="specification" label="规格" min-width="120" /><el-table-column prop="model" label="型号" min-width="120" /></el-table>
+      <el-table :data="master.goods || []" border>
+        <el-table-column type="index" label="序号" width="64" />
+        <el-table-column prop="cargoName" label="货物名称" min-width="150" />
+        <el-table-column prop="cargoType" label="货物类型" min-width="130" />
+        <el-table-column prop="packageType" label="包装" min-width="120" />
+        <el-table-column label="重量(吨)" min-width="110"><template #default="{ row }">{{ row.weight ?? row.weightTon ?? (row.quantityUnit === '吨' ? row.quantity : '-') }}</template></el-table-column>
+        <el-table-column label="体积(方)" min-width="110"><template #default="{ row }">{{ row.volume ?? row.volumeCubic ?? '-' }}</template></el-table-column>
+        <el-table-column label="数量" min-width="100"><template #default="{ row }">{{ row.quantity ?? '-' }}{{ row.quantityUnit ? ` ${row.quantityUnit}` : '' }}</template></el-table-column>
+        <el-table-column prop="materialCode" label="物料编码" min-width="130" />
+        <el-table-column prop="deviceCode" label="设备编码" min-width="130" />
+        <el-table-column prop="brand" label="品牌" min-width="120" />
+        <el-table-column label="规格型号" min-width="150"><template #default="{ row }">{{ [row.specification, row.model].filter(Boolean).join('/') || '-' }}</template></el-table-column>
+        <el-table-column prop="remark" label="备注" min-width="160" />
+        <el-table-column label="货物单价(元)" min-width="130"><template #default="{ row }">{{ row.unitPrice ?? '-' }}</template></el-table-column>
+        <el-table-column label="计划日期" min-width="130"><template #default="{ row }">{{ row.planDate || row.planStartDate || '-' }}</template></el-table-column>
+      </el-table>
       <el-empty v-if="!(master.goods || []).length" description="暂无货物信息" :image-size="56" />
     </section>
   </div>
@@ -56,6 +71,7 @@ export default {
       });
     },
     attachments() { const value = this.master?.attachmentsJson; if (Array.isArray(value)) return value; if (!value) return []; try { const parsed = JSON.parse(value); return Array.isArray(parsed) ? parsed : []; } catch (error) { return []; } },
+    transportFlowLabel() { return this.segments.map(route => this.segmentTransportType(route).slice(0, 1)).filter(Boolean).join(' → '); },
     goodsNames() { return (this.master?.goods || []).map(item => item.cargoName).filter(Boolean).join('、') || '-'; },
     goodsTypes() { return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))].join('、') || '-'; },
     dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
@@ -112,6 +128,7 @@ export default {
 .master-detail { padding-bottom: 20px; color: #303133; }
 .detail-overview, .execution-detail-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
 .detail-heading { display: flex; align-items: center; justify-content: space-between; padding: 18px 24px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
+.transport-flow-tag { margin-left: 8px; }
 .detail-meta { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 18px 24px; margin: 0; padding: 0 24px 20px; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { display: flex; flex-wrap: wrap; gap: 8px 16px; margin: 0; color: #409eff; font-size: 14px; word-break: break-all; } }
 .route-map { display: flex; align-items: flex-start; padding: 16px 24px 20px; border-top: 1px solid #eff1f7; overflow-x: auto; }
 .route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
@@ -122,7 +139,7 @@ export default {
 .segment-detail { padding: 16px 24px; border-top: 1px solid #eff1f7; header { display: flex; align-items: center; justify-content: space-between; margin: -16px -24px 8px; padding: 12px 24px; cursor: pointer; background: #fafbfc; h3 { display: flex; min-width: 0; align-items: center; flex-wrap: wrap; gap: 12px; margin: 0; font-size: 16px; } em { color: #409eff; font-style: normal; } } }
 .segment-detail__progress { color: #606266; font-size: 14px; font-weight: 400; }
 .segment-detail__transport-type { color: #409eff; font-size: 14px; font-weight: 500; }
-.segment-detail__progress-bar { display: inline-flex; width: 72px; height: 6px; overflow: hidden; border-radius: 3px; background: #e4e7ed; }
+.segment-detail__progress-bar { display: inline-flex; width: 144px; height: 6px; overflow: hidden; border-radius: 3px; background: #e4e7ed; }
 .segment-detail__progress-bar span { display: block; height: 100%; background: #409eff; transition: width 0.2s ease; }
 .segment-detail__header-right { display: flex; align-items: center; gap: 12px; }
 .segment-index { display: inline-flex; width: 36px; height: 36px; align-items: center; justify-content: center; border-radius: 50%; background: #2088ee; color: #fff; font-size: 20px; font-weight: 500; }
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 32aec10..c2d974b 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -56,12 +56,16 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="16">
             <el-col :span="12">
               <el-form-item label="发货地址" required><el-input :model-value="addressText(route.departureName, route.departureAddress)" readonly /></el-form-item>
             </el-col>
             <el-col :span="4"><el-form-item label="联系人"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item></el-col>
             <el-col :span="4"><el-form-item label="联系方式"><el-input v-model="route.departurePhone" placeholder="请输入" /></el-form-item></el-col>
             <el-col :span="4"><el-form-item :label="dateStartLabel(route)" required><el-date-picker v-model="route.estimatedStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" /></el-form-item></el-col>
+          </el-row>
+          <el-row :gutter="16">
             <el-col :span="12">
               <el-form-item label="收货地址" required><el-input :model-value="addressText(route.arrivalName, route.arrivalAddress)" readonly /></el-form-item>
             </el-col>
@@ -121,13 +125,23 @@
           <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-type-form"><el-form-item label="承运类型" required><el-radio-group v-model="route.carrierType" @change="value => handleCarrierTypeChange(route, value)"><el-radio-button label="承运商" /><el-radio-button label="自运" /><el-radio-button label="网货平台" /></el-radio-group></el-form-item></el-form>
           <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-form">
             <el-row :gutter="16">
-              <el-col v-if="route.carrierType === '承运商'" :span="6"><el-form-item label="承运商" required><el-select v-model="route.carrierName" filterable remote clearable placeholder="请选择" :remote-method="loadCarrierOptions" :loading="carrierLoading" @visible-change="visible => visible && loadCarrierOptions()"><el-option v-for="item in carrierOptions" :key="carrierOptionKey(item)" :label="carrierOptionLabel(item)" :value="carrierOptionLabel(item)" /></el-select></el-form-item></el-col>
-              <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-select :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" filterable remote clearable placeholder="请选择" :remote-method="loadDriverOptions" :loading="driverLoading" @visible-change="visible => visible && loadDriverOptions()" @change="value => handleDriverChange(route, value)"><el-option v-for="item in driverOptions" :key="driverOptionKey(item)" :label="driverOptionLabel(item)" :value="driverOptionLabel(item)" /></el-select></el-form-item></el-col>
-              <el-col :span="6"><el-form-item :label="route.carrierType === '承运商' ? '手机号' : '司机手机号'" :required="route.carrierType !== '承运商'"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
-              <el-col :span="6"><el-form-item label="车牌号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
-              <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="挂车车牌号" required><el-input v-model="route.trailerVehicleNo" placeholder="请输入" /></el-form-item></el-col>
-              <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人" required><el-input v-model="route.escortName" placeholder="请输入" /></el-form-item></el-col>
-              <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人手机号" required><el-input v-model="route.escortPhone" placeholder="请输入" /></el-form-item></el-col>
+              <template v-if="isRoad(route)">
+                <el-col v-if="route.carrierType === '承运商'" :span="6"><el-form-item label="承运商" required><el-select v-model="route.carrierName" filterable remote clearable placeholder="请选择" :remote-method="loadCarrierOptions" :loading="carrierLoading" @visible-change="visible => visible && loadCarrierOptions()"><el-option v-for="item in carrierOptions" :key="carrierOptionKey(item)" :label="carrierOptionLabel(item)" :value="carrierOptionLabel(item)" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-select :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" filterable remote clearable placeholder="请选择" :remote-method="loadDriverOptions" :loading="driverLoading" @visible-change="visible => visible && loadDriverOptions()" @change="value => handleDriverChange(route, value)"><el-option v-for="item in driverOptions" :key="driverOptionKey(item)" :label="driverOptionLabel(item)" :value="driverOptionLabel(item)" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item :label="route.carrierType === '承运商' ? '手机号' : '司机手机号'" :required="route.carrierType !== '承运商'"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="车牌号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
+                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="挂车车牌号" required><el-input v-model="route.trailerVehicleNo" placeholder="请输入" /></el-form-item></el-col>
+                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人" required><el-input v-model="route.escortName" placeholder="请输入" /></el-form-item></el-col>
+                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人手机号" required><el-input v-model="route.escortPhone" placeholder="请输入" /></el-form-item></el-col>
+              </template>
+              <template v-else>
+                <el-col v-if="route.carrierType === '承运商'" :span="6"><el-form-item label="承运商" required><el-select v-model="route.carrierName" filterable remote clearable placeholder="请选择" :remote-method="loadCarrierOptions" :loading="carrierLoading" @visible-change="visible => visible && loadCarrierOptions()"><el-option v-for="item in carrierOptions" :key="carrierOptionKey(item)" :label="carrierOptionLabel(item)" :value="carrierOptionLabel(item)" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="船/航/班列号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="船长" required><el-input v-model="route.captainName" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="联系电话" required><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="箱号" required><el-input v-model="route.containerNo" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="舱位" required><el-input v-model="route.cabinNo" placeholder="请输入" /></el-form-item></el-col>
+              </template>
               <el-col :span="6"><el-form-item label="里程(km)" required><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
               <el-col :span="6"><el-form-item label="备注"><el-input v-model="route.remark" maxlength="200" show-word-limit placeholder="请输入" /></el-form-item></el-col>
             </el-row>
@@ -284,7 +298,7 @@ export default {
       else Object.assign(row, { sourceIndex: undefined, cargoName: '', quantity: '', quantityUnit: '' });
       this.syncFreightItems(route);
     },
-    isRoad(route) { return String(route.transportType || '').includes('公路'); },
+    isRoad(route) { const type = String(route.transportType || '').toLowerCase(); return type.includes('公路') || type === 'road'; },
     dispatchedQuantity(route) {
       return this.quantityNumber(route.dispatchedQuantity) + this.pendingSegmentQuantity(route);
     },
@@ -344,9 +358,13 @@ export default {
     },
     dispatchedGoodsQuantity(route, row) {
       const dispatchedGoods = route.dispatchedGoods || {};
-      return this.quantityNumber(
-        dispatchedGoods[this.goodsKey(row)] ?? dispatchedGoods[this.goodsKey(row, false)]
-      );
+      const exactValue = dispatchedGoods[this.goodsKey(row)] ?? dispatchedGoods[this.goodsKey(row, false)];
+      if (exactValue !== undefined && exactValue !== null) return this.quantityNumber(exactValue);
+      const matchedValue = Object.entries(dispatchedGoods).find(([key]) => {
+        const [cargoName, cargoType] = String(key).split('\u0000');
+        return cargoName === row.cargoName && cargoType === row.cargoType;
+      })?.[1];
+      return this.quantityNumber(matchedValue);
     },
     baseGoodsRemainingQuantity(route, row) {
       return Math.max(0, this.quantityNumber(row.quantity) - this.dispatchedGoodsQuantity(route, row));
@@ -493,7 +511,6 @@ export default {
         route.trailerVehicleNo = '';
         route.escortName = '';
         route.escortPhone = '';
-        route.mileage = undefined;
       } else {
         route.carrierName = '';
       }
@@ -532,6 +549,9 @@ export default {
       route.driverName = '';
       route.driverPhone = '';
       route.vehicleNo = '';
+      route.captainName = '';
+      route.containerNo = '';
+      route.cabinNo = '';
       route.trailerVehicleNo = '';
       route.escortName = '';
       route.escortPhone = '';
@@ -548,15 +568,19 @@ export default {
       if (!route.estimatedEndTime) return this.$message.warning(`请选择${this.dateEndLabel(route)}`);
       if (!this.validateRoutePhones(route)) return;
       if (route.documentType === '运单') {
-        if (route.carrierType === '承运商' && (!route.carrierName || !route.vehicleNo || !route.mileage)) return this.$message.warning('请填写承运商、车牌号和里程');
-        if (route.carrierType !== '承运商' && (!route.driverName || !route.driverPhone || !route.vehicleNo || !route.trailerVehicleNo || !route.escortName || !route.escortPhone || route.mileage === undefined || route.mileage === null || route.mileage === '')) return this.$message.warning('请补全自运或网货平台的车辆与人员信息');
+        if (this.isRoad(route)) {
+          if (route.carrierType === '承运商' && (!route.carrierName || !route.vehicleNo || !route.mileage)) return this.$message.warning('请填写承运商、车牌号和里程');
+          if (route.carrierType !== '承运商' && (!route.driverName || !route.driverPhone || !route.vehicleNo || !route.trailerVehicleNo || !route.escortName || !route.escortPhone || route.mileage === undefined || route.mileage === null || route.mileage === '')) return this.$message.warning('请补全自运或网货平台的车辆与人员信息');
+        } else if (!route.vehicleNo || !route.captainName || !route.driverPhone || !route.containerNo || !route.cabinNo || route.mileage === undefined || route.mileage === null || route.mileage === '' || (route.carrierType === '承运商' && !route.carrierName)) {
+          return this.$message.warning('请补全非公路运输的承运信息和里程');
+        }
       }
       const batchNo = `${route.segmentNo}-${Date.now()}`;
       goods.forEach(item => this.pending.push({
         id: `${route.segmentNo}-${item.cargoName}-${Date.now()}-${Math.random()}`,
         batchNo,
         segmentNo: route.segmentNo, relationNo: route.segmentNo, documentType: route.documentType, transportType: route.transportType, carrierType: route.carrierType,
-        carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'CNY', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), remark: route.remark,
+        carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'CNY', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), remark: route.remark,
         departureName: route.departureName, departureAddress: route.departureAddress, departureContact: route.departureContact, departurePhone: route.departurePhone,
         arrivalName: route.arrivalName, arrivalAddress: route.arrivalAddress, arrivalContact: route.arrivalContact, arrivalPhone: route.arrivalPhone,
         estimatedStartTime: route.estimatedStartTime, estimatedEndTime: route.estimatedEndTime,
diff --git a/src/views/business/voucher-manage.vue b/src/views/business/voucher-manage.vue
index abe9894..2cfd8c4 100644
--- a/src/views/business/voucher-manage.vue
+++ b/src/views/business/voucher-manage.vue
@@ -181,7 +181,7 @@
           accept=".zip,.7z"
           :auto-upload="false"
           :limit="1"
-          :on-change="uploadVoucher"
+          :on-change="selectVoucherFile"
           :on-remove="clearFile"
           ><el-button
             type="primary"
@@ -425,7 +425,8 @@ const loading = ref(false),
   closingProgressDialog = ref(false),
   cancelledTaskIds = ref(new Set()),
   uploadCancelled = ref(false),
-  activeUploadTaskId = ref();
+  activeUploadTaskId = ref(),
+  selectedVoucherFile = ref();
 const query = reactive({
   voucherBatchNo: '',
   auditStatus: '',
@@ -499,6 +500,7 @@ const changeProject = projectId => {
 };
 const openUpload = async row => {
   await loadProjects();
+  selectedVoucherFile.value = undefined;
   Object.assign(editing, {
     id: row?.id || '',
     voucherBatchNo: row?.voucherBatchNo || '',
@@ -520,7 +522,10 @@ const openUpload = async row => {
     editing.waybillImportBatchIds = selectedBatches.value.map(item => item.id);
   }
 };
-const clearFile = () => Object.assign(editing, { fileName: '', fileUrl: '', fileTaskId: '' });
+const clearFile = () => {
+  selectedVoucherFile.value = undefined;
+  Object.assign(editing, { fileName: '', fileUrl: '', fileTaskId: '' });
+};
 const isCurrentUploadTask = taskId =>
   taskId && activeUploadTaskId.value && String(taskId) === String(activeUploadTaskId.value);
 const stopCurrentUpload = async taskId => {
@@ -543,11 +548,11 @@ const stopCurrentUpload = async taskId => {
     ElMessage.error(error.message || '暂停上传失败');
   }
 };
-const closeUploadDialog = async () => {
+const closeUploadDialog = async (pauseUpload = true) => {
   if (closingUploadDialog.value) return;
   closingUploadDialog.value = true;
   try {
-    await stopCurrentUpload(editing.fileTaskId);
+    if (pauseUpload) await stopCurrentUpload(editing.fileTaskId);
     uploadVisible.value = false;
   } finally {
     closingUploadDialog.value = false;
@@ -633,6 +638,7 @@ const uploadParts = async (file, task, sessionId) => {
     editing.fileName = file.name;
     editing.fileTaskId = task.id;
     editing.fileUrl = fileUrlRes.data?.data || '';
+    if (!editing.fileUrl) throw new Error('未获取到上传文件地址，请稍后重试');
     await api.completeUploadFile({
       voucherBatchNo: task.businessId,
       fileTaskId: task.id,
@@ -726,14 +732,23 @@ const uploadVoucher = async file => {
     cancelledTaskIds.value.delete(String(task.id));
     resumeTarget.value = undefined;
     await uploadParts(raw, task, sessionId);
+		return Boolean(editing.fileUrl);
   } catch (error) {
     if (error.name !== 'AbortError')
       ElMessage.error(error.message || '上传中断，可在上传进度中继续上传');
+		return false;
   }
 };
+const selectVoucherFile = file => {
+  if (!file?.raw) return;
+  selectedVoucherFile.value = file.raw;
+  editing.fileName = file.raw.name;
+  editing.fileUrl = '';
+  editing.fileTaskId = '';
+};
 watch(uploadVisible, visible => {
   // 兜底处理：右上角、遮罩、Esc 直接修改 v-model 时仍必须停止上传。
-  if (!visible) void stopCurrentUpload(editing.fileTaskId);
+  if (!visible && !closingUploadDialog.value) void stopCurrentUpload(editing.fileTaskId);
 });
 const openBatchDialog = async () => {
   batchVisible.value = true;
@@ -773,21 +788,23 @@ const removeBatch = row => {
 const submitUpload = async () => {
   saving.value = true;
   try {
-    if (uploading.value && editing.fileTaskId) {
-      await stopCurrentUpload(editing.fileTaskId);
-    }
     const valid = await uploadFormRef.value.validate().catch(() => false);
     if (!valid) return;
-    if (!editing.fileUrl && !editing.fileTaskId) {
-      ElMessage.warning('请先选择执行凭证');
-      return;
+    if (!editing.fileUrl) {
+		if (!selectedVoucherFile.value) {
+			ElMessage.warning('请先选择执行凭证');
+        return;
+		}
+		const uploaded = await uploadVoucher({ raw: selectedVoucherFile.value });
+		if (!uploaded) return;
+		selectedVoucherFile.value = undefined;
     }
     await api.submit({
       ...editing,
       waybillImportBatchIds: selectedBatches.value.map(item => item.id),
     });
     ElMessage.success('提交成功');
-    await closeUploadDialog();
+    await closeUploadDialog(false);
     load();
   } finally {
     saving.value = false;

From 6e012d766c1fd2e3713ff9de934046a2bdbe141d Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Fri, 14 Aug 2026 02:49:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/business/waybill-manage.js         |  110 +-
 .../components/business-crud-page.vue         | 1712 +++++++++++++++--
 .../components/waybill-import-dialog.vue      |   18 +-
 src/views/business/loading-manage.vue         |  126 +-
 src/views/business/master-order.vue           |    9 +-
 .../vehicle/credit-score-quantification.vue   |   47 +-
 src/views/vehicle/customer-archive.vue        |   41 +-
 7 files changed, 1825 insertions(+), 238 deletions(-)

diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js
index a629a5a..2eeac24 100644
--- a/src/option/business/waybill-manage.js
+++ b/src/option/business/waybill-manage.js
@@ -49,6 +49,16 @@ const parseJsonObject = value => {
 const parseProcessNodes = value => {
   const result = parseJsonArray(value);
   if (result.length) return result;
+  if (typeof value === 'string' && value.trim()) {
+    try {
+      const parsed = JSON.parse(value);
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        return Array.isArray(parsed.nodes) ? parsed.nodes : [];
+      }
+    } catch (error) {
+      return [];
+    }
+  }
   if (!value || typeof value !== 'object' || Array.isArray(value)) return [];
   return Array.isArray(value.nodes) ? value.nodes : [];
 };
@@ -62,6 +72,75 @@ const requiresDriverAcceptConfirmation = processJson =>
       node.confirmDriver === true
   );
 
+const getProcessConfigNodes = row => {
+  const sources = [
+    row.processJson,
+    row.processConfigJson,
+    row.projectProcessJson,
+    row.processConfig,
+    row.projectProcessConfig,
+  ];
+  return sources.flatMap(source => {
+    const nodes = parseProcessNodes(source);
+    if (nodes.length || !source || typeof source !== 'object' || Array.isArray(source)) {
+      return nodes;
+    }
+    const configuredNodes = parseProcessNodes(source.nodeConfigJson);
+    const includedNodes = String(source.includedNodes || '')
+      .split(',')
+      .map(item => item.trim())
+      .filter(Boolean);
+    return configuredNodes.filter(
+      node =>
+        !includedNodes.length ||
+        includedNodes.includes(node.name) ||
+        includedNodes.includes(node.key)
+    );
+  });
+};
+
+const hasAcceptProcessNode = row =>
+  getProcessConfigNodes(row).some(
+    node => node.enabled !== false && (node.key === 'accept' || node.name === '接单')
+  );
+
+const hasDriverAcceptRecord = row => {
+  const recordValues = [
+    row.driverAcceptTime,
+    row.driverAcceptedTime,
+    row.acceptTime,
+    row.driverAcceptId,
+    row.driverAcceptedBy,
+    row.acceptUserId,
+    row.acceptUserName,
+  ];
+  if (recordValues.some(value => value !== null && value !== undefined && value !== '')) {
+    return true;
+  }
+  const statusValues = [
+    row.driverAcceptStatus,
+    row.driverAccepted,
+    row.driverAccept,
+    row.accepted,
+    row.isAccepted,
+    row.acceptStatus,
+  ];
+  return statusValues.some(value => {
+    if (value === true) return true;
+    if (value === false || value === null || value === undefined || value === '') return false;
+    return ['1', 'true', 'accepted', 'confirmed', 'success', '已接单', '已确认'].includes(
+      String(value).toLowerCase()
+    );
+  });
+};
+
+const isInProgressStatus = (row, defaultText) =>
+  ['processing', 'running', 'in_progress', 'inProgress'].includes(
+    String(row.businessStatus || row.status || row.waybillStatus || '')
+  ) ||
+  String(defaultText || '').includes('进行中') ||
+  String(row.businessStatusName || row.statusName || '').includes('进行中');
+
 const getFirstValue = (row, props) => {
   const prop = props.find(item => !isEmpty(row[item]));
   return prop ? row[prop] : '';
@@ -222,6 +301,14 @@ export const config = {
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
   formatStatus(row, prop, defaultText) {
+    if (
+      prop === 'businessStatus' &&
+      hasAcceptProcessNode(row) &&
+      isInProgressStatus(row, defaultText) &&
+      !hasDriverAcceptRecord(row)
+    ) {
+      return '待执行';
+    }
     if (
       prop === 'businessStatus' &&
       row.businessStatus === 'pending' &&
@@ -538,6 +625,19 @@ export const option = {
         viewDisplay: false,
         display: false,
       },
+      {
+        label: '关联单号',
+        prop: 'relationNo',
+        search: true,
+        searchOrder: 2,
+        span: 6,
+        order: 820,
+        minWidth: 140,
+        hide: false,
+        addDisplay: true,
+        editDisplay: true,
+        viewDisplay: true,
+      },
       {
         label: '预计发货日期',
         prop: 'estimatedStartTime',
@@ -684,16 +784,6 @@ export const option = {
         editDisplay: false,
         viewDisplay: false,
       },
-      {
-        label: '关联单号',
-        prop: 'relationNo',
-        search: true,
-        searchOrder: 2,
-        span: 6,
-        order: 820,
-        minWidth: 140,
-        hide: true,
-      },
       {
         label: '货物信息',
         prop: 'goodsJson',
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index aea1fae..a495342 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -114,7 +114,11 @@
           :content="row.departureAddress || '-'"
           placement="top"
         >
-          <span>{{ formatTransportPlanDistrictAddress(row.departureAddress) }}</span>
+          <span>{{
+            isTransportPlanPage
+              ? formatTransportPlanProvinceCityDistrict(row.departureAddress)
+              : formatTransportPlanProvinceCityDistrict(row.departureAddress)
+          }}</span>
         </el-tooltip>
         <span v-else>{{ row.departureAddress || '-' }}</span>
       </template>
@@ -125,7 +129,11 @@
           :content="row.arrivalAddress || '-'"
           placement="top"
         >
-          <span>{{ formatTransportPlanDistrictAddress(row.arrivalAddress) }}</span>
+          <span>{{
+            isTransportPlanPage
+              ? formatTransportPlanProvinceCityDistrict(row.arrivalAddress)
+              : formatTransportPlanProvinceCityDistrict(row.arrivalAddress)
+          }}</span>
         </el-tooltip>
         <span v-else>{{ row.arrivalAddress || '-' }}</span>
       </template>
@@ -2335,14 +2343,172 @@
 
     <el-dialog
       v-model="detailBox"
-      :title="`${config.title}详情`"
+      :title="isTransportPlanDetailLayout ? '' : `${config.title}详情`"
       append-to-body
       top="10px"
-      width="96%"
-      class="business-crud-page__detail-dialog"
+      :width="isTransportPlanDetailLayout ? 'calc(100% - 16px)' : '96%'"
+      show-close
+      :class="[
+        'business-crud-page__detail-dialog',
+        { 'is-transport-plan-detail': isTransportPlanDetailLayout },
+      ]"
     >
       <div v-loading="detailLoading" class="business-crud-page__detail-content">
-        <template v-if="isWaybillDetailLayout">
+        <template v-if="isTransportPlanDetailLayout">
+          <section class="business-crud-page__transport-plan-detail-head">
+            <div class="business-crud-page__transport-plan-detail-title-row">
+              <h2>
+                {{ detailRow.planName || detailRow.planNo || '运输计划' }}
+                <span>|</span>
+                {{ detailRow.planNo || '-' }}
+              </h2>
+              <el-tag class="is-dispatching" effect="light">
+                {{ displayStatus(detailRow, 'businessStatus') }}
+              </el-tag>
+              <el-tag type="primary" effect="light">
+                {{
+                  detailRow.transportTypeName ||
+                  formatTransportPlanDetailTransportType(detailRow.transportType)
+                }}
+              </el-tag>
+            </div>
+            <div class="business-crud-page__transport-plan-detail-overview">
+              <div class="business-crud-page__transport-plan-detail-fields">
+                <div class="business-crud-page__transport-plan-detail-field">
+                  <span>客户</span>
+                  <strong>{{ detailRow.customerName || '-' }}</strong>
+                </div>
+                <div class="business-crud-page__transport-plan-detail-field">
+                  <span>项目</span>
+                  <strong>{{ detailRow.projectName || '-' }}</strong>
+                </div>
+                <div class="business-crud-page__transport-plan-detail-field">
+                  <span>合同编号</span>
+                  <strong>{{ detailRow.contractNo || detailRow.contractName || '-' }}</strong>
+                </div>
+                <div class="business-crud-page__transport-plan-detail-field">
+                  <span>货物信息</span>
+                  <strong class="is-normal">{{ transportPlanGoodsText }}</strong>
+                </div>
+                <div class="business-crud-page__transport-plan-detail-field">
+                  <span>计划执行时间</span>
+                  <strong class="is-normal">{{ transportPlanDateRange }}</strong>
+                </div>
+                <div class="business-crud-page__transport-plan-detail-field is-attachments">
+                  <span>附件</span>
+                  <div class="business-crud-page__transport-plan-detail-attachments">
+                    <el-link
+                      v-for="file in attachmentRows"
+                      :key="file.url || file.name || file.originalName"
+                      type="primary"
+                      @click="previewAttachment(file)"
+                    >
+                      {{ attachmentName(file) }}
+                    </el-link>
+                    <span v-if="!attachmentRows.length">-</span>
+                  </div>
+                </div>
+              </div>
+              <div class="business-crud-page__transport-plan-detail-route">
+                <div class="business-crud-page__transport-plan-detail-route-point">
+                  <b class="is-start">起</b>
+                  <div>
+                    <strong>{{ detailRow.departureName || detailRow.departureAddress || '-' }}</strong>
+                    <p>{{ formatTransportPlanProvinceCityDistrict(detailRow.departureAddress) }}</p>
+                    <p>{{ [detailRow.departureContact, detailRow.departurePhone].filter(Boolean).join(' - ') || '-' }}</p>
+                  </div>
+                </div>
+                <span class="business-crud-page__transport-plan-detail-route-line" />
+                <div class="business-crud-page__transport-plan-detail-route-point">
+                  <b class="is-end">终</b>
+                  <div>
+                    <strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
+                    <p>{{ formatTransportPlanProvinceCityDistrict(detailRow.arrivalAddress) }}</p>
+                    <p>{{ [detailRow.arrivalContact, detailRow.arrivalPhone].filter(Boolean).join(' - ') || '-' }}</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </section>
+
+          <section class="business-crud-page__transport-plan-waybill-card">
+            <div class="business-crud-page__transport-plan-waybill-heading">
+              <h3>运单记录</h3>
+              <span>总量{{ transportPlanDispatchSummary.total }}吨</span>
+              <span>，已调度 <em>{{ transportPlanDispatchSummary.assigned.toFixed(2) }}</em> 吨</span>
+              <span>，剩余 <em>{{ transportPlanDispatchSummary.remaining.toFixed(2) }}</em> 吨</span>
+            </div>
+            <el-table
+              :data="transportPlanWaybillPageRows"
+              border
+              height="calc(100vh - 475px)"
+              empty-text="暂无运单记录"
+              class="business-crud-page__transport-plan-waybill-table"
+            >
+              <el-table-column
+                type="index"
+                label="序号"
+                width="96"
+                align="center"
+                :index="transportPlanWaybillIndex"
+              />
+              <el-table-column label="运单号" width="192">
+                <template #default="{ row }">
+                  <el-link v-if="row.id || row.waybillNo" type="primary" @click="openTransportPlanWaybillDetail(row)">
+                    {{ row.waybillNo || '-' }}
+                  </el-link>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" width="192" />
+              <el-table-column prop="driverName" label="司机" width="128" />
+              <el-table-column prop="carrierName" label="承运商" width="192" />
+              <el-table-column label="运输方式" width="192">
+                <template #default="{ row }">
+                  {{ formatTransportPlanDetailTransportType(row.transportType) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="carrierType" label="承运类型" width="192" />
+              <el-table-column prop="goodsInfo" label="货物信息" min-width="320" />
+              <el-table-column label="发货地址" width="220" show-overflow-tooltip>
+                <template #default="{ row }">
+                  {{ formatTransportPlanProvinceCityDistrict(row.departureAddress) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="状态" width="120">
+                <template #default="{ row }">
+                  <span
+                    :class="['business-crud-page__transport-plan-waybill-status', row.statusClass]"
+                  >
+                    {{ row.statusText || '-' }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="128" fixed="right">
+                <template #default="{ row }">
+                  <el-link
+                    type="primary"
+                    @click="openTransportPlanWaybillDetail(row)"
+                  >
+                    详情
+                  </el-link>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="business-crud-page__transport-plan-waybill-pagination">
+              <el-pagination
+                v-model:current-page="transportPlanWaybillPage.currentPage"
+                v-model:page-size="transportPlanWaybillPage.pageSize"
+                :page-sizes="transportPlanWaybillPage.pageSizes"
+                layout="total, sizes, prev, pager, next"
+                :total="transportPlanWaybillRows.length"
+                @current-change="handleTransportPlanWaybillCurrentChange"
+                @size-change="handleTransportPlanWaybillSizeChange"
+              />
+            </div>
+          </section>
+        </template>
+        <template v-else-if="isWaybillDetailLayout">
           <section-card class="business-crud-page__waybill-detail-summary">
             <div class="business-crud-page__waybill-heading">
               <strong>运单详情</strong>
@@ -2380,7 +2546,13 @@
                 ><strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
                 </div>
                 <div class="business-crud-page__waybill-route-text">
-                  {{ detailRow.departureAddress || '-' }}　→　{{ detailRow.arrivalAddress || '-' }}
+                  <el-tooltip :content="detailRow.departureAddress || '-'" placement="top">
+                    <span>{{ formatTransportPlanProvinceCityDistrict(detailRow.departureAddress) }}</span>
+                  </el-tooltip>
+                  <span>　→　</span>
+                  <el-tooltip :content="detailRow.arrivalAddress || '-'" placement="top">
+                    <span>{{ formatTransportPlanProvinceCityDistrict(detailRow.arrivalAddress) }}</span>
+                  </el-tooltip>
                 </div>
               </div>
               <div class="business-crud-page__waybill-attachments">
@@ -2429,9 +2601,11 @@
               <div class="business-crud-page__waybill-detail-field">
                 <span>承运类型</span><strong>{{ detailRow.carrierType || '-' }}</strong>
               </div>
-              <div class="business-crud-page__waybill-detail-field">
-                <span>承运商/自运</span
-                ><strong>{{ detailRow.carrierName || detailRow.carrierType || '-' }}</strong>
+              <div
+                v-if="waybillIsCarrier(detailRow)"
+                class="business-crud-page__waybill-detail-field"
+              >
+                <span>承运商</span><strong>{{ detailRow.carrierName || '-' }}</strong>
               </div>
               <div
                 v-if="waybillIsRoadTransport(detailRow)"
@@ -2443,37 +2617,56 @@
               >
               </div>
               <div class="business-crud-page__waybill-detail-field">
-                <span>{{
-                    waybillIsRoadTransport(detailRow) ? '车牌号' : '航班号/船次号/班列号'
-                  }}</span
-                ><strong>{{ detailRow.vehicleNo || '-' }}</strong>
+                <span>{{ waybillVehicleNoLabel(detailRow) }}</span>
+                <strong>{{ detailRow.vehicleNo || '-' }}</strong>
               </div>
               <div
-                v-if="waybillIsRoadTransport(detailRow)"
+                v-if="waybillIsNonRoadTransport(detailRow)"
                 class="business-crud-page__waybill-detail-field"
               >
-                <span>挂车车牌</span><strong>{{ detailRow.trailerVehicleNo || '-' }}</strong>
+                <span>船长</span><strong>{{ detailRow.captainName || '-' }}</strong>
               </div>
               <div
-                v-if="waybillIsRoadTransport(detailRow)"
+                v-if="waybillIsNonRoadTransport(detailRow) && waybillIsCarrier(detailRow)"
                 class="business-crud-page__waybill-detail-field"
               >
-                <span>押运人</span
-                ><strong
-              >{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}</strong
-              >
+                <span>联系电话</span><strong>{{ detailRow.driverPhone || '-' }}</strong>
               </div>
               <div
-                v-if="!waybillIsRoadTransport(detailRow)"
+                v-if="waybillIsNonRoadTransport(detailRow)"
                 class="business-crud-page__waybill-detail-field"
               >
                 <span>箱号</span><strong>{{ detailRow.containerNo || '-' }}</strong>
               </div>
               <div
-                v-if="!waybillIsRoadTransport(detailRow)"
+                v-if="waybillIsNonRoadTransport(detailRow)"
                 class="business-crud-page__waybill-detail-field"
               >
-                <span>仓位</span><strong>{{ detailRow.cabinNo || '-' }}</strong>
+                <span>舱位</span><strong>{{ detailRow.cabinNo || '-' }}</strong>
+              </div>
+              <div
+                v-if="waybillIsRoadTransport(detailRow) && !waybillIsCarrier(detailRow)"
+                class="business-crud-page__waybill-detail-field"
+              >
+                <span>挂车车牌号</span><strong>{{ detailRow.trailerVehicleNo || '-' }}</strong>
+              </div>
+              <div
+                v-if="waybillIsRoadTransport(detailRow) && !waybillIsCarrier(detailRow)"
+                class="business-crud-page__waybill-detail-field"
+              >
+                <span>押运人</span><strong>{{ detailRow.escortName || '-' }}</strong>
+              </div>
+              <div
+                v-if="waybillIsRoadTransport(detailRow) && !waybillIsCarrier(detailRow)"
+                class="business-crud-page__waybill-detail-field"
+              >
+                <span>押运人手机号</span><strong>{{ detailRow.escortPhone || '-' }}</strong>
+              </div>
+              <div
+                v-if="waybillIsRoadTransport(detailRow) && !waybillIsCarrier(detailRow)"
+                class="business-crud-page__waybill-detail-field"
+              >
+                <span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
               </div>
               <div
                 class="business-crud-page__waybill-detail-field business-crud-page__waybill-detail-field--remark"
@@ -2483,25 +2676,50 @@
               </div>
             </div>
           </section-card>
-          <section-card title="费用信息">
+          <section-card title="运费信息">
             <div
               class="business-crud-page__waybill-carrier-grid business-crud-page__waybill-fee-grid"
             >
               <div class="business-crud-page__waybill-detail-field">
-                <span>单价</span><strong>{{ waybillUnitPrice(detailRow) || '-' }}</strong>
+                <span>单价</span>
+                <strong>
+                  <template v-if="waybillUnitPriceWithCurrency(detailRow).value !== '-'">
+                    <span class="business-crud-page__waybill-fee-value">
+                      {{ waybillUnitPriceWithCurrency(detailRow).value }}
+                    </span>
+                    <span v-if="waybillUnitPriceWithCurrency(detailRow).unit">
+                      {{ ' ' + waybillUnitPriceWithCurrency(detailRow).unit }}
+                    </span>
+                  </template>
+                  <template v-else>-</template>
+                </strong>
               </div>
               <div class="business-crud-page__waybill-detail-field">
-                <span>运费</span><strong>{{ formatDetailValue(detailRow, 'freight') }}</strong>
+                <span>运费</span>
+                <strong>
+                  <template v-if="waybillAmountWithCurrency(detailRow, 'freight').value !== '-'">
+                    <span class="business-crud-page__waybill-fee-value">{{ waybillAmountWithCurrency(detailRow, 'freight').value }}</span>元
+                  </template>
+                  <template v-else>-</template>
+                </strong>
               </div>
               <div class="business-crud-page__waybill-detail-field">
-                <span>其他费用合计</span
-                ><strong>{{ formatDetailValue(detailRow, 'otherFeeTotal') }}</strong>
+                <span>其他费用合计</span>
+                <strong>
+                  <template v-if="waybillAmountWithCurrency(detailRow, 'otherFeeTotal').value !== '-'">
+                    <span class="business-crud-page__waybill-fee-value">{{ waybillAmountWithCurrency(detailRow, 'otherFeeTotal').value }}</span>元
+                  </template>
+                  <template v-else>-</template>
+                </strong>
               </div>
               <div class="business-crud-page__waybill-detail-field">
-                <span>运费合计</span
-                ><strong class="is-emphasis">{{
-                  formatDetailValue(detailRow, 'freightTotal')
-                }}</strong>
+                <span>运费合计</span>
+                <strong>
+                  <template v-if="waybillAmountWithCurrency(detailRow, 'freightTotal').value !== '-'">
+                    <span class="business-crud-page__waybill-fee-value">{{ waybillAmountWithCurrency(detailRow, 'freightTotal').value }}</span>元
+                  </template>
+                  <template v-else>-</template>
+                </strong>
               </div>
             </div>
           </section-card>
@@ -3010,7 +3228,79 @@
                 <span v-else>{{ row.departureAddress || '-' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="150" fixed="right">
+            <el-table-column label="发货联系人" min-width="140">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.departureContact"
+                />
+                <span v-else>{{ row.departureContact || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发货联系人电话" min-width="160">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.departurePhone"
+                />
+                <span v-else>{{ row.departurePhone || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="到货地址" min-width="260">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.arrivalAddress"
+                />
+                <span v-else>{{ row.arrivalAddress || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="收货联系人" min-width="140">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.arrivalContact"
+                />
+                <span v-else>{{ row.arrivalContact || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="收货联系人电话" min-width="160">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.arrivalPhone"
+                />
+                <span v-else>{{ row.arrivalPhone || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开始时间" min-width="140">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.planStartDate"
+                />
+                <span v-else>{{ row.planStartDate || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结束时间" min-width="140">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.planEndDate"
+                />
+                <span v-else>{{ row.planEndDate || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="180">
+              <template #default="{ row }">
+                <el-input
+                  v-if="isEditingTransportPlanImportRow(row)"
+                  v-model="row.remark"
+                />
+                <span v-else>{{ row.remark || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="170" fixed="right">
               <template #default="{ row }">
                 <template v-if="isEditingTransportPlanImportRow(row)">
                   <el-link type="primary" @click="saveTransportPlanImportRow(row)">保存</el-link>
@@ -3270,20 +3560,25 @@
               align="center"
               show-overflow-tooltip
             />
+            <el-table-column label="发货地址" min-width="220" align="center" show-overflow-tooltip>
+              <template #default="{ row }">
+                {{ formatTransportPlanProvinceCityDistrict(row.departureAddress) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="收货地址" min-width="220" align="center" show-overflow-tooltip>
+              <template #default="{ row }">
+                {{ formatTransportPlanProvinceCityDistrict(row.arrivalAddress) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="unitPrice" label="单价" min-width="120" align="center" />
+            <el-table-column prop="freight" label="运费" min-width="120" align="center" />
             <el-table-column
-              prop="departureAddress"
-              label="发货地址"
-              min-width="220"
+              prop="otherFeeTotal"
+              label="其他费用合计"
+              min-width="140"
               align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="arrivalAddress"
-              label="收货地址"
-              min-width="220"
-              align="center"
-              show-overflow-tooltip
             />
+            <el-table-column prop="freightTotal" label="运费合计" min-width="120" align="center" />
             <el-table-column
               prop="dispatchUserName"
               label="调度人"
@@ -3386,85 +3681,118 @@
           <span class="business-crud-page__dispatch-task-title">任务信息</span>
           <el-segmented
             v-model="dispatchItemForm.taskEntryMode"
-            :options="taskEntryModeOptions"
+            :options="dispatchTaskEntryModeOptions"
             class="business-crud-page__dispatch-entry-mode"
+            @change="handleDispatchTaskEntryModeChange"
           />
         </div>
 
         <template v-if="dispatchItemForm.taskEntryMode === 'full'">
-          <div class="dialog-section-title">货物信息</div>
-          <div class="business-crud-page__dispatch-item-grid">
-            <el-form-item label="货物名称" required>
-              <el-input v-model="dispatchItemForm.cargoName" placeholder="请输入" />
-            </el-form-item>
-            <el-form-item label="货物类型" required>
-              <el-input v-model="dispatchItemForm.cargoType" placeholder="请输入" />
-            </el-form-item>
-            <el-form-item label="数量" required>
-              <el-input v-model="dispatchItemForm.quantity" placeholder="请输入">
-                <template #append>
-                  <el-select
-                    v-model="dispatchItemForm.quantityUnit"
-                    class="business-crud-page__dispatch-unit-select"
-                  >
-                    <el-option
-                      v-for="item in quantityUnitOptions"
-                      :key="item"
-                      :label="item"
-                      :value="item"
-                    />
-                  </el-select>
-                </template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="包装">
-              <el-select v-model="dispatchItemForm.packageType" clearable placeholder="请选择">
-                <el-option
-                  v-for="item in packageOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="规格">
-              <el-input v-model="dispatchItemForm.specification" placeholder="请输入" />
-            </el-form-item>
-            <el-form-item label="型号">
-              <el-input v-model="dispatchItemForm.model" placeholder="请输入" />
-            </el-form-item>
+          <div class="dialog-section-title dialog-section-title--action business-crud-page__goods-title">
+            <span>货物信息</span>
+            <div class="business-crud-page__section-actions">
+              <el-link type="primary" @click="cargoImportBox = true">导入货物</el-link>
+              <el-link type="primary" @click="openCommonCargoDialog">常用货物</el-link>
+            </div>
           </div>
-
-          <div class="dialog-section-title">费用信息</div>
-          <div class="business-crud-page__dispatch-item-grid">
-            <el-form-item label="单价">
-              <el-input v-model="dispatchItemForm.unitPrice" placeholder="请输入">
-                <template #append>
+          <div class="business-crud-page__cargo-wrap">
+            <el-table
+              :data="dispatchItemCargoRows"
+              border
+              class="business-crud-page__cargo-table business-crud-page__cargo-table--task"
+              empty-text="暂无货物信息"
+            >
+              <el-table-column type="index" label="序号" width="70" align="center" fixed="left" />
+              <el-table-column min-width="220" align="center">
+                <template #header><span class="business-crud-page__required-column">货物类型</span></template>
+                <template #default="{ row }">
+                  <el-cascader
+                    v-model="row.cargoTypePath"
+                    :options="transportCargoTypeOptions"
+                    :props="transportCargoTypeCascaderProps"
+                    placeholder="从货物类型获取"
+                    clearable
+                    filterable
+                    :filter-method="filterBillingCargoType"
+                    @visible-change="visible => visible && ensureBillingCargoTypeOptions()"
+                    @change="value => handleDispatchCargoTypeChange(row, value)"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column min-width="240" align="center">
+                <template #header><span class="business-crud-page__required-column">货物名称</span></template>
+                <template #default="{ row }">
                   <el-select
-                    v-model="dispatchItemForm.priceUnit"
-                    class="business-crud-page__dispatch-unit-select"
-                    placeholder="元/吨"
-                    :loading="taskFeeUnitLoading"
-                    @visible-change="visible => visible && loadTaskFeeUnitOptions()"
+                    v-model="row.cargoName"
+                    placeholder="请输入"
+                    filterable
+                    allow-create
+                    default-first-option
+                    clearable
+                    :loading="isTaskCargoOptionsLoading(row.cargoTypePath)"
+                    @visible-change="visible => visible && loadTaskCargoOptionsByPath(row.cargoTypePath)"
+                    @change="value => handleDispatchCargoRowNameChange(row, value)"
                   >
                     <el-option
-                      v-if="!taskFeeUnitOptions.some(item => item.value === '元/吨')"
-                      label="元/吨"
-                      value="元/吨"
-                    />
-                    <el-option
-                      v-for="item in taskFeeUnitOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      v-for="item in getDispatchCargoRowOptions(row)"
+                      :key="item.id || item.cargoCode || item.cargoName"
+                      :label="formatBillingCargoTypeLabel(item)"
+                      :value="formatBillingCargoTypeLabel(item)"
                     />
                   </el-select>
                 </template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="其他费用合计">
-              <el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入" />
-            </el-form-item>
+              </el-table-column>
+              <el-table-column label="包装" min-width="130" align="center">
+                <template #default="{ row }">
+                  <el-select v-model="row.packageType" clearable>
+                    <el-option v-for="item in packageOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column min-width="130" align="center">
+                <template #header><span class="business-crud-page__required-column">数量</span></template>
+                <template #default="{ row }">
+                  <el-input v-model="row.quantity" placeholder="请输入" @input="value => handleDispatchCargoQuantityInput(row, value)" />
+                </template>
+              </el-table-column>
+              <el-table-column min-width="140" align="center">
+                <template #header><span class="business-crud-page__required-column">数量单位</span></template>
+                <template #default="{ row }">
+                  <el-select v-model="row.quantityUnit" clearable @visible-change="visible => visible && loadTaskQuantityUnitOptions()">
+                    <el-option v-for="item in taskQuantityUnitOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="品牌" min-width="130" align="center"><template #default="{ row }"><el-input v-model="row.brand" placeholder="请输入" /></template></el-table-column>
+              <el-table-column label="规格" min-width="130" align="center"><template #default="{ row }"><el-input v-model="row.specification" placeholder="请输入" /></template></el-table-column>
+              <el-table-column label="型号" min-width="130" align="center"><template #default="{ row }"><el-input v-model="row.model" placeholder="请输入" /></template></el-table-column>
+              <el-table-column label="物料编码" min-width="150" align="center"><template #default="{ row }"><el-input v-model="row.materialCode" placeholder="请输入" /></template></el-table-column>
+              <el-table-column label="设备编码" min-width="150" align="center"><template #default="{ row }"><el-input v-model="row.deviceCode" placeholder="请输入" /></template></el-table-column>
+              <el-table-column label="备注" min-width="180" align="center"><template #default="{ row }"><el-input v-model="row.remark" placeholder="请输入" /></template></el-table-column>
+              <el-table-column label="操作" width="140" align="center" fixed="right">
+                <template #default="{ $index }">
+                  <div class="business-crud-page__cargo-actions">
+                    <el-link v-if="$index === dispatchItemCargoRows.length - 1" type="primary" @click="addDispatchCargoRow($index)">新增</el-link>
+                    <el-link type="danger" @click="removeDispatchCargoRow($index)">删除</el-link>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="dialog-section-title">费用信息</div>
+          <div class="business-crud-page__dispatch-item-grid business-crud-page__dispatch-item-grid--full">
+            <template v-for="(cargo, index) in dispatchItemCargoRows" :key="cargo._key || index">
+              <el-form-item :label="`单价${index + 1}`">
+                <el-input v-model="cargo.unitPrice" placeholder="请输入" @input="value => handleDispatchCargoNumberInput(cargo, 'unitPrice', value)">
+                  <template #append><el-select v-model="cargo.priceUnit" class="business-crud-page__dispatch-unit-select" placeholder="元/吨" @visible-change="visible => visible && loadTaskFeeUnitOptions()"><el-option v-for="item in taskFeeUnitOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></template>
+                </el-input>
+              </el-form-item>
+              <el-form-item :label="`数量合计${index + 1}`"><el-input :model-value="formatDispatchQuantity(cargo.quantity)" disabled /></el-form-item>
+              <el-form-item :label="`运费${index + 1}`"><el-input :model-value="dispatchCargoFreightAmount(cargo)" disabled /></el-form-item>
+            </template>
+            <el-form-item label="运费合计"><el-input :model-value="dispatchItemFreightSubtotal" disabled><template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template></el-input></el-form-item>
+            <el-form-item label="币种"><el-select v-model="dispatchItemForm.freightCurrency" placeholder="请选择" clearable @visible-change="visible => visible && loadShippingTemplateCurrencyOptions()"><el-option v-for="item in shippingTemplateCurrencyOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
+            <el-form-item label="其他运费合计"><el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入" @input="value => handleDispatchNumberInput('otherFeeTotal', value)"><template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template></el-input></el-form-item>
           </div>
         </template>
         <template v-else>
@@ -3631,6 +3959,31 @@
                 </template>
               </el-input>
             </el-form-item>
+            <el-form-item label="其他费用合计">
+              <el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入">
+                <template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="运费合计">
+              <el-input :model-value="dispatchItemFreightTotal" disabled>
+                <template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="币种">
+              <el-select
+                v-model="dispatchItemForm.freightCurrency"
+                placeholder="请选择"
+                clearable
+                @visible-change="visible => visible && loadShippingTemplateCurrencyOptions()"
+              >
+                <el-option
+                  v-for="item in shippingTemplateCurrencyOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="备注" class="business-crud-page__dispatch-item-span-3">
               <el-input
                 v-model="dispatchItemForm.remark"
@@ -3651,9 +4004,9 @@
         </div>
         <div
           v-if="dispatchItemForm.taskEntryMode === 'full'"
-          class="business-crud-page__dispatch-item-grid"
+          class="business-crud-page__dispatch-item-grid business-crud-page__dispatch-item-grid--carrier"
         >
-          <el-form-item label="承运类型" required class="business-crud-page__dispatch-item-span-2">
+          <el-form-item label="承运类型" required class="business-crud-page__dispatch-item-span-4">
             <el-radio-group
               v-model="dispatchItemForm.carrierType"
               @change="handleDispatchCarrierTypeChange"
@@ -3683,9 +4036,9 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="dispatchItemForm.carrierType"
+            v-if="dispatchIsRoadTransport"
             label="司机"
-            :required="dispatchItemForm.carrierType !== '承运商'"
+            :required="dispatchItemForm.carrierType === '自运'"
           >
             <el-select
               v-model="dispatchItemForm.driverName"
@@ -3708,42 +4061,54 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="dispatchItemForm.carrierType"
-            :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
-            :required="dispatchItemForm.carrierType !== '承运商'"
+            v-if="dispatchIsRoadTransport"
+            label="手机号"
+            :required="dispatchItemForm.carrierType === '自运'"
           >
             <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
           </el-form-item>
           <el-form-item
             v-if="dispatchItemForm.carrierType"
-            label="车牌号/航班号/船号/班列号"
+            :label="dispatchIsNonRoadTransport ? '船/航/班列号' : '车牌号'"
             required
           >
             <el-input v-model="dispatchItemForm.vehicleNo" placeholder="请输入" />
           </el-form-item>
+          <el-form-item v-if="dispatchIsNonRoadTransport" label="船长">
+            <el-input v-model="dispatchItemForm.captainName" placeholder="请输入船长" />
+          </el-form-item>
+          <el-form-item v-if="dispatchIsNonRoadTransport && dispatchIsCarrierMode" label="联系电话">
+            <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入联系电话" />
+          </el-form-item>
+          <el-form-item v-if="dispatchIsNonRoadTransport" label="箱号">
+            <el-input v-model="dispatchItemForm.containerNo" placeholder="请输入箱号" />
+          </el-form-item>
+          <el-form-item v-if="dispatchIsNonRoadTransport" label="舱位">
+            <el-input v-model="dispatchItemForm.cabinNo" placeholder="请输入舱位" />
+          </el-form-item>
           <el-form-item
-            v-if="dispatchItemForm.carrierType && dispatchItemForm.carrierType !== '承运商'"
+            v-if="dispatchIsRoadTransport && dispatchItemForm.carrierType !== '承运商'"
             label="挂车车牌号"
-            required
+            :required="dispatchItemForm.carrierType !== '自运'"
           >
             <el-input v-model="dispatchItemForm.trailerVehicleNo" placeholder="请输入" />
           </el-form-item>
           <el-form-item
-            v-if="dispatchItemForm.carrierType && dispatchItemForm.carrierType !== '承运商'"
+            v-if="dispatchIsRoadTransport && dispatchItemForm.carrierType !== '承运商'"
             label="押运人"
-            required
+            :required="dispatchItemForm.carrierType !== '自运'"
           >
             <el-input v-model="dispatchItemForm.escortName" placeholder="请输入" />
           </el-form-item>
           <el-form-item
-            v-if="dispatchItemForm.carrierType && dispatchItemForm.carrierType !== '承运商'"
+            v-if="dispatchIsRoadTransport && dispatchItemForm.carrierType !== '承运商'"
             label="押运人手机号"
-            required
+            :required="dispatchItemForm.carrierType !== '自运'"
           >
             <el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
           </el-form-item>
           <el-form-item
-            v-if="dispatchItemForm.carrierType && dispatchItemForm.carrierType !== '承运商'"
+            v-if="dispatchIsRoadTransport && dispatchItemForm.carrierType !== '承运商'"
             label="里程(km)"
             required
           >
@@ -3784,9 +4149,8 @@
           </el-form-item>
         </div>
 
-        <template v-if="dispatchItemForm.taskEntryMode === 'full'">
-          <div class="dialog-section-title">附件</div>
-          <div class="business-crud-page__attachment">
+        <div class="dialog-section-title">附件</div>
+        <div class="business-crud-page__attachment">
             <div class="business-crud-page__attachment-head">
               <vehicle-attachment-upload
                 v-model="dispatchItemAttachmentRows"
@@ -3814,7 +4178,11 @@
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column type="index" label="序号" width="70" align="center" />
               <el-table-column label="文件名" min-width="200" align="center" show-overflow-tooltip>
-                <template #default="{ row }">{{ row.originalName || row.name }}</template>
+                <template #default="{ row }">
+                  <el-link type="primary" @click="previewAttachment(row, dispatchItemAttachmentRows)">
+                    {{ attachmentName(row) }}
+                  </el-link>
+                </template>
               </el-table-column>
               <el-table-column label="附件描述" min-width="220" align="center">
                 <template #default="{ row }">
@@ -3840,8 +4208,7 @@
                 </template>
               </el-table-column>
             </el-table>
-          </div>
-        </template>
+        </div>
       </el-form>
       <template #footer>
         <el-button @click="dispatchItemBox = false">取消</el-button>
@@ -4907,12 +5274,18 @@ const defaultDispatchRow = () => ({
   driverName: '',
   driverPhone: '',
   vehicleNo: '',
+  captainName: '',
+  cabinNo: '',
+  containerNo: '',
   trailerVehicleNo: '',
   escortName: '',
   escortPhone: '',
   mileage: '',
   cargoType: '',
+  cargoTypeCode: '',
+  cargoTypePath: [],
   cargoName: '',
+  brand: '',
   cargoInfo: '',
   quantity: '',
   quantityUnit: '吨',
@@ -4924,6 +5297,9 @@ const defaultDispatchRow = () => ({
   unitPrice: '',
   priceUnit: '元/吨',
   otherFeeTotal: '',
+  freightCurrency: 'CNY',
+  freightJson: '',
+  goodsJson: '',
   estimatedStartTime: '',
   estimatedEndTime: '',
   departureAddress: '',
@@ -5072,6 +5448,7 @@ export default {
       dispatchItemBox: false,
       dispatchItemIndex: -1,
       dispatchItemForm: defaultDispatchRow(),
+      dispatchItemCargoRows: [],
       dispatchItemAttachmentRows: [],
       selectedDispatchItemAttachmentRows: [],
       attachmentRows: [],
@@ -5163,6 +5540,13 @@ export default {
       taskFeeUnitLoading: false,
       dispatchTransportTypeOptions: [],
       dispatchTransportTypeLoading: false,
+      transportPlanDetailTransportTypeOptions: [],
+      transportPlanDetailTransportTypeLoading: false,
+      transportPlanWaybillPage: {
+        pageSize: 10,
+        pageSizes: [10, 20, 50, 100],
+        currentPage: 1,
+      },
       cargoImportBox: false,
       cargoImportLoading: false,
       cargoImportRows: [],
@@ -5282,6 +5666,9 @@ export default {
       this.loadShippingTemplateCurrencyOptions();
       this.loadTaskFeeUnitOptions();
     }
+    if (this.config.enableWaybillFooterFreightSummary) {
+      this.loadShippingTemplateCurrencyOptions();
+    }
     this.consumeTemplateCreatePayload();
   },
   computed: {
@@ -5312,6 +5699,60 @@ export default {
     isTransportPlanPage() {
       return this.config.permission === 'transport_plan';
     },
+    isTransportPlanDetailLayout() {
+      return this.isTransportPlanPage && this.detailBox;
+    },
+    transportPlanGoodsText() {
+      const text = this.formatDetailValue(this.detailRow, 'goodsInfo');
+      return text && text !== '-' ? text : '暂无货物信息';
+    },
+    transportPlanDateRange() {
+      const start = this.detailRow.planStartDate || this.detailRow.planStartTime || '';
+      const end = this.detailRow.planEndDate || this.detailRow.planEndTime || '';
+      if (!start && !end) return '-';
+      return `${String(start).slice(0, 10)}-${String(end || start).slice(0, 10)}`;
+    },
+    transportPlanWaybillRows() {
+      const sources = [
+        this.detailRow.waybillList,
+        this.detailRow.waybillRows,
+        this.detailRow.waybills,
+        this.detailRow.transportPlanWaybills,
+        this.detailRow.transportPlanWaybillList,
+        this.detailRow.dispatchRecords,
+        this.detailRow.dispatchRecordList,
+        this.detailRow.dispatchList,
+        this.detailRow.dispatchRows,
+      ];
+      const rows = sources.reduce((result, source) => {
+        const parsed = this.parseTransportPlanWaybillSource(source);
+        return result.length ? result : parsed;
+      }, []);
+      const normalizedRows = rows.map((row, index) =>
+        this.normalizeTransportPlanWaybillRow(row, index)
+      );
+      return normalizedRows;
+    },
+    transportPlanWaybillPageRows() {
+      const start =
+        (this.transportPlanWaybillPage.currentPage - 1) * this.transportPlanWaybillPage.pageSize;
+      return this.transportPlanWaybillRows.slice(
+        start,
+        start + this.transportPlanWaybillPage.pageSize
+      );
+    },
+    transportPlanDispatchSummary() {
+      const goodsRows = this.parseJsonArray(this.detailRow.goodsJson);
+      const total = goodsRows.reduce(
+        (sum, row) => sum + Number(row.quantity || row.cargoQuantity || row.goodsQuantity || 0),
+        0
+      ) || Number(this.detailRow.totalQuantity || this.detailRow.quantity || 0);
+      const assigned = this.transportPlanWaybillRows.reduce(
+        (sum, row) => sum + Number(row.quantity || row.cargoQuantity || row.goodsQuantity || 0),
+        0
+      ) || Number(this.detailRow.dispatchedQuantity || this.detailRow.dispatchQuantity || 0);
+      return { total, assigned, remaining: Math.max(total - assigned, 0) };
+    },
     isTemplateCreate() {
       return (
         ['transport_plan', 'waybill_manage'].includes(this.config.permission) &&
@@ -5366,8 +5807,19 @@ export default {
       return this.config.enableTaskInfoForm === true;
     },
     taskEntryModeOptions() {
+      const locked = this.hasMultipleConfiguredGoods(this.form, this.transportCargoRows);
       return [
-        { label: '精简录入', value: 'simple' },
+        { label: '精简录入', value: 'simple', disabled: locked },
+        { label: '完整录入', value: 'full' },
+      ];
+    },
+    dispatchTaskEntryModeOptions() {
+      const locked = this.hasMultipleConfiguredGoods(
+        this.dispatchItemForm,
+        this.dispatchItemCargoRows
+      );
+      return [
+        { label: '精简录入', value: 'simple', disabled: locked },
         { label: '完整录入', value: 'full' },
       ];
     },
@@ -5428,9 +5880,11 @@ export default {
           row.totalCargoQuantity
         );
       });
-      this.parseJsonArray(this.dispatchRow.dispatchRows).forEach(row => {
-        addQuantity(this.getDispatchQuantityUnit(row), 'assigned', row.quantity);
-      });
+      if (!this.dispatchRows.length) {
+        this.parseJsonArray(this.dispatchRow.dispatchRows).forEach(row => {
+          addQuantity(this.getDispatchQuantityUnit(row), 'assigned', row.quantity);
+        });
+      }
       this.dispatchRows.forEach(row => {
         addQuantity(this.getDispatchQuantityUnit(row), 'assigned', row.quantity);
       });
@@ -5487,6 +5941,15 @@ export default {
     dispatchTransportMode() {
       return this.resolveTransportMode(this.dispatchItemForm.transportType);
     },
+    dispatchIsRoadTransport() {
+      return this.dispatchTransportMode === 'road';
+    },
+    dispatchIsNonRoadTransport() {
+      return ['water', 'rail', 'air'].includes(this.dispatchTransportMode);
+    },
+    dispatchIsCarrierMode() {
+      return this.dispatchItemForm.carrierType === '承运商';
+    },
     dispatchStationMode() {
       return ['water', 'rail', 'air'].includes(this.dispatchTransportMode);
     },
@@ -5515,6 +5978,45 @@ export default {
       const amount = quantity * unitPrice;
       return Number.isInteger(amount) ? String(amount) : String(Number(amount.toFixed(2)));
     },
+    dispatchItemFreightTotal() {
+      if (this.dispatchItemForm.taskEntryMode !== 'full') {
+        const quantity = Number(this.dispatchItemForm.quantity || 0);
+        const unitPrice = Number(this.dispatchItemForm.unitPrice || 0);
+        const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+        const hasFreight = this.dispatchItemForm.unitPrice !== '' && quantity > 0;
+        const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+        if (!hasFreight && !hasOtherFee) return '';
+        const total = (hasFreight ? quantity * unitPrice : 0) + (hasOtherFee ? otherFeeTotal : 0);
+        return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
+      }
+      const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+      const freightTotal = this.dispatchItemCargoRows.reduce(
+        (total, cargo) => total + Number(this.dispatchCargoFreightAmount(cargo) || 0),
+        0
+      );
+      const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+      if (!freightTotal && !hasOtherFee) return '';
+      const total = freightTotal + (hasOtherFee ? otherFeeTotal : 0);
+      return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
+    },
+    dispatchItemFreightSubtotal() {
+      if (this.dispatchItemForm.taskEntryMode !== 'full') {
+        const quantity = Number(this.dispatchItemForm.quantity || 0);
+        const unitPrice = Number(this.dispatchItemForm.unitPrice || 0);
+        if (!quantity || !unitPrice) return '';
+        const total = quantity * unitPrice;
+        return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
+      }
+      const total = this.dispatchItemCargoRows.reduce(
+        (sum, cargo) => sum + Number(this.dispatchCargoFreightAmount(cargo) || 0),
+        0
+      );
+      return total ? (Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)))) : '';
+    },
+    dispatchItemFreightCurrencyLabel() {
+      const value = this.dispatchItemForm.freightCurrency || 'CNY';
+      return this.currencyRemark(value);
+    },
     taskFullFreightTotal() {
       const total = this.transportCargoRows.reduce(
         (sum, cargo) => sum + Number(this.taskFullFreightAmount(cargo) || 0),
@@ -5526,7 +6028,7 @@ export default {
       const currency = this.taskFreightCurrency;
       if (!currency) return '';
       const option = this.shippingTemplateCurrencyOptions.find(item => item.value === currency);
-      return option?.label || currency;
+      return this.currencyName(option?.label || currency);
     },
     isAdmin() {
       const authority = this.userInfo && this.userInfo.authority;
@@ -5663,7 +6165,7 @@ export default {
       const currency = this.shippingTemplateFreight.currency;
       if (!currency) return '';
       const option = this.shippingTemplateCurrencyOptions.find(item => item.value === currency);
-      return option?.label || currency;
+      return this.currencyName(option?.label || currency);
     },
     shippingTemplateRoadFreightTotal() {
       const total = this.shippingTemplateFreight.freightItems.reduce(
@@ -5803,6 +6305,16 @@ export default {
       }
       return cityIndex > -1 ? text.slice(cityStart, cityIndex + 1) : text;
     },
+    formatTransportPlanProvinceCityDistrict(value) {
+      const text = String(value || '').trim();
+      if (!text) return '-';
+      const districtMatch = text.match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
+      if (districtMatch) {
+        return text.slice(0, districtMatch.index + districtMatch[0].length);
+      }
+      const cityMatch = text.match(/市/);
+      return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
+    },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
@@ -6084,17 +6596,178 @@ export default {
       );
     },
     waybillIsRoadTransport(row = {}) {
-      return /公路|道路|汽车|陆运/i.test(String(this.waybillTransportMode(row)));
+      return this.waybillTransportModeCode(row) === 'road';
+    },
+    waybillTransportModeCode(row = {}) {
+      const text = [
+        row.transportType,
+        row.transportTypeName,
+        row.transportMode,
+        row.transportModeName,
+        this.getTransportTypeLabel(row.transportType),
+      ]
+        .filter(Boolean)
+        .join(' ')
+        .toLowerCase();
+      if (/公路|道路|汽车|陆运|road|highway/.test(text) || text === 'gl') return 'road';
+      if (/水路|水运|海运|港|water|ship|sea/.test(text) || text === 'sl') return 'water';
+      if (/航空|空运|空港|air|airport/.test(text) || text === 'hk') return 'air';
+      if (/铁路|rail|train/.test(text) || text === 'tl') return 'rail';
+      return '';
+    },
+    waybillIsNonRoadTransport(row = {}) {
+      return ['water', 'rail', 'air'].includes(this.waybillTransportModeCode(row));
+    },
+    waybillIsCarrier(row = {}) {
+      return String(row.carrierTypeName || row.carrierType || '').trim() === '承运商';
+    },
+    waybillVehicleNoLabel(row = {}) {
+      return this.waybillIsRoadTransport(row) ? '车牌号' : '船/航/班列号';
     },
     waybillUnitPrice(row = {}) {
       const price = row.unitPrice || row.price || '';
       const unit = row.priceUnit || row.billingUnit || '';
       return price === '' ? '' : unit ? `${price}(${unit})` : price;
     },
+    waybillCurrencyRemark(row = {}) {
+      const freight = this.parseJsonObject(row.freightJson);
+      const value = row.currency || row.freightCurrency || freight.currency || '';
+      if (!value) return '';
+      const normalized = String(value).toUpperCase();
+      const option = this.shippingTemplateCurrencyOptions.find(item => {
+        const itemValue = String(item.value || '').toUpperCase();
+        return itemValue === normalized || (normalized === 'CNY' && itemValue === 'RMB');
+      });
+      const remark = String(option?.remark || '').trim();
+      if ((normalized === 'CNY' || normalized === 'RMB') && remark === '元') return '￥';
+      return remark;
+    },
+    waybillUnitPriceWithCurrency(row = {}) {
+      const text = this.waybillUnitPrice(row);
+      if (!text) return { value: '-', unit: '' };
+      const match = String(text).match(/^(.*)\((.*)\)$/);
+      const price = match ? match[1] : text;
+      const unit = match ? match[2] : '';
+      return {
+        value: `${this.waybillCurrencyRemark(row)}${price}`,
+        unit,
+      };
+    },
+    waybillAmountWithCurrency(row = {}, prop) {
+      const value = this.formatDetailValue(row, prop);
+      if (value === '-') return { value: '-' };
+      return { value: `${this.waybillCurrencyRemark(row)}${value}` };
+    },
+    normalizeTransportPlanWaybillRow(row = {}, index = 0) {
+      const status = row.businessStatus || row.status || row.waybillStatus || '';
+      const statusMap = {
+        draft: ['草稿', 'is-draft'],
+        pending: ['待执行', 'is-pending'],
+        waiting: ['待执行', 'is-pending'],
+        processing: ['进行中', 'is-processing'],
+        running: ['进行中', 'is-processing'],
+        completed: ['已完成', 'is-completed'],
+        cancelled: ['已取消', 'is-cancelled'],
+      };
+      const statusItem = statusMap[status] || [
+        row.businessStatusName || row.statusName || status || '-',
+        '',
+      ];
+      return {
+        ...row,
+        _detailIndex: index,
+        vehicleNo: row.vehicleNo || row.vehicleNumber || row.flightNo || row.shipNo || row.trainNo || '',
+        driverName: row.driverName || row.driver || '',
+        carrierName: row.carrierName || row.carrier || '',
+        transportType: row.transportTypeName || row.transportType || '',
+        carrierType: row.carrierTypeName || row.carrierType || '',
+        goodsInfo: row.goodsInfo || row.cargoInfo || this.formatDetailValue(row, 'goodsInfo'),
+        departureAddress: row.departureAddress || row.fromAddress || '',
+        statusText: statusItem[0],
+        statusClass: statusItem[1],
+      };
+    },
+    parseTransportPlanWaybillSource(value) {
+      if (Array.isArray(value)) return value;
+      const parsed = this.parseJsonArray(value);
+      if (parsed.length) return parsed;
+      if (!value || typeof value !== 'object') return [];
+      if (Array.isArray(value.records)) return value.records;
+      if (Array.isArray(value.rows)) return value.rows;
+      if (Array.isArray(value.data)) return value.data;
+      if (value.data && typeof value.data === 'object') {
+        return this.parseTransportPlanWaybillSource(value.data);
+      }
+      return [];
+    },
+    openTransportPlanWaybillDetail(row) {
+      if (!row?.id) {
+        this.$message.info('当前运单暂无详情数据');
+        return;
+      }
+      this.$router.push({ path: '/business/waybill-manage', query: { detailId: row.id } });
+    },
+    transportPlanWaybillIndex(index) {
+      return (
+        (this.transportPlanWaybillPage.currentPage - 1) *
+          this.transportPlanWaybillPage.pageSize +
+        index +
+        1
+      );
+    },
+    handleTransportPlanWaybillCurrentChange(currentPage) {
+      this.transportPlanWaybillPage.currentPage = currentPage;
+    },
+    handleTransportPlanWaybillSizeChange(pageSize) {
+      this.transportPlanWaybillPage.pageSize = pageSize;
+      this.transportPlanWaybillPage.currentPage = 1;
+    },
+    loadTransportPlanDetailTransportTypeOptions() {
+      if (
+        this.transportPlanDetailTransportTypeOptions.length ||
+        this.transportPlanDetailTransportTypeLoading
+      ) {
+        return Promise.resolve(this.transportPlanDetailTransportTypeOptions);
+      }
+      this.transportPlanDetailTransportTypeLoading = true;
+      return getDictionary({ code: 'transport_type' })
+        .then(res => {
+          this.transportPlanDetailTransportTypeOptions = this.normalizeDictOptions(
+            res.data?.data || []
+          );
+          return this.transportPlanDetailTransportTypeOptions;
+        })
+        .finally(() => {
+          this.transportPlanDetailTransportTypeLoading = false;
+        });
+    },
+    ensureTransportPlanDetailTransportTypeName(detail = {}) {
+      if (!this.isTransportPlanPage) {
+        return;
+      }
+      const transportTypes = [
+        detail.transportType,
+        ...this.transportPlanWaybillRows.map(row => row.transportType),
+      ]
+        .map(value => String(value || '').trim())
+        .filter(Boolean);
+      if (transportTypes.some(value => !/[\u4e00-\u9fff]/.test(value))) {
+        this.loadTransportPlanDetailTransportTypeOptions();
+      }
+    },
+    formatTransportPlanDetailTransportType(value) {
+      const transportType = String(value || '').trim();
+      if (!transportType) return '-';
+      const item = this.transportPlanDetailTransportTypeOptions.find(
+        option => String(option.value) === transportType
+      );
+      return item?.label || transportType;
+    },
     openDetail(row) {
       this.detailBox = true;
       this.detailLoading = true;
       this.detailRow = { ...row };
+      this.transportPlanWaybillPage.currentPage = 1;
       this.waybillProcessDetailTab = 'punch';
       this.waybillHasRelatedVoucher = false;
       this.waybillVoucherImages = [];
@@ -6107,6 +6780,7 @@ export default {
         .then(res => {
           const detail = res?.data?.data || res?.data || row;
           this.detailRow = detail;
+          this.ensureTransportPlanDetailTransportTypeName(detail);
           if (this.isWaybillDetailLayout && detail.contractId) {
             return getContractDetail(detail.contractId)
               .then(contractRes => {
@@ -6635,6 +7309,24 @@ export default {
       }
       return true;
     },
+    currencyName(value) {
+      const text = String(value || '');
+      if (text.includes(' - ')) return text.slice(text.indexOf(' - ') + 3);
+      return {
+        CNY: '人民币',
+        RMB: '人民币',
+        USD: '美元',
+        EUR: '欧元',
+        JPY: '日元',
+        GBP: '英镑',
+      }[text.toUpperCase()] || text;
+    },
+    currencyRemark(value) {
+      const option = this.shippingTemplateCurrencyOptions.find(
+        item => String(item.value).toUpperCase() === String(value || '').toUpperCase()
+      );
+      return option?.remark || this.currencyName(option?.label || value);
+    },
     loadShippingTemplateCurrencyOptions() {
       if (this.shippingTemplateCurrencyOptions.length || this.shippingTemplateCurrencyLoading) {
         return Promise.resolve(this.shippingTemplateCurrencyOptions);
@@ -6642,13 +7334,47 @@ export default {
       this.shippingTemplateCurrencyLoading = true;
       return getSystemDictionary({ code: 'currency_type' })
         .then(res => {
-          this.shippingTemplateCurrencyOptions = this.normalizeDictOptions(res.data?.data || []);
-          const cny = this.shippingTemplateCurrencyOptions.find(item =>
-            ['CNY', '人民币', 'RMB'].includes(String(item.value).toUpperCase())
+          const currencyNameMap = {
+            CNY: '人民币',
+            RMB: '人民币',
+            USD: '美元',
+            EUR: '欧元',
+            JPY: '日元',
+            GBP: '英镑',
+          };
+          this.shippingTemplateCurrencyOptions = this.normalizeDictOptions(
+            res.data?.data || []
+          ).map(item => {
+            const code = String(item.value || '').toUpperCase();
+            return {
+              ...item,
+              label: `${code} - ${currencyNameMap[code] || item.label || item.value}`,
+            };
+          });
+          const resolveCurrencyValue = value => {
+            const normalized = String(value || '').toUpperCase();
+            const exact = this.shippingTemplateCurrencyOptions.find(
+              item => String(item.value).toUpperCase() === normalized
+            );
+            if (exact) return exact.value;
+            if (normalized === 'CNY') {
+              const rmb = this.shippingTemplateCurrencyOptions.find(
+                item => String(item.value).toUpperCase() === 'RMB'
+              );
+              return rmb?.value || value;
+            }
+            return value;
+          };
+          this.dispatchItemForm.freightCurrency = resolveCurrencyValue(
+            this.dispatchItemForm.freightCurrency
+          );
+          this.taskFreightCurrency = resolveCurrencyValue(this.taskFreightCurrency);
+          this.shippingTemplateFreight.currency = resolveCurrencyValue(
+            this.shippingTemplateFreight.currency
           );
           if (!this.shippingTemplateFreight.currency) {
             this.shippingTemplateFreight.currency =
-              (cny || this.shippingTemplateCurrencyOptions[0])?.value || '';
+              this.shippingTemplateCurrencyOptions[0]?.value || '';
           }
           return this.shippingTemplateCurrencyOptions;
         })
@@ -7458,6 +8184,7 @@ export default {
       this.attachmentRows = this.parseJsonArray(plan.attachmentsJson);
       this.form.attachmentsJson = JSON.stringify(this.attachmentRows);
       const goodsRows = this.parseJsonArray(this.form.goodsJson);
+      this.form.taskEntryMode = goodsRows.length > 1 ? 'full' : 'simple';
       const firstGoods = goodsRows[0] || {};
       [
         'cargoType',
@@ -7503,6 +8230,9 @@ export default {
       const goodsInfo = goodsRows[0] || {};
       this.form.taskEntryMode =
         this.form.taskEntryMode || taskInfo.taskEntryMode || carrierInfo.taskEntryMode || 'simple';
+      if (this.hasMultipleConfiguredGoods(this.form, goodsRows)) {
+        this.form.taskEntryMode = 'full';
+      }
       this.form.carrierType =
         this.form.carrierType ||
         taskInfo.carrierType ||
@@ -7602,11 +8332,30 @@ export default {
       }
     },
     handleTaskEntryModeChange(value) {
+      if (value === 'simple' && this.hasMultipleConfiguredGoods(this.form, this.transportCargoRows)) {
+        this.form.taskEntryMode = 'full';
+        this.$message.warning('当前配置了多条货物信息，不能切换为精简录入');
+        return;
+      }
       this.form.taskEntryMode = value || 'simple';
       if (this.form.taskEntryMode === 'full') {
         this.initTaskFullCargoRows(this.parseJsonArray(this.form.goodsJson));
       }
     },
+    handleDispatchTaskEntryModeChange(value) {
+      if (
+        value === 'simple' &&
+        this.hasMultipleConfiguredGoods(this.dispatchItemForm, this.dispatchItemCargoRows)
+      ) {
+        this.dispatchItemForm.taskEntryMode = 'full';
+        this.$message.warning('当前配置了多条货物信息，不能切换为精简录入');
+        return;
+      }
+      this.dispatchItemForm.taskEntryMode = value || 'simple';
+      if (this.dispatchItemForm.taskEntryMode === 'full' && !this.dispatchItemCargoRows.length) {
+        this.dispatchItemCargoRows = [this.normalizeTransportCargoRow()];
+      }
+    },
     handleTaskFullFreightNumberInput(cargo, prop, value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
       const parts = text.split('.');
@@ -7838,6 +8587,7 @@ export default {
       return (list || []).map(item => ({
         label: item.dictValue || item.label || item.value || '',
         value: item.dictKey || item.value || item.dictValue || '',
+        remark: item.remark || '',
       }));
     },
     handleTaskNumberInput(prop, value) {
@@ -8093,12 +8843,16 @@ export default {
     },
     initTransportPlanFormRows() {
       if (!this.config.enableTransportPlanForm) return;
-      this.transportCargoRows = this.parseJsonArray(this.form.goodsJson).map(row =>
+      const goodsRows = this.parseJsonArray(this.form.goodsJson);
+      this.transportCargoRows = goodsRows.map(row =>
         this.normalizeTransportCargoRow(row)
       );
       if (!this.transportCargoRows.length) {
         this.transportCargoRows.push(this.normalizeTransportCargoRow());
       }
+      if (this.hasMultipleConfiguredGoods(this.form, this.transportCargoRows)) {
+        this.form.taskEntryMode = 'full';
+      }
       this.initShippingTemplateFreight();
       this.syncTransportCargoJson();
       this.syncCurrentContractOption();
@@ -8144,6 +8898,13 @@ export default {
       });
       return cargo;
     },
+    hasMultipleConfiguredGoods(source = {}, rows = []) {
+      const configuredRows = this.parseJsonArray(
+        source?.goodsJson || source?.goodsRows || source?.goodsList
+      );
+      const list = configuredRows.length ? configuredRows : Array.isArray(rows) ? rows : [];
+      return list.length > 1;
+    },
     syncTransportCargoJson() {
       if (!this.config.enableTransportPlanForm && !this.isTaskFullMode) return;
       this.form.goodsJson = JSON.stringify(
@@ -8949,7 +9710,12 @@ export default {
     async selectCommonCargoRow(row) {
       this.commonCargoSelected = [row];
       await this.ensureBillingCargoTypeOptions();
-      this.addTransportCargoRow(-1, this.mapCommonCargoRow(row));
+      const cargo = this.mapCommonCargoRow(row);
+      if (this.dispatchItemBox && this.dispatchItemForm.taskEntryMode === 'full') {
+        this.addDispatchCargoRow(this.dispatchItemCargoRows.length - 1, cargo);
+      } else {
+        this.addTransportCargoRow(-1, cargo);
+      }
       this.commonCargoBox = false;
     },
     mapCommonCargoRow(row = {}) {
@@ -9016,7 +9782,13 @@ export default {
         this.$message.warning('请先上传货物文件');
         return;
       }
-      this.cargoImportRows.forEach(row => this.addTransportCargoRow(-1, row));
+      this.cargoImportRows.forEach(row => {
+        if (this.dispatchItemBox && this.dispatchItemForm.taskEntryMode === 'full') {
+          this.addDispatchCargoRow(this.dispatchItemCargoRows.length - 1, row);
+        } else {
+          this.addTransportCargoRow(-1, row);
+        }
+      });
       this.$message.success(`成功导入${this.cargoImportRows.length}条货物`);
       this.closeCargoImportDialog();
     },
@@ -9180,14 +9952,14 @@ export default {
     isAttachmentImage(row) {
       return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row));
     },
-    previewAttachment(row) {
+    previewAttachment(row, rows = this.attachmentRows) {
       const url = this.attachmentUrl(row);
       if (!url) {
         this.$message.warning('附件地址为空，无法预览');
         return;
       }
       if (this.isAttachmentImage(row)) {
-        this.attachmentImagePreviewUrls = this.attachmentRows
+        this.attachmentImagePreviewUrls = (rows || [])
           .filter(item => this.isAttachmentImage(item) && this.attachmentUrl(item))
           .map(item => this.attachmentUrl(item));
         this.attachmentImagePreviewIndex = Math.max(this.attachmentImagePreviewUrls.indexOf(url), 0);
@@ -10366,9 +11138,15 @@ export default {
           return false;
         }
         const isValidDate = value => {
-          if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) return false;
-          const date = new Date(`${value}T00:00:00`);
-          return !Number.isNaN(date.getTime()) && date.toISOString().slice(0, 10) === value;
+          const match = String(value || '').match(/^(\d{4})-(\d{2})-(\d{2})$/);
+          if (!match) return false;
+          const [, year, month, day] = match;
+          const date = new Date(Number(year), Number(month) - 1, Number(day));
+          return (
+            date.getFullYear() === Number(year) &&
+            date.getMonth() === Number(month) - 1 &&
+            date.getDate() === Number(day)
+          );
         };
         if (!isValidDate(row.planStartDate) || !isValidDate(row.planEndDate)) {
           this.$message.warning(`第${index + 1}行计划日期格式必须为 YYYY-MM-DD`);
@@ -10613,16 +11391,35 @@ export default {
       this.dispatchItemBox = false;
       this.dispatchItemIndex = -1;
       this.dispatchItemForm = defaultDispatchRow();
+      this.dispatchItemCargoRows = [];
       this.dispatchItemAttachmentRows = [];
       this.selectedDispatchItemAttachmentRows = [];
     },
     buildDispatchRows(plan = {}) {
-      const goodsRows = this.parseJsonArray(plan.goodsJson);
-      const sourceRows = goodsRows.length ? goodsRows : [plan];
+      const persistedSources = [
+        plan.dispatchRows,
+        plan.dispatchRowList,
+        plan.dispatchRecords,
+        plan.dispatchRecordList,
+        plan.dispatchList,
+        plan.waybillList,
+        plan.waybillRows,
+        plan.waybills,
+      ];
+      const persistedRows = persistedSources.reduce((result, source) => {
+        const rows = this.parseTransportPlanWaybillSource(source);
+        return result.length ? result : rows;
+      }, []);
+      const goodsRows = this.dispatchGoodsRows(plan.goodsJson);
+      const sourceRows = persistedRows.length ? persistedRows : goodsRows.length ? goodsRows : [plan];
       return sourceRows.map((item, index) => this.normalizeDispatchRow(plan, item, index));
     },
     normalizeDispatchRow(plan = {}, item = {}, index = 0) {
-      const cargoInfo = this.formatDispatchCargoInfo(plan, item);
+      const itemGoodsRows = this.dispatchGoodsRows(item.goodsJson);
+      const itemGoods = itemGoodsRows[0] || {};
+      const cargoInfo = this.formatDispatchCargoInfo({}, item);
+      const waybillFallback = this.getDispatchWaybillFallback(plan, item, index);
+      const feeFields = this.getDispatchFeeFields(plan, item);
       return {
         _key: `${plan.id || 'dispatch'}-${index}-${
           item.id || item.cargoName || item.vehicleNo || 'row'
@@ -10638,14 +11435,40 @@ export default {
         escortName: item.escortName || '',
         escortPhone: item.escortPhone || '',
         mileage: item.mileage || '',
-        cargoType: item.cargoType || item.goodsType || plan.cargoType || '',
-        cargoName: item.cargoName || item.goodsName || plan.cargoName || '',
+        cargoType:
+          itemGoods.cargoType ||
+          itemGoods.goodsType ||
+          item.cargoType ||
+          item.goodsType ||
+          plan.cargoType ||
+          '',
+        cargoName:
+          itemGoods.cargoName ||
+          itemGoods.goodsName ||
+          item.cargoName ||
+          item.goodsName ||
+          plan.cargoName ||
+          '',
         cargoInfo,
-        quantity: item.quantity || item.cargoQuantity || item.goodsQuantity || '',
-        quantityUnit: item.quantityUnit || item.goodsQuantityUnit || item.unit || '吨',
-        specification: item.specification || item.spec || '',
-        model: item.model || '',
-        packageType: item.packageType || item.package || '',
+        quantity:
+          itemGoods.quantity ||
+          itemGoods.cargoQuantity ||
+          itemGoods.goodsQuantity ||
+          item.quantity ||
+          item.cargoQuantity ||
+          item.goodsQuantity ||
+          '',
+        quantityUnit:
+          itemGoods.quantityUnit ||
+          itemGoods.goodsQuantityUnit ||
+          itemGoods.unit ||
+          item.quantityUnit ||
+          item.goodsQuantityUnit ||
+          item.unit ||
+          '吨',
+        specification: item.specification || item.spec || itemGoods.specification || itemGoods.spec || '',
+        model: item.model || itemGoods.model || '',
+        packageType: item.packageType || item.package || itemGoods.packageType || itemGoods.package || '',
         estimatedStartTime: item.estimatedStartTime || plan.planStartDate || '',
         estimatedEndTime: item.estimatedEndTime || plan.planEndDate || '',
         departureAddress: item.departureAddress || plan.departureAddress || '',
@@ -10656,15 +11479,107 @@ export default {
         arrivalName: item.arrivalName || plan.arrivalName || '',
         arrivalContact: item.arrivalContact || plan.arrivalContact || '',
         arrivalPhone: item.arrivalPhone || plan.arrivalPhone || '',
-        dispatchUserName: item.dispatchUserName || plan.dispatchUserName || '',
-        dispatchTime: item.dispatchTime || plan.dispatchTime || '',
+        ...feeFields,
+        dispatchUserName:
+          item.dispatchUserName ||
+          plan.dispatchUserName ||
+          waybillFallback.createUserName ||
+          item.createUserName ||
+          '',
+        dispatchTime:
+          item.dispatchTime || plan.dispatchTime || waybillFallback.createTime || item.createTime || '',
         attachmentsJson: item.attachmentsJson || '',
         remark: item.remark || item.taskRemark || plan.remark || '',
       };
     },
+    getDispatchFeeFields(plan = {}, item = {}) {
+      const freightInfo = this.parseJsonObject(item.freightJson || plan.freightJson);
+      const itemGoods = this.dispatchGoodsRows(item.goodsJson)[0] || {};
+      const unitPrice =
+        item.unitPrice ??
+        itemGoods.unitPrice ??
+        plan.unitPrice ??
+        freightInfo.unitPrice ??
+        freightInfo.freightItems?.[0]?.unitPrice ??
+        '';
+      const otherFeeTotal =
+        item.otherFeeTotal ??
+        plan.otherFeeTotal ??
+        freightInfo.otherFeeTotal ??
+        freightInfo.otherFreightAmount ??
+        '';
+      const quantity = Number(
+        item.quantity ||
+          item.cargoQuantity ||
+          item.goodsQuantity ||
+          itemGoods.quantity ||
+          itemGoods.cargoQuantity ||
+          itemGoods.goodsQuantity ||
+          0
+      );
+      const calculatedFreight = unitPrice !== '' && quantity ? Number(unitPrice) * quantity : '';
+      const freight =
+        calculatedFreight !== ''
+          ? calculatedFreight
+          : item.freight ??
+            item.freightAmount ??
+            item.transportFee ??
+            plan.freight ??
+            plan.freightAmount ??
+            freightInfo.freightAmount ??
+            freightInfo.transportFee ??
+            '';
+      const freightTotal =
+        freight !== '' || otherFeeTotal !== ''
+          ? Number(freight || 0) + Number(otherFeeTotal || 0)
+          : item.freightTotal ??
+            item.totalFreight ??
+            plan.freightTotal ??
+            plan.totalFreight ??
+            freightInfo.totalFreightAmount ??
+            freightInfo.freightTotal ??
+            '';
+      return { unitPrice, freight, otherFeeTotal, freightTotal };
+    },
+    getDispatchWaybillFallback(plan = {}, item = {}, index = 0) {
+      const sources = [
+        plan.waybillList,
+        plan.waybillRows,
+        plan.waybills,
+        plan.transportPlanWaybills,
+        plan.transportPlanWaybillList,
+        plan.dispatchRecords,
+        plan.dispatchRecordList,
+        plan.dispatchList,
+      ];
+      const rows = sources.reduce((result, source) => {
+        const parsed = this.parseTransportPlanWaybillSource(source);
+        return result.length ? result : parsed;
+      }, []);
+      if (!rows.length) return {};
+      const itemWaybillId = item.waybillId || item.waybillID || item.waybillNo;
+      const matched = itemWaybillId
+        ? rows.find(
+            row =>
+              String(row.id || row.waybillId || row.waybillID || row.waybillNo || '') ===
+              String(itemWaybillId)
+          )
+        : null;
+      const fallback = matched || rows[index] || rows[0] || {};
+      return {
+        createUserName:
+          fallback.createUserName ||
+          fallback.creatorName ||
+          fallback.createdUserName ||
+          fallback.createdByName ||
+          '',
+        createTime: fallback.createTime || fallback.createdAt || '',
+      };
+    },
     formatDispatchCargoInfo(plan = {}, item = {}) {
-      const goodsRows = this.parseJsonArray(plan.goodsJson);
-      const sourceRows = goodsRows.length ? goodsRows : [item];
+      const goodsRows = this.dispatchGoodsRows(plan.goodsJson);
+      const itemGoodsRows = this.dispatchGoodsRows(item.goodsJson);
+      const sourceRows = goodsRows.length ? goodsRows : itemGoodsRows.length ? itemGoodsRows : [item];
       const groups = sourceRows.reduce((result, goods = {}) => {
         const cargoType =
           goods.cargoType ||
@@ -10700,6 +11615,12 @@ export default {
         .join('；');
       return cargoInfo || plan.goodsInfo || '';
     },
+    dispatchGoodsRows(value) {
+      const rows = this.parseJsonArray(value);
+      if (rows.length) return rows;
+      const item = this.parseJsonObject(value);
+      return Object.keys(item).length ? [item] : [];
+    },
     openDispatchItemDialog(index = -1, row = defaultDispatchRow()) {
       const defaultSummaryItem =
         this.dispatchSummaryItems.find(item => item.remaining > 0) || this.dispatchSummaryItems[0];
@@ -10743,6 +11664,27 @@ export default {
         ...(index >= 0 ? row : {}),
       };
       this.dispatchItemForm.carrierType = this.dispatchItemForm.carrierType || '承运商';
+      const goodsRows = this.parseJsonArray(this.dispatchItemForm.goodsJson);
+      this.dispatchItemCargoRows = (goodsRows.length ? goodsRows : [this.dispatchItemForm]).map(
+        item => this.normalizeTransportCargoRow(item)
+      );
+      if (!this.dispatchItemCargoRows.length) {
+        this.dispatchItemCargoRows = [this.normalizeTransportCargoRow()];
+      }
+      if (this.hasMultipleConfiguredGoods(this.dispatchItemForm, this.dispatchItemCargoRows)) {
+        this.dispatchItemForm.taskEntryMode = 'full';
+      }
+      const freightInfo = this.parseJsonObject(this.dispatchItemForm.freightJson);
+      this.dispatchItemForm.freightCurrency =
+        freightInfo.currency || this.dispatchItemForm.freightCurrency || 'CNY';
+      this.loadShippingTemplateCurrencyOptions();
+      if (this.dispatchItemForm.taskEntryMode === 'full' && freightInfo.freightItems?.length) {
+        this.dispatchItemCargoRows = this.dispatchItemCargoRows.map((cargo, itemIndex) => ({
+          ...cargo,
+          unitPrice: cargo.unitPrice || freightInfo.freightItems[itemIndex]?.unitPrice || '',
+          priceUnit: cargo.priceUnit || freightInfo.freightItems[itemIndex]?.priceUnit || '元/吨',
+        }));
+      }
       this.dispatchItemAttachmentRows = this.parseJsonArray(
         index >= 0 ? row.attachmentsJson : this.dispatchRow.attachmentsJson
       );
@@ -10809,11 +11751,107 @@ export default {
           '';
       }
     },
+    getDispatchCargoRowOptions(row = {}) {
+      return this.getTaskCargoRowOptions(row);
+    },
+    handleDispatchCargoTypeChange(row, value) {
+      const path = this.normalizeBillingCargoTypePath(value);
+      const cargoType = this.findBillingCargoTypeByPath(path);
+      const labels = this.getBillingCargoTypePathLabels(path);
+      row.cargoTypePath = path;
+      row.cargoType = labels.length ? labels[labels.length - 1] : '';
+      row.cargoTypeCode = cargoType?.cargoCode || cargoType?.code || cargoType?.id || '';
+      row.cargoName = '';
+      row.specification = '';
+      row.model = '';
+      this.loadTaskCargoOptionsByPath(path);
+    },
+    handleDispatchCargoRowNameChange(row, value) {
+      const cargo = this.getDispatchCargoRowOptions(row).find(
+        item => this.formatBillingCargoTypeLabel(item) === value
+      );
+      row.cargoName = value || '';
+      if (cargo) {
+        row.specification = cargo.specification || cargo.spec || row.specification || '';
+        row.model = cargo.model || cargo.modelName || row.model || '';
+      }
+    },
+    handleDispatchCargoQuantityInput(row, value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      row.quantity =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 3)}` : parts[0];
+    },
+    handleDispatchCargoNumberInput(row, prop, value) {
+      this.handleTaskFullFreightNumberInput(row, prop, value);
+    },
+    handleDispatchNumberInput(prop, value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      this.dispatchItemForm[prop] =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+    },
+    addDispatchCargoRow(index = -1) {
+      const nextRow = this.normalizeTransportCargoRow({ priceUnit: '元/吨' });
+      if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
+      else this.dispatchItemCargoRows.push(nextRow);
+    },
+    removeDispatchCargoRow(index) {
+      this.dispatchItemCargoRows.splice(index, 1);
+      if (!this.dispatchItemCargoRows.length) {
+        this.dispatchItemCargoRows.push(this.normalizeTransportCargoRow());
+      }
+    },
+    dispatchCargoFreightAmount(cargo = {}) {
+      const quantity = Number(cargo.quantity || 0);
+      const unitPrice = Number(cargo.unitPrice || 0);
+      if (!quantity || !unitPrice) return '';
+      const amount = quantity * unitPrice;
+      return Number.isInteger(amount) ? String(amount) : String(Number(amount.toFixed(2)));
+    },
     saveDispatchItem() {
+      const goodsRows =
+        this.dispatchItemForm.taskEntryMode === 'full'
+          ? this.dispatchItemCargoRows.map(row => this.normalizeTransportCargoRow(row))
+          : [
+              this.normalizeTransportCargoRow({
+                ...this.dispatchItemForm,
+                remark: this.dispatchItemForm.remark || '',
+              }),
+            ];
+      const firstGoods = goodsRows[0] || {};
       const nextRow = {
         ...this.dispatchItemForm,
+        goodsJson: JSON.stringify(goodsRows),
+        cargoType: firstGoods.cargoType || this.dispatchItemForm.cargoType || '',
+        cargoTypeCode: firstGoods.cargoTypeCode || this.dispatchItemForm.cargoTypeCode || '',
+        cargoTypePath: firstGoods.cargoTypePath || this.dispatchItemForm.cargoTypePath || [],
+        cargoName: firstGoods.cargoName || this.dispatchItemForm.cargoName || '',
+        quantity: firstGoods.quantity || this.dispatchItemForm.quantity || '',
+        quantityUnit: firstGoods.quantityUnit || this.dispatchItemForm.quantityUnit || '',
+        unitPrice: firstGoods.unitPrice || '',
+        priceUnit: firstGoods.priceUnit || '',
+        freightTotal: this.dispatchItemFreightTotal,
+        freightJson: JSON.stringify({
+          currency: this.dispatchItemForm.freightCurrency || 'CNY',
+          totalFreightAmount: this.dispatchItemFreightSubtotal,
+          otherFreightAmount: this.dispatchItemForm.otherFeeTotal || '',
+          freightItems: goodsRows.map((cargo, index) => ({
+            cargoIndex: index,
+            cargoName: cargo.cargoName || '',
+            cargoType: cargo.cargoType || '',
+            unitPrice: cargo.unitPrice || '',
+            priceUnit: cargo.priceUnit || '',
+            quantity: cargo.quantity || '',
+            quantityUnit: cargo.quantityUnit || '',
+            freightAmount: this.dispatchCargoFreightAmount(cargo),
+          })),
+        }),
         attachmentsJson: JSON.stringify(this.dispatchItemAttachmentRows),
       };
+      nextRow.cargoInfo = this.formatDispatchCargoInfo({}, nextRow);
+      nextRow.freight = this.getDispatchFeeFields({}, nextRow).freight;
+      nextRow.otherFeeTotal = this.dispatchItemForm.otherFeeTotal || '';
       const quantityUnit = this.getDispatchQuantityUnit(nextRow);
       const otherDispatchedQuantity = this.dispatchRows.reduce((total, row, index) => {
         if (
@@ -10852,12 +11890,14 @@ export default {
       this.dispatchItemBox = false;
       this.dispatchItemIndex = -1;
       this.dispatchItemForm = defaultDispatchRow();
+      this.dispatchItemCargoRows = [];
       this.dispatchItemAttachmentRows = [];
       this.selectedDispatchItemAttachmentRows = [];
     },
     resetDispatchItemDialog() {
       this.dispatchItemIndex = -1;
       this.dispatchItemForm = defaultDispatchRow();
+      this.dispatchItemCargoRows = [];
       this.dispatchItemAttachmentRows = [];
       this.selectedDispatchItemAttachmentRows = [];
     },
@@ -10893,17 +11933,19 @@ export default {
           taskRemark: row.remark || '',
           estimatedStartTime: this.formatDispatchDate(row.estimatedStartTime),
           estimatedEndTime: this.formatDispatchDate(row.estimatedEndTime),
-          goodsJson: JSON.stringify([
-            {
-              cargoName: row.cargoName,
-              cargoType: row.cargoType,
-              quantity: row.quantity,
-              quantityUnit: row.quantityUnit,
-              specification: row.specification,
-              model: row.model,
-              packageType: row.packageType,
-            },
-          ]),
+          goodsJson:
+            row.goodsJson ||
+            JSON.stringify([
+              {
+                cargoName: row.cargoName,
+                cargoType: row.cargoType,
+                quantity: row.quantity,
+                quantityUnit: row.quantityUnit,
+                specification: row.specification,
+                model: row.model,
+                packageType: row.packageType,
+              },
+            ]),
         })),
       };
     },
@@ -10918,6 +11960,13 @@ export default {
         return false;
       }
       for (const [index, row] of this.dispatchRows.entries()) {
+        if (row.taskEntryMode === 'full') {
+          const goodsRows = this.parseJsonArray(row.goodsJson);
+          if (!goodsRows.length || goodsRows.some(item => !item.cargoName || !item.cargoType || !item.quantity || !item.quantityUnit)) {
+            this.$message.warning(`第${index + 1}条调度明细的完整录入货物信息不完整`);
+            return false;
+          }
+        }
         const invalidField = [
           [row.departurePhone, '发货联系方式'],
           [row.arrivalPhone, '收货联系方式'],
@@ -10932,6 +11981,8 @@ export default {
       if (mode === 'draft') return true;
       const invalidRow = this.dispatchRows.find(row => {
         const selfTransport = row.carrierType !== '承运商';
+        const carrierPlatform = row.carrierType === '网货平台';
+        const optionalSelfEscort = row.taskEntryMode === 'full' && row.carrierType === '自运';
         return (
           !row.transportType ||
           !row.cargoName ||
@@ -10946,10 +11997,10 @@ export default {
           (selfTransport &&
             (!row.driverName ||
               !row.driverPhone ||
-              !row.trailerVehicleNo ||
-              !row.escortName ||
-              !row.escortPhone ||
-              !row.mileage))
+              !row.mileage ||
+              (!optionalSelfEscort &&
+                (carrierPlatform || row.taskEntryMode !== 'full') &&
+                (!row.trailerVehicleNo || !row.escortName || !row.escortPhone))))
         );
       });
       if (invalidRow) {
@@ -11916,7 +12967,15 @@ export default {
 
   &__dispatch-dialog {
     :deep(.el-dialog__header) {
-      display: none;
+      display: block;
+      height: 0;
+      padding: 0;
+    }
+
+    :deep(.el-dialog__headerbtn) {
+      z-index: 2;
+      top: 12px;
+      right: 12px;
     }
 
     :deep(.el-dialog__body) {
@@ -12189,6 +13248,28 @@ export default {
 
   &__dispatch-item-form {
     width: 100%;
+    padding: 16px;
+    border: 1px solid #ebeef5;
+    background: #fff;
+
+    > .dialog-section-title {
+      margin-top: 16px;
+
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+
+    > .business-crud-page__dispatch-shipping-form,
+    > .business-crud-page__cargo-wrap,
+    > .business-crud-page__dispatch-item-grid,
+    > .business-crud-page__attachment {
+      background: #fff;
+    }
+
+    > .business-crud-page__attachment {
+      padding: 0 0 4px;
+    }
   }
 
   &__dispatch-unit-select {
@@ -12218,6 +13299,14 @@ export default {
     &--compact {
       grid-template-columns: repeat(4, minmax(0, 1fr));
     }
+
+    &--full {
+      grid-template-columns: repeat(3, minmax(0, 1fr));
+    }
+
+    &--carrier {
+      grid-template-columns: repeat(4, minmax(0, 1fr));
+    }
   }
 
   &__dispatch-item-span-2 {
@@ -12228,6 +13317,10 @@ export default {
     grid-column: span 3;
   }
 
+  &__dispatch-item-span-4 {
+    grid-column: 1 / -1;
+  }
+
   &__dispatch-item-carrier-type {
     grid-column: 1 / -1;
     width: calc((100% - 72px) / 4);
@@ -12416,6 +13509,259 @@ export default {
     }
   }
 
+  &__detail-dialog.is-transport-plan-detail {
+    :deep(.el-dialog) {
+      max-width: none;
+      margin: 0 auto;
+    }
+
+    :deep(.el-dialog__header) {
+      display: none;
+    }
+
+    :deep(.el-dialog__body) {
+      padding: 8px;
+      background: #f5f6f8;
+    }
+  }
+
+  &__transport-plan-detail-head,
+  &__transport-plan-waybill-card {
+    border: 1px solid #dfe3e8;
+    background: #fff;
+  }
+
+  &__transport-plan-detail-head {
+    padding: 20px 40px 24px;
+  }
+
+  &__transport-plan-detail-title-row {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 18px;
+
+    h2 {
+      margin: 0;
+      color: #303133;
+      font-size: 20px;
+      font-weight: 600;
+
+      span {
+        margin: 0 8px;
+        color: #303133;
+      }
+    }
+
+    :deep(.el-tag) {
+      height: 36px;
+      padding: 0 14px;
+      border: 0;
+      border-radius: 8px;
+      font-size: 14px;
+      line-height: 36px;
+    }
+
+    :deep(.is-dispatching) {
+      color: #67c23a;
+      background: #e1f3d8;
+    }
+  }
+
+  &__transport-plan-detail-overview {
+    display: grid;
+    grid-template-columns: minmax(540px, 1fr) minmax(560px, 1.2fr);
+    gap: 22px;
+  }
+
+  &__transport-plan-detail-fields {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+    gap: 16px 32px;
+    align-content: start;
+  }
+
+  &__transport-plan-detail-field {
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    gap: 8px;
+
+    span {
+      color: #606266;
+      font-size: 14px;
+    }
+
+    strong {
+      overflow: hidden;
+      color: #409eff;
+      font-size: 16px;
+      font-weight: 500;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    strong.is-normal {
+      color: #303133;
+      font-weight: 400;
+      white-space: normal;
+      word-break: break-word;
+    }
+
+    &.is-attachments {
+      grid-column: 1 / -1;
+    }
+  }
+
+  &__transport-plan-detail-attachments {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 14px 32px;
+
+    .el-link,
+    span {
+      font-size: 16px;
+    }
+  }
+
+  &__transport-plan-detail-route {
+    display: flex;
+    min-width: 0;
+    align-items: flex-start;
+    padding: 12px 0 0;
+  }
+
+  &__transport-plan-detail-route-point {
+    display: flex;
+    min-width: 0;
+    align-items: flex-start;
+    gap: 12px;
+
+    b {
+      display: inline-flex;
+      flex: 0 0 auto;
+      width: 36px;
+      height: 36px;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      border-radius: 8px;
+      background: #409eff;
+      font-size: 14px;
+
+      &.is-end {
+        background: #e6a23c;
+      }
+    }
+
+    div {
+      min-width: 0;
+      text-align: center;
+    }
+
+    strong {
+      display: block;
+      color: #303133;
+      font-size: 18px;
+      white-space: nowrap;
+    }
+
+    p {
+      max-width: 280px;
+      margin: 10px 0 0;
+      color: #303133;
+      font-size: 14px;
+      line-height: 1.45;
+      word-break: break-word;
+    }
+  }
+
+  &__transport-plan-detail-route-line {
+    flex: 1;
+    min-width: 56px;
+    height: 22px;
+    margin: 0 14px;
+    border-bottom: 3px solid #303133;
+  }
+
+  &__transport-plan-waybill-card {
+    margin-top: 8px;
+    padding: 16px 14px 12px;
+  }
+
+  &__transport-plan-waybill-heading {
+    display: flex;
+    align-items: baseline;
+    flex-wrap: wrap;
+    gap: 0;
+    margin: 0 0 14px;
+    padding-left: 16px;
+
+    h3 {
+      margin: 0 30px 0 0;
+      color: #303133;
+      font-size: 18px;
+    }
+
+    span {
+      color: #303133;
+      font-size: 16px;
+    }
+
+    em {
+      color: #409eff;
+      font-style: normal;
+    }
+  }
+
+  &__transport-plan-waybill-table {
+    width: 100%;
+
+    :deep(.el-table__header th) {
+      color: #303133;
+      background: #f7f7f7;
+      font-size: 14px;
+      font-weight: 600;
+    }
+
+    :deep(.el-table__cell) {
+      height: 52px;
+      color: #303133;
+      border-color: #eff1f7;
+      font-size: 14px;
+    }
+
+    :deep(.el-table__body tr:nth-child(even) > td) {
+      background: #fafafa;
+    }
+
+    :deep(.el-table__fixed-right) {
+      background: #fff;
+    }
+  }
+
+  &__transport-plan-waybill-pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding-top: 12px;
+  }
+
+  &__transport-plan-waybill-status {
+    &.is-processing {
+      color: #67c23a;
+    }
+
+    &.is-completed {
+      color: #409eff;
+    }
+
+    &.is-pending,
+    &.is-draft,
+    &.is-cancelled {
+      color: #606266;
+    }
+  }
+
   &__waybill-detail-summary {
     :deep(.el-card__body) {
       padding: 18px 22px;
@@ -12584,7 +13930,7 @@ export default {
   &__waybill-fee-grid {
     grid-template-columns: repeat(4, minmax(0, 1fr));
 
-    .is-emphasis {
+    .business-crud-page__waybill-fee-value {
       color: #409eff;
       font-size: 16px;
     }
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index 4018a11..7d3461e 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -39,7 +39,7 @@
       </el-form>
       <div class="waybill-import-create__form-actions"><el-button @click="createVisible = false">关闭</el-button><el-button @click="saveDraft">保存草稿</el-button><el-button type="primary" @click="confirmImport">确认导入</el-button></div>
     </section>
-    <section class="waybill-import-create__detail-panel" v-if="rows.length"><div class="waybill-import-create__detail-head"><div class="dialog-section-title">导入数据明细</div><el-button type="danger" plain :disabled="!rowSelection.length" @click="removeSelectedRows">批量删除</el-button></div><el-tabs v-model="previewTab"><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane :label="`疑似重复（${duplicateRows.length}）`" name="duplicate" /></el-tabs><el-table :data="previewRows" border max-height="440" @selection-change="rowSelection = $event"><el-table-column type="selection" width="55" /><el-table-column type="index" label="序号" width="65" /><el-table-column v-for="column in detailColumns" :key="column.prop" :prop="column.prop" :label="column.label" :min-width="column.minWidth || 150" show-overflow-tooltip><template #default="{ row }"><template v-if="row._editing"><el-select v-if="column.editor === 'transportType'" v-model="row.transportType" clearable filterable placeholder="请选择"><el-option v-for="item in transportTypeOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-select v-else-if="column.editor === 'driver'" v-model="row.driverName" clearable filterable placeholder="请选择" @change="value => handleEditorChange(column, row, value)"><el-option v-for="item in driverOptions" :key="item.id || item.driverName || item.name" :label="item.driverName || item.name" :value="item.driverName || item.name" /></el-select><el-cascader v-else-if="column.editor === 'cargoType'" :model-value="resolveCargoTypePath(row)" :options="cargoTypeOptions" :props="{ label: 'cargoName', value: 'id', children: 'children', emitPath: true }" clearable filterable placeholder="请选择" @change="value => handleEditorChange(column, row, value)" /><el-select v-else-if="column.editor === 'cargoName'" v-model="row.cargoName" clearable filterable placeholder="请选择" @visible-change="visible => visible && loadCommonCargoOptions(row)" @change="value => handleEditorChange(column, row, value)"><el-option v-for="item in getCommonCargoOptions(row)" :key="item.id || item.cargoName || item.name" :label="formatCargoTypeLabel(item)" :value="formatCargoTypeLabel(item)" /></el-select><el-date-picker v-else-if="column.editor === 'datetime'" v-model="row[column.prop]" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择" /><el-input v-else-if="column.editor === 'textarea'" v-model="row[column.prop]" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" :placeholder="`请输入${column.label}`" /><el-input v-else-if="column.editor === 'number'" :model-value="row[column.prop]" inputmode="decimal" :placeholder="`请输入${column.label}`" @input="value => updateEditorValue(column, row, value)" /><el-input v-else v-model="row[column.prop]" :placeholder="`请输入${column.label}`" /></template><span v-else>{{ formatCell(row, column) }}</span></template></el-table-column><el-table-column label="操作" width="180" fixed="right"><template #default="{ row }"><template v-if="row._editing"><el-link type="primary" @click="saveRow(row)">保存</el-link><el-link type="primary" @click="cancelRow(row)">取消</el-link></template><template v-else><el-link type="primary" @click="editRow(row)">编辑</el-link><el-link type="danger" @click="deleteRow(row)">删除</el-link></template></template></el-table-column></el-table></section>
+    <section class="waybill-import-create__detail-panel" v-if="rows.length"><div class="waybill-import-create__detail-head"><div class="dialog-section-title">导入数据明细</div><el-button type="danger" plain :disabled="!rowSelection.length" @click="removeSelectedRows">批量删除</el-button></div><el-tabs v-model="previewTab"><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane :label="`疑似重复（${duplicateRows.length}）`" name="duplicate" /></el-tabs><el-table :data="previewRows" border max-height="440" @selection-change="rowSelection = $event"><el-table-column type="selection" width="55" /><el-table-column type="index" label="序号" width="65" /><el-table-column v-for="column in detailColumns" :key="column.prop" :prop="column.prop" :label="column.label" :min-width="column.minWidth || 150" show-overflow-tooltip><template #default="{ row }"><template v-if="row._editing"><el-select v-if="column.editor === 'transportType'" v-model="row.transportType" clearable filterable placeholder="请选择"><el-option v-for="item in transportTypeOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-select v-else-if="column.editor === 'driver'" v-model="row.driverName" clearable filterable placeholder="请选择" @change="value => handleEditorChange(column, row, value)"><el-option v-for="item in driverOptions" :key="item.id || item.driverName || item.name" :label="item.driverName || item.name" :value="item.driverName || item.name" /></el-select><el-cascader v-else-if="column.editor === 'cargoType'" :model-value="resolveCargoTypePath(row)" :options="cargoTypeOptions" :props="{ label: 'cargoName', value: 'id', children: 'children', emitPath: true }" clearable filterable placeholder="请选择" @change="value => handleEditorChange(column, row, value)" /><el-select v-else-if="column.editor === 'cargoName'" v-model="row.cargoName" clearable filterable placeholder="请选择" @visible-change="visible => visible && loadCommonCargoOptions(row)" @change="value => handleEditorChange(column, row, value)"><el-option v-for="item in getCommonCargoOptions(row)" :key="item.id || item.cargoName || item.name" :label="formatCargoTypeLabel(item)" :value="formatCargoTypeLabel(item)" /></el-select><el-date-picker v-else-if="column.editor === 'date'" v-model="row[column.prop]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" /><el-input v-else-if="column.editor === 'textarea'" v-model="row[column.prop]" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" :placeholder="`请输入${column.label}`" /><el-input v-else-if="column.editor === 'number'" :model-value="row[column.prop]" inputmode="decimal" :placeholder="`请输入${column.label}`" @input="value => updateEditorValue(column, row, value)" /><el-input v-else v-model="row[column.prop]" :placeholder="`请输入${column.label}`" /></template><span v-else>{{ formatCell(row, column) }}</span></template></el-table-column><el-table-column label="操作" width="180" fixed="right"><template #default="{ row }"><template v-if="row._editing"><el-link type="primary" @click="saveRow(row)">保存</el-link><el-link type="primary" @click="cancelRow(row)">取消</el-link></template><template v-else><el-link type="primary" @click="editRow(row)">编辑</el-link><el-link type="danger" @click="deleteRow(row)">删除</el-link></template></template></el-table-column></el-table></section>
   </el-dialog>
 </template>
 
@@ -84,8 +84,8 @@ const detailColumns = [
   { prop: 'arrivalAddress', label: '到货地址', editor: 'textarea', minWidth: 260 },
   { prop: 'arrivalContact', label: '收货联系人', editor: 'input', minWidth: 140 },
   { prop: 'arrivalPhone', label: '收货联系人电话', editor: 'input', minWidth: 160 },
-  { prop: 'startDate', label: '开始时间', editor: 'datetime', minWidth: 190 },
-  { prop: 'endDate', label: '结束时间', editor: 'datetime', minWidth: 190 },
+  { prop: 'startDate', label: '开始时间', editor: 'date', minWidth: 150 },
+  { prop: 'endDate', label: '结束时间', editor: 'date', minWidth: 150 },
   { prop: 'unitPrice', label: '单价', editor: 'number', minWidth: 130 },
   { prop: 'freight', label: '运费', editor: 'number', minWidth: 130 },
   { prop: 'otherFeeTotal', label: '其他费用合计', editor: 'number', minWidth: 150 },
@@ -256,9 +256,17 @@ const fileChange = async (file, list) => {
   const XLSX = await import('xlsx');
   const workbook = XLSX.read(await file.raw.arrayBuffer(), { type: 'array', cellDates: true });
   const source = XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]], { defval: '' }).map(item => Object.fromEntries(Object.entries(item).map(([key, value]) => [key.replace(/^\*/, ''), value])));
-  const keyMap = { '原始单号': 'originalNo', '车牌号/航班号/船号/班列号': 'vehicleNo', '司机/船长': 'driverName', '运输类型': 'transportType', '货物名称': 'cargoName', '货物类型': 'cargoType', '重量': 'quantity', '发货地址': 'departureAddress', '发货联系人': 'departureContact', '发货联系人电话': 'departurePhone', '到货地址': 'arrivalAddress', '收货联系人': 'arrivalContact', '收货联系人电话': 'arrivalPhone', '开始时间': 'startDate', '结束时间': 'endDate', '单价': 'unitPrice', '运费': 'freight', '其他费用合计': 'otherFeeTotal', '运费合计': 'freightTotal', '备注': 'remark' };
+  const keyMap = { originalNo: ['原始单号'], vehicleNo: ['车牌号/航班号/船号/班列号'], driverName: ['司机/船长'], transportType: ['运输类型'], cargoName: ['货物名称'], cargoType: ['货物类型'], quantity: ['重量'], departureAddress: ['发货地址'], departureContact: ['发货联系人'], departurePhone: ['发货联系人电话'], arrivalAddress: ['到货地址'], arrivalContact: ['到货联系人', '收货联系人'], arrivalPhone: ['收货联系人电话'], startDate: ['开始时间'], endDate: ['结束时间'], unitPrice: ['单价'], freight: ['运费'], otherFeeTotal: ['其他费用合计'], freightTotal: ['运费合计'], remark: ['备注'] };
+  const normalizeImportDate = value => {
+    if (value instanceof Date && !Number.isNaN(value.getTime())) {
+      const pad = number => String(number).padStart(2, '0');
+      return `${value.getFullYear()}-${pad(value.getMonth() + 1)}-${pad(value.getDate())}`;
+    }
+    const text = String(value ?? '').trim();
+    return text.slice(0, 10);
+  };
   const count = new Map();
-  rows.value = source.map((item, index) => { const row = { _key: `${Date.now()}-${index}`, batchNo: '', ...item }; Object.entries(keyMap).forEach(([label, key]) => { row[key] = item[label] ?? item[key] ?? ''; }); const duplicateKey = JSON.stringify(Object.values(keyMap).map(key => row[key])); count.set(duplicateKey, (count.get(duplicateKey) || 0) + 1); row._duplicateKey = duplicateKey; return row; });
+  rows.value = source.map((item, index) => { const row = { _key: `${Date.now()}-${index}`, batchNo: '', ...item }; Object.entries(keyMap).forEach(([key, labels]) => { row[key] = labels.map(label => item[label]).find(value => String(value ?? '').trim()) ?? item[key] ?? ''; }); row.startDate = normalizeImportDate(row.startDate); row.endDate = normalizeImportDate(row.endDate); const duplicateKey = JSON.stringify(Object.keys(keyMap).map(key => row[key])); count.set(duplicateKey, (count.get(duplicateKey) || 0) + 1); row._duplicateKey = duplicateKey; return row; });
   rows.value.forEach(row => { row._duplicate = count.get(row._duplicateKey) > 1; });
 };
 const fileRemove = () => { files.value = []; form.file = null; };
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 6fa95ca..c2efde2 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -263,7 +263,19 @@
       <el-table-column label="配载子单号" prop="loadingSubNos" min-width="220">
         <template #default="{ row }">
           <span class="loading-manage-page__sub-nos">
-            {{ splitText(row.loadingSubNos).join('，') || '-' }}
+            <template v-if="splitText(row.loadingSubNos).length">
+              <el-link
+                v-for="(waybill, index) in splitText(row.loadingSubNos)"
+                :key="`${waybill}-${index}`"
+                type="primary"
+                class="loading-manage-page__sub-no-link"
+                @click="openWaybillDetail({ waybillNo: waybill, id: findWaybillId(row, waybill) })"
+              >
+                {{ waybill }}
+                <template v-if="index < splitText(row.loadingSubNos).length - 1">,</template>
+              </el-link>
+            </template>
+            <span v-else>-</span>
           </span>
         </template>
       </el-table-column>
@@ -285,17 +297,23 @@
         min-width="180"
       >
         <template #default="{ row }">
-          <div class="loading-manage-page__address-cell">{{ formatRouteAddress(row, 'departure') }}</div>
+          <el-tooltip :content="formatFullRouteAddress(row, 'departure')" placement="top">
+            <div class="loading-manage-page__address-cell">{{ formatRouteAddress(row, 'departure') }}</div>
+          </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column label="途经地" prop="transitAddress" min-width="190">
         <template #default="{ row }">
-          <div class="loading-manage-page__address-cell">{{ formatRouteAddress(row, 'transit') }}</div>
+          <el-tooltip :content="formatFullRouteAddress(row, 'transit')" placement="top">
+            <div class="loading-manage-page__address-cell">{{ formatRouteAddress(row, 'transit') }}</div>
+          </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column label="到货地" prop="arrivalAddress" min-width="180">
         <template #default="{ row }">
-          <div class="loading-manage-page__address-cell">{{ formatRouteAddress(row, 'arrival') }}</div>
+          <el-tooltip :content="formatFullRouteAddress(row, 'arrival')" placement="top">
+            <div class="loading-manage-page__address-cell">{{ formatRouteAddress(row, 'arrival') }}</div>
+          </el-tooltip>
         </template>
       </el-table-column>
       <el-table-column label="承运商" prop="carrierName" min-width="160" show-overflow-tooltip />
@@ -1259,8 +1277,42 @@ export default {
         .map(item => item.trim())
         .filter(Boolean);
     },
+    findWaybillId(row, waybillNo) {
+      const rows = this.splitText(row.loadingSubNos);
+      const index = rows.findIndex(item => item === waybillNo);
+      const linkedRows = this.parseJsonArray(row.waybillList || row.waybillRows || row.waybills);
+      if (linkedRows[index]?.id || linkedRows[index]?.waybillId) {
+        return linkedRows[index].id || linkedRows[index].waybillId;
+      }
+      const ids = this.parseJsonArray(row.waybillIdsJson);
+      return ids[index] || '';
+    },
+    async openWaybillDetail(row = {}) {
+      let id = row.id || row.waybillId || '';
+      if (!id && row.waybillNo) {
+        try {
+          const res = await getWaybillList(1, 1, { waybillNo: row.waybillNo });
+          const page = unwrapPage(res);
+          id = page.records?.[0]?.id || page[0]?.id || '';
+        } catch (error) {
+          id = '';
+        }
+      }
+      if (!id) {
+        ElMessage.info('当前子运单暂无详情数据');
+        return;
+      }
+      this.$router.push({ path: '/business/waybill-manage', query: { detailId: id } });
+    },
     formatRouteAddress(row, type) {
       const prefix = type === 'departure' ? 'departure' : type === 'arrival' ? 'arrival' : 'transit';
+      if (type !== 'transit') {
+        const address = row[`${prefix}Address`];
+        const region = this.routeProvinceName(row, prefix);
+        const district = row[`${prefix}DistrictName`];
+        const source = this.mergeRouteAddressParts(region, district, address);
+        return this.formatProvinceCityDistrict(source) || '-';
+      }
       const values = [
         row[`${prefix}RegionName`],
         row[`${prefix}DistrictName`],
@@ -1268,24 +1320,50 @@ export default {
       ]
         .filter(Boolean)
         .flatMap(value => this.splitText(value))
-        .map(value => this.formatCityDistrict(value))
+        .map(value => this.formatProvinceCityDistrict(value))
         .filter(Boolean);
       return [...new Set(values)].join(',') || '-';
     },
-    formatCityDistrict(value) {
+    formatFullRouteAddress(row, type) {
+      const prefix = type === 'departure' ? 'departure' : type === 'arrival' ? 'arrival' : 'transit';
+      if (type !== 'transit') {
+        const address = row[`${prefix}Address`];
+        const region = this.routeProvinceName(row, prefix);
+        const district = row[`${prefix}DistrictName`];
+        return this.mergeRouteAddressParts(region, district, address) || '-';
+      }
+      const values = [row.transitRegionName, row.transitDistrictName, row.transitAddress]
+        .filter(Boolean)
+        .flatMap(value => this.splitText(value));
+      return [...new Set(values)].join('，') || '-';
+    },
+    mergeRouteAddressParts(region, district, address) {
+      const values = [region, district, address].map(value => String(value || '').trim()).filter(Boolean);
+      if (!values.length) return '';
+      return values.reduce((result, value) => {
+        if (!result) return value;
+        if (result.includes(value) || value.includes(result)) return result.length >= value.length ? result : value;
+        return `${result}${value}`;
+      }, '');
+    },
+    routeProvinceName(row, prefix) {
+      return [
+        row[`${prefix}ProvinceName`],
+        row[`${prefix}Province`],
+        row[`${prefix}RegionName`],
+        row[`${prefix}Region`],
+        row[`${prefix}Name`],
+        row[`${prefix}AdministrativeRegionName`],
+        row[`${prefix}AddressRegionName`],
+      ].find(value => String(value || '').trim()) || '';
+    },
+    formatProvinceCityDistrict(value) {
       const text = String(value || '').trim();
       if (!text) return '';
-      const cityIndex = text.indexOf('市');
-      const provinceIndex = Math.max(text.lastIndexOf('省', cityIndex), text.lastIndexOf('自治区', cityIndex));
-      const cityStart = provinceIndex > -1 ? provinceIndex + 1 : 0;
-      const districtStart = cityIndex > -1 ? cityIndex + 1 : cityStart;
-      const districtMatch = text
-        .slice(districtStart)
-        .match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
-      if (districtMatch) {
-        return text.slice(cityStart, districtStart + districtMatch.index + districtMatch[0].length);
-      }
-      return cityIndex > -1 ? text.slice(cityStart, cityIndex + 1) : text;
+      const districtMatch = text.match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
+      if (districtMatch) return text.slice(0, districtMatch.index + districtMatch[0].length);
+      const cityMatch = text.match(/市/);
+      return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
     },
     rowActions(row) {
       const status = row.businessStatus;
@@ -2125,9 +2203,17 @@ export default {
 
   .loading-manage-page__sub-nos {
     display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    line-height: 20px;
+    white-space: normal;
+    overflow-wrap: anywhere;
+    word-break: break-word;
+  }
+
+  .loading-manage-page__sub-no-link {
+    display: inline;
+    white-space: normal;
+    line-height: 20px;
+    text-align: left;
   }
 
   .loading-manage-page__address-cell {
diff --git a/src/views/business/master-order.vue b/src/views/business/master-order.vue
index f6bd45d..2ad14e6 100644
--- a/src/views/business/master-order.vue
+++ b/src/views/business/master-order.vue
@@ -376,8 +376,13 @@ export default {
         : 0;
     },
     async download() {
-      const blob = await api.exportList(this.query);
-      const url = URL.createObjectURL(new Blob([blob.data || blob]));
+      const response = await api.exportList(this.query);
+      const blob = response.data || response;
+      if (!(blob instanceof Blob) || !blob.size) {
+        this.$message.error('导出失败，未生成有效文件');
+        return;
+      }
+      const url = URL.createObjectURL(blob);
       const link = document.createElement('a');
       link.href = url;
       link.download = '总单运单明细.xlsx';
diff --git a/src/views/vehicle/credit-score-quantification.vue b/src/views/vehicle/credit-score-quantification.vue
index 3ef70c2..3a856e9 100644
--- a/src/views/vehicle/credit-score-quantification.vue
+++ b/src/views/vehicle/credit-score-quantification.vue
@@ -218,11 +218,11 @@
             <el-input v-model="itemForm.itemName" maxlength="20" />
           </el-form-item>
           <el-form-item label="分值" required>
-            <el-input-number v-model="itemForm.score" :min="0" :precision="2" :controls="false" />
+            <el-input-number v-model="itemForm.score" :min="1" :precision="0" :step="1" :controls="false" />
           </el-form-item>
         </div>
         <el-form-item label="得分说明">
-          <el-input v-model="itemForm.scoreDescription" maxlength="300" />
+          <el-input v-model="itemForm.scoreDescription" maxlength="300" class="score-description-input" />
         </el-form-item>
         <el-form-item label="选项描述">
           <el-input v-model="itemForm.optionDescription" maxlength="100" />
@@ -232,7 +232,7 @@
             <div class="option-row" v-for="(option, index) in itemForm.options" :key="index">
               <el-input v-model="option.optionName" maxlength="100" />
               <div class="option-score">
-                <el-input-number v-model="option.score" :min="0" :precision="2" :controls="false" />
+                <el-input-number v-model="option.score" :min="1" :precision="0" :step="1" :controls="false" />
                 <span class="score-unit">分</span>
               </div>
               <el-link
@@ -534,10 +534,10 @@ export default {
     emptyItem() {
       return {
         itemName: '',
-        score: 0,
+        score: 1,
         scoreDescription: '',
         optionDescription: '',
-        options: [{ optionName: '', score: 0 }],
+        options: [{ optionName: '', score: 1 }],
       };
     },
     emptyStandard() {
@@ -561,7 +561,7 @@ export default {
           items: (category.items || []).map(item => ({
             ...item,
             options:
-              item.options && item.options.length ? item.options : [{ optionName: '', score: 0 }],
+              item.options && item.options.length ? item.options : [{ optionName: '', score: 1 }],
           })),
         };
       });
@@ -624,6 +624,10 @@ export default {
         this.$message.warning('请输入分值');
         return;
       }
+      if (!this.isPositiveInteger(this.itemForm.score)) {
+        this.$message.warning('分值只能输入正整数');
+        return;
+      }
       if (!this.itemForm.options.length) {
         this.$message.warning('至少添加1条档位选项');
         return;
@@ -639,12 +643,18 @@ export default {
         this.$message.warning('请完整填写档位选项');
         return;
       }
+      if (this.itemForm.options.some(option => !this.isPositiveInteger(option.score))) {
+        this.$message.warning('选项分数只能输入正整数');
+        return;
+      }
       const item = JSON.parse(JSON.stringify(this.itemForm));
       item.itemName = String(item.itemName || '').trim();
       item.options = item.options.map(option => ({
         ...option,
         optionName: String(option.optionName || '').trim(),
+        score: Number(option.score),
       }));
+      item.score = Number(item.score);
       if (this.currentItemIndex >= 0) {
         this.currentCategory.items.splice(this.currentItemIndex, 1, item);
       } else {
@@ -660,7 +670,7 @@ export default {
       this.currentCategory.items.splice(index, 1);
     },
     addOption() {
-      this.itemForm.options.push({ optionName: '', score: 0 });
+      this.itemForm.options.push({ optionName: '', score: 1 });
     },
     removeOption(index) {
       this.itemForm.options.splice(index, 1);
@@ -779,6 +789,9 @@ export default {
     isBlankValue(value) {
       return value === undefined || value === null || value === '';
     },
+    isPositiveInteger(value) {
+      return /^\d+$/.test(String(value)) && Number(value) > 0;
+    },
     hasRangeOverlap(list, lowerProp, upperProp) {
       const ranges = list
         .map(item => ({
@@ -810,10 +823,18 @@ export default {
           return false;
         }
         for (const item of category.items) {
+          if (!this.isPositiveInteger(item.score)) {
+            this.$message.warning(`${item.itemName || '评分项目'}的分值只能为正整数`);
+            return false;
+          }
           if (!item.options || item.options.length === 0) {
             this.$message.warning(`${item.itemName}至少存在1条档位选项`);
             return false;
           }
+          if (item.options.some(option => !this.isPositiveInteger(option.score))) {
+            this.$message.warning(`${item.itemName || '评分项目'}的选项分数只能为正整数`);
+            return false;
+          }
         }
       }
       const creditLevels = this.configForm.standards
@@ -842,6 +863,10 @@ export default {
             this.$message.warning('发布前请完整填写评分项目名称');
             return false;
           }
+          if (!this.isPositiveInteger(item.score)) {
+            this.$message.warning(`${item.itemName || '评分项目'}的分值只能为正整数`);
+            return false;
+          }
           if (!item.options || item.options.length === 0) {
             this.$message.warning(`${item.itemName || '评分项目'}至少配置1个档位选项`);
             return false;
@@ -853,6 +878,10 @@ export default {
             this.$message.warning(`${item.itemName || '评分项目'}的档位选项未填写完整`);
             return false;
           }
+          if (item.options.some(option => !this.isPositiveInteger(option.score))) {
+            this.$message.warning(`${item.itemName || '评分项目'}的选项分数只能为正整数`);
+            return false;
+          }
         }
       }
 
@@ -1103,6 +1132,10 @@ export default {
     text-align: center;
   }
 
+  :deep(.score-description-input .el-input__inner) {
+    text-align: left;
+  }
+
   &__top {
     display: grid;
     grid-template-columns: 360px 360px;
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 89335b8..7dd5335 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -564,9 +564,9 @@
 
       <section-card title="客商材料">
         <template #extra>
-          <div v-if="!readonly" class="section-actions">
+          <div class="section-actions">
             <el-button icon="el-icon-download" @click="downloadAttachments">批量下载</el-button>
-            <el-button type="primary" icon="el-icon-upload" @click="addAttachment">
+            <el-button v-if="!readonly" type="primary" icon="el-icon-upload" @click="addAttachment">
               OCR上传识别
             </el-button>
           </div>
@@ -1860,7 +1860,7 @@ export default {
       const page = this.changeRecordPage;
       getChangeRecordList(this.archiveForm.id, page.currentPage, page.pageSize).then(res => {
         const data = res.data.data || {};
-        page.records = data.records || [];
+        page.records = this.replaceNegativeOneWithBlank(data.records || []);
         page.total = Number(data.total || 0);
         page.currentPage = Number(data.current || page.currentPage);
       });
@@ -1883,10 +1883,11 @@ export default {
       return (this.changeRecordPage.currentPage - 1) * this.changeRecordPage.pageSize + index + 1;
     },
     formatChangeData(row, column, value) {
-      if (!value) return '-';
+      if (!value || value === '-1') return '';
       try {
-        return Object.entries(JSON.parse(value))
-          .map(([field, fieldValue]) => `${field}：${fieldValue ?? '-'}`)
+        const data = this.replaceNegativeOneWithBlank(JSON.parse(value));
+        return Object.entries(data)
+          .map(([field, fieldValue]) => `${field}：${fieldValue ?? ''}`)
           .join('；');
       } catch (error) {
         return value;
@@ -2866,6 +2867,19 @@ export default {
     handleQualificationSelectionChange(rows) {
       this.selectedQualificationFiles = rows || [];
     },
+    replaceNegativeOneWithBlank(value) {
+      if (value === -1 || value === '-1') return '';
+      if (Array.isArray(value)) {
+        return value.map(item => this.replaceNegativeOneWithBlank(item));
+      }
+      if (value && typeof value === 'object') {
+        return Object.keys(value).reduce((result, key) => {
+          result[key] = this.replaceNegativeOneWithBlank(value[key]);
+          return result;
+        }, {});
+      }
+      return value;
+    },
     normalizeDetail(detail) {
       const businessScope = this.splitValue(detail.businessScope);
       const registeredDetailAddress =
@@ -2970,12 +2984,15 @@ export default {
       this.resetChangeRecordPage();
       if (row && row.id) {
         getDetail(row.id).then(res => {
-          this.archiveForm = this.normalizeDetail(res.data.data);
+          const archive = this.normalizeDetail(res.data.data);
+          this.archiveForm = readonly ? this.replaceNegativeOneWithBlank(archive) : archive;
           this.originalAccessType = this.archiveForm.accessType || '';
-          this.qualificationFiles = this.parseAttachments(
-            this.archiveForm.qualificationAttachments
-          );
+          const qualificationFiles = this.parseAttachments(this.archiveForm.qualificationAttachments);
+          this.qualificationFiles = readonly
+            ? this.replaceNegativeOneWithBlank(qualificationFiles)
+            : qualificationFiles;
           this.qualificationUploadFiles = [];
+          this.selectedQualificationFiles = [];
           this.archiveBox = true;
           this.loadChangeRecords();
         });
@@ -3516,7 +3533,9 @@ export default {
       this.handleScoreCurrentChange(1);
     },
     formatScoreValue(value) {
-      return value === undefined || value === null || value === '' ? '' : value;
+      return value === undefined || value === null || value === '' || value === -1 || value === '-1'
+        ? ''
+        : value;
     },
     rowDel(row) {
       this.$confirm('仅草稿状态客商可删除，确定删除该数据?', {