fix: 付款申请批量同步金蝶失败时展示失败原因

- 批量同步后解析返回结果，按"同步失败"标识区分成功与失败条目 - 部分失败时以 warning 提示成功/失败条数及具体失败原因（停留8秒），全部成功仍提示已同步条数
✨ 付款管理新增同步付款结果按钮并扩展金蝶单据状态选项
2026-09-18 11:58:00 +08:00 · 2026-09-18 11:57:59 +08:00 · 2026-09-16 14:14:53 +08:00
37 changed files with 1096 additions and 2288 deletions
@@ -13,8 +13,6 @@
    <meta name="apple-mobile-web-app-capable" content="yes" />
    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
    <meta name="format-detection" content="telephone=no" />
    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
    <meta http-equiv="Pragma" content="no-cache" />
    <link rel="stylesheet" href="/iconfont/index.css" />
    <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
    <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
@@ -1,52 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="utf-8">
 <title>oa登录</title>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js">
 </script>
 <script>
    // 获取URL查询字符串
    const queryString = window.location.search;
    // 使用URLSearchParams解析查询字符串
    const urlParams = new URLSearchParams(queryString);
    // 获取特定的参数值
    var userid = urlParams.get('userid'); // 用户id
    var username = urlParams.get('username'); // 用户名
    var redirectUrl = urlParams.get('redirectUrl'); // 重定向地址
    if(userid==null){
        userid="";
    }
    if(username==null){
        username="";
    }
    $.get("/oaApi/getToken?userid="+userid+"&username="+username,function(result){
        debugger
        //成功返回token
        if(result.data.token){
            //设置系统的cookie
            document.cookie = "X-AUTH-TOKEN="+result.data.token;
            if(redirectUrl==null){
                //如果是登录就跳转到系统首页
                window.location.href = "./";
            }else {
                //如果是待办有重定向就跳转
                window.location.href = redirectUrl;
            }
        }else {
            alert("该业务系统未同步当前oa用户");
        }
    });
 </script>
 </head>
 <body>
 </body>
 </html>
@@ -58,3 +58,14 @@ export const changeStatus = (id, status) => {
    },
  });
 };
 export const getBfiExchangeRate = (currencyCode, effectdate) => {
  return request({
    url: '/blade-transport/bfi/exchange-rate',
    method: 'get',
    params: {
      currencyCode,
      effectdate,
    },
  });
 };
@@ -79,15 +79,6 @@ export const cancel = id =>
    },
  });
 export const start = id =>
  request({
    url: `${baseUrl}/start`,
    method: 'post',
    params: {
      id,
    },
  });
 export const complete = id =>
  request({
    url: `${baseUrl}/complete`,
@@ -20,6 +20,8 @@ export const syncKingdee = id =>
  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
 export const syncKingdeeBatch = ids =>
  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids });
 export const syncKingdeeResult = () =>
  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post' });
 export const paymentTypeOptions = [
  { label: '项目预付', value: 'project_advance' },
@@ -36,5 +38,8 @@ export const approvalStatusOptions = [
 export const kingdeeStatusOptions = [
  { label: '未生成', value: 'unsynced' },
  { label: '已生成', value: 'synced' },
  { label: '付款中', value: 'paying' },
  { label: '已付款', value: 'paid' },
  { label: '已关闭', value: 'closed' },
  { label: '生成失败', value: 'failed' },
 ];
@@ -41,13 +41,6 @@ export const add = row => {
  });
 };
 export const syncIamOrganizations = () => {
  return request({
    url: '/blade-system/dept/sync-iam-organizations',
    method: 'post',
  });
 };
 export const update = row => {
  return request({
    url: '/blade-system/dept/submit',
@@ -31,13 +31,6 @@ export const add = row => {
  });
 };
 export const syncIamAccounts = () => {
  return request({
    url: '/blade-system/user/sync-iam-accounts',
    method: 'post',
  });
 };
 export const update = row => {
  return request({
    url: '/blade-system/user/update',
@@ -1,7 +1,6 @@
 FROM nginx
 VOLUME /tmp
 ENV LANG en_US.UTF-8
 ADD ./src/docker/nginx.conf /etc/nginx/conf.d/default.conf
 ADD ./dist/ /usr/share/nginx/html/
 EXPOSE 80
 EXPOSE 443
@@ -1,19 +0,0 @@
 server {
    listen 80;
    server_name localhost;
    root /usr/share/nginx/html;
    index index.html;
    gzip on;
    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
    location /assets/ {
        add_header Cache-Control "public, max-age=31536000, immutable";
        try_files $uri =404;
    }
    location / {
        add_header Cache-Control "no-store, no-cache, must-revalidate";
        try_files $uri $uri/ /index.html;
    }
 }
@@ -1,12 +1,8 @@
 import store from './store';
 import { isChunkLoadError, reloadForChunkError } from './utils/chunk-reload';
 export default {
  install: app => {
    app.config.errorHandler = (err, vm, info) => {
      if (isChunkLoadError(err) && reloadForChunkError()) {
        return;
      }
      store.commit('ADD_LOGS', {
        type: 'error',
        message: err.message,
@@ -1,5 +1,4 @@
 import { createApp } from 'vue';
 import { installChunkReload } from './utils/chunk-reload';
 import website from './config/website';
 import axios from './axios';
 import router from './router/';
@@ -47,7 +46,6 @@ import sectionCard from './components/section-card/main.vue';
 import mapSearchResults from './components/map-search-results/main.vue';
 window.$crudCommon = crudCommon;
 installChunkReload();
 debug();
 window.axios = axios;
 const app = createApp(App);
@@ -55,8 +55,8 @@ export const config = {
    'templateType',
    'transportType',
    'createUserName',
    'updateTime',
    'remark',
    'updateTime',
    'createTime',
  ],
  exportColumns: [
@@ -65,8 +65,8 @@ export const config = {
    { prop: 'templateType', label: '模板类型' },
    { prop: 'transportType', label: '运输方式' },
    { prop: 'createUserName', label: '创建人' },
    { prop: 'updateTime', label: '更新时间' },
    { prop: 'remark', label: '备注' },
    { prop: 'updateTime', label: '更新时间' },
    { prop: 'createTime', label: '创建时间' },
  ],
  enableAllDept: false,
@@ -82,14 +82,12 @@ export const config = {
  detailAttachmentDescriptionPlain: true,
  enableTransportPlanForm: true,
  enableShippingTemplateFreight: true,
-  editableRoadAddress: false,
+  editableRoadAddress: true,
  fixedTransportAddressType: true,
  enableTemplateCodePreview: true,
  attachmentTitle: '附件',
  defaultForm: {
    templateType: '运输计划',
    transportType: '公路运输',
    transportTypeName: '公路运输',
  },
  transportFormRequiredFields: [
    ['projectName', '项目'],
@@ -121,16 +119,15 @@ export const option = {
        labelWidth: 0,
      },
      {
-        label: '模板类型',
+        label: '模板编号',
-        prop: 'templateType',
+        prop: 'templateCode',
        type: 'select',
        search: true,
-        searchOrder: 2,
+        searchOrder: 4,
        span: 8,
        order: 390,
-        dicData: templateTypeOptions,
+        minWidth: 170,
-        minWidth: 120,
+        disabled: true,
-        rules: selectRule('模板类型'),
+        placeholder: '系统自动生成',
        display: true,
      },
      {
@@ -145,15 +142,16 @@ export const option = {
        display: true,
      },
      {
-        label: '模板编号',
+        label: '模板类型',
-        prop: 'templateCode',
+        prop: 'templateType',
        type: 'select',
        search: true,
-        searchOrder: 4,
+        searchOrder: 2,
        span: 8,
        order: 370,
-        minWidth: 170,
+        dicData: templateTypeOptions,
-        disabled: true,
+        minWidth: 120,
-        placeholder: '系统自动生成',
+        rules: selectRule('模板类型'),
        display: true,
      },
      {
@@ -209,12 +209,12 @@ export const config = {
  attachmentTitle: '附件',
  searchRangeMap: {
    planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
-    createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
+    planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
  },
  actions: ['copy', 'complete'],
  statusProp: 'businessStatus',
  statusTextProp: 'businessStatusName',
-  deleteStatus: ['draft'],
+  deleteStatus: ['draft', 'waiting_dispatch'],
  editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
  detailButton: true,
  detailSections: [
@@ -341,7 +341,6 @@ export const option = {
      {
        label: '发货地址',
        prop: 'departureAddress',
        slot: true,
        formslot: true,
        search: true,
        searchOrder: 7,
@@ -353,7 +352,6 @@ export const option = {
      {
        label: '到货地址',
        prop: 'arrivalAddress',
        slot: true,
        formslot: true,
        search: true,
        searchOrder: 6,
@@ -579,8 +577,8 @@ export const option = {
        viewDisplay: false,
      },
      {
-        label: '创建时间',
+        label: '计划结束日期',
-        prop: 'createTimeRange',
+        prop: 'planEndDateRange',
        type: 'date',
        format: 'YYYY-MM-DD',
        valueFormat: 'YYYY-MM-DD',
@@ -1,18 +1,7 @@
 <template>
  <router-view #="{ Component }">
    <keep-alive :include="$store.getters.tagsKeep">
-      <component :is="tabView($route, Component)" />
+      <component :is="Component" />
    </keep-alive>
  </router-view>
 </template>
 <script>
 import { tabView } from '@/router/tab';
 export default {
  name: 'layout',
  methods: {
    tabView,
  },
 };
 </script>
@@ -3,8 +3,6 @@ import store from './store';
 import { tabKeyOf } from '@/router/tab';
 import { getToken } from '@/utils/auth';
 import {
  consumeReloadQuery,
  hasReloadQuery,
  isChunkLoadError,
  reloadForChunkError,
  setPendingRoutePath,
@@ -19,20 +17,19 @@ const lockPage = '/lock'; //锁屏页
 router.onError(error => {
  if (!isChunkLoadError(error)) return;
  if (reloadForChunkError()) {
-    ElMessage.warning('页面资源已更新，正在重新加载…');
+    ElMessage.warning('页面资源加载失败，正在重新加载…');
  }
 });
 window.addEventListener('unhandledrejection', event => {
  if (!isChunkLoadError(event.reason)) return;
  if (reloadForChunkError()) {
    event.preventDefault();
    ElMessage.warning('页面资源加载失败，正在重新加载…');
  }
 });
 router.beforeEach((to, from, next) => {
  if (hasReloadQuery(to.query)) {
    next({
      path: to.path,
      query: consumeReloadQuery(to.query),
      hash: to.hash,
      replace: true,
    });
    return;
  }
  setPendingRoutePath(to.fullPath);
  const meta = to.meta || {};
  const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
@@ -62,7 +59,7 @@ router.beforeEach((to, from, next) => {
            fullPath: tabKeyOf(to),
            params: to.params,
            query: to.query,
-            meta: { ...meta, keepAlive: true },
+            meta: meta,
          });
        }
        next();
@@ -2,7 +2,6 @@ import website from '@/config/website';
 import { getToken } from '@/utils/auth';
 import store from '@/store';
 import { generateIframePath, processUrlForQuery, isURL } from './router';
 import { wrapViewLoader } from '@/utils/chunk-reload';
 const modules = import.meta.glob('../**/**/*.vue');
 // 将多级路由扁平化为二级路由，支持 keep-alive 跨层级缓存
@@ -97,23 +96,21 @@ RouterPlugin.install = function (option = {}) {
          component: (() => {
            // 判断是否为首路由
            if (first) {
-              return wrapViewLoader(
+              return modules[
                modules[
                option.store.getters.isMacOs || !website.setting.menu
                  ? '../page/index/layout.vue'
                  : '../page/index/index.vue'
-                ]
+              ];
              );
              // 判断是否为多层路由
            } else if (isChild && !first) {
-              return wrapViewLoader(modules['../page/index/layout.vue']);
+              return modules['../page/index/layout.vue'];
              // 判断是否为最终的页面视图
            } else {
              let result = modules[`../${component}.vue`];
              if (!result) {
                isComponent = false;
              }
-              return wrapViewLoader(result);
+              return result;
            }
          })(),
          name,
@@ -130,7 +127,7 @@ RouterPlugin.install = function (option = {}) {
                if (first) {
                  oMenu[propsDefault.path] = `${path}`;
                  let componentPath = oMenu.component || component;
-                  let result = wrapViewLoader(modules[`../${componentPath}.vue`]);
+                  let result = modules[`../${componentPath}.vue`];
                  if (!result) {
                    isComponent = false;
                  }
@@ -176,7 +173,7 @@ export const formatPath = (ele, first) => {
  const icon = ele[propsDefault.icon];
  ele[propsDefault.icon] = icon || '';
  ele.meta = {
-    keepAlive: true,
+    keepAlive: ele.isOpen === 2,
  };
  const iframeComponent = 'components/iframe/main';
  const iframeSrc = href => {
@@ -218,7 +215,7 @@ export const formatPath = (ele, first) => {
      ele[propsDefault.children].forEach(child => {
        child.component = 'views' + child[propsDefault.path];
        child.meta = {
-          keepAlive: true,
+          keepAlive: child.isOpen === 2,
        };
        if (isURL(child[propsDefault.href])) {
          let href = child[propsDefault.href];
@@ -128,5 +128,5 @@ export function tabView(route, Component) {
    };
    wrapperMap.set(tabKey, wrapper);
  }
-  return wrapper;
+  return h(wrapper);
 }
@@ -16,8 +16,11 @@ const getters = {
  lockPasswd: state => state.common.lockPasswd,
  tagList: state => state.tags.tagList,
  tagsKeep: (state, getters) => {
-    // 所有已打开标签均纳入 keep-alive，关闭标签后自动从白名单移除并释放实例
+    return getters.tagList
-    return getters.tagList.map(ele => ele.fullPath).filter(Boolean);
+      .filter(ele => {
        return (ele.meta || {}).keepAlive;
      })
      .map(ele => ele.fullPath);
  },
  tagWel: state => state.tags.tagWel,
  token: state => state.user.token,
@@ -1,168 +1,38 @@
 /**
 * 懒加载 chunk / CSS preload 失败后的整页恢复。
 * 常见于：部署后旧 hash 失效、静态服务空闲断连、代理 CONNECTION_RESET。
 *
 * 失败后必须整页刷新：旧入口里的 hashed 资源地址不会自行更新，
 * 仅捕获路由错误而不刷新时，未打开过的页面会一直无法进入。
 */
 const RELOAD_FLAG = 'app:chunk-reload-ts';
-const RELOAD_QUERY = '_chunkreload';
+const RELOAD_COOLDOWN_MS = 10000;
 const RELOAD_COOLDOWN_MS = 15000;
 const CHUNK_ERROR_RE =
-  /Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError|Unable to preload|error loading module|Load failed/i;
+  /Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError/i;
 /** 最近一次路由跳转目标，供 onError 时整页落到正确地址 */
 let pendingFullPath = '';
 let installed = false;
 let reloading = false;
 export function setPendingRoutePath(fullPath = '') {
  pendingFullPath = fullPath || '';
 }
 function collectErrorText(error, depth = 0) {
  if (!error || depth > 3) return '';
  if (typeof error === 'string') return error;
  const parts = [
    error.message,
    error.msg,
    error.name,
    error.stack,
    error.error && collectErrorText(error.error, depth + 1),
    error.reason && collectErrorText(error.reason, depth + 1),
    error.cause && collectErrorText(error.cause, depth + 1),
    error.payload && collectErrorText(error.payload, depth + 1),
  ];
  const target = error.target;
  if (target && (target.src || target.href)) {
    parts.push(target.src || target.href);
  }
  try {
    parts.push(String(error));
  } catch (e) {
    /* ignore */
  }
  return parts.filter(Boolean).join(' ');
 }
 export function isChunkLoadError(error) {
-  const text = collectErrorText(error);
+  if (!error) return false;
-  if (!text) return false;
+  const message = error.message || String(error);
-  if (CHUNK_ERROR_RE.test(text)) return true;
+  return CHUNK_ERROR_RE.test(message);
  return /Failed to fetch/i.test(text) && /\.m?js(\?|$|:)/i.test(text);
 }
 export function hasReloadQuery(query = {}) {
  return !!(query && query[RELOAD_QUERY] !== undefined);
 }
 export function consumeReloadQuery(query = {}) {
  if (!hasReloadQuery(query)) return query;
  const next = { ...query };
  delete next[RELOAD_QUERY];
  return next;
 }
 function buildReloadUrl(targetPath) {
  const url = new URL(targetPath, window.location.origin);
  url.searchParams.set(RELOAD_QUERY, String(Date.now()));
  return url.pathname + url.search + url.hash;
 }
 /**
 * @returns {boolean} 是否已触发刷新（冷却期内返回 false，避免死循环）
 */
 export function reloadForChunkError(targetPath) {
  if (reloading) return false;
  const now = Date.now();
  const last = Number(sessionStorage.getItem(RELOAD_FLAG) || 0);
  if (now - last < RELOAD_COOLDOWN_MS) {
    return false;
  }
  reloading = true;
  sessionStorage.setItem(RELOAD_FLAG, String(now));
-  const path =
+  const path = targetPath || pendingFullPath || window.location.pathname + window.location.search + window.location.hash;
-    targetPath ||
+  window.location.assign(path);
    pendingFullPath ||
    `${window.location.pathname}${window.location.search}${window.location.hash}`;
  const dest = buildReloadUrl(path);
  // cache: 'reload' 会回写 HTTP 缓存，降低 index.html 仍指向旧 hash 资源的概率
  fetch(`${window.location.pathname}?${RELOAD_QUERY}=${now}`, {
    cache: 'reload',
    credentials: 'same-origin',
    headers: {
      Pragma: 'no-cache',
      'Cache-Control': 'no-cache',
    },
  })
    .catch(() => {})
    .finally(() => {
      window.location.replace(dest);
    });
  return true;
 }
 export function wrapViewLoader(loader) {
  if (typeof loader !== 'function') return loader;
  return () =>
    Promise.resolve()
      .then(() => loader())
      .catch(error => {
        if (isChunkLoadError(error)) {
          reloadForChunkError();
        }
        throw error;
      });
 }
 export function installChunkReload() {
  if (installed || typeof window === 'undefined') return;
  installed = true;
  window.addEventListener('vite:preloadError', event => {
    if (reloadForChunkError()) {
      event.preventDefault();
    }
  });
  window.addEventListener('unhandledrejection', event => {
    if (!isChunkLoadError(event.reason)) return;
    if (reloadForChunkError()) {
      event.preventDefault();
    }
  });
  window.addEventListener(
    'error',
    event => {
      const el = event.target;
      const isAssetNode =
        el &&
        el !== window &&
        (el.tagName === 'SCRIPT' ||
          (el.tagName === 'LINK' && /modulepreload|stylesheet/i.test(el.rel || '')));
      if (isAssetNode || isChunkLoadError(event.error || event.message)) {
        if (reloadForChunkError()) {
          event.preventDefault();
        }
      }
    },
    true
  );
  document.addEventListener('visibilitychange', () => {
    if (document.visibilityState === 'visible') checkDeployedAssets();
  });
 }
 function checkDeployedAssets() {
  const el = document.querySelector('script[type="module"][src*="/assets/"]');
  if (!el || !el.src) return;
  fetch(el.src, { method: 'HEAD', cache: 'no-store', credentials: 'same-origin' })
    .then(res => {
      if (res.status === 404) reloadForChunkError();
    })
    .catch(() => {});
 }
@@ -1,51 +1,8 @@
 <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)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div></div>
+      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ 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">
+      <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>
          <dt>客户</dt>
          <dd>
            <el-link v-if="master.customerName" type="primary" @click="openCustomer">{{
              master.customerName
            }}</el-link>
            <span v-else>-</span>
          </dd>
        </div>
        <div>
          <dt>合同编号</dt>
          <dd>
            <el-link v-if="master.contractNo && master.contractId" type="primary" @click="openContract">{{
              master.contractNo
            }}</el-link>
            <span v-else>{{ master.contractNo || '-' }}</span>
          </dd>
        </div>
        <div>
          <dt>项目</dt>
          <dd>
            <el-link v-if="master.projectName && master.projectId" type="primary" @click="openProject">{{
              master.projectName
            }}</el-link>
            <span v-else>{{ master.projectName || '-' }}</span>
          </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>{{ segmentLocationName(route, 'departure') }}</strong><small>{{ route.departureAddress || '-' }}</small><small class="route-map__progress">{{ index ? `已到达 ${quantity(segments[index - 1].arrivedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(segments[index - 1])}` : `已调度 ${quantity(route.dispatchedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(route)}` }}</small><small v-if="index" class="route-map__progress">已调度 {{ quantity(route.dispatchedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</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>{{ segmentLocationName(route, 'arrival') }}</strong><small>{{ route.arrivalAddress || '-' }}</small><small class="route-map__progress">已到达 {{ quantity(route.arrivedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div></template></div>
    </section>
@@ -85,8 +42,6 @@
 <script>
 import * as api from '@/api/business/master-order';
 import { getDetail as getProjectDetail } from '@/api/business/project-apply';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { CaretBottom, CaretTop } from '@element-plus/icons-vue';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
@@ -96,26 +51,10 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 const viewerPlugins = [imagePlugin(), pdfPlugin({ workerSrc: pdfWorkerSrc, useFetchData: true }), officePlugin({ pdf: { workerSrc: pdfWorkerSrc, useFetchData: true } }), textPlugin(), fallbackPlugin()];
 const parseJsonArray = value => {
  if (Array.isArray(value)) return value;
  if (!value) return [];
  try {
    const parsed = JSON.parse(value);
    if (Array.isArray(parsed)) return parsed;
    return parsed && typeof parsed === 'object' ? [parsed] : [];
  } catch (error) {
    return [];
  }
 };
 const customerRowLabel = (row = {}) =>
  row.customer || row.fullName || row.shortName || row.customerName || row.customerCode || '';
 const customerRowId = (row = {}) => row.id || row.customerId || '';
 export default {
  components: { ElImageViewer, OpenFileViewer },
  props: { id: [String, Number] },
  emits: ['back'],
  data() { return { loading: false, master: null, expandedSegments: {}, CaretBottom, CaretTop, imagePreviewVisible: false, imagePreviewUrls: [], imagePreviewIndex: 0, documentPreviewVisible: false, previewFile: {}, viewerPlugins, viewerToolbar: { download: true, fullscreen: true, print: true, rotate: true, zoom: true } }; },
  computed: {
    segments() {
@@ -209,68 +148,6 @@ export default {
      this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
    },
    openPlan(row) { this.$router.push({ path: '/business/transport-plan', query: { detailId: row.id } }); },
    openContract() {
      if (!this.master?.contractId) {
        this.$message.warning('合同信息缺失，无法打开');
        return;
      }
      this.$router.push({
        path: '/business/contract-manage/detail',
        query: { id: this.master.contractId, name: '合同详情' },
      });
    },
    openProject() {
      if (!this.master?.projectId) {
        this.$message.warning('项目信息缺失，无法打开');
        return;
      }
      this.$router.push({
        path: '/business/project-apply/form',
        query: { mode: 'view', id: this.master.projectId, name: '查看项目管理' },
      });
    },
    async resolveCustomerId() {
      if (this.master?.customerId) return this.master.customerId;
      const name = String(this.master?.customerName || '').trim();
      if (!name) return '';
      if (this.master?.projectId) {
        try {
          const res = await getProjectDetail(this.master.projectId);
          const rows = parseJsonArray(res.data?.data?.customerJson);
          const matched =
            rows.find(row => customerRowLabel(row) === name) ||
            rows.find(row => {
              const label = customerRowLabel(row);
              return label && (name.includes(label) || label.includes(name));
            });
          const id = customerRowId(matched);
          if (id) return id;
        } catch (error) {
          // 项目客户解析失败时回退到客商档案检索
        }
      }
      try {
        const res = await getCustomerArchiveList(1, 20, { fullName: name });
        const records = res.data?.data?.records || [];
        const exact =
          records.find(item => item.fullName === name || item.shortName === name) || records[0];
        return exact?.id || '';
      } catch (error) {
        return '';
      }
    },
    async openCustomer() {
      if (!this.master?.customerName) return;
      const customerId = await this.resolveCustomerId();
      if (!customerId) {
        this.$message.warning('未找到对应客商档案，无法打开');
        return;
      }
      this.$router.push({
        path: '/vehicle/customer-archive/form',
        query: { id: String(customerId), name: '查看客商档案', view: '1' },
      });
    },
    waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
    waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
    statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; },
@@ -284,7 +161,7 @@ export default {
 .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: #303133; font-size: 14px; word-break: break-all; } :deep(.el-link) { font-size: 14px; } }
+.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; } }
 .route-map__progress { color: #303133 !important; }
@@ -95,51 +95,10 @@
        <div class="goods-heading"><h3>货物信息</h3><div><el-link type="primary" @click="addGoods(route)">新增货物</el-link></div></div>
        <el-table :data="route.goods" border class="goods-table">
          <el-table-column type="index" label="序号" width="64" />
-          <el-table-column min-width="180"
+          <el-table-column min-width="180"><template #header><span>货物类型<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-cascader v-model="row.cargoTypePath" class="goods-table__cargo-type" :options="cargoTypeOptions" :props="cargoTypeCascaderProps" placeholder="请选择货物类型" clearable filterable @change="value => handleCargoTypeChange(route, row, value)" /></template></el-table-column>
-            ><template #header
+          <el-table-column min-width="180"><template #header><span>货物名称<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-select v-model="row.sourceIndex" class="goods-table__cargo-name" placeholder="请选择总单货物" @change="selectGoods(route, row)"><el-option v-for="item in masterGoodsByCargoType(row)" :key="item.sourceIndex" :label="item.cargoName" :value="item.sourceIndex" /></el-select></template></el-table-column>
-              ><span>货物类型<span class="goods-required-mark">*</span></span></template
+          <el-table-column prop="remainingQuantity" column-key="remainingQuantity" label="剩余数量" width="150" class-name="goods-table__remaining"><template #default="{ row }">{{ formatQuantity(goodsRemainingQuantity(route, row)) }}</template></el-table-column>
-            ><template #default="{ row }"
+          <el-table-column prop="dispatchQuantity" column-key="dispatchQuantity" width="200" class-name="goods-table__dispatch"><template #header><span>本次数量<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-input :model-value="row.dispatchQuantity" inputmode="decimal" placeholder="请输入" @input="value => handleDispatchQuantityInput(route, row, value)" /></template></el-table-column>
              ><el-autocomplete
                v-model="row.cargoType"
                class="goods-table__cargo-type"
                clearable
                :debounce="300"
                placeholder="请输入货物类型"
                :fetch-suggestions="fetchCargoTypeSuggestions"
                @select="item => handleCargoTypeSelect(route, row, item)"
                @change="value => handleCargoTypeChange(route, row, value)"
            /></template>
          </el-table-column>
          <el-table-column min-width="180"
            ><template #header
              ><span>货物名称<span class="goods-required-mark">*</span></span></template
            ><template #default="{ row }"
              ><el-select
                v-model="row.sourceIndex"
                class="goods-table__cargo-name"
                placeholder="请选择总单货物"
                @change="selectGoods(route, row)"
                ><el-option
                  v-for="item in masterGoodsByCargoType(row)"
                  :key="item.sourceIndex"
                  :label="item.cargoName"
                  :value="item.sourceIndex" /></el-select
            ></template>
          </el-table-column>
          <el-table-column
            prop="dispatchQuantity"
            column-key="dispatchQuantity"
            width="200"
            class-name="goods-table__dispatch"
            ><template #header
              ><span>本次数量<span class="goods-required-mark">*</span></span></template
            ><template #default="{ row }"
              ><el-input
                :model-value="row.dispatchQuantity"
                inputmode="decimal"
                placeholder="请输入"
                @input="value => handleDispatchQuantityInput(route, row, value)" /></template
          ></el-table-column>
          <el-table-column prop="quantityUnit" width="110"><template #header><span>数量单位<span class="goods-required-mark">*</span></span></template></el-table-column>
          <el-table-column prop="packageType" label="包装" min-width="110" />
          <el-table-column prop="brand" label="品牌" min-width="110" />
@@ -249,7 +208,7 @@ export default {
  props: { id: [String, Number] },
  emits: ['back'],
  data() {
-    return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
+    return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, cargoTypeOptions: [], cargoTypeCascaderProps: { label: 'cargoName', value: 'id', children: 'children', emitPath: true }, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
  },
  computed: {
    totalQuantity() { return (this.master?.goods || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0); },
@@ -257,9 +216,6 @@ export default {
    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('、') || '-'; },
    masterGoods() { return (this.master?.goods || []).map((item, sourceIndex) => ({ ...item, sourceIndex, label: [item.cargoName, item.cargoType].filter(Boolean).join(' / ') })); },
    cargoTypeSelectOptions() {
      return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))];
    },
    dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
    pendingGroups() {
      return this.pending.reduce((groups, item, index) => {
@@ -300,6 +256,7 @@ export default {
        const res = await api.getDetail(this.id);
        this.master = res.data?.data || res.data || res;
        await this.loadContractCurrency();
        this.cargoTypeOptions = this.buildMasterCargoTypeOptions(this.master.goods || []);
        this.routes = this.dispatchRouteNodes().map((node, index) => this.createRoute(node, index));
      } finally { this.loading = false; }
    },
@@ -361,42 +318,46 @@ export default {
      this.syncFreightItems(route);
      return route;
    },
    buildMasterCargoTypeOptions(goods = []) {
      return [...new Set(goods.map(item => item.cargoType).filter(Boolean))].map(cargoType => ({
        id: cargoType,
        cargoName: cargoType,
      }));
    },
    masterGoodsByCargoType(row = {}) {
-      const cargoType = String(row.cargoType || '').trim();
+      return this.masterGoods.filter(item => !row.cargoType || item.cargoType === row.cargoType);
      if (!cargoType) return this.masterGoods;
      const matched = this.masterGoods.filter(item => item.cargoType === cargoType);
      return matched.length ? matched : this.masterGoods;
    },
-    fetchCargoTypeSuggestions(queryString, callback) {
+    findCargoTypeByPath(path = []) {
-      const keyword = String(queryString || '').trim().toLowerCase();
+      let options = this.cargoTypeOptions;
-      const options = this.cargoTypeSelectOptions.map(item => ({ value: item }));
+      let selected;
-      callback(
+      (path || []).forEach(id => {
-        keyword ? options.filter(item => String(item.value).toLowerCase().includes(keyword)) : options
+        selected = (options || []).find(item => String(item.id) === String(id));
-      );
+        options = selected?.children || [];
      });
      return selected;
    },
-    handleCargoTypeSelect(route, row, item = {}) {
+    findCargoTypePath(cargoType, options = this.cargoTypeOptions, parentPath = []) {
-      this.handleCargoTypeChange(route, row, item.value || '');
+      for (const option of options || []) {
        const path = [...parentPath, option.id];
        if (option.cargoName === cargoType) return path;
        if (option.children?.length) {
          const result = this.findCargoTypePath(cargoType, option.children, path);
          if (result.length) return result;
        }
      }
      return [];
    },
    handleCargoTypeChange(route, row, value) {
-      row.cargoType = String(value ?? row.cargoType ?? '').trim();
+      const path = Array.isArray(value) ? value : [];
-      const matched = this.masterGoods.filter(item => item.cargoType === row.cargoType);
+      const cargoType = this.findCargoTypeByPath(path);
-      const firstGoods = matched[0];
+      row.cargoTypePath = path;
      row.cargoType = cargoType?.cargoName || '';
      const firstGoods = this.masterGoodsByCargoType(row)[0];
      if (firstGoods) {
        row.sourceIndex = firstGoods.sourceIndex;
        this.selectGoods(route, row);
      } else {
        Object.assign(row, {
          sourceIndex: undefined,
          cargoName: '',
          quantity: '',
          quantityUnit: '',
          packageType: '',
          brand: '',
          specification: '',
          model: '',
          materialCode: '',
        });
      }
      else Object.assign(row, { sourceIndex: undefined, cargoName: '', quantity: '', quantityUnit: '' });
      this.syncFreightItems(route);
    },
    isRoad(route) {
@@ -581,47 +542,52 @@ export default {
      );
      return false;
    },
    pendingGoodsQuantity(route, row) {
      const goodsIndex = this.masterGoodsIndex(row);
      return this.pending.reduce((sum, item) => {
        if (!this.isSameRouteSegment(route, item)) return sum;
        const pendingGoodsIndex = this.masterGoodsIndex(item);
        if (
          (goodsIndex >= 0 && pendingGoodsIndex >= 0 && pendingGoodsIndex !== goodsIndex) ||
          (goodsIndex < 0 && !this.isSameGoods(item, row))
        ) {
          return sum;
        }
        return sum + this.quantityNumber(item.quantity);
      }, 0);
    },
    isSameRouteSegment(route = {}, item = {}) {
      const routeSegment = route.segmentNo || route.relationNo || '';
      const itemSegment = item.segmentNo || item.relationNo || '';
      return String(routeSegment) === String(itemSegment);
    },
    editingGoodsQuantity(route, row) {
      return (route.goods || []).reduce((sum, item) => {
        if (item === row || !this.isSameGoods(item, row)) return sum;
        return sum + this.quantityNumber(item.dispatchQuantity);
      }, 0);
    },
    goodsRemainingQuantity(route, row) {
      return Math.max(
        0,
        this.baseGoodsRemainingQuantity(route, row) -
          this.pendingGoodsQuantity(route, row) -
          this.editingGoodsQuantity(route, row)
      );
    },
    availableDispatchQuantity(route, row) { return this.goodsRemainingQuantity(route, row); },
    handleDispatchQuantityInput(route, row, value) {
      const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
-      row.dispatchQuantity =
+      const nextValue = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
-        decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
+      const availableQuantity = this.availableDispatchQuantity(route, row);
      if (Number(nextValue || 0) > availableQuantity) {
        row.dispatchQuantity = this.formatQuantity(availableQuantity);
        this.syncFreightItems(route);
-    },
+        this.$message.warning('本次数量不能超过剩余数量');
-    validatePendingTotals() {
+        return;
      for (const route of this.routes) {
        const items = this.pending.filter(item => this.isSameRouteSegment(route, item));
        if (!items.length) continue;
        if (!this.validatePreviousSegmentCompletedQuantity(route, [])) return false;
        const totals = new Map();
        for (const item of items) {
          const index = this.masterGoodsIndex(item);
          const key = index >= 0 ? `i:${index}` : this.goodsKey(item);
          totals.set(key, (totals.get(key) || 0) + this.quantityNumber(item.quantity));
      }
-        for (const [key, qty] of totals.entries()) {
+      row.dispatchQuantity = nextValue;
-          if (!key.startsWith('i:')) continue;
+      this.syncFreightItems(route);
          const sourceIndex = Number(key.slice(2));
          const masterGoods = this.master?.goods?.[sourceIndex];
          if (!masterGoods) continue;
          const available = this.baseGoodsRemainingQuantity(route, {
            ...masterGoods,
            sourceIndex,
          });
          if (qty > available) {
            this.$message.warning(
              `${route.segmentNo}「${masterGoods.cargoName || ''}」调度总量不能超过剩余数量（${this.formatQuantity(available)} ${masterGoods.quantityUnit || this.quantityUnitLabel}）`
            );
            return false;
          }
        }
      }
      return true;
    },
    handleFreightUnitPriceInput(item, value) {
      const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
@@ -652,7 +618,7 @@ export default {
        const index = (route.goods || []).indexOf(item) + 1;
        const fields = [
          [!String(item.cargoName || '').trim() || item.sourceIndex === undefined || item.sourceIndex === null || item.sourceIndex === '', '货物名称'],
-          [!String(item.cargoType || '').trim(), '货物类型'],
+          [!String(item.cargoType || '').trim() && !(item.cargoTypePath || []).length, '货物类型'],
          [item.dispatchQuantity === undefined || item.dispatchQuantity === null || item.dispatchQuantity === '' || Number(item.dispatchQuantity) <= 0, '本次数量'],
          [!String(item.quantityUnit || '').trim(), '数量单位'],
        ];
@@ -684,6 +650,7 @@ export default {
      return {
        ...goods,
        sourceIndex,
        cargoTypePath: this.findCargoTypePath(goods.cargoType),
        dispatchQuantity: undefined,
      };
    },
@@ -699,8 +666,7 @@ export default {
    selectGoods(route, row) {
      const source = (this.master.goods || [])[Number(row.sourceIndex)];
      if (!source) return;
-      const cargoType = String(row.cargoType || '').trim() || source.cargoType;
+      Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)));
      Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)), { cargoType });
      this.syncFreightItems(route);
    },
    removeGoods(route, index) { route.goods.splice(index, 1); this.syncFreightItems(route); },
@@ -888,6 +854,8 @@ export default {
      const goods = route.goods.filter(item => Number(item.dispatchQuantity) > 0);
      if (!goods.length) return this.$message.warning('请填写本次数量');
      if (!this.validateDispatchGoods(route, goods)) return;
      if (goods.some(item => Number(item.dispatchQuantity) > this.availableDispatchQuantity(route, item))) return this.$message.warning('本次数量不能超过剩余数量');
      if (!this.validatePreviousSegmentCompletedQuantity(route, goods)) return;
      this.syncFreightItems(route);
      if (!this.validateFreightItems(route)) return;
      if (!this.validateRoutePhones(route)) return;
@@ -986,7 +954,6 @@ export default {
    async submit() {
      if (!this.pending.length) return this.$message.warning('请加入待提交调度清单');
      if (this.pending.some(item => !this.validateRoutePhones(item))) return;
      if (!this.validatePendingTotals()) return;
      this.submitting = true;
      try { await api.dispatch({ id: this.master.id, dispatches: this.pending.map(({ id, ...item }) => ({ ...item, mileage: this.normalizeMileage(item.mileage) })) }); this.$message.success('调度成功'); this.$emit('back'); } finally { this.submitting = false; }
    },
@@ -1018,7 +985,7 @@ export default {
 .transport-type-field :deep(.el-input) { width: 240px; }
 .goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
 .freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
-.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type), :deep(.goods-table__cargo-name) { width: 100%; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
+.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
 .goods-required-mark { margin-left: 2px; color: #f56c6c; }
 .freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
 .carrier-type-form { margin-top: 16px; }
@@ -146,9 +146,8 @@
          />
          <el-input
            v-model="form.departureAddress"
-            class="shipping-template-page__address-map-input"
+            placeholder="请输入发货地址"
-            readonly
+            :readonly="transportStationMode || !config.editableRoadAddress"
            placeholder="请选择发货地址"
            :disabled="transportAddressSelectDisabled"
            @click="handleTransportSecondaryAddressInputClick('departure')"
          >
@@ -190,9 +189,8 @@
          />
          <el-input
            v-model="form.arrivalAddress"
-            class="shipping-template-page__address-map-input"
+            placeholder="请输入收货地址"
-            readonly
+            :readonly="transportStationMode || !config.editableRoadAddress"
            placeholder="请选择收货地址"
            :disabled="transportAddressSelectDisabled"
            @click="handleTransportSecondaryAddressInputClick('arrival')"
          >
@@ -1133,7 +1131,7 @@ const defaultCargo = () => ({
  cargoTypePath: [],
  packageType: '',
  quantity: '',
-  quantityUnit: '吨',
+  quantityUnit: '',
  brand: '',
  specification: '',
  model: '',
@@ -1260,7 +1258,6 @@ export default {
      crudDialogType: '',
      standaloneFormKey: '',
      copyingRow: null,
      suppressTransportTypeClear: false,
      detailBox: false,
      detailLoading: false,
      detailRow: {},
@@ -1514,10 +1511,10 @@ export default {
      },
    },
    'form.transportType'(value, oldValue) {
-      if (this.suppressTransportTypeClear) return;
+      if (value !== oldValue) {
      if (String(value ?? '') === String(oldValue ?? '')) return;
        this.handleTransportTypeChange(value);
        this.syncFreightItems();
      }
    },
  },
  created() {
@@ -1530,20 +1527,6 @@ export default {
  methods: {
    buildOption(option) {
      const next = { ...option, column: (option.column || []).map(column => ({ ...column })) };
      const tableOrder = this.config.tableColumnOrder || [];
      if (tableOrder.length) {
        const orderMap = new Map(tableOrder.map((prop, index) => [prop, index]));
        next.column.sort((left, right) => {
          const leftOrder = orderMap.has(left.prop) ? orderMap.get(left.prop) : tableOrder.length;
          const rightOrder = orderMap.has(right.prop)
            ? orderMap.get(right.prop)
            : tableOrder.length;
          return leftOrder - rightOrder;
        });
        next.column.forEach(column => {
          if (column.prop) column.hide = !orderMap.has(column.prop);
        });
      }
      if (this.menuWidth != null) next.menuWidth = this.menuWidth;
      if (
        this.standaloneFormPage &&
@@ -1807,7 +1790,6 @@ export default {
          console.log('进入复制模式分支');
          const copyData = { ...this.copyingRow };
          this.copyingRow = null;
          this.suppressTransportTypeClear = true;
          this.form = { ...(this.config.defaultForm || {}), ...copyData };
          console.log('合并后的 form:', this.form);
          // 删除模板编号，等待系统生成
@@ -1860,11 +1842,7 @@ export default {
      done?.();
    },
    applyFormDetail(row) {
      this.suppressTransportTypeClear = true;
      this.form = { ...(row || {}) };
      this.$nextTick(() => {
        this.suppressTransportTypeClear = false;
      });
      this.selectedProjectId = this.form.projectId || '';
      this.transportCargoRows = this.parseJsonArray(this.form.goodsJson).map(item =>
        this.normalizeCargo(item)
@@ -1946,6 +1924,14 @@ export default {
          this.$message.warning(`第${index + 1}行货物类型不能为空`);
          return false;
        }
        if (!String(row.cargoName || '').trim() || !row.quantity || !row.quantityUnit) {
          this.$message.warning(`第${index + 1}行货物信息不完整`);
          return false;
        }
        if (Number(row.quantity) <= 0) {
          this.$message.warning(`第${index + 1}行数量必须大于0`);
          return false;
        }
        if (String(row.remark || '').length > 200) {
          this.$message.warning(`第${index + 1}行备注不能超过200个字符`);
          return false;
@@ -2027,8 +2013,6 @@ export default {
          delete detail.updateUser;
          delete detail.updateUserName;
          delete detail.status;
          // 模板名称追加「-副本」
          detail.templateName = `${detail.templateName || ''}-副本`;
          console.log('处理后的数据:', detail);
          console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
@@ -2302,59 +2286,12 @@ export default {
    },
    handleTransportTypeChange(value) {
      this.form.transportTypeName = this.getTransportTypeLabel(value);
      this.clearTransportShippingInfo();
    },
    clearTransportShippingInfo() {
      [
        'departureName',
        'departureAddress',
        'departureAddressCode',
        'departureSiteCode',
        'departureLongitude',
        'departureLatitude',
        'departureContact',
        'departurePhone',
        'arrivalName',
        'arrivalAddress',
        'arrivalAddressCode',
        'arrivalSiteCode',
        'arrivalLongitude',
        'arrivalLatitude',
        'arrivalContact',
        'arrivalPhone',
      ].forEach(prop => {
        this.form[prop] = '';
      });
      this.transportMapSelected = {};
      this.transportRouteBox = false;
      this.transportAddressBox = false;
      this.transportStationBox = false;
      this.transportMapBox = false;
      this.transportAddressTarget = '';
      this.transportStationTarget = '';
      this.transportMapTarget = '';
      this.transportMapKeyword = '';
      this.transportMapStatus = '可搜索地址或点击地图选点';
      if (this.transportAmapMarker) {
        this.transportAmapMarker.setMap(null);
        this.transportAmapMarker = null;
      }
      this.$refs.crud?.clearValidate?.([
        'departureAddress',
        'arrivalAddress',
        'departureName',
        'arrivalName',
        'departureContact',
        'departurePhone',
        'arrivalContact',
        'arrivalPhone',
      ]);
    },
    openTransportPrimaryAddressPicker(target) {
      if (this.transportStationMode) this.openTransportStationDialog(target);
    },
    handleTransportSecondaryAddressInputClick(target) {
-      if (this.transportAddressSelectDisabled) return;
+      if (this.transportStationMode || !this.config.editableRoadAddress)
        this.openTransportSecondaryAddressPicker(target);
    },
    openTransportSecondaryAddressPicker(target) {
@@ -3391,13 +3328,6 @@ export default {
  gap: 8px;
  align-items: center;
 }
 .shipping-template-page__address-map-input {
  cursor: pointer;
  :deep(.el-input__wrapper),
  :deep(.el-input__inner) {
    cursor: pointer;
  }
 }
 .shipping-template-page__section-actions {
  display: flex;
  gap: 12px;
@@ -85,23 +85,15 @@
      </template>
      <template #departureAddress="{ row }">
-        <el-tooltip
+        <el-tooltip v-if="row.departureAddress" :content="row.departureAddress" placement="top">
-          v-if="row.departureAddress || row.departureName"
+          <span>{{ formatTransportPlanProvinceCityDistrict(row.departureAddress) }}</span>
          :content="row.departureAddress || row.departureName"
          placement="top"
        >
          <span>{{ formatTransportPlanListAddress(row, 'departure') }}</span>
        </el-tooltip>
        <span v-else>-</span>
      </template>
      <template #arrivalAddress="{ row }">
-        <el-tooltip
+        <el-tooltip v-if="row.arrivalAddress" :content="row.arrivalAddress" placement="top">
-          v-if="row.arrivalAddress || row.arrivalName"
+          <span>{{ formatTransportPlanProvinceCityDistrict(row.arrivalAddress) }}</span>
          :content="row.arrivalAddress || row.arrivalName"
          placement="top"
        >
          <span>{{ formatTransportPlanListAddress(row, 'arrival') }}</span>
        </el-tooltip>
        <span v-else>-</span>
      </template>
@@ -582,7 +574,7 @@
          >
          <el-link
            type="primary"
-            v-if="showViewButton(row)"
+            v-if="hasPermission(`${config.permission}_view`) && !showDetailButton(row)"
            @click="$refs.crud.rowView(row, index)"
          >
            查看
@@ -1500,38 +1492,27 @@
              <el-input
                v-model="dispatchItemForm.departureName"
                :placeholder="dispatchStationNamePlaceholder"
-                :readonly="dispatchStationMode"
+                :suffix-icon="dispatchStationMode ? Search : undefined"
-                @click="openDispatchPrimaryAddressPicker('departure')"
+                disabled
-              >
+              />
                <template v-if="dispatchStationMode" #suffix>
                  <el-icon
                    class="transport-plan-page__map-suffix"
                    @click.stop="openDispatchSecondaryAddressPicker('departure')"
                  >
                    <Search />
                  </el-icon>
                </template>
              </el-input>
              <el-input
                v-model="dispatchItemForm.departureAddress"
                :placeholder="dispatchAddressDetailPlaceholder"
-                :readonly="dispatchStationMode"
+                disabled
                @click="handleDispatchSecondaryAddressInputClick('departure')"
              >
                <template v-if="!dispatchStationMode" #suffix>
                  <el-link
                    type="primary"
                    :underline="false"
                    class="transport-plan-page__address-choose-link"
                    @click.stop="openTransportMapDialog('departure')"
                    >选择</el-link
                  >
                </template>
              </el-input>
              <span class="transport-plan-page__route-label">联系人</span>
-              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" disabled />
              <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" disabled />
            </div>
          </el-form-item>
          <el-form-item label="收货地址" required>
@@ -1539,38 +1520,27 @@
              <el-input
                v-model="dispatchItemForm.arrivalName"
                :placeholder="dispatchStationNamePlaceholder"
-                :readonly="dispatchStationMode"
+                :suffix-icon="dispatchStationMode ? Search : undefined"
-                @click="openDispatchPrimaryAddressPicker('arrival')"
+                disabled
-              >
+              />
                <template v-if="dispatchStationMode" #suffix>
                  <el-icon
                    class="transport-plan-page__map-suffix"
                    @click.stop="openDispatchSecondaryAddressPicker('arrival')"
                  >
                    <Search />
                  </el-icon>
                </template>
              </el-input>
              <el-input
                v-model="dispatchItemForm.arrivalAddress"
                :placeholder="dispatchAddressDetailPlaceholder"
-                :readonly="dispatchStationMode"
+                disabled
                @click="handleDispatchSecondaryAddressInputClick('arrival')"
              >
                <template v-if="!dispatchStationMode" #suffix>
                  <el-link
                    type="primary"
                    :underline="false"
                    class="transport-plan-page__address-choose-link"
                    @click.stop="openTransportMapDialog('arrival')"
                    >选择</el-link
                  >
                </template>
              </el-input>
              <span class="transport-plan-page__route-label">联系人</span>
-              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" disabled />
              <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" />
+              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" disabled />
            </div>
          </el-form-item>
        </div>
@@ -1606,15 +1576,20 @@
                  ><span class="transport-plan-page__required-column">货物类型</span></template
                >
                <template #default="{ row }">
-                  <el-autocomplete
+                  <el-select
                    v-model="row.cargoType"
-                    placeholder="请输入货物类型"
+                    placeholder="请选择货物类型"
                    clearable
-                    :debounce="300"
+                    filterable
                    :fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
                    @select="item => handleDispatchConfiguredCargoTypeSelect(row, item)"
                    @change="value => handleDispatchConfiguredCargoTypeChange(row, value)"
                  >
                    <el-option
                      v-for="item in getDispatchConfiguredCargoTypeOptions()"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    />
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column min-width="240" align="center">
@@ -1622,18 +1597,20 @@
                  ><span class="transport-plan-page__required-column">货物名称</span></template
                >
                <template #default="{ row }">
-                  <el-autocomplete
+                  <el-select
                    v-model="row.cargoName"
-                    placeholder="请输入货物名称"
+                    placeholder="请选择货物名称"
                    clearable
-                    :debounce="300"
+                    filterable
                    :fetch-suggestions="
                      (queryString, callback) =>
                        fetchDispatchConfiguredCargoNameSuggestions(queryString, callback, row)
                    "
                    @select="item => handleDispatchConfiguredCargoNameSelect(row, item)"
                    @change="value => handleDispatchConfiguredCargoNameChange(row, value)"
                  >
                    <el-option
                      v-for="item in getDispatchConfiguredCargoNameOptions(row)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    />
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column label="包装" min-width="130" align="center">
@@ -1650,11 +1627,7 @@
              </el-table-column>
              <el-table-column label="剩余数量" min-width="130" align="center">
                <template #default="{ row }">
-                  {{
+                  {{ formatDispatchQuantity(dispatchItemRemainingQuantity(row)) }}
                    isDispatchPlanQuantityUnlimited(row)
                      ? '-'
                      : formatDispatchQuantity(dispatchItemRemainingQuantity(row))
                  }}
                </template>
              </el-table-column>
              <el-table-column min-width="130" align="center">
@@ -1875,33 +1848,36 @@
              <el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
            </el-form-item>
            <el-form-item label="货物类型" required>
-              <el-autocomplete
+              <el-select
                v-model="dispatchItemForm.cargoType"
-                placeholder="请输入货物类型"
+                placeholder="请选择货物类型"
                clearable
-                :debounce="300"
+                filterable
-                :fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
+                @change="handleDispatchConfiguredCargoTypeChange(dispatchItemForm, $event)"
-                @select="item => handleDispatchConfiguredCargoTypeSelect(dispatchItemForm, item)"
+              >
-                @change="value => handleDispatchConfiguredCargoTypeChange(dispatchItemForm, value)"
+                <el-option
                  v-for="item in getDispatchConfiguredCargoTypeOptions()"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="货物名称" required>
-              <el-autocomplete
+              <el-select
                v-model="dispatchItemForm.cargoName"
-                placeholder="请输入货物名称"
+                placeholder="请选择货物名称"
                clearable
-                :debounce="300"
+                filterable
-                :fetch-suggestions="
+                @change="handleDispatchConfiguredCargoNameChange(dispatchItemForm, $event)"
-                  (queryString, callback) =>
+              >
-                    fetchDispatchConfiguredCargoNameSuggestions(
+                <el-option
-                      queryString,
+                  v-for="item in getDispatchConfiguredCargoNameOptions(dispatchItemForm)"
-                      callback,
+                  :key="item.value"
-                      dispatchItemForm
+                  :label="item.label"
-                    )
+                  :value="item.value"
                "
                @select="item => handleDispatchConfiguredCargoNameSelect(dispatchItemForm, item)"
                @change="value => handleDispatchConfiguredCargoNameChange(dispatchItemForm, value)"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="规格">
              <el-input v-model="dispatchItemForm.specification" placeholder="请输入" />
@@ -1926,10 +1902,7 @@
                  </el-select>
                </template>
              </el-input>
-              <div
+              <div class="transport-plan-page__dispatch-quantity-hint">
                v-if="!isDispatchPlanQuantityUnlimited(dispatchItemForm)"
                class="transport-plan-page__dispatch-quantity-hint"
              >
                剩余数量：{{
                  formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
                }}
@@ -3439,21 +3412,15 @@ export default {
      }));
    },
    dispatchHasAddableQuantity() {
-      const items = this.dispatchTableQuantityItems;
+      return this.dispatchTableQuantityItems.some(
-      if (!items.length) return true;
+        item => item.total > 0 && item.listed < item.total - 1e-8
-      // 计划总量为 0 时不限制新增调度
+      );
      if (items.every(item => item.total <= 0)) return true;
      return items.some(item => item.total > 0 && item.listed < item.total - 1e-8);
    },
    dispatchSummaryText() {
      const formatSummary = field =>
        this.dispatchSummaryItems
          .map(item => `${this.formatDispatchQuantity(item[field])}${item.unit}`)
          .join('、');
      const unlimited = this.dispatchSummaryItems.every(item => item.total <= 0);
      if (unlimited) {
        return `已调度 ${formatSummary('assigned') || `0${TRANSPORT_PLAN_QUANTITY_UNIT}`}`;
      }
      return `共${formatSummary('total')} | 已调度 ${formatSummary(
        'assigned'
      )}，剩余${formatSummary('remaining')}`;
@@ -3639,13 +3606,12 @@ export default {
      return ['water', 'rail', 'air'].includes(this.transportMode);
    },
    transportStationTypeLabel() {
      const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
      const labelMap = {
        water: '港口/码头',
        rail: '铁路车站',
        air: '空港机场',
      };
-      return labelMap[mode] || '';
+      return labelMap[this.transportMode] || '';
    },
    transportStationNamePlaceholder() {
      if (!this.transportStationMode) return '行政区划自动带出';
@@ -3832,37 +3798,6 @@ export default {
      const cityMatch = text.match(/市/);
      return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
    },
    formatTransportPlanListAddress(row = {}, field) {
      const address = String(row[`${field}Address`] || '').trim();
      const name = String(row[`${field}Name`] || '').trim();
      const fromAddress = this.extractTransportPlanProvinceCityDistrict(address);
      if (fromAddress) return fromAddress;
      const fromName = this.extractTransportPlanProvinceCityDistrict(name);
      if (fromName) return fromName;
      return name || address || '-';
    },
    extractTransportPlanProvinceCityDistrict(value) {
      const text = String(value || '')
        .trim()
        .replace(/[\\/|｜、,，\s]+/g, '');
      if (!text) return '';
      const districtPattern = '(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)';
      const parts = [];
      let remainder = text;
      const province = text.match(/^(.+?(?:省|自治区|特别行政区))/);
      if (province) {
        parts.push(province[1]);
        remainder = text.slice(province[1].length);
      }
      const city = remainder.match(/^(.+?市)/);
      if (city) {
        parts.push(city[1]);
        remainder = remainder.slice(city[1].length);
      }
      const district = remainder.match(new RegExp(`^(.+?${districtPattern})`));
      if (district) parts.push(district[1]);
      return parts.length ? parts.join('/') : '';
    },
    formatTransportPlanRoadCityDistrict(value) {
      const text = String(value || '').trim();
      if (!text) return '-';
@@ -4020,11 +3955,6 @@ export default {
      const status = this.statusValue(row);
      return status !== 'draft';
    },
    showViewButton(row) {
      if (!this.hasPermission(`${this.config.permission}_view`)) return false;
      if (this.statusValue(row) === 'draft') return false;
      return !this.showDetailButton(row);
    },
    formatDetailValue(row, prop) {
      if (!row) return '-';
      if (prop === 'businessStatus') return this.displayStatus(row, prop);
@@ -4610,37 +4540,6 @@ export default {
    getDispatchRemainingQuantity(unit) {
      return this.getDispatchSummaryItem(unit)?.remaining || 0;
    },
    /** 计划总量为 0 时不限制调度数量 */
    isDispatchPlanQuantityUnlimited(row = {}) {
      const unit = this.getDispatchQuantityUnit(row);
      const hasCargoIdentity = Boolean(
        String(row.cargoName || row.goodsName || row.name || '').trim() ||
          String(row.cargoType || row.secondCargoTypeName || row.goodsType || row.type || '').trim()
      );
      const planGoodsRows = this.dispatchPlanGoodsRows;
      if (planGoodsRows.length && hasCargoIdentity) {
        const cargoKey = this.getDispatchCargoIdentity(row);
        const matchedPlanRows = planGoodsRows.filter(
          goods => this.getDispatchCargoIdentity(goods) === cargoKey
        );
        if (!matchedPlanRows.length) {
          return (this.getDispatchSummaryItem(unit)?.total || 0) <= 0;
        }
        const total = matchedPlanRows.reduce(
          (sum, goods) =>
            sum +
            this.parseDispatchQuantity(
              goods.quantity || goods.cargoQuantity || goods.goodsQuantity
            ),
          0
        );
        return total <= 0;
      }
      if (!planGoodsRows.length) {
        return Number(this.dispatchRow.totalQuantity || this.dispatchRow.quantity || 0) <= 0;
      }
      return (this.getDispatchSummaryItem(unit)?.total || 0) <= 0;
    },
    formatDispatchQuantity(value) {
      const number = Number(value || 0);
      if (!Number.isFinite(number)) return '0';
@@ -5339,13 +5238,6 @@ export default {
      }
    },
    ensureTransportTypeBeforeAddress() {
      if (this.dispatchItemBox) {
        const transportType =
          this.dispatchItemForm.transportType || this.dispatchRow?.transportType || '';
        if (!this.isBillingFieldEmpty(transportType)) return true;
        this.$message.warning('请先选择运输方式');
        return false;
      }
      if (!this.shippingInfoFormEnabled || !this.isBillingFieldEmpty(this.form.transportType)) {
        return true;
      }
@@ -5422,21 +5314,19 @@ export default {
    },
    openTransportStationDialog(target) {
      if (!this.ensureTransportTypeBeforeAddress()) return;
-      const stationMode = this.dispatchItemBox ? this.dispatchStationMode : this.transportStationMode;
+      if (!this.transportStationMode) return;
      if (!stationMode) return;
      this.transportStationTarget = target;
      this.transportStationQuery = {};
      this.transportStationPage.currentPage = 1;
      this.transportStationBox = true;
    },
    getTransportStationListRequest() {
      const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
      const requestMap = {
        water: getPortTerminalList,
        rail: getRailwayStationList,
        air: getAirportMasterList,
      };
-      return requestMap[mode];
+      return requestMap[this.transportMode];
    },
    loadTransportStationList() {
      const request = this.getTransportStationListRequest();
@@ -5546,28 +5436,7 @@ export default {
        water: '港口/码头',
        air: '空港机场',
      };
-      const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
+      return typeMap[this.transportMode] || '';
      return typeMap[mode] || '';
    },
    getTransportAddressForm() {
      return this.dispatchItemBox ? this.dispatchItemForm : this.form;
    },
    openDispatchPrimaryAddressPicker(target) {
      if (this.dispatchStationMode) {
        this.openTransportStationDialog(target);
      }
    },
    openDispatchSecondaryAddressPicker(target) {
      if (this.dispatchStationMode) {
        this.openTransportStationDialog(target);
        return;
      }
      this.openTransportMapDialog(target);
    },
    handleDispatchSecondaryAddressInputClick(target) {
      if (this.dispatchStationMode) {
        this.openDispatchSecondaryAddressPicker(target);
      }
    },
    loadTransportAddressList() {
      this.transportAddressLoading = true;
@@ -5618,39 +5487,35 @@ export default {
    },
    applyTransportAddress(target, address = {}) {
      const prefix = target === 'departure' ? 'departure' : 'arrival';
-      const addressForm = this.getTransportAddressForm();
+      this.form[`${prefix}Name`] = address.preferRegionName
      addressForm[`${prefix}Name`] = address.preferRegionName
        ? address.regionName || address.addressName || ''
        : address.addressName || address.regionName || '';
-      addressForm[`${prefix}Address`] = address.detailAddress || address.address || '';
+      this.form[`${prefix}Address`] = address.detailAddress || address.address || '';
-      addressForm[`${prefix}AddressCode`] = address.addressCode || '';
+      this.form[`${prefix}AddressCode`] = address.addressCode || '';
-      addressForm[`${prefix}SiteCode`] =
+      this.form[`${prefix}SiteCode`] =
        address.addressType === '常规地址'
          ? '/'
          : address.siteCodeDisplay || address.siteCode || '';
-      addressForm[`${prefix}Longitude`] = address.longitude || '';
+      this.form[`${prefix}Longitude`] = address.longitude || '';
-      addressForm[`${prefix}Latitude`] = address.latitude || '';
+      this.form[`${prefix}Latitude`] = address.latitude || '';
-      addressForm[`${prefix}Contact`] =
+      this.form[`${prefix}Contact`] = address.contactName || this.form[`${prefix}Contact`] || '';
-        address.contactName || addressForm[`${prefix}Contact`] || '';
+      this.form[`${prefix}Phone`] = address.contactPhone || this.form[`${prefix}Phone`] || '';
      addressForm[`${prefix}Phone`] = address.contactPhone || addressForm[`${prefix}Phone`] || '';
      // 地址值在本轮响应式更新后再清理校验状态，避免 Avue 以旧空值重新触发必填提示。
      this.$nextTick(() => {
        this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
      });
    },
    openTransportMapDialog(target) {
-      if (this.dialogReadonly && !this.dispatchItemBox) return;
+      if (this.dialogReadonly) return;
      if (!this.ensureTransportTypeBeforeAddress()) return;
      const prefix = target === 'departure' ? 'departure' : 'arrival';
      const addressForm = this.getTransportAddressForm();
      this.transportMapTarget = prefix;
-      this.transportMapKeyword =
+      this.transportMapKeyword = this.form[`${prefix}Address`] || this.form[`${prefix}Name`] || '';
        addressForm[`${prefix}Address`] || addressForm[`${prefix}Name`] || '';
      this.transportMapSelected = this.buildTransportMapSelection({
-        lng: addressForm[`${prefix}Longitude`],
+        lng: this.form[`${prefix}Longitude`],
-        lat: addressForm[`${prefix}Latitude`],
+        lat: this.form[`${prefix}Latitude`],
-        address: addressForm[`${prefix}Address`],
+        address: this.form[`${prefix}Address`],
-        regionName: addressForm[`${prefix}Name`],
+        regionName: this.form[`${prefix}Name`],
      });
      this.transportMapStatus = this.transportMapSelected.longitude
        ? '已加载当前选点，可重新选点'
@@ -5808,13 +5673,12 @@ export default {
        return;
      }
      const prefix = this.transportMapTarget;
-      const addressForm = this.getTransportAddressForm();
+      this.form[`${prefix}Address`] =
-      addressForm[`${prefix}Address`] =
+        this.transportMapSelected.detailAddress || this.form[`${prefix}Address`];
-        this.transportMapSelected.detailAddress || addressForm[`${prefix}Address`];
+      this.form[`${prefix}Name`] =
-      addressForm[`${prefix}Name`] =
+        this.transportMapSelected.regionName || this.form[`${prefix}Name`];
-        this.transportMapSelected.regionName || addressForm[`${prefix}Name`];
+      this.form[`${prefix}Longitude`] = this.transportMapSelected.longitude;
-      addressForm[`${prefix}Longitude`] = this.transportMapSelected.longitude;
+      this.form[`${prefix}Latitude`] = this.transportMapSelected.latitude;
      addressForm[`${prefix}Latitude`] = this.transportMapSelected.latitude;
      this.transportMapBox = false;
      this.$nextTick(() => {
        this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
@@ -7423,9 +7287,8 @@ export default {
              item.cargoTypePath.join('/') === rowTypePath.join('/')
          )
        : goodsOptions;
      const source = filtered.length ? filtered : goodsOptions;
      const options = new Map();
-      source.forEach(item => {
+      filtered.forEach(item => {
        if (!item.cargoName || options.has(item.cargoName)) return;
        options.set(item.cargoName, {
          label: item.cargoName,
@@ -7439,73 +7302,26 @@ export default {
      });
      return Array.from(options.values());
    },
    fetchDispatchConfiguredCargoTypeSuggestions(queryString, callback) {
      const keyword = String(queryString || '').trim().toLowerCase();
      const options = this.getDispatchConfiguredCargoTypeOptions().map(item => ({
        ...item,
        value: item.label,
      }));
      callback(
        keyword
          ? options.filter(item => String(item.value).toLowerCase().includes(keyword))
          : options
      );
    },
    fetchDispatchConfiguredCargoNameSuggestions(queryString, callback, row = {}) {
      const keyword = String(queryString || '').trim().toLowerCase();
      const options = this.getDispatchConfiguredCargoNameOptions(row).map(item => ({
        ...item,
        value: item.label,
      }));
      callback(
        keyword
          ? options.filter(item => String(item.value).toLowerCase().includes(keyword))
          : options
      );
    },
    handleDispatchConfiguredCargoTypeSelect(row, item = {}) {
      this.handleDispatchConfiguredCargoTypeChange(row, item.value || item.label || '');
    },
    handleDispatchConfiguredCargoNameSelect(row, item = {}) {
      this.handleDispatchConfiguredCargoNameChange(row, item.value || item.label || '');
    },
    handleDispatchConfiguredCargoTypeChange(row, value) {
      const nextValue = String(value ?? row.cargoType ?? '').trim();
      const option = this.getDispatchConfiguredCargoTypeOptions().find(
-        item => String(item.value) === nextValue || item.label === nextValue
+        item => String(item.value) === String(value || '')
      );
-      if (option) {
+      row.cargoType = option?.label || '';
-        row.cargoType = option.label || '';
+      row.cargoTypeCode = option?.cargoTypeCode || '';
-        row.cargoTypeCode = option.cargoTypeCode || '';
+      row.cargoTypePath = option?.cargoTypePath || [];
        row.cargoTypePath = option.cargoTypePath || [];
      } else {
        row.cargoType = nextValue;
        row.cargoTypeCode = '';
        row.cargoTypePath = [];
      }
      row.cargoName = '';
      row.specification = '';
      row.model = '';
    },
    handleDispatchConfiguredCargoNameChange(row, value) {
      const nextValue = String(value ?? row.cargoName ?? '').trim();
      const option = this.getDispatchConfiguredCargoNameOptions(row).find(
-        item => String(item.value) === nextValue || item.label === nextValue
+        item => String(item.value) === String(value || '')
      );
-      if (!option) {
+      row.cargoName = option?.value || '';
-        row.cargoName = nextValue;
+      if (!option) return;
-        return;
+      row.cargoType = option.cargoTypeLabel || row.cargoType || '';
      }
      const previousType = String(row.cargoType || '').trim();
      const isKnownType = this.getDispatchConfiguredCargoTypeOptions().some(
        item => item.label === previousType || String(item.value) === previousType
      );
      row.cargoName = option.value || '';
      if (!previousType || isKnownType) {
        row.cargoType = option.cargoTypeLabel || previousType;
      row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
      row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
      }
      row.specification = option.specification || row.specification || '';
      row.model = option.model || row.model || '';
    },
@@ -7529,7 +7345,10 @@ export default {
        vehicleNo: this.dispatchRow.vehicleNo || '',
        cargoName: defaultGoods.cargoName || this.dispatchRow.cargoName || '',
        cargoType: defaultGoods.cargoType || this.dispatchRow.cargoType || '',
-        quantity: '',
+        quantity:
          index >= 0
            ? defaultGoods.quantity || ''
            : this.formatDispatchQuantity(this.getDispatchRemainingQuantity(defaultUnit)),
        quantityUnit: defaultUnit,
        specification: defaultGoods.specification || '',
        model: defaultGoods.model || '',
@@ -8184,7 +8003,6 @@ export default {
        quantityGroups.set(key, group);
      });
      for (const { row: goods, quantity } of quantityGroups.values()) {
        if (this.isDispatchPlanQuantityUnlimited(goods)) continue;
        const unit = this.getDispatchQuantityUnit(goods);
        const remaining = this.dispatchItemRemainingQuantity(goods);
        if (quantity - remaining > 1e-8) {
@@ -10,200 +10,107 @@
    :class="{ 'waybill-import-page': standalone }"
    @closed="handleClosed"
  >
-    <section v-show="searchVisible" class="waybill-import-toolbar__search">
+    <div class="waybill-import-toolbar">
-      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+      <div class="waybill-import-toolbar__search">
-        <div class="waybill-import-toolbar__search-grid">
+        <el-form :inline="true" :model="query" label-width="auto">
-          <el-form-item label="运单批次号">
+          <el-form-item label="运单批次号"
-            <el-input v-model="query.batchNo" clearable placeholder="请输入" />
+            ><el-input v-model="query.batchNo" clearable
-          </el-form-item>
+          /></el-form-item>
-          <el-form-item label="承运商">
+          <el-form-item label="承运商"
-            <el-select v-model="query.carrierId" clearable filterable placeholder="请选择">
+            ><el-select v-model="query.carrierId" clearable filterable
-              <el-option
+              ><el-option
                v-for="item in queryCarriers"
                :key="item.id"
                :label="item.name"
-                :value="item.id"
+                :value="item.id" /></el-select
-              />
+          ></el-form-item>
-            </el-select>
+          <el-form-item label="创建时间"
-          </el-form-item>
+            ><el-date-picker
          <el-form-item label="创建时间">
            <el-date-picker
              v-model="query.createTimeRange"
              type="datetimerange"
              value-format="YYYY-MM-DD HH:mm:ss"
-              range-separator="~"
+          /></el-form-item>
-              start-placeholder="开始时间"
+          <el-form-item label="创建人"
-              end-placeholder="结束时间"
+            ><el-select v-model="query.createUser" clearable filterable
-              clearable
+              ><el-option
            />
          </el-form-item>
          <el-form-item label="创建人">
            <el-select v-model="query.createUser" clearable filterable placeholder="请选择">
              <el-option
                v-for="item in creators"
                :key="item.id"
                :label="item.name"
-                :value="item.id"
+                :value="item.id" /></el-select
-              />
+          ></el-form-item>
            </el-select>
          </el-form-item>
        </div>
        <div class="waybill-import-toolbar__search-actions">
          <el-button type="primary" @click="loadBatches">查询</el-button>
          <el-button @click="resetQuery">重置</el-button>
        </div>
        </el-form>
-    </section>
+        <div class="waybill-import-toolbar__search-actions">
-    <div class="avue-crud__header waybill-import-toolbar__actions">
+          <el-button type="primary" @click="loadBatches">查询</el-button
-      <div class="avue-crud__left">
+          ><el-button @click="resetQuery">重置</el-button>
-        <el-button type="primary" @click="handleCreate">新建导入</el-button>
+        </div>
-        <el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
+      </div>
      <div class="waybill-import-toolbar__actions">
        <el-button type="primary" @click="handleCreate">新建导入</el-button
        ><el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
          >批量删除</el-button
        >
      </div>
      <div class="avue-crud__right">
        <el-button icon="el-icon-refresh" circle @click="loadBatches" />
        <el-button icon="el-icon-operation" circle @click="columnSettingVisible = true" />
        <el-button icon="el-icon-search" circle @click="searchVisible = !searchVisible" />
        <el-button icon="el-icon-grid" circle @click="toggleTableSize" />
    </div>
-    </div>
+    <el-table :data="batches" border @selection-change="selected = $event">
    <section class="waybill-import-toolbar__table-panel">
      <el-table
        :data="batches"
        :size="tableSize"
        border
        @selection-change="selected = $event"
      >
      <el-table-column type="selection" width="50" /><el-table-column
        type="index"
        label="序号"
        width="70"
      />
-        <el-table-column
+      <el-table-column prop="batchNo" label="运单批次号" min-width="150" /><el-table-column
          v-if="columnVisible.batchNo"
          prop="batchNo"
          label="运单批次号"
          min-width="150"
        /><el-table-column
          v-if="columnVisible.projectName"
        prop="projectName"
        label="项目名称"
        min-width="150"
      />
-        <el-table-column
+      <el-table-column prop="carrierName" label="承运商" min-width="140" /><el-table-column
          v-if="columnVisible.carrierName"
          prop="carrierName"
          label="承运商"
          min-width="140"
        /><el-table-column
          v-if="columnVisible.carrierType"
        prop="carrierType"
        label="承运类型"
        min-width="120"
      />
-        <el-table-column
+      <el-table-column prop="waybillCount" label="运单数" width="90" /><el-table-column
          v-if="columnVisible.waybillCount"
          prop="waybillCount"
          label="运单数"
          width="90"
        />        <el-table-column
          v-if="columnVisible.importTypeName"
        prop="importTypeName"
        label="导入方式"
        width="100"
      />
      <el-table-column
          v-if="columnVisible.createUserName"
          prop="createUserName"
          label="创建人"
          min-width="120"
        >
          <template #default="{ row }">{{ row.createUserName || '-' }}</template>
        </el-table-column>
        <el-table-column
          v-if="columnVisible.statusName"
          prop="statusName"
          label="状态"
          width="100"
        />
        <el-table-column
          v-if="columnVisible.createTime"
        prop="createTime"
        label="创建时间"
        min-width="170"
        sortable
-        /><el-table-column
+      /><el-table-column prop="updateTime" label="更新时间" min-width="170" sortable />
-          v-if="columnVisible.updateTime"
+      <el-table-column prop="statusName" label="状态" width="100" /><el-table-column
          prop="updateTime"
          label="更新时间"
          min-width="170"
          sortable
        />
        <el-table-column
        label="操作"
        width="180"
        fixed="right"
      >
-          <template #default="{ row }">
+        <template #default="{ row }"
-            <el-link
+          ><el-link type="primary" @click="openDetail(row)">查看</el-link
-              v-if="row.importStatus !== 'draft'"
+          ><el-link
              type="primary"
              @click="openDetail(row)"
              >查看</el-link
            >
            <el-link
            v-if="row.importStatus === 'draft'"
            type="primary"
            @click="editBatch(row)"
            >编辑</el-link
          ><el-link type="danger" @click="removeBatch(row)">删除</el-link></template
        >
            <el-link
              v-if="row.importStatus === 'draft'"
              type="danger"
              @click="removeBatch(row)"
              >删除</el-link
            >
          </template>
      </el-table-column>
    </el-table>
      <div class="waybill-import-toolbar__pagination">
    <el-pagination
          background
      v-model:current-page="page.current"
      v-model:page-size="page.size"
-          layout="total, sizes, prev, pager, next, jumper"
+      layout="total, prev, pager, next, sizes"
-          :page-sizes="[10, 20, 50, 100]"
+      :page-sizes="[10, 20, 50]"
      :total="page.total"
      @current-change="loadBatches"
      @size-change="loadBatches"
    />
      </div>
    </section>
  </component>
  <el-dialog
    v-model="columnSettingVisible"
    title="列设置"
    width="360px"
    append-to-body
  >
    <el-checkbox-group v-model="visibleColumnKeys" class="waybill-import-toolbar__column-setting">
      <el-checkbox v-for="item in columnOptions" :key="item.prop" :label="item.prop">
        {{ item.label }}
      </el-checkbox>
    </el-checkbox-group>
    <template #footer>
      <el-button @click="columnSettingVisible = false">关闭</el-button>
    </template>
  </el-dialog>
  <el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
    <el-form :inline="true" :model="detailQuery"
      ><el-form-item label="车牌号/船号"
        ><el-input v-model="detailQuery.vehicleNo" clearable /></el-form-item
-      ><el-form-item label="司机/船长姓名"
+      ><el-form-item label="货物名称"
-        ><el-input v-model="detailQuery.driverName" clearable placeholder="请输入" /></el-form-item
+        ><el-input v-model="detailQuery.cargoName" clearable /></el-form-item
      ><el-button type="primary" @click="loadDetails">查询</el-button></el-form
    >
    <el-table :data="details" border
@@ -219,10 +126,7 @@
        prop="vehicleNo"
        label="车牌号/航班号/船号/班列号"
        min-width="190"
-      /><el-table-column prop="transportType" label="运输方式" width="110">
+      /><el-table-column prop="transportType" label="运输方式" width="110" /><el-table-column
        <template #default="{ row }">{{ transportTypeLabel(row.transportType) }}</template>
      </el-table-column>
      <el-table-column
        prop="driverName"
        label="司机/船长姓名"
        min-width="120"
@@ -296,20 +200,17 @@
        prop="waybillIdentifier"
        label="同一运单标识号"
        min-width="140"
-      /></el-table
+      /><el-table-column label="操作" width="80">-</el-table-column></el-table
    >
    <div class="waybill-import-toolbar__pagination">
    <el-pagination
        background
      v-model:current-page="detailPage.current"
      v-model:page-size="detailPage.size"
-        layout="total, sizes, prev, pager, next, jumper"
+      layout="total, prev, pager, next, sizes"
-        :page-sizes="[10, 20, 50, 100]"
+      :page-sizes="[10, 20, 50]"
      :total="detailPage.total"
      @current-change="loadDetails"
      @size-change="loadDetails"
    />
    </div>
  </el-dialog>
  <component
@@ -605,32 +506,8 @@ const handleClosed = () => emit('closed');
 const createVisible = ref(props.createPage),
  detailVisible = ref(false),
  formRef = ref();
 const searchVisible = ref(true);
 const columnSettingVisible = ref(false);
 const tableSize = ref('default');
 const tableSizeOptions = ['default', 'large', 'small'];
 const columnOptions = [
  { prop: 'batchNo', label: '运单批次号' },
  { prop: 'projectName', label: '项目名称' },
  { prop: 'carrierName', label: '承运商' },
  { prop: 'carrierType', label: '承运类型' },
  { prop: 'waybillCount', label: '运单数' },
  { prop: 'importTypeName', label: '导入方式' },
  { prop: 'createUserName', label: '创建人' },
  { prop: 'statusName', label: '状态' },
  { prop: 'createTime', label: '创建时间' },
  { prop: 'updateTime', label: '更新时间' },
 ];
 const visibleColumnKeys = ref(columnOptions.map(item => item.prop));
 const columnVisible = computed(() =>
  Object.fromEntries(columnOptions.map(item => [item.prop, visibleColumnKeys.value.includes(item.prop)]))
 );
 const toggleTableSize = () => {
  const index = tableSizeOptions.indexOf(tableSize.value);
  tableSize.value = tableSizeOptions[(index + 1) % tableSizeOptions.length];
 };
 const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
-const detailQuery = reactive({ vehicleNo: '', driverName: '' });
+const detailQuery = reactive({ vehicleNo: '', cargoName: '' });
 const createDefaultForm = () => ({
  id: '',
  batchNo: '',
@@ -985,20 +862,6 @@ const loadEditorOptions = async () => {
  cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value);
  driverOptions.value = extractRecords(driverRes);
 };
 const ensureTransportTypeOptions = async () => {
  if (transportTypeOptions.value.length) return;
  const dictRes = await getDictionary({ code: 'transport_type' });
  transportTypeOptions.value = extractRecords(dictRes).map(item => ({
    label: item.dictValue || item.label,
    value: item.dictKey || item.value,
  }));
 };
 const transportTypeLabel = value => {
  if (value === null || value === undefined || value === '') return '-';
  return (
    transportTypeOptions.value.find(item => String(item.value) === String(value))?.label || value
  );
 };
 const loadBatches = async () => {
  const res = await api.getImportBatches({ ...query, current: page.current, size: page.size });
  batches.value = res.data?.data?.records || [];
@@ -1059,13 +922,9 @@ const closeCreate = () => {
  }
  createVisible.value = false;
 };
-const openDetail = async row => {
+const openDetail = row => {
  detailQuery.batchId = row.id;
  detailQuery.vehicleNo = '';
  detailQuery.driverName = '';
  detailPage.current = 1;
  detailVisible.value = true;
  await ensureTransportTypeOptions();
  loadDetails();
 };
 // 草稿明细已落库为草稿运单，编辑时回填到明细表，避免重新上传附件。
@@ -1470,81 +1329,34 @@ const confirmImport = async () => {
 <style scoped lang="scss">
 .waybill-import-toolbar {
  margin-bottom: 12px;
  &__search {
-    padding: 18px 18px 8px;
+    display: flex;
-    margin-bottom: 8px;
+    align-items: flex-start;
-    background: #fff;
+    gap: 12px;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
  }
-  &__search-grid {
+    .el-form {
-    display: grid;
+      flex: 1;
-    grid-template-columns: repeat(4, minmax(0, 1fr));
+      margin-bottom: 0;
    gap: 8px 24px;
    }
  &__search :deep(.el-form-item) {
    margin-bottom: 8px;
  }
  &__search :deep(.el-form-item__label) {
    white-space: nowrap;
  }
  &__search :deep(.el-input),
  &__search :deep(.el-select),
  &__search :deep(.el-date-editor),
  &__search :deep(.el-date-editor.el-input),
  &__search :deep(.el-date-editor.el-input__wrapper),
  &__search :deep(.el-date-editor--datetimerange) {
    width: 100%;
  }
  &__search-actions {
    display: flex;
-    justify-content: flex-end;
+    flex: none;
    gap: 8px;
    margin-bottom: 8px;
  }
  &__actions {
-    margin-top: 12px;
+    margin-top: 8px;
    background: transparent;
  }
  &__column-setting {
    display: flex;
    flex-direction: column;
    gap: 8px;
  }
  &__table-panel {
    padding: 0 12px 12px;
    background: #fff;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
  }
  &__pagination {
    display: flex;
    justify-content: flex-end;
    width: 100%;
    box-sizing: border-box;
    padding: 16px 0;
  }
  &__table-panel :deep(.el-table) {
    --el-table-border-color: #eff1f7;
  }
  &__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
  &__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
  &__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
    background: #fafafa;
  }
 }
 .waybill-import-page {
  min-height: calc(100vh - 120px);
  padding: 12px 24px 24px;
  background: #fff;
 }
 .waybill-import-create {
@@ -5172,28 +5172,19 @@ export default {
      if (type === 'add' && copyId) {
        this.api.getDetail(copyId).then(res => {
          const sourceData = res.data.data || {};
-          // 清除不应该复制的字段（业务状态与原运单保持一致）
+          // 清除不应该复制的字段
          delete sourceData.id;
          delete sourceData.code;
          delete sourceData.waybillNo;
          delete sourceData.waybillStatus;
          delete sourceData.driverAcceptStatus;
          delete sourceData.driverAcceptTime;
          delete sourceData.driverAcceptDriverId;
          delete sourceData.driverRejectTime;
          delete sourceData.driverRejectReason;
          delete sourceData.loadingNo;
          delete sourceData.masterNo;
          delete sourceData.createTime;
          delete sourceData.updateTime;
          delete sourceData.createUser;
          delete sourceData.updateUser;
          delete sourceData.createDept;
          delete sourceData.createUserName;
          delete sourceData.updateUserName;
          this.applyFormDetail(sourceData);
-          // 标记为手工创建；业务状态沿用原运单
+          // 标记为手工创建
          this.form.dataSource = '手工创建';
          done();
        });
@@ -354,7 +354,7 @@
            <el-link
              v-for="action in rowActions(row)"
              :key="action.type"
-              :type="['delete', 'cancel'].includes(action.type) ? 'danger' : 'primary'"
+              :type="action.type === 'delete' ? 'danger' : 'primary'"
              @click="handleRowAction(action.type, row)"
              >{{ action.label }}</el-link
            >
@@ -583,8 +583,12 @@
          label-width="auto"
          class="loading-manage-dialog__form archive-form"
        >
-          <div title="配载信息" class="loading-manage-dialog__load-info-card">
+          <section-card title="筛选待配载运单">
-            <section-card>
+            <template #extra>
              <el-link v-if="!dialogReadonly" type="primary" @click="openCandidateSearch"
                >筛选</el-link
              >
            </template>
            <div class="loading-manage-dialog__candidate-search">
              <el-row :gutter="16">
                <el-col :span="6">
@@ -628,11 +632,7 @@
                <template v-if="candidateSearchVisible">
                  <el-col :span="6">
                    <el-form-item label="货物名称">
-                        <el-input
+                      <el-input v-model="candidateQuery.cargoName" clearable placeholder="请输入" />
                          v-model="candidateQuery.cargoName"
                          clearable
                          placeholder="请输入"
                        />
                    </el-form-item>
                  </el-col>
                  <el-col :span="6">
@@ -703,11 +703,7 @@
                  </el-col>
                  <el-col :span="6">
                    <el-form-item label="车/船/航班/班列">
-                        <el-input
+                      <el-input v-model="candidateQuery.vehicleNo" clearable placeholder="请输入" />
                          v-model="candidateQuery.vehicleNo"
                          clearable
                          placeholder="请输入"
                        />
                    </el-form-item>
                  </el-col>
                  <el-col :span="6">
@@ -796,6 +792,10 @@
                </el-col>
              </el-row>
            </div>
          </section-card>
          <div title="配载信息" class="loading-manage-dialog__load-info-card">
            <section-card title="待配载运单">
              <el-table
                ref="candidateTableRef"
                v-loading="candidateLoading"
@@ -843,43 +843,27 @@
                  show-overflow-tooltip
                >
                  <template #default="{ row }">
-                    {{ formatCandidateGoodsInfo(row) }}
+                    {{ formatCandidateWaybillValue(row, 'goodsInfo') }}
                  </template>
                </el-table-column>
                <el-table-column
                  prop="departureAddress"
                  label="发货地址"
                  min-width="220"
                  show-overflow-tooltip
                >
                  <template #default="{ row }">
                    <el-tooltip
                      v-if="formatCandidateAddressTooltip(row, 'departure')"
                      :content="formatCandidateAddressTooltip(row, 'departure')"
                      placement="top"
                    >
                      <div class="loading-manage-page__address-cell">
                    {{ formatCandidateAddress(row, 'departure') }}
                      </div>
                    </el-tooltip>
                    <span v-else>{{ formatCandidateAddress(row, 'departure') }}</span>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="arrivalAddress"
                  label="收货地址"
                  min-width="220"
                  show-overflow-tooltip
                >
                  <template #default="{ row }">
                    <el-tooltip
                      v-if="formatCandidateAddressTooltip(row, 'arrival')"
                      :content="formatCandidateAddressTooltip(row, 'arrival')"
                      placement="top"
                    >
                      <div class="loading-manage-page__address-cell">
                    {{ formatCandidateAddress(row, 'arrival') }}
                      </div>
                    </el-tooltip>
                    <span v-else>{{ formatCandidateAddress(row, 'arrival') }}</span>
                  </template>
                </el-table-column>
                <el-table-column
@@ -1011,36 +995,20 @@
                    prop="departureAddress"
                    label="发货地"
                    min-width="220"
                    show-overflow-tooltip
                  >
                    <template #default="{ row }">
-                      <el-tooltip
+                      {{ formatWaybillAddress(row, 'departure') }}
                        v-if="formatCandidateAddressTooltip(row, 'departure')"
                        :content="formatCandidateAddressTooltip(row, 'departure')"
                        placement="top"
                      >
                        <div class="loading-manage-page__address-cell">
                          {{ formatCandidateAddress(row, 'departure') }}
                        </div>
                      </el-tooltip>
                      <span v-else>{{ formatCandidateAddress(row, 'departure') }}</span>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="arrivalAddress"
                    label="到货地"
                    min-width="220"
                    show-overflow-tooltip
                  >
                    <template #default="{ row }">
-                      <el-tooltip
+                      {{ formatWaybillAddress(row, 'arrival') }}
                        v-if="formatCandidateAddressTooltip(row, 'arrival')"
                        :content="formatCandidateAddressTooltip(row, 'arrival')"
                        placement="top"
                      >
                        <div class="loading-manage-page__address-cell">
                          {{ formatCandidateAddress(row, 'arrival') }}
                        </div>
                      </el-tooltip>
                      <span v-else>{{ formatCandidateAddress(row, 'arrival') }}</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="操作" width="110" fixed="right">
@@ -1709,6 +1677,7 @@ export default {
        add: '新建配载',
        edit: '编辑配载单',
        view: '配载单详情',
        copy: '复制配载单',
        reassign: '重新派单',
      };
      return titleMap[this.dialogMode] || '配载管理';
@@ -1857,7 +1826,6 @@ export default {
      if (!row) return '-';
      if (prop === 'businessStatus') return this.statusText(row);
      if (prop === 'transportType') return this.transportTypeLabel(row.transportType);
      if (prop === 'goodsInfo') return this.formatCandidateGoodsInfo(row);
      const column = waybillOption.column.find(item => item.prop === prop);
      if (column?.formatter) {
        const value = column.formatter(row, {}, row[prop]);
@@ -1866,130 +1834,14 @@ export default {
      const value = row[prop];
      return value === undefined || value === null || value === '' ? '-' : value;
    },
    formatCandidateGoodsInfo(row = {}) {
      const goodsRows =
        [row.goodsJson, row.goodsList, row.goodsRows, row.cargoList, row.cargoRows, row.goods]
          .map(source => {
            if (source === undefined || source === null || source === '') return [];
            if (Array.isArray(source)) return source;
            if (typeof source === 'object') return [source];
            return parseJsonArray(source);
          })
          .filter(source => source.length)
          .sort((left, right) => right.length - left.length)[0] || [];
      if (!goodsRows.length) return String(row.goodsInfo || row.cargoInfo || '') || '-';
      const groups = goodsRows.reduce((result, item = {}) => {
        const unit = String(
          item.quantityUnit ||
            item.goodsQuantityUnit ||
            item.cargoUnit ||
            item.unit ||
            row.quantityUnit ||
            row.goodsQuantityUnit ||
            row.cargoUnit ||
            row.unit ||
            ''
        ).trim();
        const key = unit || '__empty__';
        if (!result[key]) {
          result[key] = {
            typeName:
              item.secondCargoTypeName ||
              item.secondCargoType ||
              item.cargoType ||
              item.goodsType ||
              item.typeName ||
              '货物',
            count: 0,
            quantity: 0,
            unit,
          };
        }
        result[key].count += 1;
        result[key].quantity += this.parseGoodsQuantity(
          item.quantity ?? item.cargoQuantity ?? item.goodsQuantity
        );
        return result;
      }, {});
      return (
        Object.values(groups)
          .map(group => {
            const quantity = this.formatGoodsQuantity(group.quantity);
            return `${group.typeName}等${group.count}种货物 | ${quantity}${
              group.unit ? ` ${group.unit}` : ''
            }`;
          })
          .join('； ') || '-'
      );
    },
    parseGoodsQuantity(value) {
      if (value === undefined || value === null || value === '') return 0;
      const text = String(value).replace(/,/g, '');
      const match = text.match(/-?\d+(\.\d+)?/);
      if (!match) return 0;
      const number = Number(match[0]);
      return Number.isFinite(number) ? number : 0;
    },
    formatGoodsQuantity(value) {
      const number = Number(value || 0);
      if (!Number.isFinite(number)) return '0';
      const fixed = Math.round((number + Number.EPSILON) * 1000) / 1000;
      return Number.isInteger(fixed) ? String(fixed) : String(fixed).replace(/\.?0+$/, '');
    },
    formatCandidateDate(value) {
      if (!value) return '-';
      const date = dayjs(value);
      return date.isValid() ? date.format('YYYY-MM-DD HH:mm:ss') : value;
    },
    formatCandidateAddress(row, type) {
-      const prefix = type === 'departure' ? 'departure' : 'arrival';
+      const value = row?.[`${type}Address`] || row?.[`${type}Name`] || '';
-      const name = String(row?.[`${prefix}Name`] || '').trim();
+      return this.formatProvinceCityDistrict(value) || '-';
      const address = String(row?.[`${prefix}Address`] || '').trim();
      if (!this.isRoadTransportType(row?.transportType)) {
        return name || address || '-';
      }
      const region = this.mergeRouteAddressParts(
        this.routeProvinceName(row, prefix),
        row[`${prefix}CityName`] || row[`${prefix}City`],
        row[`${prefix}DistrictName`] || row[`${prefix}District`]
      );
      const source = this.mergeRouteAddressParts(region, '', address || name);
      const parts = this.parseWaybillAddress(source);
      return (
        [parts.province, parts.city, parts.district]
          .map(value => String(value || '').trim())
          .filter(Boolean)
          .join('') ||
        this.formatProvinceCityDistrict(source) ||
        name ||
        address ||
        '-'
      );
    },
    formatCandidateAddressTooltip(row, type) {
      if (!this.isRoadTransportType(row?.transportType)) return '';
      const prefix = type === 'departure' ? 'departure' : 'arrival';
      const address = String(row?.[`${prefix}Address`] || '').trim();
      const name = String(row?.[`${prefix}Name`] || '').trim();
      const region = this.mergeRouteAddressParts(
        this.routeProvinceName(row, prefix),
        row[`${prefix}CityName`] || row[`${prefix}City`],
        row[`${prefix}DistrictName`] || row[`${prefix}District`]
      );
      const detailAddress =
        row[`${prefix}DetailAddress`] || row[`${prefix}AddressDetail`] || address;
      return this.mergeRouteAddressParts(region, '', detailAddress || name) || '';
    },
    isRoadTransportType(type) {
      const value = String(type || '')
        .trim()
        .toLowerCase();
      return (
        value === 'road' ||
        value.includes('公路') ||
        value.includes('道路') ||
        value.includes('highway')
      );
    },
    splitText(value) {
      if (!value) return [];
@@ -2162,28 +2014,31 @@ export default {
      if (status === 'draft') {
        return [
          { type: 'edit', label: '编辑' },
          { type: 'copy', label: '复制' },
          { type: 'delete', label: '删除' },
        ];
      }
      if (status === 'pending') {
-        const actions = [
+        return [
          { type: 'view', label: '详情' },
-          { type: 'start', label: '改为进行中' },
+          { type: 'reassign', label: '重新派单' },
          { type: 'edit', label: '编辑' },
          { type: 'copy', label: '复制' },
          { type: 'cancel', label: '取消' },
        ];
        if (row.driverRejected) {
          actions.push({ type: 'reassign', label: '重新派单' });
        }
        actions.push({ type: 'edit', label: '编辑' }, { type: 'cancel', label: '取消' });
        return actions;
      }
      if (status === 'running') {
        return [
          { type: 'view', label: '详情' },
          { type: 'copy', label: '复制' },
          { type: 'complete', label: '完成' },
        ];
      }
      if (status === 'completed' || status === 'cancelled') {
-        return [{ type: 'view', label: '详情' }];
+        return [
          { type: 'view', label: '详情' },
          { type: 'copy', label: '复制' },
        ];
      }
      return [{ type: 'view', label: '详情' }];
    },
@@ -2192,8 +2047,8 @@ export default {
        view: () => this.openLoadingDialog('view', row),
        edit: () => this.openLoadingDialog('edit', row),
        reassign: () => this.openLoadingDialog('reassign', row),
        copy: () => this.copyLoading(row),
        delete: () => this.deleteLoading(row),
        start: () => this.startLoading(row),
        cancel: () => this.cancelLoading(row),
        complete: () => this.completeLoading(row),
      };
@@ -2611,6 +2466,10 @@ export default {
      if (['road', '公路运输'].includes(normalized)) return 'road,公路运输';
      return value || '';
    },
    openCandidateSearch() {
      this.candidateSearchVisible = true;
      this.loadCandidateWaybills();
    },
    handleCandidateSearch() {
      this.candidatePage.currentPage = 1;
      this.loadCandidateWaybills();
@@ -2712,11 +2571,11 @@ export default {
      };
      rows.forEach((row, rowIndex) => {
        const departure = row.departureAddress || row.departureName;
-        appendNode(departure, this.formatCandidateAddress(row, 'departure'), `装${rowIndex + 1}`);
+        appendNode(departure, this.formatWaybillAddress(row, 'departure'), `装${rowIndex + 1}`);
      });
      rows.forEach((row, rowIndex) => {
        const arrival = row.arrivalAddress || row.arrivalName;
-        appendNode(arrival, this.formatCandidateAddress(row, 'arrival'), `卸${rowIndex + 1}`);
+        appendNode(arrival, this.formatWaybillAddress(row, 'arrival'), `卸${rowIndex + 1}`);
      });
      return [...nodeMap.values()].map((node, index) => ({
        ...node,
@@ -2925,6 +2784,16 @@ export default {
        this.dialogSaving = '';
      }
    },
    copyLoading(row) {
      this.$router.push({
        path: '/business/loading-manage/form',
        query: {
          mode: 'add',
          copyId: row.id,
          name: '新增配载管理',
        },
      });
    },
    deleteLoading(row) {
      ElMessageBox.confirm(`确定删除配载单 ${row.loadingNo}？`, '提示', { type: 'warning' })
        .then(async () => {
@@ -2944,15 +2813,6 @@ export default {
        })
        .catch(() => {});
    },
    startLoading(row) {
      ElMessageBox.confirm(`确定将配载单 ${row.loadingNo} 改为进行中？`, '提示', { type: 'warning' })
        .then(async () => {
          await loadingApi.start(row.id);
          ElMessage.success('已改为进行中');
          this.loadTable();
        })
        .catch(() => {});
    },
    completeLoading(row) {
      ElMessageBox.confirm(`确定完成配载单 ${row.loadingNo}？`, '提示', { type: 'warning' })
        .then(async () => {
@@ -3411,8 +3271,8 @@ export default {
  }
  .loading-manage-dialog__candidate-search {
-    padding: 0;
+    padding: 4px 0;
-    margin-bottom: 0;
+    margin-bottom: 8px;
  }
  .loading-manage-dialog__waybill-route-layout {
@@ -1,58 +1,57 @@
 <template>
  <basic-container class="master-order-page">
    <template v-if="mode === 'list'">
-      <div class="master-order-page__search">
+      <el-form :model="query" class="master-search" label-width="160px" @submit.prevent>
-        <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+        <el-row :gutter="16">
-          <div class="master-order-page__search-grid">
+          <el-col v-for="field in primaryFields" :key="field.prop" :span="6"
-            <el-form-item v-for="field in primaryFields" :key="field.prop" :label="field.label">
+            ><el-form-item :label="field.label"
-              <el-input v-model="query[field.prop]" clearable placeholder="请输入" />
+              ><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
-            </el-form-item>
+          ></el-col>
-            <el-form-item label="状态">
+          <el-col :span="6"
-              <el-select v-model="query.businessStatus" clearable placeholder="全部">
+            ><el-form-item label="状态"
-                <el-option label="全部" value="" />
+              ><el-select v-model="query.businessStatus" placeholder="全部"
-                <el-option
+                ><el-option label="全部" value="" /><el-option
                  v-for="item in statuses"
                  :key="item.value"
                  :label="item.label"
-                  :value="item.value"
+                  :value="item.value" /></el-select></el-form-item
-                />
+          ></el-col>
              </el-select>
            </el-form-item>
          <template v-if="searchExpanded">
-              <el-form-item v-for="field in secondaryFields" :key="field.prop" :label="field.label">
+            <el-col v-for="field in secondaryFields" :key="field.prop" :span="6"
-                <el-input v-model="query[field.prop]" clearable placeholder="请输入" />
+              ><el-form-item :label="field.label"
-              </el-form-item>
+                ><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
-              <el-form-item label="计划开始日期">
+            ></el-col>
-                <el-date-picker
+            <el-col :span="6"
              ><el-form-item label="计划开始日期"
                ><el-date-picker
                  v-model="query.planStartRange"
                  type="datetimerange"
                  format="YYYY-MM-DD HH:mm"
                  value-format="YYYY-MM-DD HH:mm:ss"
                  start-placeholder="请选择"
-                  end-placeholder="请选择"
+                  end-placeholder="请选择" /></el-form-item
-                />
+            ></el-col>
-              </el-form-item>
+            <el-col :span="6"
-              <el-form-item label="计划结束日期">
+              ><el-form-item label="计划结束日期"
-                <el-date-picker
+                ><el-date-picker
                  v-model="query.planEndRange"
                  type="datetimerange"
                  format="YYYY-MM-DD HH:mm"
                  value-format="YYYY-MM-DD HH:mm:ss"
                  start-placeholder="请选择"
-                  end-placeholder="请选择"
+                  end-placeholder="请选择" /></el-form-item
-                />
+            ></el-col>
              </el-form-item>
          </template>
-            <div class="master-order-page__search-actions">
+          <el-col :span="24" class="search-actions"
-              <el-button type="primary" @click="search">查询</el-button>
+            ><el-button type="primary" @click="search">查询</el-button
-              <el-button @click="reset">重置</el-button>
+            ><el-button @click="reset">重置</el-button
-              <el-link type="primary" @click="searchExpanded = !searchExpanded">{{
+            ><el-link type="primary" @click="searchExpanded = !searchExpanded"
-                searchExpanded ? '收起' : '展开'
+              ><el-icon><component :is="searchExpanded ? ArrowUp : ArrowDown" /></el-icon
-              }}</el-link>
+              >{{ searchExpanded ? '折叠' : '展开' }}</el-link
-            </div>
+            ></el-col
-          </div>
+          >
        </el-row>
      </el-form>
      </div>
      <section class="master-list-panel">
        <div class="toolbar">
          <el-button type="primary" @click="goCreate()">新建多联总单</el-button
@@ -77,13 +76,7 @@
                  <div class="route-point">
                    <span :class="['route-node', node.type]">{{ node.text }}</span>
                    <div class="route-detail">
-                      <el-tooltip
+                      <el-tooltip placement="top"><template #content>{{ node.name }}</template><strong>{{ node.name }}</strong></el-tooltip>
                        :content="node.address || node.name || '-'"
                        placement="top"
                        :show-after="120"
                      >
                        <strong>{{ node.name }}</strong>
                      </el-tooltip>
                      <span v-for="line in node.lines" :key="line">{{ line }}</span>
                    </div>
                  </div>
@@ -132,7 +125,7 @@
      />
    </template>
    <master-order-dispatch v-else-if="mode === 'dispatch'" :id="routeId" @back="goList" />
-    <master-order-detail v-else :id="routeId" />
+    <master-order-detail v-else :id="routeId" @back="goList" />
    <el-dialog v-model="confirm.visible" title="提示" width="400px"
      ><span>{{ confirm.message }}</span
      ><template #footer
@@ -145,6 +138,7 @@
 <script>
 import * as api from '@/api/business/master-order';
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import MasterOrderEditor from './components/master-order-editor.vue';
 import MasterOrderDispatch from './components/master-order-dispatch.vue';
 import MasterOrderDetail from './components/master-order-detail.vue';
@@ -153,6 +147,8 @@ export default {
  components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
  data() {
    return {
      ArrowDown,
      ArrowUp,
      searchExpanded: false,
      loading: false,
      records: [],
@@ -307,7 +303,7 @@ export default {
    },
    timeRange(row) {
      return row.planStartTime && row.planEndTime
-        ? `${String(row.planStartTime).slice(0, 10)} - ${String(row.planEndTime).slice(0, 10)}`
+        ? `${String(row.planStartTime).slice(0, 16)} - ${String(row.planEndTime).slice(0, 16)}`
        : '-';
    },
    goodsSummary(row) {
@@ -338,19 +334,6 @@ export default {
      const value = String(type || '').trim().toLowerCase();
      return value === 'road' || value.includes('公路');
    },
    isStationLikeName(value) {
      const text = String(value || '').trim();
      if (!text) return false;
      return /(?:火车站|高铁站|客运站|货运站|港口|码头|机场|空港|航站楼)$/.test(text) || /(?<!市|州|盟|区|县|旗)站$/.test(text);
    },
    isNonRoadLocation({ name, siteCode, transportType, nextTransportType } = {}) {
      const code = String(siteCode || '').trim();
      if (code && code !== '/') return true;
      if (this.isStationLikeName(name)) return true;
      if (transportType && !this.isRoadTransportType(transportType)) return true;
      if (nextTransportType && !this.isRoadTransportType(nextTransportType)) return true;
      return false;
    },
    formatRoadAddress(value) {
      const text = String(value || '').replace(/\s+/g, '');
      if (!text) return '-';
@@ -372,16 +355,10 @@ export default {
    routeNodeName(value, address, transportType, region = {}) {
      const text = String(value || '').trim();
      if (!text) return '-';
-      if (
+      const siteCode = String(region.siteCode || '').trim();
-        this.isNonRoadLocation({
+      // 运输方式切换不应改变地址本身的展示模式：有站点编码时显示站点名称，
-          name: text,
+      // 没有站点编码的区域地址统一按“市 区县”格式展示。
-          siteCode: region.siteCode,
+      if (siteCode && siteCode !== '/') return text;
          transportType,
          nextTransportType: region.nextTransportType,
        })
      ) {
        return text;
      }
      // 优先从完整的地址名称/详细地址解析，避免后端只返回“梅州”等不完整的市名称时
      // 提前返回城市，导致区县被遗漏。
      const parsedText = this.formatRoadAddress(text);
@@ -406,149 +383,86 @@ export default {
      const source = /省|自治区|特别行政区|市|州|盟/.test(text) ? text : address || text;
      const formatted = this.formatRoadAddress(source);
      if (/(?:区|县|旗)$/.test(text) && !formatted.includes(text)) {
-        const cityName = formatted.split(' ')[0];
+        const city = formatted.split(' ')[0];
-        return cityName && cityName !== formatted ? `${cityName} ${text}` : formatted;
+        return city && city !== formatted ? `${city} ${text}` : formatted;
      }
      return formatted;
    },
    resolveRouteNodeLocation({
      name,
      address,
      transportType,
      nextTransportType,
      cityName,
      districtName,
      siteCode,
    } = {}) {
      const rawName = String(name || '').trim();
      const rawAddress = String(address || '').trim();
      const regionText = [cityName, districtName].filter(Boolean).join(' ');
      const nonRoad = this.isNonRoadLocation({
        name: rawName,
        siteCode,
        transportType,
        nextTransportType,
      });
      if (nonRoad) {
        // 非公路：展示站点名称，悬停展示详细地址。
        // 兼容历史数据把站点名称写在 address、区域信息写在 name 的情况。
        if (this.isStationLikeName(rawAddress) && !this.isStationLikeName(rawName)) {
          return {
            name: rawAddress,
            address: rawName || regionText || rawAddress,
          };
        }
        const displayName = rawName || rawAddress || '-';
        const tipAddress =
          (rawAddress && rawAddress !== displayName ? rawAddress : '') ||
          regionText ||
          rawAddress ||
          displayName;
        return { name: displayName, address: tipAddress };
      }
      return {
        name: this.routeNodeName(rawName || rawAddress, rawAddress, transportType, {
          cityName,
          districtName,
          siteCode,
          nextTransportType,
        }),
        address: rawAddress || rawName || regionText || '-',
      };
    },
    routeNodes(row = {}) {
      const routes = row.routeProgress || [];
      const total = this.routeNumber(row.totalQuantity);
      const firstTransportType = routes[0]?.transportType || row.routes?.[0]?.transportType || row.transportType || '';
      if (!routes.length) {
        const start = this.resolveRouteNodeLocation({
          name: row.departureName || row.departureAddress,
          address: row.departureAddress,
          transportType: firstTransportType,
          cityName: row.departureCityName,
          districtName: row.departureDistrictName,
          siteCode: row.departureSiteCode,
        });
        const end = this.resolveRouteNodeLocation({
          name: row.arrivalName || row.arrivalAddress,
          address: row.arrivalAddress,
          transportType: row.finalTransportType || firstTransportType,
          cityName: row.arrivalCityName,
          districtName: row.arrivalDistrictName,
          siteCode: row.arrivalSiteCode,
        });
        return [
          {
            key: 'start',
            type: 'start',
            text: '起',
-            ...start,
+            name: this.routeNodeName(
              row.departureName || row.departureAddress,
              row.departureAddress,
              firstTransportType,
              {
                cityName: row.departureCityName,
                districtName: row.departureDistrictName,
                siteCode: row.departureSiteCode,
              }
            ),
            lines: [`已调度0/${total}吨`],
          },
          {
            key: 'end',
            type: 'end',
            text: '终',
-            ...end,
+            name: this.routeNodeName(
              row.arrivalName || row.arrivalAddress,
              row.arrivalAddress,
              row.finalTransportType || firstTransportType,
              {
                cityName: row.arrivalCityName,
                districtName: row.arrivalDistrictName,
                siteCode: row.arrivalSiteCode,
              }
            ),
            lines: [`到达0/${total}吨`],
          },
        ];
      }
      const start = this.resolveRouteNodeLocation({
        name: row.departureName || row.departureAddress,
        address: row.departureAddress,
        transportType: firstTransportType,
        nextTransportType: firstTransportType,
        cityName: row.departureCityName,
        districtName: row.departureDistrictName,
        siteCode: row.departureSiteCode,
      });
      return [
        {
          key: 'start',
          type: 'start',
          text: '起',
-          ...start,
+          name: this.routeNodeName(
            row.departureName || row.departureAddress,
            row.departureAddress,
            firstTransportType,
            {
              cityName: row.departureCityName,
              districtName: row.departureDistrictName,
              siteCode: row.departureSiteCode,
            }
          ),
          lines: [`已调度${this.routeNumber(routes[0]?.dispatchedQuantity)}/${total}吨`],
        },
        ...routes.map((route, index) => {
          const isEnd = index === routes.length - 1;
          const arrived = this.routeNumber(this.routeArrivedQuantity(route));
          const dispatched = this.routeNumber(routes[index + 1]?.dispatchedQuantity);
          const address =
            route.arrivalAddress ||
            route.departureAddress ||
            (isEnd ? row.arrivalAddress : '') ||
            '';
          const location = this.resolveRouteNodeLocation({
            name:
              route.arrivalName ||
              route.departureName ||
              (isEnd ? row.arrivalName : '') ||
              '',
            address,
            transportType: route.transportType,
            nextTransportType: isEnd
              ? row.finalTransportType || route.transportType
              : routes[index + 1]?.transportType || '',
            cityName:
              route.arrivalCityName ||
              route.departureCityName ||
              (isEnd ? row.arrivalCityName : ''),
            districtName:
              route.arrivalDistrictName ||
              route.departureDistrictName ||
              (isEnd ? row.arrivalDistrictName : ''),
            siteCode:
              route.arrivalSiteCode ||
              route.departureSiteCode ||
              (isEnd ? row.arrivalSiteCode : ''),
          });
          return {
            key: route.segmentNo || `route-${index}`,
            type: isEnd ? 'end' : 'middle',
            text: isEnd ? '终' : '经',
-            ...location,
+            name: this.routeNodeName(
              route.arrivalName || route.departureName || row.arrivalName,
              route.arrivalAddress || route.departureAddress,
              route.transportType,
              {
                cityName: route.arrivalCityName || route.departureCityName,
                districtName: route.arrivalDistrictName || route.departureDistrictName,
                siteCode: route.arrivalSiteCode || route.departureSiteCode,
              }
            ),
            lines: isEnd
              ? [`到达${arrived}/${total}吨`]
              : [`到达 ${arrived}/${total}吨`, `已调度 ${dispatched}/到达${arrived}/${total}吨`],
@@ -580,43 +494,31 @@ export default {
 </script>
 <style scoped lang="scss">
-.master-order-page {
+.master-search {
-  &__search {
+  margin-bottom: 12px;
  padding: 12px 12px 4px;
    margin-bottom: 8px;
  background: #fff;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-  }
+  .el-form-item {
  &__search-grid {
    display: grid;
    grid-template-columns: repeat(4, minmax(0, 1fr));
    gap: 8px 24px;
  }
  &__search-actions {
    display: flex;
    grid-column: 1 / -1;
    justify-content: flex-end;
    align-items: center;
    gap: 8px;
    min-height: 32px;
  }
  :deep(.el-form-item) {
    margin-bottom: 8px;
  }
-
+  .el-input,
  .el-select,
  .el-date-editor {
    width: 100%;
  }
  :deep(.el-form-item__label) {
    white-space: nowrap;
  }
-
+  .search-actions {
-  :deep(.el-input),
+    display: flex;
-  :deep(.el-select),
+    justify-content: flex-end;
-  :deep(.el-date-editor.el-input),
+    align-items: center;
-  :deep(.el-date-editor.el-input__wrapper),
+    gap: 12px;
-  :deep(.el-date-editor--datetimerange) {
+    min-height: 40px;
-    width: 100%;
+    .el-icon {
      margin-right: 4px;
    }
  }
 }
 .master-list-panel {
@@ -710,16 +612,10 @@ export default {
    line-height: 1.8;
    white-space: nowrap;
    strong {
      display: inline-block;
      max-width: 150px;
      overflow: hidden;
      font-size: 14px;
      font-weight: 600;
      line-height: 1.4;
-      text-overflow: ellipsis;
+      max-width: 180px;
      white-space: nowrap;
      vertical-align: bottom;
      cursor: default;
    }
  }
  .route-connector {
@@ -1,98 +1,61 @@
 <template>
  <basic-container class="transport-plan-dispatch-page">
    <div v-loading="loading" class="transport-plan-dispatch-page__shell">
-      <!-- 顶部信息区：对齐运单详情汇总样式 -->
+      <!-- 顶部信息区 -->
-      <section-card class="transport-plan-dispatch-page__summary">
+      <div class="transport-plan-dispatch-page__top">
        <div class="transport-plan-dispatch-page__heading">
          <div class="transport-plan-dispatch-page__heading-title">
            <el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
-          <strong>计划调度</strong>
+            <span class="transport-plan-dispatch-page__heading-name">计划调度</span>
-          <span>{{ planData.planNo || planData.loadingNo || '-' }}</span>
+            <span class="transport-plan-dispatch-page__heading-no">
-          <span class="detail-status-text" :class="statusTextClass">
+              {{ planData.planNo || planData.loadingNo || '-' }}
            </span>
            <el-tag :type="getStatusTagType(planData.businessStatus)" effect="light" class="status-text">
              {{ planData.businessStatusName || '-' }}
-          </span>
+            </el-tag>
-          <span class="detail-status-text detail-transport-type">
+            <el-tag type="primary" effect="light">
              {{ planData.transportTypeName || '公路整车' }}
-          </span>
+            </el-tag>
          </div>
        </div>
        <div class="transport-plan-dispatch-page__summary">
          <section-card title="基本信息" class="transport-plan-dispatch-page__summary-card">
            <div class="transport-plan-dispatch-page__summary-grid">
              <div class="transport-plan-dispatch-page__summary-item">
-            <span class="transport-plan-dispatch-page__summary-label">客户</span>
+                <div class="transport-plan-dispatch-page__summary-label">客户</div>
-            <span class="transport-plan-dispatch-page__summary-value">
+                <div class="transport-plan-dispatch-page__summary-value">
                  {{ planData.customerName || '-' }}
-            </span>
+                </div>
              </div>
              <div class="transport-plan-dispatch-page__summary-item">
-            <span class="transport-plan-dispatch-page__summary-label">合同编号</span>
+                <div class="transport-plan-dispatch-page__summary-label">项目</div>
-            <span class="transport-plan-dispatch-page__summary-value is-link">
+                <div class="transport-plan-dispatch-page__summary-value">
              {{ planData.contractNo || '-' }}
            </span>
          </div>
          <div class="transport-plan-dispatch-page__summary-item">
            <span class="transport-plan-dispatch-page__summary-label">项目</span>
            <span class="transport-plan-dispatch-page__summary-value">
                  {{ planData.projectName || '-' }}
-            </span>
+                </div>
              </div>
              <div class="transport-plan-dispatch-page__summary-item">
-            <span class="transport-plan-dispatch-page__summary-label">计划执行时间</span>
+                <div class="transport-plan-dispatch-page__summary-label">合同编号</div>
-            <span class="transport-plan-dispatch-page__summary-value">
+                <div class="transport-plan-dispatch-page__summary-value">
                  {{ planData.contractNo || '-' }}
                </div>
              </div>
              <div class="transport-plan-dispatch-page__summary-item">
                <div class="transport-plan-dispatch-page__summary-label">计划执行时间</div>
                <div class="transport-plan-dispatch-page__summary-value">
                  {{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
            </span>
                </div>
-          <div class="transport-plan-dispatch-page__summary-item is-goods">
+              </div>
-            <span class="transport-plan-dispatch-page__summary-label">货物信息</span>
+              <div class="transport-plan-dispatch-page__summary-item is-wide">
-            <span class="transport-plan-dispatch-page__summary-value is-wrap">
+                <div class="transport-plan-dispatch-page__summary-label">货物信息</div>
                <div class="transport-plan-dispatch-page__summary-value">
                  {{ planData.goodsInfo || formatGoodsInfo(planData) }}
            </span>
          </div>
          <div class="transport-plan-dispatch-page__route">
            <div class="transport-plan-dispatch-page__route-item is-start">
              <div class="transport-plan-dispatch-page__route-marker">起</div>
              <div class="transport-plan-dispatch-page__route-detail">
                <strong class="transport-plan-dispatch-page__route-name">
                  {{
                    formatRouteCityDistrict(planData.departureAddress || planData.departureName)
                  }}
                </strong>
                <el-tooltip
                  :content="planData.departureAddress || planData.departureName || '-'"
                  placement="top"
                >
                  <span class="transport-plan-dispatch-page__route-addr">
                    {{ planData.departureAddress || planData.departureName || '-' }}
                  </span>
                </el-tooltip>
                <div class="transport-plan-dispatch-page__route-contact">
                  <span>联系人：{{ planData.departureContact || '-' }}</span>
                  <span>联系方式：{{ planData.departurePhone || '-' }}</span>
                </div>
              </div>
-            </div>
+              <div class="transport-plan-dispatch-page__summary-item">
-            <span class="transport-plan-dispatch-page__route-line" aria-hidden="true" />
+                <div class="transport-plan-dispatch-page__summary-label">附件</div>
-            <div class="transport-plan-dispatch-page__route-item is-end">
+                <div class="transport-plan-dispatch-page__summary-value">
-              <div class="transport-plan-dispatch-page__route-marker">终</div>
+                  <template v-if="attachmentList.length">
              <div class="transport-plan-dispatch-page__route-detail">
                <strong class="transport-plan-dispatch-page__route-name">
                  {{ formatRouteCityDistrict(planData.arrivalAddress || planData.arrivalName) }}
                </strong>
                <el-tooltip
                  :content="planData.arrivalAddress || planData.arrivalName || '-'"
                  placement="top"
                >
                  <span class="transport-plan-dispatch-page__route-addr">
                    {{ planData.arrivalAddress || planData.arrivalName || '-' }}
                  </span>
                </el-tooltip>
                <div class="transport-plan-dispatch-page__route-contact">
                  <span>联系人：{{ planData.arrivalContact || '-' }}</span>
                  <span>联系方式：{{ planData.arrivalPhone || '-' }}</span>
                </div>
              </div>
            </div>
          </div>
          <div class="transport-plan-dispatch-page__attachments">
            <span class="transport-plan-dispatch-page__summary-label">附件</span>
            <div>
                    <el-link
                      v-for="(item, index) in attachmentList"
                      :key="index"
@@ -100,15 +63,55 @@
                      :href="item.url"
                      :underline="false"
                      target="_blank"
                      class="transport-plan-dispatch-page__attachment-link"
                    >
                      {{ item.name || item.originalName || '附件' }}
                    </el-link>
-              <span v-if="!attachmentList.length">-</span>
+                  </template>
                  <span v-else>-</span>
                </div>
              </div>
            </div>
          </section-card>
          <section-card title="收发货路线" class="transport-plan-dispatch-page__route-card">
            <div class="transport-plan-dispatch-page__route">
              <div class="transport-plan-dispatch-page__route-item">
                <span class="transport-plan-dispatch-page__route-badge is-start">起</span>
                <div class="transport-plan-dispatch-page__route-body">
                  <div class="transport-plan-dispatch-page__route-title">
                    {{ planData.departureName || '-' }}
                  </div>
                  <div class="transport-plan-dispatch-page__route-address">
                    {{ formatAddress(planData.departureAddress) }}
                  </div>
                  <div class="transport-plan-dispatch-page__route-contact">
                    {{ formatContact(planData.departureContact, planData.departurePhone) }}
                  </div>
                </div>
              </div>
              <div class="transport-plan-dispatch-page__route-vehicle">
                <el-icon><Van /></el-icon>
              </div>
              <div class="transport-plan-dispatch-page__route-item">
                <span class="transport-plan-dispatch-page__route-badge is-end">终</span>
                <div class="transport-plan-dispatch-page__route-body">
                  <div class="transport-plan-dispatch-page__route-title">
                    {{ planData.arrivalName || '-' }}
                  </div>
                  <div class="transport-plan-dispatch-page__route-address">
                    {{ formatAddress(planData.arrivalAddress) }}
                  </div>
                  <div class="transport-plan-dispatch-page__route-contact">
                    {{ formatContact(planData.arrivalContact, planData.arrivalPhone) }}
                  </div>
                </div>
              </div>
            </div>
          </section-card>
        </div>
      </div>
      <!-- 调度列表 -->
      <section-card class="transport-plan-dispatch-page__list-card">
        <template #title>
@@ -201,6 +204,7 @@
 </template>
 <script>
 import { Van } from '@element-plus/icons-vue';
 import { getDetail, dispatch } from '@/api/business/transport-plan';
 import SectionCard from '@/components/section-card/main.vue';
 import TransportPlanPage from './components/transport-plan-page.vue';
@@ -212,6 +216,7 @@ const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
 export default {
  name: 'TransportPlanDispatch',
  components: {
    Van,
    SectionCard,
    TransportPlanPage,
  },
@@ -232,21 +237,11 @@ export default {
    planId() {
      return this.$route.query.planId;
    },
    statusTextClass() {
      const status = this.planData.businessStatus;
      if (status === 2 || status === '2') return 'status-text-success';
      if (status === 1 || status === '1') return 'is-dispatching';
      if (status === 3 || status === '3') return 'is-danger';
      return 'is-info';
    },
    summaryText() {
      const goodsList = this.parseGoodsList(this.planData.goodsJson);
      if (!goodsList.length) {
        const total = Number(this.planData.totalQuantity || 0);
        const dispatched = this.calculateDispatchedQuantity();
        if (total <= 0) {
          return `已调度 ${dispatched.toFixed(2)}吨`;
        }
        const remaining = Math.max(total - dispatched, 0);
        return `共${total}吨 | 已调度 ${dispatched.toFixed(2)}吨，剩余${remaining.toFixed(2)}吨`;
      }
@@ -269,9 +264,6 @@ export default {
      });
      const parts = Object.entries(summary).map(([unit, data]) => {
        if (data.total <= 0) {
          return `已调度 ${data.dispatched.toFixed(2)}${unit}`;
        }
        const remaining = Math.max(data.total - data.dispatched, 0);
        return `${data.total}${unit} | 已调度 ${data.dispatched.toFixed(2)}${unit}，剩余${remaining.toFixed(
          2
@@ -284,20 +276,13 @@ export default {
      const goodsList = this.parseGoodsList(this.planData.goodsJson);
      if (!goodsList.length) {
        const total = Number(this.planData.totalQuantity || 0);
        if (total <= 0) return true;
        const dispatched = this.calculateDispatchedQuantity();
        return dispatched < total;
      }
      const hasPositiveTotal = goodsList.some(
        goods => Number(goods.quantity || 0) > 0
      );
      if (!hasPositiveTotal) return true;
      return goodsList.some(goods => {
        const unit = goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
        const totalQty = Number(goods.quantity || 0);
        if (totalQty <= 0) return true;
        const dispatchedQty = this.dispatchList
          .filter(item => item.quantityUnit === unit)
          .reduce((sum, item) => sum + Number(item.quantity || 0), 0);
@@ -379,6 +364,15 @@ export default {
    calculateDispatchedQuantity() {
      return this.dispatchList.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
    },
    getStatusTagType(status) {
      const statusMap = {
        0: 'info',
        1: 'warning',
        2: 'success',
        3: 'danger',
      };
      return statusMap[status] || 'info';
    },
    formatDateRange(startDate, endDate) {
      const dates = [startDate, endDate].filter(Boolean);
      return dates.length ? dates.join(' ~ ') : '-';
@@ -388,30 +382,9 @@ export default {
      const match = address.match(/^(.*?省)?(.*?市)?(.*?区|.*?县)?/);
      return match ? match[0] || address : address;
    },
-    formatProvinceCityDistrict(value) {
+    formatContact(contact, phone) {
-      const text = String(value || '').trim();
+      const parts = [contact, phone].filter(Boolean);
-      if (!text) return '-';
+      return parts.length ? parts.join(' / ') : '-';
      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;
    },
    formatRouteCityDistrict(value) {
      const text = String(value || '').trim();
      if (!text) return '-';
      const provinceMatch = text.match(/^.+?(?:省|自治区|特别行政区)/);
      const cityRegion = provinceMatch ? text.slice(provinceMatch[0].length) : text;
      const cityMatch = cityRegion.match(/^(.+?市)/);
      if (!cityMatch) return this.formatProvinceCityDistrict(text);
      const city = cityMatch[1];
      const remainder = cityRegion.slice(city.length);
      const districtMatch = remainder.match(
        /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗){1,2})/
      );
      const district = districtMatch ? districtMatch[1] : '';
      return [city, district].filter(Boolean).join(' ');
    },
    formatDriver(row) {
      const parts = [row.driverName, row.driverPhone].filter(Boolean);
@@ -446,32 +419,31 @@ export default {
        this.$message.warning('待调度列表货物总量已达到计划总量，不能新增调度明细');
        return;
      }
-      this.openPageDispatchItemDialog(-1);
+
-    },
+      // 调用 transport-plan-page 组件的方法打开弹窗
    handleEdit(row, index) {
      this.openPageDispatchItemDialog(index, row);
    },
    openPageDispatchItemDialog(index = -1, row) {
      this.$nextTick(() => {
        const component = this.$refs.transportPlanPageRef;
-        if (!component) return;
+        if (component) {
          // 设置调度数据
          component.dispatchRow = this.planData;
          component.dispatchRows = [...this.dispatchList];
-        this.bindDispatchItemSaveSync(component);
+          // 打开新增弹窗
-        if (index >= 0) component.openDispatchItemDialog(index, row);
+          component.openDispatchItemDialog(-1);
-        else component.openDispatchItemDialog(-1);
+        }
      });
    },
-    bindDispatchItemSaveSync(component) {
+    handleEdit(row, index) {
-      if (component.__dispatchListSaveSynced) return;
+      // 调用 transport-plan-page 组件的方法打开弹窗
-      const originalSave = component.saveDispatchItem;
+      this.$nextTick(() => {
-      component.saveDispatchItem = (...args) => {
+        const component = this.$refs.transportPlanPageRef;
-        originalSave.apply(component, args);
+        if (component) {
-        if (!component.dispatchItemBox) {
+          // 设置调度数据
-          this.dispatchList = [...(component.dispatchRows || [])];
+          component.dispatchRow = this.planData;
          component.dispatchRows = [...this.dispatchList];
          // 打开编辑弹窗
          component.openDispatchItemDialog(index, row);
        }
-      };
+      });
      component.__dispatchListSaveSynced = true;
    },
    handleDelete(index) {
      this.$confirm('确定删除该调度明细?', '提示', {
@@ -579,189 +551,126 @@ export default {
    height: 100%;
  }
-  &__summary {
+  &__top {
-    :deep(.el-card__body) {
+    display: flex;
-      padding: 18px 22px;
+    flex-direction: column;
-    }
+    gap: 16px;
  }
  &__heading {
    padding: 16px;
    background: #fff;
    border-radius: 4px;
    &-title {
      display: flex;
      align-items: center;
    flex-wrap: wrap;
      gap: 12px;
-    margin-bottom: 18px;
+      font-size: 18px;
-
+      font-weight: 600;
    strong {
      font-size: 20px;
    }
-    .detail-status-text {
+    &-name {
-      display: inline-flex;
+      font-size: 18px;
      align-items: center;
      height: 28px;
      padding: 0 12px;
      border-radius: 8px;
      font-size: 13px;
      line-height: 28px;
    }
-    .status-text-success,
+    &-no {
-    .is-dispatching {
+      font-size: 14px;
-      color: #67c23a;
+      color: #606266;
      background: #e1f3d8;
    }
    .detail-transport-type {
      color: #409eff;
      background: #ecf5ff;
    }
    .is-danger {
      color: #f56c6c;
      background: #fef0f0;
    }
    .is-info {
      color: #909399;
      background: #f4f4f5;
    }
  }
-  &__summary-grid {
+  &__summary {
    display: flex;
    gap: 16px;
    &-card {
      flex: 1;
    }
    &-grid {
      display: grid;
-    grid-template-columns: repeat(4, minmax(120px, 1fr)) minmax(360px, 1.5fr);
+      grid-template-columns: repeat(2, 1fr);
-    gap: 16px 24px;
+      gap: 16px;
    }
-  &__summary-item {
+    &-item {
      display: flex;
      flex-direction: column;
      gap: 8px;
    min-width: 0;
-    &.is-goods {
+      &.is-wide {
-      grid-column: 1 / 5;
+        grid-column: 1 / -1;
      }
    }
-  &__summary-label {
+    &-label {
      font-size: 14px;
      color: #909399;
    }
-  &__summary-value {
+    &-value {
-    overflow: hidden;
+      font-size: 14px;
      color: #303133;
-    font-weight: 500;
+    }
    text-overflow: ellipsis;
    white-space: nowrap;
    &.is-link {
      color: #409eff;
  }
-    &.is-wrap {
+  &__route-card {
-      white-space: normal;
+    flex: 1;
      word-break: break-word;
    }
  }
  &__route {
    display: grid;
    grid-template-columns: minmax(100px, 1fr) minmax(36px, 0.7fr) minmax(100px, 1fr);
    grid-row: 1 / span 3;
    grid-column: 5;
    align-items: start;
    min-width: 0;
    padding: 4px 0;
  }
  &__route-item {
    display: flex;
    min-width: 0;
    flex-direction: column;
    align-items: center;
-    text-align: center;
+    gap: 24px;
    &-item {
      flex: 1;
      display: flex;
      gap: 12px;
    }
-  &__route-marker {
+    &-badge {
-    display: inline-flex;
+      width: 32px;
-    width: 36px;
+      height: 32px;
-    height: 36px;
+      border-radius: 50%;
      display: flex;
      align-items: center;
      justify-content: center;
      color: #fff;
-    border-radius: 8px;
+      font-size: 14px;
-    background: #409eff;
+      flex-shrink: 0;
    font-size: 18px;
    font-weight: 600;
-    .is-end & {
+      &.is-start {
        background: #67c23a;
      }
      &.is-end {
        background: #409eff;
      }
    }
-  &__route-line {
+    &-body {
-    width: 100%;
+      flex: 1;
    height: 6px;
    margin-top: 15px;
    border-radius: 1px;
    background: #e4e7ed;
  }
  &__route-detail {
      display: flex;
    min-width: 0;
      flex-direction: column;
-    align-items: center;
+      gap: 4px;
    gap: 5px;
    margin-top: 8px;
    width: 100%;
    }
-  &__route-name {
+    &-title {
-    max-width: 100%;
+      font-size: 16px;
    overflow: hidden;
    color: #303133;
    font-size: 18px;
      font-weight: 600;
    line-height: 1.35;
    text-overflow: ellipsis;
    white-space: nowrap;
    }
-  &__route-addr {
+    &-address,
-    display: block;
+    &-contact {
-    max-width: 100%;
+      font-size: 14px;
    overflow: hidden;
      color: #606266;
    font-size: 12px;
    line-height: 1.5;
    text-overflow: ellipsis;
    white-space: nowrap;
    }
-  &__route-contact {
+    &-vehicle {
-    display: flex;
+      font-size: 24px;
    flex-wrap: wrap;
    justify-content: center;
    gap: 2px 8px;
    max-width: 100%;
      color: #909399;
    font-size: 12px;
    line-height: 1.5;
  }
  &__attachments {
    grid-column: 1 / 5;
    display: flex;
    flex-direction: column;
    gap: 8px;
    div {
      display: flex;
      flex-wrap: wrap;
      gap: 16px;
    }
  }
@@ -797,42 +706,12 @@ export default {
    border-radius: 4px;
  }
-  @media (max-width: 1200px) {
+  &__attachment-link {
-    &__summary-grid {
+    margin-right: 12px;
      grid-template-columns: repeat(4, minmax(130px, 1fr));
    }
    &__summary-item.is-goods,
    &__attachments {
      grid-column: 1 / -1;
    }
    &__route {
      grid-column: 1 / -1;
      grid-row: auto;
    }
  }
  @media (max-width: 800px) {
    &__summary-grid {
      grid-template-columns: 1fr;
    }
    &__route {
      grid-template-columns: minmax(0, 1fr);
      gap: 16px;
    }
    &__route-line {
      width: 10px;
      height: 32px;
      margin: 0 auto;
    }
    &__summary-item.is-goods,
    &__attachments {
      grid-column: auto;
    }
  }
 }
 .status-text {
  font-size: 12px;
 }
 </style>
@@ -16,9 +16,7 @@
            ><el-select v-model="query.processStatus" clearable placeholder="全部"
              ><el-option label="上传中" value="上传中" /><el-option
                label="处理中"
-                value="处理中" /><el-option label="处理完成" value="处理完成" /><el-option
+                value="处理中" /><el-option label="处理完成" value="处理完成" /></el-select
                label="处理失败"
                value="处理失败" /></el-select
          ></el-form-item>
          <el-form-item label="运单批次号"
            ><el-input v-model="query.waybillBatchNo" clearable placeholder="请输入"
@@ -86,14 +84,7 @@
          min-width="160"
          ><template #default="{ row }">{{ row.carrierName || '-' }}</template></el-table-column
        >
-        <el-table-column prop="processStatus" label="处理状态" width="120"
+        <el-table-column prop="processStatus" label="处理状态" width="120" /><el-table-column
          ><template #default="{ row }"
            ><span
              :class="{ 'voucher-manage-page__process-failed': row.processStatus === '处理失败' }"
              >{{ row.processStatus }}</span
            ></template
          ></el-table-column
        ><el-table-column
          prop="voucherCount"
          label="凭证数量"
          width="100"
@@ -118,7 +109,7 @@
                placement="top"
              ><el-icon class="voucher-manage-page__audit-reject-icon"><WarnTriangleFilled /></el-icon
              ></el-tooltip></span></template
-        ></el-table-column><el-table-column label="操作" width="220" fixed="right" align="center"
+        ></el-table-column><el-table-column label="操作" width="320" fixed="right" align="center"
          ><template #default="{ row }"
            ><div class="voucher-manage-page__actions">
              <el-link
@@ -139,7 +130,7 @@
                @click="download(row)"
                >下载</el-link
              ><el-link
-                v-if="row.auditStatus === '审核驳回' || row.processStatus === '处理失败'"
+                v-if="row.auditStatus === '审核驳回'"
                type="primary"
                @click="openUpload(row, 'reupload')"
                >重新上传</el-link
@@ -154,7 +145,7 @@
                @click="openBatchDialog(row)"
                >更换运单批次</el-link
              ><el-link
-                v-if="row.processStatus === '上传中' || row.processStatus === '处理失败' || row.auditStatus === '审核驳回'"
+                v-if="row.processStatus === '上传中' || row.auditStatus === '审核驳回'"
                type="danger"
                @click="removeRow(row)"
                >删除</el-link
@@ -1247,15 +1238,7 @@ const view = async row => {
    query: { id: row.id, batchNo: row.voucherBatchNo },
  });
 };
-const download = row => {
+const download = row => window.open(row.fileUrl, '_blank');
  const url = row?.fileUrl;
  if (!url) {
    ElMessage.warning('附件地址为空，无法下载');
    return;
  }
  // 去掉 URL 中 ? 后的临时鉴权参数，避免签名过期导致无法下载
  window.open(String(url).split('?')[0], '_blank');
 };
 const handleAuditPass = row =>
  ElMessageBox.confirm(`确认审核通过凭证批次"${row.voucherBatchNo}"吗？`, '提示', {
    type: 'warning',
@@ -1346,9 +1329,6 @@ load();
    color: #f56c6c;
    cursor: help;
  }
  &__process-failed {
    color: #f56c6c;
  }
  &__actions {
    display: flex;
    flex-wrap: wrap;
@@ -1,5 +1,6 @@
 <template>
  <basic-container class="waybill-import-page-container">
    <div class="waybill-import-page-title">导入运单</div>
    <waybill-import-dialog standalone />
  </basic-container>
 </template>
@@ -10,14 +11,28 @@ import WaybillImportDialog from './components/waybill-import-dialog.vue';
 <style scoped lang="scss">
 .waybill-import-page-container {
  :deep(.basic-container__card) {
    background: transparent;
    border: none;
    box-shadow: none;
  }
  :deep(.basic-container__card > .el-card__body) {
    padding: 0;
  }
 }
 .waybill-import-page-title {
  position: relative;
  padding: 16px 24px 12px 36px;
  border-bottom: 1px solid #eff1f7;
  color: #303133;
  font-size: 18px;
  font-weight: 600;
  &::before {
    position: absolute;
    top: 16px;
    left: 24px;
    width: 4px;
    height: 22px;
    border-radius: 2px;
    background: #409eff;
    content: '';
  }
 }
 </style>
@@ -84,6 +84,13 @@
            @click="handleSync"
            >批量同步</el-button
          >
          <el-button
            v-if="hasPermission('payment_application_sync')"
            type="primary"
            plain
            @click="handleSyncResult"
            >同步付款结果</el-button
          >
          <el-button
            v-if="hasPermission('payment_application_add')"
            type="primary"
@@ -396,8 +403,22 @@ export default {
        this.$message.warning('请选择至少一条审批通过的付款申请');
        return;
      }
-      await api.syncKingdeeBatch(rows.map(row => row.id));
+      const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
-      this.$message.success(`已同步${rows.length}条付款申请`);
+      const failedList = data.filter(item => String(item).includes('同步失败'));
      if (failedList.length) {
        this.$message({
          type: 'warning',
          message: `同步完成：成功${data.length - failedList.length}条，失败${failedList.length}条。${failedList.join('；')}`,
          duration: 8000,
        });
      } else {
        this.$message.success(`已同步${data.length}条付款申请`);
      }
      this.loadTable();
    },
    async handleSyncResult() {
      const data = this.unwrapData(await api.syncKingdeeResult());
      this.$message.success(data || '金蝶付款结果回写完成');
      this.loadTable();
    },
    handleExport() {
@@ -22,6 +22,7 @@
                  type="date"
                  value-format="YYYY-MM-DD"
                  placeholder="请选择"
                  @change="fetchBfiExchangeRate"
                />
                <el-select
                  v-else-if="field.type === 'project' && editable"
@@ -947,6 +948,7 @@ import {
  getDetailFees as getPreSettlementDetailFees,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
 import { getBfiExchangeRate } from '@/api/base/currency';
 import {
  createFormalSettlementForm,
  formalSettlementFormFields,
@@ -1250,6 +1252,7 @@ export default {
        if (this.initialData) await this.applyInitialData();
        Object.assign(this.form, newRecordAudit);
        await this.refreshFormalSettlementNo();
        await this.fetchBfiExchangeRate();
        return;
      }
      this.loading = true;
@@ -1482,6 +1485,7 @@ export default {
          (settlementType === 'receivable' ? contract.partyA : contract.partyB),
        settlementType,
        settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
        currency: contract.settlementCurrency || 'RMB',
      });
      this.sources = [];
      this.details = [];
@@ -1489,6 +1493,23 @@ export default {
      this.form.sourcePreSettlementIds = [];
      this.form.sourceDetailIds = [];
      if (refreshSettlementNo) this.refreshFormalSettlementNo();
      if (this.form.currency !== 'RMB') this.fetchBfiExchangeRate();
    },
    async fetchBfiExchangeRate() {
      const currency = this.form.currency;
      if (!currency || currency === 'RMB') return;
      if (!this.form.exchangeRateDate) return;
      try {
        const { data } = await getBfiExchangeRate(currency, this.form.exchangeRateDate);
        const rateData = data?.data;
        if (rateData?.excval != null) {
          this.form.exchangeRate = Number(rateData.excval);
        } else {
          this.$message.warning(`未查询到 ${currency} 的BFI汇率数据`);
        }
      } catch (e) {
        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
      }
    },
    openCandidateDialog() {
      this.candidate.visible = true;
@@ -42,7 +42,7 @@
                  format="YYYY-MM-DD"
                  :disabled="!editable || form.currency === 'RMB'"
                  placeholder="请选择"
-                  @change="recalculateLocalAmount"
+                  @change="handleExchangeRateDateChange"
                />
                <el-input-number
                  v-else-if="field.type === 'number'"
@@ -934,6 +934,7 @@ import {
  submit,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
 import { getBfiExchangeRate } from '@/api/base/currency';
 import { getDictionary } from '@/api/system/dictbiz';
 import {
  emptyPreSettlementForm,
@@ -1242,7 +1243,11 @@ export default {
      await this.loadFeeCategoryOptions();
      await this.loadTransportTypeOptions();
      if (this.recordId) await this.loadDetail();
-      else if (this.initialData) await this.applyInitialData();
+      else if (this.initialData) {
        await this.applyInitialData();
        this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
        await this.fetchBfiExchangeRate();
      }
    },
    async applyInitialData() {
      const rows = Array.isArray(this.initialData?.rows) ? this.initialData.rows : [];
@@ -1527,7 +1532,12 @@ export default {
      this.form.settlementType = contract.settlementType || 'payable';
      this.form.payerName = contract.partyA;
      this.form.payeeName = contract.partyB;
      this.form.currency = contract.settlementCurrency || 'RMB';
      this.summaryFees = [];
      if (this.form.currency !== 'RMB') {
        this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
        this.fetchBfiExchangeRate();
      }
    },
    async saveDraft(shouldSubmit) {
      await this.$refs.formRef?.validate();
@@ -1794,6 +1804,26 @@ export default {
          .toFixed(2)
      );
    },
    handleExchangeRateDateChange() {
      this.fetchBfiExchangeRate();
      this.recalculateLocalAmount();
    },
    async fetchBfiExchangeRate() {
      if (!this.form.currency || this.form.currency === 'RMB') return;
      if (!this.form.exchangeRateDate) return;
      try {
        const { data } = await getBfiExchangeRate(this.form.currency, this.form.exchangeRateDate);
        const rateData = data?.data;
        if (rateData?.excval != null) {
          this.form.exchangeRate = Number(rateData.excval);
          this.recalculateLocalAmount();
        } else {
          this.$message.warning(`未查询到 ${this.form.currency} 的BFI汇率数据`);
        }
      } catch (e) {
        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
      }
    },
    recalculateLocalAmount() {
      const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
      this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);
@@ -169,6 +169,12 @@
                  </template>
                </el-table-column>
              </el-table>
              <div
                v-if="!latestChangeLoading && !latestChangeRows.length"
                class="settlement-detail-page__empty"
              >
                暂无变更记录
              </div>
            </el-tab-pane>
          </el-tabs>
        </div>
@@ -2728,6 +2734,12 @@ export default {
  padding: 16px 0;
 }
 .settlement-detail-page__empty {
  padding: 24px 0;
  color: #909399;
  text-align: center;
 }
 .settlement-detail-page__dialog-form {
  padding: 16px 20px;
  background: #fff;
@@ -22,14 +22,6 @@
      @tree-load="treeLoad"
    >
      <template #menu-left>
        <el-button
          type="primary"
          plain
          :loading="iamSyncLoading"
          v-if="userInfo.authority.includes('admin')"
          @click="handleIamOrganizationSync"
          >同步组织
        </el-button>
        <el-button
          type="danger"
          icon="el-icon-delete"
@@ -128,15 +120,7 @@
 </template>
 <script>
-import {
+import { getLazyList, remove, update, add, getDept, getDeptTree } from '@/api/system/dept';
  getLazyList,
  remove,
  update,
  add,
  getDept,
  getDeptTree,
  syncIamOrganizations,
 } from '@/api/system/dept';
 import { getLeaderList } from '@/api/system/user';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { mapGetters } from 'vuex';
@@ -168,7 +152,6 @@ export default {
      selectionList: [],
      query: {},
      loading: true,
      iamSyncLoading: false,
      parentId: 0,
      page: {
        pageSize: 10,
@@ -708,26 +691,6 @@ export default {
          done(row);
        });
    },
    handleIamOrganizationSync() {
      this.$confirm('确定从IAM同步组织信息?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          this.iamSyncLoading = true;
          return syncIamOrganizations();
        })
        .then(res => {
          const count = res?.data?.data ?? 0;
          this.$message.success(`IAM组织同步完成，共处理${count}条`);
          this.parentId = 0;
          this.onLoad(this.page, this.query);
        })
        .finally(() => {
          this.iamSyncLoading = false;
        });
    },
    handleDelete() {
      if (this.selectionList.length === 0) {
        this.$message.warning('请选择至少一条数据');
@@ -56,14 +56,6 @@
              @click="handleAudit"
              >审 核
            </el-button>
            <el-button
              type="primary"
              plain
              :loading="iamSyncLoading"
              v-if="userInfo.authority.includes('admin') && !auditMode"
              @click="handleIamSync"
              >同步人员
            </el-button>
            <el-button
              type="success"
              plain
@@ -356,7 +348,6 @@ import {
  remove,
  update,
  add,
  syncIamAccounts,
  grant,
  resetPassword,
  setPassword,
@@ -402,7 +393,6 @@ export default {
      selectionList: [],
      query: {},
      loading: true,
      iamSyncLoading: false,
      page: {
        pageSize: 10,
        currentPage: 1,
@@ -563,25 +553,6 @@ export default {
        this.handleExport();
      }
    },
    handleIamSync() {
      this.$confirm('确定从IAM同步人员信息?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          this.iamSyncLoading = true;
          return syncIamAccounts();
        })
        .then(res => {
          const count = res?.data?.data ?? 0;
          this.$message.success(`IAM人员同步完成，共处理${count}条`);
          this.onLoad(this.page, this.query);
        })
        .finally(() => {
          this.iamSyncLoading = false;
        });
    },
    handleSetLeader(row) {
      const tip = row.isLeader === 1 ? '确定取消用户的主管职务?' : '确定设置用户为主管职务?';
      const message = row.isLeader === 1 ? '取消主管成功!' : '设置主管成功!';
@@ -4758,7 +4758,7 @@ export default {
    },
    selectionClear() {
      this.selectionList = [];
-      this.$refs.crud?.toggleSelection();
+      this.$refs.crud.toggleSelection();
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;