From fbfd5cde893f09c3cf8cf6de0abeb3c025c140be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 11 Sep 2026 10:41:09 +0800
Subject: [PATCH 01/28] =?UTF-8?q?fix(api):=20=E7=A7=BB=E9=99=A4=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=B5=84=E9=87=91=E9=A3=8E=E9=99=A9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 由于后端/fund-risk-stats端点尚未实现，删除列表页中refreshFundRiskStats调用
- 从data中移除fundRiskStats相关数据，避免接口请求报错
- 列表头部风险筛选标签调整，仅显示“高风险/中风险”，去掉数量显示
- api/business/project-apply.js中保留getFundRiskStats定义，并添加注释说明后端就绪后恢复调用
---
 .workbuddy/memory/2026-09-10.md   | 6 ++++++
 src/api/business/project-apply.js | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 .workbuddy/memory/2026-09-10.md

diff --git a/.workbuddy/memory/2026-09-10.md b/.workbuddy/memory/2026-09-10.md
new file mode 100644
index 0000000..db2cbed
--- /dev/null
+++ b/.workbuddy/memory/2026-09-10.md
@@ -0,0 +1,6 @@
+# 2026-09-10
+
+- 移除 project-apply 的 fund-risk-stats 请求（后端未实现端点，每次列表加载都弹 No endpoint 报错）：删除 onLoad 内 refreshFundRiskStats 调用与该方法、data 中 fundRiskStats；头部风险标签去掉「（数量）」只留「高风险/中风险」；api/business/project-apply.js 保留 getFundRiskStats 定义并注释「后端就绪后恢复」。
+EOF2
+}
+cat >> /Users/gxwebsoft/VUE/tms-erp-web-ws/.workbuddy/memory/2026-09-10.md <<'EOF'
diff --git a/src/api/business/project-apply.js b/src/api/business/project-apply.js
index cf95c97..826caa6 100644
--- a/src/api/business/project-apply.js
+++ b/src/api/business/project-apply.js
@@ -10,6 +10,7 @@ export const submit = api.submit;
 export const remove = api.remove;
 
 // 项目资金使用风险统计（高风险 / 中风险数量），供列表头部快速筛选标签使用
+// 暂未启用：后端 /fund-risk-stats 端点尚未实现，列表页已移除调用，等后端就绪后恢复
 export const getFundRiskStats = params =>
   request({
     url: `${baseUrl}/fund-risk-stats`,

From 2131e99ec4440c4b4741798b41406ee5b410ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 11 Sep 2026 12:30:05 +0800
Subject: [PATCH 02/28] =?UTF-8?q?feat(contract-manage):=20=E5=B0=86?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=A6=E6=83=85=E7=94=B1=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=8B=AC=E7=AB=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增路由 /business/contract-manage/detail，详情页共享合同管理组件
- 列表、表单、详情三分支用 isFormPage 和 isDetailPage 控制
- openDetail 方法改为跳转详情路由，initDetailPage 获取详情数据
- 新增 resetDetailState 和 closeDetailPage 方法，复用关闭逻辑
- 详情页去除弹窗高度限制，样式改为页面自滚动
- 详情页底栏使用固定位置关闭按钮，保持页面布局一致
- watch 和 created 中添加对 isDetailPage 的初始化调用和监听
---
 .workbuddy/memory/2026-09-11.md               |  28 +++
 .workbuddy/memory/MEMORY.md                   |   9 +-
 src/router/views/index.js                     |  12 ++
 src/views/business/contract-manage.vue        | 174 +++++++++++-------
 src/views/business/project-apply.vue          |   2 +-
 src/views/business/temporary-credit-limit.vue |   8 +
 src/views/transportCapacity/driver.vue        |   7 +-
 src/views/transportCapacity/ship.vue          |   6 +-
 src/views/transportCapacity/vehicle.vue       |   7 +-
 vite.config.mjs                               |  26 +--
 10 files changed, 189 insertions(+), 90 deletions(-)
 create mode 100644 .workbuddy/memory/2026-09-11.md

diff --git a/.workbuddy/memory/2026-09-11.md b/.workbuddy/memory/2026-09-11.md
new file mode 100644
index 0000000..e1c56db
--- /dev/null
+++ b/.workbuddy/memory/2026-09-11.md
@@ -0,0 +1,28 @@
+# 2026-09-11
+
+## 上传证件区域固定宽度导致跨机器错位（transportCapacity）
+- 现象：driver.vue 新增弹窗的身份证/大头照上传框在本机对齐，他人电脑不对齐。
+- 根因：`--large` 上传框写死 `width:240px`（ship 写 248px），而弹窗 `width:90%` + `el-col :span=6` 列宽是弹性的、上方输入框 `width:100%`；列宽随分辨率 / Windows 系统缩放 / 浏览器缩放变化，240px 只在特定宽度下恰好等于列宽。叠加 `labelWidth:auto` 靠 JS 实测字体（苹方 vs 微软雅黑）宽度，label 列宽也不同 → 起始位置漂移。
+- 修复：三个文件改为 `width:100%; max-width:240px; flex:none`（ship 保留 248px 上限），窄屏跟随列宽、宽屏保持比例上限，左边缘恒与输入框对齐。
+  - `src/views/transportCapacity/driver.vue`（.driver-uploader--large）
+  - `src/views/transportCapacity/vehicle.vue`（.vehicle-uploader--large）
+  - `src/views/transportCapacity/ship.vue`（.ship-uploader--large）
+- 用 @vue/compiler-sfc（脚本放项目根目录）验证三个 SFC 编译通过。
+- 教训：本项目所有「固定 px 宽度的上传/控件」都要配 `max-width` + `width:100%`，否则高分屏/低分屏下必然错位。
+
+## 合同详情由弹窗改为独立页面（contract-manage）
+- 路由：新增 `/business/contract-manage/detail`（`src/router/views/index.js`，name『合同详情』，meta `keepAlive:false` + `activeMenu:'/business/contract-manage'`），组件仍复用 `contract-manage.vue`（与 form 页同一套路）。
+- 页面内三分支：`v-if="!isFormPage && !isDetailPage"`（列表）/ `v-else-if="isFormPage"`（表单）/ `v-else`（详情）。**v-else 必须紧邻 form 分支的 `</template>`**，中间不能插其它组件，否则 Vue 编译报「v-else 无相邻 v-if」——弹窗类组件（billing-plan-editor / 附件预览 / 变更记录详情 / 流程）放在三个分支之后。
+- 关键改动：`openDetail` 改 `router.push({ path:'/business/contract-manage/detail', query:{ id, name } })`；新增 `initDetailPage()`（按 query.id 拉详情，`resetDetailState()` 先清空）、`closeDetailPage()`（closeTag + 回列表）、`isDetailPage` / `detailPageTitle` computed；`created` 与 `$route.fullPath` watch 都要加 `else if (this.isDetailPage)`。
+- 样式：`.contract-manage-detail--page { max-height:none; overflow:visible }`，去掉弹窗的 74vh 限制；底栏复用 `.contract-manage-page__footer`（fixed 浮动），只读详情页按钮保留「关闭」。
+- 校验方式：dev server 已运行时 `curl "http://localhost:2889/src/views/business/contract-manage.vue"` 返回 200 即 Vite 编译通过（比整包 build 快）。
+
+## 只给「查看弹窗」加宽 label（temporary-credit-limit）
+- 场景：详情页长 label（「剩余项目资金使用额度（万元）」）换行超 2 行撑坏详情表格，但又不能影响新增/编辑页。
+- **关键发现：Avue 的 `avue-form` 在 detail 模式下根节点会挂 `.avue--detail` 类**（源码 `node_modules/@smallwei/avue/lib/packages/element-plus/form/index3.js` 中 `class: normalizeClass([b(), { 'avue--detail': isDetail }])`）。所以「只针对详情态」的选择器就是：
+  ```scss
+  .temporary-credit-limit-dialog .avue--detail .el-form-item__label { width:210px !important; flex:0 0 210px !important; }
+  ```
+  新增/编辑弹窗无 `.avue--detail`，天然不受影响，不需要在 option 里做 mode 判断。
+- 校验样式块编译：dev server 请求 `?vue&type=style&index=1&lang.scss`（**lang 必须写 scss，写 css 会 500**），grep 规则确认产物。
+- 结论备忘：长 label 优先「加宽 + 换行 ≤2 行」，不要用单行省略 + tooltip —— 详情是纯阅读场景，hover 才能看全字段名的可发现性差。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index be1c62d..f6252f5 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -30,8 +30,13 @@
 - Avue 内置弹窗 footer 真实 class 是 `.avue-dialog__footer`，须 `position:sticky; bottom:0; flex:none; background:#fff` 贴底。
 
 ### 上传证件区域尺寸（transportCapacity）
-- 身份证/行驶证/道路运输证等固定 **240×151px**（1.586:1）。
-- scoped 覆盖 `.xxx-uploader--large { width:240px }` 与 `--large .el-upload { width:100%; height:151px }`。
+- 身份证/行驶证/道路运输证等目标比例 **240×151px**（1.586:1），ship 为 248px 上限。
+- ⚠️ **不能写死 `width:240px`**：弹窗 `width:90%` + 列 `el-col :span=6` 是弹性的，固定 px 只在特定分辨率/系统缩放下恰好等于列宽（本机对齐、他人错位）。统一写法：
+  ```scss
+  .xxx-uploader--large { display:block; width:100%; max-width:240px; flex:none; margin:0; }
+  .xxx-uploader--large .el-upload { width:100%; height:151px; }
+  ```
+  2026-09-11 已修正 driver / vehicle / ship 三处。
 
 ### 上传图片点击放大预览
 - `src/components/image-upload-field/main.vue` 用 `<el-image preview-src-list fit="contain" preview-teleported :z-index="3000" @click.stop>`，阻止冒泡到 el-upload。
diff --git a/src/router/views/index.js b/src/router/views/index.js
index a22af30..458a44e 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -287,6 +287,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/contract-manage/detail',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '合同详情',
+        meta: { keepAlive: false, activeMenu: '/business/contract-manage' },
+        component: () => import('@/views/business/contract-manage.vue'),
+      },
+    ],
+  },
   {
     path: '/business/contract-manage/change',
     component: Layout,
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index c8fc9fd..8977a22 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -1,6 +1,8 @@
 <template>
-  <basic-container :class="['contract-manage-page', { 'contract-manage-page--form': isFormPage }]">
-    <template v-if="!isFormPage">
+  <basic-container
+    :class="['contract-manage-page', { 'contract-manage-page--form': isFormPage || isDetailPage }]"
+  >
+    <template v-if="!isFormPage && !isDetailPage">
       <avue-crud
         ref="crud"
         v-model:page="page"
@@ -96,7 +98,7 @@
       />
     </template>
 
-    <template v-else>
+    <template v-else-if="isFormPage">
       <div class="archive-page-form__title">{{ formPageTitle }}</div>
 
       <el-form
@@ -558,65 +560,13 @@
       </div>
     </template>
 
-    <billing-plan-editor
-      ref="billingPlanEditor"
-      v-model="billingPlanBox"
-      :value="billingPlanForm"
-      :index="billingPlanIndex"
-      @save="saveBillingPlan"
-    />
+    <template v-else>
+      <div class="archive-page-form__title">{{ detailPageTitle }}</div>
 
-    <el-dialog
-      v-model="attachmentDocumentPreviewVisible"
-      :title="attachmentPreviewFile.name || '附件预览'"
-      append-to-body
-      destroy-on-close
-      width="90%"
-      top="4vh"
-    >
-      <pdf-preview
-        v-if="
-          attachmentDocumentPreviewVisible &&
-          attachmentPreviewFile.url &&
-          attachmentPreviewFile.isPdf
-        "
-        :source="attachmentPreviewFile.url"
-        @error="handleAttachmentPreviewError"
-      />
-      <open-file-viewer
-        v-else-if="attachmentDocumentPreviewVisible && attachmentPreviewFile.url"
-        :file="attachmentPreviewFile.url"
-        :file-name="attachmentPreviewFile.name"
-        :mime-type="attachmentPreviewFile.mimeType"
-        width="100%"
-        height="72vh"
-        fit="contain"
-        theme="auto"
-        locale="zh-CN"
-        :toolbar="attachmentViewerToolbar"
-        :plugins="attachmentViewerPlugins"
-        @unsupported="handleAttachmentPreviewUnsupported"
-        @error="handleAttachmentPreviewError"
-      />
-    </el-dialog>
-
-    <el-image-viewer
-      v-if="attachmentImagePreviewVisible"
-      :url-list="attachmentImagePreviewUrls"
-      :initial-index="attachmentImagePreviewIndex"
-      @close="attachmentImagePreviewVisible = false"
-    />
-
-    <el-dialog
-      v-model="detailBox"
-      title="合同详情"
-      append-to-body
-      destroy-on-close
-      class="contract-manage-detail-dialog"
-      width="92%"
-      top="4vh"
-    >
-      <div v-loading="detailLoading" class="contract-manage-form contract-manage-detail">
+      <div
+        v-loading="detailLoading"
+        class="contract-manage-form contract-manage-detail contract-manage-detail--page"
+      >
         <section class="contract-manage-form__section contract-manage-form__section--panel">
           <div class="dialog-section-title">基本信息</div>
           <el-descriptions :column="3" class="contract-manage-detail__descriptions">
@@ -819,11 +769,61 @@
           </el-table>
         </section>
       </div>
-      <template #footer
-        ><el-button type="primary" @click="detailBox = false">关闭</el-button></template
-      >
+
+      <div class="contract-manage-page__footer">
+        <el-button type="primary" @click="closeDetailPage">关闭</el-button>
+      </div>
+    </template>
+
+    <billing-plan-editor
+      ref="billingPlanEditor"
+      v-model="billingPlanBox"
+      :value="billingPlanForm"
+      :index="billingPlanIndex"
+      @save="saveBillingPlan"
+    />
+
+    <el-dialog
+      v-model="attachmentDocumentPreviewVisible"
+      :title="attachmentPreviewFile.name || '附件预览'"
+      append-to-body
+      destroy-on-close
+      width="90%"
+      top="4vh"
+    >
+      <pdf-preview
+        v-if="
+          attachmentDocumentPreviewVisible &&
+          attachmentPreviewFile.url &&
+          attachmentPreviewFile.isPdf
+        "
+        :source="attachmentPreviewFile.url"
+        @error="handleAttachmentPreviewError"
+      />
+      <open-file-viewer
+        v-else-if="attachmentDocumentPreviewVisible && attachmentPreviewFile.url"
+        :file="attachmentPreviewFile.url"
+        :file-name="attachmentPreviewFile.name"
+        :mime-type="attachmentPreviewFile.mimeType"
+        width="100%"
+        height="72vh"
+        fit="contain"
+        theme="auto"
+        locale="zh-CN"
+        :toolbar="attachmentViewerToolbar"
+        :plugins="attachmentViewerPlugins"
+        @unsupported="handleAttachmentPreviewUnsupported"
+        @error="handleAttachmentPreviewError"
+      />
     </el-dialog>
 
+    <el-image-viewer
+      v-if="attachmentImagePreviewVisible"
+      :url-list="attachmentImagePreviewUrls"
+      :initial-index="attachmentImagePreviewIndex"
+      @close="attachmentImagePreviewVisible = false"
+    />
+
     <el-dialog
       v-model="detailChangeRecordVisible"
       title="变更记录详情"
@@ -1313,7 +1313,6 @@ export default {
       changeRecordRows: [],
       settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
       billCycleTypeOptions: ['固定截单日', '自然月'],
-      detailBox: false,
       detailLoading: false,
       detailRow: {},
       detailContractFileRows: [],
@@ -1352,6 +1351,9 @@ export default {
     isFormPage() {
       return this.$route.path === '/business/contract-manage/form';
     },
+    isDetailPage() {
+      return this.$route.path === '/business/contract-manage/detail';
+    },
     formMode() {
       return this.$route.query.mode === 'edit' ? 'edit' : 'add';
     },
@@ -1362,6 +1364,9 @@ export default {
     formPageTitle() {
       return this.$route.query.name || `${this.formMode === 'edit' ? '编辑' : '新增'}合同管理`;
     },
+    detailPageTitle() {
+      return this.$route.query.name || '合同详情';
+    },
     ids() {
       return this.selectionList.map(item => item.id).join(',');
     },
@@ -1461,6 +1466,7 @@ export default {
   watch: {
     '$route.fullPath'() {
       if (this.isFormPage) this.initFormPage();
+      else if (this.isDetailPage) this.initDetailPage();
     },
     settlementConfigTab(tab, oldTab) {
       if (tab === oldTab) return;
@@ -1476,6 +1482,7 @@ export default {
     this.loadSettlementDictionaries();
     this.loadOrganizationOptions();
     if (this.isFormPage) this.initFormPage();
+    else if (this.isDetailPage) this.initDetailPage();
   },
   methods: {
     buildTableOption() {
@@ -2204,19 +2211,42 @@ export default {
       if (Number(nextValue) > 100) nextValue = '100';
       row.ratioLimit = nextValue;
     },
+    // 合同详情：与新增/编辑一致，跳转独立页面（/business/contract-manage/detail）
     openDetail(row) {
-      this.detailBox = true;
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: row.id, name: row.contractName ? `合同详情-${row.contractName}` : '合同详情' },
+      });
+    },
+    initDetailPage() {
+      this.resetDetailState();
+      const id = this.$route.query.id;
+      if (!id) return;
       this.detailLoading = true;
-      this.applyDetailState(row);
       this.api
-        .getDetail(row.id)
+        .getDetail(id)
         .then(res => {
-          this.applyDetailState(res.data?.data || row);
+          this.applyDetailState(res.data?.data || {});
         })
         .finally(() => {
           this.detailLoading = false;
         });
     },
+    resetDetailState() {
+      this.detailRow = {};
+      this.detailContractFileRows = [];
+      this.detailAttachmentRows = [];
+      this.detailBillingPlanRows = [];
+      this.detailPaymentRatioRows = [];
+      this.detailChangeRecordRows = [];
+      this.detailPreSettlementRuleForm = defaultSettlementRule();
+      this.detailFormalSettlementRuleForm = defaultSettlementRule();
+      this.detailSettlementConfigTab = 'pre';
+    },
+    closeDetailPage() {
+      this.$router.$avueRouter?.closeTag?.();
+      this.$router.push('/business/contract-manage');
+    },
     applyDetailState(detail = {}) {
       this.detailRow = {
         ...detail,
@@ -2895,6 +2925,12 @@ export default {
   max-height: 74vh;
   overflow-y: auto;
 
+  // 独立详情页面：不再受弹窗高度限制，交给页面自身滚动
+  &--page {
+    max-height: none;
+    overflow: visible;
+  }
+
   &__descriptions {
     :deep(.el-descriptions__label) {
       display: inline-block;
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index d417b91..be9e4fa 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -288,7 +288,7 @@
           <el-form-item prop="fundLimit" class="project-apply-form__tip-label">
             <template #label>
               <span>项目资金使用额度</span>
-              <el-tooltip content="实际业务回款周期内付款" placement="top">
+              <el-tooltip content="实际业务回款周期内付款额度" placement="top">
                 <el-icon class="project-apply-form__label-tip"><QuestionFilled /></el-icon>
               </el-tooltip>
             </template>
diff --git a/src/views/business/temporary-credit-limit.vue b/src/views/business/temporary-credit-limit.vue
index a4e923f..878708c 100644
--- a/src/views/business/temporary-credit-limit.vue
+++ b/src/views/business/temporary-credit-limit.vue
@@ -763,6 +763,7 @@ export default {
     align-items: center;
     justify-content: flex-end;
     margin-bottom: 12px;
+    margin-top: 12px;
   }
 
   &__attachment-upload {
@@ -840,6 +841,13 @@ export default {
 .temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label {
   width: 180px !important;
 }
+
+// 仅查看（detail）态加宽 label 列：长字段名（如「剩余项目资金使用额度（万元）」）收敛为最多两行，
+// 避免撑坏详情表格。新增 / 编辑弹窗的 avue-form 无 .avue--detail 类，不受影响
+.temporary-credit-limit-dialog .avue--detail .el-form-item__label {
+  width: 148px !important;
+  flex: 0 0 148px !important;
+}
 .el-form-item--default .el-form-item__label {
   height: auto !important;
 }
diff --git a/src/views/transportCapacity/driver.vue b/src/views/transportCapacity/driver.vue
index 7568f3a..de65b96 100644
--- a/src/views/transportCapacity/driver.vue
+++ b/src/views/transportCapacity/driver.vue
@@ -1829,10 +1829,13 @@ export default {
   overflow: hidden;
 }
 
-// 大尺寸模式：缩成 1.586:1 比例，左对齐（不再 100% 占栏）
+// 大尺寸模式：跟随列宽自适应（最大 240px，约 1.586:1 证件比例），
+// 保证不同分辨率 / 系统缩放下都与上方输入框左右对齐
 :deep(.driver-uploader--large) {
   display: block;
-  width: 240px;
+  width: 100%;
+  max-width: 240px;
+  flex: none;
   margin: 0;
 }
 
diff --git a/src/views/transportCapacity/ship.vue b/src/views/transportCapacity/ship.vue
index 04799b9..05721fb 100644
--- a/src/views/transportCapacity/ship.vue
+++ b/src/views/transportCapacity/ship.vue
@@ -1349,9 +1349,13 @@ export default {
   height: 151px;
 }
 
+// 大尺寸模式：跟随列宽自适应（最大 248px），
+// 保证不同分辨率 / 系统缩放下都与上方输入框左右对齐
 :deep(.ship-uploader--large) {
   display: block;
-  width: 248px;
+  width: 100%;
+  max-width: 248px;
+  flex: none;
   margin: 0;
 }
 
diff --git a/src/views/transportCapacity/vehicle.vue b/src/views/transportCapacity/vehicle.vue
index 6e1f59a..d9d4b8f 100644
--- a/src/views/transportCapacity/vehicle.vue
+++ b/src/views/transportCapacity/vehicle.vue
@@ -1741,10 +1741,13 @@ export default {
   overflow: hidden;
 }
 
-// 大尺寸模式：缩成 1.586:1 比例，左对齐（不再 100% 占栏）
+// 大尺寸模式：跟随列宽自适应（最大 240px，约 1.586:1 证件比例），
+// 保证不同分辨率 / 系统缩放下都与上方输入框左右对齐
 :deep(.vehicle-uploader--large) {
   display: block;
-  width: 240px;
+  width: 100%;
+  max-width: 240px;
+  flex: none;
   margin: 0;
 }
 
diff --git a/vite.config.mjs b/vite.config.mjs
index cc153b2..8f859d0 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -47,26 +47,26 @@ export default ({ mode, command }) => {
       __VUE_I18N_LEGACY_API__: true,
       __INTLIFY_PROD_DEVTOOLS__: false,
     },
-    server: {
-      port: 2888,
-      proxy: {
-        '/api': {
-          target: 'http://localhost',
-          //target: 'https://saber3.bladex.cn/api',
-          changeOrigin: true,
-          rewrite: path => path.replace(/^\/api/, ''),
-        },
-      },
-    },
     // server: {
-    //   port: 2889,
+    //   port: 2888,
     //   proxy: {
     //     '/api': {
-    //       target: 'http://172.16.203.228:8000',
+    //       target: 'http://localhost',
+    //       //target: 'https://saber3.bladex.cn/api',
     //       changeOrigin: true,
+    //       rewrite: path => path.replace(/^\/api/, ''),
     //     },
     //   },
     // },
+    server: {
+      port: 2889,
+      proxy: {
+        '/api': {
+          target: 'http://172.16.203.228:8000',
+          changeOrigin: true,
+        },
+      },
+    },
     resolve: {
       alias: {
         '~': resolve(__dirname, './'),

From c1c4fa18c915b1e4191c760e9d088780b14a4bc3 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 16 Sep 2026 06:30:30 +0800
Subject: [PATCH 03/28] =?UTF-8?q?=E8=B0=83=E6=95=B4=20iam?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |   2 +
 src/api/business/loading-manage.js            |   9 +
 src/api/system/user.js                        |   7 +
 src/docker/Dockerfile                         |   1 +
 src/error.js                                  |   4 +
 src/main.js                                   |   2 +
 src/option/business/shipping-template.js      |  34 +-
 src/option/business/transport-plan.js         |  10 +-
 src/page/index/layout.vue                     |  13 +-
 src/permission.js                             |  23 +-
 src/router/avue-router.js                     |  23 +-
 src/router/tab.js                             |   2 +-
 src/store/getters.js                          |   7 +-
 src/utils/chunk-reload.js                     | 144 ++++-
 .../components/master-order-detail.vue        | 131 +++-
 .../components/master-order-dispatch.vue      | 195 +++---
 .../components/shipping-template-page.vue     | 108 +++-
 .../components/transport-plan-page.vue        | 400 ++++++++----
 .../components/waybill-manage-page.vue        |  15 +-
 src/views/business/loading-manage.vue         |  43 +-
 src/views/business/master-order.vue           | 326 ++++++----
 .../business/transport-plan-dispatch.vue      | 609 +++++++++++-------
 src/views/business/voucher-manage.vue         |  32 +-
 .../settlement/receivable-payable-detail.vue  |  12 -
 src/views/system/user.vue                     |  29 +
 src/views/vehicle/customer-archive.vue        |   2 +-
 26 files changed, 1517 insertions(+), 666 deletions(-)

diff --git a/index.html b/index.html
index 5a4c44b..eae241d 100644
--- a/index.html
+++ b/index.html
@@ -13,6 +13,8 @@
     <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" />
diff --git a/src/api/business/loading-manage.js b/src/api/business/loading-manage.js
index bb6be5c..5d116bc 100644
--- a/src/api/business/loading-manage.js
+++ b/src/api/business/loading-manage.js
@@ -79,6 +79,15 @@ export const cancel = id =>
     },
   });
 
+export const start = id =>
+  request({
+    url: `${baseUrl}/start`,
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+
 export const complete = id =>
   request({
     url: `${baseUrl}/complete`,
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 1334f0c..70d5b20 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -31,6 +31,13 @@ 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',
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 88425be..88c648f 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -1,6 +1,7 @@
 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
\ No newline at end of file
diff --git a/src/error.js b/src/error.js
index d2b5611..1c507e5 100644
--- a/src/error.js
+++ b/src/error.js
@@ -1,8 +1,12 @@
 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,
diff --git a/src/main.js b/src/main.js
index 9e780e5..c53d2e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,5 @@
 import { createApp } from 'vue';
+import { installChunkReload } from './utils/chunk-reload';
 import website from './config/website';
 import axios from './axios';
 import router from './router/';
@@ -46,6 +47,7 @@ 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);
diff --git a/src/option/business/shipping-template.js b/src/option/business/shipping-template.js
index eb90940..ad2f735 100644
--- a/src/option/business/shipping-template.js
+++ b/src/option/business/shipping-template.js
@@ -55,8 +55,8 @@ export const config = {
     'templateType',
     'transportType',
     'createUserName',
-    'remark',
     'updateTime',
+    'remark',
     'createTime',
   ],
   exportColumns: [
@@ -65,8 +65,8 @@ export const config = {
     { prop: 'templateType', label: '模板类型' },
     { prop: 'transportType', label: '运输方式' },
     { prop: 'createUserName', label: '创建人' },
-    { prop: 'remark', label: '备注' },
     { prop: 'updateTime', label: '更新时间' },
+    { prop: 'remark', label: '备注' },
     { prop: 'createTime', label: '创建时间' },
   ],
   enableAllDept: false,
@@ -82,12 +82,14 @@ export const config = {
   detailAttachmentDescriptionPlain: true,
   enableTransportPlanForm: true,
   enableShippingTemplateFreight: true,
-  editableRoadAddress: true,
+  editableRoadAddress: false,
   fixedTransportAddressType: true,
   enableTemplateCodePreview: true,
   attachmentTitle: '附件',
   defaultForm: {
     templateType: '运输计划',
+    transportType: '公路运输',
+    transportTypeName: '公路运输',
   },
   transportFormRequiredFields: [
     ['projectName', '项目'],
@@ -119,15 +121,16 @@ export const option = {
         labelWidth: 0,
       },
       {
-        label: '模板编号',
-        prop: 'templateCode',
+        label: '模板类型',
+        prop: 'templateType',
+        type: 'select',
         search: true,
-        searchOrder: 4,
+        searchOrder: 2,
         span: 8,
         order: 390,
-        minWidth: 170,
-        disabled: true,
-        placeholder: '系统自动生成',
+        dicData: templateTypeOptions,
+        minWidth: 120,
+        rules: selectRule('模板类型'),
         display: true,
       },
       {
@@ -142,16 +145,15 @@ export const option = {
         display: true,
       },
       {
-        label: '模板类型',
-        prop: 'templateType',
-        type: 'select',
+        label: '模板编号',
+        prop: 'templateCode',
         search: true,
-        searchOrder: 2,
+        searchOrder: 4,
         span: 8,
         order: 370,
-        dicData: templateTypeOptions,
-        minWidth: 120,
-        rules: selectRule('模板类型'),
+        minWidth: 170,
+        disabled: true,
+        placeholder: '系统自动生成',
         display: true,
       },
       {
diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js
index 45b9154..5fb8150 100644
--- a/src/option/business/transport-plan.js
+++ b/src/option/business/transport-plan.js
@@ -209,12 +209,12 @@ export const config = {
   attachmentTitle: '附件',
   searchRangeMap: {
     planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
-    planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
+    createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
   },
   actions: ['copy', 'complete'],
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
-  deleteStatus: ['draft', 'waiting_dispatch'],
+  deleteStatus: ['draft'],
   editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
   detailButton: true,
   detailSections: [
@@ -341,6 +341,7 @@ export const option = {
       {
         label: '发货地址',
         prop: 'departureAddress',
+        slot: true,
         formslot: true,
         search: true,
         searchOrder: 7,
@@ -352,6 +353,7 @@ export const option = {
       {
         label: '到货地址',
         prop: 'arrivalAddress',
+        slot: true,
         formslot: true,
         search: true,
         searchOrder: 6,
@@ -577,8 +579,8 @@ export const option = {
         viewDisplay: false,
       },
       {
-        label: '计划结束日期',
-        prop: 'planEndDateRange',
+        label: '创建时间',
+        prop: 'createTimeRange',
         type: 'date',
         format: 'YYYY-MM-DD',
         valueFormat: 'YYYY-MM-DD',
diff --git a/src/page/index/layout.vue b/src/page/index/layout.vue
index 0439730..f0531f9 100644
--- a/src/page/index/layout.vue
+++ b/src/page/index/layout.vue
@@ -1,7 +1,18 @@
 <template>
   <router-view #="{ Component }">
     <keep-alive :include="$store.getters.tagsKeep">
-      <component :is="Component" />
+      <component :is="tabView($route, Component)" />
     </keep-alive>
   </router-view>
 </template>
+
+<script>
+import { tabView } from '@/router/tab';
+
+export default {
+  name: 'layout',
+  methods: {
+    tabView,
+  },
+};
+</script>
diff --git a/src/permission.js b/src/permission.js
index 27b2028..9051363 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,6 +3,8 @@ import store from './store';
 import { tabKeyOf } from '@/router/tab';
 import { getToken } from '@/utils/auth';
 import {
+  consumeReloadQuery,
+  hasReloadQuery,
   isChunkLoadError,
   reloadForChunkError,
   setPendingRoutePath,
@@ -17,19 +19,20 @@ const lockPage = '/lock'; //锁屏页
 router.onError(error => {
   if (!isChunkLoadError(error)) return;
   if (reloadForChunkError()) {
-    ElMessage.warning('页面资源加载失败，正在重新加载…');
-  }
-});
-
-window.addEventListener('unhandledrejection', event => {
-  if (!isChunkLoadError(event.reason)) return;
-  if (reloadForChunkError()) {
-    event.preventDefault();
-    ElMessage.warning('页面资源加载失败，正在重新加载…');
+    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;
@@ -59,7 +62,7 @@ router.beforeEach((to, from, next) => {
             fullPath: tabKeyOf(to),
             params: to.params,
             query: to.query,
-            meta: meta,
+            meta: { ...meta, keepAlive: true },
           });
         }
         next();
diff --git a/src/router/avue-router.js b/src/router/avue-router.js
index 7c0a38c..3785072 100644
--- a/src/router/avue-router.js
+++ b/src/router/avue-router.js
@@ -2,6 +2,7 @@ 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 跨层级缓存
@@ -96,21 +97,23 @@ RouterPlugin.install = function (option = {}) {
           component: (() => {
             // 判断是否为首路由
             if (first) {
-              return modules[
-                option.store.getters.isMacOs || !website.setting.menu
-                  ? '../page/index/layout.vue'
-                  : '../page/index/index.vue'
-              ];
+              return wrapViewLoader(
+                modules[
+                  option.store.getters.isMacOs || !website.setting.menu
+                    ? '../page/index/layout.vue'
+                    : '../page/index/index.vue'
+                ]
+              );
               // 判断是否为多层路由
             } else if (isChild && !first) {
-              return modules['../page/index/layout.vue'];
+              return wrapViewLoader(modules['../page/index/layout.vue']);
               // 判断是否为最终的页面视图
             } else {
               let result = modules[`../${component}.vue`];
               if (!result) {
                 isComponent = false;
               }
-              return result;
+              return wrapViewLoader(result);
             }
           })(),
           name,
@@ -127,7 +130,7 @@ RouterPlugin.install = function (option = {}) {
                 if (first) {
                   oMenu[propsDefault.path] = `${path}`;
                   let componentPath = oMenu.component || component;
-                  let result = modules[`../${componentPath}.vue`];
+                  let result = wrapViewLoader(modules[`../${componentPath}.vue`]);
                   if (!result) {
                     isComponent = false;
                   }
@@ -173,7 +176,7 @@ export const formatPath = (ele, first) => {
   const icon = ele[propsDefault.icon];
   ele[propsDefault.icon] = icon || '';
   ele.meta = {
-    keepAlive: ele.isOpen === 2,
+    keepAlive: true,
   };
   const iframeComponent = 'components/iframe/main';
   const iframeSrc = href => {
@@ -215,7 +218,7 @@ export const formatPath = (ele, first) => {
       ele[propsDefault.children].forEach(child => {
         child.component = 'views' + child[propsDefault.path];
         child.meta = {
-          keepAlive: child.isOpen === 2,
+          keepAlive: true,
         };
         if (isURL(child[propsDefault.href])) {
           let href = child[propsDefault.href];
diff --git a/src/router/tab.js b/src/router/tab.js
index f715c00..d904ad1 100644
--- a/src/router/tab.js
+++ b/src/router/tab.js
@@ -128,5 +128,5 @@ export function tabView(route, Component) {
     };
     wrapperMap.set(tabKey, wrapper);
   }
-  return h(wrapper);
+  return wrapper;
 }
diff --git a/src/store/getters.js b/src/store/getters.js
index 3edda43..fb53825 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -16,11 +16,8 @@ const getters = {
   lockPasswd: state => state.common.lockPasswd,
   tagList: state => state.tags.tagList,
   tagsKeep: (state, getters) => {
-    return getters.tagList
-      .filter(ele => {
-        return (ele.meta || {}).keepAlive;
-      })
-      .map(ele => ele.fullPath);
+    // 所有已打开标签均纳入 keep-alive，关闭标签后自动从白名单移除并释放实例
+    return getters.tagList.map(ele => ele.fullPath).filter(Boolean);
   },
   tagWel: state => state.tags.tagWel,
   token: state => state.user.token,
diff --git a/src/utils/chunk-reload.js b/src/utils/chunk-reload.js
index 2d42f54..3c30bb4 100644
--- a/src/utils/chunk-reload.js
+++ b/src/utils/chunk-reload.js
@@ -1,38 +1,168 @@
 /**
  * 懒加载 chunk / CSS preload 失败后的整页恢复。
  * 常见于：部署后旧 hash 失效、静态服务空闲断连、代理 CONNECTION_RESET。
+ *
+ * 失败后必须整页刷新：旧入口里的 hashed 资源地址不会自行更新，
+ * 仅捕获路由错误而不刷新时，未打开过的页面会一直无法进入。
  */
 
 const RELOAD_FLAG = 'app:chunk-reload-ts';
-const RELOAD_COOLDOWN_MS = 10000;
+const RELOAD_QUERY = '_chunkreload';
+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/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|Unable to preload|error loading module|Load failed/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) {
-  if (!error) return false;
-  const message = error.message || String(error);
-  return CHUNK_ERROR_RE.test(message);
+  const text = collectErrorText(error);
+  if (!text) return false;
+  if (CHUNK_ERROR_RE.test(text)) return true;
+  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 = targetPath || pendingFullPath || window.location.pathname + window.location.search + window.location.hash;
-  window.location.assign(path);
+  const path =
+    targetPath ||
+    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(() => {});
+}
diff --git a/src/views/business/components/master-order-detail.vue b/src/views/business/components/master-order-detail.vue
index 5a668c4..730fe09 100644
--- a/src/views/business/components/master-order-detail.vue
+++ b/src/views/business/components/master-order-detail.vue
@@ -1,8 +1,51 @@
 <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><el-button @click="$emit('back')">取消</el-button></div>
-      <dl class="detail-meta"><div><dt>客户</dt><dd>{{ master.customerName || '-' }}</dd></div><div><dt>合同编号</dt><dd>{{ master.contractNo || '-' }}</dd></div><div><dt>项目</dt><dd>{{ master.projectName || '-' }}</dd></div><div class="detail-meta__attachments"><dt>附件</dt><dd><template v-if="attachments.length"><el-link v-for="file in attachments" :key="file.url || file.link || file.name || file.originalName" type="primary" @click="previewAttachment(file)">{{ attachmentName(file) }}</el-link></template><span v-else>-</span></dd></div></dl>
+      <div class="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>
+      <dl class="detail-meta">
+        <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>
 
@@ -42,6 +85,8 @@
 
 <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';
@@ -51,10 +96,26 @@ 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() {
@@ -148,6 +209,68 @@ 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 || '-'; },
@@ -161,7 +284,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: #409eff; font-size: 14px; word-break: break-all; } }
+.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; } }
 .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; }
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 1b8c299..5584569 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -95,10 +95,51 @@
         <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"><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>
-          <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="remainingQuantity" column-key="remainingQuantity" label="剩余数量" width="150" class-name="goods-table__remaining"><template #default="{ row }">{{ formatQuantity(goodsRemainingQuantity(route, row)) }}</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 min-width="180"
+            ><template #header
+              ><span>货物类型<span class="goods-required-mark">*</span></span></template
+            ><template #default="{ row }"
+              ><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" />
@@ -208,7 +249,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, cargoTypeOptions: [], cargoTypeCascaderProps: { label: 'cargoName', value: 'id', children: 'children', emitPath: true }, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
+    return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
   },
   computed: {
     totalQuantity() { return (this.master?.goods || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0); },
@@ -216,6 +257,9 @@ 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) => {
@@ -256,7 +300,6 @@ 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; }
     },
@@ -318,46 +361,42 @@ 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 = {}) {
-      return this.masterGoods.filter(item => !row.cargoType || item.cargoType === row.cargoType);
+      const cargoType = String(row.cargoType || '').trim();
+      if (!cargoType) return this.masterGoods;
+      const matched = this.masterGoods.filter(item => item.cargoType === cargoType);
+      return matched.length ? matched : this.masterGoods;
     },
-    findCargoTypeByPath(path = []) {
-      let options = this.cargoTypeOptions;
-      let selected;
-      (path || []).forEach(id => {
-        selected = (options || []).find(item => String(item.id) === String(id));
-        options = selected?.children || [];
-      });
-      return selected;
+    fetchCargoTypeSuggestions(queryString, callback) {
+      const keyword = String(queryString || '').trim().toLowerCase();
+      const options = this.cargoTypeSelectOptions.map(item => ({ value: item }));
+      callback(
+        keyword ? options.filter(item => String(item.value).toLowerCase().includes(keyword)) : options
+      );
     },
-    findCargoTypePath(cargoType, options = this.cargoTypeOptions, parentPath = []) {
-      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 [];
+    handleCargoTypeSelect(route, row, item = {}) {
+      this.handleCargoTypeChange(route, row, item.value || '');
     },
     handleCargoTypeChange(route, row, value) {
-      const path = Array.isArray(value) ? value : [];
-      const cargoType = this.findCargoTypeByPath(path);
-      row.cargoTypePath = path;
-      row.cargoType = cargoType?.cargoName || '';
-      const firstGoods = this.masterGoodsByCargoType(row)[0];
+      row.cargoType = String(value ?? row.cargoType ?? '').trim();
+      const matched = this.masterGoods.filter(item => item.cargoType === row.cargoType);
+      const firstGoods = matched[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) {
@@ -542,53 +581,48 @@ 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('.');
-      const nextValue = 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('本次数量不能超过剩余数量');
-        return;
-      }
-      row.dispatchQuantity = nextValue;
+      row.dispatchQuantity =
+        decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
       this.syncFreightItems(route);
     },
+    validatePendingTotals() {
+      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()) {
+          if (!key.startsWith('i:')) continue;
+          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('.');
       item.unitPrice = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
@@ -618,7 +652,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() && !(item.cargoTypePath || []).length, '货物类型'],
+          [!String(item.cargoType || '').trim(), '货物类型'],
           [item.dispatchQuantity === undefined || item.dispatchQuantity === null || item.dispatchQuantity === '' || Number(item.dispatchQuantity) <= 0, '本次数量'],
           [!String(item.quantityUnit || '').trim(), '数量单位'],
         ];
@@ -650,7 +684,6 @@ export default {
       return {
         ...goods,
         sourceIndex,
-        cargoTypePath: this.findCargoTypePath(goods.cargoType),
         dispatchQuantity: undefined,
       };
     },
@@ -666,7 +699,8 @@ export default {
     selectGoods(route, row) {
       const source = (this.master.goods || [])[Number(row.sourceIndex)];
       if (!source) return;
-      Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)));
+      const cargoType = String(row.cargoType || '').trim() || source.cargoType;
+      Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)), { cargoType });
       this.syncFreightItems(route);
     },
     removeGoods(route, index) { route.goods.splice(index, 1); this.syncFreightItems(route); },
@@ -854,8 +888,6 @@ 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;
@@ -954,6 +986,7 @@ 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; }
     },
@@ -985,7 +1018,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__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-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-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; }
diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue
index 7fa8619..323d15c 100644
--- a/src/views/business/components/shipping-template-page.vue
+++ b/src/views/business/components/shipping-template-page.vue
@@ -146,8 +146,9 @@
           />
           <el-input
             v-model="form.departureAddress"
-            placeholder="请输入发货地址"
-            :readonly="transportStationMode || !config.editableRoadAddress"
+            class="shipping-template-page__address-map-input"
+            readonly
+            placeholder="请选择发货地址"
             :disabled="transportAddressSelectDisabled"
             @click="handleTransportSecondaryAddressInputClick('departure')"
           >
@@ -189,8 +190,9 @@
           />
           <el-input
             v-model="form.arrivalAddress"
-            placeholder="请输入收货地址"
-            :readonly="transportStationMode || !config.editableRoadAddress"
+            class="shipping-template-page__address-map-input"
+            readonly
+            placeholder="请选择收货地址"
             :disabled="transportAddressSelectDisabled"
             @click="handleTransportSecondaryAddressInputClick('arrival')"
           >
@@ -1131,7 +1133,7 @@ const defaultCargo = () => ({
   cargoTypePath: [],
   packageType: '',
   quantity: '',
-  quantityUnit: '',
+  quantityUnit: '吨',
   brand: '',
   specification: '',
   model: '',
@@ -1258,6 +1260,7 @@ export default {
       crudDialogType: '',
       standaloneFormKey: '',
       copyingRow: null,
+      suppressTransportTypeClear: false,
       detailBox: false,
       detailLoading: false,
       detailRow: {},
@@ -1511,10 +1514,10 @@ export default {
       },
     },
     'form.transportType'(value, oldValue) {
-      if (value !== oldValue) {
-        this.handleTransportTypeChange(value);
-        this.syncFreightItems();
-      }
+      if (this.suppressTransportTypeClear) return;
+      if (String(value ?? '') === String(oldValue ?? '')) return;
+      this.handleTransportTypeChange(value);
+      this.syncFreightItems();
     },
   },
   created() {
@@ -1527,6 +1530,20 @@ 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 &&
@@ -1790,6 +1807,7 @@ 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);
           // 删除模板编号，等待系统生成
@@ -1842,7 +1860,11 @@ 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)
@@ -1924,14 +1946,6 @@ 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;
@@ -2013,6 +2027,8 @@ export default {
           delete detail.updateUser;
           delete detail.updateUserName;
           delete detail.status;
+          // 模板名称追加「副本」
+          detail.templateName = `${detail.templateName || ''}副本`;
 
           console.log('处理后的数据:', detail);
           console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
@@ -2286,13 +2302,60 @@ 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.transportStationMode || !this.config.editableRoadAddress)
-        this.openTransportSecondaryAddressPicker(target);
+      if (this.transportAddressSelectDisabled) return;
+      this.openTransportSecondaryAddressPicker(target);
     },
     openTransportSecondaryAddressPicker(target) {
       this.transportStationMode
@@ -3328,6 +3391,13 @@ 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;
diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue
index d069039..f86b637 100644
--- a/src/views/business/components/transport-plan-page.vue
+++ b/src/views/business/components/transport-plan-page.vue
@@ -85,15 +85,23 @@
       </template>
 
       <template #departureAddress="{ row }">
-        <el-tooltip v-if="row.departureAddress" :content="row.departureAddress" placement="top">
-          <span>{{ formatTransportPlanProvinceCityDistrict(row.departureAddress) }}</span>
+        <el-tooltip
+          v-if="row.departureAddress || row.departureName"
+          :content="row.departureAddress || row.departureName"
+          placement="top"
+        >
+          <span>{{ formatTransportPlanListAddress(row, 'departure') }}</span>
         </el-tooltip>
         <span v-else>-</span>
       </template>
 
       <template #arrivalAddress="{ row }">
-        <el-tooltip v-if="row.arrivalAddress" :content="row.arrivalAddress" placement="top">
-          <span>{{ formatTransportPlanProvinceCityDistrict(row.arrivalAddress) }}</span>
+        <el-tooltip
+          v-if="row.arrivalAddress || row.arrivalName"
+          :content="row.arrivalAddress || row.arrivalName"
+          placement="top"
+        >
+          <span>{{ formatTransportPlanListAddress(row, 'arrival') }}</span>
         </el-tooltip>
         <span v-else>-</span>
       </template>
@@ -574,7 +582,7 @@
           >
           <el-link
             type="primary"
-            v-if="hasPermission(`${config.permission}_view`) && !showDetailButton(row)"
+            v-if="showViewButton(row)"
             @click="$refs.crud.rowView(row, index)"
           >
             查看
@@ -1492,27 +1500,38 @@
               <el-input
                 v-model="dispatchItemForm.departureName"
                 :placeholder="dispatchStationNamePlaceholder"
-                :suffix-icon="dispatchStationMode ? Search : undefined"
-                disabled
-              />
+                :readonly="dispatchStationMode"
+                @click="openDispatchPrimaryAddressPicker('departure')"
+              >
+                <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"
-                disabled
+                :readonly="dispatchStationMode"
+                @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="请输入" disabled />
+              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
               <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" disabled />
+              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" />
             </div>
           </el-form-item>
           <el-form-item label="收货地址" required>
@@ -1520,27 +1539,38 @@
               <el-input
                 v-model="dispatchItemForm.arrivalName"
                 :placeholder="dispatchStationNamePlaceholder"
-                :suffix-icon="dispatchStationMode ? Search : undefined"
-                disabled
-              />
+                :readonly="dispatchStationMode"
+                @click="openDispatchPrimaryAddressPicker('arrival')"
+              >
+                <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"
-                disabled
+                :readonly="dispatchStationMode"
+                @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="请输入" disabled />
+              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
               <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" disabled />
+              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" />
             </div>
           </el-form-item>
         </div>
@@ -1576,20 +1606,15 @@
                   ><span class="transport-plan-page__required-column">货物类型</span></template
                 >
                 <template #default="{ row }">
-                  <el-select
+                  <el-autocomplete
                     v-model="row.cargoType"
-                    placeholder="请选择货物类型"
+                    placeholder="请输入货物类型"
                     clearable
-                    filterable
+                    :debounce="300"
+                    :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">
@@ -1597,20 +1622,18 @@
                   ><span class="transport-plan-page__required-column">货物名称</span></template
                 >
                 <template #default="{ row }">
-                  <el-select
+                  <el-autocomplete
                     v-model="row.cargoName"
-                    placeholder="请选择货物名称"
+                    placeholder="请输入货物名称"
                     clearable
-                    filterable
+                    :debounce="300"
+                    :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">
@@ -1627,7 +1650,11 @@
               </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">
@@ -1848,36 +1875,33 @@
               <el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
             </el-form-item>
             <el-form-item label="货物类型" required>
-              <el-select
+              <el-autocomplete
                 v-model="dispatchItemForm.cargoType"
-                placeholder="请选择货物类型"
+                placeholder="请输入货物类型"
                 clearable
-                filterable
-                @change="handleDispatchConfiguredCargoTypeChange(dispatchItemForm, $event)"
-              >
-                <el-option
-                  v-for="item in getDispatchConfiguredCargoTypeOptions()"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
+                :debounce="300"
+                :fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
+                @select="item => handleDispatchConfiguredCargoTypeSelect(dispatchItemForm, item)"
+                @change="value => handleDispatchConfiguredCargoTypeChange(dispatchItemForm, value)"
+              />
             </el-form-item>
             <el-form-item label="货物名称" required>
-              <el-select
+              <el-autocomplete
                 v-model="dispatchItemForm.cargoName"
-                placeholder="请选择货物名称"
+                placeholder="请输入货物名称"
                 clearable
-                filterable
-                @change="handleDispatchConfiguredCargoNameChange(dispatchItemForm, $event)"
-              >
-                <el-option
-                  v-for="item in getDispatchConfiguredCargoNameOptions(dispatchItemForm)"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
+                :debounce="300"
+                :fetch-suggestions="
+                  (queryString, callback) =>
+                    fetchDispatchConfiguredCargoNameSuggestions(
+                      queryString,
+                      callback,
+                      dispatchItemForm
+                    )
+                "
+                @select="item => handleDispatchConfiguredCargoNameSelect(dispatchItemForm, item)"
+                @change="value => handleDispatchConfiguredCargoNameChange(dispatchItemForm, value)"
+              />
             </el-form-item>
             <el-form-item label="规格">
               <el-input v-model="dispatchItemForm.specification" placeholder="请输入" />
@@ -1902,7 +1926,10 @@
                   </el-select>
                 </template>
               </el-input>
-              <div class="transport-plan-page__dispatch-quantity-hint">
+              <div
+                v-if="!isDispatchPlanQuantityUnlimited(dispatchItemForm)"
+                class="transport-plan-page__dispatch-quantity-hint"
+              >
                 剩余数量：{{
                   formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
                 }}
@@ -3412,15 +3439,21 @@ export default {
       }));
     },
     dispatchHasAddableQuantity() {
-      return this.dispatchTableQuantityItems.some(
-        item => item.total > 0 && item.listed < item.total - 1e-8
-      );
+      const items = this.dispatchTableQuantityItems;
+      if (!items.length) return true;
+      // 计划总量为 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')}`;
@@ -3606,12 +3639,13 @@ 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[this.transportMode] || '';
+      return labelMap[mode] || '';
     },
     transportStationNamePlaceholder() {
       if (!this.transportStationMode) return '行政区划自动带出';
@@ -3798,6 +3832,37 @@ 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 '-';
@@ -3955,6 +4020,11 @@ 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);
@@ -4540,6 +4610,37 @@ 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';
@@ -5238,6 +5339,13 @@ 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;
       }
@@ -5314,19 +5422,21 @@ export default {
     },
     openTransportStationDialog(target) {
       if (!this.ensureTransportTypeBeforeAddress()) return;
-      if (!this.transportStationMode) return;
+      const stationMode = this.dispatchItemBox ? this.dispatchStationMode : this.transportStationMode;
+      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[this.transportMode];
+      return requestMap[mode];
     },
     loadTransportStationList() {
       const request = this.getTransportStationListRequest();
@@ -5436,7 +5546,28 @@ export default {
         water: '港口/码头',
         air: '空港机场',
       };
-      return typeMap[this.transportMode] || '';
+      const mode = this.dispatchItemBox ? this.dispatchTransportMode : 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;
@@ -5487,35 +5618,39 @@ export default {
     },
     applyTransportAddress(target, address = {}) {
       const prefix = target === 'departure' ? 'departure' : 'arrival';
-      this.form[`${prefix}Name`] = address.preferRegionName
+      const addressForm = this.getTransportAddressForm();
+      addressForm[`${prefix}Name`] = address.preferRegionName
         ? address.regionName || address.addressName || ''
         : address.addressName || address.regionName || '';
-      this.form[`${prefix}Address`] = address.detailAddress || address.address || '';
-      this.form[`${prefix}AddressCode`] = address.addressCode || '';
-      this.form[`${prefix}SiteCode`] =
+      addressForm[`${prefix}Address`] = address.detailAddress || address.address || '';
+      addressForm[`${prefix}AddressCode`] = address.addressCode || '';
+      addressForm[`${prefix}SiteCode`] =
         address.addressType === '常规地址'
           ? '/'
           : address.siteCodeDisplay || address.siteCode || '';
-      this.form[`${prefix}Longitude`] = address.longitude || '';
-      this.form[`${prefix}Latitude`] = address.latitude || '';
-      this.form[`${prefix}Contact`] = address.contactName || this.form[`${prefix}Contact`] || '';
-      this.form[`${prefix}Phone`] = address.contactPhone || this.form[`${prefix}Phone`] || '';
+      addressForm[`${prefix}Longitude`] = address.longitude || '';
+      addressForm[`${prefix}Latitude`] = address.latitude || '';
+      addressForm[`${prefix}Contact`] =
+        address.contactName || addressForm[`${prefix}Contact`] || '';
+      addressForm[`${prefix}Phone`] = address.contactPhone || addressForm[`${prefix}Phone`] || '';
       // 地址值在本轮响应式更新后再清理校验状态，避免 Avue 以旧空值重新触发必填提示。
       this.$nextTick(() => {
         this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
       });
     },
     openTransportMapDialog(target) {
-      if (this.dialogReadonly) return;
+      if (this.dialogReadonly && !this.dispatchItemBox) return;
       if (!this.ensureTransportTypeBeforeAddress()) return;
       const prefix = target === 'departure' ? 'departure' : 'arrival';
+      const addressForm = this.getTransportAddressForm();
       this.transportMapTarget = prefix;
-      this.transportMapKeyword = this.form[`${prefix}Address`] || this.form[`${prefix}Name`] || '';
+      this.transportMapKeyword =
+        addressForm[`${prefix}Address`] || addressForm[`${prefix}Name`] || '';
       this.transportMapSelected = this.buildTransportMapSelection({
-        lng: this.form[`${prefix}Longitude`],
-        lat: this.form[`${prefix}Latitude`],
-        address: this.form[`${prefix}Address`],
-        regionName: this.form[`${prefix}Name`],
+        lng: addressForm[`${prefix}Longitude`],
+        lat: addressForm[`${prefix}Latitude`],
+        address: addressForm[`${prefix}Address`],
+        regionName: addressForm[`${prefix}Name`],
       });
       this.transportMapStatus = this.transportMapSelected.longitude
         ? '已加载当前选点，可重新选点'
@@ -5673,12 +5808,13 @@ export default {
         return;
       }
       const prefix = this.transportMapTarget;
-      this.form[`${prefix}Address`] =
-        this.transportMapSelected.detailAddress || this.form[`${prefix}Address`];
-      this.form[`${prefix}Name`] =
-        this.transportMapSelected.regionName || this.form[`${prefix}Name`];
-      this.form[`${prefix}Longitude`] = this.transportMapSelected.longitude;
-      this.form[`${prefix}Latitude`] = this.transportMapSelected.latitude;
+      const addressForm = this.getTransportAddressForm();
+      addressForm[`${prefix}Address`] =
+        this.transportMapSelected.detailAddress || addressForm[`${prefix}Address`];
+      addressForm[`${prefix}Name`] =
+        this.transportMapSelected.regionName || addressForm[`${prefix}Name`];
+      addressForm[`${prefix}Longitude`] = this.transportMapSelected.longitude;
+      addressForm[`${prefix}Latitude`] = this.transportMapSelected.latitude;
       this.transportMapBox = false;
       this.$nextTick(() => {
         this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
@@ -7287,8 +7423,9 @@ export default {
               item.cargoTypePath.join('/') === rowTypePath.join('/')
           )
         : goodsOptions;
+      const source = filtered.length ? filtered : goodsOptions;
       const options = new Map();
-      filtered.forEach(item => {
+      source.forEach(item => {
         if (!item.cargoName || options.has(item.cargoName)) return;
         options.set(item.cargoName, {
           label: item.cargoName,
@@ -7302,26 +7439,73 @@ export default {
       });
       return Array.from(options.values());
     },
-    handleDispatchConfiguredCargoTypeChange(row, value) {
-      const option = this.getDispatchConfiguredCargoTypeOptions().find(
-        item => String(item.value) === String(value || '')
+    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
       );
-      row.cargoType = option?.label || '';
-      row.cargoTypeCode = option?.cargoTypeCode || '';
-      row.cargoTypePath = option?.cargoTypePath || [];
+    },
+    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
+      );
+      if (option) {
+        row.cargoType = option.label || '';
+        row.cargoTypeCode = option.cargoTypeCode || '';
+        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) === String(value || '')
+        item => String(item.value) === nextValue || item.label === nextValue
       );
-      row.cargoName = option?.value || '';
-      if (!option) return;
-      row.cargoType = option.cargoTypeLabel || row.cargoType || '';
-      row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
-      row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
+      if (!option) {
+        row.cargoName = nextValue;
+        return;
+      }
+      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 || '';
     },
@@ -7345,10 +7529,7 @@ export default {
         vehicleNo: this.dispatchRow.vehicleNo || '',
         cargoName: defaultGoods.cargoName || this.dispatchRow.cargoName || '',
         cargoType: defaultGoods.cargoType || this.dispatchRow.cargoType || '',
-        quantity:
-          index >= 0
-            ? defaultGoods.quantity || ''
-            : this.formatDispatchQuantity(this.getDispatchRemainingQuantity(defaultUnit)),
+        quantity: '',
         quantityUnit: defaultUnit,
         specification: defaultGoods.specification || '',
         model: defaultGoods.model || '',
@@ -8003,6 +8184,7 @@ 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) {
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index af185a0..323a550 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -5177,15 +5177,28 @@ export default {
           delete sourceData.code;
           delete sourceData.waybillNo;
           delete sourceData.waybillStatus;
+          delete sourceData.businessStatus;
+          delete sourceData.businessStatusName;
+          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 = '手工创建';
+          this.form.businessStatus = '';
+          this.form.businessStatusName = '';
           done();
         });
         return;
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 633c1db..87c9efe 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -354,7 +354,7 @@
             <el-link
               v-for="action in rowActions(row)"
               :key="action.type"
-              :type="action.type === 'delete' ? 'danger' : 'primary'"
+              :type="['delete', 'cancel'].includes(action.type) ? 'danger' : 'primary'"
               @click="handleRowAction(action.type, row)"
               >{{ action.label }}</el-link
             >
@@ -1677,7 +1677,6 @@ export default {
         add: '新建配载',
         edit: '编辑配载单',
         view: '配载单详情',
-        copy: '复制配载单',
         reassign: '重新派单',
       };
       return titleMap[this.dialogMode] || '配载管理';
@@ -2014,31 +2013,28 @@ export default {
       if (status === 'draft') {
         return [
           { type: 'edit', label: '编辑' },
-          { type: 'copy', label: '复制' },
           { type: 'delete', label: '删除' },
         ];
       }
       if (status === 'pending') {
-        return [
+        const actions = [
           { type: 'view', label: '详情' },
-          { type: 'reassign', label: '重新派单' },
-          { type: 'edit', label: '编辑' },
-          { type: 'copy', label: '复制' },
-          { type: 'cancel', label: '取消' },
+          { type: 'start', 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: '详情' },
-          { type: 'copy', label: '复制' },
-        ];
+        return [{ type: 'view', label: '详情' }];
       }
       return [{ type: 'view', label: '详情' }];
     },
@@ -2047,8 +2043,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),
       };
@@ -2784,16 +2780,6 @@ 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 () => {
@@ -2813,6 +2799,15 @@ 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 () => {
diff --git a/src/views/business/master-order.vue b/src/views/business/master-order.vue
index 13fb57a..4a7a506 100644
--- a/src/views/business/master-order.vue
+++ b/src/views/business/master-order.vue
@@ -1,57 +1,58 @@
 <template>
   <basic-container class="master-order-page">
     <template v-if="mode === 'list'">
-      <el-form :model="query" class="master-search" label-width="160px" @submit.prevent>
-        <el-row :gutter="16">
-          <el-col v-for="field in primaryFields" :key="field.prop" :span="6"
-            ><el-form-item :label="field.label"
-              ><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
-          ></el-col>
-          <el-col :span="6"
-            ><el-form-item label="状态"
-              ><el-select v-model="query.businessStatus" placeholder="全部"
-                ><el-option label="全部" value="" /><el-option
+      <div class="master-order-page__search">
+        <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+          <div class="master-order-page__search-grid">
+            <el-form-item v-for="field in primaryFields" :key="field.prop" :label="field.label">
+              <el-input v-model="query[field.prop]" clearable placeholder="请输入" />
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select v-model="query.businessStatus" clearable placeholder="全部">
+                <el-option label="全部" value="" />
+                <el-option
                   v-for="item in statuses"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value" /></el-select></el-form-item
-          ></el-col>
-          <template v-if="searchExpanded">
-            <el-col v-for="field in secondaryFields" :key="field.prop" :span="6"
-              ><el-form-item :label="field.label"
-                ><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
-            ></el-col>
-            <el-col :span="6"
-              ><el-form-item label="计划开始日期"
-                ><el-date-picker
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <template v-if="searchExpanded">
+              <el-form-item v-for="field in secondaryFields" :key="field.prop" :label="field.label">
+                <el-input v-model="query[field.prop]" clearable placeholder="请输入" />
+              </el-form-item>
+              <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="请选择" /></el-form-item
-            ></el-col>
-            <el-col :span="6"
-              ><el-form-item label="计划结束日期"
-                ><el-date-picker
+                  end-placeholder="请选择"
+                />
+              </el-form-item>
+              <el-form-item label="计划结束日期">
+                <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="请选择" /></el-form-item
-            ></el-col>
-          </template>
-          <el-col :span="24" class="search-actions"
-            ><el-button type="primary" @click="search">查询</el-button
-            ><el-button @click="reset">重置</el-button
-            ><el-link type="primary" @click="searchExpanded = !searchExpanded"
-              ><el-icon><component :is="searchExpanded ? ArrowUp : ArrowDown" /></el-icon
-              >{{ searchExpanded ? '折叠' : '展开' }}</el-link
-            ></el-col
-          >
-        </el-row>
-      </el-form>
+                  end-placeholder="请选择"
+                />
+              </el-form-item>
+            </template>
+            <div class="master-order-page__search-actions">
+              <el-button type="primary" @click="search">查询</el-button>
+              <el-button @click="reset">重置</el-button>
+              <el-link type="primary" @click="searchExpanded = !searchExpanded">{{
+                searchExpanded ? '收起' : '展开'
+              }}</el-link>
+            </div>
+          </div>
+        </el-form>
+      </div>
       <section class="master-list-panel">
         <div class="toolbar">
           <el-button type="primary" @click="goCreate()">新建多联总单</el-button
@@ -76,7 +77,13 @@
                   <div class="route-point">
                     <span :class="['route-node', node.type]">{{ node.text }}</span>
                     <div class="route-detail">
-                      <el-tooltip placement="top"><template #content>{{ node.name }}</template><strong>{{ node.name }}</strong></el-tooltip>
+                      <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>
@@ -125,7 +132,7 @@
       />
     </template>
     <master-order-dispatch v-else-if="mode === 'dispatch'" :id="routeId" @back="goList" />
-    <master-order-detail v-else :id="routeId" @back="goList" />
+    <master-order-detail v-else :id="routeId" />
     <el-dialog v-model="confirm.visible" title="提示" width="400px"
       ><span>{{ confirm.message }}</span
       ><template #footer
@@ -138,7 +145,6 @@
 
 <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';
@@ -147,8 +153,6 @@ export default {
   components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
   data() {
     return {
-      ArrowDown,
-      ArrowUp,
       searchExpanded: false,
       loading: false,
       records: [],
@@ -303,7 +307,7 @@ export default {
     },
     timeRange(row) {
       return row.planStartTime && row.planEndTime
-        ? `${String(row.planStartTime).slice(0, 16)} - ${String(row.planEndTime).slice(0, 16)}`
+        ? `${String(row.planStartTime).slice(0, 10)} - ${String(row.planEndTime).slice(0, 10)}`
         : '-';
     },
     goodsSummary(row) {
@@ -334,6 +338,19 @@ 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 '-';
@@ -355,10 +372,16 @@ export default {
     routeNodeName(value, address, transportType, region = {}) {
       const text = String(value || '').trim();
       if (!text) return '-';
-      const siteCode = String(region.siteCode || '').trim();
-      // 运输方式切换不应改变地址本身的展示模式：有站点编码时显示站点名称，
-      // 没有站点编码的区域地址统一按“市 区县”格式展示。
-      if (siteCode && siteCode !== '/') return text;
+      if (
+        this.isNonRoadLocation({
+          name: text,
+          siteCode: region.siteCode,
+          transportType,
+          nextTransportType: region.nextTransportType,
+        })
+      ) {
+        return text;
+      }
       // 优先从完整的地址名称/详细地址解析，避免后端只返回“梅州”等不完整的市名称时
       // 提前返回城市，导致区县被遗漏。
       const parsedText = this.formatRoadAddress(text);
@@ -383,86 +406,149 @@ export default {
       const source = /省|自治区|特别行政区|市|州|盟/.test(text) ? text : address || text;
       const formatted = this.formatRoadAddress(source);
       if (/(?:区|县|旗)$/.test(text) && !formatted.includes(text)) {
-        const city = formatted.split(' ')[0];
-        return city && city !== formatted ? `${city} ${text}` : formatted;
+        const cityName = formatted.split(' ')[0];
+        return cityName && cityName !== formatted ? `${cityName} ${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: '起',
-            name: this.routeNodeName(
-              row.departureName || row.departureAddress,
-              row.departureAddress,
-              firstTransportType,
-              {
-                cityName: row.departureCityName,
-                districtName: row.departureDistrictName,
-                siteCode: row.departureSiteCode,
-              }
-            ),
+            ...start,
             lines: [`已调度0/${total}吨`],
           },
           {
             key: 'end',
             type: 'end',
             text: '终',
-            name: this.routeNodeName(
-              row.arrivalName || row.arrivalAddress,
-              row.arrivalAddress,
-              row.finalTransportType || firstTransportType,
-              {
-                cityName: row.arrivalCityName,
-                districtName: row.arrivalDistrictName,
-                siteCode: row.arrivalSiteCode,
-              }
-            ),
+            ...end,
             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: '起',
-          name: this.routeNodeName(
-            row.departureName || row.departureAddress,
-            row.departureAddress,
-            firstTransportType,
-            {
-              cityName: row.departureCityName,
-              districtName: row.departureDistrictName,
-              siteCode: row.departureSiteCode,
-            }
-          ),
+          ...start,
           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 ? '终' : '经',
-            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,
-              }
-            ),
+            ...location,
             lines: isEnd
               ? [`到达${arrived}/${total}吨`]
               : [`到达 ${arrived}/${total}吨`, `已调度 ${dispatched}/到达${arrived}/${total}吨`],
@@ -494,31 +580,43 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.master-search {
-  margin-bottom: 12px;
-  padding: 12px 12px 4px;
-  background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-  .el-form-item {
+.master-order-page {
+  &__search {
+    padding: 12px 12px 4px;
+    margin-bottom: 8px;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
+
+  &__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 {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    gap: 12px;
-    min-height: 40px;
-    .el-icon {
-      margin-right: 4px;
-    }
+
+  :deep(.el-input),
+  :deep(.el-select),
+  :deep(.el-date-editor.el-input),
+  :deep(.el-date-editor.el-input__wrapper),
+  :deep(.el-date-editor--datetimerange) {
+    width: 100%;
   }
 }
 .master-list-panel {
@@ -612,10 +710,16 @@ 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;
-      max-width: 180px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      vertical-align: bottom;
+      cursor: default;
     }
   }
   .route-connector {
diff --git a/src/views/business/transport-plan-dispatch.vue b/src/views/business/transport-plan-dispatch.vue
index 1c70a06..66994dd 100644
--- a/src/views/business/transport-plan-dispatch.vue
+++ b/src/views/business/transport-plan-dispatch.vue
@@ -1,116 +1,113 @@
 <template>
   <basic-container class="transport-plan-dispatch-page">
     <div v-loading="loading" class="transport-plan-dispatch-page__shell">
-      <!-- 顶部信息区 -->
-      <div class="transport-plan-dispatch-page__top">
+      <!-- 顶部信息区：对齐运单详情汇总样式 -->
+      <section-card class="transport-plan-dispatch-page__summary">
         <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>
-            <span class="transport-plan-dispatch-page__heading-name">计划调度</span>
-            <span class="transport-plan-dispatch-page__heading-no">
-              {{ planData.planNo || planData.loadingNo || '-' }}
+          <el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
+          <strong>计划调度</strong>
+          <span>{{ planData.planNo || planData.loadingNo || '-' }}</span>
+          <span class="detail-status-text" :class="statusTextClass">
+            {{ planData.businessStatusName || '-' }}
+          </span>
+          <span class="detail-status-text detail-transport-type">
+            {{ planData.transportTypeName || '公路整车' }}
+          </span>
+        </div>
+        <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>
+            <span class="transport-plan-dispatch-page__summary-value">
+              {{ planData.customerName || '-' }}
             </span>
-            <el-tag :type="getStatusTagType(planData.businessStatus)" effect="light" class="status-text">
-              {{ planData.businessStatusName || '-' }}
-            </el-tag>
-            <el-tag type="primary" effect="light">
-              {{ planData.transportTypeName || '公路整车' }}
-            </el-tag>
+          </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 is-link">
+              {{ 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 class="transport-plan-dispatch-page__summary-item">
+            <span class="transport-plan-dispatch-page__summary-label">计划执行时间</span>
+            <span class="transport-plan-dispatch-page__summary-value">
+              {{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
+            </span>
+          </div>
+          <div class="transport-plan-dispatch-page__summary-item is-goods">
+            <span class="transport-plan-dispatch-page__summary-label">货物信息</span>
+            <span class="transport-plan-dispatch-page__summary-value is-wrap">
+              {{ 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>
+            <span class="transport-plan-dispatch-page__route-line" aria-hidden="true" />
+            <div class="transport-plan-dispatch-page__route-item is-end">
+              <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.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"
+                type="primary"
+                :href="item.url"
+                :underline="false"
+                target="_blank"
+              >
+                {{ item.name || item.originalName || '附件' }}
+              </el-link>
+              <span v-if="!attachmentList.length">-</span>
+            </div>
           </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">
-                <div class="transport-plan-dispatch-page__summary-label">客户</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ planData.customerName || '-' }}
-                </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">
-                  {{ planData.projectName || '-' }}
-                </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">
-                  {{ 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) }}
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__summary-item is-wide">
-                <div class="transport-plan-dispatch-page__summary-label">货物信息</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ planData.goodsInfo || formatGoodsInfo(planData) }}
-                </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">
-                  <template v-if="attachmentList.length">
-                    <el-link
-                      v-for="(item, index) in attachmentList"
-                      :key="index"
-                      type="primary"
-                      :href="item.url"
-                      :underline="false"
-                      target="_blank"
-                      class="transport-plan-dispatch-page__attachment-link"
-                    >
-                      {{ item.name || item.originalName || '附件' }}
-                    </el-link>
-                  </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>
 
       <!-- 调度列表 -->
       <section-card class="transport-plan-dispatch-page__list-card">
@@ -204,7 +201,6 @@
 </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';
@@ -216,7 +212,6 @@ const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
 export default {
   name: 'TransportPlanDispatch',
   components: {
-    Van,
     SectionCard,
     TransportPlanPage,
   },
@@ -237,11 +232,21 @@ 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)}吨`;
       }
@@ -264,6 +269,9 @@ 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
@@ -276,13 +284,20 @@ 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);
@@ -364,15 +379,6 @@ 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(' ~ ') : '-';
@@ -382,9 +388,30 @@ export default {
       const match = address.match(/^(.*?省)?(.*?市)?(.*?区|.*?县)?/);
       return match ? match[0] || address : address;
     },
-    formatContact(contact, phone) {
-      const parts = [contact, phone].filter(Boolean);
-      return parts.length ? parts.join(' / ') : '-';
+    formatProvinceCityDistrict(value) {
+      const text = String(value || '').trim();
+      if (!text) return '-';
+      const districtMatch = text.match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
+      if (districtMatch) {
+        return text.slice(0, districtMatch.index + districtMatch[0].length);
+      }
+      const cityMatch = text.match(/市/);
+      return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
+    },
+    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);
@@ -419,32 +446,33 @@ export default {
         this.$message.warning('待调度列表货物总量已达到计划总量，不能新增调度明细');
         return;
       }
-
-      // 调用 transport-plan-page 组件的方法打开弹窗
-      this.$nextTick(() => {
-        const component = this.$refs.transportPlanPageRef;
-        if (component) {
-          // 设置调度数据
-          component.dispatchRow = this.planData;
-          component.dispatchRows = [...this.dispatchList];
-          // 打开新增弹窗
-          component.openDispatchItemDialog(-1);
-        }
-      });
+      this.openPageDispatchItemDialog(-1);
     },
     handleEdit(row, index) {
-      // 调用 transport-plan-page 组件的方法打开弹窗
+      this.openPageDispatchItemDialog(index, row);
+    },
+    openPageDispatchItemDialog(index = -1, row) {
       this.$nextTick(() => {
         const component = this.$refs.transportPlanPageRef;
-        if (component) {
-          // 设置调度数据
-          component.dispatchRow = this.planData;
-          component.dispatchRows = [...this.dispatchList];
-          // 打开编辑弹窗
-          component.openDispatchItemDialog(index, row);
-        }
+        if (!component) return;
+        component.dispatchRow = this.planData;
+        component.dispatchRows = [...this.dispatchList];
+        this.bindDispatchItemSaveSync(component);
+        if (index >= 0) component.openDispatchItemDialog(index, row);
+        else component.openDispatchItemDialog(-1);
       });
     },
+    bindDispatchItemSaveSync(component) {
+      if (component.__dispatchListSaveSynced) return;
+      const originalSave = component.saveDispatchItem;
+      component.saveDispatchItem = (...args) => {
+        originalSave.apply(component, args);
+        if (!component.dispatchItemBox) {
+          this.dispatchList = [...(component.dispatchRows || [])];
+        }
+      };
+      component.__dispatchListSaveSynced = true;
+    },
     handleDelete(index) {
       this.$confirm('确定删除该调度明细?', '提示', {
         confirmButtonText: '确定',
@@ -551,126 +579,189 @@ export default {
     height: 100%;
   }
 
-  &__top {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
+  &__summary {
+    :deep(.el-card__body) {
+      padding: 18px 22px;
+    }
   }
 
   &__heading {
-    padding: 16px;
-    background: #fff;
-    border-radius: 4px;
-
-    &-title {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      font-size: 18px;
-      font-weight: 600;
-    }
-
-    &-name {
-      font-size: 18px;
-    }
-
-    &-no {
-      font-size: 14px;
-      color: #606266;
-    }
-  }
-
-  &__summary {
     display: flex;
-    gap: 16px;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 12px;
+    margin-bottom: 18px;
 
-    &-card {
-      flex: 1;
+    strong {
+      font-size: 20px;
     }
 
-    &-grid {
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 16px;
+    .detail-status-text {
+      display: inline-flex;
+      align-items: center;
+      height: 28px;
+      padding: 0 12px;
+      border-radius: 8px;
+      font-size: 13px;
+      line-height: 28px;
     }
 
-    &-item {
-      display: flex;
-      flex-direction: column;
-      gap: 8px;
-
-      &.is-wide {
-        grid-column: 1 / -1;
-      }
+    .status-text-success,
+    .is-dispatching {
+      color: #67c23a;
+      background: #e1f3d8;
     }
 
-    &-label {
-      font-size: 14px;
+    .detail-transport-type {
+      color: #409eff;
+      background: #ecf5ff;
+    }
+
+    .is-danger {
+      color: #f56c6c;
+      background: #fef0f0;
+    }
+
+    .is-info {
       color: #909399;
-    }
-
-    &-value {
-      font-size: 14px;
-      color: #303133;
+      background: #f4f4f5;
     }
   }
 
-  &__route-card {
-    flex: 1;
+  &__summary-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(120px, 1fr)) minmax(360px, 1.5fr);
+    gap: 16px 24px;
+  }
+
+  &__summary-item {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    min-width: 0;
+
+    &.is-goods {
+      grid-column: 1 / 5;
+    }
+  }
+
+  &__summary-label {
+    color: #909399;
+  }
+
+  &__summary-value {
+    overflow: hidden;
+    color: #303133;
+    font-weight: 500;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    &.is-link {
+      color: #409eff;
+    }
+
+    &.is-wrap {
+      white-space: normal;
+      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;
-    gap: 24px;
+    text-align: center;
+  }
 
-    &-item {
-      flex: 1;
+  &__route-marker {
+    display: inline-flex;
+    width: 36px;
+    height: 36px;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    border-radius: 8px;
+    background: #409eff;
+    font-size: 18px;
+    font-weight: 600;
+
+    .is-end & {
+      background: #67c23a;
+    }
+  }
+
+  &__route-line {
+    width: 100%;
+    height: 6px;
+    margin-top: 15px;
+    border-radius: 1px;
+    background: #e4e7ed;
+  }
+
+  &__route-detail {
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    align-items: center;
+    gap: 5px;
+    margin-top: 8px;
+    width: 100%;
+  }
+
+  &__route-name {
+    max-width: 100%;
+    overflow: hidden;
+    color: #303133;
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 1.35;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__route-addr {
+    display: block;
+    max-width: 100%;
+    overflow: hidden;
+    color: #606266;
+    font-size: 12px;
+    line-height: 1.5;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__route-contact {
+    display: flex;
+    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;
-      gap: 12px;
-    }
-
-    &-badge {
-      width: 32px;
-      height: 32px;
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #fff;
-      font-size: 14px;
-      flex-shrink: 0;
-
-      &.is-start {
-        background: #67c23a;
-      }
-
-      &.is-end {
-        background: #409eff;
-      }
-    }
-
-    &-body {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      gap: 4px;
-    }
-
-    &-title {
-      font-size: 16px;
-      font-weight: 600;
-    }
-
-    &-address,
-    &-contact {
-      font-size: 14px;
-      color: #606266;
-    }
-
-    &-vehicle {
-      font-size: 24px;
-      color: #909399;
+      flex-wrap: wrap;
+      gap: 16px;
     }
   }
 
@@ -706,12 +797,42 @@ export default {
     border-radius: 4px;
   }
 
-  &__attachment-link {
-    margin-right: 12px;
+  @media (max-width: 1200px) {
+    &__summary-grid {
+      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>
diff --git a/src/views/business/voucher-manage.vue b/src/views/business/voucher-manage.vue
index 32ea14c..ef6c6dd 100644
--- a/src/views/business/voucher-manage.vue
+++ b/src/views/business/voucher-manage.vue
@@ -16,7 +16,9 @@
             ><el-select v-model="query.processStatus" clearable placeholder="全部"
               ><el-option label="上传中" value="上传中" /><el-option
                 label="处理中"
-                value="处理中" /><el-option label="处理完成" value="处理完成" /></el-select
+                value="处理中" /><el-option label="处理完成" value="处理完成" /><el-option
+                label="处理失败"
+                value="处理失败" /></el-select
           ></el-form-item>
           <el-form-item label="运单批次号"
             ><el-input v-model="query.waybillBatchNo" clearable placeholder="请输入"
@@ -84,7 +86,14 @@
           min-width="160"
           ><template #default="{ row }">{{ row.carrierName || '-' }}</template></el-table-column
         >
-        <el-table-column prop="processStatus" label="处理状态" width="120" /><el-table-column
+        <el-table-column prop="processStatus" label="处理状态" width="120"
+          ><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"
@@ -109,7 +118,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="320" fixed="right" align="center"
+        ></el-table-column><el-table-column label="操作" width="220" fixed="right" align="center"
           ><template #default="{ row }"
             ><div class="voucher-manage-page__actions">
               <el-link
@@ -130,7 +139,7 @@
                 @click="download(row)"
                 >下载</el-link
               ><el-link
-                v-if="row.auditStatus === '审核驳回'"
+                v-if="row.auditStatus === '审核驳回' || row.processStatus === '处理失败'"
                 type="primary"
                 @click="openUpload(row, 'reupload')"
                 >重新上传</el-link
@@ -145,7 +154,7 @@
                 @click="openBatchDialog(row)"
                 >更换运单批次</el-link
               ><el-link
-                v-if="row.processStatus === '上传中' || row.auditStatus === '审核驳回'"
+                v-if="row.processStatus === '上传中' || row.processStatus === '处理失败' || row.auditStatus === '审核驳回'"
                 type="danger"
                 @click="removeRow(row)"
                 >删除</el-link
@@ -1238,7 +1247,15 @@ const view = async row => {
     query: { id: row.id, batchNo: row.voucherBatchNo },
   });
 };
-const download = row => window.open(row.fileUrl, '_blank');
+const download = row => {
+  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',
@@ -1329,6 +1346,9 @@ load();
     color: #f56c6c;
     cursor: help;
   }
+  &__process-failed {
+    color: #f56c6c;
+  }
   &__actions {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 171d21b..0d92d07 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -169,12 +169,6 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <div
-                v-if="!latestChangeLoading && !latestChangeRows.length"
-                class="settlement-detail-page__empty"
-              >
-                暂无变更记录
-              </div>
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -2734,12 +2728,6 @@ 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;
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index bb4c73d..1ed0669 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -56,6 +56,14 @@
               @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
@@ -348,6 +356,7 @@ import {
   remove,
   update,
   add,
+  syncIamAccounts,
   grant,
   resetPassword,
   setPassword,
@@ -393,6 +402,7 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
+      iamSyncLoading: false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -553,6 +563,25 @@ 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 ? '取消主管成功!' : '设置主管成功!';
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 9c36d1a..1325abc 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -4758,7 +4758,7 @@ export default {
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.crud.toggleSelection();
+      this.$refs.crud?.toggleSelection();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

From 84d9e098ba7f807687df7dba11002c7c3c98da4c Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 16 Sep 2026 23:43:12 +0800
Subject: [PATCH 04/28] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oaLogin.html                                  |  52 ++
 src/api/system/dept.js                        |   7 +
 src/docker/nginx.conf                         |  19 +
 .../components/shipping-template-page.vue     |   4 +-
 .../components/waybill-import-dialog.vue      | 398 +++++++++---
 .../components/waybill-manage-page.vue        |   8 +-
 src/views/business/loading-manage.vue         | 607 +++++++++++-------
 src/views/business/waybill-import.vue         |  27 +-
 src/views/system/dept.vue                     |  39 +-
 9 files changed, 795 insertions(+), 366 deletions(-)
 create mode 100644 oaLogin.html
 create mode 100644 src/docker/nginx.conf

diff --git a/oaLogin.html b/oaLogin.html
new file mode 100644
index 0000000..7c8f80f
--- /dev/null
+++ b/oaLogin.html
@@ -0,0 +1,52 @@
+<!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>
\ No newline at end of file
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index fc2f0ad..7bf3f68 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -41,6 +41,13 @@ 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',
diff --git a/src/docker/nginx.conf b/src/docker/nginx.conf
new file mode 100644
index 0000000..0155f82
--- /dev/null
+++ b/src/docker/nginx.conf
@@ -0,0 +1,19 @@
+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;
+    }
+}
diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue
index 323d15c..3b33a8f 100644
--- a/src/views/business/components/shipping-template-page.vue
+++ b/src/views/business/components/shipping-template-page.vue
@@ -2027,8 +2027,8 @@ export default {
           delete detail.updateUser;
           delete detail.updateUserName;
           delete detail.status;
-          // 模板名称追加「副本」
-          detail.templateName = `${detail.templateName || ''}副本`;
+          // 模板名称追加「-副本」
+          detail.templateName = `${detail.templateName || ''}-副本`;
 
           console.log('处理后的数据:', detail);
           console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index 33585a8..57dc3a0 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -10,107 +10,200 @@
     :class="{ 'waybill-import-page': standalone }"
     @closed="handleClosed"
   >
-    <div class="waybill-import-toolbar">
-      <div class="waybill-import-toolbar__search">
-        <el-form :inline="true" :model="query" label-width="auto">
-          <el-form-item label="运单批次号"
-            ><el-input v-model="query.batchNo" clearable
-          /></el-form-item>
-          <el-form-item label="承运商"
-            ><el-select v-model="query.carrierId" clearable filterable
-              ><el-option
+    <section v-show="searchVisible" class="waybill-import-toolbar__search">
+      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+        <div class="waybill-import-toolbar__search-grid">
+          <el-form-item label="运单批次号">
+            <el-input v-model="query.batchNo" clearable placeholder="请输入" />
+          </el-form-item>
+          <el-form-item label="承运商">
+            <el-select v-model="query.carrierId" clearable filterable placeholder="请选择">
+              <el-option
                 v-for="item in queryCarriers"
                 :key="item.id"
                 :label="item.name"
-                :value="item.id" /></el-select
-          ></el-form-item>
-          <el-form-item label="创建时间"
-            ><el-date-picker
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
               v-model="query.createTimeRange"
               type="datetimerange"
               value-format="YYYY-MM-DD HH:mm:ss"
-          /></el-form-item>
-          <el-form-item label="创建人"
-            ><el-select v-model="query.createUser" clearable filterable
-              ><el-option
+              range-separator="~"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              clearable
+            />
+          </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" /></el-select
-          ></el-form-item>
-        </el-form>
-        <div class="waybill-import-toolbar__search-actions">
-          <el-button type="primary" @click="loadBatches">查询</el-button
-          ><el-button @click="resetQuery">重置</el-button>
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
         </div>
-      </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"
+        <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="avue-crud__header waybill-import-toolbar__actions">
+      <div class="avue-crud__left">
+        <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">
-      <el-table-column type="selection" width="50" /><el-table-column
-        type="index"
-        label="序号"
-        width="70"
-      />
-      <el-table-column prop="batchNo" label="运单批次号" min-width="150" /><el-table-column
-        prop="projectName"
-        label="项目名称"
-        min-width="150"
-      />
-      <el-table-column prop="carrierName" label="承运商" min-width="140" /><el-table-column
-        prop="carrierType"
-        label="承运类型"
-        min-width="120"
-      />
-      <el-table-column prop="waybillCount" label="运单数" width="90" /><el-table-column
-        prop="importTypeName"
-        label="导入方式"
-        width="100"
-      />
-      <el-table-column
-        prop="createTime"
-        label="创建时间"
-        min-width="170"
-        sortable
-      /><el-table-column prop="updateTime" label="更新时间" min-width="170" sortable />
-      <el-table-column prop="statusName" label="状态" width="100" /><el-table-column
-        label="操作"
-        width="180"
-        fixed="right"
+    <section class="waybill-import-toolbar__table-panel">
+      <el-table
+        :data="batches"
+        :size="tableSize"
+        border
+        @selection-change="selected = $event"
       >
-        <template #default="{ row }"
-          ><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-table-column type="selection" width="50" /><el-table-column
+          type="index"
+          label="序号"
+          width="70"
+        />
+        <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
+          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
+          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"
         >
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      v-model:current-page="page.current"
-      v-model:page-size="page.size"
-      layout="total, prev, pager, next, sizes"
-      :page-sizes="[10, 20, 50]"
-      :total="page.total"
-      @current-change="loadBatches"
-      @size-change="loadBatches"
-    />
+          <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
+          v-if="columnVisible.updateTime"
+          prop="updateTime"
+          label="更新时间"
+          min-width="170"
+          sortable
+        />
+        <el-table-column
+          label="操作"
+          width="180"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <el-link
+              v-if="row.importStatus !== 'draft'"
+              type="primary"
+              @click="openDetail(row)"
+              >查看</el-link
+            >
+            <el-link
+              v-if="row.importStatus === 'draft'"
+              type="primary"
+              @click="editBatch(row)"
+              >编辑</el-link
+            >
+            <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"
+          :page-sizes="[10, 20, 50, 100]"
+          :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-input v-model="detailQuery.cargoName" clearable /></el-form-item
+      ><el-form-item label="司机/船长姓名"
+        ><el-input v-model="detailQuery.driverName" clearable placeholder="请输入" /></el-form-item
       ><el-button type="primary" @click="loadDetails">查询</el-button></el-form
     >
     <el-table :data="details" border
@@ -126,7 +219,10 @@
         prop="vehicleNo"
         label="车牌号/航班号/船号/班列号"
         min-width="190"
-      /><el-table-column prop="transportType" label="运输方式" width="110" /><el-table-column
+      /><el-table-column prop="transportType" label="运输方式" width="110">
+        <template #default="{ row }">{{ transportTypeLabel(row.transportType) }}</template>
+      </el-table-column>
+      <el-table-column
         prop="driverName"
         label="司机/船长姓名"
         min-width="120"
@@ -200,17 +296,20 @@
         prop="waybillIdentifier"
         label="同一运单标识号"
         min-width="140"
-      /><el-table-column label="操作" width="80">-</el-table-column></el-table
+      /></el-table
     >
-    <el-pagination
-      v-model:current-page="detailPage.current"
-      v-model:page-size="detailPage.size"
-      layout="total, prev, pager, next, sizes"
-      :page-sizes="[10, 20, 50]"
-      :total="detailPage.total"
-      @current-change="loadDetails"
-      @size-change="loadDetails"
-    />
+    <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"
+        :page-sizes="[10, 20, 50, 100]"
+        :total="detailPage.total"
+        @current-change="loadDetails"
+        @size-change="loadDetails"
+      />
+    </div>
   </el-dialog>
 
   <component
@@ -506,8 +605,32 @@ 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: '', cargoName: '' });
+const detailQuery = reactive({ vehicleNo: '', driverName: '' });
 const createDefaultForm = () => ({
   id: '',
   batchNo: '',
@@ -862,6 +985,20 @@ 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 || [];
@@ -922,9 +1059,13 @@ const closeCreate = () => {
   }
   createVisible.value = false;
 };
-const openDetail = row => {
+const openDetail = async row => {
   detailQuery.batchId = row.id;
+  detailQuery.vehicleNo = '';
+  detailQuery.driverName = '';
+  detailPage.current = 1;
   detailVisible.value = true;
+  await ensureTransportTypeOptions();
   loadDetails();
 };
 // 草稿明细已落库为草稿运单，编辑时回填到明细表，避免重新上传附件。
@@ -1329,34 +1470,81 @@ const confirmImport = async () => {
 
 <style scoped lang="scss">
 .waybill-import-toolbar {
-  margin-bottom: 12px;
-
   &__search {
-    display: flex;
-    align-items: flex-start;
-    gap: 12px;
+    padding: 18px 18px 8px;
+    margin-bottom: 8px;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
 
-    .el-form {
-      flex: 1;
-      margin-bottom: 0;
-    }
+  &__search-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    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;
-    flex: none;
+    justify-content: flex-end;
     gap: 8px;
+    margin-bottom: 8px;
   }
 
   &__actions {
-    margin-top: 8px;
+    margin-top: 12px;
+    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 {
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 323a550..42dffde 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -5172,13 +5172,11 @@ 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.businessStatus;
-          delete sourceData.businessStatusName;
           delete sourceData.driverAcceptStatus;
           delete sourceData.driverAcceptTime;
           delete sourceData.driverAcceptDriverId;
@@ -5195,10 +5193,8 @@ export default {
           delete sourceData.updateUserName;
 
           this.applyFormDetail(sourceData);
-          // 标记为手工创建，状态与新增一致（暂存=草稿，确认后按过程配置校正）
+          // 标记为手工创建；业务状态沿用原运单
           this.form.dataSource = '手工创建';
-          this.form.businessStatus = '';
-          this.form.businessStatusName = '';
           done();
         });
         return;
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 87c9efe..3a7efc0 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -583,219 +583,219 @@
           label-width="auto"
           class="loading-manage-dialog__form archive-form"
         >
-          <section-card title="筛选待配载运单">
-            <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">
-                  <el-form-item label="运单号">
-                    <el-input v-model="candidateQuery.waybillNo" clearable placeholder="请输入" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="项目名称">
-                    <el-select
-                      v-model="candidateQuery.projectName"
-                      clearable
-                      filterable
-                      remote
-                      reserve-keyword
-                      :remote-method="loadProjectOptions"
-                      :loading="projectLoading"
-                      placeholder="请输入"
-                      @visible-change="
-                        visible => visible && loadProjectOptions(candidateQuery.projectName)
-                      "
-                    >
-                      <el-option
-                        v-for="item in projectOptions"
-                        :key="item.id || item.projectName"
-                        :label="item.projectName"
-                        :value="item.projectName"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="发货地址">
-                    <el-input
-                      v-model="candidateQuery.departureAddress"
-                      clearable
-                      placeholder="请输入"
-                    />
-                  </el-form-item>
-                </el-col>
-                <template v-if="candidateSearchVisible">
-                  <el-col :span="6">
-                    <el-form-item label="货物名称">
-                      <el-input v-model="candidateQuery.cargoName" clearable placeholder="请输入" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="收货地址">
-                      <el-input
-                        v-model="candidateQuery.arrivalAddress"
-                        clearable
-                        placeholder="请输入"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="客户名称">
-                      <el-select
-                        v-model="candidateQuery.customerName"
-                        clearable
-                        filterable
-                        remote
-                        reserve-keyword
-                        :remote-method="loadCustomerOptions"
-                        :loading="customerLoading"
-                        placeholder="请输入"
-                        @visible-change="
-                          visible => visible && loadCustomerOptions(candidateQuery.customerName)
-                        "
-                      >
-                        <el-option
-                          v-for="item in customerOptions"
-                          :key="item.id || item.customerName"
-                          :label="item.customerName"
-                          :value="item.customerName"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="货物类型">
-                      <el-select
-                        v-model="candidateQuery.cargoType"
-                        clearable
-                        filterable
-                        remote
-                        reserve-keyword
-                        :remote-method="loadCargoTypeOptions"
-                        :loading="cargoTypeLoading"
-                        placeholder="请输入"
-                        @visible-change="
-                          visible => visible && loadCargoTypeOptions(candidateQuery.cargoType)
-                        "
-                      >
-                        <el-option
-                          v-for="item in cargoTypeOptions"
-                          :key="item.id || item.cargoName || item.cargoType"
-                          :label="item.cargoName || item.cargoType || item.label"
-                          :value="item.cargoName || item.cargoType || item.label"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="原始单号">
-                      <el-input
-                        v-model="candidateQuery.originalNo"
-                        clearable
-                        placeholder="请输入"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="车/船/航班/班列">
-                      <el-input v-model="candidateQuery.vehicleNo" clearable placeholder="请输入" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="承运商名称">
-                      <el-select
-                        v-model="candidateQuery.carrierName"
-                        clearable
-                        filterable
-                        remote
-                        reserve-keyword
-                        :remote-method="loadCarrierOptions"
-                        :loading="carrierLoading"
-                        placeholder="请输入"
-                        @visible-change="
-                          visible => visible && loadCarrierOptions(candidateQuery.carrierName)
-                        "
-                      >
-                        <el-option
-                          v-for="item in carrierOptions"
-                          :key="item.id || item.fullName || item.customerName || item.carrierName"
-                          :label="
-                            item.fullName || item.customerName || item.carrierName || item.name
-                          "
-                          :value="
-                            item.fullName || item.customerName || item.carrierName || item.name
-                          "
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="司机">
-                      <el-select
-                        v-model="candidateQuery.driverName"
-                        clearable
-                        filterable
-                        remote
-                        reserve-keyword
-                        :remote-method="loadDriverOptions"
-                        :loading="driverLoading"
-                        placeholder="请输入"
-                        @visible-change="
-                          visible => visible && loadDriverOptions(candidateQuery.driverName)
-                        "
-                      >
-                        <el-option
-                          v-for="item in driverOptions"
-                          :key="item.id || item.driverName || item.name"
-                          :label="item.driverName || item.name"
-                          :value="item.driverName || item.name"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="运输方式">
-                      <el-select
-                        v-model="candidateQuery.transportType"
-                        clearable
-                        filterable
-                        placeholder="请选择"
-                        :disabled="dialogMode === 'add'"
-                        @visible-change="visible => visible && loadTransportTypeOptions()"
-                      >
-                        <el-option
-                          v-for="item in transportTypeOptions"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </template>
-                <el-col
-                  :span="candidateSearchVisible ? 24 : 6"
-                  class="loading-manage-dialog__candidate-actions"
-                >
-                  <el-button type="primary" @click="handleCandidateSearch">查询</el-button>
-                  <el-button @click="handleCandidateReset">重置</el-button>
-                  <el-link
-                    type="primary"
-                    @click="candidateSearchVisible = !candidateSearchVisible"
-                    >{{ candidateSearchVisible ? '收起' : '展开' }}</el-link
-                  >
-                </el-col>
-              </el-row>
-            </div>
-          </section-card>
-
           <div title="配载信息" class="loading-manage-dialog__load-info-card">
-            <section-card title="待配载运单">
+            <section-card>
+              <div class="loading-manage-dialog__candidate-search">
+                <el-row :gutter="16">
+                  <el-col :span="6">
+                    <el-form-item label="运单号">
+                      <el-input v-model="candidateQuery.waybillNo" clearable placeholder="请输入" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="项目名称">
+                      <el-select
+                        v-model="candidateQuery.projectName"
+                        clearable
+                        filterable
+                        remote
+                        reserve-keyword
+                        :remote-method="loadProjectOptions"
+                        :loading="projectLoading"
+                        placeholder="请输入"
+                        @visible-change="
+                          visible => visible && loadProjectOptions(candidateQuery.projectName)
+                        "
+                      >
+                        <el-option
+                          v-for="item in projectOptions"
+                          :key="item.id || item.projectName"
+                          :label="item.projectName"
+                          :value="item.projectName"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="发货地址">
+                      <el-input
+                        v-model="candidateQuery.departureAddress"
+                        clearable
+                        placeholder="请输入"
+                      />
+                    </el-form-item>
+                  </el-col>
+                  <template v-if="candidateSearchVisible">
+                    <el-col :span="6">
+                      <el-form-item label="货物名称">
+                        <el-input
+                          v-model="candidateQuery.cargoName"
+                          clearable
+                          placeholder="请输入"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="收货地址">
+                        <el-input
+                          v-model="candidateQuery.arrivalAddress"
+                          clearable
+                          placeholder="请输入"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="客户名称">
+                        <el-select
+                          v-model="candidateQuery.customerName"
+                          clearable
+                          filterable
+                          remote
+                          reserve-keyword
+                          :remote-method="loadCustomerOptions"
+                          :loading="customerLoading"
+                          placeholder="请输入"
+                          @visible-change="
+                            visible => visible && loadCustomerOptions(candidateQuery.customerName)
+                          "
+                        >
+                          <el-option
+                            v-for="item in customerOptions"
+                            :key="item.id || item.customerName"
+                            :label="item.customerName"
+                            :value="item.customerName"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="货物类型">
+                        <el-select
+                          v-model="candidateQuery.cargoType"
+                          clearable
+                          filterable
+                          remote
+                          reserve-keyword
+                          :remote-method="loadCargoTypeOptions"
+                          :loading="cargoTypeLoading"
+                          placeholder="请输入"
+                          @visible-change="
+                            visible => visible && loadCargoTypeOptions(candidateQuery.cargoType)
+                          "
+                        >
+                          <el-option
+                            v-for="item in cargoTypeOptions"
+                            :key="item.id || item.cargoName || item.cargoType"
+                            :label="item.cargoName || item.cargoType || item.label"
+                            :value="item.cargoName || item.cargoType || item.label"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="原始单号">
+                        <el-input
+                          v-model="candidateQuery.originalNo"
+                          clearable
+                          placeholder="请输入"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="车/船/航班/班列">
+                        <el-input
+                          v-model="candidateQuery.vehicleNo"
+                          clearable
+                          placeholder="请输入"
+                        />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="承运商名称">
+                        <el-select
+                          v-model="candidateQuery.carrierName"
+                          clearable
+                          filterable
+                          remote
+                          reserve-keyword
+                          :remote-method="loadCarrierOptions"
+                          :loading="carrierLoading"
+                          placeholder="请输入"
+                          @visible-change="
+                            visible => visible && loadCarrierOptions(candidateQuery.carrierName)
+                          "
+                        >
+                          <el-option
+                            v-for="item in carrierOptions"
+                            :key="item.id || item.fullName || item.customerName || item.carrierName"
+                            :label="
+                              item.fullName || item.customerName || item.carrierName || item.name
+                            "
+                            :value="
+                              item.fullName || item.customerName || item.carrierName || item.name
+                            "
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="司机">
+                        <el-select
+                          v-model="candidateQuery.driverName"
+                          clearable
+                          filterable
+                          remote
+                          reserve-keyword
+                          :remote-method="loadDriverOptions"
+                          :loading="driverLoading"
+                          placeholder="请输入"
+                          @visible-change="
+                            visible => visible && loadDriverOptions(candidateQuery.driverName)
+                          "
+                        >
+                          <el-option
+                            v-for="item in driverOptions"
+                            :key="item.id || item.driverName || item.name"
+                            :label="item.driverName || item.name"
+                            :value="item.driverName || item.name"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="运输方式">
+                        <el-select
+                          v-model="candidateQuery.transportType"
+                          clearable
+                          filterable
+                          placeholder="请选择"
+                          :disabled="dialogMode === 'add'"
+                          @visible-change="visible => visible && loadTransportTypeOptions()"
+                        >
+                          <el-option
+                            v-for="item in transportTypeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                          />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </template>
+                  <el-col
+                    :span="candidateSearchVisible ? 24 : 6"
+                    class="loading-manage-dialog__candidate-actions"
+                  >
+                    <el-button type="primary" @click="handleCandidateSearch">查询</el-button>
+                    <el-button @click="handleCandidateReset">重置</el-button>
+                    <el-link
+                      type="primary"
+                      @click="candidateSearchVisible = !candidateSearchVisible"
+                      >{{ candidateSearchVisible ? '收起' : '展开' }}</el-link
+                    >
+                  </el-col>
+                </el-row>
+              </div>
               <el-table
                 ref="candidateTableRef"
                 v-loading="candidateLoading"
@@ -843,27 +843,43 @@
                   show-overflow-tooltip
                 >
                   <template #default="{ row }">
-                    {{ formatCandidateWaybillValue(row, 'goodsInfo') }}
+                    {{ formatCandidateGoodsInfo(row) }}
                   </template>
                 </el-table-column>
                 <el-table-column
                   prop="departureAddress"
                   label="发货地址"
                   min-width="220"
-                  show-overflow-tooltip
                 >
                   <template #default="{ row }">
-                    {{ formatCandidateAddress(row, 'departure') }}
+                    <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 }">
-                    {{ formatCandidateAddress(row, 'arrival') }}
+                    <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
@@ -995,20 +1011,36 @@
                     prop="departureAddress"
                     label="发货地"
                     min-width="220"
-                    show-overflow-tooltip
                   >
                     <template #default="{ row }">
-                      {{ formatWaybillAddress(row, 'departure') }}
+                      <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 }">
-                      {{ formatWaybillAddress(row, 'arrival') }}
+                      <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 label="操作" width="110" fixed="right">
@@ -1825,6 +1857,7 @@ 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]);
@@ -1833,14 +1866,130 @@ 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 value = row?.[`${type}Address`] || row?.[`${type}Name`] || '';
-      return this.formatProvinceCityDistrict(value) || '-';
+      const prefix = type === 'departure' ? 'departure' : 'arrival';
+      const name = String(row?.[`${prefix}Name`] || '').trim();
+      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 [];
@@ -2462,10 +2611,6 @@ export default {
       if (['road', '公路运输'].includes(normalized)) return 'road,公路运输';
       return value || '';
     },
-    openCandidateSearch() {
-      this.candidateSearchVisible = true;
-      this.loadCandidateWaybills();
-    },
     handleCandidateSearch() {
       this.candidatePage.currentPage = 1;
       this.loadCandidateWaybills();
@@ -2567,11 +2712,11 @@ export default {
       };
       rows.forEach((row, rowIndex) => {
         const departure = row.departureAddress || row.departureName;
-        appendNode(departure, this.formatWaybillAddress(row, 'departure'), `装${rowIndex + 1}`);
+        appendNode(departure, this.formatCandidateAddress(row, 'departure'), `装${rowIndex + 1}`);
       });
       rows.forEach((row, rowIndex) => {
         const arrival = row.arrivalAddress || row.arrivalName;
-        appendNode(arrival, this.formatWaybillAddress(row, 'arrival'), `卸${rowIndex + 1}`);
+        appendNode(arrival, this.formatCandidateAddress(row, 'arrival'), `卸${rowIndex + 1}`);
       });
       return [...nodeMap.values()].map((node, index) => ({
         ...node,
@@ -3266,8 +3411,8 @@ export default {
   }
 
   .loading-manage-dialog__candidate-search {
-    padding: 4px 0;
-    margin-bottom: 8px;
+    padding: 0;
+    margin-bottom: 0;
   }
 
   .loading-manage-dialog__waybill-route-layout {
diff --git a/src/views/business/waybill-import.vue b/src/views/business/waybill-import.vue
index 3da42f9..4b56e6e 100644
--- a/src/views/business/waybill-import.vue
+++ b/src/views/business/waybill-import.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-container class="waybill-import-page-container">
-    <div class="waybill-import-page-title">导入运单</div>
     <waybill-import-dialog standalone />
   </basic-container>
 </template>
@@ -11,28 +10,14 @@ 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>
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index aac5268..edad1f7 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -22,6 +22,14 @@
       @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"
@@ -120,7 +128,15 @@
 </template>
 
 <script>
-import { getLazyList, remove, update, add, getDept, getDeptTree } from '@/api/system/dept';
+import {
+  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';
@@ -152,6 +168,7 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
+      iamSyncLoading: false,
       parentId: 0,
       page: {
         pageSize: 10,
@@ -691,6 +708,26 @@ 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('请选择至少一条数据');

From 17c482e21aa384856303e235b748332241e70520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Sep 2026 14:47:29 +0800
Subject: [PATCH 05/28] =?UTF-8?q?feat(waybill):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=89=93=E5=8D=A1=E6=97=B6=E9=97=B4=E8=BD=B4=E6=8C=89=E6=89=93?=
 =?UTF-8?q?=E5=8D=A1=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 computed 属性 orderedWaybillPunchRecords，按打卡时间升序排序已打卡记录
- 未打卡记录保持后端返回的节点顺序，排在已打卡记录之后
- 引入方法 waybillPunchRecordTimestamp 解析打卡时间，支持多种日期格式
- 修正 el-timeline v-for 使用 orderedWaybillPunchRecords 避免 key 冲突
- 保持原有流程节点顺序不变，仅调整时间轴展示顺序
---
 .workbuddy/memory/2026-09-17.md               | 12 ++++++
 .../components/waybill-manage-page.vue        | 42 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 .workbuddy/memory/2026-09-17.md

diff --git a/.workbuddy/memory/2026-09-17.md b/.workbuddy/memory/2026-09-17.md
new file mode 100644
index 0000000..77aa92a
--- /dev/null
+++ b/.workbuddy/memory/2026-09-17.md
@@ -0,0 +1,12 @@
+# 2026-09-17 工作日志
+
+## 运单管理详情：打卡时间轴改为按打卡顺序展示
+
+- 文件：`src/views/business/components/waybill-manage-page.vue`（详情页「执行详情 → 打卡详情」tab）
+- 需求：时间轴不再固定按流程节点顺序（发货/在途/到货/卸货/签收/回单），改为按打卡时间先后展示。
+- 实现（不改后端、不改原始数据）：
+  1. 新增 computed `orderedWaybillPunchRecords`：映射出 `punchedAt`（毫秒时间戳）后排序 —— **已打卡记录按打卡时间升序排在前**，未打卡记录保持后端返回的节点顺序排在其后；时间相同用原索引稳定排序。
+  2. 新增 method `waybillPunchRecordTimestamp(record)`：`punched === false` 或 `statusName === '未打卡'` 直接返回 null（防止后端返回计划时间造成误序）；优先 `this.$dayjs(text).valueOf()`，失败兜底 `new Date(text.replace(/-/g,'/'))`（兼容 Safari）。
+  3. 模板 `el-timeline` 的 `v-for` 改用 `orderedWaybillPunchRecords`；`key` 由 `record.nodeCode || record.id || index` 改为 `${nodeCode||id||'punch'}-${index}`，避免同节点多次打卡（在途）时 key 重复。
+- 校验：项目根目录临时脚本 `_verify-sfc.mjs`（@vue/compiler-sfc parse + compileScript + compileTemplate）通过，已删除脚本。
+- 注意：`getPunchRecords`（`src/api/business/waybill-manage.js` → `/punch-records`）后端未提供节点排序字段，排序只能在前端做。
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 42dffde..959f7b2 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -1923,6 +1923,12 @@
                     }}</strong
                   >
                 </div>
+                <div
+                  v-if="!waybillIsCarrier(detailRow)"
+                  class="waybill-manage-page__waybill-detail-field"
+                >
+                  <span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
+                </div>
               </template>
               <template v-else-if="waybillIsNonRoadTransport(detailRow)">
                 <div class="waybill-manage-page__waybill-detail-field">
@@ -2029,8 +2035,8 @@
                   <div v-loading="waybillPunchRecordsLoading">
                     <el-timeline v-if="waybillPunchRecords.length">
                       <el-timeline-item
-                        v-for="(record, index) in waybillPunchRecords"
-                        :key="record.nodeCode || record.id || index"
+                        v-for="(record, index) in orderedWaybillPunchRecords"
+                        :key="`${record.nodeCode || record.id || 'punch'}-${index}`"
                         :timestamp="record.punchTime || record.statusName || '未打卡'"
                         :type="record.punched ? 'primary' : 'info'"
                         :color="record.punched ? '#2b6ce8' : '#c0c4cc'"
@@ -3545,6 +3551,25 @@ export default {
         addBtn: this.canCreate,
       };
     },
+    // 打卡时间轴按打卡时间先后展示：已打卡记录按打卡时间升序在前，
+    // 未打卡记录保持流程节点原顺序排在其后。
+    orderedWaybillPunchRecords() {
+      const records = Array.isArray(this.waybillPunchRecords) ? this.waybillPunchRecords : [];
+      return records
+        .map((record, index) => ({
+          record,
+          index,
+          punchedAt: this.waybillPunchRecordTimestamp(record),
+        }))
+        .sort((a, b) => {
+          const aPunched = a.punchedAt !== null;
+          const bPunched = b.punchedAt !== null;
+          if (aPunched && bPunched) return a.punchedAt - b.punchedAt || a.index - b.index;
+          if (aPunched !== bPunched) return aPunched ? -1 : 1;
+          return a.index - b.index;
+        })
+        .map(item => item.record);
+    },
     isStandaloneWaybillPage() {
       return this.standaloneFormPage && standaloneWaybillFormPaths.includes(this.$route.path);
     },
@@ -4492,6 +4517,19 @@ export default {
         })
         .catch(() => []);
     },
+    // 解析打卡时间（支持常见日期字符串格式），未打卡或无有效时间返回 null
+    waybillPunchRecordTimestamp(record = {}) {
+      if (record.punched === false || record.statusName === '未打卡') return null;
+      const raw = record.punchTime || record.punchAt || record.punchDateTime || '';
+      const text = String(raw).trim();
+      if (!text) return null;
+      const parsed = this.$dayjs ? this.$dayjs(text) : null;
+      if (parsed && typeof parsed.isValid === 'function' && parsed.isValid()) {
+        return parsed.valueOf();
+      }
+      const fallback = new Date(text.replace(/-/g, '/')).getTime();
+      return Number.isNaN(fallback) ? null : fallback;
+    },
     loadWaybillPunchRecords() {
       const waybillId = this.detailRow?.id;
       if (!waybillId || this.waybillPunchRecordsLoading) return;

From 82fbb99593d557c51858ecdfeaf87cda9dc72483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Sep 2026 14:59:26 +0800
Subject: [PATCH 06/28] =?UTF-8?q?fix(payment):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=8F=8A=E6=94=B6=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8F=90=E7=A4=BA=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 简化合并开票结算单的合同限制提示文案
- 调整发票申请表单搜索区域的内容左对齐样式
- 修正发票收据表单关键词输入框的占位符文字错误
---
 src/views/payment/invoice-application-form.vue | 4 ++--
 src/views/payment/invoice-receipt-form.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 8c6d212..bbb0e84 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -882,7 +882,7 @@ export default {
           item.receiverName !== first.receiverName
       );
       if (incompatible) {
-        this.$message.warning('合并开票的结算单必须属于同一合同、项目、组织及收付款方');
+        this.$message.warning('合并开票的结算单必须属于同一合同');
         return;
       }
       this.form.settlements = rows.map(item => ({
@@ -1260,7 +1260,7 @@ export default {
 }
 .invoice-form-page__dialog-search {
   display: flex;
-  justify-content: flex-end;
+  justify-content: flex-start;
   gap: 8px;
   margin-bottom: 12px;
 }
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue
index c74498f..965a168 100644
--- a/src/views/payment/invoice-receipt-form.vue
+++ b/src/views/payment/invoice-receipt-form.vue
@@ -216,7 +216,7 @@
         <el-input
           v-model="settlementDialog.keyword"
           clearable
-          placeholder="结算单号、项目或合同"
+          placeholder="3结算单号、项目或合同"
           @keyup.enter="loadSettlementCandidates"
         />
         <el-button type="primary" @click="loadSettlementCandidates">查询</el-button>

From 3d6e2971478475dc4605c7957b0e5f144a193623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Sep 2026 21:21:33 +0800
Subject: [PATCH 07/28] =?UTF-8?q?feat(vehicle):=20=E5=BD=92=E4=B8=80?=
 =?UTF-8?q?=E5=8C=96=E4=BF=9D=E9=99=A9=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 保险记录批量导入时，前端读取 Excel 并规范日期格式为 YYYY-MM-DD，兼容多种日期写法
- 重写 `handleImport` 支持自定义上传逻辑，调用归一化处理后再上传文件
- 添加日期归一化相关方法，确保不合法或已标准格式保持原值
- 设备台账界面新增批量删除按钮及相关逻辑，支持多选数据批量删除并提示确认
- 补充导出含创建时间和更新时间的后端修复说明，避免导出时间字段为空问题
- 说明后端导出分配逻辑，强调导出字段由后端控制，前端修改导出列无效
---
 .workbuddy/memory/2026-09-17.md        | 24 +++++++
 .workbuddy/memory/MEMORY.md            |  6 ++
 src/views/vehicle/equipment-ledger.vue | 26 +++++++
 src/views/vehicle/insurance-record.vue | 93 +++++++++++++++++++++++++-
 4 files changed, 147 insertions(+), 2 deletions(-)

diff --git a/.workbuddy/memory/2026-09-17.md b/.workbuddy/memory/2026-09-17.md
index 77aa92a..ac38a75 100644
--- a/.workbuddy/memory/2026-09-17.md
+++ b/.workbuddy/memory/2026-09-17.md
@@ -10,3 +10,27 @@
   3. 模板 `el-timeline` 的 `v-for` 改用 `orderedWaybillPunchRecords`；`key` 由 `record.nodeCode || record.id || index` 改为 `${nodeCode||id||'punch'}-${index}`，避免同节点多次打卡（在途）时 key 重复。
 - 校验：项目根目录临时脚本 `_verify-sfc.mjs`（@vue/compiler-sfc parse + compileScript + compileTemplate）通过，已删除脚本。
 - 注意：`getPunchRecords`（`src/api/business/waybill-manage.js` → `/punch-records`）后端未提供节点排序字段，排序只能在前端做。
+
+## 保险记录批量导入：前端归一化日期格式
+
+- 文件：`src/views/vehicle/insurance-record.vue`（仅此一个文件）
+- 背景：保险记录批量导入是**后端驱动**——前端 `handleImport` 经 `importBlob` 把原始 Excel 直接 POST 到 `/blade-transport/insurance-record/import-insurance-record`，前端不解析行。后端只认 `2026-09-01`，`2026-9-1` 导入失败。
+- 决策：用户选择**前端归一化**（不动后端）。把 `openImportDialog` 改为自写 `httpRequest`：用 `xlsx` 读取 Excel → 把日期列（开始日期/结束日期/开票日期）`2026-9-1` 归一为 `2026-09-01` → 重写成新 File 再交给 `handleImportExcel` 上传；复用其失败明细下载与成功刷新逻辑。无日期列时回退为原文件（行为不变）。
+- 关键方法：`normalizeExcelDates` / `readExcelRows` / `writeExcelFile` / `normalizeDateString`（正则 `^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$`，用 `new Date` 校验合法性后补零；非法/已标准格式返回 null 保持原值）。
+- 校验：本机 dev（localhost:2889）待用户部署自测。注意所有单元格经 `sheet_to_json(raw:false)` 后均为字符串，与 transport-plan-import 的客户端解析模式一致。
+
+## 车/船务模块导出 xlsx「创建时间/更新时间」为空（后端 tms-api 修复）
+
+- 现象：`/vehicle/insurance-record` 批量导出的 xlsx 里「创建时间」「更新时间」两列空白，「更新人」有值。用户要求车/船务模块所有页面统一修。
+- 定位：导出由**后端**生成（前端只传查询参数，`exportColumns` 参数后端未使用）。实测 `~/Downloads/保险记录2026-09-17 20_46_08.xlsx`：K/M 列单元格无 `<v>` 节点（值 null），E/F/J 日期列是数值 46266.0（带 numFmt `yyyy-MM-dd`，WPS 显示为日期）。
+- 根因：Service 用 BladeX `org.springblade.core.tool.utils.BeanUtil`（**继承 Spring `BeanUtils`**）做 `copyProperties`。实体 `TenantEntity.createTime/updateTime` 是 `java.util.Date`，导出类字段是 `java.time.LocalDateTime` → Spring BeanUtils **类型不兼容静默跳过**，值为 null。而「更新人」是手动 `UserCache.getUserRealName(...)` 赋值的，所以有值。（Hutool 的 BeanUtil 能转 Date→LocalDateTime，但本项目用的是 BladeX 版本，不能。）
+- 佐证：项目里正常的导出（Waybill / LoadingManage / CustomerArchive / CommonCargo）时间字段一律用 `java.util.Date`，并在 Service 里手动 `excel.setCreateTime(record.getCreateTime())`。
+- 修复（后端仓库 `/Users/gxwebsoft/JAVA/tms-api`，blade-transport 模块）：在 13 个导出方法里补显式赋值（Date→LocalDateTime 用 BladeX `DateUtil.fromDate`，`Func.isEmpty` 判空），不改 Excel 类字段类型（避免影响自定义 converter 与导入模板）。
+  ```java
+  excel.setCreateTime(Func.isEmpty(x.getCreateTime()) ? null : DateUtil.fromDate(x.getCreateTime()));
+  excel.setUpdateTime(Func.isEmpty(x.getUpdateTime()) ? null : DateUtil.fromDate(x.getUpdateTime()));
+  ```
+- 涉及文件（13 个 Service + 1 新建 Excel 类 + 设备台账 controller/接口）：InsuranceRecord / ViolationRecord / MaintenanceRecord / MaintenancePlan / TireReplacementRecord / AccidentRecord / AnnualInspectionRecord / MileageRecord / TransportChangeRecord / EtcRecord / OilElectricRecord / OtherExpenseRecord / EquipmentLedger。
+- 设备台账特殊：原 `EquipmentLedgerExcel` 根本没有审计列（前端列表有），新建 `EquipmentLedgerExportExcel extends EquipmentLedgerExcel`（创建时间/更新人/更新时间），导出链路改用新类，**导入模板仍用旧类不受影响**。
+- 未验证：本机无 mvn（仅 IDEA 内置），且离线模式缺 `blade-bom` 无法编译；用 javap 确认 `DateUtil.fromDate(Date)` 存在 + 逐行 grep 复核代替。需用户在 IDEA 里编译并重新部署后自测。
+- 同类隐患（本次未改，其他模块）：TemporaryCreditLimit、ProcessConfig、CommonRoute、CommonAddress、ContractManage、ProjectApply、ShippingTemplate 的导出 Excel 也是 LocalDateTime 且未手动 set 时间。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index f6252f5..6543ad6 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -111,3 +111,9 @@
 - option 由 prop `crudOption` 经 `cloneOption` 克隆。
 - 独立表单页走 `PageAvueForm`，不包 el-dialog。
 - 自定义详情弹窗：`config.detailButton=true` + `detailSections:[{title, fields}]`。
+
+## 配套后端工程与导出字段约定
+- **本前端工程 tms-erp-web-ws 对应的后端是 `/Users/gxwebsoft/JAVA/tms-api`**（不是 `tms-erp-api-ws`，后者功能滞后，排查时不要看错仓库）。
+- 所有列表导出（批量导出/下载模板）由后端 FastExcel 生成，前端 `exportColumns` 参数后端未使用 —— 导出列以 `XxxExportExcel.java` 为准，前端改 option 不影响导出。
+- BladeX `org.springblade.core.tool.utils.BeanUtil` **继承 Spring `BeanUtils`**：字段类型不兼容时**静默跳过**（实体 `Date createTime` → Excel `LocalDateTime createTime` 会丢值）。所以 Excel 导出的审计时间必须在 Service 里手动赋值，并用 `DateUtil.fromDate(...)` 做 Date→LocalDateTime 转换（`Func.isEmpty` 判空）。参考写法见 Waybill/InsuranceRecord 的 `exportXxx()`。
+- 排查导出文件问题：用 Python 标准库 `zipfile` + 解析 `xl/worksheets/sheet1.xml`、`xl/styles.xml` 直接看单元格有无 `<v>` 与 numFmt，无需装 openpyxl。
diff --git a/src/views/vehicle/equipment-ledger.vue b/src/views/vehicle/equipment-ledger.vue
index f4d25cb..6c4c646 100644
--- a/src/views/vehicle/equipment-ledger.vue
+++ b/src/views/vehicle/equipment-ledger.vue
@@ -21,6 +21,15 @@
       @on-load="onLoad"
     >
       <template #menu-left>
+        <el-button
+          v-if="hasPermission('equipment_ledger_delete')"
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
         <el-button
           v-if="hasPermission('equipment_ledger_import')"
           type="primary"
@@ -310,6 +319,23 @@ export default {
           this.$message.success('操作成功');
         });
     },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确认删除选中的数据？删除后将不可恢复！', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(this.ids))
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message.success('操作成功');
+          this.$refs.crud.toggleSelection();
+        });
+    },
     beforeOpen(done, type) {
       this.boxType = type;
       if (type === 'add') {
diff --git a/src/views/vehicle/insurance-record.vue b/src/views/vehicle/insurance-record.vue
index 292e3a6..4c090eb 100644
--- a/src/views/vehicle/insurance-record.vue
+++ b/src/views/vehicle/insurance-record.vue
@@ -217,7 +217,7 @@ import { getList as getOcrTemplateList } from '@/api/base/insurance-ocr-template
 import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
-import { openImportDialog } from '@/utils/import-excel';
+import { handleImportExcel } from '@/utils/import-excel';
 import { getToken } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
 import { normalizeSearchRangeParams } from '@/utils/search-range';
@@ -540,7 +540,96 @@ export default {
         });
     },
     handleImport() {
-      openImportDialog(this, '保险记录');
+      const column = this.findColumn(this.excelOption.column, 'excelFile');
+      if (!column) {
+        this.$message.error('导入配置异常，请稍后重试');
+        return;
+      }
+      // 上传前先归一化日期列（2026-9-1 → 2026-09-01），兼容两种格式
+      column.httpRequest = async (uploadOption, uploadColumn) => {
+        try {
+          const normalizedFile = await this.normalizeExcelDates(uploadOption.file);
+          await handleImportExcel(
+            this,
+            { ...uploadOption, file: normalizedFile },
+            uploadColumn,
+            '保险记录',
+            null,
+            { timeout: 60000 }
+          );
+        } catch (error) {
+          this.$message.error(error.message || '导入失败');
+          if (typeof uploadOption.onError === 'function') {
+            uploadOption.onError(error);
+          }
+        }
+      };
+      this.excelBox = true;
+    },
+    // 读取 Excel，把指定日期列统一归一化为 YYYY-MM-DD，再写回新文件
+    async normalizeExcelDates(file) {
+      const rows = await this.readExcelRows(file);
+      const dateHeaders = ['开始日期', '结束日期', '开票日期'];
+      const headerIndex = (rows[0] || []).reduce((map, label, index) => {
+        const key = String(label || '').trim();
+        if (key) map[key] = index;
+        return map;
+      }, {});
+      const targetIndexes = dateHeaders
+        .map(label => headerIndex[label])
+        .filter(index => index !== undefined);
+      if (!targetIndexes.length) return file;
+      rows.forEach((row, rowIndex) => {
+        if (rowIndex === 0) return;
+        targetIndexes.forEach(index => {
+          if (row[index] !== undefined && row[index] !== '') {
+            const normalized = this.normalizeDateString(String(row[index]));
+            if (normalized) row[index] = normalized;
+          }
+        });
+      });
+      return this.writeExcelFile(rows, file.name);
+    },
+    async readExcelRows(file) {
+      const XLSX = await import('xlsx');
+      const buffer = await file.arrayBuffer();
+      const workbook = XLSX.read(buffer, { type: 'array', cellDates: false });
+      const worksheet = workbook.Sheets[workbook.SheetNames[0]];
+      return XLSX.utils.sheet_to_json(worksheet, {
+        header: 1,
+        defval: '',
+        raw: false,
+        blankrows: false,
+      });
+    },
+    async writeExcelFile(rows, fileName) {
+      const XLSX = await import('xlsx');
+      const workbook = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(workbook, XLSX.utils.aoa_to_sheet(rows), 'Sheet1');
+      const binary = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+      return new File([binary], fileName || 'insurance-record.xlsx', {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      });
+    },
+    // 兼容 YYYY-M-D / YYYY-MM-DD / YYYY/M/D / YYYY.年.月.日，非法或已标准格式原样返回 null
+    normalizeDateString(value) {
+      const text = String(value || '').trim();
+      if (!text) return null;
+      const match = text.match(/^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$/);
+      if (!match) return null;
+      const year = Number(match[1]);
+      const month = Number(match[2]);
+      const day = Number(match[3]);
+      const date = new Date(year, month - 1, day);
+      if (
+        date.getFullYear() !== year ||
+        date.getMonth() !== month - 1 ||
+        date.getDate() !== day
+      ) {
+        return null;
+      }
+      const pad = n => String(n).padStart(2, '0');
+      return `${year}-${pad(month)}-${pad(day)}`;
     },
     handleExport() {
       this.$confirm('是否导出保险记录数据?', '提示', {

From 5bb072223f0e763ceda1bcc2ae2ab57c4bf7c301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Sep 2026 22:40:41 +0800
Subject: [PATCH 08/28] =?UTF-8?q?feat(loading-manage):=20=E9=85=8D?=
 =?UTF-8?q?=E8=BD=BD=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85=E5=8F=8A=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=B4=BE=E5=8D=95=E6=94=B9=E7=94=A8=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 `/business/loading-manage/detail` 路由，详情页由独立页面承载
- 统一将新增、编辑、详情和重新派单均采用独立表单页/详情页显示
- 修改组件内逻辑，新增 `isStandalonePage` 计算属性统一控制页面与弹窗切换
- 修改列表页链接及操作行为，详情和重新派单按钮跳转至对应独立页面
- 去除旧详情弹窗模式，相关样式调整支持独立页面自然滚动
- 添加路由监听，支持页面刷新和切换时正确初始化详情或表单数据
- 兼容老链接 `/business/loading-manage?detailId=x` 自动跳详情新路由
- 修正弹窗底栏样式，去除写死间距，统一由全局规则控制
- 代码中禁止顶层 scoped style 使用 `//` 注释，改用 `/* */` 避免编译错误
---
 .workbuddy/memory/2026-09-17.md               |  27 ++++
 .workbuddy/memory/MEMORY.md                   | 145 ++++-------------
 src/router/views/index.js                     |  12 ++
 .../components/waybill-manage-page.vue        |   5 +-
 src/views/business/loading-manage.vue         | 151 +++++++++++++-----
 5 files changed, 185 insertions(+), 155 deletions(-)

diff --git a/.workbuddy/memory/2026-09-17.md b/.workbuddy/memory/2026-09-17.md
index ac38a75..1fb0550 100644
--- a/.workbuddy/memory/2026-09-17.md
+++ b/.workbuddy/memory/2026-09-17.md
@@ -1,5 +1,23 @@
 # 2026-09-17 工作日志
 
+## 配载管理（loading-manage）：弹窗全部改为独立表单页/详情页
+
+- 需求：`/business/loading-manage` 不再用弹窗，改成与新增合同（`/business/contract-manage/form?mode=add&name=新增合同管理`）一致的独立页面。
+- 现状：新增/编辑**已经**是独立页（组件内 `isStandaloneFormPage` + `/business/loading-manage/form` 路由），但「详情」和「重新派单」仍是 el-dialog（用户截图即详情弹窗）。
+- 改动（3 个文件）：
+  1. `src/router/views/index.js`：新增 `/business/loading-manage/detail`（name 配载单详情，`meta.keepAlive:false, activeMenu:'/business/loading-manage'`），组件仍是 `loading-manage.vue`。
+  2. `src/views/business/loading-manage.vue`：
+     - computed 新增 `isStandaloneDetailPage`（path==='/business/loading-manage/detail'）、`isStandalonePage`（form|detail 并集，作为隐藏列表容器的统一开关）、`detailPageTitle`、`formPageDefaultTitle`（add/edit/reassign 映射）；`isStandaloneFormPage` 放行 `mode=reassign`。
+     - 模板中所有控制「是否独立页/是否弹窗」的 `isStandaloneFormPage` 改为 `isStandalonePage`；顶部标题按详情/表单取 `detailPageTitle`/`formPageTitle`。
+     - 新增 `gotoLoadingDetail(row)`（push `/detail?id=&name=配载单详情`，替换「配载单号」链接与操作列「详情」）、`gotoLoadingReassign(row)`（push `/form?mode=reassign&id=&name=重新派单`）、`initStandaloneDetailPage()`；`initStandaloneFormPage` 模式透传 edit/reassign；`openLoadingDialog` 对 add/edit/reassign 一律转独立页；`closeLoadingDialog` 判据改 `isStandalonePage`。
+     - `mounted` / `watch $route` 增加详情页分支（直接打开与页内切换都要 init）；detail 分支除 id 变化外，`dialogMode !== 'view'` 也重新 init（防止从表单页切详情时残留表单态）。
+     - 兼容旧链接：`/business/loading-manage?detailId=x` 仍可用，会 replace 到详情页。
+     - 样式：底栏去掉写死的 `gap:8px`（全站统一 12px）；页面模式的内容区解除 `max-height:78vh` 内嵌滚动盒 —— 原 `:global(.loading-manage-form-page .loading-manage-dialog__body)` 权重 (0,2,0) 低于 scoped 规则 (0,3,0) 一直没生效，改为 `.loading-manage-page .loading-manage-form-dialog.loading-manage-form-page .loading-manage-dialog__body` (0,4,0)，内容改随 `#avue-view` 自然滚动（与合同页一致）。
+  3. `src/views/business/components/waybill-manage-page.vue`：`openLoadingDetail` 由 `/business/loading-manage?detailId=` 改为 push `/business/loading-manage/detail?id=&name=配载单详情`。
+- 校验：dev server（2889）单独编译 4 个模块均 HTTP 200（含 scoped scss）；`vite build` 仍会在无关文件 `src/page/login/facelogin.vue` 被沙箱敏感内容保护中断。
+- 踩坑：**`<style scoped lang="scss">` 顶层写 `//` 注释**会让该样式模块编译 500（`Unexpected '/'. Escaping special characters with \ may help.`），已实测确认；顶层必须用 `/* */`。
+- 未做：登录态无法在浏览器实测（无测试账号），需用户点 `/business/loading-manage` → 详情/重新派单 自测；`voucher-manage-detail` 跳配载时带的 `?loadingNo=` 参数本来就未被列表消费（历史遗留）。
+
 ## 运单管理详情：打卡时间轴改为按打卡顺序展示
 
 - 文件：`src/views/business/components/waybill-manage-page.vue`（详情页「执行详情 → 打卡详情」tab）
@@ -34,3 +52,12 @@
 - 设备台账特殊：原 `EquipmentLedgerExcel` 根本没有审计列（前端列表有），新建 `EquipmentLedgerExportExcel extends EquipmentLedgerExcel`（创建时间/更新人/更新时间），导出链路改用新类，**导入模板仍用旧类不受影响**。
 - 未验证：本机无 mvn（仅 IDEA 内置），且离线模式缺 `blade-bom` 无法编译；用 javap 确认 `DateUtil.fromDate(Date)` 存在 + 逐行 grep 复核代替。需用户在 IDEA 里编译并重新部署后自测。
 - 同类隐患（本次未改，其他模块）：TemporaryCreditLimit、ProcessConfig、CommonRoute、CommonAddress、ContractManage、ProjectApply、ShippingTemplate 的导出 Excel 也是 LocalDateTime 且未手动 set 时间。
+
+## 保险记录保额 -1 问题排查（未结案，待用户验证 DB 环境）
+
+- 症状：新增弹窗保额不填 → 再开编辑弹窗显示 -1，触发「不能小于 0」校验。
+- 已排除：前端（源码/dist 构建/git 全历史）、后端 tms-api + tms-erp-api-ws（源码/编译产物 javap/git 历史）均无任何 -1 赋值逻辑；保额为 formslot el-input，空值传 ''。
+- 关键链路：编辑弹窗 beforeOpen 走 `/detail` 接口（getOne 原生查询），**不经过**列表 SQL 的 `CASE WHEN insured_amount<0 THEN 0` 兜底——所以表格显示 0、弹窗显示原始值。
+- 数据库截图（用户 Navicat）：该行 insured_amount=NULL，全表无负数 → 说明用户浏览的库与后端实际连接的库**不是同一个/DDL 不一致**。系统存在「空数值=-1」惯例（MaintenanceRecordMapper 里程 `CASE WHEN mileage=-1 THEN NULL`；前端 waybill-manage.js/process-config.js 均有 `Number(v)===-1?'':v` 掩码）→ 后端真实库的 insured_amount 列默认值很可能是 -1，MP 插入排除 null 列 → 默认值 -1 入库。
+- 待验证：在后端 Nacos 数据源指向的库执行 `SHOW CREATE TABLE blade_insurance_record` + `SELECT insured_amount FROM blade_insurance_record WHERE policy_no='11111' AND vehicle_no='沪AE31312'`。
+- 修复方案（待确认）：1) ALTER 列默认值改 NULL + UPDATE 存量负数为 NULL；2) 前端 beforeOpen 对 insuredAmount/premium 做 null/-1 → '' 归一（参照 waybill-manage normalizeNumericDisplayValue）；3) 列表 SQL 的 CASE 兜底与 detail 不一致，可顺手统一。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index 6543ad6..79fd549 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -1,119 +1,38 @@
-# 项目长期记忆（tms-erp-web-ws / Saber3 客商模块）
+# 项目长期记忆（tms-erp-web-ws / Saber3）
 
-## 设计约定（已确认）
+配套后端：`/Users/gxwebsoft/JAVA/tms-api`（不是 tms-erp-api-ws，后者功能滞后）。
 
-### 表单 placeholder 统一为「请输入 / 请选择」（不带字段名）
-- **规范**：输入框 placeholder 只写动作词 `请输入` / `请选择`，**后面不跟字段名称**（label 已说明是什么字段，重复无意义）。
-- 已生效页面：waybill-manage、transport-plan、shipping-template、temporary-credit-limit（搜索栏 + 弹窗表单）、**driver.vue**（2026-09-09 补齐 18 处）。
-- **3 类例外必须保留，不要误简化**：
-  1. 复合操作：如 `请输入或选择车辆`（既可键盘输入又可点按钮弹窗选车），丢掉会损失语义。
-  2. 日期区间的 `起` / `止`：是起止标记，不是字段提示。
-  3. 默认值说明：如资格证号 `默认身份证号`、车牌号 `如：京A12345`，属于示例/默认值提示，非「请输入」格式。
-- **校验错误提示 message 保持带字段名**（如「请选择准驾车型」「请输入档案编号」），与 placeholder 定位不同——报错必须指明具体哪个字段，不能只说「请选择」。
-- Avue 配置化表单：在 option 各列加 `placeholder`；搜索栏可用通用工具 `withSearchPlaceholders([...])`（见 temporary-credit-limit.js）。
-- 批量改法：Python 脚本按**完整 placeholder 字符串**做精确替换，每规则校验 `count > 0` 否则中断，避免误伤；改完用 `@vue/compiler-sfc` 的 parse + compileTemplate + compileScript 验证（脚本须放项目根目录下跑，放 /tmp 解析不到 node_modules）。
+## 页面结构：列表 + 独立表单页 + 独立详情页（同一组件分流）
+- `src/router/views/index.js` 里三条静态/菜单路由指向同一个 .vue：`/xxx`（后端菜单）、`/xxx/form`、`/xxx/detail`；form/detail 都是 `component: Layout` + 空 children，`meta: { keepAlive: false }`，detail 额外带 `activeMenu: '/xxx'`。
+- 组件内按 `$route.path` 分流（如 `isFormPage` / `isDetailPage` / `isListPage`），列表部分统一 `v-if="!isStandalonePage"` 隐藏搜索栏/工具栏/表格/分页。
+- 路由记录不同但组件相同 → Vue 复用实例，所以**必须**在 `watch: { $route(to, from) }` 里重新 init；`mounted` 只覆盖「直接打开/刷新」场景。切换详情与表单时不要只比 id，还要看当前 `dialogMode` 是否匹配。
+- 跳转：`this.$router.push({ path: '/xxx/form', query: { mode, id, name: '新增xxx' } })`；标签标题由 avue-router 取 `query.name`。关闭：`this.$router.$avueRouter?.closeTag?.()` + push 列表。
+- 已按此模式：contract-manage（form+detail）、waybill-manage、loading-manage（新增/编辑/重新派单/详情，2026-09-17 完成）。
+- 底栏文案：只读详情页用「关闭」；表单页沿用「关闭/暂存/确认」。
 
-### 弹窗分组：统一用全局 `<section-card>`
-- 弹窗 body 背景由 `src/styles/element-ui.scss` 全局 `.el-dialog__body { background:#f5f6fa; padding:16px }` 统一灰底。
-- 每组 = 白底卡片：4px 主色竖条 + 8px 间距 + 圆角 6px + 淡阴影。组件全局注册 `<section-card title="...">`，支持 `#title` / `#extra` slot。
-- 仅 3 项的小分组用 `el-col :span="8"` 均分一行。
+## 样式硬规则
+- 底部操作栏：`display:flex; justify-content:flex-end;`，**不写 gap**（间距由 Element Plus 默认 `.el-button+.el-button{margin-left:12px}` 提供）。⚠️ 浮动底栏必须 `position:fixed`（祖先 overflow:hidden 让 sticky 失效），配套 `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包住整个选择器。
+- 按钮层级：次要 = 不写 type；中间步骤 = `type="primary" plain`；主操作 = `type="primary"`（禁绿色 success，禁两个蓝实心）。顺序 `[辅助工具][取消][保存草稿][提交]`。
+- ⚠️ **`<style scoped lang="scss">` 顶层禁止 `//` 行注释**：Vite5 + sass modern-compiler + scoped 会报 `Unexpected '/'.`，样式模块直接 HTTP 500（块内的 `//` 正常）。顶层统一用 `/* */`。
+- 独立页顶部标题用 `.archive-page-form__title`（全局：18px/600 + 4px 主色竖条），或 business-crud-page 的 `formPageTitle` prop。
+- 弹窗分组统一全局 `<section-card>`（白卡 + 4px 主色竖条）；弹窗灰底 `#f5f6fa` 由全局 `.el-dialog__body` 提供。
+- 上传证件区：`width:100%; max-width:240px` + `.el-upload{height:151px}`，禁止写死 px。
+- 其他全站细则（表格线 #EFF1F7、偶数行 #FAFAFA、搜索栏 8px 行距 / label≥160px / `searchIndex:4`、操作列宽度与纯文字链接、表格内嵌控件全宽、`.el-tag.status-text` 文字化）见 `src/styles/element-ui.scss` 与 AGENTS.md 4.4。
 
-### Avue 内置弹窗用 section-card：dialogCustomClass 透明化 avue-form
-- option 顶层加 `dialogCustomClass:'xxx-dialog'`，再在 `element-ui.scss` 写三条：
-  1. `.xxx-dialog .avue-form { background:transparent; box-shadow:none; padding:0 }`
-  2. `.xxx-dialog .avue-form__group > .el-col > .el-form-item { margin-bottom:0 }`
-  3. `.xxx-dialog .avue-dialog__footer, .avue-crud__dialog .xxx-dialog .avue-dialog__footer { margin-top:0 !important }`
+## 表单文案
+- placeholder 只写 `请输入` / `请选择`，不带字段名；必须保留的例外：`请输入或选择车辆`、日期区间 `起/止`、示例值（`如：京A12345`）。
+- 校验 message 必须带字段名（`请选择准驾车型`）。
+- Avue 配置化表单：option 各列加 `placeholder`；搜索栏可用 `withSearchPlaceholders([...])`。
+- 存量的独立页 `max-height:78vh` 内嵌滚动盒写法是历史遗留，新做页面应让内容随 `#avue-view`（自身 `overflow-y:auto`）自然滚动 + 固定底栏。
 
-### 弹窗底部操作栏浮动（全局 CSS）
-- `.el-dialog__body { max-height:calc(100vh - 200px); overflow-y:auto; overflow-x:hidden }`
-- `.el-dialog__footer { margin:0; padding:12px 20px; background:#fff; border-top:1px solid #ebeef5; box-shadow:0 -2px 8px rgba(0,0,0,.04) }`
-- Avue 内置弹窗 footer 真实 class 是 `.avue-dialog__footer`，须 `position:sticky; bottom:0; flex:none; background:#fff` 贴底。
+## 复用与工具
+- `business/components/business-crud-page.vue`：option 由 `crudOption` prop 经 `cloneOption` 克隆；独立表单页走 `PageAvueForm`；自定义详情弹窗 `detailButton + detailSections`。
+- SFC 自检：项目根目录写临时脚本用 `@vue/compiler-sfc` 的 parse + compileScript + compileTemplate（脚本必须放根目录，放 /tmp 找不到 node_modules）。
+- 更快的改后自检（dev server 已在 2889 时）：`curl "localhost:2889/src/xxx.vue"`（模板+脚本）与 `curl "localhost:2889/src/xxx.vue?vue&type=style&index=0&scoped=true&lang.scss"`（样式），HTTP 200 即编译通过、500 会返回带堆栈的错误页。
+- ⚠️ `vite build` 会在 `src/page/login/facelogin.vue` 处被 WorkBuddy 沙箱的敏感内容保护中断（环境问题，非代码问题），不能作为唯一校验手段。
+- dev：`VITE_APP_API=/api`，vite 代理 `172.16.203.228:8000`；改 .env / vite.config.mjs 须重启。
 
-### 上传证件区域尺寸（transportCapacity）
-- 身份证/行驶证/道路运输证等目标比例 **240×151px**（1.586:1），ship 为 248px 上限。
-- ⚠️ **不能写死 `width:240px`**：弹窗 `width:90%` + 列 `el-col :span=6` 是弹性的，固定 px 只在特定分辨率/系统缩放下恰好等于列宽（本机对齐、他人错位）。统一写法：
-  ```scss
-  .xxx-uploader--large { display:block; width:100%; max-width:240px; flex:none; margin:0; }
-  .xxx-uploader--large .el-upload { width:100%; height:151px; }
-  ```
-  2026-09-11 已修正 driver / vehicle / ship 三处。
-
-### 上传图片点击放大预览
-- `src/components/image-upload-field/main.vue` 用 `<el-image preview-src-list fit="contain" preview-teleported :z-index="3000" @click.stop>`，阻止冒泡到 el-upload。
-
-### 独立表单页标题 `archive-page-form__title`
-- 样式全局化到 `src/styles/element-ui.scss`：18px/600/#303133 + margin-bottom:20px + 4px 主色竖条 + 8px 间距。
-- business-crud-page 系列通过 `formPageTitle` prop 注入；loading-manage / master-order 手写前置标题。
-
-### 表格列内嵌输入控件全宽
-- `element-ui.scss` 全局兜底：`.el-table .el-table__body td.el-table__cell .cell > .el-input-number/.el-input/.el-select/.el-date-editor/.el-cascader { width:100% }`。
-
-### 业务状态标签文字化
-- 全站"状态语义"的 `el-tag` 加 `class="status-text"`，转为普通文字，不带颜色/背景/边框/圆点。
-- 实现：`element-ui.scss` 末尾 `.el-tag.status-text { ... }`。
-
-### 弹窗 / 独立表单页底栏按钮统一规则
-- **排序**：从左到右按次→主排（次要居左、主操作居右），主操作永远放最后。
-  - 顺序模板：`[可选辅助工具(如同步/导入)][取消][保存草稿][提交/确认]`
-- **容器布局（2026-08-27 改为「去 gap」）**：`display:flex; justify-content:flex-end;`（**不写 `gap`**）。按钮间距统一由 Element Plus 全局默认的相邻按钮 `.el-button+.el-button{margin-left:12px}` 提供，全站恒为 12px。原各 footer 写死的 `gap:8/12px` 已全部移除。`src/styles/element-ui.scss` 里 `.el-dialog__footer .el-button + .el-button` 也已从 `8px` 改 `12px`，与之一致。弹窗关闭按钮继承 Element Plus 自带 `.el-dialog__footer` 全局规则（见上条），独立页用 `.archive-form__footer` 配 `.archive-page-form & { position:fixed; right:0; left:230px; bottom:0; z-index:10; margin:0; padding:12px 24px; border-top:1px solid #eff1f7; background:#fff; box-shadow:0 -2px 8px rgba(0,0,0,.06); }`。
-- **⚠️ 浮动底部必须用 `position:fixed`，不能用 `position:sticky`**：本项目布局 `.app-main` / `.basic-container` 祖先带 `overflow:hidden`，会导致 `sticky` 永不触发（footer 不吸底）。固定写法照搬 customer-archive：
-  ```scss
-  .xxx-actions {
-    position: fixed; right: 0; left: 230px; bottom: 0; margin: 0; z-index: 10;
-    /* flex-end + padding + border-top + 白底 + 上投影 */
-  }
-  :global(.avue--collapse .xxx-actions) { left: 60px; }      /* 侧栏折叠 */
-  :global(.avue-layout--horizontal .xxx-actions) { left: 0; } /* 横向布局 */
-  ```
-  注意 `:global()` 要把「整个选择器」包进去（customer-archive 写法），不要只包前缀，否则 scoped 会在中间选择器上追加 data 属性导致不匹配。
-- **颜色层级 3 档**：
-  | 语义 | type | 备注 |
-  | --- | --- | --- |
-  | 次要（取消 / 关闭） | 不写 type（默认） | 灰描边 |
-  - **全站底部操作栏「返回」已统一改为「取消」**：独立表单页返回列表、弹窗关闭、主从编辑器返回等场景一律写「取消」；仅只读查看 / 纯关闭场景保留「关闭」。
-  | 中间步骤（保存草稿 / 按匹配结果更新） | `type="primary" plain` | 蓝描边 |
-  | 主操作（提交 / 完成对账 / 复评确认） | `type="primary"` | 蓝实心 |
-- **禁区**：
-  - 保存草稿和主操作不允许同为 `type="primary"`，否则两个蓝实心无视觉层级。
-  - 主操作禁止用 `type="success"`（绿）。全站统一深蓝实心。
-- **生效页面（已按规则统一）**：
-  - `business/project-apply.vue`（footer + 变更 footer）
-  - `vehicle/customer-archive.vue` 全部 5 处 footer（`archive-form__footer` 主表单页 + `contact-dialog`/`receipt-dialog`/`invoice-dialog` 子弹窗 + `score-detail-dialog` 含总分合计）
-  - `business/components/business-crud-page.vue` 的 PageAvueForm 独立表单页（`#menu-form-before` slot 新增 `取消` 按钮，shipping-template 模式验证通过；影响 `/business/waybill-manage/form`、`/business/transport-plan/form`、`/business/shipping-template/form` 三处独立表单页）
-  - `business/components/master-order-editor.vue` 主 `<footer>`（取消 default + 暂存/确认创建 plain + 创建并调度 primary；`position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）
-  - **payment 模块**表单页（`__actions` 均 `flex-end` + `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）：
-    - `payment-application-form.vue`（`[取消][保存 plain][提交]`）
-    - `invoice-application-form.vue` / `invoice-receipt-form.vue`（`[取消][同步 plain][保存 plain][提交]`）
-    - `bill-ledger-form.vue`（`[取消][确认 primary]`）
-    - `bill-payment-form.vue`（`[取消][保存 plain][提交]`）
-    - `receipt-flow-form.vue`（`[取消][确认 primary]`）
-    - `receipt-claim-record-form.vue`（单「关闭」按钮，居中→右对齐浮动）
-  - **settlement 模块**：
-    - `settlement/components/pre-settlement-editor.vue`（弹窗 + pageMode 两处 footer：保存加 `plain`；`&__page-actions` 加 `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）
-    - `settlement/components/formal-settlement-editor.vue`（`.formal-editor__page-actions` 加 `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移；按钮已 `[取消][提交]` 合规）
-    - `settlement/receivable-payable-detail.vue`（生成费用弹窗「上一步」改 `plain`）
-- **已合规未动**：`settlement/components/transport-reconciliation-editor.vue`（`[取消][保存草稿 plain][按匹配结果更新账单 plain][完成对账 primary]`）、`settlement/components/settlement-adjustment-editor.vue`（弹窗 `[取消][保存 primary]`）、`business/temporary-credit-limit.vue`。
-- **Avue-form footer 结构注意**：`#menu-form-before` slot 内容在 Avue 内置按钮之**左**；`#menu-form` slot 在 Avue 内置按钮之**右**。要实现 `[次要][Avue 主操作]` 顺序，把次要按钮放进 `#menu-form-before`，主操作保留 Avue 内置即可。
-- **Avue 表单 footer 按钮去图标（统一纯文字）**：Avue 的 `avue-form` 提交/清空按钮内置图标（`submitIcon: 'el-icon-check'`、`emptyIcon: 'el-icon-delete'`），且 Avue 源码用 `|| 'el-icon-xxx'` 兜底，无法通过 option 配置去掉。已在 `business-crud-page.vue` 样式里用 `:global(.business-crud-form-page-dialog .avue-form__menu .el-icon){display:none}` 统一隐藏，仅作用于独立表单页（PageAvueForm 容器），不影响其它弹窗。新增/编辑弹窗内的 Avue 表单若也要去图标，复用此选择器即可。
-- **复杂 footer 例外**：当 footer 需要在按钮组左侧展示「总分合计 / 数量统计」等聚合信息时，块用 `flex:1` 推自己到最左，按钮组按上述规则排在右半边（参考 `score-detail-dialog`）。
-
-## 关键文件
-- `src/components/section-card/main.vue`
-- `src/styles/element-ui.scss`
-- `src/views/vehicle/customer-archive.vue`
-- `src/views/transportCapacity/{driver,vehicle,ship}.vue`
-- `src/views/business/project-apply.vue`
-
-## 环境注意
-- Vite 代理跨域：`axios.withCredentials=true`，改 `.env`/`vite.config.mjs` 须重启 dev。
-
-## business-crud-page 复用模式
-- option 由 prop `crudOption` 经 `cloneOption` 克隆。
-- 独立表单页走 `PageAvueForm`，不包 el-dialog。
-- 自定义详情弹窗：`config.detailButton=true` + `detailSections:[{title, fields}]`。
-
-## 配套后端工程与导出字段约定
-- **本前端工程 tms-erp-web-ws 对应的后端是 `/Users/gxwebsoft/JAVA/tms-api`**（不是 `tms-erp-api-ws`，后者功能滞后，排查时不要看错仓库）。
-- 所有列表导出（批量导出/下载模板）由后端 FastExcel 生成，前端 `exportColumns` 参数后端未使用 —— 导出列以 `XxxExportExcel.java` 为准，前端改 option 不影响导出。
-- BladeX `org.springblade.core.tool.utils.BeanUtil` **继承 Spring `BeanUtils`**：字段类型不兼容时**静默跳过**（实体 `Date createTime` → Excel `LocalDateTime createTime` 会丢值）。所以 Excel 导出的审计时间必须在 Service 里手动赋值，并用 `DateUtil.fromDate(...)` 做 Date→LocalDateTime 转换（`Func.isEmpty` 判空）。参考写法见 Waybill/InsuranceRecord 的 `exportXxx()`。
-- 排查导出文件问题：用 Python 标准库 `zipfile` + 解析 `xl/worksheets/sheet1.xml`、`xl/styles.xml` 直接看单元格有无 `<v>` 与 numFmt，无需装 openpyxl。
+## 导出（后端 FastExcel）
+- 前端 `exportColumns` 后端未使用，导出列以 `XxxExportExcel.java` 为准。
+- BladeX `BeanUtil`（继承 Spring BeanUtils）字段类型不兼容时**静默跳过**：实体 `Date createTime` → Excel `LocalDateTime` 会丢值，须在 Service 手动 `DateUtil.fromDate(...)` 赋值（参考 Waybill / InsuranceRecord）。
+- 排查导出文件用 Python `zipfile` 读 `xl/worksheets/sheet1.xml` 看有无 `<v>` 与 numFmt，无需 openpyxl。
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 8ac0044..911cbd7 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -239,6 +239,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/loading-manage/detail',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '配载单详情',
+        meta: { keepAlive: false, activeMenu: '/business/loading-manage' },
+        component: () => import('@/views/business/loading-manage.vue'),
+      },
+    ],
+  },
   {
     path: '/business/transport-plan/form',
     component: Layout,
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 959f7b2..fb9e27c 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -4488,7 +4488,10 @@ export default {
         this.$message.info('当前配载单暂无详情数据');
         return;
       }
-      this.$router.push({ path: '/business/loading-manage', query: { detailId: id } });
+      this.$router.push({
+        path: '/business/loading-manage/detail',
+        query: { id, name: '配载单详情' },
+      });
     },
     loadWaybillDetailProcessNodes(projectId) {
       this.waybillDetailProcessNodes = [];
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 3a7efc0..29a58d0 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -1,6 +1,6 @@
 <template>
   <basic-container class="loading-manage-page">
-    <div v-if="!isStandaloneFormPage" class="loading-manage-page__search">
+    <div v-if="!isStandalonePage" class="loading-manage-page__search">
       <el-form :model="searchForm" label-position="right" label-width="88px">
         <div class="loading-manage-page__search-grid">
           <el-form-item label="配载单号">
@@ -222,7 +222,7 @@
       </el-form>
     </div>
 
-    <div v-if="!isStandaloneFormPage" class="loading-manage-page__toolbar">
+    <div v-if="!isStandalonePage" class="loading-manage-page__toolbar">
       <div class="loading-manage-page__toolbar-left">
         <el-button type="primary" @click="openLoadingDialog('add')">新建配载</el-button>
         <el-button type="primary" plain @click="handleExport">批量导出</el-button>
@@ -242,7 +242,7 @@
     </div>
 
     <el-table
-      v-if="!isStandaloneFormPage"
+      v-if="!isStandalonePage"
       ref="tableRef"
       v-loading="loading"
       :data="tableData"
@@ -259,7 +259,7 @@
           <el-link
             type="primary"
             class="loading-manage-page__link"
-            @click="openLoadingDialog('view', row)"
+            @click="gotoLoadingDetail(row)"
             >{{ row.loadingNo }}</el-link
           >
         </template>
@@ -363,7 +363,7 @@
       </el-table-column>
     </el-table>
 
-    <div v-if="!isStandaloneFormPage" class="loading-manage-page__pagination">
+    <div v-if="!isStandalonePage" class="loading-manage-page__pagination">
       <el-pagination
         v-model:current-page="page.currentPage"
         v-model:page-size="page.pageSize"
@@ -377,26 +377,28 @@
     </div>
 
     <component
-      :is="isStandaloneFormPage ? 'div' : 'el-dialog'"
-      :model-value="isStandaloneFormPage ? undefined : dialogVisible"
-      :title="isStandaloneFormPage ? undefined : dialogTitle"
-      :append-to-body="isStandaloneFormPage ? undefined : true"
-      :destroy-on-close="isStandaloneFormPage ? undefined : true"
-      :width="isStandaloneFormPage ? undefined : '96%'"
-      :top="isStandaloneFormPage ? undefined : '3vh'"
+      :is="isStandalonePage ? 'div' : 'el-dialog'"
+      :model-value="isStandalonePage ? undefined : dialogVisible"
+      :title="isStandalonePage ? undefined : dialogTitle"
+      :append-to-body="isStandalonePage ? undefined : true"
+      :destroy-on-close="isStandalonePage ? undefined : true"
+      :width="isStandalonePage ? undefined : '96%'"
+      :top="isStandalonePage ? undefined : '3vh'"
       :class="[
         'loading-manage-dialog',
-        { 'loading-manage-form-dialog': isStandaloneFormPage },
-        { 'loading-manage-form-page': isStandaloneFormPage },
+        { 'loading-manage-form-dialog': isStandalonePage },
+        { 'loading-manage-form-page': isStandalonePage },
       ]"
-      :modal="isStandaloneFormPage ? undefined : true"
-      :show-close="isStandaloneFormPage ? undefined : true"
-      :close-on-click-modal="isStandaloneFormPage ? undefined : true"
-      :close-on-press-escape="isStandaloneFormPage ? undefined : true"
-      @update:model-value="value => !isStandaloneFormPage && (dialogVisible = value)"
+      :modal="isStandalonePage ? undefined : true"
+      :show-close="isStandalonePage ? undefined : true"
+      :close-on-click-modal="isStandalonePage ? undefined : true"
+      :close-on-press-escape="isStandalonePage ? undefined : true"
+      @update:model-value="value => !isStandalonePage && (dialogVisible = value)"
       @closed="resetLoadingDialog"
     >
-      <div v-if="isStandaloneFormPage" class="archive-page-form__title">{{ formPageTitle }}</div>
+      <div v-if="isStandalonePage" class="archive-page-form__title">{{
+        isStandaloneDetailPage ? detailPageTitle : formPageTitle
+      }}</div>
       <div v-loading="dialogLoading" class="loading-manage-dialog__body">
         <div v-if="dialogReadonly" class="loading-detail">
           <section-card title="配载单详情">
@@ -1229,7 +1231,7 @@
         </el-form>
       </div>
 
-      <div v-if="isStandaloneFormPage" class="loading-manage-dialog__footer">
+      <div v-if="isStandalonePage" class="loading-manage-dialog__footer">
         <template v-if="dialogReadonly">
           <el-button @click="closeLoadingDialog">关闭</el-button>
         </template>
@@ -1243,7 +1245,7 @@
           </el-button>
         </template>
       </div>
-      <template v-if="!isStandaloneFormPage" #footer>
+      <template v-if="!isStandalonePage" #footer>
         <div class="loading-manage-dialog__footer">
           <template v-if="dialogReadonly">
             <el-button @click="closeLoadingDialog">关闭</el-button>
@@ -1268,7 +1270,7 @@
       width="78%"
       class="loading-route-change-dialog"
     >
-      <el-tabs v-model="routeChangeTab">
+      <el-tabs type="border-card" v-model="routeChangeTab">
         <el-tab-pane label="变更路线" name="change">
           <section-card title="关联子运单地址">
             <el-table :data="routeChangeRows" border>
@@ -1741,32 +1743,58 @@ export default {
               }
       );
     },
+    // 独立表单页：/business/loading-manage/form?mode=add|edit|reassign
     isStandaloneFormPage() {
       return (
         this.$route.path === '/business/loading-manage/form' &&
-        ['add', 'edit'].includes(this.$route.query.mode)
+        ['add', 'edit', 'reassign'].includes(this.$route.query.mode)
       );
     },
+    // 独立详情页：/business/loading-manage/detail?id=xxx
+    isStandaloneDetailPage() {
+      return this.$route.path === '/business/loading-manage/detail';
+    },
+    // 列表容器隐藏搜索栏 / 工具栏 / 表格 / 分页的统一开关
+    isStandalonePage() {
+      return this.isStandaloneFormPage || this.isStandaloneDetailPage;
+    },
+    formPageDefaultTitle() {
+      const titleMap = {
+        add: '新增配载管理',
+        edit: '编辑配载管理',
+        reassign: '重新派单',
+      };
+      return titleMap[this.$route.query.mode] || '新增配载管理';
+    },
     formPageTitle() {
-      return (
-        this.$route.query.name || `${this.$route.query.mode === 'edit' ? '编辑' : '新增'}配载管理`
-      );
+      return this.$route.query.name || this.formPageDefaultTitle;
+    },
+    detailPageTitle() {
+      return this.$route.query.name || '配载单详情';
     },
   },
   mounted() {
     this.loadTransportTypeOptions();
     this.loadTable();
-    if (this.isStandaloneFormPage) {
+    if (this.isStandalonePage) {
       this.syncStandaloneTagTitle();
-      this.initStandaloneFormPage();
+      if (this.isStandaloneDetailPage) this.initStandaloneDetailPage();
+      else this.initStandaloneFormPage();
     }
+    // 兼容旧链接：/business/loading-manage?detailId=xxx 直接跳独立详情页
     const detailId = this.$route.query.detailId;
-    if (detailId) this.openLoadingDialog('view', { id: detailId });
+    if (detailId) this.gotoLoadingDetail({ id: detailId });
   },
   watch: {
     $route(to, from) {
-      if (this.isStandaloneFormPage) {
+      if (this.isStandalonePage) {
         this.syncStandaloneTagTitle();
+        if (this.isStandaloneDetailPage) {
+          // 记录变化或上一个页面不是详情态（例如从表单页/列表页进来）时重新拉取详情
+          const idChanged = String(to.query.id || '') !== String(from?.query?.id || '');
+          if (idChanged || this.dialogMode !== 'view') this.initStandaloneDetailPage();
+          return;
+        }
         if (
           to.query.mode !== from?.query?.mode ||
           String(to.query.id || '') !== String(from?.query.id || '') ||
@@ -1779,13 +1807,13 @@ export default {
       }
     },
     '$route.query.detailId'(detailId) {
-      if (detailId) this.openLoadingDialog('view', { id: detailId });
+      if (detailId) this.gotoLoadingDetail({ id: detailId });
     },
   },
   methods: {
     syncStandaloneTagTitle() {
-      if (!this.isStandaloneFormPage) return;
-      const title = this.$route.query.mode === 'edit' ? '编辑配载管理' : '新增配载管理';
+      if (!this.isStandalonePage) return;
+      const title = this.isStandaloneDetailPage ? this.detailPageTitle : this.formPageDefaultTitle;
       if (this.$route.query.name === title) return;
       this.$store.commit('SET_TAG', {
         fullPath: this.$route.fullPath,
@@ -2189,9 +2217,9 @@ export default {
     },
     handleRowAction(type, row) {
       const actionMap = {
-        view: () => this.openLoadingDialog('view', row),
+        view: () => this.gotoLoadingDetail(row),
         edit: () => this.openLoadingDialog('edit', row),
-        reassign: () => this.openLoadingDialog('reassign', row),
+        reassign: () => this.gotoLoadingReassign(row),
         delete: () => this.deleteLoading(row),
         start: () => this.startLoading(row),
         cancel: () => this.cancelLoading(row),
@@ -2199,9 +2227,44 @@ export default {
       };
       actionMap[type]?.();
     },
+    // 详情改为独立页面（与新增/编辑一致）
+    gotoLoadingDetail(row = {}) {
+      const id = row.id || row.loadingId || row.loadingManageId;
+      if (!id) {
+        ElMessage.info('当前配载单暂无详情数据');
+        return;
+      }
+      if (this.isStandaloneDetailPage && String(this.$route.query.id || '') === String(id)) return;
+      this.$router.push({
+        path: '/business/loading-manage/detail',
+        query: { id, name: '配载单详情' },
+      });
+    },
+    // 重新派单改为独立页面
+    gotoLoadingReassign(row = {}) {
+      if (!row.id) {
+        ElMessage.warning('配载单不存在，无法重新派单');
+        return;
+      }
+      this.$router.push({
+        path: '/business/loading-manage/form',
+        query: { mode: 'reassign', id: row.id, name: '重新派单' },
+      });
+    },
+    async initStandaloneDetailPage() {
+      if (!this.isStandaloneDetailPage) return;
+      const id = this.$route.query.id;
+      if (!id) {
+        ElMessage.warning('缺少配载单参数，无法查看详情');
+        this.closeLoadingDialog();
+        return;
+      }
+      await this.openLoadingDialog('view', { id });
+    },
     async initStandaloneFormPage() {
       if (!this.isStandaloneFormPage) return;
-      const mode = this.$route.query.mode === 'edit' ? 'edit' : 'add';
+      const queryMode = this.$route.query.mode;
+      const mode = ['edit', 'reassign'].includes(queryMode) ? queryMode : 'add';
       const copyId = mode === 'add' ? this.$route.query.copyId : '';
       await this.openLoadingDialog(mode, {
         id: copyId || this.$route.query.id,
@@ -2222,7 +2285,12 @@ export default {
       }
     },
     async openLoadingDialog(mode, row) {
-      if (['add', 'edit'].includes(mode) && !this.isStandaloneFormPage) {
+      // 列表页进入新增/编辑/重新派单：统一走独立页面
+      if (['add', 'edit', 'reassign'].includes(mode) && !this.isStandaloneFormPage) {
+        if (mode === 'reassign') {
+          this.gotoLoadingReassign(row || {});
+          return;
+        }
         this.$router.push({
           path: '/business/loading-manage/form',
           query: {
@@ -2267,7 +2335,7 @@ export default {
       }
     },
     closeLoadingDialog() {
-      if (this.isStandaloneFormPage) {
+      if (this.isStandalonePage) {
         this.$router.$avueRouter?.closeTag?.();
         this.$router.push({ path: '/business/loading-manage', query: {} });
         return;
@@ -3433,7 +3501,6 @@ export default {
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    gap: 8px;
   }
 
   .loading-manage-dialog__table-toolbar {
@@ -3767,7 +3834,9 @@ export default {
   box-sizing: border-box;
   background: #f5f6fa;
 }
-:global(.loading-manage-form-page .loading-manage-dialog__body) {
+/* 独立页面（新增/编辑/重新派单/详情）：内容随 #avue-view 自然滚动，不做内嵌 78vh 滚动盒。
+   此处权重必须高于 .loading-manage-dialog .loading-manage-dialog__body，故带上 .loading-manage-page 外壳。 */
+:global(.loading-manage-page .loading-manage-form-dialog.loading-manage-form-page .loading-manage-dialog__body) {
   max-height: none;
   overflow: visible;
   padding-right: 0;

From b4e12a671f1da47164f28645258178644a3fce33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 18 Sep 2026 10:17:48 +0800
Subject: [PATCH 09/28] =?UTF-8?q?fix(views):=20=E4=BF=AE=E5=A4=8D=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B5=E5=88=87=E6=8D=A2=E6=97=B6=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=AE=8B=E7=95=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 独立整页固定使用普通 div 容器，取消动态切换 el-dialog 避免切换时弹窗 DOM 残留
- 删除相关 dialogVisible、dialogTitle、页脚弹窗动态分支代码以简化逻辑
- watch $route 调整，优化独立页初始化流程，避免不必要的关闭弹窗操作
- 新增 closeInnerDialogs 方法，页面卸载或 keep-alive deactivate 时关闭所有二级弹窗
- 对 loading-manage 与 project-apply 两个模块同步改造，统一处理弹窗状态和容器渲染
- 解决 keep-alive 缓存导致旧弹窗一直挂载在 body 上的问题，改善用户切换体验
---
 .workbuddy/memory/2026-09-18.md       |  24 +++++
 .workbuddy/memory/MEMORY.md           |  53 +++++------
 src/views/business/loading-manage.vue | 122 +++++++++-----------------
 src/views/business/project-apply.vue  |  90 ++++++-------------
 4 files changed, 119 insertions(+), 170 deletions(-)
 create mode 100644 .workbuddy/memory/2026-09-18.md

diff --git a/.workbuddy/memory/2026-09-18.md b/.workbuddy/memory/2026-09-18.md
new file mode 100644
index 0000000..7d5557d
--- /dev/null
+++ b/.workbuddy/memory/2026-09-18.md
@@ -0,0 +1,24 @@
+# 2026-09-18
+
+## 修复：改成独立整页后点左侧菜单仍弹出旧弹窗（loading-manage / project-apply）
+
+**现象**：配载单管理、项目管理已改为「新增/编辑/详情走独立整页」，但从独立页返回或直接点左侧菜单时，页面上仍会盖出一个老的 `el-dialog`（新增项目管理 / 配载单）。
+
+**根因**（已读 Vue runtime-core 源码确认）：
+- `src/router/tab.js` 按 `tabKey`（默认 fullPath）为每个标签建一个具名 wrapper 组件放进 `wrapperMap`，`src/page/index/layout.vue` 用 `<keep-alive :include="$store.getters.tagsKeep">` 缓存 —— 每个标签页一个实例，全部缓存不销毁。
+- 组件被 deactivate 后**仍会随 `$route`（全局响应式）重新渲染**；此时 `isStandalonePage` 变 false，`<component :is="isStandalonePage ? 'div' : 'el-dialog'">` 由 div 翻回 `el-dialog`，而 `v-model`（`projectBox`/`dialogVisible`）仍是 true，`append-to-body` 使弹窗 Teleport 到 body。
+- `KeepAlive.deactivate` 调 `move(vnode, storageContainer, ..., moveType=OUT)`，但 `TeleportImpl.move`（`moveTeleport`）忽略传入的 moveType、一律按 REORDER 处理 → **teleport 出去的 DOM 不会被搬回 storage container**，永久残留在 `document.body` 上并显示出来。
+
+**修法**（不回退 tab.js 的 `return wrapper` 提交 c1c4fa1，改修根因）：
+- 独立页容器固定为 `<div v-if="isXxxPage">`，不再按路由回退成 `el-dialog`。
+- 页内其它 `append-to-body` 二级弹窗加 `deactivated()` / `beforeUnmount()` → `closeInnerDialogs()` 把 v-model 置 false。
+
+**改动文件**：
+- `src/views/business/loading-manage.vue`：容器改 `<div v-if="isStandalonePage">`；删 `dialogVisible`、`dialogTitle`、`resetLoadingDialog`、`clearLoadingDialog`、页脚弹窗分支（含「清空」）；`watch.$route` 简化；新增 `closeInnerDialogs()`（routeChange / commonAddress / candidateSearch）+ `deactivated`/`beforeUnmount`。
+- `src/views/business/project-apply.vue`：容器改 `<div v-if="isProjectFormPage">`；删 `projectFormContainer`/`projectFormContainerProps`、`projectBox`、`resetProjectDialog`、`handleCancelProject`；`closeProjectForm` 简化为直接 push 列表；新增 `closeInnerDialogs()`（changeRecordDetail / 附件文档预览 / 图片预览 / 选人）+ `deactivated`/`beforeUnmount`。
+
+**校验**：dev server(2889) curl 两个 .vue 及其 scoped style 模块，均 HTTP 200（500 才是编译失败）。`vite build` 因沙箱敏感内容保护会在 facelogin.vue 中断，未用。
+
+**遗留同类风险（未改，已告知用户）**：`business/components/waybill-manage-page.vue`（`detailContainer` 在 PageDetail / el-dialog 间切）、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`business/components/waybill-import-dialog.vue`（`standalone`/`createPage`）。统一修法：容器类型在 `created()` 锁定，不随路由/prop 翻转。
+
+**未提交**：上述改动 + 上一轮 loading-manage 独立页改造均未 commit。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index 79fd549..db7e494 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -2,37 +2,38 @@
 
 配套后端：`/Users/gxwebsoft/JAVA/tms-api`（不是 tms-erp-api-ws，后者功能滞后）。
 
-## 页面结构：列表 + 独立表单页 + 独立详情页（同一组件分流）
-- `src/router/views/index.js` 里三条静态/菜单路由指向同一个 .vue：`/xxx`（后端菜单）、`/xxx/form`、`/xxx/detail`；form/detail 都是 `component: Layout` + 空 children，`meta: { keepAlive: false }`，detail 额外带 `activeMenu: '/xxx'`。
-- 组件内按 `$route.path` 分流（如 `isFormPage` / `isDetailPage` / `isListPage`），列表部分统一 `v-if="!isStandalonePage"` 隐藏搜索栏/工具栏/表格/分页。
-- 路由记录不同但组件相同 → Vue 复用实例，所以**必须**在 `watch: { $route(to, from) }` 里重新 init；`mounted` 只覆盖「直接打开/刷新」场景。切换详情与表单时不要只比 id，还要看当前 `dialogMode` 是否匹配。
-- 跳转：`this.$router.push({ path: '/xxx/form', query: { mode, id, name: '新增xxx' } })`；标签标题由 avue-router 取 `query.name`。关闭：`this.$router.$avueRouter?.closeTag?.()` + push 列表。
-- 已按此模式：contract-manage（form+detail）、waybill-manage、loading-manage（新增/编辑/重新派单/详情，2026-09-17 完成）。
-- 底栏文案：只读详情页用「关闭」；表单页沿用「关闭/暂存/确认」。
+## 列表 + 独立表单页 + 独立详情页（同一组件分流）
+- 路由：`/xxx`（菜单）、`/xxx/form`、`/xxx/detail` 指向同一 .vue；form/detail 为 `component: Layout` + 空 children，`meta:{keepAlive:false}`，detail 带 `activeMenu:'/xxx'`。
+- 组件内按 `$route.path` 分流，列表部分统一 `v-if="!isStandalonePage"` 隐藏。
+- 路由记录不同但组件相同 → 必须 `watch:{$route}` 里重新 init；`mounted` 只覆盖直接打开/刷新。
+- 跳转 `push({path:'/xxx/form',query:{mode,id,name:'新增xxx'}})`，标签标题取 `query.name`。
+- 底栏：只读详情页「关闭」；表单页「关闭/暂存/确认」。
+
+## ⚠️ 独立页容器禁止用 `<component :is>` 在 div 与 el-dialog 间切换
+- **现象**：改成独立整页后，点左侧菜单又弹出旧弹窗，且永久盖在页面上。
+- **根因**：`src/router/tab.js` 按 fullPath 建 wrapper 组件，`layout.vue` 用 `<keep-alive :include="tagsKeep">` 缓存，每个标签一个实例。实例被 deactivate 后**仍会随 `$route` 重新渲染**；此时 `:is` 由 div 变回 `el-dialog`，`v-model` 仍为 true，`append-to-body` 的弹窗经 Teleport 渲染进 body——而 `KeepAlive.deactivate → Teleport.move` 只做 reorder，**不会把 teleport 出去的 DOM 搬回 storage container**，于是弹窗永久残留。
+- **正确写法**：独立页固定 `<div v-if="isXxxPage">` 普通容器，绝不按路由回退成 el-dialog；列表页分支另写或只保留弹窗一种形态。
+- **兜底**：页面内其它 `append-to-body` 的二级弹窗，加 `deactivated(){closeInnerDialogs()}` + `beforeUnmount(){closeInnerDialogs()}` 把 v-model 置 false。
+- 同类风险未修：`business/components/waybill-manage-page.vue`（`detailContainer` 在 PageDetail/el-dialog 间切）、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`business/components/waybill-import-dialog.vue`（`standalone`/`createPage`）。修法同上：容器类型在 `created()` 锁定，不随路由/prop 翻转。
 
 ## 样式硬规则
-- 底部操作栏：`display:flex; justify-content:flex-end;`，**不写 gap**（间距由 Element Plus 默认 `.el-button+.el-button{margin-left:12px}` 提供）。⚠️ 浮动底栏必须 `position:fixed`（祖先 overflow:hidden 让 sticky 失效），配套 `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包住整个选择器。
-- 按钮层级：次要 = 不写 type；中间步骤 = `type="primary" plain`；主操作 = `type="primary"`（禁绿色 success，禁两个蓝实心）。顺序 `[辅助工具][取消][保存草稿][提交]`。
-- ⚠️ **`<style scoped lang="scss">` 顶层禁止 `//` 行注释**：Vite5 + sass modern-compiler + scoped 会报 `Unexpected '/'.`，样式模块直接 HTTP 500（块内的 `//` 正常）。顶层统一用 `/* */`。
-- 独立页顶部标题用 `.archive-page-form__title`（全局：18px/600 + 4px 主色竖条），或 business-crud-page 的 `formPageTitle` prop。
-- 弹窗分组统一全局 `<section-card>`（白卡 + 4px 主色竖条）；弹窗灰底 `#f5f6fa` 由全局 `.el-dialog__body` 提供。
-- 上传证件区：`width:100%; max-width:240px` + `.el-upload{height:151px}`，禁止写死 px。
-- 其他全站细则（表格线 #EFF1F7、偶数行 #FAFAFA、搜索栏 8px 行距 / label≥160px / `searchIndex:4`、操作列宽度与纯文字链接、表格内嵌控件全宽、`.el-tag.status-text` 文字化）见 `src/styles/element-ui.scss` 与 AGENTS.md 4.4。
+- 底栏：`flex; justify-content:flex-end`、**不写 gap**（间距靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）。浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包住整个选择器。
+- 按钮层级：次要=不写 type；中间步骤=`primary plain`；主操作=`primary`（禁绿色、禁两个蓝实心）。顺序 `[辅助][取消][保存草稿][提交]`。
+- 独立页标题 `.archive-page-form__title`（18px/600 + 4px 主色竖条）；分组用全局 `<section-card>`；弹窗灰底 `#f5f6fa`。
+- 上传证件区：`width:100%; max-width:240px` + `.el-upload{height:151px}`，禁写死 px。
+- ⚠️ `<style scoped lang="scss">` **顶层禁 `//` 注释**（Vite5+sass 报 `Unexpected '/'` → 样式模块 500），顶层用 `/* */`。
+- 其余全站细则见 `src/styles/element-ui.scss` 与 AGENTS.md 4.4。
 
 ## 表单文案
-- placeholder 只写 `请输入` / `请选择`，不带字段名；必须保留的例外：`请输入或选择车辆`、日期区间 `起/止`、示例值（`如：京A12345`）。
-- 校验 message 必须带字段名（`请选择准驾车型`）。
-- Avue 配置化表单：option 各列加 `placeholder`；搜索栏可用 `withSearchPlaceholders([...])`。
-- 存量的独立页 `max-height:78vh` 内嵌滚动盒写法是历史遗留，新做页面应让内容随 `#avue-view`（自身 `overflow-y:auto`）自然滚动 + 固定底栏。
+- placeholder 只写 `请输入`/`请选择`；例外保留：`请输入或选择车辆`、日期区间 `起/止`、示例值（`如：京A12345`）。校验 message 必须带字段名。
 
-## 复用与工具
-- `business/components/business-crud-page.vue`：option 由 `crudOption` prop 经 `cloneOption` 克隆；独立表单页走 `PageAvueForm`；自定义详情弹窗 `detailButton + detailSections`。
-- SFC 自检：项目根目录写临时脚本用 `@vue/compiler-sfc` 的 parse + compileScript + compileTemplate（脚本必须放根目录，放 /tmp 找不到 node_modules）。
-- 更快的改后自检（dev server 已在 2889 时）：`curl "localhost:2889/src/xxx.vue"`（模板+脚本）与 `curl "localhost:2889/src/xxx.vue?vue&type=style&index=0&scoped=true&lang.scss"`（样式），HTTP 200 即编译通过、500 会返回带堆栈的错误页。
-- ⚠️ `vite build` 会在 `src/page/login/facelogin.vue` 处被 WorkBuddy 沙箱的敏感内容保护中断（环境问题，非代码问题），不能作为唯一校验手段。
-- dev：`VITE_APP_API=/api`，vite 代理 `172.16.203.228:8000`；改 .env / vite.config.mjs 须重启。
+## 复用与自检
+- `business/components/business-crud-page.vue`：option 经 `cloneOption` 克隆；独立表单页走 `PageAvueForm`；详情弹窗 `detailButton + detailSections`。
+- 自检：dev(2889) 时 `curl "localhost:2889/src/xxx.vue"` 与 `curl "...?vue&type=style&index=0&scoped=true&lang.scss"`，200 通过、500 返回带堆栈错误页。
+- ⚠️ `vite build` 会在 `src/page/login/facelogin.vue` 被沙箱敏感内容保护中断（环境问题），不能作为唯一校验手段。
+- dev：`VITE_APP_API=/api`，代理 `172.16.203.228:8000`。
 
 ## 导出（后端 FastExcel）
 - 前端 `exportColumns` 后端未使用，导出列以 `XxxExportExcel.java` 为准。
-- BladeX `BeanUtil`（继承 Spring BeanUtils）字段类型不兼容时**静默跳过**：实体 `Date createTime` → Excel `LocalDateTime` 会丢值，须在 Service 手动 `DateUtil.fromDate(...)` 赋值（参考 Waybill / InsuranceRecord）。
-- 排查导出文件用 Python `zipfile` 读 `xl/worksheets/sheet1.xml` 看有无 `<v>` 与 numFmt，无需 openpyxl。
+- BladeX `BeanUtil` 类型不兼容时静默跳过（`Date createTime` → `LocalDateTime` 丢值），须 Service 内 `DateUtil.fromDate(...)` 赋值。
+- 排查导出文件用 Python `zipfile` 读 `xl/worksheets/sheet1.xml`。
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 29a58d0..c970611 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -376,27 +376,17 @@
       />
     </div>
 
-    <component
-      :is="isStandalonePage ? 'div' : 'el-dialog'"
-      :model-value="isStandalonePage ? undefined : dialogVisible"
-      :title="isStandalonePage ? undefined : dialogTitle"
-      :append-to-body="isStandalonePage ? undefined : true"
-      :destroy-on-close="isStandalonePage ? undefined : true"
-      :width="isStandalonePage ? undefined : '96%'"
-      :top="isStandalonePage ? undefined : '3vh'"
-      :class="[
-        'loading-manage-dialog',
-        { 'loading-manage-form-dialog': isStandalonePage },
-        { 'loading-manage-form-page': isStandalonePage },
-      ]"
-      :modal="isStandalonePage ? undefined : true"
-      :show-close="isStandalonePage ? undefined : true"
-      :close-on-click-modal="isStandalonePage ? undefined : true"
-      :close-on-press-escape="isStandalonePage ? undefined : true"
-      @update:model-value="value => !isStandalonePage && (dialogVisible = value)"
-      @closed="resetLoadingDialog"
+    <!--
+      配载单的新增/编辑/重新派单/详情全部是独立整页，这里固定渲染普通容器，不再按路由切换 el-dialog。
+      原因：标签页 keep-alive 会把本页实例缓存下来，若容器随 $route 由 div 变回 el-dialog，
+      被缓存的实例会在离开本页后渲染出 append-to-body 的弹窗并永久停留在 body 上（Vue 的
+      KeepAlive.deactivate → Teleport.move 不会搬走 append-to-body 的弹窗 DOM），表现为“点左侧菜单又弹出弹窗”。
+    -->
+    <div
+      v-if="isStandalonePage"
+      class="loading-manage-dialog loading-manage-form-dialog loading-manage-form-page"
     >
-      <div v-if="isStandalonePage" class="archive-page-form__title">{{
+      <div class="archive-page-form__title">{{
         isStandaloneDetailPage ? detailPageTitle : formPageTitle
       }}</div>
       <div v-loading="dialogLoading" class="loading-manage-dialog__body">
@@ -1231,7 +1221,7 @@
         </el-form>
       </div>
 
-      <div v-if="isStandalonePage" class="loading-manage-dialog__footer">
+      <div class="loading-manage-dialog__footer">
         <template v-if="dialogReadonly">
           <el-button @click="closeLoadingDialog">关闭</el-button>
         </template>
@@ -1245,23 +1235,7 @@
           </el-button>
         </template>
       </div>
-      <template v-if="!isStandalonePage" #footer>
-        <div class="loading-manage-dialog__footer">
-          <template v-if="dialogReadonly">
-            <el-button @click="closeLoadingDialog">关闭</el-button>
-          </template>
-          <template v-else>
-            <el-button @click="clearLoadingDialog">清空</el-button>
-            <el-button type="primary" plain :loading="dialogSaving === 'draft'" @click="saveDraft">
-              暂存
-            </el-button>
-            <el-button type="primary" :loading="dialogSaving === 'submit'" @click="submitLoading">
-              {{ dialogMode === 'reassign' ? '确认派单' : '确认' }}
-            </el-button>
-          </template>
-        </div>
-      </template>
-    </component>
+    </div>
     <el-dialog
       v-model="routeChangeVisible"
       title="变更运输路线"
@@ -1636,7 +1610,6 @@ export default {
       searchExpanded: false,
       searchForm: createSearchForm(),
       selectionRows: [],
-      dialogVisible: false,
       dialogMode: 'add',
       dialogLoading: false,
       dialogSaving: '',
@@ -1706,15 +1679,6 @@ export default {
       if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
       return '请选择';
     },
-    dialogTitle() {
-      const titleMap = {
-        add: '新建配载',
-        edit: '编辑配载单',
-        view: '配载单详情',
-        reassign: '重新派单',
-      };
-      return titleMap[this.dialogMode] || '配载管理';
-    },
     detailStatusType() {
       const typeMap = {
         pending: 'success',
@@ -1785,25 +1749,29 @@ export default {
     const detailId = this.$route.query.detailId;
     if (detailId) this.gotoLoadingDetail({ id: detailId });
   },
+  // 标签切走（实例被 keep-alive 缓存）或销毁时，先收起页内子弹窗
+  deactivated() {
+    this.closeInnerDialogs();
+  },
+  beforeUnmount() {
+    this.closeInnerDialogs();
+  },
   watch: {
     $route(to, from) {
-      if (this.isStandalonePage) {
-        this.syncStandaloneTagTitle();
-        if (this.isStandaloneDetailPage) {
-          // 记录变化或上一个页面不是详情态（例如从表单页/列表页进来）时重新拉取详情
-          const idChanged = String(to.query.id || '') !== String(from?.query?.id || '');
-          if (idChanged || this.dialogMode !== 'view') this.initStandaloneDetailPage();
-          return;
-        }
-        if (
-          to.query.mode !== from?.query?.mode ||
-          String(to.query.id || '') !== String(from?.query.id || '') ||
-          String(to.query.copyId || '') !== String(from?.query.copyId || '')
-        ) {
-          this.initStandaloneFormPage();
-        }
-      } else if (from?.query?.mode && this.dialogVisible) {
-        this.closeLoadingDialog();
+      if (!this.isStandalonePage) return;
+      this.syncStandaloneTagTitle();
+      if (this.isStandaloneDetailPage) {
+        // 记录变化或上一个页面不是详情态（例如从表单页/列表页进来）时重新拉取详情
+        const idChanged = String(to.query.id || '') !== String(from?.query?.id || '');
+        if (idChanged || this.dialogMode !== 'view') this.initStandaloneDetailPage();
+        return;
+      }
+      if (
+        to.query.mode !== from?.query?.mode ||
+        String(to.query.id || '') !== String(from?.query.id || '') ||
+        String(to.query.copyId || '') !== String(from?.query.copyId || '')
+      ) {
+        this.initStandaloneFormPage();
       }
     },
     '$route.query.detailId'(detailId) {
@@ -2302,7 +2270,6 @@ export default {
         return;
       }
       this.dialogMode = mode;
-      this.dialogVisible = true;
       this.dialogLoading = true;
       this.resetDialogData();
       if (mode === 'add') this.candidateQuery.transportType = 'road';
@@ -2335,17 +2302,9 @@ export default {
       }
     },
     closeLoadingDialog() {
-      if (this.isStandalonePage) {
-        this.$router.$avueRouter?.closeTag?.();
-        this.$router.push({ path: '/business/loading-manage', query: {} });
-        return;
-      }
-      this.dialogVisible = false;
-    },
-    resetLoadingDialog() {
-      this.resetDialogData();
-      this.dialogSaving = '';
-      this.dialogLoading = false;
+      if (!this.isStandalonePage) return;
+      this.$router.$avueRouter?.closeTag?.();
+      this.$router.push({ path: '/business/loading-manage', query: {} });
     },
     resetDialogData() {
       this.detailAmap?.destroy?.();
@@ -2367,10 +2326,11 @@ export default {
       this.processProjectId = '';
       this.processProjectOptions = [];
     },
-    clearLoadingDialog() {
-      this.resetDialogData();
-      if (this.dialogMode === 'add') this.candidateQuery.transportType = 'road';
-      this.loadCandidateWaybills();
+    // 离开本页（标签缓存/卸载）时收起页内子弹窗，避免 append-to-body 的弹窗 DOM 残留在 body 上
+    closeInnerDialogs() {
+      this.routeChangeVisible = false;
+      this.commonAddressVisible = false;
+      this.candidateSearchVisible = false;
     },
     restoreRouteAndCargo() {
       const routeRows = parseJsonArray(this.dialogForm.routeJson);
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index e54b864..60134bf 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -140,14 +140,15 @@
       @load="onLoad(page, query)"
     />
 
-    <component
-      :is="projectFormContainer"
-      v-if="projectBox"
-      v-bind="projectFormContainerProps"
-      @update:model-value="projectBox = $event"
-      @closed="resetProjectDialog"
-    >
-      <div v-if="isProjectFormPage" class="archive-page-form__title">
+    <!--
+      项目新增/编辑/查看/变更/补录全部是独立整页（openProjectDialog 一律 push /business/project-apply/form），
+      这里固定渲染普通容器，不再按 $route 在 div 与 el-dialog 之间切换。
+      原因：标签页 keep-alive 会缓存本页实例，若容器在离开本页后又变回 el-dialog，
+      缓存实例会把 append-to-body 的弹窗渲染进 body 并永久停留（Vue 的 KeepAlive.deactivate →
+      Teleport.move 不会搬走 append-to-body 的弹窗 DOM），表现为“点左侧菜单又弹出新增项目管理弹窗”。
+    -->
+    <div v-if="isProjectFormPage" class="project-apply-page-form">
+      <div class="archive-page-form__title">
         {{ projectDialogTitle }}
       </div>
       <el-form
@@ -788,8 +789,7 @@
         :class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
       >
           <template v-if="isChangeDialog">
-            <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
+            <el-button @click="closeProjectForm">取消</el-button>
             <el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
               保存
             </el-button>
@@ -798,8 +798,7 @@
             </el-button>
           </template>
           <template v-else>
-            <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
+            <el-button @click="closeProjectForm">取消</el-button>
             <el-button
               v-if="!dialogReadonly"
               type="primary"
@@ -819,7 +818,7 @@
             </el-button>
           </template>
       </div>
-    </component>
+    </div>
 
     <el-dialog
       v-model="attachmentDocumentPreviewVisible"
@@ -1116,7 +1115,6 @@ export default {
         total: 0,
       },
       selectionList: [],
-      projectBox: false,
       dialogType: 'add',
       dialogReadonly: false,
       submitLoading: false,
@@ -1310,21 +1308,6 @@ export default {
     isProjectFormPage() {
       return this.$route.path === '/business/project-apply/form';
     },
-    projectFormContainer() {
-      return this.isProjectFormPage ? 'div' : 'el-dialog';
-    },
-    projectFormContainerProps() {
-      if (this.isProjectFormPage) return { class: 'project-apply-page-form' };
-      return {
-        modelValue: this.projectBox,
-        title: this.projectDialogTitle,
-        appendToBody: true,
-        destroyOnClose: true,
-        width: '1440px',
-        top: '4vh',
-        class: 'project-apply-dialog',
-      };
-    },
     isBasicInfoReadonly() {
       return this.dialogReadonly || this.isChangeDialog;
     },
@@ -1363,6 +1346,12 @@ export default {
       this.openProjectFormPage();
     }
   },
+  deactivated() {
+    this.closeInnerDialogs();
+  },
+  beforeUnmount() {
+    this.closeInnerDialogs();
+  },
   methods: {
     buildTableOption() {
       return {
@@ -1390,7 +1379,6 @@ export default {
       const id = this.$route.query.id;
       this.dialogType = type;
       this.dialogReadonly = type === 'view';
-      this.projectBox = true;
       if (['add', 'majorSupplement'].includes(type)) {
         this.applyProjectDetail({
           ...emptyForm(),
@@ -1411,11 +1399,15 @@ export default {
       });
     },
     closeProjectForm() {
-      if (this.isProjectFormPage) {
-        this.$router.push('/business/project-apply');
-      } else {
-        this.projectBox = false;
-      }
+      this.$router.push('/business/project-apply');
+    },
+    // 页面被 keep-alive 缓存/卸载时，关闭本页所有 append-to-body 的二级弹窗。
+    // 若不关闭，Teleport 出去的弹窗 DOM 在实例失活时不会被搬离 body，会残留盖在后续页面上。
+    closeInnerDialogs() {
+      this.changeRecordDetailVisible = false;
+      this.attachmentDocumentPreviewVisible = false;
+      this.attachmentImagePreviewVisible = false;
+      this.userBox = false;
     },
     statusValue(row) {
       return row[this.config.statusProp || 'status'];
@@ -1634,17 +1626,6 @@ export default {
       else if (type === 'change') query.name = '项目变更';
       this.$router.push({ path: '/business/project-apply/form', query });
     },
-    resetProjectDialog() {
-      this.$refs.projectForm?.clearValidate();
-      this.form = emptyForm();
-      this.customerRows = [];
-      this.carrierRows = [];
-      this.attachmentRows = [];
-      this.selectedAttachmentRows = [];
-      this.changeRows = [];
-      this.selectedCustomerId = [];
-      this.selectedCarrierIds = [];
-    },
     applyProjectDetail(row) {
       const displayRow = {
         ...row,
@@ -1767,23 +1748,6 @@ export default {
           this.submitLoading = false;
         });
     },
-    handleCancelProject() {
-      if (this.isProjectFormPage) {
-        this.closeProjectForm();
-        return;
-      }
-      if (!['add', 'majorSupplement', 'change'].includes(this.dialogType)) {
-        this.closeProjectForm();
-        return;
-      }
-      this.$confirm('确认后直接关闭弹窗，列表无数据变更，是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        this.closeProjectForm();
-      });
-    },
     saveChangeProject() {
       this.submitChangeForm(false);
     },

From 3e7110ca8cec7ec32542aae1c103e4c46b04de08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 18 Sep 2026 11:17:50 +0800
Subject: [PATCH 10/28] =?UTF-8?q?fix(waybill-manage):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 页面形态状态（列表/独立表单页/独立详情页）在实例创建时锁定，避免随路由变化切换导致弹窗残留
- 模板中形态相关所有判定改为使用锁定状态变量，保证渲染一致性
- 修改 detailContainer、crudContainer、pageFormOption 等方法使用锁定状态，避免缓存实例 option 变形
- 新增 closeInnerDialogs 方法，在组件 deactivated 和 beforeUnmount 生命周期关闭所有 append-to-body 弹窗
- 解决标签页 keep-alive 机制下弹窗 Teleport 持续遗留导致界面异常的问题
- 对运单管理页面多处弹窗和视图控制做统一修复，提升页面稳定性和体验
---
 .workbuddy/memory/2026-09-18.md               | 16 +++++
 .workbuddy/memory/MEMORY.md                   |  3 +-
 .../components/waybill-manage-page.vue        | 72 ++++++++++++++-----
 3 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/.workbuddy/memory/2026-09-18.md b/.workbuddy/memory/2026-09-18.md
index 7d5557d..e5544ff 100644
--- a/.workbuddy/memory/2026-09-18.md
+++ b/.workbuddy/memory/2026-09-18.md
@@ -21,4 +21,20 @@
 
 **遗留同类风险（未改，已告知用户）**：`business/components/waybill-manage-page.vue`（`detailContainer` 在 PageDetail / el-dialog 间切）、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`business/components/waybill-import-dialog.vue`（`standalone`/`createPage`）。统一修法：容器类型在 `created()` 锁定，不随路由/prop 翻转。
 
+---
+
+## 追加修复：运单详情弹窗残留（waybill-manage-page.vue）
+
+用户复现路径：打开 `/business/waybill-manage/detail?id=xxx` → 点「配载管理」菜单 → 页面上又冒出运单详情弹窗。与上面同一根因：`detailContainer()` 随 `isStandaloneWaybillDetailPage` 在 PageDetail / el-dialog 间翻转，`:append-to-body="!isStandaloneWaybillDetailPage"` 随之为 true，`v-model="detailBox"` 仍 true → Teleport 进 body 搬不回来。
+
+**改动**（`src/views/business/components/waybill-manage-page.vue`）：
+- data 新增三个锁定标志 `formPageLocked` / `detailPageLocked` / `formModeLocked`，在 `created()` 一次性从 `isStandaloneWaybillFormPage` / `isStandaloneWaybillDetailPage` / `$route.query.mode` 取值。
+- 模板里所有形态判定（根 class、`v-if="!detailPageLocked"` 的列表容器、`form-page-title`、`status`、独立表单页按钮块、分页 `v-show`、`:append-to-body`、detail-page class、内容 `v-if="detailBox || detailPageLocked"`、独立页 footer / 弹窗 footer slot）全部改读锁定标志。
+- `detailContainer()` / `crudContainer()` / `pageFormOption()`（含 `boxType`）改读锁定标志，避免缓存实例的 option 变形。
+- 新增 `closeInnerDialogs()`（关 detailBox、里程补录、附件文档/图片预览、变更路线、常用地址、流程图、运输路线/地址/站点/地图、常用货物、货物导入、过程配置、Excel 导入）+ `deactivated()` / `beforeUnmount()`。
+
+**关键验证**：`onDeactivated` 在子组件里也会触发 —— apiLifecycle 的 `injectHook` 会向上遍历父链，发现 KeepAlive 父级就把钩子注入到根实例（runtime-core 的 `injectToKeepAliveRoot`），所以写在子组件 waybill-manage-page 上的 `deactivated` 有效。
+
+**校验**：dev server curl 该 .vue 与 scoped style 均 200。仍未 commit。
+
 **未提交**：上述改动 + 上一轮 loading-manage 独立页改造均未 commit。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index db7e494..317e49d 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -14,7 +14,8 @@
 - **根因**：`src/router/tab.js` 按 fullPath 建 wrapper 组件，`layout.vue` 用 `<keep-alive :include="tagsKeep">` 缓存，每个标签一个实例。实例被 deactivate 后**仍会随 `$route` 重新渲染**；此时 `:is` 由 div 变回 `el-dialog`，`v-model` 仍为 true，`append-to-body` 的弹窗经 Teleport 渲染进 body——而 `KeepAlive.deactivate → Teleport.move` 只做 reorder，**不会把 teleport 出去的 DOM 搬回 storage container**，于是弹窗永久残留。
 - **正确写法**：独立页固定 `<div v-if="isXxxPage">` 普通容器，绝不按路由回退成 el-dialog；列表页分支另写或只保留弹窗一种形态。
 - **兜底**：页面内其它 `append-to-body` 的二级弹窗，加 `deactivated(){closeInnerDialogs()}` + `beforeUnmount(){closeInnerDialogs()}` 把 v-model 置 false。
-- 同类风险未修：`business/components/waybill-manage-page.vue`（`detailContainer` 在 PageDetail/el-dialog 间切）、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`business/components/waybill-import-dialog.vue`（`standalone`/`createPage`）。修法同上：容器类型在 `created()` 锁定，不随路由/prop 翻转。
+- 已按此修法落地：loading-manage、project-apply（2026-09-18）、waybill-manage-page（同日，锁 detailPage/formPage/formMode 三个标志）。
+- 未修同类风险：`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`waybill-import-dialog.vue`（`standalone`/`createPage`）。
 
 ## 样式硬规则
 - 底栏：`flex; justify-content:flex-end`、**不写 gap**（间距靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）。浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包住整个选择器。
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index fb9e27c..9d73d46 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -3,21 +3,21 @@
     :class="[
       'waybill-manage-page',
       {
-        'waybill-manage-page--form-page': isStandaloneWaybillFormPage,
-        'waybill-manage-page--detail-page': isStandaloneWaybillDetailPage,
+        'waybill-manage-page--form-page': formPageLocked,
+        'waybill-manage-page--detail-page': detailPageLocked,
       },
     ]"
   >
     <component
-      v-if="!isStandaloneWaybillDetailPage"
+      v-if="!detailPageLocked"
       :is="crudContainer"
       :option="pageFormOption"
-      :form-page-title="isStandaloneWaybillFormPage ? formPageTitle : undefined"
+      :form-page-title="formPageLocked ? formPageTitle : undefined"
       :table-loading="loading"
       :data="data"
       v-model:page="page"
       v-model="form"
-      :status="isStandaloneWaybillFormPage ? dialogReadonly : undefined"
+      :status="formPageLocked ? dialogReadonly : undefined"
       ref="crud"
       :permission="permissionList"
       :before-open="beforeOpen"
@@ -1546,7 +1546,7 @@
           </el-link>
         </div>
         <div
-          v-if="isStandaloneWaybillFormPage"
+          v-if="formPageLocked"
           class="waybill-manage-page__standalone-menu-actions"
         >
           <el-button class="waybill-manage-page__form-close" @click="closeCrudDialog">
@@ -1747,7 +1747,7 @@
     </el-dialog>
 
     <empty-pagination
-      v-show="!isStandaloneWaybillFormPage && !isStandaloneWaybillDetailPage"
+      v-show="!formPageLocked && !detailPageLocked"
       :page="page"
       @size-change="sizeChange"
       @current-change="currentChange"
@@ -1758,18 +1758,18 @@
       :is="detailContainer"
       v-model="detailBox"
       :title="`${config.title}详情`"
-      :append-to-body="!isStandaloneWaybillDetailPage"
+      :append-to-body="!detailPageLocked"
       top="10px"
       width="96%"
       show-close
       :class="[
         'waybill-manage-page__detail-dialog',
-        { 'waybill-manage-page__detail-page': isStandaloneWaybillDetailPage },
+        { 'waybill-manage-page__detail-page': detailPageLocked },
         $attrs.option?.dialogCustomClass,
       ]"
     >
       <div v-loading="detailLoading" class="waybill-manage-page__detail-content">
-        <template v-if="detailBox || isStandaloneWaybillDetailPage">
+        <template v-if="detailBox || detailPageLocked">
           <section-card class="waybill-manage-page__waybill-detail-summary">
             <div class="waybill-manage-page__waybill-heading">
               <strong>运单详情</strong>
@@ -2223,10 +2223,10 @@
           </div>
         </template>
       </div>
-      <div v-if="isStandaloneWaybillDetailPage" class="waybill-manage-page__detail-footer">
+      <div v-if="detailPageLocked" class="waybill-manage-page__detail-footer">
         <el-button type="primary" @click="closeDetail">关闭</el-button>
       </div>
-      <template v-if="!isStandaloneWaybillDetailPage" #footer>
+      <template v-if="!detailPageLocked" #footer>
         <el-button type="primary" @click="closeDetail">关闭</el-button>
       </template>
     </component>
@@ -3518,9 +3518,21 @@ export default {
       selectionList: [],
       attachmentUploadMode: false,
       standaloneFormKey: '',
+      // 页面形态（列表 / 独立表单页 / 独立详情页）在实例创建时锁定一次，之后不再随 $route 变化。
+      // 原因：标签页 keep-alive 只会让实例 deactivate，实例仍会随 $route（全局响应式）重新渲染；
+      // 若形态跟着路由翻回列表/弹窗态，缓存实例会渲染出 append-to-body 的 el-dialog —— 弹窗被
+      // Teleport 到 body 后，KeepAlive.deactivate 的 move 搬不动它，DOM 会永久残留在页面上，
+      // 表现为“从运单详情/独立表单离开后点其它菜单，详情弹窗又冒出来”。
+      formPageLocked: false,
+      detailPageLocked: false,
+      // 同上：表单模式（add / edit）也一次性锁定，避免缓存实例随 $route 变 query 导致 option 变形
+      formModeLocked: '',
     };
   },
   created() {
+    this.formPageLocked = this.isStandaloneWaybillFormPage;
+    this.detailPageLocked = this.isStandaloneWaybillDetailPage;
+    this.formModeLocked = this.$route.query.mode || '';
     if (this.config.enableAllDept && this.isAdmin) {
       this.allDept = 1;
     }
@@ -3544,6 +3556,14 @@ export default {
       this.consumeTemplateCreatePayload();
     }
   },
+  // 标签切走（实例被 keep-alive 缓存）或销毁时，收起本页所有 append-to-body 的弹窗。
+  // 否则 Teleport 出去的弹窗 DOM 会一直留在 body 上，盖住后续打开的页面。
+  deactivated() {
+    this.closeInnerDialogs();
+  },
+  beforeUnmount() {
+    this.closeInnerDialogs();
+  },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     permissionList() {
@@ -3579,8 +3599,9 @@ export default {
     isStandaloneWaybillDetailPage() {
       return this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute;
     },
+    // 容器形态读实例创建时锁定的标志，不随 $route 翻转（详见 data 中 formPageLocked 的说明）
     detailContainer() {
-      return this.isStandaloneWaybillDetailPage ? 'PageDetail' : 'el-dialog';
+      return this.detailPageLocked ? 'PageDetail' : 'el-dialog';
     },
     formPageTitle() {
       if (this.isStandaloneWaybillFormPage) {
@@ -3592,13 +3613,13 @@ export default {
       return '';
     },
     crudContainer() {
-      return this.isStandaloneWaybillFormPage ? 'PageAvueForm' : 'avue-crud';
+      return this.formPageLocked ? 'PageAvueForm' : 'avue-crud';
     },
     pageFormOption() {
-      if (!this.isStandaloneWaybillFormPage) return this.option;
+      if (!this.formPageLocked) return this.option;
       const base = {
         ...this.option,
-        boxType: this.$route.query.mode === 'edit' ? 'edit' : 'add',
+        boxType: this.formModeLocked === 'edit' ? 'edit' : 'add',
         menuBtn: true,
         submitBtn: true,
         emptyBtn: false,
@@ -3862,6 +3883,25 @@ export default {
     },
   },
   methods: {
+    // 页面被 keep-alive 缓存/卸载时调用，关闭本页所有 append-to-body 的弹窗，
+    // 避免 Teleport 出去的 DOM 残留在 body 上盖住后续页面（详见 data 里的说明）。
+    closeInnerDialogs() {
+      this.detailBox = false;
+      this.mileageDialog.visible = false;
+      this.attachmentDocumentPreviewVisible = false;
+      this.attachmentImagePreviewVisible = false;
+      this.waybillRouteChangeBox = false;
+      this.waybillCommonAddressBox = false;
+      this.flowBox = false;
+      this.transportRouteBox = false;
+      this.transportAddressBox = false;
+      this.transportStationBox = false;
+      this.transportMapBox = false;
+      this.commonCargoBox = false;
+      this.cargoImportBox = false;
+      this.waybillProcessConfigBox = false;
+      this.excelBox = false;
+    },
     initStandaloneFormPage() {
       if (!this.isStandaloneWaybillFormPage) return;
       const mode = this.$route.query.mode === 'edit' ? 'edit' : 'add';

From 986feff7b79e7ec0cd7f736694ae82c0fa429fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 18 Sep 2026 11:29:52 +0800
Subject: [PATCH 11/28] =?UTF-8?q?fix(waybill-manage):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 页面形态状态（列表/独立表单页/独立详情页）在实例创建时锁定，避免随路由变化切换导致弹窗残留
- 模板中形态相关所有判定改为使用锁定状态变量，保证渲染一致性
- 修改 detailContainer、crudContainer、pageFormOption 等方法使用锁定状态，避免缓存实例 option 变形
- 新增 closeInnerDialogs 方法，在组件 deactivated 和 beforeUnmount 生命周期关闭所有 append-to-body 弹窗
- 解决标签页 keep-alive 机制下弹窗 Teleport 持续遗留导致界面异常的问题
- 对运单管理页面多处弹窗和视图控制做统一修复，提升页面稳定性和体验
---
 .workbuddy/memory/2026-09-18.md | 26 +++++++++++++++++
 .workbuddy/memory/MEMORY.md     | 52 +++++++++++++++------------------
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/.workbuddy/memory/2026-09-18.md b/.workbuddy/memory/2026-09-18.md
index e5544ff..b6ad131 100644
--- a/.workbuddy/memory/2026-09-18.md
+++ b/.workbuddy/memory/2026-09-18.md
@@ -38,3 +38,29 @@
 **校验**：dev server curl 该 .vue 与 scoped style 均 200。仍未 commit。
 
 **未提交**：上述改动 + 上一轮 loading-manage 独立页改造均未 commit。
+
+---
+
+## 排查（未改码）：配载单详情页反复弹「运单管理不存在」
+
+用户截图：打开 `/business/loading-manage/detail?id=2097607162718441474&name=配载单详情`，连续弹出 6-7 条红色「运单管理不存在」，标签栏堆了一串「运单管理详情」。
+
+**文案来源**：前端 src 里没有这句话，是后端 `BusinessException` 的 msg，被 `src/axios.js` 的响应拦截器（`status !== 200` → `ElMessage.error(message)`）统一弹出。
+
+**主因（通道 A）**：`views/business/waybill-manage-detail.vue` 只有 23 行，写了 `:detail-id="$route.query.id"` —— 直接绑全局 `$route`，**没有路径守卫**。`waybill-manage-page.vue` 的 `detailId` watcher 是 `immediate` 且对任何非空 id 都 `openDetail({id})`。于是：
+1. 之前打开过的每个运单详情标签（`/business/waybill-manage/detail?id=A`、`?id=B`…）各是一个被 keep-alive 缓存的独立实例；
+2. 跳到配载单详情后，这些实例被 deactivate 但仍随 `$route` 重渲染 → `$route.query.id` 变成配载单 id；
+3. prop 变化 → `openDetail({id: 配载单id})` → `getDetail(配载单id)` 去查运单 → 后端「运单管理不存在」→ 拦截器弹一次。**几个旧标签就几条提示**；
+4. 且被污染实例的 `isStandaloneWaybillDetailPage` 仍是 live computed(false) → `openDetail` 走 `$router.push` 分支 → 又生成新的「运单管理详情」标签（标签栏那串的来源）。
+
+同理风险：`waybill-manage.vue:6` 与 `transport-plan.vue:6` 的 `:detail-id="$route.query.detailId"`（`business-crud-page.vue:7356` 会 push `/business/loading-manage?detailId=id`，正好会污染运单列表实例）。
+
+**次因（通道 B）**：`loading-manage.vue` 的 `restoreWaybillRows` 会用 `waybillIdsJson` 里的每个运单 id 并发 `getWaybillDetail(id)`，若历史运单已被删/失效，也会报同一句文案且并发多条。单条 `.catch(() => null)` 挡不住拦截器已弹出的提示。
+
+**区分方法**：Network 里看报错请求的 `id` —— 等于 `2097607162718441474`（配载单 id）→ 通道 A；是别的数字（运单 id）→ 通道 B。或先关掉所有「运单管理详情」标签再复现，通道 A 会消失。
+
+**待确认的修法**（用户要求先报不改）：
+1. `waybill-manage-page.vue`：`created()` 锁 `routePathLocked = this.$route.path`，`detailId` watcher 首行加 `if (this.$route.path !== this.routePathLocked) return;`。
+2. `openDetail()` 的 push 分支加同样守卫（防其它调用路径）。
+3. 宿主 view 绑定加路径守卫（`waybill-manage-detail.vue` / `waybill-manage.vue` / `transport-plan.vue`）双保险。
+4. 可选：`getWaybillDetail` 支持静默模式，供 `restoreWaybillRows` 用，避免历史脏数据刷屏。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index 317e49d..5e989b9 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -3,38 +3,32 @@
 配套后端：`/Users/gxwebsoft/JAVA/tms-api`（不是 tms-erp-api-ws，后者功能滞后）。
 
 ## 列表 + 独立表单页 + 独立详情页（同一组件分流）
-- 路由：`/xxx`（菜单）、`/xxx/form`、`/xxx/detail` 指向同一 .vue；form/detail 为 `component: Layout` + 空 children，`meta:{keepAlive:false}`，detail 带 `activeMenu:'/xxx'`。
-- 组件内按 `$route.path` 分流，列表部分统一 `v-if="!isStandalonePage"` 隐藏。
-- 路由记录不同但组件相同 → 必须 `watch:{$route}` 里重新 init；`mounted` 只覆盖直接打开/刷新。
-- 跳转 `push({path:'/xxx/form',query:{mode,id,name:'新增xxx'}})`，标签标题取 `query.name`。
-- 底栏：只读详情页「关闭」；表单页「关闭/暂存/确认」。
+- `/xxx`、`/xxx/form`、`/xxx/detail` 指向同一 .vue；form/detail 为 `component: Layout` + 空 children、`meta:{keepAlive:false}`，detail 带 `activeMenu:'/xxx'`。
+- 组件内按 `$route.path` 分流，列表部分 `v-if="!isStandalonePage"` 隐藏；路由不同但组件相同 → 必须 `watch:{$route}` 重新 init。
+- 跳转 `push({path:'/xxx/form',query:{mode,id,name}})`，标签标题取 `query.name`；只读详情底栏「关闭」，表单页「关闭/暂存/确认」。
 
-## ⚠️ 独立页容器禁止用 `<component :is>` 在 div 与 el-dialog 间切换
-- **现象**：改成独立整页后，点左侧菜单又弹出旧弹窗，且永久盖在页面上。
-- **根因**：`src/router/tab.js` 按 fullPath 建 wrapper 组件，`layout.vue` 用 `<keep-alive :include="tagsKeep">` 缓存，每个标签一个实例。实例被 deactivate 后**仍会随 `$route` 重新渲染**；此时 `:is` 由 div 变回 `el-dialog`，`v-model` 仍为 true，`append-to-body` 的弹窗经 Teleport 渲染进 body——而 `KeepAlive.deactivate → Teleport.move` 只做 reorder，**不会把 teleport 出去的 DOM 搬回 storage container**，于是弹窗永久残留。
-- **正确写法**：独立页固定 `<div v-if="isXxxPage">` 普通容器，绝不按路由回退成 el-dialog；列表页分支另写或只保留弹窗一种形态。
-- **兜底**：页面内其它 `append-to-body` 的二级弹窗，加 `deactivated(){closeInnerDialogs()}` + `beforeUnmount(){closeInnerDialogs()}` 把 v-model 置 false。
-- 已按此修法落地：loading-manage、project-apply（2026-09-18）、waybill-manage-page（同日，锁 detailPage/formPage/formMode 三个标志）。
-- 未修同类风险：`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`waybill-import-dialog.vue`（`standalone`/`createPage`）。
+## ⚠️ keep-alive 缓存引起的两个同源坑（`tab.js` + `layout.vue`）
+`tab.js` 按 fullPath 建 wrapper，`layout.vue` 用 `<keep-alive :include="tagsKeep">` 缓存，**每标签一实例且永不销毁**；实例 deactivate 后**仍会随全局 `$route` 重渲染**。由此：
 
+**坑一：独立页容器禁止用 `<component :is>` 在 div 与 el-dialog 间切换**
+- 机制：`:is` 由 div 翻回 `el-dialog` + `v-model` 仍 true + `append-to-body` → 弹窗 Teleport 进 body；`TeleportImpl.move` 忽略 `moveType`，**不会把 teleport 的 DOM 搬回 storage container** → 点左侧菜单又冒出旧弹窗。
+- 修法：独立页固定 `<div v-if="isXxxPage">`；另加 `deactivated(){closeInnerDialogs()}` + `beforeUnmount()` 收起页内 append-to-body 二级弹窗（子组件里写 `deactivated` 也有效）。
+- 已修：loading-manage、project-apply、waybill-manage-page（2026-09-18，后者用 `formPageLocked/detailPageLocked/formModeLocked` 锁形态）。未修：`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`、`waybill-import-dialog.vue`。
+
+**坑二：宿主 view 把全局 `$route.query.*` 直接绑给子组件 prop**
+- 现象：打开 A 页详情却弹「运单管理不存在」这类**用错 id** 的后端报错（可重复多条），还莫名多出别的标签。
+- 机制：`waybill-manage-detail.vue` 写 `:detail-id="$route.query.id"` → 旧缓存实例把「当前页的 id」灌进来 → 触发 `openDetail` → 用别人的 id 查自己的接口 → 后端「XX 不存在」→ 全局 axios 拦截器红字弹出（几个旧标签就几条）。其 `isStandaloneXxxPage` 是 live computed(false) → 还会误 `push` 出新标签。
+- 修法：`created()` 锁 `routePathLocked = $route.path`，watcher/跳转方法先判 `if ($route.path !== routePathLocked) return;`；宿主 view 绑定也加路径守卫。
+- 同理：按 id 批量查详情处（如 `restoreWaybillRows`）虽有 `.catch`，但**拦截器已弹过提示**，catch 拦不住。
 ## 样式硬规则
-- 底栏：`flex; justify-content:flex-end`、**不写 gap**（间距靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）。浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包住整个选择器。
+- 底栏：`flex; justify-content:flex-end`、**不写 gap**（靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）。浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 包整个选择器。
 - 按钮层级：次要=不写 type；中间步骤=`primary plain`；主操作=`primary`（禁绿色、禁两个蓝实心）。顺序 `[辅助][取消][保存草稿][提交]`。
-- 独立页标题 `.archive-page-form__title`（18px/600 + 4px 主色竖条）；分组用全局 `<section-card>`；弹窗灰底 `#f5f6fa`。
-- 上传证件区：`width:100%; max-width:240px` + `.el-upload{height:151px}`，禁写死 px。
+- 独立页标题 `.archive-page-form__title`；分组用全局 `<section-card>`；上传证件区 `width:100%; max-width:240px` + `.el-upload{height:151px}`。
 - ⚠️ `<style scoped lang="scss">` **顶层禁 `//` 注释**（Vite5+sass 报 `Unexpected '/'` → 样式模块 500），顶层用 `/* */`。
-- 其余全站细则见 `src/styles/element-ui.scss` 与 AGENTS.md 4.4。
+- 其余细则见 `src/styles/element-ui.scss` 与 AGENTS.md 4.4。
 
-## 表单文案
-- placeholder 只写 `请输入`/`请选择`；例外保留：`请输入或选择车辆`、日期区间 `起/止`、示例值（`如：京A12345`）。校验 message 必须带字段名。
-
-## 复用与自检
-- `business/components/business-crud-page.vue`：option 经 `cloneOption` 克隆；独立表单页走 `PageAvueForm`；详情弹窗 `detailButton + detailSections`。
-- 自检：dev(2889) 时 `curl "localhost:2889/src/xxx.vue"` 与 `curl "...?vue&type=style&index=0&scoped=true&lang.scss"`，200 通过、500 返回带堆栈错误页。
-- ⚠️ `vite build` 会在 `src/page/login/facelogin.vue` 被沙箱敏感内容保护中断（环境问题），不能作为唯一校验手段。
-- dev：`VITE_APP_API=/api`，代理 `172.16.203.228:8000`。
-
-## 导出（后端 FastExcel）
-- 前端 `exportColumns` 后端未使用，导出列以 `XxxExportExcel.java` 为准。
-- BladeX `BeanUtil` 类型不兼容时静默跳过（`Date createTime` → `LocalDateTime` 丢值），须 Service 内 `DateUtil.fromDate(...)` 赋值。
-- 排查导出文件用 Python `zipfile` 读 `xl/worksheets/sheet1.xml`。
+## 表单文案 / 自检 / 导出
+- placeholder 只写 `请输入`/`请选择`；例外：`请输入或选择车辆`、日期区间 `起/止`、示例值。校验 message 必须带字段名。
+- `business-crud-page.vue`：option 经 `cloneOption` 克隆，独立表单页走 `PageAvueForm`。
+- 自检：dev(2889) 时 `curl "localhost:2889/src/xxx.vue"` 与 `"...?vue&type=style&index=0&scoped=true&lang.scss"`，200 通过、500 报错。`vite build` 会在 `facelogin.vue` 被沙箱中断，不能作唯一校验。dev：`VITE_APP_API=/api`，代理 `172.16.203.228:8000`。
+- 导出：前端 `exportColumns` 后端未用，以 `XxxExportExcel.java` 为准；BladeX `BeanUtil` 类型不兼容静默跳过（`Date` → `LocalDateTime` 丢值，须 `DateUtil.fromDate(...)`）。

From ff9fb9168b6aff64b2453efd104cbbd1d5816b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 18 Sep 2026 12:22:25 +0800
Subject: [PATCH 12/28] =?UTF-8?q?fix(router):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=8F=8A=E5=90=88=E5=90=8C=E8=AF=A6=E6=83=85=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E9=87=8D=E5=A4=8D=E5=AE=9A=E4=B9=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为 waybill-manage-page、transport-plan-page 等组件增加 routePathLocked 变量锁定路由路径
- 添加 isOwnedRouteActive 计算属性，防止缓存实例错误读取其它路由的 detailId 导致误请求
- watcher 和 openDetail 方法中添加路由守卫，避免多余的请求和误开详情标签
- 修改宿主视图绑定 detailId，避免直接绑定全局 $route.query 导致缓存污染
- 删除 router/views/index.js 中合同管理详情路由重复定义，防止内容区空白问题
- 优化 waybill-import-dialog 组件样式和结构，增加 section-card 包裹表单区域
- 调整相关组件 data、computed、watch 使用，确保第一次立即 watcher 正确读取路由数据
- 验证所有改动后相关页面 HTTP 200，标签页行为正常，解决「运单管理不存在」和合同详情空白问题
---
 .workbuddy/memory/2026-09-18.md               | 56 +++++++++++++++++++
 .workbuddy/memory/MEMORY.md                   | 41 ++++++--------
 src/router/views/index.js                     | 12 ----
 .../components/transport-plan-page.vue        | 12 ++++
 .../components/waybill-import-dialog.vue      | 18 ++++--
 .../components/waybill-manage-page.vue        | 18 ++++++
 src/views/business/transport-plan.vue         | 11 +++-
 src/views/business/waybill-manage-detail.vue  | 15 ++++-
 src/views/business/waybill-manage.vue         | 11 +++-
 9 files changed, 150 insertions(+), 44 deletions(-)

diff --git a/.workbuddy/memory/2026-09-18.md b/.workbuddy/memory/2026-09-18.md
index b6ad131..d7645e5 100644
--- a/.workbuddy/memory/2026-09-18.md
+++ b/.workbuddy/memory/2026-09-18.md
@@ -64,3 +64,59 @@
 2. `openDetail()` 的 push 分支加同样守卫（防其它调用路径）。
 3. 宿主 view 绑定加路径守卫（`waybill-manage-detail.vue` / `waybill-manage.vue` / `transport-plan.vue`）双保险。
 4. 可选：`getWaybillDetail` 支持静默模式，供 `restoreWaybillRows` 用，避免历史脏数据刷屏。
+
+## 修复（已执行）：「运单管理不存在」误报 + 误开标签
+
+用户确认后按上方案落地，5 个文件：
+
+1. `src/views/business/components/waybill-manage-page.vue`
+   - `data()` 新增 `routePathLocked: this.$route.path` —— **必须放 data，不能放 created**：Vue Options API 顺序是 data → computed → watch(immediate) → created（已在 runtime-core `applyOptions` 源码中核实）。放 created 会让首个 immediate watcher 读到空值。
+   - 新增 computed `isOwnedRouteActive() { return this.$route.path === this.routePathLocked; }`
+   - `detailId` watcher 首行加 `if (!this.isOwnedRouteActive) return;`
+   - `openDetail` 的 `$router.push` 分支同样加守卫。
+2. `src/views/business/components/transport-plan-page.vue`：完全同构的写法（`:detail-id` host 一致），加同样的 `routePathLocked` + `isOwnedRouteActive` + watcher 守卫。
+3. `src/views/business/waybill-manage-detail.vue`：`:detail-id="$route.query.id"` → `:detail-id="detailId"`，computed 做 `this.$route.path === '/business/waybill-manage/detail'` 守卫。
+4. `src/views/business/waybill-manage.vue`：同上，守卫 `/business/waybill-manage`（保留旧链接 `?detailId=` 兼容）。
+5. `src/views/business/transport-plan.vue`：同上，守卫 `/business/transport-plan`。
+
+**验证**：
+- dev server curl 5 个 .vue + 2 个 scoped style 全部 HTTP 200。
+- 用 `@vue/server-renderer` 写了临时 mjs（已删）模拟带 `$route` 的 app，确认 **data() 里访问 `this.$route` 可行**：immediate watcher 触发时 `routePathLocked` 已是正确路径、首次加载不被拦截。
+- `$route` 是 vue-router 挂在 `app.config.globalProperties` 上的 getter（vue-router.mjs:1498），组件实例化时已就绪。
+
+**未做（第 4 条可选）**：给 `getWaybillDetail` 加静默模式供 `restoreWaybillRows` 使用（历史失效运单仍会刷多条红字），待用户定夺。
+
+**另注**：`business-crud-page.vue:6651` 有同构的 `detailId` immediate watcher，但全项目只有上述 3 个宿主 view 传 `:detail-id`，它暂无调用方，未动。
+
+**仍未 commit。**
+
+## 修复（已执行）：合同详情页整页空白 —— 路由表重复定义
+
+**现象**：主订单详情点合同编号 → `/business/contract-manage/detail?id=...&name=合同详情` 内容区空白（侧栏/标签正常）。
+
+**定位过程（关键：真实浏览器复现，不猜）**
+1. 静态排查全部排除：`contract-manage.vue` 及其 26 个依赖 HTTP 200、模块 `import()` 成功、无循环依赖、详情分支引用的 24 个成员全部有定义。
+2. dev 环境登录态无法直接拿（验证码 + `admin/admin` 报 `error_code 2004 用户密码强度过低`），改为**注入式复现**：
+   - `agent-browser open <目标 URL>`（落 `/login`）；
+   - eval 取 `document.getElementById('app').__vue_app__.config.globalProperties` 拿 `$router` / `$store`；
+   - 写 cookie `saber3-access-token`（注意 token 走 **js-cookie**，不是 localStorage）+ `$store.state.user.token`；
+   - 覆写 `XMLHttpRequest.prototype.open/send` 让所有 `/api/**` 返回 `{code:200,data:{...}}`（defineProperty 伪造 readyState/status/responseText 后手动触发 `onloadend`）。
+   - 再 `$router.push(...)` 做 SPA 跳转。
+3. 复现出空白，并拿到决定性证据：
+   - `/business/contract-manage/detail` → `$route.matched.length === 1`（只有 Layout，name undefined），`#avue-view.children.length === 0`，innerHTML 为 `<!---->`。
+   - 对照 `/business/contract-manage/change`（结构相同但未重复定义）→ `matched.length === 2`（Layout + 合同变更），内容完整渲染。
+   - `$router.getRoutes()` 里 detail 有 **3 条**记录：2 个 Layout 父记录 + 1 个子记录（`合同详情`）。
+
+**根因**：`src/router/views/index.js` 中 `/business/contract-manage/detail` **被复制粘贴定义了两次**，两次的子路由都叫 `合同详情`。vue-router 的 `addRoute` 遇到重名会 `removeRoute(name)` 把先注册的子记录删掉，但**不会把它从父记录的 `children` 数组里摘除**；于是第一条 Layout 壳记录留在 matcher 列表里且排在前面，`resolve('/business/contract-manage/detail')` 命中这个"无有效子路由"的壳 → matched 只有 1 层 → `page/index/index.vue` 里 `#avue-view` 的二级 `<router-view>` 无匹配 → 内容区空白。
+（`getRoutes()` 计数是判据：form / change 都是 2 条 = 父 + 子（健康），detail 是 3 条 = 2 父 + 1 子（坏）。）
+
+**修复**：删除重复块（原 314-325 行），只保留 159-169 行那一份。
+
+**验证**：
+- 重复扫描脚本（正则匹配「顶层 path + `component: Layout` + 首个子路由 name」）：views/index.js 27 条 Layout 子路由中仅 `合同详情` 重复；page/index.js 无重复 → 已清零。
+- 修复后浏览器复验：detail → `matched.length === 2`（Layout + 合同详情）、`#avue-view.children.length === 1`，正文完整渲染「基本信息 / 签约类型 / 合同编号 HT-2026-001 / … / 变更记录」。
+- 全量回归：48 条 business/vehicle/payment/settlement 路由 `resolve()` 后 `matched.length` 全部 ≥ 2，`bad: []`。
+- `curl` 校验：`views/index.js`、`contract-manage.vue` 均 200。
+- 残留报错均为 mock 数据形状不符所致（所有接口都返回同一个合同对象，导致 `tree.reduce` / `feeCategories.find` 之类失败），非真实缺陷。
+
+**未 commit**（连同 1、2 轮改动一起待确认）。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index 5e989b9..6be373c 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -1,34 +1,27 @@
 # 项目长期记忆（tms-erp-web-ws / Saber3）
 
-配套后端：`/Users/gxwebsoft/JAVA/tms-api`（不是 tms-erp-api-ws，后者功能滞后）。
+后端：`/Users/gxwebsoft/JAVA/tms-api`（`tms-erp-api-ws` 滞后，别看错仓库）。
 
-## 列表 + 独立表单页 + 独立详情页（同一组件分流）
-- `/xxx`、`/xxx/form`、`/xxx/detail` 指向同一 .vue；form/detail 为 `component: Layout` + 空 children、`meta:{keepAlive:false}`，detail 带 `activeMenu:'/xxx'`。
-- 组件内按 `$route.path` 分流，列表部分 `v-if="!isStandalonePage"` 隐藏；路由不同但组件相同 → 必须 `watch:{$route}` 重新 init。
-- 跳转 `push({path:'/xxx/form',query:{mode,id,name}})`，标签标题取 `query.name`；只读详情底栏「关闭」，表单页「关闭/暂存/确认」。
+## 列表 / 表单 / 详情三态同组件分流
+`/xxx`、`/xxx/form`、`/xxx/detail` 指向同一 `.vue`；form/detail 在 `src/router/views/index.js` 是 `component: Layout` + 空 `children.path` + `meta:{keepAlive:false}`（detail 另带 `activeMenu`）。组件内按 `$route.path` 分流，必须 `watch:{$route}` 重新 init；标签标题取 `query.name`；独立页容器固定 `<div v-if>`，不用 `el-dialog`。
 
-## ⚠️ keep-alive 缓存引起的两个同源坑（`tab.js` + `layout.vue`）
-`tab.js` 按 fullPath 建 wrapper，`layout.vue` 用 `<keep-alive :include="tagsKeep">` 缓存，**每标签一实例且永不销毁**；实例 deactivate 后**仍会随全局 `$route` 重渲染**。由此：
+## ⚠️ keep-alive 三坑
+背景（`router/tab.js` + `page/index/index.vue`）：按 `fullPath` 建 wrapper，`<keep-alive :include="tagsKeep">` 缓存，**每标签一实例、永不销毁**，deactivate 后**仍随全局 `$route` 重渲染**。
 
-**坑一：独立页容器禁止用 `<component :is>` 在 div 与 el-dialog 间切换**
-- 机制：`:is` 由 div 翻回 `el-dialog` + `v-model` 仍 true + `append-to-body` → 弹窗 Teleport 进 body；`TeleportImpl.move` 忽略 `moveType`，**不会把 teleport 的 DOM 搬回 storage container** → 点左侧菜单又冒出旧弹窗。
-- 修法：独立页固定 `<div v-if="isXxxPage">`；另加 `deactivated(){closeInnerDialogs()}` + `beforeUnmount()` 收起页内 append-to-body 二级弹窗（子组件里写 `deactivated` 也有效）。
-- 已修：loading-manage、project-apply、waybill-manage-page（2026-09-18，后者用 `formPageLocked/detailPageLocked/formModeLocked` 锁形态）。未修：`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`、`waybill-import-dialog.vue`。
+**坑一：独立页容器禁用 `<component :is>` 在 div / el-dialog 间切换。** `append-to-body` 走 Teleport，`TeleportImpl.move` 忽略 `moveType`，不会把 DOM 搬回缓存容器 → 切菜单冒出旧弹窗。修法：固定 `<div v-if>` + `deactivated(){closeInnerDialogs()}` + `beforeUnmount()`（写在子组件也生效）。已修 loading-manage / project-apply / waybill-manage-page；未修 `settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`、`waybill-import-dialog.vue`。
+
+**坑二：宿主 view 直绑全局 `$route.query.*` 给子组件 prop。** 缓存实例被灌入当前页 id → 拿错 id 查后端（批量弹「运单管理不存在」），live computed 还会误 push 标签。修法：`routePathLocked` 锁路径 + watcher / push 前判 `isOwnedRouteActive` + 宿主绑定加路径守卫。⚠️ `routePathLocked` **必须放 `data()`**（Options API 顺序 data → computed → watch(immediate) → created；放 created 会读到空值、挡掉首次加载）。已修 waybill-manage-page / transport-plan-page + 三个宿主 view。
+
+**坑三：路由表重复定义 → 内容区整页空白（2026-09-18）。** `/business/contract-manage/detail` 在 `router/views/index.js` 定义两次、子路由同名 `合同详情`。重名 `addRoute` 会 `removeRoute(name)` 移除旧子记录，但**不从父记录 children 里摘除**，第一条 Layout 壳记录留在 matcher 且靠前 → `resolve()` 命中它 → `$route.matched.length === 1` → 二级 router-view 无匹配 → 侧栏/标签正常但内容空白。修法：删重复定义。排查：扫「顶层 path + 首个子路由 name」重复项。
 
-**坑二：宿主 view 把全局 `$route.query.*` 直接绑给子组件 prop**
-- 现象：打开 A 页详情却弹「运单管理不存在」这类**用错 id** 的后端报错（可重复多条），还莫名多出别的标签。
-- 机制：`waybill-manage-detail.vue` 写 `:detail-id="$route.query.id"` → 旧缓存实例把「当前页的 id」灌进来 → 触发 `openDetail` → 用别人的 id 查自己的接口 → 后端「XX 不存在」→ 全局 axios 拦截器红字弹出（几个旧标签就几条）。其 `isStandaloneXxxPage` 是 live computed(false) → 还会误 `push` 出新标签。
-- 修法：`created()` 锁 `routePathLocked = $route.path`，watcher/跳转方法先判 `if ($route.path !== routePathLocked) return;`；宿主 view 绑定也加路径守卫。
-- 同理：按 id 批量查详情处（如 `restoreWaybillRows`）虽有 `.catch`，但**拦截器已弹过提示**，catch 拦不住。
 ## 样式硬规则
-- 底栏：`flex; justify-content:flex-end`、**不写 gap**（靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）。浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 包整个选择器。
-- 按钮层级：次要=不写 type；中间步骤=`primary plain`；主操作=`primary`（禁绿色、禁两个蓝实心）。顺序 `[辅助][取消][保存草稿][提交]`。
+- 底栏 `flex; justify-content:flex-end`，**不写 gap**（靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）；浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包整个选择器。
+- 按钮层级：次要=无 type；中间步骤=`primary plain`；主操作=`primary`（禁绿、禁两个蓝实心）。顺序 `[辅助][取消][保存草稿][提交]`。
 - 独立页标题 `.archive-page-form__title`；分组用全局 `<section-card>`；上传证件区 `width:100%; max-width:240px` + `.el-upload{height:151px}`。
-- ⚠️ `<style scoped lang="scss">` **顶层禁 `//` 注释**（Vite5+sass 报 `Unexpected '/'` → 样式模块 500），顶层用 `/* */`。
-- 其余细则见 `src/styles/element-ui.scss` 与 AGENTS.md 4.4。
+- ⚠️ `<style scoped lang="scss">` 顶层禁 `//` 注释（Vite5 + sass `Unexpected '/'` → 500），顶层用 `/* */`。其余见 `src/styles/element-ui.scss` 与 `AGENTS.md` 4.4。
 
-## 表单文案 / 自检 / 导出
-- placeholder 只写 `请输入`/`请选择`；例外：`请输入或选择车辆`、日期区间 `起/止`、示例值。校验 message 必须带字段名。
+## 表单 / 自检 / 导出
+- placeholder 只写 `请输入`/`请选择`；例外：`请输入或选择车辆`、日期区间 `起`/`止`、示例值。校验 message 须带字段名。
 - `business-crud-page.vue`：option 经 `cloneOption` 克隆，独立表单页走 `PageAvueForm`。
-- 自检：dev(2889) 时 `curl "localhost:2889/src/xxx.vue"` 与 `"...?vue&type=style&index=0&scoped=true&lang.scss"`，200 通过、500 报错。`vite build` 会在 `facelogin.vue` 被沙箱中断，不能作唯一校验。dev：`VITE_APP_API=/api`，代理 `172.16.203.228:8000`。
-- 导出：前端 `exportColumns` 后端未用，以 `XxxExportExcel.java` 为准；BladeX `BeanUtil` 类型不兼容静默跳过（`Date` → `LocalDateTime` 丢值，须 `DateUtil.fromDate(...)`）。
+- 自检：`curl "localhost:2889/src/xxx.vue"` 与 `"...?vue&type=style&index=0&scoped=true&lang.scss"`（200 / 500）。`vite build` 在 `facelogin.vue` 被沙箱中断，不能作唯一校验。dev `VITE_APP_API=/api` 代理 `172.16.203.228:8000`。
+- 导出：前端 `exportColumns` 后端未用，以 `XxxExportExcel.java` 为准；BladeX `BeanUtil` 类型不兼容静默跳过（`Date` → `LocalDateTime` 丢值，用 `DateUtil.fromDate`）。
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 911cbd7..16aba8b 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -311,18 +311,6 @@ export default [
       },
     ],
   },
-  {
-    path: '/business/contract-manage/detail',
-    component: Layout,
-    children: [
-      {
-        path: '',
-        name: '合同详情',
-        meta: { keepAlive: false, activeMenu: '/business/contract-manage' },
-        component: () => import('@/views/business/contract-manage.vue'),
-      },
-    ],
-  },
   {
     path: '/business/contract-manage/change',
     component: Layout,
diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue
index f86b637..588dcce 100644
--- a/src/views/business/components/transport-plan-page.vue
+++ b/src/views/business/components/transport-plan-page.vue
@@ -3020,6 +3020,10 @@ export default {
       Location,
       OfficeBuilding,
       Search,
+      // 实例所属路由的路径快照，用于在 watcher / 跳转前判断当前路由是否还是自己的。
+      // 必须放 data：Options API 的顺序是 data → computed → watch(immediate) → created，
+      // 放 created 的话首个 immediate watcher 会读到空值，把首次加载也挡掉。
+      routePathLocked: this.$route.path,
       form: {},
       suppressTransportTypeClear: false,
       query: {},
@@ -3596,6 +3600,11 @@ export default {
         !this.dialogReadonly
       );
     },
+    // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
+    // 实例被 keep-alive 缓存后 $route 已跑到别的页面时，不能用「当前页面的 id」去查本页数据。
+    isOwnedRouteActive() {
+      return this.$route.path === this.routePathLocked;
+    },
     billingCargoTypeCascaderProps() {
       return {
         label: 'cargoName',
@@ -3673,6 +3682,9 @@ export default {
     detailId: {
       immediate: true,
       handler(id) {
+        // 宿主 view 传的是全局 $route.query.detailId，必须确认当前路由还是自己的，
+        // 否则跳到别的页面后会把「别人的 id」灌进来触发详情请求。
+        if (!this.isOwnedRouteActive) return;
         if (id !== undefined && id !== null && id !== '') {
           this.$nextTick(() => this.openDetail({ id }));
         }
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index 57dc3a0..ee2ccec 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -199,13 +199,17 @@
   </el-dialog>
 
   <el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
-    <el-form :inline="true" :model="detailQuery"
-      ><el-form-item label="车牌号/船号"
+    <section-card class="waybill-search">
+      <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-input v-model="detailQuery.driverName" clearable placeholder="请输入" /></el-form-item
+        ><el-form-item label="司机/船长姓名"
+      ><el-input v-model="detailQuery.driverName" clearable placeholder="请输入" /></el-form-item
       ><el-button type="primary" @click="loadDetails">查询</el-button></el-form
-    >
+      >
+    </section-card>
+
     <el-table :data="details" border
       ><el-table-column type="index" label="序号" width="65" /><el-table-column
         prop="batchNo"
@@ -593,6 +597,7 @@ import { getList as getDriverList } from '@/api/transportCapacity/driver';
 import { getDictionary } from '@/api/system/dictbiz';
 import * as api from '@/api/business/waybill-manage';
 import { downloadXls } from '@/utils/util';
+import SectionCard from '@/components/section-card/main.vue';
 
 const props = defineProps({ modelValue: Boolean, standalone: Boolean, createPage: Boolean });
 const emit = defineEmits(['update:modelValue', 'closed']);
@@ -1617,4 +1622,7 @@ const confirmImport = async () => {
 :global(.avue-layout--horizontal .waybill-import-create__footer) {
   left: 0;
 }
+.waybill-search .el-form-item{
+  margin-bottom: 0 !important;
+}
 </style>
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 9d73d46..2f3576a 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -3518,6 +3518,11 @@ export default {
       selectionList: [],
       attachmentUploadMode: false,
       standaloneFormKey: '',
+      // 实例所属路由的路径快照：用于判断当前 $route 是否还是「本实例自己的路由」。
+      // 必须在 data 里初始化，不能放 created —— Vue 的 Options API 执行顺序是
+      // data → computed → watch(immediate) → created，放 created 会被首个
+      // immediate watcher 读到空值，把本该执行的首次加载也挡掉。
+      routePathLocked: this.$route.path,
       // 页面形态（列表 / 独立表单页 / 独立详情页）在实例创建时锁定一次，之后不再随 $route 变化。
       // 原因：标签页 keep-alive 只会让实例 deactivate，实例仍会随 $route（全局响应式）重新渲染；
       // 若形态跟着路由翻回列表/弹窗态，缓存实例会渲染出 append-to-body 的 el-dialog —— 弹窗被
@@ -3600,6 +3605,12 @@ export default {
       return this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute;
     },
     // 容器形态读实例创建时锁定的标志，不随 $route 翻转（详见 data 中 formPageLocked 的说明）
+    // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
+    // 被 keep-alive 缓存后如果 $route 已经跑到别的页面上，就不该再用「当前页面的 id」
+    // 去触发本实例的请求或跳转，否则会拿别的单据 id 查自己的接口。
+    isOwnedRouteActive() {
+      return this.$route.path === this.routePathLocked;
+    },
     detailContainer() {
       return this.detailPageLocked ? 'PageDetail' : 'el-dialog';
     },
@@ -3867,6 +3878,10 @@ export default {
     detailId: {
       immediate: true,
       handler(id) {
+        // 宿主 view 传的是全局 $route.query.id / detailId，实例被缓存后仍会被重渲染，
+        // 必须确认当前路由还是自己的：否则跳到别的详情页时会把「别的单据 id」灌进来，
+        // 触发 openDetail 用错 id 查运单 → 报「运单管理不存在」。
+        if (!this.isOwnedRouteActive) return;
         if (id !== undefined && id !== null && id !== '') {
           this.$nextTick(() => this.openDetail({ id }));
         }
@@ -4449,6 +4464,9 @@ export default {
     },
     openDetail(row) {
       if (!this.isStandaloneWaybillDetailPage) {
+        // 已不在自己的路由上（被缓存后路由切走）：此时 row.id 极可能是别的单据的 id，
+        // 再 push 会生成一堆错误的「运单管理详情」标签
+        if (!this.isOwnedRouteActive) return;
         this.$router.push({ path: standaloneWaybillDetailRoute, query: { id: row.id } });
         return;
       }
diff --git a/src/views/business/transport-plan.vue b/src/views/business/transport-plan.vue
index b43cad7..4c5e770 100644
--- a/src/views/business/transport-plan.vue
+++ b/src/views/business/transport-plan.vue
@@ -1,9 +1,11 @@
 <template>
+  <!-- 同 waybill-manage-detail.vue：只在当前路由属于本页时才透传 detailId，
+       避免标签页缓存的实例被其它页面的 detailId 污染后误开详情。 -->
   <transport-plan-page
     :api="api"
     :config="config"
     :crud-option="option"
-    :detail-id="$route.query.detailId"
+    :detail-id="detailId"
     :menu-width="220"
     standalone-form-page
   />
@@ -14,6 +16,8 @@ import TransportPlanPage from './components/transport-plan-page.vue';
 import * as api from '@/api/business/transport-plan';
 import { config, option } from '@/option/business/transport-plan';
 
+const listRoutePath = '/business/transport-plan';
+
 export default {
   components: { TransportPlanPage },
   data() {
@@ -23,5 +27,10 @@ export default {
       option,
     };
   },
+  computed: {
+    detailId() {
+      return this.$route.path === listRoutePath ? this.$route.query.detailId : '';
+    },
+  },
 };
 </script>
diff --git a/src/views/business/waybill-manage-detail.vue b/src/views/business/waybill-manage-detail.vue
index 6dfdac5..ec47ce5 100644
--- a/src/views/business/waybill-manage-detail.vue
+++ b/src/views/business/waybill-manage-detail.vue
@@ -1,9 +1,15 @@
 <template>
+  <!--
+    detailId 必须做路由守卫：本组件对应 /business/waybill-manage/detail，
+    而 $route 是全局响应式的。标签页 keep-alive 会缓存本实例，路由切到别的详情页后
+    实例仍会重渲染，若无守卫就会把「当前页面的 id」灌进子组件，导致它拿别的单据 id
+    去查运单 → 报「运单管理不存在」，并误生成一个又一个运单详情标签。
+  -->
   <waybill-manage-page
     :api="api"
     :config="config"
     :crud-option="option"
-    :detail-id="$route.query.id"
+    :detail-id="detailId"
     :menu-width="250"
     standalone-detail-page
   />
@@ -14,10 +20,17 @@ import WaybillManagePage from './components/waybill-manage-page.vue';
 import * as api from '@/api/business/waybill-manage';
 import { config, option } from '@/option/business/waybill-manage';
 
+const detailRoutePath = '/business/waybill-manage/detail';
+
 export default {
   components: { WaybillManagePage },
   data() {
     return { api, config, option };
   },
+  computed: {
+    detailId() {
+      return this.$route.path === detailRoutePath ? this.$route.query.id : '';
+    },
+  },
 };
 </script>
diff --git a/src/views/business/waybill-manage.vue b/src/views/business/waybill-manage.vue
index e99dc1e..bc03525 100644
--- a/src/views/business/waybill-manage.vue
+++ b/src/views/business/waybill-manage.vue
@@ -1,9 +1,11 @@
 <template>
+  <!-- 同 waybill-manage-detail.vue：保留旧链接 /business/waybill-manage?detailId=xxx 的能力，
+       但只在当前路由确实属于本页时才透传，避免被其它页面的 detailId 污染。 -->
   <waybill-manage-page
     :api="api"
     :config="config"
     :crud-option="option"
-    :detail-id="$route.query.detailId"
+    :detail-id="detailId"
     :menu-width="250"
     standalone-form-page
   />
@@ -14,6 +16,8 @@ import WaybillManagePage from './components/waybill-manage-page.vue';
 import * as api from '@/api/business/waybill-manage';
 import { config, option } from '@/option/business/waybill-manage';
 
+const listRoutePath = '/business/waybill-manage';
+
 export default {
   components: { WaybillManagePage },
   data() {
@@ -23,5 +27,10 @@ export default {
       option,
     };
   },
+  computed: {
+    detailId() {
+      return this.$route.path === listRoutePath ? this.$route.query.detailId : '';
+    },
+  },
 };
 </script>

From bcbc45bb03b70392982a9e124ae25fb944acdea6 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Fri, 18 Sep 2026 18:25:52 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js               |   8 +-
 src/router/avue-router.js            |   2 +
 src/router/views/index.js            |  86 +++++-----
 src/views/business/project-apply.vue |  12 ++
 src/views/system/dept.vue            |  30 ----
 src/views/system/user.vue            | 233 +++++++++++++++++++++++++--
 6 files changed, 286 insertions(+), 85 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 70d5b20..4e1c8de 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -31,10 +31,16 @@ export const add = row => {
   });
 };
 
-export const syncIamAccounts = () => {
+export const syncIamAccounts = (current = 1, size = 50, signal) => {
   return request({
     url: '/blade-system/user/sync-iam-accounts',
     method: 'post',
+    params: {
+      current,
+      size,
+    },
+    timeout: 60000,
+    signal,
   });
 };
 
diff --git a/src/router/avue-router.js b/src/router/avue-router.js
index 3785072..5538125 100644
--- a/src/router/avue-router.js
+++ b/src/router/avue-router.js
@@ -3,6 +3,8 @@ import { getToken } from '@/utils/auth';
 import store from '@/store';
 import { generateIframePath, processUrlForQuery, isURL } from './router';
 import { wrapViewLoader } from '@/utils/chunk-reload';
+
+// 保持懒加载，避免 eager 与 store 循环依赖（Cannot access 'store' before initialization）
 const modules = import.meta.glob('../**/**/*.vue');
 
 // 将多级路由扁平化为二级路由，支持 keep-alive 跨层级缓存
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 3a380e6..93079e0 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,5 +1,8 @@
 import Layout from '@/page/index/index.vue';
 import Store from '@/store/';
+import { wrapViewLoader } from '@/utils/chunk-reload';
+
+const loadView = loader => wrapViewLoader(loader);
 
 export default [
   {
@@ -10,7 +13,7 @@ export default [
         path: '',
         name: '汇票付款表单',
         meta: { keepAlive: false, activeMenu: '/payment/bill-payment' },
-        component: () => import('@/views/payment/bill-payment-form.vue'),
+        component: loadView(() => import('@/views/payment/bill-payment-form.vue')),
       },
     ],
   },
@@ -22,7 +25,7 @@ export default [
         path: '',
         name: '汇票台账表单',
         meta: { keepAlive: false, activeMenu: '/payment/bill-ledger' },
-        component: () => import('@/views/payment/bill-ledger-form.vue'),
+        component: loadView(() => import('@/views/payment/bill-ledger-form.vue')),
       },
     ],
   },
@@ -34,7 +37,7 @@ export default [
         path: '',
         name: '认领记录详情',
         meta: { keepAlive: false, activeMenu: '/payment/receipt-claim-record' },
-        component: () => import('@/views/payment/receipt-claim-record-form.vue'),
+        component: loadView(() => import('@/views/payment/receipt-claim-record-form.vue')),
       },
     ],
   },
@@ -46,7 +49,7 @@ export default [
         path: '',
         name: '收款流水认领',
         meta: { keepAlive: false, activeMenu: '/payment/receipt-flow' },
-        component: () => import('@/views/payment/receipt-flow-form.vue'),
+        component: loadView(() => import('@/views/payment/receipt-flow-form.vue')),
       },
     ],
   },
@@ -58,7 +61,7 @@ export default [
         path: '',
         name: '收票登记',
         meta: { keepAlive: false, activeMenu: '/payment/invoice-receipt' },
-        component: () => import('@/views/payment/invoice-receipt-form.vue'),
+        component: loadView(() => import('@/views/payment/invoice-receipt-form.vue')),
       },
     ],
   },
@@ -70,7 +73,7 @@ export default [
         path: '',
         name: '开票申请',
         meta: { keepAlive: false, activeMenu: '/payment/invoice-application' },
-        component: () => import('@/views/payment/invoice-application-form.vue'),
+        component: loadView(() => import('@/views/payment/invoice-application-form.vue')),
       },
     ],
   },
@@ -82,7 +85,7 @@ export default [
         path: '',
         name: '付款申请',
         meta: { keepAlive: false, activeMenu: '/payment/payment-application' },
-        component: () => import('@/views/payment/payment-application-form.vue'),
+        component: loadView(() => import('@/views/payment/payment-application-form.vue')),
       },
     ],
   },
@@ -97,7 +100,7 @@ export default [
           keepAlive: false,
           activeMenu: '/settlement/pre-settlement',
         },
-        component: () => import('@/views/settlement/pre-settlement-form.vue'),
+        component: loadView(() => import('@/views/settlement/pre-settlement-form.vue')),
       },
     ],
   },
@@ -112,7 +115,7 @@ export default [
           keepAlive: false,
           activeMenu: '/settlement/formal-settlement',
         },
-        component: () => import('@/views/settlement/formal-settlement-form.vue'),
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
       },
     ],
   },
@@ -127,7 +130,7 @@ export default [
           keepAlive: false,
           activeMenu: '/settlement/transport-reconciliation',
         },
-        component: () => import('@/views/settlement/transport-reconciliation-form.vue'),
+        component: loadView(() => import('@/views/settlement/transport-reconciliation-form.vue')),
       },
     ],
   },
@@ -139,7 +142,7 @@ export default [
         path: '',
         name: '执行凭证批次详情',
         meta: { keepAlive: false, activeMenu: '/business/voucher-manage' },
-        component: () => import('@/views/business/voucher-manage-detail.vue'),
+        component: loadView(() => import('@/views/business/voucher-manage-detail.vue')),
       },
     ],
   },
@@ -151,7 +154,7 @@ export default [
         path: '',
         name: '新增合同管理',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/contract-manage.vue'),
+        component: loadView(() => import('@/views/business/contract-manage.vue')),
       },
     ],
   },
@@ -163,7 +166,7 @@ export default [
         path: '',
         name: '合同详情',
         meta: { keepAlive: false, activeMenu: '/business/contract-manage' },
-        component: () => import('@/views/business/contract-manage.vue'),
+        component: loadView(() => import('@/views/business/contract-manage.vue')),
       },
     ],
   },
@@ -175,7 +178,7 @@ export default [
         path: '',
         name: '新增项目申请',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/project-apply.vue'),
+        component: loadView(() => import('@/views/business/project-apply.vue')),
       },
     ],
   },
@@ -187,7 +190,7 @@ export default [
         path: '',
         name: '新增编辑运单管理',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/waybill-manage.vue'),
+        component: loadView(() => import('@/views/business/waybill-manage.vue')),
       },
     ],
   },
@@ -199,7 +202,7 @@ export default [
         path: '',
         name: '运单管理详情',
         meta: { keepAlive: false, activeMenu: '/business/waybill-manage' },
-        component: () => import('@/views/business/waybill-manage-detail.vue'),
+        component: loadView(() => import('@/views/business/waybill-manage-detail.vue')),
       },
     ],
   },
@@ -211,7 +214,7 @@ export default [
         path: '',
         name: '导入运单',
         meta: { keepAlive: false, activeMenu: '/business/waybill-import' },
-        component: () => import('@/views/business/waybill-import.vue'),
+        component: loadView(() => import('@/views/business/waybill-import.vue')),
       },
     ],
   },
@@ -223,7 +226,7 @@ export default [
         path: '',
         name: '新建导入运单',
         meta: { keepAlive: false, activeMenu: '/business/waybill-import' },
-        component: () => import('@/views/business/waybill-import-form.vue'),
+        component: loadView(() => import('@/views/business/waybill-import-form.vue')),
       },
     ],
   },
@@ -235,7 +238,7 @@ export default [
         path: '',
         name: '新增编辑配载管理',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/loading-manage.vue'),
+        component: loadView(() => import('@/views/business/loading-manage.vue')),
       },
     ],
   },
@@ -247,7 +250,7 @@ export default [
         path: '',
         name: '新增编辑运输计划',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/transport-plan.vue'),
+        component: loadView(() => import('@/views/business/transport-plan.vue')),
       },
     ],
   },
@@ -259,7 +262,7 @@ export default [
         path: '',
         name: '导入运输计划',
         meta: { keepAlive: false, activeMenu: '/business/transport-plan' },
-        component: () => import('@/views/business/transport-plan-import.vue'),
+        component: loadView(() => import('@/views/business/transport-plan-import.vue')),
       },
     ],
   },
@@ -271,7 +274,7 @@ export default [
         path: '',
         name: '计划调度',
         meta: { keepAlive: false, activeMenu: '/business/transport-plan' },
-        component: () => import('@/views/business/transport-plan-dispatch.vue'),
+        component: loadView(() => import('@/views/business/transport-plan-dispatch.vue')),
       },
     ],
   },
@@ -283,7 +286,7 @@ export default [
         path: '',
         name: '新增编辑运单模板',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/shipping-template.vue'),
+        component: loadView(() => import('@/views/business/shipping-template.vue')),
       },
     ],
   },
@@ -295,7 +298,7 @@ export default [
         path: '',
         name: '新增客商档案',
         meta: { keepAlive: false },
-        component: () => import('@/views/vehicle/customer-archive.vue'),
+        component: loadView(() => import('@/views/vehicle/customer-archive.vue')),
       },
     ],
   },
@@ -307,7 +310,7 @@ export default [
         path: '',
         name: '合同变更',
         meta: { keepAlive: false },
-        component: () => import('@/views/business/contract-manage-change.vue'),
+        component: loadView(() => import('@/views/business/contract-manage-change.vue')),
       },
     ],
   },
@@ -323,7 +326,7 @@ export default [
         meta: {
           i18n: 'dashboard',
         },
-        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue'),
+        component: loadView(() => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue')),
       },
       {
         path: 'dashboard',
@@ -332,7 +335,7 @@ export default [
           i18n: 'dashboard',
           menu: false,
         },
-        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue'),
+        component: loadView(() => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue')),
       },
     ],
   },
@@ -347,7 +350,7 @@ export default [
         meta: {
           i18n: 'test',
         },
-        component: () => import(/* webpackChunkName: "views" */ '@/views/util/test.vue'),
+        component: loadView(() => import(/* webpackChunkName: "views" */ '@/views/util/test.vue')),
       },
     ],
   },
@@ -362,8 +365,9 @@ export default [
         meta: {
           i18n: 'dict',
         },
-        component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal.vue'),
+        component: loadView(() =>
+          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal.vue')
+        ),
       },
     ],
   },
@@ -378,8 +382,9 @@ export default [
         meta: {
           i18n: 'dict',
         },
-        component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical.vue'),
+        component: loadView(() =>
+          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical.vue')
+        ),
       },
     ],
   },
@@ -394,7 +399,7 @@ export default [
         meta: {
           i18n: 'info',
         },
-        component: () => import(/* webpackChunkName: "views" */ '@/views/system/userinfo.vue'),
+        component: loadView(() => import(/* webpackChunkName: "views" */ '@/views/system/userinfo.vue')),
       },
     ],
   },
@@ -409,8 +414,9 @@ export default [
         meta: {
           i18n: 'work',
         },
-        component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/form.vue'),
+        component: loadView(() =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/form.vue')
+        ),
       },
       {
         path: 'handle/:taskId/:processInstanceId/:businessId',
@@ -418,8 +424,9 @@ export default [
         meta: {
           i18n: 'work',
         },
-        component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/handle.vue'),
+        component: loadView(() =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/handle.vue')
+        ),
       },
       {
         path: 'detail/:processInstanceId/:businessId',
@@ -427,8 +434,9 @@ export default [
         meta: {
           i18n: 'work',
         },
-        component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/detail.vue'),
+        component: loadView(() =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/detail.vue')
+        ),
       },
     ],
   },
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 3f62e96..e48ba77 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -1354,6 +1354,13 @@ export default {
         .filter(fileType => !uploadedTypes.has(fileType));
     },
   },
+  watch: {
+    '$route.fullPath'() {
+      if (this.isProjectFormPage) {
+        this.openProjectFormPage();
+      }
+    },
+  },
   created() {
     this.loadDeptOptions();
     this.loadCargoTypeOptions();
@@ -1363,6 +1370,11 @@ export default {
       this.openProjectFormPage();
     }
   },
+  activated() {
+    if (this.isProjectFormPage && !this.projectBox) {
+      this.openProjectFormPage();
+    }
+  },
   methods: {
     buildTableOption() {
       return {
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index edad1f7..9004b7e 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -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"
@@ -135,7 +127,6 @@ import {
   add,
   getDept,
   getDeptTree,
-  syncIamOrganizations,
 } from '@/api/system/dept';
 import { getLeaderList } from '@/api/system/user';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
@@ -168,7 +159,6 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
-      iamSyncLoading: false,
       parentId: 0,
       page: {
         pageSize: 10,
@@ -708,26 +698,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('请选择至少一条数据');
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 1ed0669..70247da 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -340,6 +340,45 @@
           </template>
         </el-dialog>
 
+        <el-dialog
+          v-model="oaSyncVisible"
+          width="480px"
+          append-to-body
+          :close-on-click-modal="false"
+          :close-on-press-escape="!oaSyncRunning"
+          :show-close="!oaSyncRunning"
+          class="oa-sync-dialog"
+          @close="closeOaSyncDialog"
+        >
+          <template #header>
+            <span class="dialog-title">{{ oaSyncDialogTitle }}</span>
+          </template>
+          <div class="oa-sync-body">
+            <el-progress
+              :percentage="oaSyncPercent"
+              :status="oaSyncProgressStatus"
+              :stroke-width="12"
+            />
+            <div class="oa-sync-meta">当前进度：第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页</div>
+            <div class="oa-sync-stats">
+              <div class="oa-sync-stat">
+                <span class="oa-sync-stat__label">同步成功</span>
+                <span class="oa-sync-stat__value oa-sync-stat__value--success">{{ oaSyncProgress.synced }}</span>
+              </div>
+              <div class="oa-sync-stat">
+                <span class="oa-sync-stat__label">跳过</span>
+                <span class="oa-sync-stat__value oa-sync-stat__value--skip">{{ oaSyncProgress.skipped }}</span>
+              </div>
+            </div>
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button v-if="oaSyncRunning" @click="cancelOaSync">取消</el-button>
+              <el-button v-else type="primary" @click="closeOaSyncDialog">关闭</el-button>
+            </span>
+          </template>
+        </el-dialog>
+
         <!-- 认证日志组件 -->
         <auth-log ref="authLog" />
         <!-- 认证锁定配置组件 -->
@@ -403,6 +442,18 @@ export default {
       query: {},
       loading: true,
       iamSyncLoading: false,
+      oaSyncVisible: false,
+      oaSyncRunning: false,
+      oaSyncCancelled: false,
+      oaSyncStatus: 'running',
+      oaSyncController: null,
+      oaSyncProgress: {
+        current: 0,
+        size: 50,
+        total: 0,
+        synced: 0,
+        skipped: 0,
+      },
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -453,6 +504,46 @@ export default {
   },
   computed: {
     ...mapGetters(['userInfo', 'permission']),
+    oaSyncDialogTitle() {
+      if (this.oaSyncStatus === 'done') {
+        return '同步完成';
+      }
+      if (this.oaSyncStatus === 'cancelled') {
+        return '已取消同步';
+      }
+      if (this.oaSyncStatus === 'error') {
+        return '同步失败';
+      }
+      return '同步人员';
+    },
+    oaSyncTotalPage() {
+      const total = Number(this.oaSyncProgress.total) || 0;
+      const size = Number(this.oaSyncProgress.size) || 50;
+      if (total <= 0) {
+        return this.oaSyncProgress.current || 0;
+      }
+      return Math.max(1, Math.ceil(total / size));
+    },
+    oaSyncPercent() {
+      if (this.oaSyncStatus === 'done') {
+        return 100;
+      }
+      const totalPage = this.oaSyncTotalPage;
+      const current = Number(this.oaSyncProgress.current) || 0;
+      if (totalPage <= 0) {
+        return 0;
+      }
+      return Math.min(100, Math.round((current / totalPage) * 100));
+    },
+    oaSyncProgressStatus() {
+      if (this.oaSyncStatus === 'done') {
+        return 'success';
+      }
+      if (this.oaSyncStatus === 'error') {
+        return 'exception';
+      }
+      return undefined;
+    },
     // 所属组织级联配置：checkStrictly 为 false 时只能选择最后一级（叶子节点）
     deptCascaderProps() {
       return {
@@ -564,23 +655,87 @@ export default {
       }
     },
     handleIamSync() {
-      this.$confirm('确定从IAM同步人员信息?', '提示', {
+      this.$confirm('确定从OA同步人员及组织信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          this.iamSyncLoading = true;
-          return syncIamAccounts();
-        })
-        .then(res => {
-          const count = res?.data?.data ?? 0;
-          this.$message.success(`IAM人员同步完成，共处理${count}条`);
+      }).then(() => {
+        this.startOaSync();
+      });
+    },
+    startOaSync() {
+      this.iamSyncLoading = true;
+      this.oaSyncVisible = true;
+      this.oaSyncRunning = true;
+      this.oaSyncCancelled = false;
+      this.oaSyncStatus = 'running';
+      this.oaSyncController = new AbortController();
+      this.oaSyncProgress = {
+        current: 0,
+        size: 50,
+        total: 0,
+        synced: 0,
+        skipped: 0,
+      };
+      this.runOaSyncPages();
+    },
+    isOaSyncCanceledError(error) {
+      return (
+        this.oaSyncCancelled ||
+        error?.code === 'ERR_CANCELED' ||
+        error?.name === 'CanceledError' ||
+        error?.name === 'AbortError'
+      );
+    },
+    async runOaSyncPages() {
+      const size = 50;
+      let current = 1;
+      try {
+        while (!this.oaSyncCancelled) {
+          const res = await syncIamAccounts(current, size, this.oaSyncController?.signal);
+          const page = res?.data?.data || {};
+          this.oaSyncProgress.current = page.current || current;
+          this.oaSyncProgress.size = page.size || size;
+          this.oaSyncProgress.total = page.total || 0;
+          this.oaSyncProgress.synced += page.syncedCount || 0;
+          this.oaSyncProgress.skipped += page.skippedCount || 0;
+          if (page.finished) {
+            this.oaSyncStatus = 'done';
+            break;
+          }
+          current += 1;
+        }
+        if (this.oaSyncCancelled && this.oaSyncStatus === 'running') {
+          this.oaSyncStatus = 'cancelled';
+        }
+      } catch (error) {
+        if (this.isOaSyncCanceledError(error)) {
+          this.oaSyncStatus = 'cancelled';
+        } else {
+          this.oaSyncStatus = 'error';
+          this.$message.error(error?.message || 'OA人员同步失败');
+        }
+      } finally {
+        this.oaSyncRunning = false;
+        this.iamSyncLoading = false;
+        if (this.oaSyncStatus === 'done' || this.oaSyncStatus === 'cancelled') {
           this.onLoad(this.page, this.query);
-        })
-        .finally(() => {
-          this.iamSyncLoading = false;
-        });
+        }
+      }
+    },
+    cancelOaSync() {
+      if (!this.oaSyncRunning) {
+        return;
+      }
+      this.oaSyncCancelled = true;
+      this.oaSyncController?.abort();
+    },
+    closeOaSyncDialog() {
+      if (this.oaSyncRunning) {
+        this.cancelOaSync();
+        return;
+      }
+      this.oaSyncVisible = false;
     },
     handleSetLeader(row) {
       const tip = row.isLeader === 1 ? '确定取消用户的主管职务?' : '确定设置用户为主管职务?';
@@ -1150,14 +1305,16 @@ export default {
   margin-top: 8px;
 }
 
-.user-edit-dialog .dialog-title {
+.user-edit-dialog .dialog-title,
+.oa-sync-dialog .dialog-title {
   display: inline-flex;
   align-items: center;
   font-size: 16px;
   font-weight: 600;
 }
 
-.user-edit-dialog .dialog-title::before {
+.user-edit-dialog .dialog-title::before,
+.oa-sync-dialog .dialog-title::before {
   width: 4px;
   height: 18px;
   margin-right: 8px;
@@ -1165,6 +1322,52 @@ export default {
   content: '';
 }
 
+.oa-sync-body {
+  padding: 8px 4px 0;
+}
+
+.oa-sync-meta {
+  margin-top: 12px;
+  color: #606266;
+  font-size: 13px;
+}
+
+.oa-sync-stats {
+  display: flex;
+  gap: 16px;
+  margin-top: 16px;
+}
+
+.oa-sync-stat {
+  flex: 1;
+  padding: 12px 16px;
+  background: #fafafa;
+  border: 1px solid #eff1f7;
+  border-radius: 4px;
+}
+
+.oa-sync-stat__label {
+  display: block;
+  color: #909399;
+  font-size: 12px;
+}
+
+.oa-sync-stat__value {
+  display: block;
+  margin-top: 6px;
+  font-size: 22px;
+  font-weight: 600;
+  line-height: 1.2;
+}
+
+.oa-sync-stat__value--success {
+  color: #409eff;
+}
+
+.oa-sync-stat__value--skip {
+  color: #909399;
+}
+
 .user-edit-dialog .el-form-item {
   margin-bottom: 14px;
 }

From 4af9afda61487f894d650b9b28621bca350a394d Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sun, 20 Sep 2026 13:17:05 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E8=B0=83=E8=AF=95mk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/waybill-manage.js            |  19 +
 src/api/system/business-process.js            |  18 +
 src/api/system/dept.js                        |  26 +
 src/api/vehicle/customer-archive.js           |  28 ++
 src/option/base/measurement-unit.js           |  14 +
 src/router/page/index.js                      |  10 +
 src/views/base/measurement-unit.vue           |   1 +
 .../components/billing-plan-editor.vue        |  85 +++-
 .../components/waybill-manage-page.vue        | 454 +++++++++++++++++-
 src/views/business/project-apply.vue          |  28 +-
 src/views/system/dept.vue                     | 272 +++++++++++
 .../vehicle/customer-archive-public-view.vue  |  88 ++++
 src/views/vehicle/customer-archive.vue        | 164 ++++++-
 vite.config.mjs                               |  26 +-
 14 files changed, 1188 insertions(+), 45 deletions(-)
 create mode 100644 src/api/system/business-process.js
 create mode 100644 src/views/vehicle/customer-archive-public-view.vue

diff --git a/src/api/business/waybill-manage.js b/src/api/business/waybill-manage.js
index 316f053..2ab51d8 100644
--- a/src/api/business/waybill-manage.js
+++ b/src/api/business/waybill-manage.js
@@ -33,6 +33,25 @@ export const getPunchRecords = waybillId =>
     method: 'get',
     params: { waybillId },
   });
+
+/** 运单车辆实时定位 */
+export const locateVehicle = id =>
+  request({
+    url: `${baseUrl}/locate`,
+    method: 'post',
+    params: { id },
+    timeout: 60000,
+  });
+
+/** 运单车辆历史轨迹 */
+export const trackVehicle = (id, startDate, endDate) =>
+  request({
+    url: `${baseUrl}/track`,
+    method: 'post',
+    params: { id, startDate, endDate },
+    timeout: 60000,
+  });
+
 export const roadLoading = ids =>
   request({
     url: `${baseUrl}/road-loading`,
diff --git a/src/api/system/business-process.js b/src/api/system/business-process.js
new file mode 100644
index 0000000..3cfcd67
--- /dev/null
+++ b/src/api/system/business-process.js
@@ -0,0 +1,18 @@
+import request from '@/axios';
+
+/**
+ * 调用 MK processSubmit 提交审核流
+ * @param {Object} data
+ * @param {string} data.templateCode 模板编码
+ * @param {string} data.submitIdentity 提交人（手机号）
+ * @param {string} data.loginName 登录账号（手机号）
+ * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} [data.subject] 流程标题
+ */
+export const processSubmit = data => {
+  return request({
+    url: '/blade-system/businessProcess/processSubmit',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 7bf3f68..de1edf6 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -48,6 +48,32 @@ export const syncIamOrganizations = () => {
   });
 };
 
+export const syncOaCompany = (current = 1, size = 20, signal) => {
+  return request({
+    url: '/blade-system/dept/sync-oa-company',
+    method: 'post',
+    params: {
+      current,
+      size,
+    },
+    timeout: 60000,
+    signal,
+  });
+};
+
+export const syncOaDepartment = (current = 1, size = 20, signal) => {
+  return request({
+    url: '/blade-system/dept/sync-oa-department',
+    method: 'post',
+    params: {
+      current,
+      size,
+    },
+    timeout: 60000,
+    signal,
+  });
+};
+
 export const update = row => {
   return request({
     url: '/blade-system/dept/submit',
diff --git a/src/api/vehicle/customer-archive.js b/src/api/vehicle/customer-archive.js
index 9d859f2..98e9f4c 100644
--- a/src/api/vehicle/customer-archive.js
+++ b/src/api/vehicle/customer-archive.js
@@ -22,6 +22,19 @@ export const getDetail = id => {
   });
 };
 
+export const getPublicDetail = id => {
+  return request({
+    url: '/blade-transport/customer-archive/public/detail',
+    method: 'get',
+    meta: {
+      isToken: false,
+    },
+    params: {
+      id,
+    },
+  });
+};
+
 export const getChangeRecordList = (customerId, current, size) => {
   return request({
     url: '/blade-transport/customer-archive/change-record/list',
@@ -34,6 +47,21 @@ export const getChangeRecordList = (customerId, current, size) => {
   });
 };
 
+export const getPublicChangeRecordList = (customerId, current, size) => {
+  return request({
+    url: '/blade-transport/customer-archive/public/change-record/list',
+    method: 'get',
+    meta: {
+      isToken: false,
+    },
+    params: {
+      customerId,
+      current,
+      size,
+    },
+  });
+};
+
 export const submit = row => {
   return request({
     url: '/blade-transport/customer-archive/submit',
diff --git a/src/option/base/measurement-unit.js b/src/option/base/measurement-unit.js
index c135823..5f02982 100644
--- a/src/option/base/measurement-unit.js
+++ b/src/option/base/measurement-unit.js
@@ -38,6 +38,20 @@ export const createOption = () => ({
   menuWidth: 240,
   menuFixed: 'right',
   column: [
+    {
+      label: '计量单位编码',
+      prop: 'unitCode',
+      minWidth: 150,
+      search: true,
+      searchOrder: 4,
+      searchSpan: 6,
+      maxlength: 50,
+      showWordLimit: true,
+      rules: [
+        { required: true, message: '请输入计量单位编码', trigger: 'blur' },
+        { max: 50, message: '计量单位编码不能超过50个字', trigger: 'blur' },
+      ],
+    },
     {
       label: '计量单位',
       prop: 'unitName',
diff --git a/src/router/page/index.js b/src/router/page/index.js
index 9110d5c..3b8f319 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -74,6 +74,16 @@ export default [
       isAuth: false,
     },
   },
+  {
+    path: '/vehicle/customer-archive/public-view',
+    name: '查看客商信息',
+    component: () => import('@/views/vehicle/customer-archive-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+    },
+  },
   {
     path: '/',
     name: '主页',
diff --git a/src/views/base/measurement-unit.vue b/src/views/base/measurement-unit.vue
index 11d1181..ebd7613 100644
--- a/src/views/base/measurement-unit.vue
+++ b/src/views/base/measurement-unit.vue
@@ -119,6 +119,7 @@ export default {
       return this.isAdmin || this.permission?.[code] === true;
     },
     normalizeRow(row) {
+      row.unitCode = String(row.unitCode || '').trim();
       row.unitName = String(row.unitName || '').trim();
       row.dimension = String(row.dimension || '').trim();
       row.remark = String(row.remark || '').trim();
diff --git a/src/views/business/components/billing-plan-editor.vue b/src/views/business/components/billing-plan-editor.vue
index 2984093..6fa3275 100644
--- a/src/views/business/components/billing-plan-editor.vue
+++ b/src/views/business/components/billing-plan-editor.vue
@@ -157,12 +157,19 @@
       <el-table-column label="计费单位" width="150"
         ><template #default="{ row }"
           ><span v-if="readonly">{{ displayValue(row.billingUnit) }}</span
-          ><el-select v-else v-model="row.billingUnit" clearable filterable :loading="unitLoading"
+          ><el-select
+            v-else
+            v-model="row.billingUnit"
+            clearable
+            filterable
+            :disabled="!row.billingElement"
+            :loading="unitLoading"
+            :placeholder="row.billingElement ? '请选择' : '请先选择计费要素'"
             ><el-option
-              v-for="item in unitOptions"
-              :key="item.id || item.dictKey || item.dictValue"
-              :label="item.dictValue"
-              :value="item.dictValue" /></el-select></template
+              v-for="item in unitOptionsFor(row)"
+              :key="item.id || item.value"
+              :label="item.label"
+              :value="item.value" /></el-select></template
       ></el-table-column>
       <el-table-column label="单价（元）" width="180"
         ><template #default="{ row }"
@@ -367,12 +374,19 @@
 <script>
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { getList as getFeeItemList } from '@/api/base/fee-item';
+import { getList as getMeasurementUnitList } from '@/api/base/measurement-unit';
 import { getLazyTree as getRegionLazyTree } from '@/api/base/region';
 import { InfoFilled } from '@element-plus/icons-vue';
 import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 
 const clone = value => JSON.parse(JSON.stringify(value));
+/** 计费要素与计量单位维度的对应关系 */
+const BILLING_ELEMENT_DIMENSION_MAP = {
+  按重量: '重量',
+  按体积: '体积',
+  按车辆: '数量',
+};
 const defaultRule = () => ({
   feeType: '',
   feeItem: '',
@@ -417,6 +431,7 @@ export default {
       feeItems: {},
       feeItemLoadingMap: {},
       unitOptions: [],
+      measurementUnits: [],
       unitLoading: false,
       billingElements: [
         '按重量',
@@ -614,14 +629,53 @@ export default {
         .finally(() => {
           this.feeCategoryLoading = false;
         });
+      this.loadUnitOptions();
+    },
+    loadUnitOptions() {
       this.unitLoading = true;
-      getDictionary({ code: 'unit_fee' })
-        .then(res => {
+      Promise.all([
+        getDictionary({ code: 'unit_fee' }).then(res => {
           this.unitOptions = res.data?.data || [];
-        })
-        .finally(() => {
-          this.unitLoading = false;
-        });
+        }),
+        getMeasurementUnitList(1, 9999, { status: 1 }).then(res => {
+          const data = res?.data?.data || res?.data || {};
+          const records = Array.isArray(data) ? data : data.records || [];
+          this.measurementUnits = records.filter(
+            item => item.status === undefined || item.status === null || Number(item.status) === 1
+          );
+        }),
+      ]).finally(() => {
+        this.unitLoading = false;
+      });
+    },
+    measurementDimension(billingElement) {
+      return BILLING_ELEMENT_DIMENSION_MAP[billingElement] || '';
+    },
+    unitOptionsFor(row) {
+      const dimension = this.measurementDimension(row?.billingElement);
+      if (dimension) {
+        return this.measurementUnits
+          .filter(item => String(item.dimension || '').trim() === dimension)
+          .map(item => ({
+            id: item.id,
+            label: item.unitName,
+            value: item.unitName,
+          }))
+          .filter(item => item.value);
+      }
+      return (this.unitOptions || [])
+        .map(item => ({
+          id: item.id || item.dictKey || item.dictValue,
+          label: item.dictValue,
+          value: item.dictValue,
+        }))
+        .filter(item => item.value);
+    },
+    syncBillingUnit(row) {
+      const options = this.unitOptionsFor(row);
+      if (!options.some(item => String(item.value) === String(row.billingUnit || ''))) {
+        row.billingUnit = '';
+      }
     },
     feeTypeKey(row) {
       const option = this.feeCategories.find(
@@ -699,7 +753,14 @@ export default {
       return this.typeMap[row.billingElement] || [];
     },
     handleElementChange(row) {
-      if (!this.billingTypes(row).includes(row.billingType)) row.billingType = '';
+      const billingTypes = this.billingTypes(row);
+      if (!billingTypes.includes(row.billingType)) {
+        row.billingType =
+          row.billingElement === '固定金额（整单一口价）' && billingTypes.includes('固定一口价')
+            ? '固定一口价'
+            : '';
+      }
+      this.syncBillingUnit(row);
       if (!this.canEditMinimum(row)) {
         row.minimumBillingWeight = '';
         row.limitRanges = (row.limitRanges || []).map(item => ({
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 2f3576a..cc64540 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -2212,13 +2212,105 @@
             <section-card title="物流轨迹">
               <template #extra>
                 <div class="waybill-manage-page__waybill-track-actions">
-                  <el-button plain @click="handleWaybillTrackAction('playback')"
+                  <el-button
+                    plain
+                    :type="waybillTrackMode === 'playback' ? 'primary' : undefined"
+                    :loading="waybillTrackLoading"
+                    @click="handleWaybillTrackAction('playback')"
                     >轨迹回放</el-button
                   >
-                  <el-button plain @click="handleWaybillTrackAction('locate')">实时定位</el-button>
+                  <el-button
+                    plain
+                    :type="waybillTrackMode === 'locate' ? 'primary' : undefined"
+                    :loading="waybillLocateLoading"
+                    @click="handleWaybillTrackAction('locate')"
+                    >实时定位</el-button
+                  >
                 </div>
               </template>
-              <div class="waybill-manage-page__waybill-map-empty">暂无数据</div>
+              <div
+                v-if="waybillTrackMode === 'playback'"
+                class="waybill-manage-page__waybill-track-toolbar"
+              >
+                <span>时间段</span>
+                <el-date-picker
+                  v-model="waybillTrackDateRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="YYYY-MM-DD"
+                  :clearable="false"
+                  :disabled="waybillTrackLoading"
+                />
+                <el-button
+                  type="primary"
+                  :loading="waybillTrackLoading"
+                  @click="loadWaybillTrack"
+                  >查询</el-button
+                >
+                <span class="waybill-manage-page__waybill-track-total"
+                  >轨迹点 {{ waybillTrackInfo?.total || 0 }} 个</span
+                >
+              </div>
+              <div
+                v-if="waybillTrackMode === 'locate'"
+                class="waybill-manage-page__waybill-locate"
+              >
+                <div v-if="waybillLocateInfo" class="waybill-manage-page__waybill-locate-meta">
+                  <div>
+                    <span>车牌号</span><strong>{{ waybillLocateInfo.vehicleNo || '-' }}</strong>
+                  </div>
+                  <div>
+                    <span>定位时间</span><strong>{{ waybillLocateInfo.locateTime || '-' }}</strong>
+                  </div>
+                  <div>
+                    <span>速度</span><strong>{{ waybillLocateInfo.speed || '-' }}</strong>
+                  </div>
+                  <div>
+                    <span>方向</span><strong>{{ waybillLocateInfo.direction || '-' }}</strong>
+                  </div>
+                  <div class="waybill-manage-page__waybill-locate-address">
+                    <span>地址</span><strong>{{ waybillLocateInfo.address || '-' }}</strong>
+                  </div>
+                  <div>
+                    <span>坐标</span
+                    ><strong
+                      >{{
+                        waybillLocateInfo.longitude != null && waybillLocateInfo.latitude != null
+                          ? `${waybillLocateInfo.longitude}, ${waybillLocateInfo.latitude}`
+                          : '-'
+                      }}
+                    </strong>
+                  </div>
+                </div>
+                <div
+                  ref="waybillLocateMap"
+                  class="waybill-manage-page__waybill-locate-map"
+                ></div>
+                <div
+                  v-if="!waybillLocateInfo"
+                  class="waybill-manage-page__waybill-map-tip"
+                >
+                  {{ waybillLocateHint || '暂无数据' }}
+                </div>
+              </div>
+              <div
+                v-else-if="waybillTrackMode === 'playback'"
+                class="waybill-manage-page__waybill-locate"
+              >
+                <div
+                  ref="waybillTrackMap"
+                  class="waybill-manage-page__waybill-locate-map waybill-manage-page__waybill-locate-map--track"
+                ></div>
+                <div
+                  v-if="!(waybillTrackInfo?.points || []).length"
+                  class="waybill-manage-page__waybill-map-tip"
+                >
+                  {{ waybillTrackHint || '暂无数据' }}
+                </div>
+              </div>
+              <div v-else class="waybill-manage-page__waybill-map-empty">暂无数据</div>
             </section-card>
           </div>
         </template>
@@ -3029,7 +3121,7 @@ import {
   getList as getProcessConfigList,
   getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
-import { getPunchRecords as getWaybillPunchRecords } from '@/api/business/waybill-manage';
+import { getPunchRecords as getWaybillPunchRecords, locateVehicle, trackVehicle } from '@/api/business/waybill-manage';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
@@ -3292,6 +3384,21 @@ export default {
       waybillRouteChangeRecords: [],
       waybillRouteChangeDragIndex: -1,
       waybillRouteChangeSaving: false,
+      waybillLocateLoading: false,
+      waybillLocateInfo: null,
+      waybillLocateHint: '',
+      waybillLocateMapInstance: null,
+      waybillLocateMarker: null,
+      waybillLocateInfoWindow: null,
+      waybillTrackMode: '',
+      waybillTrackLoading: false,
+      waybillTrackInfo: null,
+      waybillTrackHint: '',
+      waybillTrackDateRange: [],
+      waybillTrackMapInstance: null,
+      waybillTrackPolyline: null,
+      waybillTrackStartMarker: null,
+      waybillTrackEndMarker: null,
       mileageDialog: {
         visible: false,
         submitting: false,
@@ -4523,6 +4630,13 @@ export default {
         });
     },
     closeDetail() {
+      this.destroyWaybillLocateMap();
+      this.destroyWaybillTrackMap();
+      this.waybillTrackMode = '';
+      this.waybillLocateInfo = null;
+      this.waybillLocateHint = '';
+      this.waybillTrackInfo = null;
+      this.waybillTrackHint = '';
       if (this.isStandaloneWaybillDetailPage) {
         this.$router.$avueRouter?.closeTag?.();
         this.$router.push({ path: '/business/waybill-manage', query: {} });
@@ -4867,7 +4981,262 @@ export default {
       }
     },
     handleWaybillTrackAction(action) {
-      this.$message.info(action === 'playback' ? '暂无可回放的物流轨迹' : '暂无车辆实时定位数据');
+      if (action === 'playback') {
+        this.destroyWaybillLocateMap();
+        this.waybillTrackMode = 'playback';
+        this.waybillLocateInfo = null;
+        this.waybillLocateHint = '';
+        if (!Array.isArray(this.waybillTrackDateRange) || this.waybillTrackDateRange.length !== 2) {
+          this.waybillTrackDateRange = this.buildDefaultTrackDateRange();
+        }
+        this.loadWaybillTrack();
+        return;
+      }
+      this.destroyWaybillTrackMap();
+      this.waybillTrackMode = 'locate';
+      this.waybillTrackInfo = null;
+      this.waybillTrackHint = '';
+      this.loadWaybillLocate();
+    },
+    buildDefaultTrackDateRange() {
+      const pad = value => String(value).padStart(2, '0');
+      const formatDate = date =>
+        `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+      const today = new Date();
+      const yesterday = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 1);
+      return [formatDate(yesterday), formatDate(today)];
+    },
+    destroyWaybillLocateMap() {
+      if (this.waybillLocateMarker) {
+        this.waybillLocateMarker.setMap(null);
+        this.waybillLocateMarker = null;
+      }
+      if (this.waybillLocateInfoWindow) {
+        this.waybillLocateInfoWindow.close();
+        this.waybillLocateInfoWindow = null;
+      }
+      if (this.waybillLocateMapInstance) {
+        this.waybillLocateMapInstance.destroy();
+        this.waybillLocateMapInstance = null;
+      }
+    },
+    destroyWaybillTrackMap() {
+      if (this.waybillTrackPolyline) {
+        this.waybillTrackPolyline.setMap(null);
+        this.waybillTrackPolyline = null;
+      }
+      if (this.waybillTrackStartMarker) {
+        this.waybillTrackStartMarker.setMap(null);
+        this.waybillTrackStartMarker = null;
+      }
+      if (this.waybillTrackEndMarker) {
+        this.waybillTrackEndMarker.setMap(null);
+        this.waybillTrackEndMarker = null;
+      }
+      if (this.waybillTrackMapInstance) {
+        this.waybillTrackMapInstance.destroy();
+        this.waybillTrackMapInstance = null;
+      }
+    },
+    async loadWaybillLocate() {
+      const waybillId = this.detailRow?.id;
+      if (!waybillId) {
+        this.$message.warning('运单信息不完整');
+        return;
+      }
+      if (!this.detailRow.vehicleNo) {
+        this.$message.warning('运单未绑定车牌号，无法实时定位');
+        return;
+      }
+      this.waybillLocateLoading = true;
+      this.waybillLocateHint = '正在获取车辆实时定位...';
+      this.waybillLocateInfo = null;
+      try {
+        const locateApi =
+          typeof this.api.locateVehicle === 'function' ? this.api.locateVehicle : locateVehicle;
+        const res = await locateApi(waybillId);
+        const data = res?.data?.data || null;
+        if (!data || data.longitude == null || data.latitude == null) {
+          this.waybillLocateInfo = null;
+          this.waybillLocateHint = '暂无车辆实时定位数据';
+          this.$message.warning('暂无车辆实时定位数据');
+          return;
+        }
+        this.waybillLocateInfo = data;
+        this.waybillLocateHint = '';
+        await this.$nextTick();
+        await this.renderWaybillLocateMap(data);
+      } catch (error) {
+        this.waybillLocateInfo = null;
+        this.waybillLocateHint = '实时定位获取失败';
+        this.$message.error(error?.message || '实时定位获取失败');
+      } finally {
+        this.waybillLocateLoading = false;
+      }
+    },
+    async loadWaybillTrack() {
+      const waybillId = this.detailRow?.id;
+      if (!waybillId) {
+        this.$message.warning('运单信息不完整');
+        return;
+      }
+      if (!this.detailRow.vehicleNo) {
+        this.$message.warning('运单未绑定车牌号，无法查询历史轨迹');
+        return;
+      }
+      if (!Array.isArray(this.waybillTrackDateRange) || this.waybillTrackDateRange.length !== 2) {
+        this.waybillTrackDateRange = this.buildDefaultTrackDateRange();
+      }
+      const [startDate, endDate] = this.waybillTrackDateRange;
+      this.waybillTrackLoading = true;
+      this.waybillTrackHint = '正在获取历史轨迹...';
+      this.destroyWaybillTrackMap();
+      try {
+        const trackApi =
+          typeof this.api.trackVehicle === 'function' ? this.api.trackVehicle : trackVehicle;
+        const res = await trackApi(waybillId, startDate, endDate);
+        const data = res?.data?.data || null;
+        const points = Array.isArray(data?.points) ? data.points : [];
+        if (!data || points.length === 0) {
+          this.waybillTrackInfo = data || { total: 0, points: [] };
+          this.waybillTrackHint = '暂无可回放的物流轨迹';
+          this.$message.warning('暂无可回放的物流轨迹');
+          return;
+        }
+        this.waybillTrackInfo = data;
+        this.waybillTrackHint = '';
+        await this.$nextTick();
+        await this.renderWaybillTrackMap(points);
+      } catch (error) {
+        this.waybillTrackInfo = null;
+        this.waybillTrackHint = '历史轨迹获取失败';
+        this.$message.error(error?.message || '历史轨迹获取失败');
+      } finally {
+        this.waybillTrackLoading = false;
+      }
+    },
+    async renderWaybillLocateMap(locateInfo) {
+      const longitude = Number(locateInfo?.longitude);
+      const latitude = Number(locateInfo?.latitude);
+      if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
+        this.$message.warning('定位坐标无效，无法在地图上展示');
+        return;
+      }
+      try {
+        await this.loadAmap();
+        await this.$nextTick();
+        const container = this.$refs.waybillLocateMap;
+        if (!container || !window.AMap) {
+          this.$message.warning('高德地图容器未就绪');
+          return;
+        }
+        this.destroyWaybillLocateMap();
+        this.waybillLocateMapInstance = new window.AMap.Map(container, {
+          zoom: 15,
+          center: [longitude, latitude],
+          viewMode: '2D',
+          resizeEnable: true,
+        });
+        const content = [
+          `<div style="padding:4px 2px;line-height:1.6;font-size:12px;">`,
+          `<div><b>${locateInfo.vehicleNo || '车辆位置'}</b></div>`,
+          locateInfo.locateTime ? `<div>时间：${locateInfo.locateTime}</div>` : '',
+          locateInfo.address ? `<div>地址：${locateInfo.address}</div>` : '',
+          `<div>坐标：${longitude}, ${latitude}</div>`,
+          `</div>`,
+        ].join('');
+        this.waybillLocateInfoWindow = new window.AMap.InfoWindow({
+          content,
+          offset: new window.AMap.Pixel(0, -30),
+        });
+        this.waybillLocateMarker = new window.AMap.Marker({
+          position: [longitude, latitude],
+          title: locateInfo.vehicleNo || '车辆位置',
+          anchor: 'bottom-center',
+        });
+        this.waybillLocateMarker.on('click', () => {
+          this.waybillLocateInfoWindow.open(this.waybillLocateMapInstance, [longitude, latitude]);
+        });
+        this.waybillLocateMapInstance.add(this.waybillLocateMarker);
+        this.waybillLocateInfoWindow.open(this.waybillLocateMapInstance, [longitude, latitude]);
+        this.waybillLocateMapInstance.setFitView([this.waybillLocateMarker], false, [40, 40, 40, 40]);
+        setTimeout(() => {
+          this.waybillLocateMapInstance?.resize?.();
+        }, 80);
+      } catch (error) {
+        window.console.warn('实时定位地图渲染失败', error);
+        this.$message.error('高德地图渲染失败，请稍后重试');
+      }
+    },
+    async renderWaybillTrackMap(points) {
+      const path = (points || [])
+        .map(item => [Number(item.longitude), Number(item.latitude)])
+        .filter(item => Number.isFinite(item[0]) && Number.isFinite(item[1]));
+      if (!path.length) {
+        this.$message.warning('轨迹坐标无效，无法在地图上展示');
+        return;
+      }
+      try {
+        await this.loadAmap();
+        await this.$nextTick();
+        const container = this.$refs.waybillTrackMap;
+        if (!container || !window.AMap) {
+          this.$message.warning('高德地图容器未就绪');
+          return;
+        }
+        this.destroyWaybillTrackMap();
+        this.waybillTrackMapInstance = new window.AMap.Map(container, {
+          zoom: 12,
+          center: path[0],
+          viewMode: '2D',
+          resizeEnable: true,
+        });
+        this.waybillTrackPolyline = new window.AMap.Polyline({
+          path,
+          strokeColor: '#409eff',
+          strokeWeight: 6,
+          strokeOpacity: 0.9,
+          lineJoin: 'round',
+          lineCap: 'round',
+          showDir: path.length > 1,
+        });
+        this.waybillTrackStartMarker = new window.AMap.Marker({
+          position: path[0],
+          title: '起点',
+          anchor: 'bottom-center',
+          label: {
+            content: '起',
+            direction: 'top',
+            offset: new window.AMap.Pixel(0, -6),
+          },
+        });
+        this.waybillTrackEndMarker = new window.AMap.Marker({
+          position: path[path.length - 1],
+          title: '终点',
+          anchor: 'bottom-center',
+          label: {
+            content: '终',
+            direction: 'top',
+            offset: new window.AMap.Pixel(0, -6),
+          },
+        });
+        this.waybillTrackMapInstance.add([
+          this.waybillTrackPolyline,
+          this.waybillTrackStartMarker,
+          this.waybillTrackEndMarker,
+        ]);
+        this.waybillTrackMapInstance.setFitView(
+          [this.waybillTrackPolyline, this.waybillTrackStartMarker, this.waybillTrackEndMarker],
+          false,
+          [48, 48, 48, 48]
+        );
+        setTimeout(() => {
+          this.waybillTrackMapInstance?.resize?.();
+        }, 80);
+      } catch (error) {
+        window.console.warn('历史轨迹地图渲染失败', error);
+        this.$message.error('高德地图渲染失败，请稍后重试');
+      }
     },
     displayStatus(row, prop) {
       const formatStatus = this.config.formatStatus;
@@ -9553,6 +9922,81 @@ export default {
     border: 1px solid #eff1f7;
   }
 
+  &__waybill-locate {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  &__waybill-locate-meta {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 8px 16px;
+    padding: 10px 12px;
+    border: 1px solid #eff1f7;
+    background: #fafafa;
+    color: #606266;
+    font-size: 13px;
+
+    span {
+      margin-right: 8px;
+      color: #909399;
+    }
+
+    strong {
+      color: #303133;
+      font-weight: 600;
+    }
+  }
+
+  &__waybill-locate-address {
+    grid-column: 1 / -1;
+  }
+
+  &__waybill-locate-map {
+    width: 100%;
+    min-height: 320px;
+    height: 320px;
+    border: 1px solid #eff1f7;
+    background: #f5f7fa;
+  }
+
+  &__waybill-locate-map--track {
+    min-height: 420px;
+    height: 420px;
+  }
+
+  &__waybill-map-tip {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    z-index: 2;
+    transform: translate(-50%, -50%);
+    padding: 8px 14px;
+    border-radius: 4px;
+    background: rgba(255, 255, 255, 0.92);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
+    color: #909399;
+    font-size: 13px;
+    text-align: center;
+    pointer-events: none;
+  }
+
+  &__waybill-track-toolbar {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    align-items: center;
+    margin-bottom: 10px;
+    color: #606266;
+    font-size: 13px;
+  }
+
+  &__waybill-track-total {
+    color: #909399;
+  }
+
   &__waybill-track-actions {
     display: flex;
     gap: 8px;
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 3f62e96..fe2b8e2 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -1116,6 +1116,10 @@ export default {
         total: 0,
       },
       selectionList: [],
+      // 表单页实例标记：创建时按路由落定，不随 keep-alive 切走后的 $route 变化翻转。
+      // 否则 isProjectFormPage 变 false 后容器会从 div 切成 el-dialog（append-to-body），
+      // 盖住后续打开的页面（如客商档案）。
+      isFormPageInstance: false,
       projectBox: false,
       dialogType: 'add',
       dialogReadonly: false,
@@ -1308,13 +1312,14 @@ export default {
       return ['add', 'majorSupplement'].includes(this.dialogType);
     },
     isProjectFormPage() {
-      return this.$route.path === '/business/project-apply/form';
+      return this.isFormPageInstance;
     },
     projectFormContainer() {
-      return this.isProjectFormPage ? 'div' : 'el-dialog';
+      // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
+      return this.isFormPageInstance ? 'div' : 'el-dialog';
     },
     projectFormContainerProps() {
-      if (this.isProjectFormPage) return { class: 'project-apply-page-form' };
+      if (this.isFormPageInstance) return { class: 'project-apply-page-form' };
       return {
         modelValue: this.projectBox,
         title: this.projectDialogTitle,
@@ -1359,11 +1364,26 @@ export default {
     this.loadCargoTypeOptions();
     this.loadTransportTypeOptions();
     this.loadSettlementModeOptions();
-    if (this.isProjectFormPage) {
+    if (this.$route.path === '/business/project-apply/form') {
+      this.isFormPageInstance = true;
       this.openProjectFormPage();
     }
   },
+  // 标签切走（keep-alive 缓存）或销毁时，收起 append-to-body 的内层弹窗，
+  // 避免 Teleport 出去的 DOM 继续盖住后续页面。
+  deactivated() {
+    this.closeInnerDialogs();
+  },
+  beforeUnmount() {
+    this.closeInnerDialogs();
+  },
   methods: {
+    closeInnerDialogs() {
+      this.changeRecordDetailVisible = false;
+      this.attachmentDocumentPreviewVisible = false;
+      this.attachmentImagePreviewVisible = false;
+      this.userBox = false;
+    },
     buildTableOption() {
       return {
         ...option,
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 9004b7e..e30e593 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -30,6 +30,14 @@
           @click="handleDelete"
           >删除
         </el-button>
+        <el-button
+          type="primary"
+          plain
+          :loading="oaSyncLoading"
+          v-if="userInfo.authority.includes('admin')"
+          @click="handleOaOrgSync"
+          >自动同步组织
+        </el-button>
       </template>
       <template #menu="scope">
         <el-link
@@ -116,6 +124,46 @@
         />
       </div>
     </el-dialog>
+    <el-dialog
+      v-model="oaSyncVisible"
+      width="480px"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="!oaSyncRunning"
+      :show-close="!oaSyncRunning"
+      class="oa-sync-dialog"
+      @close="closeOaSyncDialog"
+    >
+      <template #header>
+        <span class="dialog-title">{{ oaSyncDialogTitle }}</span>
+      </template>
+      <div class="oa-sync-body">
+        <el-progress
+          :percentage="oaSyncPercent"
+          :status="oaSyncProgressStatus"
+          :stroke-width="12"
+        />
+        <div class="oa-sync-meta">
+          当前阶段：{{ oaSyncStageLabel }}，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
+        </div>
+        <div class="oa-sync-stats">
+          <div class="oa-sync-stat">
+            <span class="oa-sync-stat__label">同步成功</span>
+            <span class="oa-sync-stat__value oa-sync-stat__value--success">{{ oaSyncProgress.synced }}</span>
+          </div>
+          <div class="oa-sync-stat">
+            <span class="oa-sync-stat__label">跳过</span>
+            <span class="oa-sync-stat__value oa-sync-stat__value--skip">{{ oaSyncProgress.skipped }}</span>
+          </div>
+        </div>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button v-if="oaSyncRunning" @click="cancelOaSync">取消</el-button>
+          <el-button v-else type="primary" @click="closeOaSyncDialog">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -127,6 +175,8 @@ import {
   add,
   getDept,
   getDeptTree,
+  syncOaCompany,
+  syncOaDepartment,
 } from '@/api/system/dept';
 import { getLeaderList } from '@/api/system/user';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
@@ -159,6 +209,20 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
+      oaSyncLoading: false,
+      oaSyncVisible: false,
+      oaSyncRunning: false,
+      oaSyncCancelled: false,
+      oaSyncStatus: 'running',
+      oaSyncStage: 'company',
+      oaSyncController: null,
+      oaSyncProgress: {
+        current: 0,
+        size: 20,
+        total: 0,
+        synced: 0,
+        skipped: 0,
+      },
       parentId: 0,
       page: {
         pageSize: 10,
@@ -443,8 +507,153 @@ export default {
       });
       return ids.join(',');
     },
+    oaSyncDialogTitle() {
+      if (this.oaSyncStatus === 'done') {
+        return '同步完成';
+      }
+      if (this.oaSyncStatus === 'cancelled') {
+        return '已取消同步';
+      }
+      if (this.oaSyncStatus === 'error') {
+        return '同步失败';
+      }
+      return '自动同步组织';
+    },
+    oaSyncStageLabel() {
+      return this.oaSyncStage === 'department' ? '同步部门' : '同步公司';
+    },
+    oaSyncTotalPage() {
+      const total = Number(this.oaSyncProgress.total) || 0;
+      const size = Number(this.oaSyncProgress.size) || 20;
+      if (total <= 0) {
+        return this.oaSyncProgress.current || 0;
+      }
+      return Math.max(1, Math.ceil(total / size));
+    },
+    oaSyncPercent() {
+      if (this.oaSyncStatus === 'done') {
+        return 100;
+      }
+      const totalPage = this.oaSyncTotalPage;
+      const current = Number(this.oaSyncProgress.current) || 0;
+      const stageBase = this.oaSyncStage === 'department' ? 50 : 0;
+      if (totalPage <= 0) {
+        return stageBase;
+      }
+      const stagePercent = Math.min(50, Math.round((current / totalPage) * 50));
+      return Math.min(99, stageBase + stagePercent);
+    },
+    oaSyncProgressStatus() {
+      if (this.oaSyncStatus === 'done') {
+        return 'success';
+      }
+      if (this.oaSyncStatus === 'error') {
+        return 'exception';
+      }
+      return undefined;
+    },
   },
   methods: {
+    handleOaOrgSync() {
+      this.$confirm('确定从OA先同步公司、再同步部门?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.startOaOrgSync();
+      });
+    },
+    startOaOrgSync() {
+      this.oaSyncLoading = true;
+      this.oaSyncVisible = true;
+      this.oaSyncRunning = true;
+      this.oaSyncCancelled = false;
+      this.oaSyncStatus = 'running';
+      this.oaSyncStage = 'company';
+      this.oaSyncController = new AbortController();
+      this.oaSyncProgress = {
+        current: 0,
+        size: 20,
+        total: 0,
+        synced: 0,
+        skipped: 0,
+      };
+      this.runOaOrgSyncPages();
+    },
+    isOaSyncCanceledError(error) {
+      return (
+        this.oaSyncCancelled ||
+        error?.code === 'ERR_CANCELED' ||
+        error?.name === 'CanceledError' ||
+        error?.name === 'AbortError'
+      );
+    },
+    async runOaOrgSyncStage(syncApi) {
+      const size = 20;
+      let current = 1;
+      while (!this.oaSyncCancelled) {
+        const res = await syncApi(current, size, this.oaSyncController?.signal);
+        const page = res?.data?.data || {};
+        this.oaSyncProgress.current = page.current || current;
+        this.oaSyncProgress.size = page.size || size;
+        this.oaSyncProgress.total = page.total || 0;
+        this.oaSyncProgress.synced += page.syncedCount || 0;
+        this.oaSyncProgress.skipped += page.skippedCount || 0;
+        if (page.finished) {
+          break;
+        }
+        current += 1;
+      }
+    },
+    async runOaOrgSyncPages() {
+      try {
+        this.oaSyncStage = 'company';
+        await this.runOaOrgSyncStage(syncOaCompany);
+        if (this.oaSyncCancelled) {
+          this.oaSyncStatus = 'cancelled';
+          return;
+        }
+        this.oaSyncStage = 'department';
+        this.oaSyncProgress.current = 0;
+        this.oaSyncProgress.total = 0;
+        await this.runOaOrgSyncStage(syncOaDepartment);
+        if (this.oaSyncCancelled) {
+          this.oaSyncStatus = 'cancelled';
+          return;
+        }
+        this.oaSyncStatus = 'done';
+      } catch (error) {
+        if (this.isOaSyncCanceledError(error)) {
+          this.oaSyncStatus = 'cancelled';
+        } else {
+          this.oaSyncStatus = 'error';
+          this.$message.error(error?.message || 'OA组织同步失败');
+        }
+      } finally {
+        this.oaSyncRunning = false;
+        this.oaSyncLoading = false;
+        if (this.oaSyncStatus === 'done' || this.oaSyncStatus === 'cancelled') {
+          this.parentId = 0;
+          this.data = [];
+          this.$refs.crud?.refreshTable?.();
+          this.onLoad(this.page, this.query);
+        }
+      }
+    },
+    cancelOaSync() {
+      if (!this.oaSyncRunning) {
+        return;
+      }
+      this.oaSyncCancelled = true;
+      this.oaSyncController?.abort();
+    },
+    closeOaSyncDialog() {
+      if (this.oaSyncRunning) {
+        this.cancelOaSync();
+        return;
+      }
+      this.oaSyncVisible = false;
+    },
     initData(tenantId) {
       getDeptTree(tenantId).then(res => {
         const column = this.findColumn(this.option.column, 'parentId');
@@ -865,3 +1074,66 @@ export default {
   color: var(--el-color-danger-light-3);
 }
 </style>
+
+<style>
+.oa-sync-dialog .dialog-title {
+  display: inline-flex;
+  align-items: center;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.oa-sync-dialog .dialog-title::before {
+  width: 4px;
+  height: 18px;
+  margin-right: 8px;
+  background: #409eff;
+  content: '';
+}
+
+.oa-sync-body {
+  padding: 8px 4px 0;
+}
+
+.oa-sync-meta {
+  margin-top: 12px;
+  color: #606266;
+  font-size: 13px;
+}
+
+.oa-sync-stats {
+  display: flex;
+  gap: 16px;
+  margin-top: 16px;
+}
+
+.oa-sync-stat {
+  flex: 1;
+  padding: 12px 16px;
+  background: #fafafa;
+  border: 1px solid #eff1f7;
+  border-radius: 4px;
+}
+
+.oa-sync-stat__label {
+  display: block;
+  color: #909399;
+  font-size: 12px;
+}
+
+.oa-sync-stat__value {
+  display: block;
+  margin-top: 6px;
+  font-size: 22px;
+  font-weight: 600;
+  line-height: 1.2;
+}
+
+.oa-sync-stat__value--success {
+  color: #409eff;
+}
+
+.oa-sync-stat__value--skip {
+  color: #909399;
+}
+</style>
diff --git a/src/views/vehicle/customer-archive-public-view.vue b/src/views/vehicle/customer-archive-public-view.vue
new file mode 100644
index 0000000..8fb5734
--- /dev/null
+++ b/src/views/vehicle/customer-archive-public-view.vue
@@ -0,0 +1,88 @@
+<template>
+  <div ref="page" class="customer-archive-public-view">
+    <customer-archive />
+  </div>
+</template>
+
+<script>
+import CustomerArchive from './customer-archive.vue';
+
+export default {
+  name: 'CustomerArchivePublicView',
+  components: {
+    CustomerArchive,
+  },
+  created() {
+    this.handleIframeHeight = () => this.sendIframeHeight();
+    document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+  },
+  mounted() {
+    document.documentElement.classList.add('mk-iframe-page');
+    document.body.classList.add('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.add('mk-iframe-page');
+    this.handleIframeHeight();
+    window.addEventListener('load', this.handleIframeHeight);
+    this.mkHeightTimers = [300, 800, 1600].map(delay =>
+      setTimeout(this.handleIframeHeight, delay)
+    );
+    if (typeof ResizeObserver === 'undefined') return;
+    this.mkHeightObserver = new ResizeObserver(() => this.handleIframeHeight());
+    this.$nextTick(() => {
+      if (this.$refs.page) this.mkHeightObserver.observe(this.$refs.page);
+      this.mkHeightObserver.observe(document.body);
+    });
+  },
+  beforeUnmount() {
+    document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.removeEventListener('load', this.handleIframeHeight);
+    (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
+    if (this.mkHeightObserver) {
+      this.mkHeightObserver.disconnect();
+      this.mkHeightObserver = null;
+    }
+    document.documentElement.classList.remove('mk-iframe-page');
+    document.body.classList.remove('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.remove('mk-iframe-page');
+  },
+  methods: {
+    sendIframeHeight() {
+      this.$nextTick(() => {
+        var tbody = document.body;
+        var height = tbody.clientHeight;
+        // 如需动态改变表单高度，可以直接发送此postMessage
+        window.parent.postMessage({ height: height }, '*');
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+html.mk-iframe-page,
+html.mk-iframe-page body,
+html.mk-iframe-page #app,
+html.mk-iframe-page #app.mk-iframe-page {
+  height: auto !important;
+  min-height: 100%;
+  overflow: visible;
+}
+</style>
+
+<style lang="scss" scoped>
+.customer-archive-public-view {
+  min-height: 100%;
+  padding: 12px 0 24px;
+  box-sizing: border-box;
+  background: #f0f2f5;
+
+  :deep(.basic-container) {
+    padding: 0 12px;
+  }
+
+  :deep(.archive-page-form .archive-form__footer) {
+    left: 0;
+  }
+}
+</style>
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 1325abc..967f2c9 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container class="customer-archive-page">
+  <basic-container class="customer-archive-page" :class="{ 'is-public-view': isPublicViewPage }">
     <avue-crud
       v-if="!isArchivePage"
       :option="option"
@@ -913,7 +913,7 @@
         </template>
       </el-dialog>
 
-      <div class="archive-form__footer">
+      <div class="archive-form__footer" v-if="!isPublicViewPage">
         <!-- 次要：独立页返回 / 只读关闭 / 弹窗取消 -->
         <el-button @click="closeArchive">{{ readonly ? '关闭' : '取消' }}</el-button>
         <el-button type="primary" plain v-if="!readonly" @click="saveArchive">保存</el-button>
@@ -1482,7 +1482,9 @@ import { ElCascader } from 'element-plus';
 import {
   getList,
   getDetail,
+  getPublicDetail,
   getChangeRecordList,
+  getPublicChangeRecordList,
   submit,
   submitApproval,
   withdrawApproval,
@@ -1498,6 +1500,7 @@ import {
   getDetail as getCreditScoreQuantificationDetail,
 } from '@/api/vehicle/credit-score-quantification';
 import { getDictionary } from '@/api/system/dictbiz';
+import { processSubmit } from '@/api/system/business-process';
 import { getDeptTree } from '@/api/system/dept';
 import { getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
@@ -1989,6 +1992,18 @@ export default {
     };
   },
   created() {
+    if (this.isPublicViewPage) {
+      this.readonly = true;
+      const id = this.$route.query.id;
+      if (!id) {
+        this.archiveBox = true;
+        this.$message.error('缺少客商ID');
+        return;
+      }
+      this.openArchive({ id }, true);
+      this.bindMkParentHeight();
+      return;
+    }
     this.initDeptTree();
     this.initRegionOptions();
     this.initBusinessDictionaries();
@@ -1997,6 +2012,10 @@ export default {
       const readonly = this.$route.query.view === '1' || this.$route.query.view === 'true';
       this.openArchive(this.$route.query.id ? { id: this.$route.query.id } : null, readonly);
     }
+    this.bindMkParentHeight();
+  },
+  mounted() {
+    this.notifyMkParentHeight();
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
@@ -2010,7 +2029,18 @@ export default {
       };
     },
     isArchivePage() {
-      return this.$route.path === '/vehicle/customer-archive/form';
+      return (
+        this.$route.path === '/vehicle/customer-archive/form' || this.isPublicViewPage
+      );
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/vehicle/customer-archive/public-view';
+    },
+    isMkEmbed() {
+      const isMk = this.$route.query.isMk;
+      return (
+        this.isPublicViewPage || isMk === '1' || isMk === 1 || isMk === 'true'
+      );
     },
     archiveContainer() {
       return 'div';
@@ -2190,6 +2220,67 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);
     },
+    bindMkParentHeight() {
+      if (!this.isMkEmbed) return;
+      document.addEventListener(
+        'DOMContentLoaded',
+        function () {
+          var tbody = document.body;
+          var height = tbody.clientHeight;
+          // 如需动态改变表单高度，可以直接发送此postMessage
+          window.parent.postMessage({ height: height }, '*');
+        },
+        false
+      );
+    },
+    notifyMkParentHeight() {
+      if (!this.isMkEmbed) return;
+      this.$nextTick(() => {
+        var tbody = document.body;
+        var height = tbody.clientHeight;
+        // 如需动态改变表单高度，可以直接发送此postMessage
+        window.parent.postMessage({ height: height }, '*');
+      });
+    },
+    mergeSelectOptions(target, values) {
+      const list = Array.isArray(values) ? values : values ? [values] : [];
+      list.forEach(value => {
+        if (value === undefined || value === null || value === '') return;
+        if (!this[target].some(item => String(item.value) === String(value))) {
+          this[target].push({ label: String(value), value });
+        }
+      });
+    },
+    ensurePublicViewOptions(archive = {}) {
+      this.mergeSelectOptions('customerNatureOptions', archive.customerNature);
+      this.mergeSelectOptions('customerTypeOptions', archive.customerType);
+      this.mergeSelectOptions('businessScopeOptions', archive.businessScope);
+      this.mergeSelectOptions(
+        'qualificationTypeOptions',
+        (this.qualificationFiles || []).map(item => item.type)
+      );
+      const deptId = Array.isArray(archive.deptId) ? archive.deptId[0] : archive.deptId;
+      if (deptId && archive.deptName) {
+        this.deptTree = [
+          {
+            label: archive.deptName,
+            value: String(deptId),
+            children: [],
+          },
+        ];
+        this.deptOptions = this.flattenDept(this.deptTree);
+      }
+      (archive.scores || []).forEach(score => {
+        if (!score.quantificationId) return;
+        const id = String(score.quantificationId);
+        if (!this.scoreQuantificationOptions.some(item => String(item.id) === id)) {
+          this.scoreQuantificationOptions.push({
+            id,
+            name: score.quantificationName || score.name || id,
+          });
+        }
+      });
+    },
     // 检测输入框文本是否溢出，仅溢出时才允许 tooltip 显示完整地址
     checkOverflow(refName, flag) {
       const inst = this.$refs[refName];
@@ -2278,7 +2369,8 @@ export default {
     loadChangeRecords() {
       if (!this.archiveForm.id) return;
       const page = this.changeRecordPage;
-      getChangeRecordList(this.archiveForm.id, page.currentPage, page.pageSize).then(res => {
+      const requestList = this.isPublicViewPage ? getPublicChangeRecordList : getChangeRecordList;
+      requestList(this.archiveForm.id, page.currentPage, page.pageSize).then(res => {
         const data = res.data.data || {};
         page.records = this.replaceNegativeOneWithBlank(data.records || []);
         page.total = Number(data.total || 0);
@@ -3890,6 +3982,7 @@ export default {
       });
     },
     closeArchive() {
+      if (this.isPublicViewPage) return;
       this.$router.push('/vehicle/customer-archive');
     },
     openArchive(row, readonly = false) {
@@ -3898,7 +3991,9 @@ export default {
       this.resetDetailPagination();
       this.resetChangeRecordPage();
       if (row && row.id) {
-        getDetail(row.id).then(res => {
+        const requestDetail = this.isPublicViewPage ? getPublicDetail : getDetail;
+        requestDetail(row.id)
+          .then(res => {
           const archive = this.normalizeDetail(res.data.data);
           this.archiveForm = readonly ? this.replaceNegativeOneWithBlank(archive) : archive;
           this.originalAccessType = this.archiveForm.accessType || '';
@@ -3912,9 +4007,15 @@ export default {
           this.qualificationUploadFiles = [];
           this.ocrQualificationUploadFiles = [];
           this.selectedQualificationFiles = [];
+          if (this.isPublicViewPage) this.ensurePublicViewOptions(this.archiveForm);
           this.archiveBox = true;
+          this.notifyMkParentHeight();
           this.loadChangeRecords();
-        });
+        })
+          .catch(() => {
+            this.archiveBox = true;
+            if (this.isPublicViewPage) this.$message.error('客商信息加载失败');
+          });
         return;
       }
       this.archiveForm = this.emptyArchive();
@@ -3924,6 +4025,7 @@ export default {
       this.ocrQualificationUploadFiles = [];
       this.selectedQualificationFiles = [];
       this.archiveBox = true;
+      this.notifyMkParentHeight();
     },
     resetArchive() {
       this.readonly = false;
@@ -4078,14 +4180,47 @@ export default {
             this.$message({ type: 'success', message: '保存成功，请在列表提交审批' });
             return;
           }
-          submitApproval(id).then(() => {
-            this.closeArchive();
-            this.onLoad(this.page);
-            this.$message({ type: 'success', message: '提交成功!' });
-          });
+          const fullName =
+            (data && typeof data === 'object' ? data.fullName : '') ||
+            archive.fullName ||
+            this.archiveForm.fullName ||
+            '';
+          this.submitMkApprovalFlow(id, fullName)
+            .then(() => submitApproval(id))
+            .then(() => {
+              this.closeArchive();
+              this.onLoad(this.page);
+              this.$message({ type: 'success', message: '提交成功!' });
+            });
         });
       });
     },
+    /**
+     * 提交 MK 审核流：templateCode 取业务字典 mk_template 中「提交审核流」的键值
+     * 提交人手机号由后端从用户表读取真实值（前端接口会脱敏）
+     */
+    async submitMkApprovalFlow(formInstanceId, subjectName = '') {
+      const templateCode = await this.resolveMkTemplateCode('提交审核流');
+      const subject = subjectName
+        ? `客商准入审批：${subjectName}`
+        : `客商准入审批：${formInstanceId}`;
+      return processSubmit({
+        templateCode,
+        formInstanceId: String(formInstanceId),
+        subject,
+      });
+    },
+    async resolveMkTemplateCode(dictName = '提交审核流') {
+      const res = await getDictionary({ code: 'mk_template' });
+      const list = res?.data?.data || [];
+      const matched = list.find(item => String(item.dictValue || '').trim() === dictName);
+      const templateCode = matched?.dictKey;
+      if (!templateCode) {
+        this.$message.warning(`未配置业务字典 mk_template「${dictName}」，无法提交审核流`);
+        return Promise.reject(new Error(`未配置业务字典 mk_template「${dictName}」`));
+      }
+      return String(templateCode);
+    },
     addScore() {
       this.scoreRecordIndex = -1;
       this.currentScore = this.normalizeScore({});
@@ -4676,6 +4811,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
         })
+          .then(() => this.submitMkApprovalFlow(row.id, archive.fullName || row.fullName))
           .then(() => submitApproval(row.id))
           .then(() => {
             this.onLoad(this.page);
@@ -5348,6 +5484,12 @@ export default {
   font-size: 14px;
 }
 
+.customer-archive-page.is-public-view {
+  :deep(.archive-page-form .archive-form__footer) {
+    left: 0;
+  }
+}
+
 .archive-page-form {
   min-height: 100%;
   margin-bottom: 60px;
diff --git a/vite.config.mjs b/vite.config.mjs
index 8f859d0..cc153b2 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -47,26 +47,26 @@ export default ({ mode, command }) => {
       __VUE_I18N_LEGACY_API__: true,
       __INTLIFY_PROD_DEVTOOLS__: false,
     },
-    // server: {
-    //   port: 2888,
-    //   proxy: {
-    //     '/api': {
-    //       target: 'http://localhost',
-    //       //target: 'https://saber3.bladex.cn/api',
-    //       changeOrigin: true,
-    //       rewrite: path => path.replace(/^\/api/, ''),
-    //     },
-    //   },
-    // },
     server: {
-      port: 2889,
+      port: 2888,
       proxy: {
         '/api': {
-          target: 'http://172.16.203.228:8000',
+          target: 'http://localhost',
+          //target: 'https://saber3.bladex.cn/api',
           changeOrigin: true,
+          rewrite: path => path.replace(/^\/api/, ''),
         },
       },
     },
+    // server: {
+    //   port: 2889,
+    //   proxy: {
+    //     '/api': {
+    //       target: 'http://172.16.203.228:8000',
+    //       changeOrigin: true,
+    //     },
+    //   },
+    // },
     resolve: {
       alias: {
         '~': resolve(__dirname, './'),

From 7078de638592b6350a89ad268d790f18c052e9b7 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sun, 20 Sep 2026 18:12:51 +0800
Subject: [PATCH 15/28] =?UTF-8?q?=E8=B0=83=E8=AF=95mk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/vehicle/customer-archive.js           | 11 +++
 .../vehicle/customer-archive-public-view.vue  | 82 ++++++++++++++++++-
 src/views/vehicle/customer-archive.vue        | 58 ++++---------
 3 files changed, 106 insertions(+), 45 deletions(-)

diff --git a/src/api/vehicle/customer-archive.js b/src/api/vehicle/customer-archive.js
index 98e9f4c..f6266db 100644
--- a/src/api/vehicle/customer-archive.js
+++ b/src/api/vehicle/customer-archive.js
@@ -62,6 +62,17 @@ export const getPublicChangeRecordList = (customerId, current, size) => {
   });
 };
 
+export const postPublicProcessMessage = data => {
+  return request({
+    url: '/blade-transport/customer-archive/public/process-message',
+    method: 'post',
+    meta: {
+      isToken: false,
+    },
+    data,
+  });
+};
+
 export const submit = row => {
   return request({
     url: '/blade-transport/customer-archive/submit',
diff --git a/src/views/vehicle/customer-archive-public-view.vue b/src/views/vehicle/customer-archive-public-view.vue
index 8fb5734..a1cf726 100644
--- a/src/views/vehicle/customer-archive-public-view.vue
+++ b/src/views/vehicle/customer-archive-public-view.vue
@@ -1,11 +1,12 @@
 <template>
   <div ref="page" class="customer-archive-public-view">
-    <customer-archive />
+    <customer-archive ref="archive" />
   </div>
 </template>
 
 <script>
 import CustomerArchive from './customer-archive.vue';
+import { postPublicProcessMessage } from '@/api/vehicle/customer-archive';
 
 export default {
   name: 'CustomerArchivePublicView',
@@ -14,7 +15,9 @@ export default {
   },
   created() {
     this.handleIframeHeight = () => this.sendIframeHeight();
+    this.handleProcessMessage = event => this.onProcessMessage(event);
     document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.addEventListener('message', this.handleProcessMessage);
   },
   mounted() {
     document.documentElement.classList.add('mk-iframe-page');
@@ -36,6 +39,7 @@ export default {
   beforeUnmount() {
     document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
     window.removeEventListener('load', this.handleIframeHeight);
+    window.removeEventListener('message', this.handleProcessMessage);
     (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
     if (this.mkHeightObserver) {
       this.mkHeightObserver.disconnect();
@@ -55,6 +59,82 @@ export default {
         window.parent.postMessage({ height: height }, '*');
       });
     },
+    onProcessMessage(event) {
+      const data = event && event.data;
+      if (!data || typeof data !== 'object') return;
+      if (data.height && !data.status && !data.type) return;
+      if (data.type === 'formValues' || data.type === 'afterSubmit') return;
+      console.log('客商公开页收到流程消息：', data);
+      const formValues = data.formValues;
+      if (data.status === 'submit') {
+        this.submitData(formValues);
+      } else if (data.status === 'save') {
+        this.saveData(formValues);
+      }
+      if (data.type === 'getFormValues') {
+        window.parent.postMessage({ type: 'formValues', formData: this.buildFormData() }, '*');
+      }
+    },
+    submitData(lbpmFormValues) {
+      const formData = this.buildFormData();
+      this.postFormData('submit', lbpmFormValues, formData);
+      if (!lbpmFormValues) return;
+      const parameters = Object.assign({}, lbpmFormValues, {
+        loginName: this.getLoginName(lbpmFormValues),
+        formInstanceId: this.getFormId(),
+        subject: formData.subject,
+      });
+      window.parent.postMessage(
+        {
+          type: 'afterSubmit',
+          success: true,
+          parameters,
+        },
+        '*'
+      );
+    },
+    saveData(lbpmFormValues) {
+      this.postFormData('save', lbpmFormValues, this.buildFormData());
+    },
+    postFormData(status, formValues, formData) {
+      const payload = {
+        status,
+        formValues: formValues || {},
+        formData,
+      };
+      console.log('客商公开页提交流程数据：', payload);
+      postPublicProcessMessage(payload).catch(error => {
+        console.error('客商公开页提交流程数据失败：', error);
+      });
+    },
+    buildFormData() {
+      const archive = this.getArchiveForm();
+      return {
+        ...archive,
+        subject: archive.fullName || archive.shortName || '',
+        formInstanceId: this.getFormId(),
+      };
+    },
+    getArchiveForm() {
+      const archive = this.$refs.archive && this.$refs.archive.archiveForm;
+      if (!archive) return {};
+      try {
+        return JSON.parse(JSON.stringify(archive));
+      } catch (error) {
+        return { ...archive };
+      }
+    },
+    getFormId() {
+      return this.$route.query.id || this.getArchiveForm().id || '';
+    },
+    getLoginName(formValues = {}) {
+      return (
+        formValues.loginName ||
+        this.$route.query.loginName ||
+        this.$route.query.submitIdentity ||
+        ''
+      );
+    },
   },
 };
 </script>
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 967f2c9..fcf3d08 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -2001,7 +2001,6 @@ export default {
         return;
       }
       this.openArchive({ id }, true);
-      this.bindMkParentHeight();
       return;
     }
     this.initDeptTree();
@@ -2012,10 +2011,6 @@ export default {
       const readonly = this.$route.query.view === '1' || this.$route.query.view === 'true';
       this.openArchive(this.$route.query.id ? { id: this.$route.query.id } : null, readonly);
     }
-    this.bindMkParentHeight();
-  },
-  mounted() {
-    this.notifyMkParentHeight();
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
@@ -2036,12 +2031,6 @@ export default {
     isPublicViewPage() {
       return this.$route.path === '/vehicle/customer-archive/public-view';
     },
-    isMkEmbed() {
-      const isMk = this.$route.query.isMk;
-      return (
-        this.isPublicViewPage || isMk === '1' || isMk === 1 || isMk === 'true'
-      );
-    },
     archiveContainer() {
       return 'div';
     },
@@ -2220,28 +2209,6 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);
     },
-    bindMkParentHeight() {
-      if (!this.isMkEmbed) return;
-      document.addEventListener(
-        'DOMContentLoaded',
-        function () {
-          var tbody = document.body;
-          var height = tbody.clientHeight;
-          // 如需动态改变表单高度，可以直接发送此postMessage
-          window.parent.postMessage({ height: height }, '*');
-        },
-        false
-      );
-    },
-    notifyMkParentHeight() {
-      if (!this.isMkEmbed) return;
-      this.$nextTick(() => {
-        var tbody = document.body;
-        var height = tbody.clientHeight;
-        // 如需动态改变表单高度，可以直接发送此postMessage
-        window.parent.postMessage({ height: height }, '*');
-      });
-    },
     mergeSelectOptions(target, values) {
       const list = Array.isArray(values) ? values : values ? [values] : [];
       list.forEach(value => {
@@ -3983,6 +3950,8 @@ export default {
     },
     closeArchive() {
       if (this.isPublicViewPage) return;
+      this.archiveBox = false;
+      this.$router.$avueRouter?.closeTag?.();
       this.$router.push('/vehicle/customer-archive');
     },
     openArchive(row, readonly = false) {
@@ -4009,7 +3978,6 @@ export default {
           this.selectedQualificationFiles = [];
           if (this.isPublicViewPage) this.ensurePublicViewOptions(this.archiveForm);
           this.archiveBox = true;
-          this.notifyMkParentHeight();
           this.loadChangeRecords();
         })
           .catch(() => {
@@ -4025,7 +3993,6 @@ export default {
       this.ocrQualificationUploadFiles = [];
       this.selectedQualificationFiles = [];
       this.archiveBox = true;
-      this.notifyMkParentHeight();
     },
     resetArchive() {
       this.readonly = false;
@@ -4185,16 +4152,20 @@ export default {
             archive.fullName ||
             this.archiveForm.fullName ||
             '';
-          this.submitMkApprovalFlow(id, fullName)
-            .then(() => submitApproval(id))
-            .then(() => {
-              this.closeArchive();
-              this.onLoad(this.page);
-              this.$message({ type: 'success', message: '提交成功!' });
-            });
+          this.submitCustomerApproval(id, fullName).then(() => {
+            this.closeArchive();
+            this.onLoad(this.page);
+            this.$message({ type: 'success', message: '提交成功!' });
+          });
         });
       });
     },
+    /**
+     * 列表 / 新增 / 编辑提交共用：提交 MK 审核流并更新客商审批状态
+     */
+    submitCustomerApproval(id, fullName = '') {
+      return this.submitMkApprovalFlow(id, fullName).then(() => submitApproval(id));
+    },
     /**
      * 提交 MK 审核流：templateCode 取业务字典 mk_template 中「提交审核流」的键值
      * 提交人手机号由后端从用户表读取真实值（前端接口会脱敏）
@@ -4811,8 +4782,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
         })
-          .then(() => this.submitMkApprovalFlow(row.id, archive.fullName || row.fullName))
-          .then(() => submitApproval(row.id))
+          .then(() => this.submitCustomerApproval(row.id, archive.fullName || row.fullName))
           .then(() => {
             this.onLoad(this.page);
             this.$message({ type: 'success', message: '提交成功!' });

From 57368f0179bd54050fe88a5f7820219e2cb61f1a Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 21 Sep 2026 11:14:51 +0800
Subject: [PATCH 16/28] =?UTF-8?q?=E8=B0=83=E8=AF=95mk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mk-process.js                         |  23 ++
 src/api/system/business-process.js            |  13 +
 src/router/page/index.js                      |  66 +++++
 src/utils/mk-approval.js                      |  78 +++++
 .../components/waybill-manage-page.vue        |  49 +++-
 src/views/business/contract-manage-change.vue |   3 +-
 src/views/business/contract-manage.vue        |  43 ++-
 src/views/business/project-apply.vue          |  56 +++-
 src/views/mk/public-biz-view.vue              | 271 ++++++++++++++++++
 .../payment/payment-application-form.vue      |   7 +
 src/views/payment/payment-application.vue     |   7 +
 .../components/pre-settlement-editor.vue      |   7 +
 src/views/settlement/formal-settlement.vue    |   7 +
 src/views/system/user.vue                     |  24 +-
 src/views/vehicle/customer-archive.vue        |  32 ++-
 15 files changed, 647 insertions(+), 39 deletions(-)
 create mode 100644 src/api/mk-process.js
 create mode 100644 src/utils/mk-approval.js
 create mode 100644 src/views/mk/public-biz-view.vue

diff --git a/src/api/mk-process.js b/src/api/mk-process.js
new file mode 100644
index 0000000..c70ffc6
--- /dev/null
+++ b/src/api/mk-process.js
@@ -0,0 +1,23 @@
+import request from '@/axios';
+
+export const getMkPublicDetail = (bizType, id) => {
+  return request({
+    url: `/blade-transport/mk-process/public/${bizType}/detail`,
+    method: 'get',
+    meta: {
+      isToken: false,
+    },
+    params: { id },
+  });
+};
+
+export const postMkPublicProcessMessage = (bizType, data) => {
+  return request({
+    url: `/blade-transport/mk-process/public/${bizType}/process-message`,
+    method: 'post',
+    meta: {
+      isToken: false,
+    },
+    data,
+  });
+};
diff --git a/src/api/system/business-process.js b/src/api/system/business-process.js
index 3cfcd67..44f9526 100644
--- a/src/api/system/business-process.js
+++ b/src/api/system/business-process.js
@@ -16,3 +16,16 @@ export const processSubmit = data => {
     data,
   });
 };
+
+/**
+ * 调用 MK processDelete 删除审核流（驳回后重新提交前使用）
+ * @param {Object} data
+ * @param {string} data.formInstanceId 业务表单实例 id
+ */
+export const processDelete = data => {
+  return request({
+    url: '/blade-system/businessProcess/processDelete',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/router/page/index.js b/src/router/page/index.js
index 3b8f319..cbb2e72 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -84,6 +84,72 @@ export default [
       isAuth: false,
     },
   },
+  {
+    path: '/business/project-apply/public-view',
+    name: '查看项目信息',
+    component: () => import('@/views/mk/public-biz-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'project-apply',
+    },
+  },
+  {
+    path: '/business/contract-manage/public-view',
+    name: '查看合同信息',
+    component: () => import('@/views/mk/public-biz-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'contract-manage',
+    },
+  },
+  {
+    path: '/business/waybill-manage/public-view',
+    name: '查看运单信息',
+    component: () => import('@/views/mk/public-biz-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'waybill-manage',
+    },
+  },
+  {
+    path: '/settlement/pre-settlement/public-view',
+    name: '查看预结算信息',
+    component: () => import('@/views/mk/public-biz-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'pre-settlement',
+    },
+  },
+  {
+    path: '/settlement/formal-settlement/public-view',
+    name: '查看正式结算信息',
+    component: () => import('@/views/mk/public-biz-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'formal-settlement',
+    },
+  },
+  {
+    path: '/payment/payment-application/public-view',
+    name: '查看付款申请信息',
+    component: () => import('@/views/mk/public-biz-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'payment-application',
+    },
+  },
   {
     path: '/',
     name: '主页',
diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js
new file mode 100644
index 0000000..a8544e7
--- /dev/null
+++ b/src/utils/mk-approval.js
@@ -0,0 +1,78 @@
+import { getDictionary } from '@/api/system/dictbiz';
+import { processDelete, processSubmit } from '@/api/system/business-process';
+import { ElMessage } from 'element-plus';
+
+export const MK_BIZ = {
+  'customer-archive': {
+    dictName: '提交客商审核流',
+    subjectPrefix: '客商准入审批',
+    rejected: ['rejected'],
+  },
+  'project-apply': {
+    dictName: '提交项目审核流',
+    subjectPrefix: '项目审批',
+    rejected: ['rejected', 'change_rejected', 'withdrawn'],
+  },
+  'contract-manage': {
+    dictName: '提交合同审核流',
+    subjectPrefix: '合同审批',
+    rejected: ['rejected', 'change_rejected', 'withdrawn'],
+  },
+  'waybill-manage': {
+    dictName: '提交运单审核流',
+    subjectPrefix: '运单审批',
+    rejected: ['rejected', 'returned'],
+  },
+  'pre-settlement': {
+    dictName: '提交预结算审核流',
+    subjectPrefix: '预结算审批',
+    rejected: ['returned'],
+  },
+  'formal-settlement': {
+    dictName: '提交正式结算审核流',
+    subjectPrefix: '正式结算审批',
+    rejected: ['returned'],
+  },
+  'payment-application': {
+    dictName: '提交付款审核流',
+    subjectPrefix: '付款审批',
+    rejected: ['returned'],
+  },
+};
+
+export async function resolveMkTemplateCode(dictName) {
+  const res = await getDictionary({ code: 'mk_template' });
+  const list = res?.data?.data || [];
+  const matched = list.find(item => String(item.dictValue || '').trim() === dictName);
+  const templateCode = matched?.dictKey;
+  if (!templateCode) {
+    ElMessage.warning(`未配置业务字典 mk_template「${dictName}」，无法提交审核流`);
+    return Promise.reject(new Error(`未配置业务字典 mk_template「${dictName}」`));
+  }
+  return String(templateCode);
+}
+
+export async function submitMkApprovalFlow({
+  bizType,
+  formInstanceId,
+  subjectName = '',
+  approvalStatus = '',
+}) {
+  const conf = MK_BIZ[bizType];
+  if (!conf) {
+    return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`));
+  }
+  if ((conf.rejected || []).includes(approvalStatus)) {
+    await processDelete({ formInstanceId: String(formInstanceId) });
+  }
+  const templateCode = await resolveMkTemplateCode(conf.dictName);
+  const subject = subjectName
+    ? `${conf.subjectPrefix}：${subjectName}`
+    : `${conf.subjectPrefix}：${formInstanceId}`;
+  return processSubmit({
+    templateCode,
+    formInstanceId: String(formInstanceId),
+    subject,
+    bizType,
+  });
+}
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index cc64540..67d0c7d 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -3128,6 +3128,7 @@ import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
 import { packageOptions } from '@/option/business/common';
 import { formatUpdateUserName } from '@/utils/audit';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
 import { applyTableMenuWidth } from '@/utils/table-menu';
@@ -5521,11 +5522,23 @@ export default {
         return;
       }
       this.getSaveRequest()(submitRow).then(
-        () => {
-          this.onLoad(this.page);
-          this.$message({ type: 'success', message: '操作成功!' });
-          done();
-          if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+        res => {
+          const data = res.data?.data || {};
+          const id = data.id || submitRow.id;
+          const after = id
+            ? submitMkApprovalFlow({
+                bizType: 'waybill-manage',
+                formInstanceId: id,
+                subjectName: data.waybillNo || submitRow.waybillNo || '',
+                approvalStatus: data.approvalStatus || submitRow.approvalStatus || '',
+              })
+            : Promise.resolve();
+          return after.then(() => {
+            this.onLoad(this.page);
+            this.$message({ type: 'success', message: '提交成功!' });
+            done();
+            if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+          });
         },
         error => {
           window.console.log(error);
@@ -5544,12 +5557,26 @@ export default {
           ? this.api.updateAttachments
           : this.getSaveRequest();
       request(submitRow).then(
-        () => {
-          this.attachmentUploadMode = false;
-          this.onLoad(this.page);
-          this.$message({ type: 'success', message: '操作成功!' });
-          done();
-          if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+        res => {
+          const skipMk = this.attachmentUploadMode;
+          const data = res.data?.data || {};
+          const id = data.id || submitRow.id;
+          const after =
+            skipMk || !id
+              ? Promise.resolve()
+              : submitMkApprovalFlow({
+                  bizType: 'waybill-manage',
+                  formInstanceId: id,
+                  subjectName: data.waybillNo || submitRow.waybillNo || '',
+                  approvalStatus: data.approvalStatus || submitRow.approvalStatus || '',
+                });
+          return after.then(() => {
+            this.attachmentUploadMode = false;
+            this.onLoad(this.page);
+            this.$message({ type: 'success', message: skipMk ? '操作成功!' : '提交成功!' });
+            done();
+            if (this.isStandaloneWaybillPage) this.closeCrudDialog();
+          });
         },
         error => {
           this.attachmentUploadMode = false;
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index c325a2f..b6fd16f 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -302,6 +302,7 @@
 
 <script>
 import * as api from '@/api/business/contract-manage';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
   normalizeContractFileRows,
@@ -629,7 +630,7 @@ export default {
     removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
     validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
     validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日期和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
-    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); this.$message.success('变更已提交'); this.$router.back(); },
+    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', formInstanceId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected' }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
 </script>
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 044a401..88bcde9 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -1035,6 +1035,7 @@ import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { config, option } from '@/option/business/contract-manage';
 import { getToken } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
   attachmentName as sharedAttachmentName,
@@ -1824,9 +1825,17 @@ export default {
           const id = saved.id || this.form.id;
           if (action === 'temporary' || action === 'formal') {
             if (!id) throw new Error('合同保存成功但未返回主键，无法提交合同');
-            return action === 'temporary'
+            return (action === 'temporary'
               ? this.api.toTemporary(id)
-              : this.api.submitFormal(id);
+              : this.api.submitFormal(id)
+            ).then(() =>
+              submitMkApprovalFlow({
+                bizType: 'contract-manage',
+                formInstanceId: id,
+                subjectName: saved.contractName || submit.contractName || '',
+                approvalStatus: saved.approvalStatus || submit.approvalStatus || '',
+              })
+            );
           }
           return null;
         })
@@ -1853,8 +1862,20 @@ export default {
         : this.api.submit(payload);
       request
         .then(() => {
-          this.$message.success(isChangeRejected ? '已重新提交变更审批' : '修改成功');
-          this.closeForm();
+          if (!isChangeRejected) {
+            this.$message.success('修改成功');
+            this.closeForm();
+            return;
+          }
+          return submitMkApprovalFlow({
+            bizType: 'contract-manage',
+            formInstanceId: payload.id || this.form.id,
+            subjectName: payload.contractName || this.form.contractName || '',
+            approvalStatus: this.form.approvalStatus || 'change_rejected',
+          }).then(() => {
+            this.$message.success('已重新提交变更审批');
+            this.closeForm();
+          });
         })
         .finally(() => {
           this.submitAction = '';
@@ -2698,7 +2719,19 @@ export default {
       }
       const run = value => {
         const args = operation.prompt ? [row.id, value] : [row.id];
-        this.api[operation.action](...args).then(() => {
+        const request = () => this.api[operation.action](...args);
+        const afterMk =
+          operation.action === 'submitFormal'
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'contract-manage',
+                  formInstanceId: row.id,
+                  subjectName: row.contractName || '',
+                  approvalStatus: row.approvalStatus || '',
+                })
+              )
+            : request();
+        afterMk.then(() => {
           this.$message.success(operation.successMessage || `${operation.label}成功`);
           this.onLoad(this.page, this.query);
         });
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index fe2b8e2..12d2e22 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -925,6 +925,7 @@ import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { getList as getUserList } from '@/api/system/user';
 import { getToken } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import PdfPreview from '@/components/pdf-preview/main.vue';
@@ -1589,7 +1590,17 @@ export default {
       }
       const run = value => {
         const args = operation.prompt ? [row.id, value] : [row.id];
-        this.api[operation.action](...args).then(res => {
+        const request = () => this.api[operation.action](...args);
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? submitMkApprovalFlow({
+                bizType: 'project-apply',
+                formInstanceId: row.id,
+                subjectName: row.projectName || '',
+                approvalStatus: row.approvalStatus || '',
+              }).then(() => request())
+            : request();
+        afterMk.then(res => {
           if (res.data?.success === false || res.data?.data === false) {
             this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
             return;
@@ -1757,9 +1768,26 @@ export default {
                 this.$message.error(res.data?.msg || '保存失败，请联系管理员');
                 return;
               }
-              this.$message.success('操作成功!');
-              this.closeProjectForm();
-              this.onLoad(this.page, this.query);
+              const data = res.data?.data || {};
+              const id = data.id || this.form.id;
+              const name = data.projectName || this.form.projectName || '';
+              const status = data.approvalStatus || this.form.approvalStatus || '';
+              if (!id) {
+                this.$message.success('操作成功!');
+                this.closeProjectForm();
+                this.onLoad(this.page, this.query);
+                return;
+              }
+              return submitMkApprovalFlow({
+                bizType: 'project-apply',
+                formInstanceId: id,
+                subjectName: name,
+                approvalStatus: status,
+              }).then(() => {
+                this.$message.success('提交成功!');
+                this.closeProjectForm();
+                this.onLoad(this.page, this.query);
+              });
             },
             error => {
               window.console.log(error);
@@ -1827,9 +1855,23 @@ export default {
               );
               return;
             }
-            this.$message.success(`${needSubmit ? '提交' : '保存'}成功!`);
-            this.closeProjectForm();
-            this.onLoad(this.page, this.query);
+            if (!needSubmit) {
+              this.$message.success('保存成功!');
+              this.closeProjectForm();
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            const id = this.form.id;
+            return submitMkApprovalFlow({
+              bizType: 'project-apply',
+              formInstanceId: id,
+              subjectName: this.form.projectName || '',
+              approvalStatus: this.form.approvalStatus || 'change_rejected',
+            }).then(() => {
+              this.$message.success('提交成功!');
+              this.closeProjectForm();
+              this.onLoad(this.page, this.query);
+            });
           })
           .finally(() => {
             this.submitLoading = false;
diff --git a/src/views/mk/public-biz-view.vue b/src/views/mk/public-biz-view.vue
new file mode 100644
index 0000000..1dcd457
--- /dev/null
+++ b/src/views/mk/public-biz-view.vue
@@ -0,0 +1,271 @@
+<template>
+  <div ref="page" class="mk-public-biz-view">
+    <basic-container>
+      <div class="mk-public-biz-view__title">{{ pageTitle }}</div>
+      <el-descriptions v-if="detail" :column="2" border>
+        <el-descriptions-item
+          v-for="item in visibleFields"
+          :key="item.prop"
+          :label="item.label"
+          :span="item.span || 1"
+        >
+          {{ displayValue(detail[item.prop]) }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-empty v-else description="暂无数据" />
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { getMkPublicDetail, postMkPublicProcessMessage } from '@/api/mk-process';
+
+const FIELD_MAP = {
+  'project-apply': [
+    { label: '申请单号', prop: 'applyNo' },
+    { label: '项目编号', prop: 'projectCode' },
+    { label: '项目名称', prop: 'projectName', span: 2 },
+    { label: '审核状态', prop: 'approvalStatusName' },
+    { label: '当前节点', prop: 'currentNode' },
+    { label: '当前处理人', prop: 'currentProcessor' },
+    { label: '所属组织', prop: 'deptName' },
+    { label: '备注', prop: 'remark', span: 2 },
+  ],
+  'contract-manage': [
+    { label: '合同编号', prop: 'contractNo' },
+    { label: '合同名称', prop: 'contractName', span: 2 },
+    { label: '合同类别', prop: 'contractCategory' },
+    { label: '审核状态', prop: 'approvalStatusName' },
+    { label: '当前节点', prop: 'currentNode' },
+    { label: '当前处理人', prop: 'currentProcessor' },
+    { label: '甲方', prop: 'partyA' },
+    { label: '乙方', prop: 'partyB' },
+    { label: '项目名称', prop: 'projectName', span: 2 },
+  ],
+  'waybill-manage': [
+    { label: '运单号', prop: 'waybillNo' },
+    { label: '项目', prop: 'projectName' },
+    { label: '客户合同', prop: 'contractName' },
+    { label: '客户名称', prop: 'customerName' },
+    { label: '货物名称', prop: 'cargoName' },
+    { label: '承运商', prop: 'carrierName' },
+    { label: '当前过程节点', prop: 'currentProcessNode' },
+    { label: '发货地', prop: 'departureName' },
+    { label: '收货地', prop: 'arrivalName' },
+  ],
+  'pre-settlement': [
+    { label: '预结算单号', prop: 'preSettlementNo' },
+    { label: '合同名称', prop: 'contractName' },
+    { label: '项目名称', prop: 'projectName' },
+    { label: '结算金额', prop: 'settlementAmount' },
+    { label: '审核状态', prop: 'approvalStatusName' },
+    { label: '当前节点', prop: 'currentNode' },
+    { label: '当前处理人', prop: 'currentProcessor' },
+    { label: '备注', prop: 'remark', span: 2 },
+  ],
+  'formal-settlement': [
+    { label: '正式结算单号', prop: 'formalSettlementNo' },
+    { label: '预结算单号', prop: 'preSettlementNos' },
+    { label: '项目名称', prop: 'projectName' },
+    { label: '合同名称', prop: 'contractName' },
+    { label: '结算金额', prop: 'settlementAmount' },
+    { label: '审核状态', prop: 'approvalStatusName' },
+    { label: '当前节点', prop: 'currentNode' },
+    { label: '当前处理人', prop: 'currentProcessor' },
+  ],
+  'payment-application': [
+    { label: '付款申请号', prop: 'paymentNo' },
+    { label: '付款类型', prop: 'paymentTypeName' },
+    { label: '收款方', prop: 'payeeName' },
+    { label: '项目名称', prop: 'projectName' },
+    { label: '申请金额', prop: 'applyAmount' },
+    { label: '审核状态', prop: 'approvalStatusName' },
+    { label: '当前节点', prop: 'currentNode' },
+    { label: '当前处理人', prop: 'currentProcessor' },
+  ],
+};
+
+const TITLE_MAP = {
+  'project-apply': '查看项目信息',
+  'contract-manage': '查看合同信息',
+  'waybill-manage': '查看运单信息',
+  'pre-settlement': '查看预结算信息',
+  'formal-settlement': '查看正式结算信息',
+  'payment-application': '查看付款申请信息',
+};
+
+export default {
+  name: 'MkPublicBizView',
+  data() {
+    return {
+      detail: null,
+    };
+  },
+  computed: {
+    bizType() {
+      return this.$route.meta.bizType || this.$route.query.bizType || '';
+    },
+    pageTitle() {
+      return TITLE_MAP[this.bizType] || '查看详情';
+    },
+    visibleFields() {
+      return FIELD_MAP[this.bizType] || [];
+    },
+  },
+  created() {
+    this.handleIframeHeight = () => this.sendIframeHeight();
+    this.handleProcessMessage = event => this.onProcessMessage(event);
+    document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.addEventListener('message', this.handleProcessMessage);
+  },
+  mounted() {
+    document.documentElement.classList.add('mk-iframe-page');
+    document.body.classList.add('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.add('mk-iframe-page');
+    this.loadDetail();
+    this.handleIframeHeight();
+    window.addEventListener('load', this.handleIframeHeight);
+    this.mkHeightTimers = [300, 800, 1600].map(delay => setTimeout(this.handleIframeHeight, delay));
+    if (typeof ResizeObserver === 'undefined') return;
+    this.mkHeightObserver = new ResizeObserver(() => this.handleIframeHeight());
+    this.$nextTick(() => {
+      if (this.$refs.page) this.mkHeightObserver.observe(this.$refs.page);
+      this.mkHeightObserver.observe(document.body);
+    });
+  },
+  beforeUnmount() {
+    document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.removeEventListener('load', this.handleIframeHeight);
+    window.removeEventListener('message', this.handleProcessMessage);
+    (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
+    if (this.mkHeightObserver) {
+      this.mkHeightObserver.disconnect();
+      this.mkHeightObserver = null;
+    }
+    document.documentElement.classList.remove('mk-iframe-page');
+    document.body.classList.remove('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.remove('mk-iframe-page');
+  },
+  methods: {
+    loadDetail() {
+      const id = this.getFormId();
+      if (!id || !this.bizType) return;
+      getMkPublicDetail(this.bizType, id).then(res => {
+        this.detail = res.data?.data || null;
+        this.handleIframeHeight();
+      });
+    },
+    sendIframeHeight() {
+      this.$nextTick(() => {
+        window.parent.postMessage({ height: document.body.clientHeight }, '*');
+      });
+    },
+    onProcessMessage(event) {
+      const data = event && event.data;
+      if (!data || typeof data !== 'object') return;
+      if (data.height && !data.status && !data.type) return;
+      if (data.type === 'formValues' || data.type === 'afterSubmit') return;
+      const formValues = data.formValues;
+      if (data.status === 'submit') {
+        this.submitData(formValues);
+      } else if (data.status === 'save') {
+        this.saveData(formValues);
+      }
+      if (data.type === 'getFormValues') {
+        window.parent.postMessage({ type: 'formValues', formData: this.buildFormData() }, '*');
+      }
+    },
+    submitData(lbpmFormValues) {
+      const formData = this.buildFormData();
+      this.postFormData('submit', lbpmFormValues, formData);
+      if (!lbpmFormValues) return;
+      const parameters = Object.assign({}, lbpmFormValues, {
+        loginName: this.getLoginName(lbpmFormValues),
+        formInstanceId: this.getFormId(),
+        subject: formData.subject,
+      });
+      window.parent.postMessage({ type: 'afterSubmit', success: true, parameters }, '*');
+    },
+    saveData(lbpmFormValues) {
+      this.postFormData('save', lbpmFormValues, this.buildFormData());
+    },
+    postFormData(status, formValues, formData) {
+      const payload = { status, formValues: formValues || {}, formData };
+      postMkPublicProcessMessage(this.bizType, payload).catch(error => {
+        console.error('公开页提交流程数据失败：', error);
+      });
+    },
+    buildFormData() {
+      const detail = this.detail || {};
+      return {
+        ...detail,
+        id: this.getFormId() || detail.id,
+        subject: this.pageTitle,
+        formInstanceId: this.getFormId(),
+      };
+    },
+    getFormId() {
+      return this.$route.query.id || this.detail?.id || '';
+    },
+    getLoginName(formValues = {}) {
+      return (
+        formValues.loginName ||
+        this.$route.query.loginName ||
+        this.$route.query.submitIdentity ||
+        ''
+      );
+    },
+    displayValue(value) {
+      if (value === null || value === undefined || value === '') return '-';
+      if (Array.isArray(value)) return value.join('、') || '-';
+      if (typeof value === 'object') return JSON.stringify(value);
+      return value;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+html.mk-iframe-page,
+html.mk-iframe-page body,
+html.mk-iframe-page #app,
+html.mk-iframe-page #app.mk-iframe-page {
+  height: auto !important;
+  min-height: 100%;
+  overflow: visible;
+}
+</style>
+
+<style lang="scss" scoped>
+.mk-public-biz-view {
+  min-height: 100%;
+  padding: 12px 0 24px;
+  box-sizing: border-box;
+  background: #f0f2f5;
+
+  :deep(.basic-container) {
+    padding: 0 12px;
+  }
+
+  &__title {
+    position: relative;
+    padding-left: 12px;
+    margin: 8px 0 16px;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 22px;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 0;
+      top: 2px;
+      width: 4px;
+      height: 18px;
+      background: #409eff;
+    }
+  }
+}
+</style>
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 13cee87..6adff7c 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -608,6 +608,7 @@ import {
 } from '@/api/vehicle/customer-archive';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
 import { downloadFileByUrl } from '@/utils/util';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import PdfPreview from '@/components/pdf-preview/main.vue';
 
 const attachmentViewerPlugins = [
@@ -2354,6 +2355,12 @@ export default {
       const saved = await this.saveDraft(true);
       if (!saved) return;
       await api.submit({ id: this.form.id });
+      await submitMkApprovalFlow({
+        bizType: 'payment-application',
+        formInstanceId: this.form.id,
+        subjectName: this.form.paymentNo || '',
+        approvalStatus: this.form.approvalStatus || '',
+      });
       this.$message.success('提交成功');
       this.goBack();
     },
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 9fb193b..c18379f 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -233,6 +233,7 @@ import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/paymentApplication';
 import { paymentApplicationTableColumns } from '@/option/payment/paymentApplication';
 import organizationSearch from '@/mixins/organization-search';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyQuery = () => ({
   paymentNo: '',
@@ -361,6 +362,12 @@ export default {
     },
     async handleSubmit(row) {
       await api.submit({ id: row.id });
+      await submitMkApprovalFlow({
+        bizType: 'payment-application',
+        formInstanceId: row.id,
+        subjectName: row.paymentNo || '',
+        approvalStatus: row.approvalStatus || '',
+      });
       this.$message.success('提交成功');
       this.loadTable();
     },
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 61a80e3..c90624f 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -955,6 +955,7 @@ import {
   settlementSummaryColumns,
 } from '@/option/settlement/preSettlementTable';
 import { downloadFileByUrl } from '@/utils/util';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
 
 export default {
@@ -1553,6 +1554,12 @@ export default {
         await this.persistPendingAdjustments();
         if (shouldSubmit) {
           await submit({ id: this.form.id });
+          await submitMkApprovalFlow({
+            bizType: 'pre-settlement',
+            formInstanceId: this.form.id,
+            subjectName: this.form.preSettlementNo || this.form.contractName || '',
+            approvalStatus: this.form.approvalStatus || '',
+          });
           this.$message.success('审批流程已发起');
           this.visible = false;
           this.$emit('success', this.form.id);
diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index 002b5d5..985e1a0 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -182,6 +182,7 @@ import organizationSearch from '@/mixins/organization-search';
 import { formalSettlementTableColumns } from '@/option/settlement/formalSettlementTable';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyQuery = () => ({
   formalSettlementNo: '',
@@ -337,6 +338,12 @@ export default {
     async handleSubmit(row) {
       await this.$confirm('提交后来源预结算将保持锁定，确认提交？', '提示', { type: 'warning' });
       await api.submit({ id: row.id });
+      await submitMkApprovalFlow({
+        bizType: 'formal-settlement',
+        formInstanceId: row.id,
+        subjectName: row.formalSettlementNo || '',
+        approvalStatus: row.approvalStatus || '',
+      });
       this.$message.success('提交成功');
       this.loadTable();
     },
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 70247da..107f5be 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -198,6 +198,17 @@
             <el-form ref="userFormRef" :model="form" :rules="userRules" label-position="right" label-width="calc(6em + 24px)">
               <el-row :gutter="18">
                 <el-col :span="6"><el-form-item label="账号名" prop="account"><el-input v-model="form.account" /></el-form-item></el-col>
+                <el-col v-if="userDialogMode === 'add'" :span="6">
+                  <el-form-item label="登录密码" prop="password">
+                    <el-input
+                      v-model="form.password"
+                      type="password"
+                      show-password
+                      autocomplete="new-password"
+                      placeholder="请输入登录密码"
+                    />
+                  </el-form-item>
+                </el-col>
                 <el-col :span="6"><el-form-item label="姓名" prop="realName"><el-input v-model="form.realName" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="手机号" prop="phone"><el-input v-model="form.phone" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="邮箱"><el-input v-model="form.email" /></el-form-item></el-col>
@@ -544,19 +555,16 @@ export default {
       }
       return undefined;
     },
-    // 所属组织级联配置：checkStrictly 为 false 时只能选择最后一级（叶子节点）
+    // 所属组织级联配置：checkStrictly 为 true 时任意一级都可选择
     deptCascaderProps() {
       return {
         label: 'title',
         value: 'id',
         children: 'children',
         emitPath: false,
-        checkStrictly: false,
+        checkStrictly: true,
         expandTrigger: 'click',
-        leaf: (data, node) => {
-          // 判断是否为叶子节点：没有 children 或 children 为空数组
-          return !data.children || data.children.length === 0;
-        },
+        leaf: data => !data.children || data.children.length === 0,
       };
     },
     // 所属组织为单选级联：form.deptId 为数组（提交时 join），级联返回单个 id 值
@@ -835,6 +843,7 @@ export default {
       if (mode === 'add') {
         this.form = {
           account: '',
+          password: '',
           realName: '',
           phone: '',
           email: '',
@@ -890,6 +899,9 @@ export default {
           roleId: func.join(this.form.roleId),
           leaderId: func.join(this.form.leaderId),
         };
+        if (this.userDialogMode !== 'add') {
+          delete row.password;
+        }
         const request = this.userDialogMode === 'add' ? add(row) : update(this.sensitiveManager.getSubmitData(row));
         request.then(() => {
           this.userDialog = false;
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index fcf3d08..e6e507d 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1500,7 +1500,7 @@ import {
   getDetail as getCreditScoreQuantificationDetail,
 } from '@/api/vehicle/credit-score-quantification';
 import { getDictionary } from '@/api/system/dictbiz';
-import { processSubmit } from '@/api/system/business-process';
+import { processDelete, processSubmit } from '@/api/system/business-process';
 import { getDeptTree } from '@/api/system/dept';
 import { getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
@@ -4152,7 +4152,11 @@ export default {
             archive.fullName ||
             this.archiveForm.fullName ||
             '';
-          this.submitCustomerApproval(id, fullName).then(() => {
+          this.submitCustomerApproval(
+            id,
+            fullName,
+            archive.approvalStatus || this.archiveForm.approvalStatus
+          ).then(() => {
             this.closeArchive();
             this.onLoad(this.page);
             this.$message({ type: 'success', message: '提交成功!' });
@@ -4163,15 +4167,19 @@ export default {
     /**
      * 列表 / 新增 / 编辑提交共用：提交 MK 审核流并更新客商审批状态
      */
-    submitCustomerApproval(id, fullName = '') {
-      return this.submitMkApprovalFlow(id, fullName).then(() => submitApproval(id));
+    submitCustomerApproval(id, fullName = '', approvalStatus = '') {
+      return this.submitMkApprovalFlow(id, fullName, approvalStatus).then(() => submitApproval(id));
     },
     /**
-     * 提交 MK 审核流：templateCode 取业务字典 mk_template 中「提交审核流」的键值
+     * 提交 MK 审核流：templateCode 取业务字典 mk_template 中「提交客商审核流」的键值
      * 提交人手机号由后端从用户表读取真实值（前端接口会脱敏）
+     * MK 驳回后再提交时，先删除旧流程再创建新流程
      */
-    async submitMkApprovalFlow(formInstanceId, subjectName = '') {
-      const templateCode = await this.resolveMkTemplateCode('提交审核流');
+    async submitMkApprovalFlow(formInstanceId, subjectName = '', approvalStatus = '') {
+      if (approvalStatus === 'rejected') {
+        await processDelete({ formInstanceId: String(formInstanceId) });
+      }
+      const templateCode = await this.resolveMkTemplateCode('提交客商审核流');
       const subject = subjectName
         ? `客商准入审批：${subjectName}`
         : `客商准入审批：${formInstanceId}`;
@@ -4181,7 +4189,7 @@ export default {
         subject,
       });
     },
-    async resolveMkTemplateCode(dictName = '提交审核流') {
+    async resolveMkTemplateCode(dictName = '提交客商审核流') {
       const res = await getDictionary({ code: 'mk_template' });
       const list = res?.data?.data || [];
       const matched = list.find(item => String(item.dictValue || '').trim() === dictName);
@@ -4782,7 +4790,13 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
         })
-          .then(() => this.submitCustomerApproval(row.id, archive.fullName || row.fullName))
+          .then(() =>
+            this.submitCustomerApproval(
+              row.id,
+              archive.fullName || row.fullName,
+              archive.approvalStatus || row.approvalStatus
+            )
+          )
           .then(() => {
             this.onLoad(this.page);
             this.$message({ type: 'success', message: '提交成功!' });

From 4e04cdbc5b08ba22ecd2934ae5d9ef3db914b14c Mon Sep 17 00:00:00 2001
From: "weicw1996@qq.com" <weicw1996@qq.com>
Date: Mon, 21 Sep 2026 06:24:31 +0800
Subject: [PATCH 17/28] =?UTF-8?q?:zap:=20=E7=BB=9F=E4=B8=80=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E6=96=B9=E5=BC=8F=E5=85=9C=E5=BA=95=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E4=B8=BA=E5=85=AC=E8=B7=AF=E8=BF=90=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去掉计划单调度、运输计划展示中的「公路整车」旧文案
---
 src/views/business/components/business-crud-page.vue  | 2 +-
 src/views/business/components/transport-plan-page.vue | 2 +-
 src/views/business/transport-plan-dispatch.vue        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index a1131fb..3c95e84 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -3374,7 +3374,7 @@
                 {{ dispatchDialogStatusText }}
               </el-tag>
               <el-tag type="primary" effect="light">
-                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路整车' }}
+                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路运输' }}
               </el-tag>
             </div>
           </div>
diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue
index 588dcce..9d02e48 100644
--- a/src/views/business/components/transport-plan-page.vue
+++ b/src/views/business/components/transport-plan-page.vue
@@ -1231,7 +1231,7 @@
                 {{ dispatchDialogStatusText }}
               </el-tag>
               <el-tag type="primary" effect="light">
-                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路整车' }}
+                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路运输' }}
               </el-tag>
             </div>
           </div>
diff --git a/src/views/business/transport-plan-dispatch.vue b/src/views/business/transport-plan-dispatch.vue
index 66994dd..045284a 100644
--- a/src/views/business/transport-plan-dispatch.vue
+++ b/src/views/business/transport-plan-dispatch.vue
@@ -11,7 +11,7 @@
             {{ planData.businessStatusName || '-' }}
           </span>
           <span class="detail-status-text detail-transport-type">
-            {{ planData.transportTypeName || '公路整车' }}
+            {{ planData.transportTypeName || '公路运输' }}
           </span>
         </div>
         <div class="transport-plan-dispatch-page__summary-grid">

From 815810f841698086027832dada607349b2648d5e Mon Sep 17 00:00:00 2001
From: "weicw1996@qq.com" <weicw1996@qq.com>
Date: Mon, 21 Sep 2026 09:48:08 +0800
Subject: [PATCH 18/28] =?UTF-8?q?:sparkles:=20=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA=E6=B3=A8=E6=98=8E?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AE=BD=E5=AE=B9=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

8 个 CRUD 导入上传 tip 与运单导入弹窗、运输计划导入页的提示文案
统一补充「日期支持 2026-08-02、2026-8-2、2026/8/2 等写法」，
配合后端宽容日期解析（weicw/tms-erp#1）。
---
 src/views/base/airport-master.vue                       | 2 +-
 src/views/base/cargo-type.vue                           | 2 +-
 src/views/base/currency.vue                             | 2 +-
 src/views/base/port-terminal.vue                        | 2 +-
 src/views/base/railway-station.vue                      | 2 +-
 src/views/base/region.vue                               | 2 +-
 src/views/business/components/waybill-import-dialog.vue | 2 +-
 src/views/business/transport-plan-import.vue            | 2 +-
 src/views/vehicle/maintenance-plan.vue                  | 2 +-
 src/views/vehicle/maintenance-record.vue                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue
index ad78455..93f92a7 100644
--- a/src/views/base/airport-master.vue
+++ b/src/views/base/airport-master.vue
@@ -504,7 +504,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             accept: '.xls,.xlsx',
             action: '/blade-system/airport-master/import-airport-master',
           },
diff --git a/src/views/base/cargo-type.vue b/src/views/base/cargo-type.vue
index cdc487f..b1f783b 100644
--- a/src/views/base/cargo-type.vue
+++ b/src/views/base/cargo-type.vue
@@ -274,7 +274,7 @@ export default {
               res: 'data',
             },
             headers: getUploadHeaders(),
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             action: '/blade-system/cargo-type/import-cargo-type',
           },
           {
diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue
index f4441bb..0ad39fe 100644
--- a/src/views/base/currency.vue
+++ b/src/views/base/currency.vue
@@ -326,7 +326,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             action: '/blade-system/currency/import-currency',
           },
           {
diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue
index 125e786..e4e2daf 100644
--- a/src/views/base/port-terminal.vue
+++ b/src/views/base/port-terminal.vue
@@ -673,7 +673,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             accept: '.xls,.xlsx',
             action: '/blade-system/port-terminal/import-port-terminal',
           },
diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue
index 5b04b5a..d6dc0f2 100644
--- a/src/views/base/railway-station.vue
+++ b/src/views/base/railway-station.vue
@@ -475,7 +475,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             accept: '.xls,.xlsx',
             action: '/blade-system/railway-station/import-railway-station',
           },
diff --git a/src/views/base/region.vue b/src/views/base/region.vue
index 62adceb..8b256ea 100644
--- a/src/views/base/region.vue
+++ b/src/views/base/region.vue
@@ -309,7 +309,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             action: '/blade-system/region/import-region',
           },
           {
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index ee2ccec..8c750aa 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -454,7 +454,7 @@
             :on-change="fileChange"
             :on-remove="fileRemove"
             ><el-button type="primary">添加附件</el-button></el-upload
-          ><span class="waybill-import-create__file-tip">请上传运单明细表，仅支持 excel 格式</span
+          ><span class="waybill-import-create__file-tip">请上传运单明细表，仅支持 excel 格式；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法</span
           ><el-link type="primary" @click="downloadTemplate">下载模板</el-link></el-form-item
         >
       </el-form>
diff --git a/src/views/business/transport-plan-import.vue b/src/views/business/transport-plan-import.vue
index de780cc..b6f5443 100644
--- a/src/views/business/transport-plan-import.vue
+++ b/src/views/business/transport-plan-import.vue
@@ -76,7 +76,7 @@
           <el-button type="primary">添加附件</el-button>
         </el-upload>
         <span class="transport-plan-import-page__file-tip">
-          请上传计划明细表，仅支持 Excel 格式
+          请上传计划明细表，仅支持 Excel 格式；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法
         </span>
         <el-link type="primary" @click="handleTemplateDownload">下载模板</el-link>
       </el-form-item>
diff --git a/src/views/vehicle/maintenance-plan.vue b/src/views/vehicle/maintenance-plan.vue
index 79cc1b8..12304a5 100644
--- a/src/views/vehicle/maintenance-plan.vue
+++ b/src/views/vehicle/maintenance-plan.vue
@@ -516,7 +516,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             action: '/blade-transport/maintenance-plan/import-maintenance-plan',
           },
           {
diff --git a/src/views/vehicle/maintenance-record.vue b/src/views/vehicle/maintenance-record.vue
index 77dd905..225b352 100644
--- a/src/views/vehicle/maintenance-record.vue
+++ b/src/views/vehicle/maintenance-record.vue
@@ -489,7 +489,7 @@ export default {
             propsHttp: {
               res: 'data',
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: '请上传 .xls,.xlsx 标准格式文件；日期支持 2026-08-02、2026-8-2、2026/8/2 等写法',
             action: '/blade-transport/maintenance-record/import-maintenance-record',
           },
           {

From ac87208ba97f49061384046ab6af0da5731aee33 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 22 Sep 2026 12:06:48 +0800
Subject: [PATCH 19/28] =?UTF-8?q?:sparkles:=20MK=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E9=A1=B5=E3=80=81=E9=A2=84=E7=BB=93=E7=AE=97=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E5=9C=B0=E5=9B=BE=E9=80=89=E5=9D=80?=
 =?UTF-8?q?=E4=B8=8E=E8=AE=A4=E8=AF=81=E5=AF=86=E7=A0=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dept.js                        |   9 +
 src/components/address-map-picker/main.vue    |  52 +-
 src/option/base/measurement-unit.js           |   1 +
 src/option/business/temporary-credit-limit.js |   2 +-
 src/option/system/authlog.js                  |   5 +-
 src/option/system/user.js                     |   7 +-
 src/page/login/index.vue                      |   4 +-
 src/router/page/index.js                      |  12 +-
 src/utils/mk-approval.js                      |  24 +-
 src/utils/validate.js                         |  28 +
 src/views/base/airport-master.vue             |  60 +-
 src/views/base/port-terminal.vue              |  47 +-
 src/views/base/railway-station.vue            |  60 +-
 .../components/billing-plan-editor.vue        |  64 ++-
 .../components/business-crud-page.vue         |   8 +-
 .../contract-attachment-section.vue           |  36 +-
 .../components/waybill-manage-page.vue        |  26 +-
 src/views/business/contract-manage-change.vue |  79 ++-
 .../business/contract-manage-public-view.vue  |  21 +
 src/views/business/contract-manage.vue        | 144 +++--
 .../business/project-apply-public-view.vue    | 149 +++++
 src/views/business/project-apply.vue          | 127 ++++-
 src/views/business/temporary-credit-limit.vue |  82 ++-
 .../business/waybill-manage-public-view.vue   |  38 ++
 src/views/mk/mk-public-shell.vue              | 155 ++++++
 .../payment/payment-application-form.vue      |  56 +-
 .../payment-application-public-view.vue       |  21 +
 .../components/formal-settlement-editor.vue   |  86 ++-
 .../components/pre-settlement-editor.vue      | 524 ++++++++++++------
 .../settlement/formal-settlement-form.vue     |   1 +
 .../formal-settlement-public-view.vue         |  55 ++
 src/views/settlement/pre-settlement-form.vue  |   1 +
 .../settlement/pre-settlement-public-view.vue |  55 ++
 .../settlement/receivable-payable-detail.vue  |  58 +-
 src/views/system/dept.vue                     |  64 ++-
 src/views/system/user.vue                     |  14 +-
 src/views/system/userinfo.vue                 |  15 +-
 src/views/vehicle/customer-archive.vue        |  71 ++-
 src/views/vehicle/maintenance-plan.vue        |   4 +-
 src/views/vehicle/maintenance-record.vue      |   4 +-
 src/views/vehicle/violation-record.vue        |   4 +-
 41 files changed, 1882 insertions(+), 391 deletions(-)
 create mode 100644 src/views/business/contract-manage-public-view.vue
 create mode 100644 src/views/business/project-apply-public-view.vue
 create mode 100644 src/views/business/waybill-manage-public-view.vue
 create mode 100644 src/views/mk/mk-public-shell.vue
 create mode 100644 src/views/payment/payment-application-public-view.vue
 create mode 100644 src/views/settlement/formal-settlement-public-view.vue
 create mode 100644 src/views/settlement/pre-settlement-public-view.vue

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index de1edf6..37b1aba 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -48,6 +48,15 @@ export const syncIamOrganizations = () => {
   });
 };
 
+export const clearNonTopDept = signal => {
+  return request({
+    url: '/blade-system/dept/clear-non-top',
+    method: 'post',
+    timeout: 60000,
+    signal,
+  });
+};
+
 export const syncOaCompany = (current = 1, size = 20, signal) => {
   return request({
     url: '/blade-system/dept/sync-oa-company',
diff --git a/src/components/address-map-picker/main.vue b/src/components/address-map-picker/main.vue
index 851d9eb..aab6ba6 100644
--- a/src/components/address-map-picker/main.vue
+++ b/src/components/address-map-picker/main.vue
@@ -42,6 +42,14 @@ export default {
       type: String,
       default: '',
     },
+    longitude: {
+      type: [String, Number],
+      default: '',
+    },
+    latitude: {
+      type: [String, Number],
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'confirm'],
   data() {
@@ -66,9 +74,11 @@ export default {
         this.visible = value;
         if (value) {
           this.keyword = this.address || '';
-          this.selected = {};
-          this.status = '可搜索地址或点击地图选点';
           this.searchResults = [];
+          this.selected = this.buildInitialSelection();
+          this.status = this.selected.longitude
+            ? this.selected.address || '已选点，可确认回填'
+            : '可搜索地址或点击地图选点';
         }
       },
     },
@@ -82,6 +92,18 @@ export default {
     }
   },
   methods: {
+    buildInitialSelection() {
+      const longitude = Number(this.longitude);
+      const latitude = Number(this.latitude);
+      if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
+        return {};
+      }
+      return {
+        longitude,
+        latitude,
+        address: this.address || '',
+      };
+    },
     loadAmap() {
       if (window.AMap && window.AMap.Map) {
         return Promise.resolve();
@@ -110,15 +132,27 @@ export default {
           return new Promise(resolve => {
             this.$nextTick(() => {
               if (!this.$refs.map) return resolve(null);
+              const initial = this.buildInitialSelection();
+              const center =
+                Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude)
+                  ? [initial.longitude, initial.latitude]
+                  : [116.40769, 39.89945];
               if (!this.amap) {
                 this.amap = new window.AMap.Map(this.$refs.map, {
-                  center: [116.40769, 39.89945],
-                  zoom: 11,
+                  center,
+                  zoom: initial.longitude ? 14 : 11,
                 });
                 this.amap.on('click', event => this.pickPoint(event.lnglat));
               } else {
                 this.amap.resize();
                 this.clearMarker();
+                this.amap.setZoomAndCenter(initial.longitude ? 14 : 11, center);
+              }
+              if (initial.longitude) {
+                const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
+                this.renderMarker(point);
+                this.selected = { ...initial };
+                this.status = initial.address || '已选点，可确认回填';
               }
               resolve(this.amap);
             });
@@ -254,11 +288,19 @@ export default {
       }
     },
     confirm() {
+      if (!this.selected.longitude || !this.selected.latitude) {
+        this.$message.warning('请先搜索或点击地图完成选点');
+        return;
+      }
       if (!this.selected.address) {
         this.$message.warning('请等待地址解析完成后再确认');
         return;
       }
-      this.$emit('confirm', this.selected.address);
+      this.$emit('confirm', {
+        address: this.selected.address,
+        longitude: this.selected.longitude,
+        latitude: this.selected.latitude,
+      });
       this.visible = false;
     },
   },
diff --git a/src/option/base/measurement-unit.js b/src/option/base/measurement-unit.js
index 5f02982..7c68b87 100644
--- a/src/option/base/measurement-unit.js
+++ b/src/option/base/measurement-unit.js
@@ -42,6 +42,7 @@ export const createOption = () => ({
       label: '计量单位编码',
       prop: 'unitCode',
       minWidth: 150,
+      span: 24,
       search: true,
       searchOrder: 4,
       searchSpan: 6,
diff --git a/src/option/business/temporary-credit-limit.js b/src/option/business/temporary-credit-limit.js
index 4ad6fb4..e069f7d 100644
--- a/src/option/business/temporary-credit-limit.js
+++ b/src/option/business/temporary-credit-limit.js
@@ -334,7 +334,7 @@ export const option = {
     },
     ...auditColumns.map(column => ({ ...column, hide: true })),
   ])),
-  dialogWidth: '96%',
+  dialogWidth: '1100px',
   menuFixed: 'right',
   menuWidth: 320,
   index: false,
diff --git a/src/option/system/authlog.js b/src/option/system/authlog.js
index d550790..3e937f1 100644
--- a/src/option/system/authlog.js
+++ b/src/option/system/authlog.js
@@ -5,6 +5,7 @@ export const GRANT_TYPE_DIC = [
   { label: '社交登录', value: 'social' },
   { label: '客户端凭证', value: 'client_credentials' },
   { label: '刷新令牌', value: 'refresh_token' },
+  { label: '退出登录', value: 'logout' },
 ];
 
 export const authLogOption = {
@@ -38,7 +39,7 @@ export const authLogOption = {
       prop: 'realName',
     },
     {
-      label: '授权类型',
+      label: '操作类型',
       prop: 'grantType',
       type: 'select',
       search: true,
@@ -80,7 +81,7 @@ export const authLogOption = {
       width: 120,
     },
     {
-      label: '登录时间',
+      label: '操作时间',
       prop: 'loginTime',
       sortable: true,
       span: 24,
diff --git a/src/option/system/user.js b/src/option/system/user.js
index 197198b..9cc07c3 100644
--- a/src/option/system/user.js
+++ b/src/option/system/user.js
@@ -1,12 +1,9 @@
 import { getDeptLazyTree } from '@/api/system/dept';
+import { validateLoginPassword } from '@/utils/validate';
 
 export const userOption = safe => {
   const validatePass = (rule, value, callback) => {
-    if (value === '') {
-      callback(new Error('请输入密码'));
-    } else {
-      callback();
-    }
+    validateLoginPassword(rule, value, callback);
   };
   const validatePass2 = (rule, value, callback) => {
     if (value === '') {
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index a9ee607..0ab99ca 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -24,6 +24,7 @@
           -->
           <userLogin v-if="activeName === 'user'"></userLogin>
           <registerLogin v-else-if="activeName === 'register'"></registerLogin>
+          <!-- 暂时默认账号密码登录，IAM 选择入口先隐藏
           <div v-else class="iam-login">
             <el-button type="primary" class="login-submit" @click.prevent="handleIamLogin">
               IAM统一身份认证
@@ -32,6 +33,7 @@
               账号密码登录
             </el-button>
           </div>
+          -->
         </div>
       </div>
     </div>
@@ -61,7 +63,7 @@ export default {
     return {
       website: website,
       time: '',
-      activeName: 'iam',
+      activeName: 'user',
       socialForm: {
         tenantId: '000000',
         source: '',
diff --git a/src/router/page/index.js b/src/router/page/index.js
index cbb2e72..ab93bb9 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -87,7 +87,7 @@ export default [
   {
     path: '/business/project-apply/public-view',
     name: '查看项目信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/business/project-apply-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -98,7 +98,7 @@ export default [
   {
     path: '/business/contract-manage/public-view',
     name: '查看合同信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/business/contract-manage-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -109,7 +109,7 @@ export default [
   {
     path: '/business/waybill-manage/public-view',
     name: '查看运单信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/business/waybill-manage-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -120,7 +120,7 @@ export default [
   {
     path: '/settlement/pre-settlement/public-view',
     name: '查看预结算信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/settlement/pre-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -131,7 +131,7 @@ export default [
   {
     path: '/settlement/formal-settlement/public-view',
     name: '查看正式结算信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/settlement/formal-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -142,7 +142,7 @@ export default [
   {
     path: '/payment/payment-application/public-view',
     name: '查看付款申请信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/payment/payment-application-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js
index a8544e7..5b02da7 100644
--- a/src/utils/mk-approval.js
+++ b/src/utils/mk-approval.js
@@ -40,10 +40,22 @@ export const MK_BIZ = {
   },
 };
 
-export async function resolveMkTemplateCode(dictName) {
+const MK_SWITCH_NAME = '开启MK';
+
+async function loadMkTemplateList() {
   const res = await getDictionary({ code: 'mk_template' });
-  const list = res?.data?.data || [];
-  const matched = list.find(item => String(item.dictValue || '').trim() === dictName);
+  return res?.data?.data || [];
+}
+
+/** 业务字典 mk_template：名称「开启MK」且键值为 1 时才请求 MK */
+export function isMkEnabled(list = []) {
+  const matched = list.find(item => String(item.dictValue || '').trim() === MK_SWITCH_NAME);
+  return String(matched?.dictKey ?? '').trim() === '1';
+}
+
+export async function resolveMkTemplateCode(dictName, list) {
+  const dictList = list || (await loadMkTemplateList());
+  const matched = dictList.find(item => String(item.dictValue || '').trim() === dictName);
   const templateCode = matched?.dictKey;
   if (!templateCode) {
     ElMessage.warning(`未配置业务字典 mk_template「${dictName}」，无法提交审核流`);
@@ -62,10 +74,14 @@ export async function submitMkApprovalFlow({
   if (!conf) {
     return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`));
   }
+  const list = await loadMkTemplateList();
+  if (!isMkEnabled(list)) {
+    return;
+  }
   if ((conf.rejected || []).includes(approvalStatus)) {
     await processDelete({ formInstanceId: String(formInstanceId) });
   }
-  const templateCode = await resolveMkTemplateCode(conf.dictName);
+  const templateCode = await resolveMkTemplateCode(conf.dictName, list);
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
     : `${conf.subjectPrefix}：${formInstanceId}`;
diff --git a/src/utils/validate.js b/src/utils/validate.js
index ccba6e7..6aed154 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -283,3 +283,31 @@ export function validatejson(val) {
   // 非对象、非数组、非字符串，或者字符串不是 JSON
   return false;
 }
+
+/** 登录密码规则提示 */
+export const LOGIN_PASSWORD_RULE_MESSAGE =
+  '密码须大于8位，且同时包含字母、数字和特殊字符（.!@#$%^&*）';
+
+/**
+ * 校验登录密码强度：大于8位，同时包含字母、数字、特殊字符（.!@#$%^&*）
+ * @param {string} password
+ * @returns {boolean}
+ */
+export function isValidLoginPassword(password) {
+  return /^(?=.*[A-Za-z])(?=.*\d)(?=.*[.!@#$%^&*]).{9,}$/.test(String(password || ''));
+}
+
+/**
+ * Element Plus / Avue 表单校验器：登录密码强度
+ */
+export function validateLoginPassword(rule, value, callback) {
+  if (value === undefined || value === null || String(value).trim() === '') {
+    callback(new Error('请输入登录密码'));
+    return;
+  }
+  if (!isValidLoginPassword(value)) {
+    callback(new Error(LOGIN_PASSWORD_RULE_MESSAGE));
+    return;
+  }
+  callback();
+}
diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue
index ad78455..a4f0632 100644
--- a/src/views/base/airport-master.vue
+++ b/src/views/base/airport-master.vue
@@ -94,6 +94,17 @@
           />
         </el-select>
       </template>
+      <template #detailAddress-form>
+        <el-input
+          v-model="form.detailAddress"
+          class="detail-address-input"
+          readonly
+          maxlength="255"
+          show-word-limit
+          placeholder="点击选择地图地址"
+          @click="openAddressMapPicker"
+        />
+      </template>
       <template #longitude-form>
         <el-input
           v-model="form.longitude"
@@ -121,6 +132,13 @@
         </template>
       </avue-form>
     </el-dialog>
+    <address-map-picker
+      v-model="addressMapPickerVisible"
+      :address="form.detailAddress"
+      :longitude="form.longitude"
+      :latitude="form.latitude"
+      @confirm="handleAddressMapConfirm"
+    />
   </basic-container>
 </template>
 
@@ -134,6 +152,7 @@ import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
@@ -181,6 +200,9 @@ const addExcelRequiredHeaderMarks = async blob => {
 };
 
 export default {
+  components: {
+    AddressMapPicker,
+  },
   data() {
     const validateIataCode = (rule, value, callback) => {
       if (!/^[A-Z]{3}$/.test(String(value || '').toUpperCase())) {
@@ -220,6 +242,7 @@ export default {
       loading: true,
       data: [],
       excelBox: false,
+      addressMapPickerVisible: false,
       excelForm: {},
       provinceOptions: [],
       cityOptions: [],
@@ -368,15 +391,14 @@ export default {
           {
             label: '详细地址',
             prop: 'detailAddress',
-            type: 'textarea',
-            minRows: 2,
+            formslot: true,
             span: 24,
             minWidth: 220,
             overHidden: false,
             maxlength: 255,
             showWordLimit: true,
             rules: [
-              { required: true, message: '请输入详细地址', trigger: 'blur' },
+              { required: true, message: '请选择详细地址', trigger: 'change' },
               { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
             ],
           },
@@ -669,6 +691,29 @@ export default {
     handleCoordinateInput(prop, value) {
       this.form[prop] = normalizeCoordinateInput(value);
     },
+    openAddressMapPicker() {
+      this.addressMapPickerVisible = true;
+    },
+    handleAddressMapConfirm(payload) {
+      const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      if (selection.address) {
+        this.form.detailAddress = selection.address;
+      }
+      if (
+        selection.longitude !== undefined &&
+        selection.longitude !== null &&
+        selection.longitude !== ''
+      ) {
+        this.form.longitude = Number(selection.longitude).toFixed(6);
+      }
+      if (
+        selection.latitude !== undefined &&
+        selection.latitude !== null &&
+        selection.latitude !== ''
+      ) {
+        this.form.latitude = Number(selection.latitude).toFixed(6);
+      }
+    },
     normalizeRow(row) {
       row.code = row.iataCode ? `JC-${row.iataCode}` : row.code;
       row.regionCode = String(row.regionCode || '').trim();
@@ -917,4 +962,13 @@ export default {
     white-space: nowrap;
   }
 }
+
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>
diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue
index 125e786..dc0e763 100644
--- a/src/views/base/port-terminal.vue
+++ b/src/views/base/port-terminal.vue
@@ -194,10 +194,11 @@
         <el-input
           v-model="form.detailAddress"
           class="detail-address-input"
-          clearable
+          readonly
           maxlength="255"
           show-word-limit
-          placeholder="请输入"
+          placeholder="点击选择地图地址"
+          @click="openAddressMapPicker"
         />
       </template>
       <template #remark-form>
@@ -244,6 +245,13 @@
         </template>
       </avue-form>
     </el-dialog>
+    <address-map-picker
+      v-model="addressMapPickerVisible"
+      :address="form.detailAddress"
+      :longitude="form.longitude"
+      :latitude="form.latitude"
+      @confirm="handleAddressMapConfirm"
+    />
   </basic-container>
 </template>
 
@@ -264,12 +272,16 @@ import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 const DEFAULT_COUNTRY_CODE = '+86';
 const newLocal = '请选择类型';
 export default {
+  components: {
+    AddressMapPicker,
+  },
   data() {
     const validateCode = (rule, value, callback) => {
       const code = String(value || '').toUpperCase();
@@ -315,6 +327,7 @@ export default {
       loading: true,
       data: [],
       excelBox: false,
+      addressMapPickerVisible: false,
       excelForm: {},
       portOptions: [],
       countryOptions: [],
@@ -572,11 +585,11 @@ export default {
             minWidth: 220,
             overHidden: false,
             order: 85,
-            placeholder: '请输入',
+            placeholder: '点击选择地图地址',
             maxlength: 255,
             showWordLimit: true,
             rules: [
-              { required: true, message: '请输入详细地址', trigger: 'blur' },
+              { required: true, message: '请选择详细地址', trigger: 'change' },
               { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
             ],
           },
@@ -1040,6 +1053,21 @@ export default {
     handleCoordinateInput(prop, value) {
       this.form[prop] = normalizeCoordinateInput(value);
     },
+    openAddressMapPicker() {
+      this.addressMapPickerVisible = true;
+    },
+    handleAddressMapConfirm(payload) {
+      const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      if (selection.address) {
+        this.form.detailAddress = selection.address;
+      }
+      if (selection.longitude !== undefined && selection.longitude !== null && selection.longitude !== '') {
+        this.form.longitude = Number(selection.longitude).toFixed(6);
+      }
+      if (selection.latitude !== undefined && selection.latitude !== null && selection.latitude !== '') {
+        this.form.latitude = Number(selection.latitude).toFixed(6);
+      }
+    },
     resolveCountryCode(country) {
       if (!country) {
         return Promise.resolve('');
@@ -1107,7 +1135,7 @@ export default {
         return false;
       }
       if (isBlank(row.detailAddress)) {
-        this.$message.warning('请输入详细地址');
+        this.$message.warning('请选择详细地址');
         return false;
       }
       if (isBlank(row.longitude)) {
@@ -1399,6 +1427,15 @@ export default {
   line-height: 20px;
   padding: 4px 0;
 }
+
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue
index 5b04b5a..a154b26 100644
--- a/src/views/base/railway-station.vue
+++ b/src/views/base/railway-station.vue
@@ -94,6 +94,17 @@
           />
         </el-select>
       </template>
+      <template #detailAddress-form>
+        <el-input
+          v-model="form.detailAddress"
+          class="detail-address-input"
+          readonly
+          maxlength="255"
+          show-word-limit
+          placeholder="点击选择地图地址"
+          @click="openAddressMapPicker"
+        />
+      </template>
       <template #longitude-form>
         <el-input
           v-model="form.longitude"
@@ -121,6 +132,13 @@
         </template>
       </avue-form>
     </el-dialog>
+    <address-map-picker
+      v-model="addressMapPickerVisible"
+      :address="form.detailAddress"
+      :longitude="form.longitude"
+      :latitude="form.latitude"
+      @confirm="handleAddressMapConfirm"
+    />
   </basic-container>
 </template>
 
@@ -134,12 +152,16 @@ import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 const DEFAULT_COUNTRY_CODE = '+86';
 
 export default {
+  components: {
+    AddressMapPicker,
+  },
   data() {
     const validateTmisCode = (rule, value, callback) => {
       if (!/^\d{5}$/.test(value || '')) {
@@ -185,6 +207,7 @@ export default {
       loading: true,
       data: [],
       excelBox: false,
+      addressMapPickerVisible: false,
       excelForm: {},
       provinceOptions: [],
       cityOptions: [],
@@ -340,15 +363,14 @@ export default {
           {
             label: '详细地址',
             prop: 'detailAddress',
-            type: 'textarea',
-            minRows: 2,
+            formslot: true,
             span: 24,
             minWidth: 220,
             overHidden: false,
             maxlength: 255,
             showWordLimit: true,
             rules: [
-              { required: true, message: '请输入详细地址', trigger: 'blur' },
+              { required: true, message: '请选择详细地址', trigger: 'change' },
               { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
             ],
           },
@@ -652,6 +674,29 @@ export default {
     handleCoordinateInput(prop, value) {
       this.form[prop] = normalizeCoordinateInput(value);
     },
+    openAddressMapPicker() {
+      this.addressMapPickerVisible = true;
+    },
+    handleAddressMapConfirm(payload) {
+      const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      if (selection.address) {
+        this.form.detailAddress = selection.address;
+      }
+      if (
+        selection.longitude !== undefined &&
+        selection.longitude !== null &&
+        selection.longitude !== ''
+      ) {
+        this.form.longitude = Number(selection.longitude).toFixed(6);
+      }
+      if (
+        selection.latitude !== undefined &&
+        selection.latitude !== null &&
+        selection.latitude !== ''
+      ) {
+        this.form.latitude = Number(selection.latitude).toFixed(6);
+      }
+    },
     normalizeRow(row) {
       row.code = row.tmisCode ? `TL${row.tmisCode}` : row.code;
       row.regionCode = String(row.regionCode || '').trim();
@@ -910,9 +955,16 @@ export default {
   :deep(.el-table td .cell) {
     white-space: nowrap;
   }
-
 }
 
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/business/components/billing-plan-editor.vue b/src/views/business/components/billing-plan-editor.vue
index 6fa3275..b13e2ab 100644
--- a/src/views/business/components/billing-plan-editor.vue
+++ b/src/views/business/components/billing-plan-editor.vue
@@ -162,9 +162,9 @@
             v-model="row.billingUnit"
             clearable
             filterable
-            :disabled="!row.billingElement"
+            :disabled="!canSelectBillingUnit(row)"
             :loading="unitLoading"
-            :placeholder="row.billingElement ? '请选择' : '请先选择计费要素'"
+            :placeholder="billingUnitPlaceholder(row)"
             ><el-option
               v-for="item in unitOptionsFor(row)"
               :key="item.id || item.value"
@@ -381,11 +381,18 @@ import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 
 const clone = value => JSON.parse(JSON.stringify(value));
-/** 计费要素与计量单位维度的对应关系 */
+/** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
 const BILLING_ELEMENT_DIMENSION_MAP = {
   按重量: '重量',
   按体积: '体积',
-  按车辆: '数量',
+  按数量: '数量',
+};
+const BILLING_UNIT_SELECTABLE_ELEMENTS = Object.keys(BILLING_ELEMENT_DIMENSION_MAP);
+/** 固定计费单位（不可编辑） */
+const FIXED_BILLING_UNIT_MAP = {
+  按里程: '公里',
+  '按吨·公里': '吨公里',
+  '固定金额（整单一口价）': '单',
 };
 const defaultRule = () => ({
   feeType: '',
@@ -436,7 +443,6 @@ export default {
       billingElements: [
         '按重量',
         '按体积',
-        '按车辆',
         '按里程',
         '按吨·公里',
         '固定金额（整单一口价）',
@@ -445,7 +451,6 @@ export default {
       typeMap: {
         按重量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
         按体积: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
-        按车辆: ['固定单价'],
         按里程: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
         '按吨·公里': ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
         '固定金额（整单一口价）': ['固定一口价'],
@@ -560,6 +565,7 @@ export default {
         next.limitRanges = next.limitRanges.map(item => ({ ...item, minimumBillingWeight: '' }));
       this.syncLegacyLimit(next);
       next.matchCondition = { ...defaultRule().matchCondition, ...(rule.matchCondition || {}) };
+      this.syncBillingUnit(next);
       return next;
     },
     normalizeRanges(row) {
@@ -651,7 +657,26 @@ export default {
     measurementDimension(billingElement) {
       return BILLING_ELEMENT_DIMENSION_MAP[billingElement] || '';
     },
+    fixedBillingUnit(billingElement) {
+      return FIXED_BILLING_UNIT_MAP[String(billingElement || '').trim()] || '';
+    },
+    canSelectBillingUnit(row) {
+      return BILLING_UNIT_SELECTABLE_ELEMENTS.includes(String(row?.billingElement || '').trim());
+    },
+    billingUnitPlaceholder(row) {
+      if (!row?.billingElement) return '请先选择计费要素';
+      if (this.fixedBillingUnit(row.billingElement)) return this.fixedBillingUnit(row.billingElement);
+      if (!this.canSelectBillingUnit(row)) return '当前计费要素无需选择';
+      return '请选择';
+    },
     unitOptionsFor(row) {
+      const fixedUnit = this.fixedBillingUnit(row?.billingElement);
+      if (fixedUnit) {
+        return [{ id: fixedUnit, label: fixedUnit, value: fixedUnit }];
+      }
+      if (!this.canSelectBillingUnit(row)) {
+        return [];
+      }
       const dimension = this.measurementDimension(row?.billingElement);
       if (dimension) {
         return this.measurementUnits
@@ -663,15 +688,18 @@ export default {
           }))
           .filter(item => item.value);
       }
-      return (this.unitOptions || [])
-        .map(item => ({
-          id: item.id || item.dictKey || item.dictValue,
-          label: item.dictValue,
-          value: item.dictValue,
-        }))
-        .filter(item => item.value);
+      return [];
     },
     syncBillingUnit(row) {
+      const fixedUnit = this.fixedBillingUnit(row?.billingElement);
+      if (fixedUnit) {
+        row.billingUnit = fixedUnit;
+        return;
+      }
+      if (!this.canSelectBillingUnit(row)) {
+        row.billingUnit = '';
+        return;
+      }
       const options = this.unitOptionsFor(row);
       if (!options.some(item => String(item.value) === String(row.billingUnit || ''))) {
         row.billingUnit = '';
@@ -892,7 +920,6 @@ export default {
         ['taxRate', '税率'],
         ['billingElement', '计费要素'],
         ['billingType', '计费类型'],
-        ['billingUnit', '计费单位'],
       ];
       for (const [i, row] of this.draft.rules.entries()) {
         const empty = required.find(
@@ -902,6 +929,15 @@ export default {
           this.$message.warning(`第${i + 1}行${empty[1]}不能为空`);
           return false;
         }
+        if (
+          this.canSelectBillingUnit(row) &&
+          (row.billingUnit === undefined ||
+            row.billingUnit === null ||
+            String(row.billingUnit).trim() === '')
+        ) {
+          this.$message.warning(`第${i + 1}行计费单位不能为空`);
+          return false;
+        }
         const feeItem = String(row.feeItem).trim();
         if (feeItemSet.has(feeItem)) {
           this.$message.warning(`费用项“${feeItem}”不能重复`);
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index a1131fb..e58bbf4 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -1899,11 +1899,11 @@
             label-width="auto"
             class="business-crud-page__module-form business-crud-page__module-form--three"
           >
-            <el-form-item label="账单起始日期" required :error="settlementRuleErrors.billStartDate">
+            <el-form-item label="账单起始日" required :error="settlementRuleErrors.billStartDate">
               <el-date-picker
                 v-model="settlementRuleForm.billStartDate"
                 type="date"
-                placeholder="请选择账单起始日期"
+                placeholder="请选择账单起始日"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 :disabled="dialogReadonly"
@@ -7784,8 +7784,8 @@ export default {
       const rule = this.normalizeSettlementRule(source);
       this.settlementRuleErrors = {};
       if (this.isBillingFieldEmpty(rule.billStartDate)) {
-        this.settlementRuleErrors = { billStartDate: '请选择账单起始日期' };
-        this.$message.warning(`${label}${label ? '：' : ''}请选择账单起始日期`);
+        this.settlementRuleErrors = { billStartDate: '请选择账单起始日' };
+        this.$message.warning(`${label}${label ? '：' : ''}请选择账单起始日`);
         return false;
       }
       if (this.isBillingFieldEmpty(rule.settlementType)) {
diff --git a/src/views/business/components/contract-attachment-section.vue b/src/views/business/components/contract-attachment-section.vue
index ef36b9b..297b52c 100644
--- a/src/views/business/components/contract-attachment-section.vue
+++ b/src/views/business/components/contract-attachment-section.vue
@@ -103,8 +103,13 @@
       <div class="contract-attachment-upload-dialog__body">
         <div class="contract-attachment-upload-dialog__field">
           <span class="contract-attachment-upload-dialog__label">附件位置</span>
-          <el-select :model-value="attachmentLocation" disabled style="width: 100%">
-            <el-option :label="attachmentLocation" :value="attachmentLocation" />
+          <el-select v-model="uploadDialogLocation" placeholder="请选择附件位置" style="width: 100%">
+            <el-option
+              v-for="item in resolvedLocationOptions"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
           </el-select>
         </div>
         <div class="contract-attachment-upload-dialog__field">
@@ -273,15 +278,17 @@ export default {
     markApprovedOnUpload: Boolean,
     useUploadDialog: Boolean,
     attachmentLocation: { type: String, default: '合同文件' },
+    attachmentLocationOptions: { type: Array, default: null },
     preview: { type: Function, default: null },
   },
-  emits: ['update:rows'],
+  emits: ['update:rows', 'upload-to-location'],
   data() {
     return {
       selected: [],
       attachmentFileTypes,
       contractAttachmentTypeOptions: [...defaultContractAttachmentTypeOptions],
       uploadDialogVisible: false,
+      uploadDialogLocation: '合同文件',
       uploadDialogType: resolveOtherAttachmentType(defaultContractAttachmentTypeOptions),
       uploadDialogFiles: [],
       uploadDialogFileList: [],
@@ -300,6 +307,11 @@ export default {
     defaultAttachmentType() {
       return resolveOtherAttachmentType(this.contractAttachmentTypeOptions);
     },
+    resolvedLocationOptions() {
+      const options = (this.attachmentLocationOptions || []).filter(Boolean);
+      if (options.length) return options;
+      return ['合同文件', '其它附件'];
+    },
   },
   created() {
     this.loadAttachmentTypeOptions();
@@ -340,6 +352,10 @@ export default {
       this.update([...this.rows]);
     },
     openUploadDialog() {
+      const options = this.resolvedLocationOptions;
+      this.uploadDialogLocation = options.includes(this.attachmentLocation)
+        ? this.attachmentLocation
+        : options[0] || this.attachmentLocation;
       this.uploadDialogType = this.defaultAttachmentType;
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
@@ -348,6 +364,7 @@ export default {
     resetUploadDialog() {
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
+      this.uploadDialogLocation = this.attachmentLocation;
       this.uploadDialogType = this.defaultAttachmentType;
     },
     beforeUpload(file) {
@@ -416,6 +433,10 @@ export default {
         this.$message.warning('请先上传附件');
         return;
       }
+      if (!this.uploadDialogLocation) {
+        this.$message.warning('请选择附件位置');
+        return;
+      }
       if (!this.uploadDialogType) {
         this.$message.warning('请选择附件类型');
         return;
@@ -430,7 +451,14 @@ export default {
         uploadTime: row.uploadTime || uploadTime,
         ...(this.markApprovedOnUpload ? { approved: true } : {}),
       }));
-      this.update([...(this.rows || []), ...appended]);
+      if (this.uploadDialogLocation === this.attachmentLocation) {
+        this.update([...(this.rows || []), ...appended]);
+      } else {
+        this.$emit('upload-to-location', {
+          location: this.uploadDialogLocation,
+          rows: appended,
+        });
+      }
       this.uploadDialogVisible = false;
     },
     handleChange(rows) {
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 67d0c7d..461d885 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -1927,7 +1927,8 @@
                   v-if="!waybillIsCarrier(detailRow)"
                   class="waybill-manage-page__waybill-detail-field"
                 >
-                  <span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
+                  <span>里程(km)</span
+                  ><strong>{{ normalizeMileageValue(detailRow.mileage) || '-' }}</strong>
                 </div>
               </template>
               <template v-else-if="waybillIsNonRoadTransport(detailRow)">
@@ -2315,7 +2316,7 @@
           </div>
         </template>
       </div>
-      <div v-if="detailPageLocked" class="waybill-manage-page__detail-footer">
+      <div v-if="detailPageLocked && !isPublicWaybillView" class="waybill-manage-page__detail-footer">
         <el-button type="primary" @click="closeDetail">关闭</el-button>
       </div>
       <template v-if="!detailPageLocked" #footer>
@@ -3122,6 +3123,7 @@ import {
   getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
 import { getPunchRecords as getWaybillPunchRecords, locateVehicle, trackVehicle } from '@/api/business/waybill-manage';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
@@ -3646,6 +3648,7 @@ export default {
     this.formPageLocked = this.isStandaloneWaybillFormPage;
     this.detailPageLocked = this.isStandaloneWaybillDetailPage;
     this.formModeLocked = this.$route.query.mode || '';
+    if (this.isPublicWaybillView) return;
     if (this.config.enableAllDept && this.isAdmin) {
       this.allDept = 1;
     }
@@ -3709,8 +3712,14 @@ export default {
     isStandaloneWaybillFormPage() {
       return this.isStandaloneWaybillPage && ['add', 'edit'].includes(this.$route.query.mode);
     },
+    isPublicWaybillView() {
+      return this.$route.path === '/business/waybill-manage/public-view';
+    },
     isStandaloneWaybillDetailPage() {
-      return this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute;
+      return (
+        (this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute) ||
+        this.isPublicWaybillView
+      );
     },
     // 容器形态读实例创建时锁定的标志，不随 $route 翻转（详见 data 中 formPageLocked 的说明）
     // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
@@ -4591,14 +4600,19 @@ export default {
       this.waybillVoucherFolder = null;
       this.waybillVoucherFolderView = false;
       this.waybillVoucherImagesLoaded = false;
-      const request =
-        typeof this.api.getDetail === 'function'
+      const request = this.isPublicWaybillView
+        ? getMkPublicDetail('waybill-manage', row.id)
+        : typeof this.api.getDetail === 'function'
           ? this.api.getDetail(row.id)
           : Promise.resolve({ data: { data: row } });
       request
         .then(res => {
           const detail = res?.data?.data || res?.data || row;
           this.detailRow = detail;
+          if (this.isPublicWaybillView) {
+            this.applyFormDetail(detail);
+            return;
+          }
           this.loadWaybillPunchRecords();
           this.loadWaybillVoucherImages();
           if (detail.contractId) {
@@ -8560,7 +8574,7 @@ export default {
       };
       this.mileageForm = {
         id: row.id,
-        mileage: row.mileage === null || row.mileage === undefined ? '' : String(row.mileage),
+        mileage: this.normalizeMileageValue(row.mileage),
         mileageRemark: row.mileageRemark || '',
       };
       this.$nextTick(() => this.$refs.mileageFormRef?.clearValidate());
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index b6fd16f..96d3c62 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -70,7 +70,7 @@
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="YYYY-MM-DD"
+                placeholder="请输入"
               />
               <span>至</span>
               <el-date-picker
@@ -78,7 +78,7 @@
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="YYYY-MM-DD"
+                placeholder="请输入"
               />
             </div>
           </el-form-item>
@@ -92,12 +92,12 @@
             </el-input>
           </el-form-item>
           <el-form-item label="合同金额">
-            <el-input-number
-              v-model="form.contractAmount"
-              :min="0"
-              :precision="2"
-              :controls="false"
+            <el-input
+              :model-value="contractAmountDisplay"
               placeholder="请输入"
+              clearable
+              @input="handleContractAmountInput"
+              @clear="form.contractAmount = null"
             />
           </el-form-item>
           <el-form-item label="是否范本">
@@ -190,9 +190,11 @@
         description
         attachment-type
         use-upload-dialog
+        :attachment-location-options="changeAttachmentLocationOptions"
         :rows="contractFileRows"
         :preview="previewAttachment"
         @update:rows="contractFileRows = $event"
+        @upload-to-location="handleAttachmentUploadToLocation"
       />
 
       <section class="change-section">
@@ -218,7 +220,7 @@
           </el-radio-group>
         </div>
         <el-form v-if="settlementRule.autoGenerate === 1" :model="settlementRule" label-position="right" label-width="auto" class="settlement-form">
-          <el-form-item label="账单起始日期" required><el-date-picker v-model="settlementRule.billStartDate" type="date" placeholder="请选择账单起始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" /></el-form-item>
+          <el-form-item label="账单起始日" required><el-date-picker v-model="settlementRule.billStartDate" type="date" placeholder="请选择账单起始日" format="YYYY-MM-DD" value-format="YYYY-MM-DD" /></el-form-item>
           <el-form-item label="结算类型" required><el-select v-model="settlementRule.settlementType" placeholder="请选择结算类型" @change="handleSettlementTypeChange"><el-option v-for="item in settlementTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
           <el-form-item v-if="showSettlementBillCycleType" label="结算周期" required><el-select v-model="settlementRule.billCycleType" placeholder="请选择结算周期" @change="handleCycleTypeChange"><el-option v-for="item in billCycleTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
           <el-form-item v-if="showSettlementBillCutoffDay" label="账单截单日" required><el-select v-model="settlementRule.billCutoffDay" placeholder="请选择账单截单日"><el-option v-for="item in billCutoffDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
@@ -258,9 +260,11 @@
         attachment-type
         use-upload-dialog
         attachment-location="其它附件"
+        :attachment-location-options="changeAttachmentLocationOptions"
         :rows="attachments"
         :preview="previewAttachment"
         @update:rows="attachments = $event"
+        @upload-to-location="handleAttachmentUploadToLocation"
       />
 
       <section class="change-section change-reason-section">
@@ -283,9 +287,11 @@
         attachment-type
         use-upload-dialog
         attachment-location="变更材料"
+        :attachment-location-options="changeAttachmentLocationOptions"
         :rows="changeMaterials"
         :preview="previewAttachment"
         @update:rows="changeMaterials = $event"
+        @upload-to-location="handleAttachmentUploadToLocation"
       />
       <div class="page-footer">
         <el-button @click="$router.back()">取消</el-button>
@@ -343,7 +349,15 @@ const normalizeOptionalPositiveInteger = value => {
   return Number.isInteger(number) && number > 0 ? number : null;
 };
 const normalizeOptionalAmount = value => {
-  if (value === undefined || value === null || value === '') return null;
+  if (
+    value === undefined ||
+    value === null ||
+    value === '' ||
+    Number(value) === -1 ||
+    String(value) === '-1'
+  ) {
+    return null;
+  }
   const number = Number(value);
   return Number.isFinite(number) && number >= 0 ? Number(number.toFixed(2)) : null;
 };
@@ -421,6 +435,22 @@ export default {
     pageTitle() {
       return this.$route.query.name || '合同变更';
     },
+    changeAttachmentLocationOptions() {
+      return ['合同文件', '其它附件', '变更材料'];
+    },
+    contractAmountDisplay() {
+      const value = this.form.contractAmount;
+      if (
+        value === undefined ||
+        value === null ||
+        value === '' ||
+        Number(value) === -1 ||
+        String(value) === '-1'
+      ) {
+        return '';
+      }
+      return value;
+    },
     contractCategoryOptions() {
       return this.contractCategoryDictOptions.length
         ? this.contractCategoryDictOptions
@@ -464,6 +494,13 @@ export default {
     },
   },
   methods: {
+    handleContractAmountInput(value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      const normalized =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+      this.form.contractAmount = normalized === '' ? null : normalized;
+    },
     loadDictionaries() {
       Promise.all([
         getSystemDictionary({ code: 'currency_type' }),
@@ -619,6 +656,20 @@ export default {
     attachmentExtension(row = {}) { const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0]; const index = source.lastIndexOf('.'); return index > -1 ? source.slice(index + 1).toLowerCase() : ''; },
     isAttachmentImage(row) { return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row)); },
     previewAttachment(row, rows = this.attachments) { const url = this.attachmentUrl(row); if (!url) { this.$message.warning('附件地址为空，无法预览'); return; } if (this.isAttachmentImage(row)) { this.imagePreviewUrls = (rows || []).filter(item => this.isAttachmentImage(item) && this.attachmentUrl(item)).map(item => this.attachmentUrl(item)); this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0); this.imagePreviewVisible = true; return; } this.previewFile = { name: this.attachmentName(row), url, mimeType: row.mimeType || row.contentType || '' }; this.documentPreviewVisible = true; },
+    handleAttachmentUploadToLocation({ location, rows = [] }) {
+      if (!rows.length) return;
+      if (location === '合同文件') {
+        this.contractFileRows = [...(this.contractFileRows || []), ...rows];
+        return;
+      }
+      if (location === '其它附件') {
+        this.attachments = [...(this.attachments || []), ...rows];
+        return;
+      }
+      if (location === '变更材料') {
+        this.changeMaterials = [...(this.changeMaterials || []), ...rows];
+      }
+    },
     handlePreviewUnsupported() { this.$message.warning('当前文件暂不支持在线预览'); },
     handlePreviewError() { this.$message.error('附件预览失败'); },
     formatFileSize(value) { const size = Number(value || 0); return size > 1024 * 1024 ? `${(size / 1024 / 1024).toFixed(2)}MB` : `${Math.max(1, Math.ceil(size / 1024))}KB`; },
@@ -629,7 +680,7 @@ export default {
     addCustomPeriodRow() { const periods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); periods.push({ startDay: '', endDay: '' }); this.settlementRule.customPeriods = periods; },
     removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
     validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
-    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日期和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
+    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
     async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', formInstanceId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected' }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
@@ -654,6 +705,14 @@ export default {
 .contract-basic-section :deep(.el-input),
 .contract-basic-section :deep(.el-select),
 .contract-basic-section :deep(.el-date-editor) { width: 360px; max-width: 100%; }
+.contract-basic-section :deep(.el-input-number) {
+  width: 360px;
+  max-width: 100%;
+
+  .el-input__inner {
+    text-align: left;
+  }
+}
 .dialog-section-title { margin-bottom: 18px; font-size: 16px; font-weight: 600; }
 .dialog-section-title::before { display: inline-block; width: 4px; height: 16px; margin-right: 8px; vertical-align: -2px; background: #409eff; content: ''; }
 .section-head { display: flex; align-items: center; justify-content: space-between; }
diff --git a/src/views/business/contract-manage-public-view.vue b/src/views/business/contract-manage-public-view.vue
new file mode 100644
index 0000000..a0d1fd4
--- /dev/null
+++ b/src/views/business/contract-manage-public-view.vue
@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="contract-manage" :get-form="getForm">
+    <contract-manage ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import ContractManage from '@/views/business/contract-manage.vue';
+
+export default {
+  name: 'ContractManagePublicView',
+  components: { MkPublicShell, ContractManage },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.detailRow || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
+    },
+  },
+};
+</script>
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 88bcde9..2cf10ff 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -222,7 +222,7 @@
               Number(detailSettlementRule.autoGenerate) === 1 ? '开启' : '关闭'
             }}</el-descriptions-item>
             <template v-if="Number(detailSettlementRule.autoGenerate) === 1">
-              <el-descriptions-item label="账单起始日期">{{
+              <el-descriptions-item label="账单起始日">{{
                 displayValue(detailSettlementRule.billStartDate)
               }}</el-descriptions-item>
               <el-descriptions-item label="结算类型">{{
@@ -244,7 +244,7 @@
                 }}</el-descriptions-item
               >
               <el-descriptions-item
-                v-if="detailSettlementRule.settlementType === '固定天数周期结算'"
+                v-if="isFixedCycleSettlementType(detailSettlementRule.settlementType)"
                 label="周期天数"
                 >{{
                   detailObjectUnitValue(detailSettlementRule, 'cycleDays', '天')
@@ -345,7 +345,7 @@
         </section>
       </div>
       <div class="contract-manage-page__footer">
-        <el-button @click="closeDetail">关闭</el-button>
+        <el-button v-if="!isPublicViewPage" @click="closeDetail">关闭</el-button>
       </div>
     </template>
 
@@ -478,7 +478,7 @@
                   type="date"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
-                  placeholder="YYYY-MM-DD"
+                  placeholder="请输入"
                 />
                 <span>至</span>
                 <el-date-picker
@@ -486,7 +486,7 @@
                   type="date"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
-                  placeholder="YYYY-MM-DD"
+                  placeholder="请输入"
                 />
               </div>
             </el-form-item>
@@ -498,12 +498,12 @@
               ><template #suffix>天</template></el-input>
             </el-form-item>
             <el-form-item label="合同金额">
-              <el-input-number
-                v-model="form.contractAmount"
-                :min="0"
-                :precision="2"
-                :controls="false"
+              <el-input
+                :model-value="contractAmountDisplay"
                 placeholder="请输入"
+                clearable
+                @input="handleContractAmountInput"
+                @clear="form.contractAmount = null"
               />
             </el-form-item>
             <el-form-item label="是否范本">
@@ -593,11 +593,13 @@
           description
           attachment-type
           use-upload-dialog
+          :attachment-location-options="contractAttachmentLocationOptions"
           :lock-approved="isAttachmentUploadMode || hasApprovedContractFiles"
           :mark-approved-on-upload="isAttachmentUploadMode"
           :rows="contractFileRows"
           :preview="previewAttachment"
           @update:rows="contractFileRows = $event"
+          @upload-to-location="handleAttachmentUploadToLocation"
         />
 
         <section class="contract-manage-form__section contract-manage-form__section--panel">
@@ -646,7 +648,7 @@
                 content="开启时，系统根据配置规则归集运单，定时生成结算单"
                 placement="top"
               >
-                <el-icon class="settlement-switch-tip"><QuestionFilled /></el-icon>
+                <el-icon class="contract-manage-form__fee-mode-tip"><QuestionFilled /></el-icon>
               </el-tooltip>
               <el-radio :label="0">关闭</el-radio>
             </el-radio-group>
@@ -655,13 +657,13 @@
             v-if="settlementRuleEnabled"
             class="contract-manage-form__grid contract-manage-form__settlement-grid"
           >
-            <el-form-item label="账单起始日期" required>
+            <el-form-item label="账单起始日" required>
               <el-date-picker
                 v-model="settlementRuleForm.billStartDate"
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="请选择账单起始日期"
+                placeholder="请选择账单起始日"
               />
             </el-form-item>
             <el-form-item label="结算类型" required>
@@ -813,10 +815,12 @@
           attachment-type
           use-upload-dialog
           attachment-location="其它附件"
+          :attachment-location-options="contractAttachmentLocationOptions"
           :readonly="isAttachmentUploadMode"
           :rows="attachmentRows"
           :preview="previewAttachment"
           @update:rows="attachmentRows = $event"
+          @upload-to-location="handleAttachmentUploadToLocation"
         />
 
         <section
@@ -1027,6 +1031,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import { exportBlob } from '@/api/common';
 import * as api from '@/api/business/contract-manage';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { getList as getProjectList } from '@/api/business/project-apply';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { getDeptTree } from '@/api/system/dept';
@@ -1058,7 +1063,15 @@ const normalizeOptionalInteger = (value, emptyValue = null) => {
   return Number.isFinite(number) ? Math.trunc(number) : emptyValue;
 };
 const normalizeOptionalAmount = (value, emptyValue = null) => {
-  if (value === undefined || value === null || value === '') return emptyValue;
+  if (
+    value === undefined ||
+    value === null ||
+    value === '' ||
+    Number(value) === -1 ||
+    String(value) === '-1'
+  ) {
+    return emptyValue;
+  }
   const number = Number(value);
   return Number.isFinite(number) && number >= 0 ? Number(number.toFixed(2)) : emptyValue;
 };
@@ -1100,7 +1113,7 @@ const defaultForm = () => ({
   settlementCurrency: '',
   invoiceCycle: '',
   paymentDays: '',
-  contractAmount: '',
+  contractAmount: null,
   templateFlag: 0,
   originalContractNo: '',
   electronicSealFlag: 0,
@@ -1272,7 +1285,7 @@ export default {
       formalSettlementRuleForm: defaultSettlementRule(),
       paymentRatioRows: [],
       changeRecordRows: [],
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['现结', '日结', '周结', '月结', '按固定天数周期'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       detailLoading: false,
       detailRow: {},
@@ -1316,7 +1329,12 @@ export default {
       return this.$route.path === '/business/contract-manage/form';
     },
     isDetailPage() {
-      return this.$route.path === '/business/contract-manage/detail';
+      return (
+        this.$route.path === '/business/contract-manage/detail' || this.isPublicViewPage
+      );
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/business/contract-manage/public-view';
     },
     formMode() {
       return this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -1331,6 +1349,23 @@ export default {
     isAttachmentUploadMode() {
       return this.$route.query.attachmentUpload === '1';
     },
+    contractAttachmentLocationOptions() {
+      if (this.isAttachmentUploadMode) return ['合同文件'];
+      return ['合同文件', '其它附件'];
+    },
+    contractAmountDisplay() {
+      const value = this.form.contractAmount;
+      if (
+        value === undefined ||
+        value === null ||
+        value === '' ||
+        Number(value) === -1 ||
+        String(value) === '-1'
+      ) {
+        return '';
+      }
+      return value;
+    },
     hasApprovedContractFiles() {
       return (this.contractFileRows || []).some(
         row =>
@@ -1412,7 +1447,7 @@ export default {
       return this.showBillCycleType && this.settlementRuleForm.billCycleType === '自定义多周期';
     },
     showCycleDays() {
-      return this.settlementRuleForm.settlementType === '固定天数周期结算';
+      return this.isFixedCycleSettlementType(this.settlementRuleForm.settlementType);
     },
     billCutoffDayOptions() {
       return Array.from({ length: 31 }, (_, index) => ({
@@ -1473,9 +1508,11 @@ export default {
     },
   },
   created() {
-    this.loadProjectOptions();
-    this.loadSettlementDictionaries();
-    this.loadOrganizationOptions();
+    if (!this.isPublicViewPage) {
+      this.loadProjectOptions();
+      this.loadSettlementDictionaries();
+      this.loadOrganizationOptions();
+    }
     if (this.isFormPage) this.initFormPage();
     if (this.isDetailPage) this.initDetailPage();
   },
@@ -1675,7 +1712,7 @@ export default {
         copyCount: normalizeOptionalInteger(detail.copyCount, ''),
         invoiceCycle: normalizeOptionalInteger(detail.invoiceCycle, ''),
         paymentDays: normalizeOptionalInteger(detail.paymentDays, ''),
-        contractAmount: normalizeOptionalAmount(detail.contractAmount, ''),
+        contractAmount: normalizeOptionalAmount(detail.contractAmount, null),
         archiveStatus: detail.archiveStatus || '未归档',
         feeGenerationMode:
           detail.feeGenerationMode || (Number(detail.billingEnabled) === 0 ? 'manual' : 'system'),
@@ -2118,6 +2155,13 @@ export default {
     integerInput(prop, value) {
       this.form[prop] = String(value || '').replace(/\D/g, '');
     },
+    handleContractAmountInput(value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      const normalized =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+      this.form.contractAmount = normalized === '' ? null : normalized;
+    },
     positiveIntegerInput(prop, value) {
       const normalized = String(value || '').replace(/\D/g, '').replace(/^0+/, '');
       this.form[prop] = normalized;
@@ -2148,6 +2192,16 @@ export default {
       };
       this.attachmentDocumentPreviewVisible = true;
     },
+    handleAttachmentUploadToLocation({ location, rows = [] }) {
+      if (!rows.length) return;
+      if (location === '合同文件') {
+        this.contractFileRows = [...(this.contractFileRows || []), ...rows];
+        return;
+      }
+      if (location === '其它附件') {
+        this.attachmentRows = [...(this.attachmentRows || []), ...rows];
+      }
+    },
     handleAttachmentPreviewUnsupported() {
       this.$message.warning('当前文件暂不支持在线预览');
     },
@@ -2206,8 +2260,12 @@ export default {
       }
       return true;
     },
+    isFixedCycleSettlementType(value) {
+      return value === '按固定天数周期' || value === '固定天数周期结算';
+    },
     normalizeSettlementRule(rule = {}) {
       const next = { ...defaultSettlementRule(), ...rule };
+      if (next.settlementType === '固定天数周期结算') next.settlementType = '按固定天数周期';
       if (next.settlementType !== '月结') {
         next.billCycleType = '';
         next.billCutoffDay = '';
@@ -2222,7 +2280,7 @@ export default {
       } else {
         next.customPeriods = [];
       }
-      if (next.settlementType !== '固定天数周期结算') next.cycleDays = '';
+      if (!this.isFixedCycleSettlementType(next.settlementType)) next.cycleDays = '';
       return next;
     },
     syncSettlementConfig() {
@@ -2245,7 +2303,7 @@ export default {
       this.settlementRuleForm.billCycleType = '';
       this.settlementRuleForm.billCutoffDay = '';
       this.settlementRuleForm.customPeriods = [];
-      if (value !== '固定天数周期结算') this.settlementRuleForm.cycleDays = '';
+      if (!this.isFixedCycleSettlementType(value)) this.settlementRuleForm.cycleDays = '';
     },
     handleBillCycleTypeChange(value) {
       if (value !== '固定截单日') this.settlementRuleForm.billCutoffDay = '';
@@ -2336,7 +2394,7 @@ export default {
     validateSettlementRule(rule, label) {
       if (Number(rule.autoGenerate) !== 1) return true;
       if (!rule.billStartDate || !rule.settlementType) {
-        this.$message.warning(`${label}：请完整填写账单起始日期和结算类型`);
+        this.$message.warning(`${label}：请完整填写账单起始日和结算类型`);
         return false;
       }
       if (rule.settlementType === '月结' && !rule.billCycleType) {
@@ -2354,7 +2412,7 @@ export default {
       if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') {
         return this.validateCustomPeriods(rule.customPeriods, label);
       }
-      if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) {
+      if (this.isFixedCycleSettlementType(rule.settlementType) && !rule.cycleDays) {
         this.$message.warning(`${label}：请选择周期天数`);
         return false;
       }
@@ -2406,8 +2464,10 @@ export default {
       if (!id) return;
       this.detailLoading = true;
       this.applyDetailState({});
-      this.api
-        .getDetail(id)
+      const request = this.isPublicViewPage
+        ? getMkPublicDetail('contract-manage', id)
+        : this.api.getDetail(id);
+      request
         .then(res => {
           this.applyDetailState(res.data?.data || {});
         })
@@ -2576,7 +2636,7 @@ export default {
               .join('，')}`
           );
         }
-        if (config.billStartDate) parts.push(`账单起始日期：${config.billStartDate}`);
+        if (config.billStartDate) parts.push(`账单起始日：${config.billStartDate}`);
         return parts.join('，');
       };
       if (normalized.preSettlementConfig || normalized.formalSettlementConfig) {
@@ -2672,6 +2732,15 @@ export default {
     },
     detailValue(prop) {
       const value = this.detailRow[prop];
+      if (prop === 'contractAmount') {
+        return value === undefined ||
+          value === null ||
+          value === '' ||
+          Number(value) === -1 ||
+          String(value) === '-1'
+          ? '-'
+          : value;
+      }
       if (
         prop === 'contractStage' ||
         prop === 'approvalStatus' ||
@@ -3018,13 +3087,6 @@ export default {
     align-items: center;
     gap: 20px;
     margin-bottom: 16px;
-
-    .settlement-switch-tip {
-      margin: 0 4px;
-      color: #a8abb2;
-      cursor: help;
-      font-size: 14px;
-    }
   }
 
   &__settlement-grid {
@@ -3082,11 +3144,19 @@ export default {
     min-width: 0;
   }
 
+  :deep(.el-input-number) {
+    width: 360px;
+    max-width: 100%;
+
+    .el-input__inner {
+      text-align: left;
+    }
+  }
+
   :deep(.el-input),
   :deep(.el-select),
   :deep(.el-cascader),
   :deep(.el-tree-select),
-  :deep(.el-input-number),
   :deep(.el-date-editor) {
     width: 360px;
     max-width: 100%;
diff --git a/src/views/business/project-apply-public-view.vue b/src/views/business/project-apply-public-view.vue
new file mode 100644
index 0000000..8fb6219
--- /dev/null
+++ b/src/views/business/project-apply-public-view.vue
@@ -0,0 +1,149 @@
+<template>
+  <div ref="page" class="project-apply-public-view">
+    <project-apply ref="project" />
+  </div>
+</template>
+
+<script>
+import ProjectApply from './project-apply.vue';
+import { postMkPublicProcessMessage } from '@/api/mk-process';
+
+export default {
+  name: 'ProjectApplyPublicView',
+  components: {
+    ProjectApply,
+  },
+  created() {
+    this.handleIframeHeight = () => this.sendIframeHeight();
+    this.handleProcessMessage = event => this.onProcessMessage(event);
+    document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.addEventListener('message', this.handleProcessMessage);
+  },
+  mounted() {
+    document.documentElement.classList.add('mk-iframe-page');
+    document.body.classList.add('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.add('mk-iframe-page');
+    this.handleIframeHeight();
+    window.addEventListener('load', this.handleIframeHeight);
+    this.mkHeightTimers = [300, 800, 1600].map(delay => setTimeout(this.handleIframeHeight, delay));
+    if (typeof ResizeObserver === 'undefined') return;
+    this.mkHeightObserver = new ResizeObserver(() => this.handleIframeHeight());
+    this.$nextTick(() => {
+      if (this.$refs.page) this.mkHeightObserver.observe(this.$refs.page);
+      this.mkHeightObserver.observe(document.body);
+    });
+  },
+  beforeUnmount() {
+    document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.removeEventListener('load', this.handleIframeHeight);
+    window.removeEventListener('message', this.handleProcessMessage);
+    (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
+    if (this.mkHeightObserver) {
+      this.mkHeightObserver.disconnect();
+      this.mkHeightObserver = null;
+    }
+    document.documentElement.classList.remove('mk-iframe-page');
+    document.body.classList.remove('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.remove('mk-iframe-page');
+  },
+  methods: {
+    sendIframeHeight() {
+      this.$nextTick(() => {
+        window.parent.postMessage({ height: document.body.clientHeight }, '*');
+      });
+    },
+    onProcessMessage(event) {
+      const data = event && event.data;
+      if (!data || typeof data !== 'object') return;
+      if (data.height && !data.status && !data.type) return;
+      if (data.type === 'formValues' || data.type === 'afterSubmit') return;
+      const formValues = data.formValues;
+      if (data.status === 'submit') {
+        this.submitData(formValues);
+      } else if (data.status === 'save') {
+        this.saveData(formValues);
+      }
+      if (data.type === 'getFormValues') {
+        window.parent.postMessage({ type: 'formValues', formData: this.buildFormData() }, '*');
+      }
+    },
+    submitData(lbpmFormValues) {
+      const formData = this.buildFormData();
+      this.postFormData('submit', lbpmFormValues, formData);
+      if (!lbpmFormValues) return;
+      const parameters = Object.assign({}, lbpmFormValues, {
+        loginName: this.getLoginName(lbpmFormValues),
+        formInstanceId: this.getFormId(),
+        subject: formData.subject,
+      });
+      window.parent.postMessage({ type: 'afterSubmit', success: true, parameters }, '*');
+    },
+    saveData(lbpmFormValues) {
+      this.postFormData('save', lbpmFormValues, this.buildFormData());
+    },
+    postFormData(status, formValues, formData) {
+      postMkPublicProcessMessage('project-apply', {
+        status,
+        formValues: formValues || {},
+        formData,
+      }).catch(error => {
+        console.error('项目公开页提交流程数据失败：', error);
+      });
+    },
+    buildFormData() {
+      const form = this.getProjectForm();
+      return {
+        ...form,
+        subject: form.projectName || form.projectShortName || '',
+        formInstanceId: this.getFormId(),
+      };
+    },
+    getProjectForm() {
+      const form = this.$refs.project && this.$refs.project.form;
+      if (!form) return {};
+      try {
+        return JSON.parse(JSON.stringify(form));
+      } catch (error) {
+        return { ...form };
+      }
+    },
+    getFormId() {
+      return this.$route.query.id || this.getProjectForm().id || '';
+    },
+    getLoginName(formValues = {}) {
+      return (
+        formValues.loginName ||
+        this.$route.query.loginName ||
+        this.$route.query.submitIdentity ||
+        ''
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+html.mk-iframe-page,
+html.mk-iframe-page body,
+html.mk-iframe-page #app,
+html.mk-iframe-page #app.mk-iframe-page {
+  height: auto !important;
+  min-height: 100%;
+  overflow: visible;
+}
+</style>
+
+<style lang="scss" scoped>
+.project-apply-public-view {
+  min-height: 100%;
+  padding: 12px 0 24px;
+  box-sizing: border-box;
+  background: #f0f2f5;
+
+  :deep(.basic-container) {
+    padding: 0 12px;
+  }
+}
+</style>
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 12d2e22..abcac61 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container class="project-apply-page">
+  <basic-container class="project-apply-page" :class="{ 'is-public-view': isPublicViewPage }">
     <avue-crud
       v-if="!isProjectFormPage"
       :option="tableOption"
@@ -784,6 +784,7 @@
       </el-form>
 
       <div
+        v-if="!isPublicViewPage"
         class="project-apply-dialog__footer"
         :class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
       >
@@ -909,12 +910,29 @@
         />
       </div>
     </el-dialog>
+
+    <el-dialog
+      v-model="publicCustomerVisible"
+      title="查看客商档案"
+      append-to-body
+      destroy-on-close
+      width="92%"
+      top="4vh"
+      class="project-apply-public-customer-dialog"
+    >
+      <customer-archive
+        v-if="publicCustomerVisible"
+        :embedded-public-id="publicCustomerId"
+      />
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
 import { exportBlob } from '@/api/common';
+import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
+import { getMkPublicDetail } from '@/api/mk-process';
 import {
   getList as getCustomerArchiveList,
   getDetail as getCustomerArchiveDetail,
@@ -1045,7 +1063,9 @@ const majorProjectAttachmentTypeOptions = [
 ].map(item => ({ label: item, value: item })).concat(otherAttachmentType);
 
 export default {
+  name: 'ProjectApply',
   components: {
+    CustomerArchive: defineAsyncComponent(() => import('@/views/vehicle/customer-archive.vue')),
     ElImageViewer,
     OpenFileViewer,
     PdfPreview,
@@ -1239,6 +1259,8 @@ export default {
       changeRecordDetail: null,
       changeRecordDetailRows: [],
       userBox: false,
+      publicCustomerVisible: false,
+      publicCustomerId: '',
       userPickType: '',
       userLoading: false,
       userData: [],
@@ -1315,6 +1337,9 @@ export default {
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
+    isPublicViewPage() {
+      return this.$route.path === '/business/project-apply/public-view';
+    },
     projectFormContainer() {
       // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
       return this.isFormPageInstance ? 'div' : 'el-dialog';
@@ -1361,6 +1386,11 @@ export default {
     },
   },
   created() {
+    if (this.isPublicViewPage) {
+      this.isFormPageInstance = true;
+      this.openPublicProjectForm();
+      return;
+    }
     this.loadDeptOptions();
     this.loadCargoTypeOptions();
     this.loadTransportTypeOptions();
@@ -1384,6 +1414,7 @@ export default {
       this.attachmentDocumentPreviewVisible = false;
       this.attachmentImagePreviewVisible = false;
       this.userBox = false;
+      this.publicCustomerVisible = false;
     },
     buildTableOption() {
       return {
@@ -1406,6 +1437,75 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
+    openPublicProjectForm() {
+      const id = this.$route.query.id;
+      this.dialogType = 'view';
+      this.dialogReadonly = true;
+      this.projectBox = true;
+      if (!id) {
+        this.$message.error('缺少项目ID');
+        return;
+      }
+      getMkPublicDetail('project-apply', id)
+        .then(res => {
+          const detail = res.data?.data || {};
+          this.applyPublicDictOptions(detail);
+          const displayDetail = { ...detail };
+          delete displayDetail.cargoTypeOptions;
+          delete displayDetail.transportTypeOptions;
+          delete displayDetail.settlementModeOptions;
+          this.applyProjectDetail(displayDetail);
+        })
+        .catch(() => {
+          this.$message.error('项目信息加载失败');
+        });
+    },
+    applyPublicDictOptions(detail = {}) {
+      this.cargoTypeOptions = this.resolvePublicDictOptions(
+        detail.cargoTypeOptions,
+        detail.cargoType
+      );
+      this.transportTypeOptions = this.resolvePublicDictOptions(
+        detail.transportTypeOptions,
+        detail.transportType
+      );
+      this.settlementModeOptions = this.resolvePublicDictOptions(
+        detail.settlementModeOptions,
+        detail.settlementMode
+      );
+      if (detail.businessDeptId) {
+        const label = detail.businessDeptName || String(detail.businessDeptId);
+        this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
+        this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
+      }
+      if (detail.undertakeDeptId) {
+        this.platformCompanyOptions = [
+          {
+            label: detail.undertakeDeptName || String(detail.undertakeDeptId),
+            value: detail.undertakeDeptId,
+          },
+        ];
+      }
+    },
+    resolvePublicDictOptions(options, currentValue) {
+      const list = Array.isArray(options)
+        ? options
+            .filter(item => item && item.value !== undefined && item.value !== null && item.value !== '')
+            .map(item => ({
+              label: item.label || String(item.value),
+              value: item.value,
+            }))
+        : [];
+      if (
+        currentValue !== undefined &&
+        currentValue !== null &&
+        currentValue !== '' &&
+        !list.some(item => String(item.value) === String(currentValue))
+      ) {
+        list.unshift({ label: String(currentValue), value: currentValue });
+      }
+      return list;
+    },
     openProjectFormPage() {
       const type = this.$route.query.mode || 'add';
       const id = this.$route.query.id;
@@ -2012,6 +2112,11 @@ export default {
         this.$message.warning('客商档案 ID 为空，无法打开');
         return;
       }
+      if (this.isPublicViewPage) {
+        this.publicCustomerId = String(id);
+        this.publicCustomerVisible = true;
+        return;
+      }
       this.$router.push({
         path: '/vehicle/customer-archive/form',
         query: { id: String(id), name: '查看客商档案', view: '1' },
@@ -2594,6 +2699,12 @@ export default {
         this.$message.warning('项目ID为空，无法查看变更详情');
         return;
       }
+      if (this.isPublicViewPage) {
+        this.changeRecordDetail = { ...row };
+        this.changeRecordDetailRows = this.buildChangeRecordDetailRows(this.changeRecordDetail);
+        this.changeRecordDetailVisible = true;
+        return;
+      }
       try {
         if (!this.transportTypeOptions.length) {
           await this.loadTransportTypeOptions();
@@ -2650,6 +2761,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.project-apply-page.is-public-view {
+  :deep(.el-link) {
+    pointer-events: auto;
+  }
+}
+
 .project-apply-form {
   padding: 0;
 
@@ -3019,3 +3136,11 @@ export default {
   }
 }
 </style>
+
+<style lang="scss">
+.project-apply-public-customer-dialog .el-dialog__body {
+  max-height: 78vh;
+  overflow: auto;
+  padding-top: 8px;
+}
+</style>
diff --git a/src/views/business/temporary-credit-limit.vue b/src/views/business/temporary-credit-limit.vue
index 735909e..fc66576 100644
--- a/src/views/business/temporary-credit-limit.vue
+++ b/src/views/business/temporary-credit-limit.vue
@@ -99,13 +99,25 @@
           <el-table :data="attachmentRows" border @selection-change="selectedAttachments = $event">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column label="文件名" min-width="240" show-overflow-tooltip>
+            <el-table-column label="文件名称" min-width="240" show-overflow-tooltip>
               <template #default="{ row }">
                 <el-link type="primary" @click="previewAttachment(row)">
                   {{ attachmentName(row) }}
                 </el-link>
               </template>
             </el-table-column>
+            <el-table-column label="附件描述" min-width="220">
+              <template #default="{ row }">
+                <span v-if="dialogReadonly">{{ row.description || '-' }}</span>
+                <el-input
+                  v-else
+                  v-model="row.description"
+                  maxlength="200"
+                  placeholder="请输入"
+                  @input="syncAttachmentsJson"
+                />
+              </template>
+            </el-table-column>
             <el-table-column label="文件大小" width="120" align="center">
               <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
             </el-table-column>
@@ -172,7 +184,7 @@
       title="查看临时额度申请"
       append-to-body
       destroy-on-close
-      width="96%"
+      width="1100px"
       class="temporary-credit-limit-dialog temporary-credit-limit-detail-dialog"
     >
       <div v-loading="detailLoading" class="business-crud-page__detail-content">
@@ -204,13 +216,16 @@
             </div>
             <el-table :data="attachmentRows" empty-text="暂无附件">
               <el-table-column type="index" label="序号" width="70" align="center" />
-              <el-table-column label="文件名" min-width="240" show-overflow-tooltip>
+              <el-table-column label="文件名称" min-width="240" show-overflow-tooltip>
                 <template #default="{ row }">
                   <el-link type="primary" @click="previewAttachment(row)">
                     {{ attachmentName(row) }}
                   </el-link>
                 </template>
               </el-table-column>
+              <el-table-column label="附件描述" min-width="220" show-overflow-tooltip>
+                <template #default="{ row }">{{ row.description || '-' }}</template>
+              </el-table-column>
               <el-table-column label="文件大小" width="120" align="center">
                 <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
               </el-table-column>
@@ -783,24 +798,37 @@ export default {
       const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
       this.attachmentRows = (list || []).map(item => ({
         ...item,
+        description: item.description || '',
         uploadUserName: item.uploadUserName || uploadUserName,
         uploadTime: item.uploadTime || uploadTime,
       }));
-      this.form.attachmentsJson = JSON.stringify(this.attachmentRows);
+      this.syncAttachmentsJson();
     },
     removeAttachment(index) {
       this.attachmentRows.splice(index, 1);
-      this.form.attachmentsJson = JSON.stringify(this.attachmentRows);
+      this.syncAttachmentsJson();
+    },
+    syncAttachmentsJson() {
+      this.form.attachmentsJson = JSON.stringify(this.attachmentRows || []);
     },
     parseJsonArray(value) {
-      if (Array.isArray(value)) return value;
-      if (!value) return [];
-      try {
-        const data = JSON.parse(value);
-        return Array.isArray(data) ? data : [];
-      } catch (error) {
+      let list = [];
+      if (Array.isArray(value)) {
+        list = value;
+      } else if (!value) {
         return [];
+      } else {
+        try {
+          const data = JSON.parse(value);
+          list = Array.isArray(data) ? data : [];
+        } catch (error) {
+          return [];
+        }
       }
+      return list.map(item => ({
+        ...item,
+        description: item?.description || '',
+      }));
     },
     attachmentName(row = {}) {
       return row.originalName || row.name || row.fileName || '附件';
@@ -907,6 +935,7 @@ export default {
 .temporary-credit-limit-page {
   &__field {
     width: 100%;
+    max-width: 240px;
   }
 
   &__attachment-head {
@@ -993,7 +1022,7 @@ export default {
       align-items: center;
       gap: 8px;
       width: 100%;
-      padding: 14px 16px 4px;
+      padding: 14px 0 4px;
       margin-bottom: 0;
       color: #303133;
       font-size: 15px;
@@ -1086,9 +1115,36 @@ export default {
     background: transparent !important;
     box-shadow: none !important;
     margin: 0 !important;
-    padding: 0 !important;
+    padding: 0 16px 8px !important;
     border-radius: 0 !important;
   }
+
+  // 新增/编辑：控件限宽，避免宽屏下撑满列宽贴到弹窗右边缘
+  &:not(.temporary-credit-limit-detail-dialog) {
+    .el-form-item__content {
+      min-width: 0;
+    }
+
+    .el-form-item__content > .el-input,
+    .el-form-item__content > .el-select,
+    .el-form-item__content > .el-date-editor,
+    .el-form-item__content > .el-cascader,
+    .el-form-item__content > .el-textarea,
+    .temporary-credit-limit-page__field {
+      width: 100%;
+      max-width: 240px;
+    }
+
+    .el-form-item__content > .el-textarea {
+      max-width: 100%;
+    }
+
+    .el-date-editor.el-input,
+    .el-date-editor.el-input__wrapper {
+      width: 100%;
+      max-width: 240px;
+    }
+  }
 }
 
 .temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label {
diff --git a/src/views/business/waybill-manage-public-view.vue b/src/views/business/waybill-manage-public-view.vue
new file mode 100644
index 0000000..bcb3714
--- /dev/null
+++ b/src/views/business/waybill-manage-public-view.vue
@@ -0,0 +1,38 @@
+<template>
+  <mk-public-shell biz-type="waybill-manage" :get-form="getForm">
+    <waybill-manage-page
+      ref="page"
+      :api="api"
+      :config="config"
+      :crud-option="option"
+      :detail-id="detailId"
+      standalone-detail-page
+    />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import WaybillManagePage from '@/views/business/components/waybill-manage-page.vue';
+import * as api from '@/api/business/waybill-manage';
+import { config, option } from '@/option/business/waybill-manage';
+
+export default {
+  name: 'WaybillManagePublicView',
+  components: { MkPublicShell, WaybillManagePage },
+  data() {
+    return { api, config, option };
+  },
+  computed: {
+    detailId() {
+      return this.$route.query.id || '';
+    },
+  },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.detailRow || {};
+      return { ...row, subject: row.waybillNo || '' };
+    },
+  },
+};
+</script>
diff --git a/src/views/mk/mk-public-shell.vue b/src/views/mk/mk-public-shell.vue
new file mode 100644
index 0000000..5e42e40
--- /dev/null
+++ b/src/views/mk/mk-public-shell.vue
@@ -0,0 +1,155 @@
+<template>
+  <div ref="page" class="mk-public-shell">
+    <slot />
+  </div>
+</template>
+
+<script>
+import { postMkPublicProcessMessage } from '@/api/mk-process';
+
+export default {
+  name: 'MkPublicShell',
+  props: {
+    bizType: {
+      type: String,
+      required: true,
+    },
+    getForm: {
+      type: Function,
+      default: null,
+    },
+  },
+  created() {
+    this.handleIframeHeight = () => this.sendIframeHeight();
+    this.handleProcessMessage = event => this.onProcessMessage(event);
+    document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.addEventListener('message', this.handleProcessMessage);
+  },
+  mounted() {
+    document.documentElement.classList.add('mk-iframe-page');
+    document.body.classList.add('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.add('mk-iframe-page');
+    this.handleIframeHeight();
+    window.addEventListener('load', this.handleIframeHeight);
+    this.mkHeightTimers = [300, 800, 1600].map(delay => setTimeout(this.handleIframeHeight, delay));
+    if (typeof ResizeObserver === 'undefined') return;
+    this.mkHeightObserver = new ResizeObserver(() => this.handleIframeHeight());
+    this.$nextTick(() => {
+      if (this.$refs.page) this.mkHeightObserver.observe(this.$refs.page);
+      this.mkHeightObserver.observe(document.body);
+    });
+  },
+  beforeUnmount() {
+    document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.removeEventListener('load', this.handleIframeHeight);
+    window.removeEventListener('message', this.handleProcessMessage);
+    (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
+    if (this.mkHeightObserver) {
+      this.mkHeightObserver.disconnect();
+      this.mkHeightObserver = null;
+    }
+    document.documentElement.classList.remove('mk-iframe-page');
+    document.body.classList.remove('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.remove('mk-iframe-page');
+  },
+  methods: {
+    sendIframeHeight() {
+      this.$nextTick(() => {
+        window.parent.postMessage({ height: document.body.clientHeight }, '*');
+      });
+    },
+    onProcessMessage(event) {
+      const data = event && event.data;
+      if (!data || typeof data !== 'object') return;
+      if (data.height && !data.status && !data.type) return;
+      if (data.type === 'formValues' || data.type === 'afterSubmit') return;
+      const formValues = data.formValues;
+      if (data.status === 'submit') {
+        this.submitData(formValues);
+      } else if (data.status === 'save') {
+        this.saveData(formValues);
+      }
+      if (data.type === 'getFormValues') {
+        window.parent.postMessage({ type: 'formValues', formData: this.buildFormData() }, '*');
+      }
+    },
+    submitData(lbpmFormValues) {
+      const formData = this.buildFormData();
+      this.postFormData('submit', lbpmFormValues, formData);
+      if (!lbpmFormValues) return;
+      const parameters = Object.assign({}, lbpmFormValues, {
+        loginName: this.getLoginName(lbpmFormValues),
+        formInstanceId: this.getFormId(),
+        subject: formData.subject,
+      });
+      window.parent.postMessage({ type: 'afterSubmit', success: true, parameters }, '*');
+    },
+    saveData(lbpmFormValues) {
+      this.postFormData('save', lbpmFormValues, this.buildFormData());
+    },
+    postFormData(status, formValues, formData) {
+      postMkPublicProcessMessage(this.bizType, {
+        status,
+        formValues: formValues || {},
+        formData,
+      }).catch(error => {
+        console.error('公开页提交流程数据失败：', error);
+      });
+    },
+    buildFormData() {
+      const form = this.readForm();
+      return {
+        ...form,
+        subject: form.subject || '',
+        formInstanceId: this.getFormId(),
+      };
+    },
+    readForm() {
+      const form = typeof this.getForm === 'function' ? this.getForm() : {};
+      if (!form) return {};
+      try {
+        return JSON.parse(JSON.stringify(form));
+      } catch (error) {
+        return { ...form };
+      }
+    },
+    getFormId() {
+      return this.$route.query.id || this.readForm().id || '';
+    },
+    getLoginName(formValues = {}) {
+      return (
+        formValues.loginName ||
+        this.$route.query.loginName ||
+        this.$route.query.submitIdentity ||
+        ''
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+html.mk-iframe-page,
+html.mk-iframe-page body,
+html.mk-iframe-page #app,
+html.mk-iframe-page #app.mk-iframe-page {
+  height: auto !important;
+  min-height: 100%;
+  overflow: visible;
+}
+</style>
+
+<style lang="scss" scoped>
+.mk-public-shell {
+  min-height: 100%;
+  padding: 12px 0 24px;
+  box-sizing: border-box;
+  background: #f0f2f5;
+
+  :deep(.basic-container) {
+    padding: 0 12px;
+  }
+}
+</style>
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 6adff7c..7d68571 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -364,7 +364,7 @@
           @click="submitForm"
           >提交</el-button
         >
-        <el-button @click="goBack">返回</el-button>
+        <el-button v-if="!isPublicViewPage" @click="goBack">返回</el-button>
       </div>
     </el-form>
     <el-dialog
@@ -596,6 +596,7 @@ import '@open-file-viewer/core/style.css';
 import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/paymentApplication';
+import { getMkPublicDetail } from '@/api/mk-process';
 import * as billLedgerApi from '@/api/payment/billLedger';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getList as getProjectList } from '@/api/business/project-apply';
@@ -791,7 +792,10 @@ export default {
       return this.$route.query.id || '';
     },
     readonly() {
-      return this.$route.query.mode === 'view';
+      return this.$route.query.mode === 'view' || this.isPublicViewPage;
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/payment/payment-application/public-view';
     },
     canSave() {
       const code = this.recordId ? 'payment_application_edit' : 'payment_application_add';
@@ -1036,7 +1040,55 @@ export default {
       const body = response?.data || response || {};
       return body?.data || body;
     },
+    async loadPublicDetail() {
+      if (!this.recordId) return;
+      const data = this.unwrapData(
+        await getMkPublicDetail('payment-application', this.recordId)
+      );
+      this.form = {
+        ...emptyForm(),
+        ...data,
+        preSettlementIds: data.preSettlementIds?.length
+          ? data.preSettlementIds
+          : data.preSettlementId
+          ? [data.preSettlementId]
+          : [],
+        attachments: this.parse(data.attachmentsJson),
+        invoices: data.invoices || [],
+      };
+      if (this.form.paymentMethod) {
+        this.paymentMethodOptions = [
+          {
+            label: this.form.paymentMethodName || this.form.paymentMethod,
+            value: this.form.paymentMethod,
+          },
+        ];
+      }
+      if (this.form.projectId) {
+        this.projectOptions = [
+          {
+            id: this.form.projectId,
+            projectName: this.form.projectName || this.form.projectCode,
+          },
+        ];
+      }
+      if (this.form.contractId) {
+        this.contractOptions = [
+          {
+            id: this.form.contractId,
+            contractName: this.form.contractName || this.form.contractNo,
+          },
+        ];
+      }
+      const referenceRow = this.createReferenceRow(data);
+      this.referenceRows = referenceRow.settlementNo ? [referenceRow] : [];
+      this.paymentRecords = data.paymentRecords || [];
+    },
     async initialize() {
+      if (this.isPublicViewPage) {
+        await this.loadPublicDetail();
+        return;
+      }
       await this.loadPaymentMethodOptions();
       if (this.recordId) {
         const data = this.unwrapData(await api.getDetail(this.recordId));
diff --git a/src/views/payment/payment-application-public-view.vue b/src/views/payment/payment-application-public-view.vue
new file mode 100644
index 0000000..4d816b0
--- /dev/null
+++ b/src/views/payment/payment-application-public-view.vue
@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="payment-application" :get-form="getForm">
+    <payment-application-form ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import PaymentApplicationForm from '@/views/payment/payment-application-form.vue';
+
+export default {
+  name: 'PaymentApplicationPublicView',
+  components: { MkPublicShell, PaymentApplicationForm },
+  methods: {
+    getForm() {
+      const form = this.$refs.page?.form || {};
+      return { ...form, subject: form.paymentNo || form.projectName || '' };
+    },
+  },
+};
+</script>
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 93cd0bd..896c2a0 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -211,8 +211,15 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <el-table v-show="!detailCollapsed" :data="filteredDetails" border>
-          <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+        <el-table v-show="!detailCollapsed" :data="pagedDetails" border>
+          <el-table-column
+            type="index"
+            label="序号"
+            width="64"
+            fixed="left"
+            align="center"
+            :index="detailIndexMethod"
+          />
           <el-table-column
             v-for="column in detailTableColumns"
             :key="column.prop"
@@ -245,6 +252,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div v-show="!detailCollapsed" class="formal-editor__pagination">
+          <el-pagination
+            v-model:current-page="detailPage.current"
+            v-model:page-size="detailPage.size"
+            :total="filteredDetails.length"
+            :page-sizes="[10, 20, 50, 100]"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleDetailPageSizeChange"
+          />
+        </div>
       </section-card>
 
       <section-card>
@@ -623,7 +640,7 @@
         >提交</el-button
       >
     </template>
-    <div v-if="pageMode" class="formal-editor__page-actions">
+    <div v-if="pageMode && !publicMode" class="formal-editor__page-actions">
       <el-button @click="visible = false">取消</el-button>
       <el-button
         v-if="editable && !recordId"
@@ -929,6 +946,7 @@
 </template>
 
 <script>
+import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
   getCandidateDetails,
@@ -977,6 +995,10 @@ export default {
       type: Object,
       default: null,
     },
+    publicMode: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue', 'success'],
   data() {
@@ -1088,6 +1110,10 @@ export default {
         batchNo: '',
         cargoName: '',
       },
+      detailPage: {
+        current: 1,
+        size: 10,
+      },
     };
   },
   computed: {
@@ -1135,6 +1161,13 @@ export default {
         })
       );
     },
+    pagedDetails() {
+      const list = this.filteredDetails;
+      const size = Number(this.detailPage.size) || 10;
+      const current = Math.max(Number(this.detailPage.current) || 1, 1);
+      const start = (current - 1) * size;
+      return list.slice(start, start + size);
+    },
     missingAttachmentTypeText() {
       const missing = this.getMissingAttachmentTypes();
       return missing.length ? `未上传：${missing.join('、')}` : '';
@@ -1159,6 +1192,16 @@ export default {
         if (value) this.initialize();
       },
     },
+    filteredDetails: {
+      handler(list) {
+        const size = Number(this.detailPage.size) || 10;
+        const maxPage = Math.max(1, Math.ceil((list?.length || 0) / size) || 1);
+        if (this.detailPage.current > maxPage) {
+          this.detailPage.current = maxPage;
+        }
+      },
+      immediate: true,
+    },
     summaryTotal(value) {
       this.form.settlementAmount = Number(value || 0).toFixed(2);
       this.form.localSettlementAmount = (
@@ -1173,7 +1216,9 @@ export default {
   },
   methods: {
     async loadFormalDetail(id) {
-      const response = await getDetail(id);
+      const response = this.publicMode
+        ? await getMkPublicDetail('formal-settlement', id)
+        : await getDetail(id);
       const data = this.unwrapData(response);
       this.form = {
         ...createFormalSettlementForm(),
@@ -1185,12 +1230,13 @@ export default {
       };
       this.sources = data.sources || [];
       this.details = data.details || [];
+      this.detailPage.current = 1;
       this.summaryFees = data.summaryFees || [];
       // 服务端数据已刷新，费用快照与暂存调整全部作废。
       this.detailFeeSnapshots = {};
       this.pendingAdjustments = {};
       this.paymentApplications = data.paymentApplications || [];
-      if (this.readonly && this.form.settlementType === 'receivable') {
+      if (this.readonly && this.form.settlementType === 'receivable' && !this.publicMode) {
         this.receiptClaims = this.unwrapData(await getReceiptClaims(id)) || [];
       }
       this.adjustments = data.adjustments || [];
@@ -1237,14 +1283,17 @@ export default {
         rule: null,
       };
       this.detailCollapsed = false;
+      this.detailPage = { current: 1, size: 10 };
       this.resetDetailQuery(false);
-      await Promise.all([
-        this.loadAllContracts(),
-        this.loadFeeOptions(),
-        this.loadFeeCategoryOptions(),
-        this.loadAttachmentTypeOptions(),
-        this.loadTransportTypeOptions(),
-      ]);
+      if (!this.publicMode) {
+        await Promise.all([
+          this.loadAllContracts(),
+          this.loadFeeOptions(),
+          this.loadFeeCategoryOptions(),
+          this.loadAttachmentTypeOptions(),
+          this.loadTransportTypeOptions(),
+        ]);
+      }
       if (!this.recordId) {
         this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
         if (this.initialData) await this.applyInitialData();
@@ -1328,6 +1377,7 @@ export default {
         settlementAmountTax:
           row.settlementAmountTax ?? row.totalAmount ?? row.afterAmount ?? row.settlementAmount,
       }));
+      this.detailPage.current = 1;
       this.form.sourceDetailIds = this.details.map(item => item.sourceDetailId);
       await this.refreshSummaryFees();
     },
@@ -1373,6 +1423,7 @@ export default {
           sourcePreSettlementId: settlement.id,
         }))
       );
+      this.detailPage.current = 1;
       const summaryMap = new Map();
       settlements
         .flatMap(settlement => settlement.summaryFees || [])
@@ -1601,6 +1652,7 @@ export default {
         ...this.details.filter(item => item.formalSettlementId),
         ...existing.values(),
       ];
+      this.detailPage.current = 1;
       this.form.sourceDetailIds = [...existing.values()].map(item => item.sourceDetailId);
       this.detailCandidate.loading = true;
       try {
@@ -1819,6 +1871,9 @@ export default {
       return sourceDetailId ? `src:${sourceDetailId}` : '';
     },
     async loadDetailFeeRows(detail) {
+      if (this.publicMode) {
+        return [this.normalizeAdjustRow(detail)];
+      }
       if (detail.formalSettlementId && detail.id) {
         const rows = this.unwrapData(await getDetailFees(detail.id)) || [];
         return rows.map(item => this.normalizeAdjustRow(item));
@@ -1920,12 +1975,19 @@ export default {
     },
     handleDetailQuery() {
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage.current = 1;
     },
     resetDetailQuery(apply = true) {
       this.detailQuery = { documentNo: '', waybillNo: '', batchNo: '', cargoName: '' };
       if (apply) this.handleDetailQuery();
       else this.appliedDetailQuery = { ...this.detailQuery };
     },
+    handleDetailPageSizeChange() {
+      this.detailPage.current = 1;
+    },
+    detailIndexMethod(index) {
+      return (this.detailPage.current - 1) * this.detailPage.size + index + 1;
+    },
     exportDetails() {
       if (!this.details.length) return this.$message.warning('暂无可导出的结算明细');
       const rows = this.details.map((row, index) => {
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index c90624f..c2ecc5e 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -66,6 +66,9 @@
                 <span v-else-if="field.prop === 'settlementType'" class="form-readonly">
                   {{ settlementTypeName }}
                 </span>
+                <span v-else-if="field.prop === 'createTime'" class="form-readonly">
+                  {{ formatCreateDate(form.createTime) }}
+                </span>
                 <span v-else-if="field.money" class="form-readonly">
                   {{ formatMoney(form[field.prop], moneyCurrency(field.prop)) }}
                 </span>
@@ -184,7 +187,6 @@
         </template>
         <el-form
           :model="detailQuery"
-          inline
           label-position="right"
           label-width="auto"
           class="pre-settlement-editor__detail-filter"
@@ -228,8 +230,15 @@
           </el-form-item>
         </el-form>
         <div v-show="!detailCollapsed">
-          <el-table :data="filteredDetails" border class="pre-settlement-editor__detail-table">
-            <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+          <el-table :data="pagedDetails" border class="pre-settlement-editor__detail-table">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="64"
+              fixed="left"
+              align="center"
+              :index="detailIndexMethod"
+            />
             <el-table-column
               v-for="column in visibleDetailColumns"
               :key="column.prop"
@@ -300,6 +309,16 @@
               </template>
             </el-table-column>
           </el-table>
+          <div class="pre-settlement-editor__pagination">
+            <el-pagination
+              v-model:current-page="detailPage.current"
+              v-model:page-size="detailPage.size"
+              :total="filteredDetails.length"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleDetailPageSizeChange"
+            />
+          </div>
         </div>
       </section-card>
 
@@ -313,13 +332,43 @@
           <el-table :data="attachments" border @selection-change="handleAttachmentSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column label="文件名" min-width="260" show-overflow-tooltip>
+            <el-table-column label="附件类型" min-width="180" align="center">
+              <template #default="{ row }">
+                <el-select
+                  v-if="editable"
+                  v-model="row.type"
+                  filterable
+                  placeholder="请选择"
+                  @change="sortAttachments"
+                >
+                  <el-option
+                    v-for="item in attachmentTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else>{{ attachmentTypeName(row.type) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="文件名称" min-width="260" show-overflow-tooltip>
               <template #default="{ row }">
                 <el-link type="primary" @click="previewAttachment(row)">
                   {{ attachmentName(row) }}
                 </el-link>
               </template>
             </el-table-column>
+            <el-table-column label="附件描述" min-width="220">
+              <template #default="{ row }">
+                <span v-if="!editable">{{ row.description || '-' }}</span>
+                <el-input
+                  v-else
+                  v-model="row.description"
+                  maxlength="200"
+                  placeholder="请输入"
+                />
+              </template>
+            </el-table-column>
             <el-table-column label="文件大小" width="120" align="center">
               <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
             </el-table-column>
@@ -425,7 +474,7 @@
         提交
       </el-button>
     </template>
-    <div v-if="pageMode" class="pre-settlement-editor__page-actions">
+    <div v-if="pageMode && !publicMode" class="pre-settlement-editor__page-actions">
       <el-button @click="visible = false">取消</el-button>
       <el-button v-if="editable" type="primary" plain :loading="saving" @click="saveDraft(false)"
         >保存</el-button
@@ -681,134 +730,113 @@
     append-to-body
     destroy-on-close
   >
-    <el-tabs v-model="adjustDialog.activeTab" class="pre-settlement-editor__adjust-tabs">
-      <el-tab-pane label="结算明细调整" name="adjust">
-        <el-table v-loading="adjustDialog.loading" :data="adjustRows" border>
-          <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
-          <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
-          <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
-          <el-table-column label="计费规则" min-width="190" align="center">
-            <template #default="{ row }">
-              <div class="pre-settlement-editor__billing-rule-cell">
-                <span>{{ displayValue(billingRuleName(row)) }}</span>
-                <el-icon
-                  class="pre-settlement-editor__billing-rule-icon"
-                  title="查看计费规则详情"
-                  @click="openBillingRuleInfo(row)"
-                >
-                  <InfoFilled />
-                </el-icon>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="运输总量" min-width="150" align="center">
-            <template #default="{ row }">
-              <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
-              <el-input-number
-                v-else
-                v-model="row.transportQuantity"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                @change="recalculateAdjustRow(row, 'transportQuantity')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="里程（KM）" min-width="140" align="center">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.mileage"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-                @change="recalculateAdjustRow(row, 'mileage')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="运输单价" min-width="140" align="center">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.unitPrice"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-                @change="recalculateAdjustRow(row, 'unitPrice')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-for="feeItem in adjustFeeItemNames"
-            :key="feeItem"
-            :label="feeItem"
-            min-width="140"
-            align="center"
-          >
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.feeItems[feeItem]"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-                @change="recalculateAdjustRow(row, feeItem)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="结算金额（含税）" min-width="170" align="center">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.settlementAmountTax"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" min-width="200" align="center">
-            <template #default="{ row }">
-              <el-input v-model="row.remark" maxlength="200" :disabled="adjustDialog.readonly" />
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-form
-          v-if="!adjustDialog.readonly"
-          :model="adjustDialog"
-          label-position="right"
-          label-width="auto"
-          class="pre-settlement-editor__adjust-reason"
-        >
-          <el-form-item label="调整原因">
-            <el-input v-model="adjustDialog.reason" maxlength="200" show-word-limit />
-          </el-form-item>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="变更记录" name="records">
-        <el-table :data="changeRecords" border>
-          <el-table-column type="index" label="序号" width="70" align="center" />
-          <el-table-column prop="changeTime" label="变更日期" min-width="170" align="center" />
-          <el-table-column prop="operatorName" label="经办人" min-width="140" align="center" />
-          <el-table-column prop="changeType" label="变更类型" min-width="160" align="center" />
-          <el-table-column
-            prop="changeReason"
-            label="变更原因"
-            min-width="240"
-            align="center"
-            show-overflow-tooltip
+    <el-table v-loading="adjustDialog.loading" :data="adjustRows" border>
+      <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+      <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
+      <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
+      <el-table-column label="计费规则" min-width="190" align="center">
+        <template #default="{ row }">
+          <div class="pre-settlement-editor__billing-rule-cell">
+            <span>{{ displayValue(billingRuleName(row)) }}</span>
+            <el-icon
+              class="pre-settlement-editor__billing-rule-icon"
+              title="查看计费规则详情"
+              @click="openBillingRuleInfo(row)"
+            >
+              <InfoFilled />
+            </el-icon>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="运输总量" min-width="150" align="center">
+        <template #default="{ row }">
+          <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
+          <el-input-number
+            v-else
+            v-model="row.transportQuantity"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            @change="recalculateAdjustRow(row, 'transportQuantity')"
           />
-          <el-table-column label="状态" min-width="120" align="center">
-            <template #default>已生效</template>
-          </el-table-column>
-          <el-table-column label="操作" width="120" align="center" fixed="right">
-            <template #default="{ row }">
-              <el-link type="primary" @click="openAdjustChangeRecord(row)">查看详情</el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-empty v-if="!adjustChangeRecords.length" description="暂无变更记录" :image-size="60" />
-      </el-tab-pane>
-    </el-tabs>
+        </template>
+      </el-table-column>
+      <el-table-column label="里程（KM）" min-width="140" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.mileage"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+            @change="recalculateAdjustRow(row, 'mileage')"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="运输单价" min-width="140" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.unitPrice"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+            @change="recalculateAdjustRow(row, 'unitPrice')"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="feeItem in adjustFeeItemNames"
+        :key="feeItem"
+        :label="feeItem"
+        min-width="140"
+        align="center"
+      >
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.feeItems[feeItem]"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+            @change="recalculateAdjustRow(row, feeItem)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="结算金额（含税）" min-width="170" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.settlementAmountTax"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="200" align="center">
+        <template #default="{ row }">
+          <el-input v-model="row.remark" maxlength="200" :disabled="adjustDialog.readonly" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-form
+      v-if="!adjustDialog.readonly"
+      :model="adjustDialog"
+      label-position="right"
+      label-width="auto"
+      class="pre-settlement-editor__adjust-reason"
+    >
+      <el-form-item label="调整原因">
+        <el-input
+          v-model="adjustDialog.reason"
+          type="textarea"
+          :rows="2"
+          maxlength="200"
+          show-word-limit
+          placeholder="请输入"
+        />
+      </el-form-item>
+    </el-form>
     <template #footer>
       <el-button @click="adjustDialog.visible = false">取消</el-button>
       <el-button
@@ -922,6 +950,7 @@
 import { h } from 'vue';
 import { mapGetters } from 'vuex';
 import { InfoFilled } from '@element-plus/icons-vue';
+import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
   getCandidateDetails,
@@ -982,6 +1011,10 @@ export default {
       type: Object,
       default: null,
     },
+    publicMode: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue', 'success'],
   data() {
@@ -1054,9 +1087,14 @@ export default {
         batchNo: '',
         cargoName: '',
       },
+      detailPage: {
+        current: 1,
+        size: 10,
+      },
       advances: [],
       changeRecords: [],
       attachments: [],
+      attachmentTypeOptions: [],
       selectedAttachmentRows: [],
       candidateDialog: {
         visible: false,
@@ -1079,7 +1117,6 @@ export default {
         loading: false,
         saving: false,
         readonly: false,
-        activeTab: 'adjust',
         detailId: '',
         sourceDetailId: '',
         detailLineNo: '',
@@ -1206,6 +1243,13 @@ export default {
         })
       );
     },
+    pagedDetails() {
+      const list = this.filteredDetails;
+      const size = Number(this.detailPage.size) || 10;
+      const current = Math.max(Number(this.detailPage.current) || 1, 1);
+      const start = (current - 1) * size;
+      return list.slice(start, start + size);
+    },
     adjustFeeItemNames() {
       const names = new Set();
       this.adjustRows.forEach(row => {
@@ -1232,6 +1276,16 @@ export default {
       this.form.settlementAmount = Number(value || 0).toFixed(2);
       this.recalculateLocalAmount();
     },
+    filteredDetails: {
+      handler(list) {
+        const size = Number(this.detailPage.size) || 10;
+        const maxPage = Math.max(1, Math.ceil((list?.length || 0) / size) || 1);
+        if (this.detailPage.current > maxPage) {
+          this.detailPage.current = maxPage;
+        }
+      },
+      immediate: true,
+    },
   },
   methods: {
     hasPermission(code) {
@@ -1239,9 +1293,12 @@ export default {
     },
     async initialize() {
       this.resetEditor();
-      await this.loadFeeOptions();
-      await this.loadFeeCategoryOptions();
-      await this.loadTransportTypeOptions();
+      if (!this.publicMode) {
+        await this.loadFeeOptions();
+        await this.loadFeeCategoryOptions();
+        await this.loadTransportTypeOptions();
+        await this.loadAttachmentTypeOptions();
+      }
       if (this.recordId) await this.loadDetail();
       else if (this.initialData) await this.applyInitialData();
     },
@@ -1281,6 +1338,7 @@ export default {
         localCurrency: first.localCurrency || 'RMB',
       });
       this.details = rows.map(row => this.normalizeSourceDetail(row));
+      this.detailPage.current = 1;
       this.loading = true;
       try {
         await this.ensureSourceFeeSnapshots();
@@ -1342,6 +1400,7 @@ export default {
         cargoName: '',
       };
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage = { current: 1, size: 10 };
       this.advances = [];
       this.changeRecords = [];
       this.attachments = [];
@@ -1350,7 +1409,6 @@ export default {
       this.pendingAdjustments = {};
       this.sourceFeeSnapshots = {};
       this.detailFeeCache = {};
-      this.adjustDialog.activeTab = 'adjust';
       this.adjustDialog.detailId = '';
       this.adjustDialog.sourceDetailId = '';
       this.adjustDialog.detailLineNo = '';
@@ -1370,11 +1428,14 @@ export default {
     async loadDetail() {
       this.loading = true;
       try {
-        const { data } = await getDetail(this.form.id || this.recordId);
-        const detail = data?.data || {};
+        const response = this.publicMode
+          ? await getMkPublicDetail('pre-settlement', this.form.id || this.recordId)
+          : await getDetail(this.form.id || this.recordId);
+        const detail = response.data?.data || {};
         this.form = { ...emptyPreSettlementForm(), ...detail };
         this.summaryFees = (detail.summaryFees || []).map(row => ({ ...row }));
         this.details = (detail.details || []).map(row => this.normalizeSourceDetail(row));
+        this.detailPage.current = 1;
         this.advances = (detail.advances || []).map(row => ({
           ...row,
           createUserName: row.createUserName || detail.createUserName,
@@ -1382,6 +1443,7 @@ export default {
         }));
         this.changeRecords = detail.changeRecords || [];
         this.attachments = this.parseAttachments(detail.attachmentsJson);
+        this.sortAttachments();
         this.selectedAttachmentRows = [];
         if (
           detail.contractId &&
@@ -1399,8 +1461,15 @@ export default {
             partyB: detail.payeeName,
           });
         }
-        // 预加载所有明细的费用明细数据，用于拼接货物名称和类型
-        await this.loadAllDetailFees();
+        if (this.publicMode && detail.detailFees) {
+          Object.entries(detail.detailFees).forEach(([detailId, feeRows]) => {
+            if (Array.isArray(feeRows) && feeRows.length) {
+              this.detailFeeCache[detailId] = feeRows;
+            }
+          });
+        } else {
+          await this.loadAllDetailFees();
+        }
       } finally {
         this.loading = false;
       }
@@ -1566,6 +1635,7 @@ export default {
           return;
         }
         this.$message.success('保存成功');
+        this.visible = false;
         this.$emit('success', this.form.id);
       } finally {
         this[stateKey] = false;
@@ -1895,6 +1965,7 @@ export default {
     },
     handleDetailQuery() {
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage.current = 1;
     },
     resetDetailQuery() {
       this.detailQuery = {
@@ -1904,6 +1975,13 @@ export default {
         cargoName: '',
       };
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage.current = 1;
+    },
+    handleDetailPageSizeChange() {
+      this.detailPage.current = 1;
+    },
+    detailIndexMethod(index) {
+      return (this.detailPage.current - 1) * this.detailPage.size + index + 1;
     },
     normalizeAdjustRow(item, feeItemNames = []) {
       const rawFeeItems =
@@ -2026,7 +2104,6 @@ export default {
       this.adjustDialog.visible = true;
       this.adjustDialog.loading = true;
       this.adjustDialog.readonly = readonly;
-      this.adjustDialog.activeTab = 'adjust';
       this.adjustDialog.detailId = detailRow.id;
       this.adjustDialog.detailLineNo = detailRow.lineNo;
       this.adjustDialog.sourceDetailId =
@@ -2042,6 +2119,11 @@ export default {
           this.adjustRows = this.cloneAdjustRows(pending.rows);
           return;
         }
+        if (this.publicMode) {
+          const cachedFees = this.detailFeeCache[detailRow.id] || [];
+          this.adjustRows = cachedFees.map(item => this.normalizeAdjustRow(item));
+          return;
+        }
         if (sourceDetailId) {
           if (!this.sourceFeeSnapshots[sourceDetailId]) {
             this.sourceFeeSnapshots[sourceDetailId] = await this.loadSourceFeeRows(sourceDetailId);
@@ -2049,6 +2131,11 @@ export default {
           this.adjustRows = this.cloneAdjustRows(this.sourceFeeSnapshots[sourceDetailId]);
           return;
         }
+        const cachedFees = this.detailFeeCache[detailRow.id];
+        if (this.publicMode && Array.isArray(cachedFees)) {
+          this.adjustRows = cachedFees.map(item => this.normalizeAdjustRow(item));
+          return;
+        }
         const response = await getDetailFees(detailRow.id);
         const rows = response.data?.data || response.data || [];
         this.adjustRows = rows.map(item => this.normalizeAdjustRow(item));
@@ -2237,10 +2324,6 @@ export default {
       return String(name || '').includes('运费') || String(name || '').includes('运输费');
     },
     async saveAdjustment() {
-      if (!this.adjustDialog.reason.trim()) {
-        this.$message.warning('请输入调整原因');
-        return;
-      }
       if (this.adjustRows.some(row => row.calculating)) {
         this.$message.warning('费用正在重新计算，请稍候');
         return;
@@ -2419,13 +2502,92 @@ export default {
     handleAttachmentChange(list) {
       const uploadUserName = this.userInfo?.realName || this.userInfo?.userName || '';
       const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
-      this.attachments = (list || []).map(file => ({
-        ...file,
-        uploadUserName: file.uploadUserName || uploadUserName,
-        uploadTime: file.uploadTime || uploadTime,
-      }));
+      const existingRows = this.attachments || [];
+      this.attachments = (list || []).map(file => {
+        const fileUrl = this.attachmentUrl(file);
+        const existing = existingRows.find(item => {
+          const sameUid = file.uid && item.uid && String(file.uid) === String(item.uid);
+          const sameUrl = fileUrl && this.attachmentUrl(item) === fileUrl;
+          return sameUid || sameUrl;
+        });
+        const originalName = this.attachmentName(file);
+        return {
+          ...file,
+          type: existing?.type || file.type || this.resolveAttachmentType(originalName),
+          description: existing?.description || file.description || '',
+          uploadUserName: existing?.uploadUserName || file.uploadUserName || uploadUserName,
+          uploadTime: existing?.uploadTime || file.uploadTime || uploadTime,
+        };
+      });
+      this.sortAttachments();
       this.selectedAttachmentRows = [];
     },
+    async loadAttachmentTypeOptions() {
+      try {
+        const response = await getDictionary({ code: 'pre_settlement_attachment_type' });
+        const data = response?.data?.data || [];
+        this.attachmentTypeOptions = data
+          .map(item => ({
+            label: item.dictValue,
+            value: item.dictValue,
+          }))
+          .filter(item => item.label && item.value);
+      } catch (error) {
+        this.attachmentTypeOptions = [];
+      }
+      this.sortAttachments();
+    },
+    resolveAttachmentType(fileName) {
+      const normalizedName = String(fileName || '').toLocaleLowerCase();
+      const matchedType = [...this.attachmentTypeOptions]
+        .filter(item => item?.label || item?.value)
+        .sort(
+          (a, b) =>
+            String(b.label || b.value || '').length - String(a.label || a.value || '').length
+        )
+        .find(item => {
+          const typeText = String(item.label || item.value || '').toLocaleLowerCase();
+          return typeText && normalizedName.includes(typeText);
+        });
+      if (matchedType?.value) return matchedType.value;
+      const otherType = this.attachmentTypeOptions.find(item => this.isOtherAttachmentType(item));
+      if (otherType?.value) return otherType.value;
+      return '';
+    },
+    isOtherAttachmentType(item) {
+      const typeText = String(item?.label || item?.value || '').trim();
+      return (
+        typeText === '其他' ||
+        typeText === '其它' ||
+        typeText === '其他附件' ||
+        typeText === '其它附件'
+      );
+    },
+    getAttachmentTypeOrder(type) {
+      const normalizedType = String(type || '').trim();
+      const index = this.attachmentTypeOptions.findIndex(
+        item =>
+          String(item.value || '').trim() === normalizedType ||
+          String(item.label || '').trim() === normalizedType
+      );
+      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
+    },
+    sortAttachments() {
+      this.attachments = (this.attachments || [])
+        .map((file, index) => ({ file, index }))
+        .sort((a, b) => {
+          const orderDifference =
+            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
+          return orderDifference || a.index - b.index;
+        })
+        .map(item => item.file);
+    },
+    attachmentTypeName(type) {
+      const option = this.attachmentTypeOptions.find(
+        item => String(item.value) === String(type) || String(item.label) === String(type)
+      );
+      return option?.label || type || '-';
+    },
     handleAttachmentSelectionChange(rows) {
       this.selectedAttachmentRows = rows || [];
     },
@@ -2469,13 +2631,25 @@ export default {
     },
     parseAttachments(value) {
       if (!value) return [];
-      if (Array.isArray(value)) return value;
-      try {
-        const parsed = JSON.parse(value);
-        return Array.isArray(parsed) ? parsed : [];
-      } catch (error) {
-        return [];
+      let list = [];
+      if (Array.isArray(value)) {
+        list = value;
+      } else {
+        try {
+          const parsed = JSON.parse(value);
+          list = Array.isArray(parsed) ? parsed : [];
+        } catch (error) {
+          return [];
+        }
       }
+      return list.map(file => {
+        const originalName = this.attachmentName(file);
+        return {
+          ...file,
+          type: file?.type || this.resolveAttachmentType(originalName),
+          description: file?.description || '',
+        };
+      });
     },
     parseFeeItems(value) {
       if (!value) return {};
@@ -2512,6 +2686,11 @@ export default {
       if (!Number.isFinite(amount)) return '-';
       return `${amount.toFixed(2)} ${currency || 'RMB'}`;
     },
+    formatCreateDate(value) {
+      if (value === undefined || value === null || value === '') return '-';
+      const parsed = this.$dayjs(value);
+      return parsed.isValid() ? parsed.format('YYYY-MM-DD') : this.displayValue(value);
+    },
     formatQuantity(row) {
       const value = row.transportQuantity;
       if (value === undefined || value === null || value === '') return '-';
@@ -2662,22 +2841,43 @@ export default {
   }
 
   &__detail-filter {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 0 24px;
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr)) auto;
+    align-items: center;
+    gap: 8px 16px;
     margin-bottom: 12px;
+    padding: 12px 12px 4px;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
 
     :deep(.el-form-item) {
+      display: flex;
+      min-width: 0;
+      margin-right: 0;
       margin-bottom: 0;
     }
 
+    :deep(.el-form-item__content) {
+      flex: 1;
+      min-width: 0;
+    }
+
     :deep(.el-input) {
-      width: 220px;
+      width: 100%;
     }
   }
 
   &__detail-filter-actions {
-    margin-left: auto;
+    width: auto;
+    margin-left: 0;
+    white-space: nowrap;
+    justify-self: end;
+
+    :deep(.el-form-item__content) {
+      flex: none;
+      justify-content: flex-end;
+      flex-wrap: nowrap;
+    }
   }
 
   &__contract-filter {
diff --git a/src/views/settlement/formal-settlement-form.vue b/src/views/settlement/formal-settlement-form.vue
index 999e8bd..5abd953 100644
--- a/src/views/settlement/formal-settlement-form.vue
+++ b/src/views/settlement/formal-settlement-form.vue
@@ -56,6 +56,7 @@ export default {
   methods: {
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
+      this.$router.$avueRouter.closeTag();
       this.$router.push('/settlement/formal-settlement');
     },
     syncTagTitle() {
diff --git a/src/views/settlement/formal-settlement-public-view.vue b/src/views/settlement/formal-settlement-public-view.vue
new file mode 100644
index 0000000..1c337f2
--- /dev/null
+++ b/src/views/settlement/formal-settlement-public-view.vue
@@ -0,0 +1,55 @@
+<template>
+  <mk-public-shell biz-type="formal-settlement" :get-form="getForm">
+    <basic-container>
+      <div class="mk-public-form-title">查看正式结算</div>
+      <formal-settlement-editor
+        ref="page"
+        :model-value="true"
+        page-mode
+        readonly
+        public-mode
+        :record-id="recordId"
+      />
+    </basic-container>
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import FormalSettlementEditor from '@/views/settlement/components/formal-settlement-editor.vue';
+
+export default {
+  name: 'FormalSettlementPublicView',
+  components: { MkPublicShell, FormalSettlementEditor },
+  computed: {
+    recordId() {
+      return this.$route.query.id || '';
+    },
+  },
+  methods: {
+    getForm() {
+      const form = this.$refs.page?.form || {};
+      return { ...form, subject: form.formalSettlementNo || form.contractName || '' };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.mk-public-form-title {
+  display: flex;
+  align-items: center;
+  min-height: 24px;
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: 600;
+
+  &::before {
+    width: 4px;
+    height: 20px;
+    margin-right: 8px;
+    background: #409eff;
+    content: '';
+  }
+}
+</style>
diff --git a/src/views/settlement/pre-settlement-form.vue b/src/views/settlement/pre-settlement-form.vue
index b70ec75..9bd3549 100644
--- a/src/views/settlement/pre-settlement-form.vue
+++ b/src/views/settlement/pre-settlement-form.vue
@@ -50,6 +50,7 @@ export default {
     },
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
+      this.$router.$avueRouter.closeTag();
       this.$router.push('/settlement/pre-settlement');
     },
     syncTagTitle() {
diff --git a/src/views/settlement/pre-settlement-public-view.vue b/src/views/settlement/pre-settlement-public-view.vue
new file mode 100644
index 0000000..1ddec11
--- /dev/null
+++ b/src/views/settlement/pre-settlement-public-view.vue
@@ -0,0 +1,55 @@
+<template>
+  <mk-public-shell biz-type="pre-settlement" :get-form="getForm">
+    <basic-container>
+      <div class="mk-public-form-title">查看预结算</div>
+      <pre-settlement-editor
+        ref="page"
+        :model-value="true"
+        page-mode
+        readonly
+        public-mode
+        :record-id="recordId"
+      />
+    </basic-container>
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import PreSettlementEditor from '@/views/settlement/components/pre-settlement-editor.vue';
+
+export default {
+  name: 'PreSettlementPublicView',
+  components: { MkPublicShell, PreSettlementEditor },
+  computed: {
+    recordId() {
+      return this.$route.query.id || '';
+    },
+  },
+  methods: {
+    getForm() {
+      const form = this.$refs.page?.form || {};
+      return { ...form, subject: form.preSettlementNo || form.contractName || '' };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.mk-public-form-title {
+  display: flex;
+  align-items: center;
+  min-height: 24px;
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: 600;
+
+  &::before {
+    width: 4px;
+    height: 20px;
+    margin-right: 8px;
+    background: #409eff;
+    content: '';
+  }
+}
+</style>
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 0d92d07..faf5b97 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -1153,28 +1153,16 @@ export default {
         minWidth: 130,
         align: 'right',
       };
-      const dynamicColumns = this.isPayable
-        ? [
-            {
-              label: '运输费',
-              prop: 'tableFreightAmount',
-              feeSummaryType: 'freight',
-              minWidth: 130,
-              align: 'right',
-            },
-            otherFeeColumn,
-          ]
-        : [
-            ...this.tableFeeItemNames.map((name, index) => ({
-              label: name,
-              prop: `tableFeeItem${index}`,
-              feeItemName: name,
-              dynamic: true,
-              minWidth: 130,
-              align: 'right',
-            })),
-            otherFeeColumn,
-          ];
+      const dynamicColumns = [
+        {
+          label: '运输费',
+          prop: 'tableFreightAmount',
+          feeSummaryType: 'freight',
+          minWidth: 130,
+          align: 'right',
+        },
+        otherFeeColumn,
+      ];
       if (totalIndex < 0) return [...columns, ...dynamicColumns];
       columns.splice(totalIndex, 0, ...dynamicColumns);
       return columns;
@@ -1498,7 +1486,7 @@ export default {
         const res = await api.getList(this.page.current, this.page.size, params);
         const data = this.unwrapPage(res);
         this.rows = (data.records || []).map(this.decorateRow);
-        this.tableFeeItemNames = this.isPayable ? [] : this.collectFeeItemNames(this.rows);
+        this.tableFeeItemNames = [];
         this.page.total = data.total || 0;
       } finally {
         this.loading = false;
@@ -1738,7 +1726,7 @@ export default {
           });
           const adjusted = {
             ...item,
-            transportQuantity: Number(item.transportQuantity || 0),
+            transportQuantity: this.normalizeAdjustTransportQuantity(item),
             mileage:
               item.mileage === null || item.mileage === undefined || Number(item.mileage) === -1
                 ? null
@@ -1767,6 +1755,21 @@ export default {
     feeSourceLabel(value) {
       return ['手动录入', '手动添加', '手工录入'].includes(value) ? '手动录入' : '自动生成';
     },
+    normalizeAdjustTransportQuantity(item = {}) {
+      const value = item.transportQuantity;
+      if (value === undefined || value === null || value === '' || Number(value) === -1) {
+        return '';
+      }
+      const element = item.billingFactor;
+      // 按车辆/固定金额生成时运输量会被写成占位 1，调整弹窗无实际运输量时不展示
+      if (
+        (element === '按车辆' || element === '固定金额（整单一口价）') &&
+        Number(value) === 1
+      ) {
+        return '';
+      }
+      return Number(value);
+    },
     adjustBillingTypes(row) {
       return ADJUST_BILLING_TYPE_MAP[row.billingFactor] || [];
     },
@@ -1894,7 +1897,12 @@ export default {
             model: row.model,
             billingFactor: row.billingFactor,
             billingType: row.billingType,
-            transportQuantity: row.transportQuantity,
+            transportQuantity:
+              row.transportQuantity === '' ||
+              row.transportQuantity === null ||
+              row.transportQuantity === undefined
+                ? null
+                : Number(row.transportQuantity),
             priceUnit: row.priceUnit,
             unitPrice: row.unitPrice,
             mileage: row.mileage,
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index e30e593..565ad53 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -143,7 +143,8 @@
           :status="oaSyncProgressStatus"
           :stroke-width="12"
         />
-        <div class="oa-sync-meta">
+        <div class="oa-sync-meta" v-if="oaSyncStage === 'clear'">当前阶段：{{ oaSyncStageLabel }}</div>
+        <div class="oa-sync-meta" v-else>
           当前阶段：{{ oaSyncStageLabel }}，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
         </div>
         <div class="oa-sync-stats">
@@ -177,6 +178,7 @@ import {
   getDeptTree,
   syncOaCompany,
   syncOaDepartment,
+  clearNonTopDept,
 } from '@/api/system/dept';
 import { getLeaderList } from '@/api/system/user';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
@@ -215,6 +217,7 @@ export default {
       oaSyncCancelled: false,
       oaSyncStatus: 'running',
       oaSyncStage: 'company',
+      oaSyncClearNonTop: false,
       oaSyncController: null,
       oaSyncProgress: {
         current: 0,
@@ -287,8 +290,9 @@ export default {
                     return;
                   }
                   const parentId = this.normalizeParentId(this.form?.parentId);
+                  // 顶级组织不选择上级时，编码不依赖上级编码
                   if (!parentId) {
-                    callback(new Error('请先选择上级组织'));
+                    callback();
                     return;
                   }
                   if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
@@ -429,13 +433,6 @@ export default {
             props: {
               label: 'title',
             },
-            rules: [
-              {
-                required: true,
-                message: '请选择上级组织',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '所属租户',
@@ -520,6 +517,9 @@ export default {
       return '自动同步组织';
     },
     oaSyncStageLabel() {
+      if (this.oaSyncStage === 'clear') {
+        return '清除非顶级组织';
+      }
       return this.oaSyncStage === 'department' ? '同步部门' : '同步公司';
     },
     oaSyncTotalPage() {
@@ -555,21 +555,34 @@ export default {
   },
   methods: {
     handleOaOrgSync() {
-      this.$confirm('确定从OA先同步公司、再同步部门?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        this.startOaOrgSync();
-      });
+      this.$confirm(
+        '是否清除非顶级组织？选择“是”将先删除顶级以外的组织后再同步；选择“否”则直接同步。',
+        '提示',
+        {
+          confirmButtonText: '是',
+          cancelButtonText: '否',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          this.startOaOrgSync(true);
+        })
+        .catch(action => {
+          if (action === 'cancel') {
+            this.startOaOrgSync(false);
+          }
+        });
     },
-    startOaOrgSync() {
+    startOaOrgSync(clearNonTop) {
       this.oaSyncLoading = true;
       this.oaSyncVisible = true;
       this.oaSyncRunning = true;
       this.oaSyncCancelled = false;
       this.oaSyncStatus = 'running';
-      this.oaSyncStage = 'company';
+      this.oaSyncClearNonTop = !!clearNonTop;
+      this.oaSyncStage = clearNonTop ? 'clear' : 'company';
       this.oaSyncController = new AbortController();
       this.oaSyncProgress = {
         current: 0,
@@ -607,6 +620,14 @@ export default {
     },
     async runOaOrgSyncPages() {
       try {
+        if (this.oaSyncClearNonTop) {
+          this.oaSyncStage = 'clear';
+          await clearNonTopDept(this.oaSyncController?.signal);
+          if (this.oaSyncCancelled) {
+            this.oaSyncStatus = 'cancelled';
+            return;
+          }
+        }
         this.oaSyncStage = 'company';
         await this.runOaOrgSyncStage(syncOaCompany);
         if (this.oaSyncCancelled) {
@@ -821,6 +842,11 @@ export default {
         .filter(Boolean);
       return result.length ? result.join('、') : '-';
     },
+    normalizeTopParent(row) {
+      if (!this.normalizeParentId(row?.parentId)) {
+        row.parentId = 0;
+      }
+    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -836,6 +862,7 @@ export default {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
       row.leaderId = func.join(row.leaderId);
+      this.normalizeTopParent(row);
       if (Number(row.deptCategory) === 6 && !row.carrierCustomerId) {
         this.$message.warning('请选择承运商');
         loading();
@@ -865,6 +892,7 @@ export default {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
       row.leaderId = func.join(row.leaderId);
+      this.normalizeTopParent(row);
       if (Number(row.deptCategory) === 6 && !row.carrierCustomerId) {
         this.$message.warning('请选择承运商');
         loading();
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 107f5be..6d400fb 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -205,7 +205,7 @@
                       type="password"
                       show-password
                       autocomplete="new-password"
-                      placeholder="请输入登录密码"
+                      placeholder="大于8位，含字母、数字、特殊字符.!@#$%^&*"
                     />
                   </el-form-item>
                 </el-col>
@@ -332,7 +332,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="新密码" prop="password">
-                    <el-input v-model="passwordForm.password" type="password" show-password />
+                    <el-input
+                      v-model="passwordForm.password"
+                      type="password"
+                      show-password
+                      placeholder="大于8位，含字母、数字、特殊字符.!@#$%^&*"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -424,6 +429,7 @@ import { mapGetters } from 'vuex';
 import { h } from 'vue';
 import { getToken } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
+import { validateLoginPassword } from '@/utils/validate';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import func from '@/utils/func';
@@ -487,8 +493,7 @@ export default {
       passwordForm: {},
       passwordRules: {
         password: [
-          { required: true, message: '请输入新密码', trigger: 'blur' },
-          { min: 6, max: 32, message: '密码长度在6到32个字符', trigger: 'blur' },
+          { required: true, validator: validateLoginPassword, trigger: 'blur' },
         ],
         password2: [
           { required: true, message: '请再次输入新密码', trigger: 'blur' },
@@ -497,6 +502,7 @@ export default {
       },
       userRules: {
         account: [{ required: true, message: '请输入账号名', trigger: 'blur' }],
+        password: [{ required: true, validator: validateLoginPassword, trigger: 'blur' }],
         realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
         deptId: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
diff --git a/src/views/system/userinfo.vue b/src/views/system/userinfo.vue
index a0d55f8..002ff50 100644
--- a/src/views/system/userinfo.vue
+++ b/src/views/system/userinfo.vue
@@ -91,7 +91,7 @@
               <el-input
                 v-model="passwordForm.newPassword"
                 type="password"
-                placeholder="请输入新密码"
+                placeholder="大于8位，含字母、数字、特殊字符.!@#$%^&*"
                 show-password
               >
                 <template #prefix>
@@ -143,6 +143,7 @@
 import { getUserInfo, updateInfo, updatePassword } from '@/api/system/user';
 import md5 from 'js-md5';
 import { sensitive } from '@/utils/sensitive';
+import { isValidLoginPassword, LOGIN_PASSWORD_RULE_MESSAGE } from '@/utils/validate';
 import {
   Plus,
   Bell,
@@ -259,6 +260,18 @@ export default {
     },
     // 提交密码修改
     submitPassword() {
+      if (!this.passwordForm.newPassword || !this.passwordForm.newPassword1) {
+        this.$message.warning('请输入新密码和确认密码');
+        return;
+      }
+      if (this.passwordForm.newPassword !== this.passwordForm.newPassword1) {
+        this.$message.warning('两次输入的新密码不一致');
+        return;
+      }
+      if (!isValidLoginPassword(this.passwordForm.newPassword)) {
+        this.$message.warning(LOGIN_PASSWORD_RULE_MESSAGE);
+        return;
+      }
       this.loading = true;
       updatePassword(
         md5(this.passwordForm.oldPassword),
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index e6e507d..4c9baed 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -624,6 +624,7 @@
               <el-table-column label="开户人姓名" prop="accountHolderName" min-width="150" />
               <el-table-column label="收款账号" prop="bankAccount" min-width="180" />
               <el-table-column label="开户行" prop="bankName" min-width="180" />
+              <el-table-column label="联行号" prop="cnapsCode" min-width="160" />
               <el-table-column label="备注" prop="remark" min-width="180" />
               <el-table-column
                 label="操作"
@@ -1022,6 +1023,9 @@
           <el-form-item label="开户行" prop="bankName">
             <el-input v-model="receiptForm.bankName" maxlength="100" />
           </el-form-item>
+          <el-form-item label="联行号" prop="cnapsCode">
+            <el-input v-model="receiptForm.cnapsCode" maxlength="32" />
+          </el-form-item>
           <el-form-item label="收款账号" prop="bankAccount">
             <el-input v-model="receiptForm.bankAccount" maxlength="50" />
           </el-form-item>
@@ -1500,7 +1504,7 @@ import {
   getDetail as getCreditScoreQuantificationDetail,
 } from '@/api/vehicle/credit-score-quantification';
 import { getDictionary } from '@/api/system/dictbiz';
-import { processDelete, processSubmit } from '@/api/system/business-process';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { getDeptTree } from '@/api/system/dept';
 import { getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
@@ -1539,6 +1543,12 @@ export default {
     OpenFileViewer,
     PdfPreview,
   },
+  props: {
+    embeddedPublicId: {
+      type: [String, Number],
+      default: '',
+    },
+  },
   data() {
     const nonNegativeLabelMap = {
       invoiceTaxRate: '开票税点',
@@ -1779,6 +1789,7 @@ export default {
         accountName: [{ required: true, message: '请输入收款单位名称', trigger: 'blur' }],
         accountHolderName: [{ required: true, message: '请输入开户人姓名', trigger: 'blur' }],
         bankName: [{ required: true, message: '请输入开户行', trigger: 'blur' }],
+        cnapsCode: [{ required: true, message: '请输入联行号', trigger: 'blur' }],
         bankAccount: [{ required: true, message: '请输入收款账号', trigger: 'blur' }],
         remark: [{ max: 200, message: '备注最多200个字符', trigger: 'blur' }],
       },
@@ -1994,7 +2005,7 @@ export default {
   created() {
     if (this.isPublicViewPage) {
       this.readonly = true;
-      const id = this.$route.query.id;
+      const id = this.embeddedPublicId || this.$route.query.id;
       if (!id) {
         this.archiveBox = true;
         this.$message.error('缺少客商ID');
@@ -2029,7 +2040,9 @@ export default {
       );
     },
     isPublicViewPage() {
-      return this.$route.path === '/vehicle/customer-archive/public-view';
+      return (
+        this.$route.path === '/vehicle/customer-archive/public-view' || !!this.embeddedPublicId
+      );
     },
     archiveContainer() {
       return 'div';
@@ -2695,6 +2708,7 @@ export default {
         accountName: '',
         accountHolderName: '',
         bankName: '',
+        cnapsCode: '',
         bankAccount: '',
         registeredPhone: '',
         registeredAddress: '',
@@ -4079,7 +4093,7 @@ export default {
         .filter(item => item.contactName || item.contactPhone);
       archive.receiptAccounts = (archive.receiptAccounts || [])
         .map(item => this.normalizeReceipt(item))
-        .filter(item => item.accountName || item.accountHolderName || item.bankAccount);
+        .filter(item => item.accountName || item.accountHolderName || item.bankAccount || item.cnapsCode);
       archive.invoices = (archive.invoices || [])
         .map(item => {
           const invoice = this.normalizeInvoice(item);
@@ -4165,40 +4179,15 @@ export default {
       });
     },
     /**
-     * 列表 / 新增 / 编辑提交共用：提交 MK 审核流并更新客商审批状态
+     * 列表 / 新增 / 编辑提交共用：开启 MK 时提交审核流，并更新客商审批状态
      */
     submitCustomerApproval(id, fullName = '', approvalStatus = '') {
-      return this.submitMkApprovalFlow(id, fullName, approvalStatus).then(() => submitApproval(id));
-    },
-    /**
-     * 提交 MK 审核流：templateCode 取业务字典 mk_template 中「提交客商审核流」的键值
-     * 提交人手机号由后端从用户表读取真实值（前端接口会脱敏）
-     * MK 驳回后再提交时，先删除旧流程再创建新流程
-     */
-    async submitMkApprovalFlow(formInstanceId, subjectName = '', approvalStatus = '') {
-      if (approvalStatus === 'rejected') {
-        await processDelete({ formInstanceId: String(formInstanceId) });
-      }
-      const templateCode = await this.resolveMkTemplateCode('提交客商审核流');
-      const subject = subjectName
-        ? `客商准入审批：${subjectName}`
-        : `客商准入审批：${formInstanceId}`;
-      return processSubmit({
-        templateCode,
-        formInstanceId: String(formInstanceId),
-        subject,
-      });
-    },
-    async resolveMkTemplateCode(dictName = '提交客商审核流') {
-      const res = await getDictionary({ code: 'mk_template' });
-      const list = res?.data?.data || [];
-      const matched = list.find(item => String(item.dictValue || '').trim() === dictName);
-      const templateCode = matched?.dictKey;
-      if (!templateCode) {
-        this.$message.warning(`未配置业务字典 mk_template「${dictName}」，无法提交审核流`);
-        return Promise.reject(new Error(`未配置业务字典 mk_template「${dictName}」`));
-      }
-      return String(templateCode);
+      return submitMkApprovalFlow({
+        bizType: 'customer-archive',
+        formInstanceId: id,
+        subjectName: fullName,
+        approvalStatus,
+      }).then(() => submitApproval(id));
     },
     addScore() {
       this.scoreRecordIndex = -1;
@@ -5309,6 +5298,16 @@ export default {
 
 .invoice-form {
   max-width: none;
+
+  :deep(.el-input),
+  :deep(.el-cascader),
+  :deep(.el-select) {
+    width: 100%;
+  }
+
+  :deep(.el-cascader .el-input) {
+    width: 100%;
+  }
 }
 
 .invoice-contact-table {
diff --git a/src/views/vehicle/maintenance-plan.vue b/src/views/vehicle/maintenance-plan.vue
index 79cc1b8..5a83a9f 100644
--- a/src/views/vehicle/maintenance-plan.vue
+++ b/src/views/vehicle/maintenance-plan.vue
@@ -564,8 +564,8 @@ export default {
         this.addressMapPickerVisible = true;
       }
     },
-    handleAddressMapConfirm(address) {
-      this.form.address = address;
+    handleAddressMapConfirm(payload) {
+      this.form.address = typeof payload === 'string' ? payload : payload?.address || '';
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);
diff --git a/src/views/vehicle/maintenance-record.vue b/src/views/vehicle/maintenance-record.vue
index 77dd905..506adae 100644
--- a/src/views/vehicle/maintenance-record.vue
+++ b/src/views/vehicle/maintenance-record.vue
@@ -545,8 +545,8 @@ export default {
         this.addressMapPickerVisible = true;
       }
     },
-    handleAddressMapConfirm(address) {
-      this.form.address = address;
+    handleAddressMapConfirm(payload) {
+      this.form.address = typeof payload === 'string' ? payload : payload?.address || '';
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);
diff --git a/src/views/vehicle/violation-record.vue b/src/views/vehicle/violation-record.vue
index bc50708..bb3d1e6 100644
--- a/src/views/vehicle/violation-record.vue
+++ b/src/views/vehicle/violation-record.vue
@@ -288,8 +288,8 @@ export default {
         this.locationMapPickerVisible = true;
       }
     },
-    handleLocationMapConfirm(address) {
-      this.form.location = address;
+    handleLocationMapConfirm(payload) {
+      this.form.location = typeof payload === 'string' ? payload : payload?.address || '';
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);

From ce1ce02551a04af3d78514ea53c6b04fbc630669 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 22 Sep 2026 20:13:44 +0800
Subject: [PATCH 20/28] =?UTF-8?q?:sparkles:=20=E5=AE=8C=E5=96=84=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E5=95=86=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E4=B8=8E=E8=BD=A6=E8=BE=86=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

变更记录详情统一为居中分页弹窗，并去掉经办人等信息行。
客商评分支持删除、提交前自评校验、复评后才能审批，以及 0 分提交。
车辆外廓尺寸和载质量单位改到输入框内，认证审核标签按四字换行，使用部门必填并默认当前部门。
临时额度的 -1 占位金额显示为空。新增项目编号可留空由系统生成。
修复缓存总单页在打开新增项目时误请求缺少 id 的详情接口。
详情页状态与运输方式标签样式统一。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../change-record-detail-dialog/main.vue      | 108 ++++++
 .../components/master-order-detail.vue        |  45 ++-
 .../components/master-order-dispatch.vue      |   1 +
 .../components/waybill-manage-page.vue        |  41 ++-
 src/views/business/contract-manage.vue        |  69 +---
 src/views/business/loading-manage.vue         |  28 +-
 src/views/business/master-order.vue           |  12 +-
 src/views/business/project-apply.vue          |  66 +---
 src/views/business/temporary-credit-limit.vue |  42 ++-
 .../components/pre-settlement-editor.vue      |  51 +--
 .../settlement/receivable-payable-detail.vue  |   1 +
 src/views/transportCapacity/vehicle.vue       |  82 +++--
 src/views/vehicle/customer-archive.vue        | 315 ++++++++++++------
 13 files changed, 532 insertions(+), 329 deletions(-)
 create mode 100644 src/components/change-record-detail-dialog/main.vue

diff --git a/src/components/change-record-detail-dialog/main.vue b/src/components/change-record-detail-dialog/main.vue
new file mode 100644
index 0000000..9db3113
--- /dev/null
+++ b/src/components/change-record-detail-dialog/main.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    title="变更记录详情"
+    append-to-body
+    destroy-on-close
+    align-center
+    width="1100px"
+    class="change-record-detail-dialog"
+    @update:model-value="$emit('update:modelValue', $event)"
+    @open="resetPage"
+  >
+    <el-table
+      :data="pageRows"
+      border
+      max-height="60vh"
+      :show-overflow-tooltip="false"
+    >
+      <el-table-column prop="field" label="变更字段" min-width="180" />
+      <el-table-column
+        prop="before"
+        label="变更前"
+        min-width="360"
+        class-name="change-record-detail-value"
+      />
+      <el-table-column
+        prop="after"
+        label="变更后"
+        min-width="500"
+        class-name="change-record-detail-value"
+      />
+    </el-table>
+    <el-empty v-if="!total" description="暂无变更内容" :image-size="60" />
+    <div class="change-record-detail-dialog__pager">
+      <el-pagination
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        background
+        :total="total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+      />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="$emit('update:modelValue', false)">关闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'ChangeRecordDetailDialog',
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    rows: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      currentPage: 1,
+      pageSize: 10,
+    };
+  },
+  computed: {
+    total() {
+      return this.rows.length;
+    },
+    pageRows() {
+      const start = (this.currentPage - 1) * this.pageSize;
+      return this.rows.slice(start, start + this.pageSize);
+    },
+  },
+  watch: {
+    rows() {
+      const maxPage = Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
+      if (this.currentPage > maxPage) this.currentPage = 1;
+    },
+  },
+  methods: {
+    resetPage() {
+      this.currentPage = 1;
+      this.pageSize = 10;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.change-record-detail-dialog__pager {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+
+:deep(.change-record-detail-value .cell) {
+  white-space: pre-wrap;
+  word-break: break-word;
+  overflow: visible;
+  text-overflow: clip;
+  line-height: 1.6;
+}
+</style>
diff --git a/src/views/business/components/master-order-detail.vue b/src/views/business/components/master-order-detail.vue
index 730fe09..fa4d120 100644
--- a/src/views/business/components/master-order-detail.vue
+++ b/src/views/business/components/master-order-detail.vue
@@ -1,7 +1,17 @@
 <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)">{{
+            statusName(master.businessStatus)
+          }}</el-tag>
+          <el-tag v-if="transportFlowLabel" type="primary" class="transport-flow-tag">{{
+            transportFlowLabel
+          }}</el-tag>
+        </div>
+      </div>
       <dl class="detail-meta">
         <div>
           <dt>客户</dt>
@@ -132,6 +142,7 @@ export default {
     dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
   },
   async mounted() {
+    if (!this.id) return;
     this.loading = true;
     try {
       const res = await api.getDetail(this.id);
@@ -282,8 +293,36 @@ export default {
 <style scoped lang="scss">
 .master-detail { padding-bottom: 20px; color: #303133; }
 .detail-overview, .execution-detail-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
-.detail-heading { display: flex; align-items: center; justify-content: space-between; padding: 18px 24px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
-.transport-flow-tag { margin-left: 8px; }
+.detail-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;
+  }
+
+  :deep(.el-tag) {
+    height: 28px;
+    padding: 0 12px;
+    border: 0;
+    border-radius: 8px;
+    font-size: 13px;
+    line-height: 28px;
+  }
+}
+.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; } }
 .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; } }
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 5584569..019a265 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -295,6 +295,7 @@ export default {
   },
   methods: {
     async load() {
+      if (!this.id) return;
       this.loading = true;
       try {
         const res = await api.getDetail(this.id);
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 461d885..21143b6 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -1774,12 +1774,17 @@
             <div class="waybill-manage-page__waybill-heading">
               <strong>运单详情</strong>
               <span>{{ detailRow.waybillNo || '-' }}</span>
-              <span class="detail-status-text status-text-success">{{
-                displayStatus(detailRow, 'businessStatus')
-              }}</span>
-              <span class="detail-status-text detail-transport-type">
-                {{ getTransportTypeLabel(waybillTransportMode(detailRow)) || '-' }}
-              </span>
+              <el-tag :type="statusTagType(detailRow.businessStatus)">
+                {{ displayStatus(detailRow, 'businessStatus') }}
+              </el-tag>
+              <el-tag type="primary">
+                {{
+                  detailRow.transportTypeName ||
+                  getTransportTypeLabel(detailRow.transportType) ||
+                  waybillTransportMode(detailRow) ||
+                  '-'
+                }}
+              </el-tag>
               <el-link
                 v-if="detailRow.id"
                 class="waybill-manage-page__waybill-route-change-link"
@@ -2184,7 +2189,11 @@
                     />
                   </div>
                 </el-tab-pane>
-                <el-tab-pane label="司机上传" name="driverUpload">
+                <el-tab-pane
+                  v-if="waybillDriverUploads.length"
+                  label="司机上传"
+                  name="driverUpload"
+                >
                   <div
                     v-loading="waybillPunchRecordsLoading"
                     class="waybill-manage-page__driver-upload-grid"
@@ -2201,11 +2210,6 @@
                         {{ photo.label || '凭证' }}
                       </div>
                     </div>
-                    <el-empty
-                      v-if="!waybillPunchRecordsLoading && !waybillDriverUploads.length"
-                      description="暂无司机上传数据"
-                      :image-size="50"
-                    />
                   </div>
                 </el-tab-pane>
               </el-tabs>
@@ -5265,7 +5269,9 @@ export default {
         : defaultText;
     },
     statusTagType(status) {
-      if ([1, 'pending', 'processing', 'approved', 'change_approved'].includes(status)) {
+      if (
+        [1, 'pending', 'processing', 'running', 'approved', 'change_approved'].includes(status)
+      ) {
         return 'success';
       }
       if ([2, 'cancelled', 'withdrawn', 'draft'].includes(status)) {
@@ -9763,6 +9769,15 @@ export default {
     strong {
       font-size: 20px;
     }
+
+    :deep(.el-tag) {
+      height: 28px;
+      padding: 0 12px;
+      border: 0;
+      border-radius: 8px;
+      font-size: 13px;
+      line-height: 28px;
+    }
   }
 
   &__waybill-route-change-link {
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 2cf10ff..a0d860c 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -966,44 +966,10 @@
       @close="attachmentImagePreviewVisible = false"
     />
 
-    <el-dialog
+    <change-record-detail-dialog
       v-model="detailChangeRecordVisible"
-      title="变更记录详情"
-      append-to-body
-      destroy-on-close
-      width="1100px"
-      top="10px"
-      class="contract-change-record-detail-dialog"
-    >
-      <div v-if="detailChangeRecord" class="contract-change-record-detail-meta">
-        <span>经办人：{{ detailChangeRecord.handlerUserName || '-' }}</span>
-        <span>变更类型：{{ detailChangeRecord.changeType || '-' }}</span>
-        <span>状态：{{ detailChangeRecord.statusName || detailChangeRecord.status || '-' }}</span>
-      </div>
-      <el-table :data="detailChangeRecordDetailRows" border :show-overflow-tooltip="false">
-        <el-table-column prop="field" label="变更字段" min-width="180" />
-        <el-table-column
-          prop="before"
-          label="变更前"
-          min-width="360"
-          class-name="contract-change-record-detail-value"
-        />
-        <el-table-column
-          prop="after"
-          label="变更后"
-          min-width="500"
-          class-name="contract-change-record-detail-value"
-        />
-      </el-table>
-      <el-empty
-        v-if="!detailChangeRecordDetailRows.length"
-        description="暂无变更内容"
-        :image-size="60"
-      />
-      <template #footer>
-        <el-button type="primary" @click="detailChangeRecordVisible = false">关闭</el-button>
-      </template>
-    </el-dialog>
+      :rows="detailChangeRecordDetailRows"
+    />
 
     <billing-plan-editor
       v-model="detailBillingPlanBox"
@@ -1042,6 +1008,7 @@ import { getToken } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import ContractAttachmentSection, {
   attachmentName as sharedAttachmentName,
   attachmentUrl as sharedAttachmentUrl,
@@ -1194,7 +1161,14 @@ const attachmentViewerPlugins = [
 
 export default {
   name: 'ContractManage',
-  components: { ContractAttachmentSection, BillingPlanEditor, ElImageViewer, OpenFileViewer, PdfPreview },
+  components: {
+    ContractAttachmentSection,
+    BillingPlanEditor,
+    ChangeRecordDetailDialog,
+    ElImageViewer,
+    OpenFileViewer,
+    PdfPreview,
+  },
   data() {
     return {
       api,
@@ -2969,25 +2943,6 @@ export default {
   word-break: break-word;
 }
 
-.contract-change-record-detail-meta {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px 32px;
-  margin-bottom: 16px;
-  color: #606266;
-}
-
-:deep(.contract-change-record-detail-dialog .el-dialog__body) {
-  max-height: 65vh;
-  overflow: auto;
-  padding-top: 12px;
-}
-
-:deep(.contract-change-record-detail-dialog .contract-change-record-detail-value .cell) {
-  white-space: pre-wrap;
-  word-break: break-all;
-}
-
 :global(.avue--collapse .contract-manage-page__footer) {
   left: 60px;
 }
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index c970611..b42f4a3 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -395,14 +395,8 @@
             <div class="loading-detail__summary">
               <div class="loading-detail__heading">配载单详情</div>
               <div>{{ dialogForm.loadingNo || '-' }}</div>
-              <div>
-                <el-tag :type="detailStatusType" class="status-text">{{
-                  statusText(dialogForm)
-                }}</el-tag>
-              </div>
-              <div>
-                <el-tag type="warning">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag>
-              </div>
+              <el-tag :type="detailStatusType">{{ statusText(dialogForm) }}</el-tag>
+              <el-tag type="primary">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag>
             </div>
             <div class="loading-detail__task-row">
               <div class="loading-detail__field">
@@ -1683,11 +1677,12 @@ export default {
       const typeMap = {
         pending: 'success',
         running: 'success',
-        completed: 'info',
+        processing: 'success',
+        completed: 'primary',
         cancelled: 'info',
-        draft: 'warning',
+        draft: 'info',
       };
-      return typeMap[this.dialogForm.businessStatus] || 'info';
+      return typeMap[this.dialogForm.businessStatus] || 'warning';
     },
     taskSummary() {
       return (
@@ -3604,8 +3599,17 @@ export default {
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-    gap: 24px;
+    gap: 12px;
     padding: 4px 0 16px;
+
+    :deep(.el-tag) {
+      height: 28px;
+      padding: 0 12px;
+      border: 0;
+      border-radius: 8px;
+      font-size: 13px;
+      line-height: 28px;
+    }
   }
   .loading-detail__heading {
     font-size: 20px;
diff --git a/src/views/business/master-order.vue b/src/views/business/master-order.vue
index 4a7a506..5642ebf 100644
--- a/src/views/business/master-order.vue
+++ b/src/views/business/master-order.vue
@@ -132,7 +132,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-if="mode === 'detail'" :id="routeId" />
     <el-dialog v-model="confirm.visible" title="提示" width="400px"
       ><span>{{ confirm.message }}</span
       ><template #footer
@@ -153,6 +153,10 @@ export default {
   components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
   data() {
     return {
+      // 实例创建时锁定所属路由。keep-alive 缓存后 $route 会变成其它页面，
+      // 不能再用全局 query.mode / query.id 决定本页形态，否则打开「新增项目管理」
+      //（mode=add 且无 id）会落入详情分支并请求缺少 id 的详情接口。
+      routePathLocked: this.$route.path,
       searchExpanded: false,
       loading: false,
       records: [],
@@ -180,10 +184,15 @@ export default {
     };
   },
   computed: {
+    isOwnedRoute() {
+      return this.$route.path === this.routePathLocked;
+    },
     mode() {
+      if (!this.isOwnedRoute) return 'list';
       return this.$route.query.mode || 'list';
     },
     routeId() {
+      if (!this.isOwnedRoute) return '';
       return this.$route.query.id;
     },
     masterEditorTitle() {
@@ -194,6 +203,7 @@ export default {
     '$route.query': {
       immediate: true,
       handler() {
+        if (!this.isOwnedRoute) return;
         this.syncTagTitle();
         if (this.mode === 'list') this.load();
       },
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index abcac61..8b61737 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -196,7 +196,7 @@
           <el-form-item label="项目编号" prop="projectCode">
             <el-input
               v-model="form.projectCode"
-              placeholder="请输入"
+              :placeholder="dialogType === 'add' ? '若不填写，系统自动生成' : '请输入'"
               :disabled="dialogType === 'edit'"
             />
           </el-form-item>
@@ -703,6 +703,7 @@
             label="变更内容"
             min-width="180"
             align="center"
+            :show-overflow-tooltip="false"
           >
             <template #default="{ row }">
               <el-tooltip placement="top" :show-after="200">
@@ -730,43 +731,10 @@
           </el-table-column>
         </el-table>
 
-        <el-dialog
+        <change-record-detail-dialog
           v-model="changeRecordDetailVisible"
-          title="变更记录详情"
-          append-to-body
-          destroy-on-close
-          width="1100px"
-          top="10px"
-          class="project-change-record-detail-dialog"
-        >
-          <div v-if="changeRecordDetail" class="project-change-record-detail-meta">
-            <span>变更日期：{{ changeRecordDetail.changeDate || '-' }}</span>
-            <span>变更账号：{{ changeRecordDetail.handler || '-' }}</span>
-          </div>
-          <el-table :data="changeRecordDetailRows" border :show-overflow-tooltip="false">
-            <el-table-column prop="field" label="变更字段" min-width="180" />
-            <el-table-column
-              prop="before"
-              label="变更前"
-              min-width="360"
-              class-name="project-change-record-detail-value"
-            />
-            <el-table-column
-              prop="after"
-              label="变更后"
-              min-width="500"
-              class-name="project-change-record-detail-value"
-            />
-          </el-table>
-          <el-empty
-            v-if="!changeRecordDetailRows.length"
-            description="暂无变更内容"
-            :image-size="60"
-          />
-          <template #footer>
-            <el-button type="primary" @click="changeRecordDetailVisible = false">关闭</el-button>
-          </template>
-        </el-dialog>
+          :rows="changeRecordDetailRows"
+        />
 
         <template v-if="isChangeDialog">
           <div class="dialog-section-title">变更原因</div>
@@ -947,6 +915,7 @@ import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import PdfPreview from '@/components/pdf-preview/main.vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import {
   fallbackPlugin,
   imagePlugin,
@@ -1066,6 +1035,7 @@ export default {
   name: 'ProjectApply',
   components: {
     CustomerArchive: defineAsyncComponent(() => import('@/views/vehicle/customer-archive.vue')),
+    ChangeRecordDetailDialog,
     ElImageViewer,
     OpenFileViewer,
     PdfPreview,
@@ -1520,6 +1490,7 @@ export default {
         this.fillDefaultUsers();
         return;
       }
+      if (!id) return;
       this.api.getDetail(id).then(res => {
         const detail = res.data.data || {};
         const isChange = type === 'change';
@@ -2999,27 +2970,6 @@ export default {
   }
 }
 
-:deep(.project-change-record-detail-dialog .el-dialog__body) {
-  max-height: 65vh;
-  overflow: auto;
-}
-
-:deep(.project-change-record-detail-dialog .project-change-record-detail-value .cell) {
-  white-space: pre-wrap;
-  word-break: break-word;
-  overflow: visible;
-  text-overflow: clip;
-  line-height: 1.6;
-}
-
-.project-change-record-detail-meta {
-  display: flex;
-  gap: 32px;
-  margin-bottom: 16px;
-  color: #606266;
-  font-size: 14px;
-}
-
 :global(.project-apply-dialog .el-dialog__body) {
   max-height: 76vh;
   overflow-y: auto;
diff --git a/src/views/business/temporary-credit-limit.vue b/src/views/business/temporary-credit-limit.vue
index fc66576..03c9aa0 100644
--- a/src/views/business/temporary-credit-limit.vue
+++ b/src/views/business/temporary-credit-limit.vue
@@ -610,7 +610,12 @@ export default {
       return value;
     },
     applyDetail(detail) {
-      this.form = { ...detail };
+      this.form = {
+        ...detail,
+        projectFundLimit: this.blankSentinelAmount(detail.projectFundLimit),
+        usedFundLimit: this.blankSentinelAmount(detail.usedFundLimit),
+        remainingFundLimit: this.blankSentinelAmount(detail.remainingFundLimit),
+      };
       this.selectedProjectId = detail.projectId || '';
       this.attachmentRows = this.parseJsonArray(detail.attachmentsJson);
       this.selectedAttachments = [];
@@ -620,6 +625,9 @@ export default {
       const { projectQuotaInfoTitle, temporaryCreditInfoTitle, ...payload } = row || {};
       return {
         ...payload,
+        projectFundLimit: this.toOptionalAmount(payload.projectFundLimit),
+        usedFundLimit: this.toOptionalAmount(payload.usedFundLimit),
+        remainingFundLimit: this.toOptionalAmount(payload.remainingFundLimit),
         applyLimit: payload.applyLimit === '' ? '' : Number(payload.applyLimit),
         attachmentsJson: JSON.stringify(this.attachmentRows),
       };
@@ -765,8 +773,8 @@ export default {
         projectName: project.projectName || '',
         projectCode: project.projectCode || '',
         undertakeDeptName: project.undertakeDeptName || '',
-        projectFundLimit: project.fundLimit || project.projectFundLimit || 0,
-        usedFundLimit: project.usedFundLimit || 0,
+        projectFundLimit: this.blankSentinelAmount(project.fundLimit ?? project.projectFundLimit),
+        usedFundLimit: this.blankSentinelAmount(project.usedFundLimit),
       });
       this.form.remainingFundLimit = this.calculateRemainingFundLimit();
       getProjectDetail(project.id).then(res => {
@@ -774,18 +782,32 @@ export default {
         Object.assign(this.form, {
           projectCode: detail.projectCode || this.form.projectCode,
           undertakeDeptName: detail.undertakeDeptName || this.form.undertakeDeptName,
-          projectFundLimit:
-            detail.fundLimit ?? detail.projectFundLimit ?? this.form.projectFundLimit,
-          usedFundLimit: detail.usedFundLimit ?? this.form.usedFundLimit,
+          projectFundLimit: this.blankSentinelAmount(
+            detail.fundLimit ?? detail.projectFundLimit ?? this.form.projectFundLimit
+          ),
+          usedFundLimit: this.blankSentinelAmount(
+            detail.usedFundLimit ?? this.form.usedFundLimit
+          ),
         });
         this.form.remainingFundLimit = this.calculateRemainingFundLimit();
       });
     },
+    blankSentinelAmount(value) {
+      if (value === undefined || value === null || value === '') return '';
+      return Number(value) === -1 ? '' : value;
+    },
+    toOptionalAmount(value) {
+      const amount = this.blankSentinelAmount(value);
+      return amount === '' ? null : amount;
+    },
     calculateRemainingFundLimit() {
-      const total = Number(this.form.projectFundLimit);
-      const used = Number(this.form.usedFundLimit);
-      if (!Number.isFinite(total) || !Number.isFinite(used)) return '';
-      return Math.round((total - used + Number.EPSILON) * 100) / 100;
+      const total = this.blankSentinelAmount(this.form.projectFundLimit);
+      const used = this.blankSentinelAmount(this.form.usedFundLimit);
+      if (total === '' || used === '') return '';
+      const totalAmount = Number(total);
+      const usedAmount = Number(used);
+      if (!Number.isFinite(totalAmount) || !Number.isFinite(usedAmount)) return '';
+      return Math.round((totalAmount - usedAmount + Number.EPSILON) * 100) / 100;
     },
     handleAmountInput(value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index c2ecc5e..9977172 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -850,35 +850,10 @@
     </template>
   </el-dialog>
 
-  <el-dialog
+  <change-record-detail-dialog
     v-model="adjustChangeRecordVisible"
-    title="变更记录详情"
-    append-to-body
-    destroy-on-close
-    width="1100px"
-    top="10px"
-    class="pre-settlement-change-record-detail-dialog"
-  >
-    <div v-if="adjustChangeRecord" class="pre-settlement-change-record-detail-meta">
-      <span>变更日期：{{ adjustChangeRecord.changeTime || '-' }}</span>
-      <span>经办人：{{ adjustChangeRecord.operatorName || '-' }}</span>
-      <span>变更类型：{{ adjustChangeRecord.changeType || '-' }}</span>
-      <span>状态：已生效</span>
-    </div>
-    <el-table :data="adjustChangeRecordDetailRows" border :show-overflow-tooltip="false">
-      <el-table-column prop="field" label="变更字段" min-width="220" />
-      <el-table-column prop="before" label="变更前" min-width="330" />
-      <el-table-column prop="after" label="变更后" min-width="420" />
-    </el-table>
-    <el-empty
-      v-if="!adjustChangeRecordDetailRows.length"
-      description="暂无变更内容"
-      :image-size="60"
-    />
-    <template #footer>
-      <el-button type="primary" @click="adjustChangeRecordVisible = false">关闭</el-button>
-    </template>
-  </el-dialog>
+    :rows="adjustChangeRecordDetailRows"
+  />
 
   <el-dialog
     v-model="billingRuleDialog.visible"
@@ -950,6 +925,7 @@
 import { h } from 'vue';
 import { mapGetters } from 'vuex';
 import { InfoFilled } from '@element-plus/icons-vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
@@ -989,7 +965,7 @@ import * as XLSX from 'xlsx';
 
 export default {
   name: 'PreSettlementEditor',
-  components: { InfoFilled },
+  components: { InfoFilled, ChangeRecordDetailDialog },
   props: {
     modelValue: {
       type: Boolean,
@@ -2990,23 +2966,6 @@ export default {
   }
 }
 
-.pre-settlement-change-record-detail-meta {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px 32px;
-  margin-bottom: 16px;
-  color: #606266;
-}
-
-:deep(.pre-settlement-change-record-detail-dialog .el-dialog__body) {
-  padding-top: 12px;
-}
-
-:deep(.pre-settlement-change-record-detail-dialog .el-table .cell) {
-  white-space: pre-wrap;
-  word-break: break-all;
-}
-
 :deep(.pre-settlement-editor .el-dialog__body) {
   padding: 12px 16px;
 }
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index faf5b97..0c5b977 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -183,6 +183,7 @@
       title="变更记录详情"
       width="88%"
       append-to-body
+      align-center
     >
       <el-table v-loading="changeRecordsDialog.loading" :data="changeRows" border>
         <el-table-column type="index" label="序号" width="64" align="center" />
diff --git a/src/views/transportCapacity/vehicle.vue b/src/views/transportCapacity/vehicle.vue
index ac79d84..8025ff9 100644
--- a/src/views/transportCapacity/vehicle.vue
+++ b/src/views/transportCapacity/vehicle.vue
@@ -129,7 +129,7 @@
     >
       <el-form
         label-position="right"
-        label-width="calc(7em + 24px)"
+        label-width="calc(4em + 12px)"
         class="certification-audit archive-form"
       >
         <section-card title="基础信息">
@@ -145,19 +145,25 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="外廓尺寸（毫米）">
+              <el-form-item label="外廓尺寸">
                 <div class="dimension-group">
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">长</span>
-                    <span class="certification-audit__value">{{ auditValue('outerLength') }}</span>
+                    <span class="certification-audit__value">
+                      {{ auditValueWithUnit('outerLength', 'mm') }}
+                    </span>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">宽</span>
-                    <span class="certification-audit__value">{{ auditValue('outerWidth') }}</span>
+                    <span class="certification-audit__value">
+                      {{ auditValueWithUnit('outerWidth', 'mm') }}
+                    </span>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">高</span>
-                    <span class="certification-audit__value">{{ auditValue('outerHeight') }}</span>
+                    <span class="certification-audit__value">
+                      {{ auditValueWithUnit('outerHeight', 'mm') }}
+                    </span>
                   </div>
                 </div>
               </el-form-item>
@@ -165,13 +171,17 @@
           </el-row>
           <el-row :gutter="18">
             <el-col :span="6">
-              <el-form-item label="核定载质量（KG）">
-                <span class="certification-audit__value">{{ auditValue('approvedLoadKg') }}</span>
+              <el-form-item label="核定载质量">
+                <span class="certification-audit__value">
+                  {{ auditValueWithUnit('approvedLoadKg', 'KG') }}
+                </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="准牵引总质量（KG）">
-                <span class="certification-audit__value">{{ auditValue('tractionMassKg') }}</span>
+              <el-form-item label="准牵引总质量">
+                <span class="certification-audit__value">
+                  {{ auditValueWithUnit('tractionMassKg', 'KG') }}
+                </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -357,7 +367,7 @@
         v-if="showRejectReason"
         class="certification-audit__reason"
         label-position="right"
-        label-width="calc(7em + 24px)"
+        label-width="calc(4em + 24px)"
       >
         <el-form-item label="驳回原因" required>
           <el-input
@@ -427,7 +437,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="外廓尺寸（毫米）">
+              <el-form-item label="外廓尺寸">
                 <div class="dimension-group">
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">长</span>
@@ -436,7 +446,9 @@
                       inputmode="numeric"
                       placeholder="请输入"
                       @input="vehicleForm.outerLength = digitsOnly($event)"
-                    />
+                    >
+                      <template #suffix>mm</template>
+                    </el-input>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">宽</span>
@@ -445,7 +457,9 @@
                       inputmode="numeric"
                       placeholder="请输入"
                       @input="vehicleForm.outerWidth = digitsOnly($event)"
-                    />
+                    >
+                      <template #suffix>mm</template>
+                    </el-input>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">高</span>
@@ -454,7 +468,9 @@
                       inputmode="numeric"
                       placeholder="请输入"
                       @input="vehicleForm.outerHeight = digitsOnly($event)"
-                    />
+                    >
+                      <template #suffix>mm</template>
+                    </el-input>
                   </div>
                 </div>
               </el-form-item>
@@ -462,23 +478,27 @@
           </el-row>
           <el-row :gutter="18">
             <el-col :span="6">
-              <el-form-item label="核定载质量（KG）" prop="approvedLoadKg">
+              <el-form-item label="核定载质量" prop="approvedLoadKg">
                 <el-input
                   v-model="vehicleForm.approvedLoadKg"
                   inputmode="numeric"
                   placeholder="请输入"
                   @input="vehicleForm.approvedLoadKg = digitsOnly($event)"
-                />
+                >
+                  <template #suffix>KG</template>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="准牵引总质量（KG）" prop="tractionMassKg">
+              <el-form-item label="准牵引总质量" prop="tractionMassKg">
                 <el-input
                   v-model="vehicleForm.tractionMassKg"
                   inputmode="numeric"
                   placeholder="请输入"
                   @input="vehicleForm.tractionMassKg = digitsOnly($event)"
-                />
+                >
+                  <template #suffix>KG</template>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -896,6 +916,7 @@ export default {
       energyTypeOptions: ['柴油', '汽油', '新能源', '天然气'],
       baseRules: {
         organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
+        useDepartment: [{ required: true, message: '请选择使用部门', trigger: 'change' }],
         plateNo: [
           { required: true, message: '请输入车牌号', trigger: 'change' },
           { validator: this.validatePlateNo, trigger: 'change' },
@@ -986,6 +1007,9 @@ export default {
         if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
           this.vehicleForm.organizationName = this.getCurrentOrganizationName();
         }
+        if (this.vehicleBox && !this.vehicleForm.useDepartment) {
+          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
+        }
       });
     },
     flattenDeptOptions(tree = [], level = 0) {
@@ -1061,6 +1085,7 @@ export default {
       if (!row?.id) {
         this.vehicleForm = emptyForm();
         this.vehicleForm.organizationName = this.getCurrentOrganizationName();
+        this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         this.syncPlateNo(false);
         this.vehicleBox = true;
         return;
@@ -1070,6 +1095,9 @@ export default {
           ...emptyForm(),
           ...(res.data.data || {}),
         };
+        if (!this.vehicleForm.useDepartment) {
+          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
+        }
         this.splitPlateNo();
         this.syncPlateNo(false);
         this.vehicleBox = true;
@@ -1102,6 +1130,10 @@ export default {
       const value = this.certificationAuditForm[prop];
       return value === undefined || value === null || value === '' ? '-' : value;
     },
+    auditValueWithUnit(prop, unit) {
+      const value = this.auditValue(prop);
+      return value === '-' ? value : `${value}${unit}`;
+    },
     handleCertificationApprove() {
       auditCertification(this.certificationAuditForm.id, 1).then(() => {
         this.$message.success('认证已通过');
@@ -1693,11 +1725,19 @@ export default {
   }
 }
 
-.certification-audit,
+.certification-audit {
+  :deep(.el-form-item__label) {
+    flex: 0 0 calc(4em + 12px) !important;
+    width: calc(4em + 12px) !important;
+    max-width: calc(4em + 12px);
+  }
+}
+
 .certification-audit__reason {
   :deep(.el-form-item__label) {
-    flex: 0 0 calc(7em + 24px) !important;
-    width: calc(7em + 24px) !important;
+    flex: 0 0 calc(4em + 24px) !important;
+    width: calc(4em + 24px) !important;
+    max-width: calc(4em + 24px);
   }
 }
 
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 4c9baed..00088e8 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -144,9 +144,24 @@
         >
           撤回
         </el-link>
+        <el-link
+          type="primary"
+          v-if="
+            hasPermission('customer_type_re_cert') &&
+            row.approvalStatus === 'reviewing' &&
+            row.reviewStatus !== '已完成'
+          "
+          @click="openReview(row)"
+        >
+          复评
+        </el-link>
         <el-link
           type="success"
-          v-if="hasPermission('customer_archive_approve') && row.approvalStatus === 'reviewing'"
+          v-if="
+            hasPermission('customer_archive_approve') &&
+            row.approvalStatus === 'reviewing' &&
+            row.reviewStatus === '已完成'
+          "
           @click="handleApprove(row)"
         >
           审核通过
@@ -517,7 +532,7 @@
                   <span>{{ formatScoreValue(row.selfScore) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="复评得分" min-width="145" align="center">
+              <el-table-column v-if="archiveForm.id" label="复评得分" min-width="145" align="center">
                 <template #default="{ row }">
                   <span>{{ formatScoreValue(row.reviewScore) }}</span>
                 </template>
@@ -553,11 +568,18 @@
                   <span>{{ row.reviewStatus }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="135" fixed="right" align="center">
+              <el-table-column label="操作" width="160" fixed="right" align="center">
                 <template #default="{ row }">
                   <el-link type="primary" @click="openScore(row.__raw, row.__rawIndex)">
                     详情
                   </el-link>
+                  <el-link
+                    v-if="showScoreDelete"
+                    type="danger"
+                    @click="deleteScore(row.__rawIndex)"
+                  >
+                    删除
+                  </el-link>
                 </template>
               </el-table-column>
             </el-table>
@@ -876,43 +898,10 @@
         />
       </section-card>
 
-      <el-dialog
+      <change-record-detail-dialog
         v-model="changeRecordDetailVisible"
-        title="变更记录详情"
-        append-to-body
-        destroy-on-close
-        width="1100px"
-        top="10px"
-        class="change-record-detail-dialog"
-      >
-        <div v-if="changeRecordDetail" class="change-record-detail-meta">
-          <span>变更日期：{{ changeRecordDetail.changeTime || '-' }}</span>
-          <span>变更账号：{{ changeRecordDetail.changeUserName || '-' }}</span>
-        </div>
-        <el-table :data="changeRecordDetailRows" border :show-overflow-tooltip="false">
-          <el-table-column prop="field" label="变更字段" min-width="180" />
-          <el-table-column
-            prop="before"
-            label="变更前"
-            min-width="360"
-            class-name="change-record-detail-value"
-          />
-          <el-table-column
-            prop="after"
-            label="变更后"
-            min-width="500"
-            class-name="change-record-detail-value"
-          />
-        </el-table>
-        <el-empty
-          v-if="!changeRecordDetailRows.length"
-          description="暂无变更内容"
-          :image-size="60"
-        />
-        <template #footer>
-          <el-button type="primary" @click="changeRecordDetailVisible = false">关闭</el-button>
-        </template>
-      </el-dialog>
+        :rows="changeRecordDetailRows"
+      />
 
       <div class="archive-form__footer" v-if="!isPublicViewPage">
         <!-- 次要：独立页返回 / 只读关闭 / 弹窗取消 -->
@@ -1323,7 +1312,25 @@
                 class="score-detail-table score-detail-table--inline"
                 max-height="520"
               >
-                <el-table-column label="评分项目" prop="itemName" width="150" align="center" />
+                <el-table-column
+                  label="评分项目"
+                  width="150"
+                  align="center"
+                  :show-overflow-tooltip="false"
+                >
+                  <template #default="{ row: detail }">
+                    <el-tooltip
+                      :content="detail.itemName"
+                      placement="top"
+                      effect="dark"
+                      append-to="body"
+                      :show-after="200"
+                      :disabled="!detail.itemName"
+                    >
+                      <span class="score-item-name">{{ detail.itemName }}</span>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
                 <el-table-column label="评分标准" min-width="430">
                   <template #default="{ row: detail }">
                     <div class="score-standard-cell">
@@ -1333,6 +1340,7 @@
                           inputmode="decimal"
                           :disabled="readonly"
                           @input="value => handleScoreValueInput(detail, value)"
+                          @blur="handleScoreValueBlur(detail)"
                         >
                           <template #append>{{ getScoreRule(detail)?.changeUnit || '' }}</template>
                         </el-input>
@@ -1362,13 +1370,15 @@
                     <span>{{ formatScoreValue(getSignedScore(detail, 'selfScore')) }}分</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="复评得分" width="150" align="center">
+                <el-table-column v-if="!isNewScore" label="复评得分" width="150" align="center">
                   <template #default="{ row: detail }">
                     <el-input
                       v-model="detail.reviewScore"
                       maxlength="10"
                       inputmode="decimal"
-                      :disabled="readonly || !hasPermission('customer_type_re_cert')"
+                      :disabled="
+                        (!reviewMode && readonly) || !hasPermission('customer_type_re_cert')
+                      "
                       @input="value => handleScoreDetailScoreInput(detail, 'reviewScore', value)"
                     >
                       <template
@@ -1389,7 +1399,7 @@
             <template #default="{ row }">
               <span class="score-category-table__name">{{ row.categoryName }}</span>
               <span>自评：{{ getSignedScore(row, 'selfScore') }}分</span>
-              <span>复评：{{ getSignedScore(row, 'reviewScore') }}分</span>
+              <span v-if="!isNewScore">复评：{{ getSignedScore(row, 'reviewScore') }}分</span>
             </template>
           </el-table-column>
           <el-table-column width="60" align="center">
@@ -1463,12 +1473,15 @@
           <div class="score-detail-dialog__total">
             <span>总分合计</span>
             <span>自评：{{ formatScoreValue(currentScore.selfScore) }}分</span>
-            <span>复评：{{ formatScoreValue(currentScore.reviewScore) }}分</span>
+            <span v-if="!isNewScore">复评：{{ formatScoreValue(currentScore.reviewScore) }}分</span>
           </div>
           <el-button @click="scoreBox = false">取消</el-button>
-          <el-button type="primary" plain v-if="!readonly" @click="saveScoreDetail">保存</el-button>
+          <el-button v-if="isNewScore" type="primary" @click="submitSelfScore">提交自评</el-button>
+          <el-button type="primary" plain v-if="!readonly && !isNewScore" @click="saveScoreDetail">
+            保存
+          </el-button>
           <el-button
-            v-if="!readonly && hasPermission('customer_type_re_cert')"
+            v-if="!isNewScore && (!readonly || reviewMode) && hasPermission('customer_type_re_cert')"
             type="primary"
             @click="confirmReviewScore"
           >
@@ -1523,6 +1536,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import SectionCard from '@/components/section-card/main.vue';
 import PdfPreview from '@/components/pdf-preview/main.vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 
 const createTimeRangeMap = {
   createTimeRange: ['createTimeStart', 'createTimeEnd'],
@@ -1538,6 +1552,7 @@ const qualificationViewerPlugins = [
 export default {
   components: {
     SectionCard,
+    ChangeRecordDetailDialog,
     ArrowRight,
     ElImageViewer,
     OpenFileViewer,
@@ -1631,6 +1646,8 @@ export default {
       receiptBox: false,
       invoiceBox: false,
       readonly: false,
+      reviewMode: false,
+      listActivated: false,
       originalAccessType: '',
       activeTab: 'scores',
       archiveForm: this.emptyArchive(),
@@ -1825,7 +1842,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 280,
+        menuWidth: 320,
         column: [
           {
             label: '客商编号',
@@ -2019,10 +2036,20 @@ export default {
     this.initBusinessDictionaries();
     this.initScoreQuantificationOptions();
     if (this.isArchivePage) {
-      const readonly = this.$route.query.view === '1' || this.$route.query.view === 'true';
+      this.reviewMode = this.$route.query.review === '1';
+      const readonly =
+        this.$route.query.view === '1' || this.$route.query.view === 'true' || this.reviewMode;
       this.openArchive(this.$route.query.id ? { id: this.$route.query.id } : null, readonly);
     }
   },
+  activated() {
+    if (this.isArchivePage || this.isPublicViewPage) return;
+    if (!this.listActivated) {
+      this.listActivated = true;
+      return;
+    }
+    this.onLoad(this.page, this.query);
+  },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     isAdmin() {
@@ -2108,6 +2135,7 @@ export default {
       return ids.join(',');
     },
     dialogTitle() {
+      if (this.reviewMode) return '客商复评';
       if (this.readonly) return '查看客商档案';
       return this.archiveForm.id ? '编辑客商档案' : '新增客商档案';
     },
@@ -2151,6 +2179,14 @@ export default {
     scoreList() {
       return this.archiveForm.scores || [];
     },
+    showScoreDelete() {
+      if (this.readonly) return false;
+      const status = this.archiveForm.approvalStatus || 'draft';
+      return status === 'draft' || status === 'rejected';
+    },
+    isNewScore() {
+      return this.scoreRecordIndex < 0 && !this.reviewMode;
+    },
     scorePageCount() {
       return Math.max(Math.ceil(this.scoreList.length / this.scorePage.pageSize), 1);
     },
@@ -3962,6 +3998,12 @@ export default {
         query: { id: row.id, name: '查看客商档案', view: '1' },
       });
     },
+    openReview(row) {
+      this.$router.push({
+        path: '/vehicle/customer-archive/form',
+        query: { id: row.id, name: '客商复评', review: '1' },
+      });
+    },
     closeArchive() {
       if (this.isPublicViewPage) return;
       this.archiveBox = false;
@@ -3993,6 +4035,7 @@ export default {
           if (this.isPublicViewPage) this.ensurePublicViewOptions(this.archiveForm);
           this.archiveBox = true;
           this.loadChangeRecords();
+          if (this.reviewMode) this.openReviewScore();
         })
           .catch(() => {
             this.archiveBox = true;
@@ -4034,14 +4077,15 @@ export default {
       this.invoiceForm = this.emptyInvoice();
       this.$refs.archiveForm?.clearValidate();
     },
-    // 客商材料不做提交校验，仅在页面上提示未上传项
-    validateFormalForApproval(archive) {
-      if (archive.accessType !== 'formal') return true;
-      const hasCompletedScore = (archive.scores || []).some(
-        item => item.selfStatus === '已完成' || item.reviewStatus === '已完成' || item.finalScore
-      );
-      if (!hasCompletedScore) {
-        this.$message.warning('正式客商提交审核前必须完成信用评分');
+    // 客商材料不做提交校验，仅在页面上提示未上传项。提交审批前必须完成自评，且评分记录只能有一条。
+    validateScoreForApproval(archive) {
+      const scores = archive.scores || [];
+      if (scores.length > 1) {
+        this.$message.warning('评分记录只能有一条');
+        return false;
+      }
+      if (scores.length !== 1 || scores[0].selfStatus !== '已完成') {
+        this.$message.warning('提交审批前必须完成自评');
         return false;
       }
       return true;
@@ -4151,7 +4195,7 @@ export default {
         const archive = this.normalizeArchive();
         // 仅提交时落变更记录；保存不记录
         archive.recordChange = true;
-        if (!this.validateFormalForApproval(archive)) return;
+        if (!this.validateScoreForApproval(archive)) return;
         submit(archive).then(res => {
           const data = res.data.data;
           const id = (data && typeof data === 'object' ? data.id : data) || this.archiveForm.id;
@@ -4189,9 +4233,21 @@ export default {
         approvalStatus,
       }).then(() => submitApproval(id));
     },
+    openReviewScore() {
+      const scores = this.archiveForm.scores || [];
+      if (!scores.length) {
+        this.$message.warning('暂无评分记录，无法复评');
+        return;
+      }
+      this.$nextTick(() => this.openScore(scores[0], 0));
+    },
     addScore() {
+      if ((this.archiveForm.scores || []).length) {
+        this.$message.warning('请勿重复添加');
+        return;
+      }
       this.scoreRecordIndex = -1;
-      this.currentScore = this.normalizeScore({});
+      this.currentScore = this.normalizeScore({ applyCreditLimit: '' });
       this.scoreAttachmentFiles = [];
       this.expandedScoreCategoryKeys = [];
       this.scoreBox = true;
@@ -4273,7 +4329,7 @@ export default {
             JSON.stringify(
               (item.options || []).map(option => ({
                 label: option.label || option.optionName || option.value,
-                value: option.value || option.optionName || option.label,
+                value: option.value ?? option.optionName ?? option.label,
                 score: option.score,
                 changeType: option.changeType,
                 changeValue: option.changeValue,
@@ -4363,20 +4419,21 @@ export default {
           const isScoreOption = item.changeType || item.changeValue || item.changeUnit;
           const changeLabel = item.changeType === 'decrease' ? '每减少' : '每增加';
           const scoreLabel = item.scoreType === 'subtract' ? '减' : '加';
+          const rawScore = item.score;
           const generatedLabel = isScoreOption
             ? `${changeLabel}${item.changeValue || ''}${item.changeUnit || ''}${scoreLabel}${
-                item.score || ''
+                this.isBlankScore(rawScore) ? '' : rawScore
               }分`
             : '';
           const label = item.label || item.optionName || item.value || generatedLabel;
           return {
             ...item,
             label,
-            value: item.value || item.optionName || item.label || generatedLabel,
+            value: item.value ?? item.optionName ?? item.label ?? generatedLabel,
             score:
-              item.scoreType === 'subtract' && item.score !== undefined
-                ? -Math.abs(Number(item.score))
-                : item.score,
+              item.scoreType === 'subtract' && !this.isBlankScore(rawScore)
+                ? -Math.abs(Number(rawScore))
+                : rawScore,
           };
         });
       if (Array.isArray(value)) return normalize(value);
@@ -4440,23 +4497,35 @@ export default {
       const valid = increase ? input >= base : input <= base;
       if (!valid) {
         detail.selfScore = '';
-        this.$message.warning(`输入值${increase ? '不能小于' : '不能大于'}基准数值${base}`);
         this.calculateScore(this.currentScore);
         return;
       }
       detail.selfScore = this.getScoreTypeCalculatedScore(detail);
       this.calculateScore(this.currentScore);
     },
+    handleScoreValueBlur(detail) {
+      const normalized = String(detail.scoreInput ?? '').trim();
+      if (!normalized || normalized === '-' || normalized === '.') return;
+      const rule = this.getScoreRule(detail);
+      const base = Number(detail.baseValue);
+      const input = Number(normalized);
+      if (!rule || !Number.isFinite(base) || !Number.isFinite(input)) return;
+      const increase = rule.changeType !== 'decrease';
+      const valid = increase ? input >= base : input <= base;
+      if (!valid) {
+        this.$message.warning(`输入值${increase ? '不能小于' : '不能大于'}基准数值${base}`);
+      }
+    },
     scoreOptionChange(detail, optionValue) {
       const option = this.parseScoreOptions(detail.optionsJson).find(
         item => item.value === optionValue
       );
-      const score = Number(option?.score || 0);
-      detail.selfScore = score;
+      const rawScore = option?.score;
+      detail.selfScore = this.isBlankScore(rawScore) ? 0 : Number(rawScore);
       this.calculateScore(this.currentScore);
     },
     handleScoreDetailScoreInput(detail, prop, value) {
-      const normalized = String(value || '')
+      const normalized = String(value ?? '')
         .replace(/[^\d.]/g, '')
         .replace(/^\./, '')
         .replace(/(\..*)\./g, '$1')
@@ -4588,8 +4657,7 @@ export default {
         sumScore(plusDetails, 'reviewScore') -
         sumScore(minusDetails, 'reviewScore');
       const hasReviewScore = details.some(
-        item =>
-          item.reviewScore !== undefined && item.reviewScore !== null && item.reviewScore !== ''
+        item => !this.isBlankScore(item.reviewScore)
       );
       const finalScore = hasReviewScore ? reviewScore : selfScore;
       const fullMark = this.getScoreFullMark(details);
@@ -4609,13 +4677,17 @@ export default {
       }
       return score;
     },
+    isBlankScore(value) {
+      return value === undefined || value === null || String(value).trim() === '';
+    },
     hasIncompleteBasicScoreDetail(details = []) {
       return this.getScoreCategoryDetailsByList(details, 'basic').some(item => {
         if (this.isScoreTypeDetail(item)) {
           const input = String(item.scoreInput ?? '').trim();
-          return !input || !Number.isFinite(Number(input)) || item.selfScore === '';
+          const inputBlank = input === '' || input === '-' || input === '.';
+          return inputBlank || !Number.isFinite(Number(input)) || this.isBlankScore(item.selfScore);
         }
-        return !item.selectedOption;
+        return this.isBlankScore(item.selectedOption);
       });
     },
     finishScore(score) {
@@ -4632,10 +4704,13 @@ export default {
       score.reviewStatus = '已完成';
       this.$message.success('评分已完成');
     },
-    saveScoreDetail() {
+    saveScoreDetail(successMessage) {
       if (!this.validateScoreForm(false)) return;
       this.currentScore.attachments = JSON.parse(JSON.stringify(this.scoreAttachmentFiles || []));
       this.currentScore.proofAttachments = this.stringifyAttachments(this.scoreAttachmentFiles);
+      this.currentScore.selfStatus = this.hasIncompleteBasicScoreDetail(this.currentScore.details)
+        ? '未完成'
+        : '已完成';
       this.calculateScore(this.currentScore);
       const score = JSON.parse(JSON.stringify(this.currentScore));
       if (this.scoreRecordIndex > -1) {
@@ -4647,23 +4722,62 @@ export default {
       this.syncArchiveCreditFromScores();
       this.activeTab = 'scores';
       this.scoreBox = false;
-      this.saveScoreArchive();
-    },
-    saveScoreArchive() {
-      if (!this.archiveForm.id) {
-        this.$message.success('评分记录已添加，请保存客商档案后生效');
-        return;
+      const pending = this.saveScoreArchive(successMessage);
+      if (this.reviewMode && successMessage && pending && pending.then) {
+        pending.then(() => this.closeArchive());
       }
-      submit(this.normalizeArchive()).then(() => {
-        this.$message.success('评分记录已保存');
+      return pending;
+    },
+    deleteScore(index) {
+      this.$confirm('确定删除该评分记录?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          if (!Array.isArray(this.archiveForm.scores)) this.archiveForm.scores = [];
+          this.archiveForm.scores.splice(index, 1);
+          if (this.scoreRecordIndex === index) {
+            this.scoreBox = false;
+          } else if (this.scoreRecordIndex > index) {
+            this.scoreRecordIndex -= 1;
+          }
+          const latestScore = this.getLatestCreditScore(this.archiveForm.scores);
+          if (latestScore) {
+            this.syncArchiveCreditFromScores();
+          } else {
+            this.archiveForm.customerLevel = '';
+            this.archiveForm.maxCreditLimit = '';
+            this.archiveForm.applyCreditLimit = '';
+          }
+          this.handleScoreCurrentChange(this.scorePage.currentPage);
+          this.saveScoreArchive('评分记录已删除', '评分记录已删除，请保存客商档案后生效');
+        })
+        .catch(() => {});
+    },
+    saveScoreArchive(
+      successMessage = '评分记录已保存',
+      draftMessage = '评分记录已添加，请保存客商档案后生效'
+    ) {
+      if (!this.archiveForm.id) {
+        this.$message.success(draftMessage);
+        return Promise.resolve();
+      }
+      return submit(this.normalizeArchive()).then(() => {
+        this.$message.success(successMessage);
       });
     },
+    submitSelfScore() {
+      if (!this.validateScoreForm(true)) return;
+      this.currentScore.selfStatus = '已完成';
+      this.currentScore.reviewStatus = '未完成';
+      this.saveScoreDetail('自评已提交');
+    },
     confirmReviewScore() {
       if (!this.validateScoreForm(true)) return;
       this.currentScore.selfStatus = '已完成';
       this.currentScore.reviewStatus = '已完成';
-      this.saveScoreDetail();
-      this.$message.success('复评确认成功');
+      this.saveScoreDetail('复评确认成功');
     },
     validateScoreForm(requireComplete) {
       if (!this.currentScore.scoreDate) {
@@ -4701,7 +4815,7 @@ export default {
         if (
           item.reviewScore === undefined ||
           item.reviewScore === null ||
-          item.reviewScore === ''
+          String(item.reviewScore).trim() === ''
         ) {
           return false;
         }
@@ -4718,7 +4832,7 @@ export default {
         return false;
       }
       if (requireComplete && this.hasIncompleteBasicScoreDetail(this.currentScore.details)) {
-        this.$message.warning('请完整填写基础得分项评分明细');
+        this.$message.warning('请完整填写所有基础项目后再提交自评');
         return false;
       }
       return true;
@@ -4773,7 +4887,7 @@ export default {
       getDetail(row.id).then(res => {
         const archive = this.normalizeDetail(res.data.data);
         archive.qualificationAttachments = archive.qualificationAttachments || '';
-        if (!this.validateFormalForApproval(archive)) return;
+        if (!this.validateScoreForApproval(archive)) return;
         this.$confirm('是否提交客商准入审批?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -5260,10 +5374,16 @@ export default {
   }
 
   :deep(.el-table__body td) {
-    //min-height: 112px;
     color: #303133;
   }
 
+  :deep(.score-item-name) {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
   :deep(.el-select),
   :deep(.el-input),
   :deep(.el-select) {
@@ -5446,27 +5566,6 @@ export default {
   word-break: break-word;
 }
 
-:deep(.change-record-detail-dialog .el-dialog__body) {
-  max-height: 65vh;
-  overflow: auto;
-}
-
-:deep(.change-record-detail-dialog .change-record-detail-value .cell) {
-  white-space: pre-wrap;
-  word-break: break-word;
-  overflow: visible;
-  text-overflow: clip;
-  line-height: 1.6;
-}
-
-.change-record-detail-meta {
-  display: flex;
-  gap: 32px;
-  margin-bottom: 16px;
-  color: #606266;
-  font-size: 14px;
-}
-
 .customer-archive-page.is-public-view {
   :deep(.archive-page-form .archive-form__footer) {
     left: 0;

From 6212d68a7761bf1a5ab8415a39a92c3c3115bc37 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 00:17:07 +0800
Subject: [PATCH 21/28] =?UTF-8?q?:sparkles:=20=E4=BB=98=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=A1=A8=E5=8D=95=E4=BC=98=E5=8C=96=E4=B8=8E=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8D=95=E8=BF=87=E6=BB=A4=EF=BC=8C=E5=B9=B6=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E7=9B=B8=E5=85=B3=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

进度预付仅可选预结算、尾款付款可选正式/预结算；同步收款账户、申请金额校验、关闭标签与费用明细残留等交互，并补充运单复制需求说明。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/api/payment/paymentApplication.js         |   2 +-
 .../components/waybill-import-dialog.vue      |  14 +-
 .../payment/payment-application-form.vue      | 671 ++++++++++++------
 src/views/payment/payment-application.vue     |   2 +-
 .../components/pre-settlement-editor.vue      |   3 +
 src/views/settlement/pre-settlement.vue       |   1 +
 .../settlement/receivable-payable-detail.vue  |  16 +-
 需求卡/运单管理需求卡.md                      |  11 +-
 8 files changed, 492 insertions(+), 228 deletions(-)

diff --git a/src/api/payment/paymentApplication.js b/src/api/payment/paymentApplication.js
index 7c48a0d..43e50e1 100644
--- a/src/api/payment/paymentApplication.js
+++ b/src/api/payment/paymentApplication.js
@@ -24,7 +24,7 @@ export const syncKingdeeBatch = ids =>
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },
   { label: '进度预付', value: 'progress_advance' },
-  { label: '结算付款', value: 'settlement_payment' },
+  { label: '尾款付款', value: 'settlement_payment' },
 ];
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index 8c750aa..c3452a9 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -113,6 +113,12 @@
           label="导入方式"
           width="100"
         />
+        <el-table-column
+          v-if="columnVisible.statusName"
+          prop="statusName"
+          label="状态"
+          width="100"
+        />
         <el-table-column
           v-if="columnVisible.createUserName"
           prop="createUserName"
@@ -121,12 +127,6 @@
         >
           <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"
@@ -621,8 +621,8 @@ const columnOptions = [
   { prop: 'carrierType', label: '承运类型' },
   { prop: 'waybillCount', label: '运单数' },
   { prop: 'importTypeName', label: '导入方式' },
-  { prop: 'createUserName', label: '创建人' },
   { prop: 'statusName', label: '状态' },
+  { prop: 'createUserName', label: '创建人' },
   { prop: 'createTime', label: '创建时间' },
   { prop: 'updateTime', label: '更新时间' },
 ];
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 7d68571..1c06624 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -22,24 +22,46 @@
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="付款类型" prop="paymentType"
-              ><el-select v-model="form.paymentType" :disabled="readonly" @change="handleTypeChange"
+              ><el-select
+                v-model="form.paymentType"
+                :disabled="readonly || paymentTypeLocked"
+                clearable
+                placeholder="请选择付款类型"
+                @change="handleTypeChange"
                 ><el-option
                   v-for="item in paymentTypeOptions"
                   :key="item.value"
                   v-bind="item" /></el-select></el-form-item
           ></el-col>
-          <el-col v-if="form.paymentType !== 'project_advance'" :span="6"
-            ><el-form-item label="结算单号" prop="referenceId"
-              ><el-input
-                v-model="referenceLabel"
-                readonly
-                :disabled="readonly"
-                placeholder="请选择预结算/正式结算单"
-                ><template #append
-                  ><el-button :disabled="readonly" @click="openReference">选择</el-button></template
-                ></el-input
-              ></el-form-item
-            ></el-col
+          <el-col v-if="isSettlementRelatedType" :span="6"
+            ><el-form-item label="结算单号" prop="referenceId">
+              <div class="payment-form-page__settlement-nos">
+                <template v-if="referenceSettlementLinks.length">
+                  <el-link
+                    v-for="item in referenceSettlementLinks"
+                    :key="`${item.id || item.settlementNo}`"
+                    type="primary"
+                    @click="openSettlementDetail(item)"
+                  >
+                    {{ item.settlementNo }}
+                  </el-link>
+                </template>
+                <el-input
+                  v-else
+                  v-model="referenceLabel"
+                  readonly
+                  :disabled="readonly"
+                  placeholder="请选择预结算/正式结算单"
+                />
+                <el-button
+                  v-if="!readonly"
+                  class="payment-form-page__settlement-select-btn"
+                  @click="openReference"
+                >
+                  选择
+                </el-button>
+              </div>
+            </el-form-item></el-col
           >
           <el-col :span="6">
             <el-form-item label="所属项目">
@@ -85,19 +107,13 @@
               <el-input v-else v-model="form.contractName" disabled />
             </el-form-item>
           </el-col>
-          <el-col v-if="form.paymentType !== 'project_advance'" :span="6"
+          <el-col v-if="isSettlementRelatedType" :span="6"
             ><el-form-item label="结算金额" prop="settlementAmount"
-              ><el-input-number
-                v-model="form.settlementAmount"
-                :disabled="readonly"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                style="width: 100%" /></el-form-item
+              ><el-input :model-value="formatMoney(form.settlementAmount)" disabled /></el-form-item
           ></el-col>
-          <el-col v-if="form.paymentType !== 'project_advance'" :span="6"
+          <el-col v-if="isSettlementRelatedType" :span="6"
             ><el-form-item label="可付款金额"
-              ><el-input v-model="form.payableAmount" disabled /></el-form-item
+              ><el-input :model-value="formatMoney(form.payableAmount)" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="票款类型"
@@ -124,8 +140,11 @@
                 :disabled="readonly"
                 :min="0"
                 :precision="2"
+                :step="0.01"
                 :controls="false"
-                style="width: 100%" /></el-form-item
+                style="width: 100%"
+                value-on-clear="0"
+              /></el-form-item
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="付款方式" prop="paymentMethod"
@@ -150,34 +169,39 @@
                 ></el-input></el-form-item
           ></el-col>
           <el-col :span="6"
-            ><el-form-item label="收款方"
-              ><el-input v-model="form.payeeName" disabled /></el-form-item
+            ><el-form-item label="付款方"
+              ><el-input v-model="form.payerName" disabled /></el-form-item
           ></el-col>
           <el-col :span="6">
-            <el-form-item label="收款账号" prop="receiptAccountId">
-              <el-input v-if="readonly" v-model="form.bankAccount" disabled></el-input>
+            <el-form-item label="收款方" prop="receiptAccountId">
+              <el-input v-if="readonly" v-model="form.payeeName" disabled />
               <el-select
                 v-else
                 v-model="form.receiptAccountId"
-                :disabled="!form.payeeName"
                 :loading="receiptAccountLoading"
+                :disabled="!contractPartyBName"
                 filterable
                 clearable
-                placeholder="请选择收款方的收款账号"
-                no-data-text="该收款方未维护可用收款信息"
-                @change="handleReceiptAccountChange"
-                ><el-option
+                placeholder="请选择收款方"
+                no-data-text="合同乙方客商未维护可用收款信息"
+                @change="handlePayeeReceiptChange"
+              >
+                <el-option
                   v-for="item in receiptAccountOptions"
                   :key="item.id"
-                  :label="receiptAccountLabel(item)"
+                  :label="payeeReceiptLabel(item)"
                   :value="item.id"
                 />
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6"
+            ><el-form-item label="收款账号"
+              ><el-input v-model="form.bankAccount" disabled placeholder="选择收款方后自动带出" /></el-form-item
+          ></el-col>
           <el-col :span="6"
             ><el-form-item label="开户银行"
-              ><el-input v-model="form.bankName" disabled /></el-form-item
+              ><el-input v-model="form.bankName" disabled placeholder="选择收款方后自动带出" /></el-form-item
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="申请人"
@@ -198,30 +222,50 @@
           ></el-col>
         </el-row>
       </section-card>
-      <section-card v-if="form.paymentType !== 'project_advance'" title="结算信息">
+      <section-card v-if="isSettlementRelatedType" title="结算信息">
         <el-table :data="settlementRows" border
-          ><el-table-column type="index" label="序号" width="70" /><el-table-column
-            prop="settlementNo"
-            label="结算单号"
-            min-width="150" /><el-table-column
-            prop="settlementAmount"
-            label="结算总金额"
-            min-width="130" /><el-table-column
-            prop="payableAmount"
-            label="可付款金额"
-            min-width="130" /><el-table-column
-            prop="paymentRatio"
-            label="付款比例（%）"
-            min-width="110" /><el-table-column
-            prop="appliedAmount"
-            label="付款金额"
-            min-width="130"
-        /></el-table>
+          ><el-table-column type="index" label="序号" width="70" />
+          <el-table-column prop="settlementNo" label="结算单号" min-width="150">
+            <template #default="{ row }">
+              <el-link
+                v-if="row.settlementNo"
+                type="primary"
+                @click="openSettlementDetail(row)"
+              >
+                {{ row.settlementNo }}
+              </el-link>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="settlementAmount" label="结算总金额" min-width="130">
+            <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
+          </el-table-column>
+          <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
+            <template #default="{ row }">{{ formatMoney(row.payableAmount) }}</template>
+          </el-table-column>
+          <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="110">
+            <template #default="{ row }">{{ formatMoney(row.paymentRatio) }}</template>
+          </el-table-column>
+          <el-table-column prop="appliedAmount" label="付款金额" min-width="130">
+            <template #default="{ row }">{{ formatMoney(row.appliedAmount) }}</template>
+          </el-table-column>
+        </el-table>
       </section-card>
-      <section-card v-if="form.paymentType !== 'project_advance'" title="发票信息">
+      <section-card v-if="isSettlementRelatedType" title="发票信息">
         <el-table :data="form.invoices" border>
           <el-table-column type="index" label="序号" width="70" />
-          <el-table-column prop="settlementNo" label="结算单号" min-width="120" />
+          <el-table-column prop="settlementNo" label="结算单号" min-width="120">
+            <template #default="{ row }">
+              <el-link
+                v-if="row.settlementNo"
+                type="primary"
+                @click="openSettlementDetail({ settlementNo: row.settlementNo })"
+              >
+                {{ row.settlementNo }}
+              </el-link>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="invoiceNo" label="发票号" min-width="140" />
           <el-table-column prop="invoiceDate" label="开票日期" min-width="150" />
           <el-table-column prop="invoiceType" label="发票类型" min-width="130" />
@@ -355,7 +399,7 @@
         <el-button v-if="!readonly" type="primary" plain @click="syncPaymentRecords"
           >同步</el-button
         >
-        <el-button v-if="!readonly && canSave" type="primary" plain @click="saveDraft(false)"
+        <el-button v-if="!readonly && canSave" type="primary" plain @click="saveDraft()"
           >保存</el-button
         >
         <el-button
@@ -369,7 +413,7 @@
     </el-form>
     <el-dialog
       v-model="referenceVisible"
-      :title="form.paymentType === 'project_advance' ? '选择项目合同' : '选择结算单'"
+      :title="referenceDialogTitle"
       width="80%"
       ><el-table
         v-if="form.paymentType === 'project_advance'"
@@ -429,7 +473,7 @@
           </el-form>
         </div>
         <el-tabs v-model="referenceTab" @tab-change="handleReferenceTabChange">
-          <el-tab-pane label="正式结算单" name="formal">
+          <el-tab-pane v-if="canSelectFormalSettlement" label="正式结算单" name="formal">
             <el-table
               v-loading="formalPage.loading"
               :data="formalRows"
@@ -440,7 +484,9 @@
               <el-table-column prop="formalSettlementNo" label="结算单号" />
               <el-table-column prop="projectName" label="所属项目" />
               <el-table-column prop="contractName" label="合同名称" />
-              <el-table-column prop="settlementAmount" label="结算金额" />
+              <el-table-column prop="settlementAmount" label="结算金额">
+                <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                   <el-link type="primary" @click.stop="selectFormal(row)">选择</el-link>
@@ -459,13 +505,20 @@
               />
             </div>
           </el-tab-pane>
-          <el-tab-pane label="预结算单" name="pre">
-            <el-table v-loading="prePage.loading" :data="preRows" border @selection-change="preSelection = $event">
+          <el-tab-pane v-if="canSelectPreSettlement" label="预结算单" name="pre">
+            <el-table
+              v-loading="prePage.loading"
+              :data="preRows"
+              border
+              @selection-change="preSelection = $event"
+            >
               <el-table-column type="selection" width="50" />
               <el-table-column prop="preSettlementNo" label="结算单号" />
               <el-table-column prop="projectName" label="所属项目" />
               <el-table-column prop="contractName" label="合同名称" />
-              <el-table-column prop="settlementAmount" label="结算金额" />
+              <el-table-column prop="settlementAmount" label="结算金额">
+                <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                   <el-link type="primary" @click.stop="selectPre(row)">选择</el-link>
@@ -486,7 +539,7 @@
           </el-tab-pane>
         </el-tabs></div
       >
-      <template v-if="form.paymentType !== 'project_advance'" #footer>
+      <template v-if="isSettlementRelatedType" #footer>
         <div class="payment-form-page__reference-footer">
           <el-button @click="referenceVisible = false">取消</el-button>
           <el-button
@@ -646,7 +699,7 @@ const MATERIAL_TYPE_MAP = {
 const emptyForm = () => ({
   id: null,
   paymentNo: '',
-  paymentType: 'project_advance',
+  paymentType: '',
   settlementId: null,
   settlementIds: [],
   preSettlementId: null,
@@ -735,6 +788,7 @@ export default {
       },
       receiptAccountOptions: [],
       receiptAccountLoading: false,
+      contractPartyBName: '',
       firstContractPayment: false,
       contractSignatureFileAvailable: false,
       contractPaymentRatioLimit: null,
@@ -777,12 +831,16 @@ export default {
       ],
       rules: {
         paymentType: [{ required: true, message: '请选择付款类型' }],
-        referenceId: [{ validator: this.validateReference, trigger: 'change' }],
+        referenceId: [
+          { required: true, validator: this.validateReference, trigger: 'change' },
+        ],
         paymentMethod: [{ required: true, message: '请选择付款方式' }],
-        receiptAccountId: [{ required: true, message: '请选择收款账号', trigger: 'change' }],
+        receiptAccountId: [{ required: true, message: '请选择收款方', trigger: 'change' }],
         billLedgerId: [{ validator: this.validateBillLedger, trigger: 'change' }],
         settlementAmount: [{ validator: this.validateSettlementAmount, trigger: 'change' }],
-        appliedAmount: [{ validator: this.validateAppliedAmount, trigger: 'change' }],
+        appliedAmount: [
+          { required: true, validator: this.validateAppliedAmount, trigger: 'change' },
+        ],
       },
     };
   },
@@ -801,6 +859,31 @@ export default {
       const code = this.recordId ? 'payment_application_edit' : 'payment_application_add';
       return this.hasPermission(code);
     },
+    paymentTypeLocked() {
+      if (this.readonly || this.recordId) return false;
+      const queryType = String(this.$route.query.paymentType || '');
+      if (['progress_advance', 'settlement_payment'].includes(queryType)) return true;
+      if (this.transferPayload?.sourcePreSettlements?.length) return true;
+      if (this.transferPayload?.sourceFormalSettlements?.length) return true;
+      return false;
+    },
+    isSettlementRelatedType() {
+      return ['progress_advance', 'settlement_payment'].includes(this.form.paymentType);
+    },
+    canSelectPreSettlement() {
+      // 进度预付仅预结算；尾款付款可正式/预结算
+      return ['progress_advance', 'settlement_payment'].includes(this.form.paymentType);
+    },
+    canSelectFormalSettlement() {
+      return this.form.paymentType === 'settlement_payment';
+    },
+    referenceDialogTitle() {
+      if (this.form.paymentType === 'project_advance') return '选择项目合同';
+      if (this.canSelectPreSettlement && this.canSelectFormalSettlement) return '选择结算单';
+      if (this.canSelectPreSettlement) return '选择预结算单';
+      if (this.canSelectFormalSettlement) return '选择正式结算单';
+      return '选择结算单';
+    },
     billPayment() {
       return this.isBillPaymentMethod();
     },
@@ -821,6 +904,24 @@ export default {
       }
       return this.form.settlementNo || this.form.preSettlementNo || '';
     },
+    referenceSettlementLinks() {
+      if (this.referenceRows.length) {
+        return this.referenceRows.filter(item => item.settlementNo);
+      }
+      const label = this.referenceLabel;
+      if (!label) return [];
+      return String(label)
+        .split(/[、,，]/)
+        .map(item => item.trim())
+        .filter(Boolean)
+        .map(settlementNo => ({
+          settlementNo,
+          id: this.form.preSettlementId
+            ? this.form.preSettlementId || this.form.preSettlementIds?.[0]
+            : this.form.settlementId || this.form.settlementIds?.[0],
+          referenceType: this.form.preSettlementId ? 'pre' : 'formal',
+        }));
+    },
     settlementRows() {
       if (this.referenceRows.length) {
         return this.referenceRows.map(item => ({
@@ -924,6 +1025,10 @@ export default {
       return this.permission?.[code] !== false;
     },
     validateReference(rule, value, callback) {
+      if (!this.isSettlementRelatedType) {
+        callback();
+        return;
+      }
       if (
         this.form.paymentType === 'progress_advance' &&
         !this.form.preSettlementId &&
@@ -932,8 +1037,14 @@ export default {
         callback(new Error('请选择预结算单'));
         return;
       }
-      if (this.form.paymentType === 'settlement_payment' && !this.form.settlementId) {
-        callback(new Error('请选择正式结算单'));
+      if (
+        this.form.paymentType === 'settlement_payment' &&
+        !this.form.settlementId &&
+        !this.form.settlementIds?.length &&
+        !this.form.preSettlementId &&
+        !this.form.preSettlementIds?.length
+      ) {
+        callback(new Error('请选择结算单'));
         return;
       }
       callback();
@@ -956,8 +1067,12 @@ export default {
     validateAppliedAmount(rule, value, callback) {
       const amount = Number(value);
       const payableAmount = Number(this.form.payableAmount || 0);
-      if (!Number.isFinite(amount) || amount < 0) {
-        callback(new Error('申请付款金额不能小于0'));
+      if (value === null || value === undefined || value === '' || !Number.isFinite(amount)) {
+        callback(new Error('请填写申请付款金额'));
+        return;
+      }
+      if (amount <= 0) {
+        callback(new Error('申请付款金额必须大于0'));
         return;
       }
       if (
@@ -1110,7 +1225,7 @@ export default {
           await this.loadProjectOptions();
           await this.loadContractOptions(this.form.projectId);
         }
-        await this.loadReceiptAccountOptions(false);
+        await this.fillBillTypeFromContract(this.form.contractId);
         await this.loadAttachmentRuleData(await this.loadCurrentSettlementDetails());
         if (this.billPayment) await this.loadBillOptions('', data.billLedgerId);
       } else {
@@ -1131,9 +1246,30 @@ export default {
     },
     initialAddPaymentType() {
       const paymentType = String(this.$route.query.paymentType || '');
-      return api.paymentTypeOptions.some(item => item.value === paymentType)
-        ? paymentType
-        : 'project_advance';
+      return api.paymentTypeOptions.some(item => item.value === paymentType) ? paymentType : '';
+    },
+    async fillBillTypeFromContract(contractId, autoSelectDefault = false) {
+      if (!contractId) {
+        this.form.billType = '';
+        this.contractPartyBName = '';
+        this.receiptAccountOptions = [];
+        return;
+      }
+      try {
+        const data = this.unwrapData(await getContractDetail(contractId));
+        this.form.billType = data?.settlementMode || '';
+        // 付款方取合同甲方名称
+        const partyA = data?.partyA || data?.payerName || '';
+        if (partyA) {
+          this.form.payerName = partyA;
+        }
+        this.contractPartyBName = String(data?.partyB || data?.payeeName || '').trim();
+        await this.loadReceiptAccountOptions(autoSelectDefault);
+      } catch (error) {
+        this.form.billType = '';
+        this.contractPartyBName = '';
+        this.receiptAccountOptions = [];
+      }
     },
     async loadPaymentMethodOptions() {
       try {
@@ -1186,29 +1322,20 @@ export default {
       const fallbackRows = this.transferPayload?.sourcePreSettlements || [];
       const ids = this.getTransferredPreSettlementIds();
       if (!ids.length) {
-        this.applyTransferredPreSettlements(fallbackRows);
-        await Promise.all([
-          this.loadReceiptAccountOptions(),
-          this.loadAttachmentRuleData(fallbackRows),
-        ]);
+        await this.applyTransferredPreSettlements(fallbackRows);
+        await this.loadAttachmentRuleData(fallbackRows);
         return;
       }
       try {
         const responses = await Promise.all(ids.map(id => preApi.getDetail(id)));
         const rows = responses.map(response => this.unwrapData(response)).filter(item => item?.id);
         const sourceRows = rows.length ? rows : fallbackRows;
-        this.applyTransferredPreSettlements(sourceRows);
-        await Promise.all([
-          this.loadReceiptAccountOptions(),
-          this.loadAttachmentRuleData(sourceRows),
-        ]);
+        await this.applyTransferredPreSettlements(sourceRows);
+        await this.loadAttachmentRuleData(sourceRows);
       } catch (error) {
         if (fallbackRows.length) {
-          this.applyTransferredPreSettlements(fallbackRows);
-          await Promise.all([
-            this.loadReceiptAccountOptions(),
-            this.loadAttachmentRuleData(fallbackRows),
-          ]);
+          await this.applyTransferredPreSettlements(fallbackRows);
+          await this.loadAttachmentRuleData(fallbackRows);
           return;
         }
         this.$message.error('预结算信息加载失败，请返回后重新发起预付申请');
@@ -1227,10 +1354,12 @@ export default {
           }
         })
       );
-      this.applyTransferredFormalSettlements(rows.filter(item => this.isValidReferenceId(item?.id)));
-      await Promise.all([this.loadReceiptAccountOptions(), this.loadAttachmentRuleData(rows)]);
+      await this.applyTransferredFormalSettlements(
+        rows.filter(item => this.isValidReferenceId(item?.id))
+      );
+      await this.loadAttachmentRuleData(rows);
     },
-    applyTransferredFormalSettlements(rows = []) {
+    async applyTransferredFormalSettlements(rows = []) {
       if (!rows.length) return;
       const contractIds = new Set(rows.map(item => String(item.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has('')) {
@@ -1281,10 +1410,10 @@ export default {
         contractNo: first.contractNo,
         contractName: first.contractName,
         payerName: first.payerName,
-        payeeName: first.payeeName,
+        payeeName: '',
         settlementAmount: Number(settlementAmount.toFixed(2)),
         payableAmount: Number(payableAmount.toFixed(2)),
-        billType: '正式结算单',
+        billType: '',
         paymentRatio,
         appliedAmount: Number(appliedAmount.toFixed(2)),
         invoices: rows.flatMap(item =>
@@ -1301,6 +1430,8 @@ export default {
           kingdeeBillNo: record.kingdeeBillNo || '',
         }))
       );
+      this.clearReceiptAccount();
+      await this.fillBillTypeFromContract(first.contractId, true);
       this.$nextTick(() => {
         this.amountSyncing = false;
         this.$refs.formRef?.clearValidate();
@@ -1309,9 +1440,11 @@ export default {
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
       const appliedAmount = Number(row.advanceAppliedAmount || row.appliedPaymentAmount || 0);
+      const isPre = Boolean(row.preSettlementNo || row.preSettlementId || row.referenceType === 'pre');
       return {
         id: row.preSettlementId || row.settlementId || row.id,
         settlementNo: row.preSettlementNo || row.formalSettlementNo || row.settlementNo || '',
+        referenceType: isPre ? 'pre' : 'formal',
         settlementAmount,
         payableAmount:
           row.payableAmount === undefined || row.payableAmount === null
@@ -1365,7 +1498,7 @@ export default {
       });
       this.$message.success(`同步成功，已生成${recordCount}条付款记录`);
     },
-    applyTransferredPreSettlements(rows = []) {
+    async applyTransferredPreSettlements(rows = []) {
       if (!rows.length) return;
       const contractIds = new Set(rows.map(item => String(item.contractId || '')));
       if (contractIds.size > 1 || contractIds.has('')) {
@@ -1374,7 +1507,9 @@ export default {
       }
       const first = rows[0];
       this.form.invoices = [];
-      this.referenceRows = rows.map(item => this.createReferenceRow(item));
+      this.referenceRows = rows.map(item =>
+        this.createReferenceRow({ ...item, referenceType: 'pre' })
+      );
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1384,10 +1519,14 @@ export default {
         0
       );
       const paymentRatio = Number(this.form.paymentRatio || 0);
+      // 尾款付款场景下选择预结算单时保留尾款付款类型，不强制改为进度预付
+      const paymentType =
+        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
       this.amountSyncing = true;
       Object.assign(this.form, {
-        paymentType: 'progress_advance',
+        paymentType,
         settlementId: null,
+        settlementIds: [],
         settlementNo: '',
         preSettlementId: first.preSettlementId || first.id,
         preSettlementIds: rows.map(item => item.preSettlementId || item.id),
@@ -1403,13 +1542,15 @@ export default {
         contractNo: first.contractNo,
         contractName: first.contractName,
         payerName: first.payerName,
-        payeeName: first.payeeName,
+        payeeName: '',
         settlementAmount: Number(settlementAmount.toFixed(2)),
         payableAmount: Number(payableAmount.toFixed(2)),
-        billType: '预结算单',
+        billType: '',
         appliedAmount: Number(((settlementAmount * paymentRatio) / 100).toFixed(2)),
       });
       this.paymentRecords = [];
+      this.clearReceiptAccount();
+      await this.fillBillTypeFromContract(first.contractId, true);
       this.$nextTick(() => {
         this.amountSyncing = false;
         this.$refs.formRef?.clearValidate();
@@ -1722,14 +1863,6 @@ export default {
       }
       this.contractPaymentRatioExceeded = exceeded;
     },
-    notifyMissingAttachments() {
-      if (!this.missingAttachmentMaterials.length) return;
-      this.$message.warning(
-        `付款申请所需材料未上传，请核对：${this.missingAttachmentMaterials
-          .map(item => item.label)
-          .join('、')}`
-      );
-    },
     handleTypeChange() {
       this.form.invoices = [];
       this.paymentRecords = [];
@@ -1756,6 +1889,8 @@ export default {
       });
       this.referenceRows = [];
       this.contractOptions = [];
+      this.contractPartyBName = '';
+      this.receiptAccountOptions = [];
       this.clearReceiptAccount();
       this.loadAttachmentRuleData([]);
       if (this.form.paymentType === 'project_advance') this.loadProjectOptions();
@@ -1764,6 +1899,7 @@ export default {
       Object.assign(this.form, {
         receiptAccountId: null,
         receiptAccountName: '',
+        payeeName: '',
         bankName: '',
         bankAccount: '',
       });
@@ -1771,6 +1907,103 @@ export default {
     customerRecords(response) {
       return this.unwrapData(response)?.records || [];
     },
+    async loadReceiptAccountOptions(autoSelectDefault = true) {
+      const partyBName = String(this.contractPartyBName || '').trim();
+      const preserveCurrentValue = autoSelectDefault === false;
+      this.receiptAccountOptions = [];
+      this.payeeCustomerLevel = '';
+      if (!partyBName) {
+        if (!preserveCurrentValue) this.clearReceiptAccount();
+        return;
+      }
+      this.receiptAccountLoading = true;
+      try {
+        const [fullNameResponse, shortNameResponse] = await Promise.all([
+          getCustomerArchiveList(1, 20, {
+            fullName: partyBName,
+            approvalStatus: 'approved',
+            status: 1,
+          }),
+          getCustomerArchiveList(1, 20, {
+            shortName: partyBName,
+            approvalStatus: 'approved',
+            status: 1,
+          }),
+        ]);
+        const customers = [
+          ...this.customerRecords(fullNameResponse),
+          ...this.customerRecords(shortNameResponse),
+        ];
+        const customer = customers.find(
+          item => item.fullName === partyBName || item.shortName === partyBName
+        );
+        if (!customer?.id) {
+          if (!preserveCurrentValue) this.clearReceiptAccount();
+          return;
+        }
+        const detail = this.unwrapData(await getCustomerArchiveDetail(customer.id));
+        this.payeeCustomerLevel = detail.customerLevel || '';
+        this.receiptAccountOptions = (detail.receiptAccounts || [])
+          .filter(item => item.accountName || item.accountHolderName || item.bankAccount)
+          .map(item => ({
+            ...item,
+            id: String(item.id),
+          }));
+        const selected = this.receiptAccountOptions.find(
+          item => String(item.id) === String(this.form.receiptAccountId || '')
+        );
+        if (selected) {
+          this.applyReceiptAccount(selected);
+          return;
+        }
+        if (preserveCurrentValue) {
+          // 编辑回填时若选项已加载但暂未匹配到，保留已有展示字段
+          return;
+        }
+        this.clearReceiptAccount();
+        if (autoSelectDefault && !this.readonly) {
+          const defaultAccount =
+            this.receiptAccountOptions.find(item => Number(item.isDefault) === 1) ||
+            (this.receiptAccountOptions.length === 1 ? this.receiptAccountOptions[0] : null);
+          if (defaultAccount) this.applyReceiptAccount(defaultAccount);
+        }
+      } catch (error) {
+        if (!preserveCurrentValue) this.clearReceiptAccount();
+        this.$message.warning('合同乙方客商收款信息加载失败，请稍后重试');
+      } finally {
+        this.receiptAccountLoading = false;
+      }
+    },
+    payeeReceiptLabel(item) {
+      const name = item.accountName || item.accountHolderName || '未命名收款方';
+      return item.bankAccount ? `${name}（${item.bankAccount}）` : name;
+    },
+    receiptAccountLabel(item) {
+      return [item.accountName || item.accountHolderName, item.bankName, item.bankAccount]
+        .filter(Boolean)
+        .join('｜');
+    },
+    applyReceiptAccount(account) {
+      Object.assign(this.form, {
+        receiptAccountId: account.id,
+        receiptAccountName: account.accountName || account.accountHolderName || '',
+        payeeName: account.accountName || account.accountHolderName || '',
+        bankName: account.bankName || '',
+        bankAccount: account.bankAccount || '',
+      });
+      this.$nextTick(() => this.$refs.formRef?.validateField('receiptAccountId').catch(() => {}));
+    },
+    handlePayeeReceiptChange(id) {
+      const account = this.receiptAccountOptions.find(item => String(item.id) === String(id || ''));
+      if (account) {
+        this.applyReceiptAccount(account);
+        return;
+      }
+      this.clearReceiptAccount();
+    },
+    handleReceiptAccountChange(id) {
+      this.handlePayeeReceiptChange(id);
+    },
     async loadProjectOptions() {
       if (this.projectLoading) return;
       this.projectLoading = true;
@@ -1848,6 +2081,8 @@ export default {
           payerName: '',
           payeeName: '',
         });
+        this.contractPartyBName = '';
+        this.receiptAccountOptions = [];
         this.clearReceiptAccount();
         return;
       }
@@ -1855,97 +2090,18 @@ export default {
         contractNo: contract.contractNo || '',
         contractName: contract.contractName || '',
         payerName: contract.payerName || contract.partyA || '',
-        payeeName: contract.payeeName || contract.partyB || '',
+        payeeName: '',
         settlementAmount: 0,
         payableAmount: 0,
         billType: '',
       });
-      await Promise.all([this.loadReceiptAccountOptions(), this.loadAttachmentRuleData([])]);
-      if (this.billPayment) this.loadBillOptions();
-    },
-    async loadReceiptAccountOptions(autoSelectDefault = true) {
-      const payeeName = String(this.form.payeeName || '').trim();
-      const preserveCurrentValue = autoSelectDefault === false;
-      this.receiptAccountOptions = [];
-      this.payeeCustomerLevel = '';
-      if (!payeeName) {
-        if (!preserveCurrentValue) this.clearReceiptAccount();
-        return;
-      }
-      this.receiptAccountLoading = true;
-      try {
-        const [fullNameResponse, shortNameResponse] = await Promise.all([
-          getCustomerArchiveList(1, 20, {
-            fullName: payeeName,
-            approvalStatus: 'approved',
-            status: 1,
-          }),
-          getCustomerArchiveList(1, 20, {
-            shortName: payeeName,
-            approvalStatus: 'approved',
-            status: 1,
-          }),
-        ]);
-        const customers = [
-          ...this.customerRecords(fullNameResponse),
-          ...this.customerRecords(shortNameResponse),
-        ];
-        const customer = customers.find(
-          item => item.fullName === payeeName || item.shortName === payeeName
-        );
-        if (!customer?.id) {
-          if (!preserveCurrentValue) this.clearReceiptAccount();
-          return;
-        }
-        const detail = this.unwrapData(await getCustomerArchiveDetail(customer.id));
-        this.payeeCustomerLevel = detail.customerLevel || '';
-        this.receiptAccountOptions = (detail.receiptAccounts || []).map(item => ({
-          ...item,
-          id: String(item.id),
-        }));
-        const selected = this.receiptAccountOptions.find(
-          item => String(item.id) === String(this.form.receiptAccountId || '')
-        );
-        if (selected) {
-          this.applyReceiptAccount(selected);
-          return;
-        }
-        if (preserveCurrentValue) return;
-        this.clearReceiptAccount();
-        if (autoSelectDefault && !this.readonly) {
-          const defaultAccount =
-            this.receiptAccountOptions.find(item => Number(item.isDefault) === 1) ||
-            (this.receiptAccountOptions.length === 1 ? this.receiptAccountOptions[0] : null);
-          if (defaultAccount) this.applyReceiptAccount(defaultAccount);
-        }
-      } catch (error) {
-        if (!preserveCurrentValue) this.clearReceiptAccount();
-        this.$message.warning('收款方的客商收款信息加载失败，请稍后重试');
-      } finally {
-        this.receiptAccountLoading = false;
-      }
-    },
-    receiptAccountLabel(item) {
-      return [item.accountName || item.accountHolderName, item.bankName, item.bankAccount]
-        .filter(Boolean)
-        .join('｜');
-    },
-    applyReceiptAccount(account) {
-      Object.assign(this.form, {
-        receiptAccountId: account.id,
-        receiptAccountName: account.accountName || account.accountHolderName || '',
-        bankName: account.bankName || '',
-        bankAccount: account.bankAccount || '',
-      });
-      this.$nextTick(() => this.$refs.formRef?.validateField('receiptAccountId').catch(() => {}));
-    },
-    handleReceiptAccountChange(id) {
-      const account = this.receiptAccountOptions.find(item => String(item.id) === String(id || ''));
-      if (account) {
-        this.applyReceiptAccount(account);
-        return;
-      }
+      this.contractPartyBName = String(contract.partyB || contract.payeeName || '').trim();
       this.clearReceiptAccount();
+      await Promise.all([
+        this.fillBillTypeFromContract(contract.id, true),
+        this.loadAttachmentRuleData([]),
+      ]);
+      if (this.billPayment) this.loadBillOptions();
     },
     async handlePaymentMethodChange() {
       if (!this.billPayment) {
@@ -2056,7 +2212,13 @@ export default {
       }
     },
     loadSettlementReferences() {
-      return Promise.all([this.loadFormalReferences(), this.loadPreReferences()]);
+      const loaders = [];
+      if (this.canSelectFormalSettlement) loaders.push(this.loadFormalReferences());
+      if (this.canSelectPreSettlement) loaders.push(this.loadPreReferences());
+      if (!loaders.length) {
+        return Promise.all([this.loadFormalReferences(), this.loadPreReferences()]);
+      }
+      return Promise.all(loaders);
     },
     handleReferenceSearch() {
       this.formalPage.current = 1;
@@ -2088,6 +2250,8 @@ export default {
     },
     async openReference() {
       if (this.form.paymentType === 'project_advance') return;
+      // 进度预付仅预结算；尾款付款默认正式结算，也可切到预结算
+      this.referenceTab = this.canSelectFormalSettlement ? 'formal' : 'pre';
       this.referenceVisible = true;
       this.formalSelection = [];
       this.preSelection = [];
@@ -2095,6 +2259,57 @@ export default {
       this.prePage.current = 1;
       await this.loadSettlementReferences();
     },
+    async openSettlementDetail(row = {}) {
+      const settlementNo = String(row.settlementNo || '').trim();
+      const isPre =
+        row.referenceType === 'pre' ||
+        this.form.paymentType === 'progress_advance' ||
+        Boolean(this.form.preSettlementId || this.form.preSettlementNo);
+      let id =
+        row.id ||
+        row.preSettlementId ||
+        row.settlementId ||
+        (isPre
+          ? this.form.preSettlementId || this.form.preSettlementIds?.[0]
+          : this.form.settlementId || this.form.settlementIds?.[0]);
+      if (!id && settlementNo) {
+        const matched = this.referenceRows.find(
+          item => String(item.settlementNo || '').trim() === settlementNo
+        );
+        id = matched?.id;
+      }
+      if (!id && settlementNo) {
+        try {
+          const listApi = isPre ? preApi.getList : formalApi.getList;
+          const params = isPre
+            ? { preSettlementNo: settlementNo }
+            : { formalSettlementNo: settlementNo };
+          const data = this.unwrapData(await listApi(1, 10, params));
+          const matched = (data.records || []).find(item => {
+            const no = String(
+              item.preSettlementNo || item.formalSettlementNo || item.settlementNo || ''
+            ).trim();
+            return no === settlementNo;
+          });
+          id = matched?.id;
+        } catch (error) {
+          this.$message.error('结算单详情加载失败');
+          return;
+        }
+      }
+      if (!id) {
+        this.$message.warning(isPre ? '未找到对应的预结算单' : '未找到对应的正式结算单');
+        return;
+      }
+      this.$router.push({
+        path: isPre ? '/settlement/pre-settlement/form' : '/settlement/formal-settlement/form',
+        query: {
+          mode: 'view',
+          id,
+          name: isPre ? '查看预结算' : '查看正式结算',
+        },
+      });
+    },
     async selectContract(row) {
       this.referenceRows = [];
       this.form.invoices = [];
@@ -2109,14 +2324,17 @@ export default {
         contractNo: row.contractNo,
         contractName: row.contractName,
         payerName: row.payerName || row.partyA || '',
-        payeeName: row.payeeName || row.partyB || '',
+        payeeName: '',
         settlementAmount: 0,
         payableAmount: 0,
         appliedAmount: 0,
-        billType: '',
+        billType: row.settlementMode || '',
       });
       this.referenceVisible = false;
-      await Promise.all([this.loadReceiptAccountOptions(), this.loadAttachmentRuleData([])]);
+      await Promise.all([
+        this.fillBillTypeFromContract(row.id, true),
+        this.loadAttachmentRuleData([]),
+      ]);
       if (this.billPayment) this.loadBillOptions();
     },
     async selectFormal(row) {
@@ -2149,9 +2367,9 @@ export default {
         contractName: row.contractName,
         settlementAmount,
         payableAmount,
-        billType: '正式结算单',
+        billType: '',
         payerName: row.payerName,
-        payeeName: row.payeeName,
+        payeeName: '',
       });
       this.referenceVisible = false;
       this.refreshReferenceValidation();
@@ -2162,7 +2380,7 @@ export default {
       );
       this.paymentRecords = [];
       await Promise.all([
-        this.loadReceiptAccountOptions(),
+        this.fillBillTypeFromContract(row.contractId, true),
         this.loadAttachmentRuleData(detail?.id ? [detail] : []),
       ]);
       if (this.billPayment) this.loadBillOptions();
@@ -2180,28 +2398,33 @@ export default {
       }
       const validRows = rows.filter(row => this.isValidReferenceId(row.id));
       const details = await Promise.all(validRows.map(row => formalApi.getDetail(row.id)));
-      this.applyTransferredFormalSettlements(
+      await this.applyTransferredFormalSettlements(
         details.map((response, index) => ({ ...validRows[index], ...this.unwrapData(response) }))
       );
       this.referenceVisible = false;
     },
     async selectPre(row) {
       const validReferenceId = this.isValidReferenceId(row.id);
+      // 尾款付款选择预结算时保留尾款付款类型
+      const paymentType =
+        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
       const [amountResponse, detailResponse] = await Promise.all([
         validReferenceId
-          ? api.getReferenceAmount('progress_advance', row.id, this.form.id)
+          ? api.getReferenceAmount(paymentType, row.id, this.form.id)
           : Promise.resolve(null),
         validReferenceId ? preApi.getDetail(row.id) : Promise.resolve(null),
       ]);
       const amount = this.unwrapData(amountResponse) || {};
       const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
       const payableAmount = Number(amount.payableAmount ?? 0);
-      this.referenceRows = [this.createReferenceRow({ ...row, settlementAmount, payableAmount })];
+      this.referenceRows = [
+        this.createReferenceRow({ ...row, settlementAmount, payableAmount, referenceType: 'pre' }),
+      ];
       this.form.invoices = [];
       this.paymentRecords = [];
       this.clearReceiptAccount();
       Object.assign(this.form, {
-        paymentType: 'progress_advance',
+        paymentType,
         preSettlementId: row.id,
         preSettlementIds: [row.id],
         settlementId: null,
@@ -2217,15 +2440,15 @@ export default {
         contractName: row.contractName,
         settlementAmount,
         payableAmount,
-        billType: '预结算单',
+        billType: '',
         payerName: row.payerName,
-        payeeName: row.payeeName,
+        payeeName: '',
       });
       this.referenceVisible = false;
       this.refreshReferenceValidation();
       const detail = this.unwrapData(detailResponse);
       await Promise.all([
-        this.loadReceiptAccountOptions(),
+        this.fillBillTypeFromContract(row.contractId, true),
         this.loadAttachmentRuleData(detail?.id ? [detail] : []),
       ]);
       if (this.billPayment) this.loadBillOptions();
@@ -2239,7 +2462,7 @@ export default {
       }
       const validRows = rows.filter(row => this.isValidReferenceId(row.id));
       const details = await Promise.all(validRows.map(row => preApi.getDetail(row.id)));
-      this.applyTransferredPreSettlements(
+      await this.applyTransferredPreSettlements(
         details.map((response, index) => ({ ...validRows[index], ...this.unwrapData(response) }))
       );
       this.referenceVisible = false;
@@ -2384,13 +2607,13 @@ export default {
               })),
       };
     },
-    async saveDraft(validateMaterials = false) {
+    async saveDraft(options = {}) {
+      const showSuccess = options.showSuccess !== false;
       await this.$refs.formRef.validate();
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
         this.$message.warning('请选择所属项目');
         return false;
       }
-      if (validateMaterials) this.notifyMissingAttachments();
       try {
         this.validateInvoices();
         this.validatePaymentRecords();
@@ -2400,11 +2623,14 @@ export default {
       }
       const data = this.unwrapData(await api.save(this.payload()));
       this.form.id = data;
-      this.$message.success('保存成功');
+      if (showSuccess) {
+        this.$message.success('保存成功');
+      }
       return true;
     },
     async submitForm() {
-      const saved = await this.saveDraft(true);
+      // 提交前静默保存，避免同时弹出「保存成功」与材料缺失 toast
+      const saved = await this.saveDraft({ showSuccess: false });
       if (!saved) return;
       await api.submit({ id: this.form.id });
       await submitMkApprovalFlow({
@@ -2418,10 +2644,12 @@ export default {
     },
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
+      this.$router.$avueRouter?.closeTag?.();
       this.$router.push('/payment/payment-application');
     },
     formatMoney(value) {
-      return Number(value || 0).toFixed(2);
+      const amount = Number(value);
+      return Number.isFinite(amount) ? amount.toFixed(2) : '0.00';
     },
   },
 };
@@ -2431,6 +2659,21 @@ export default {
 .payment-form-page__form {
   padding-bottom: 72px;
 }
+.payment-form-page__settlement-nos {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+  width: 100%;
+  min-height: 32px;
+}
+.payment-form-page__settlement-nos :deep(.el-input) {
+  flex: 1;
+  min-width: 120px;
+}
+.payment-form-page__settlement-select-btn {
+  flex-shrink: 0;
+}
 .payment-form-page__reference-search {
   padding: 12px 12px 4px;
   margin-bottom: 8px;
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index c18379f..3013b4e 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -326,7 +326,7 @@ export default {
     openProjectAdvance() {
       this.$router.push({
         path: '/payment/payment-application/form',
-        query: { mode: 'add', paymentType: 'project_advance' },
+        query: { mode: 'add', paymentType: 'progress_advance' },
       });
     },
     openEdit(row) {
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 9977172..9c7cb11 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -66,6 +66,9 @@
                 <span v-else-if="field.prop === 'settlementType'" class="form-readonly">
                   {{ settlementTypeName }}
                 </span>
+                <span v-else-if="field.prop === 'preSettlementNo'" class="form-readonly">
+                  {{ form.preSettlementNo || (!form.id ? '系统自动生成' : '-') }}
+                </span>
                 <span v-else-if="field.prop === 'createTime'" class="form-readonly">
                   {{ formatCreateDate(form.createTime) }}
                 </span>
diff --git a/src/views/settlement/pre-settlement.vue b/src/views/settlement/pre-settlement.vue
index 56d0d6a..f393a14 100644
--- a/src/views/settlement/pre-settlement.vue
+++ b/src/views/settlement/pre-settlement.vue
@@ -497,6 +497,7 @@ export default {
         path: '/payment/payment-application/form',
         query: {
           mode: 'add',
+          paymentType: 'progress_advance',
           transferToken,
           preSettlementIds: sourcePreSettlements
             .map(row => row.preSettlementId)
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 0c5b977..c33c5c0 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -1198,10 +1198,24 @@ export default {
     await this.loadTable();
     await this.openRouteDetail();
   },
+  // 标签切走（keep-alive 缓存）或销毁时，收起 teleport/append-to-body 弹层，避免残留盖住其它页面
+  deactivated() {
+    this.closeInnerDialogs();
+  },
   beforeUnmount() {
-    this.clearAdjustCalculations();
+    this.closeInnerDialogs();
   },
   methods: {
+    closeInnerDialogs() {
+      this.closeDetailPanel();
+      this.closeAdjustPanel();
+      this.changeRecordsDialog.visible = false;
+      this.updateFeeDialog.visible = false;
+      this.transferDialog.visible = false;
+      this.generateDialog.visible = false;
+      this.previewDialog.visible = false;
+      this.generateContractDialog.visible = false;
+    },
     contractCategoryName(value) {
       return (
         this.contractCategoryOptions.find(item => String(item.value) === String(value))?.label ||
diff --git a/需求卡/运单管理需求卡.md b/需求卡/运单管理需求卡.md
index 5a1ad05..2c035f9 100644
--- a/需求卡/运单管理需求卡.md
+++ b/需求卡/运单管理需求卡.md
@@ -570,19 +570,22 @@
 
 - 功能点：
   - 任意状态的运单均支持复制。
-  - 复制后生成新的草稿运单，运单号重新生成。
-  - 复制时保留运单基础信息、货物信息、承运信息和过程配置相关信息，状态与过程记录重新初始化。
-  - 复制成功后跳转编辑页面。
+  - 复制后运单号重新生成，业务状态与原运单保持一致。
+  - 复制时保留运单基础信息、货物信息、承运信息和过程配置相关信息；过程打卡记录重新初始化。
+  - 若原运单为已完成，复制保存后按合同系统计费规则自动生成对应应收、应付明细。
+  - 复制成功后跳转编辑页面（独立表单模式）或刷新列表（弹窗模式）。
 
 - 异常与边界：
   - 原运单不存在时提示数据不存在。
   - 复制后名称、编号或关联字段触发唯一性校验时应重新处理。
   - 复制失败时不影响原运单数据。
+  - 合同未开启系统计费、无匹配计费方案或自有运输等场景下，按既有规则跳过对应应收/应付生成。
 
 - 反例：
   - 不允许复制后沿用原运单号。
-  - 不允许复制后直接生成进行中或已完成状态。
+  - 不允许复制后状态与原运单不一致。
   - 不允许复制后保留原过程节点完成记录。
+  - 不允许已完成运单复制成功后遗漏按规则应生成的应收应付明细。
 
 ---
 

From e2e2eb9a2fd79711efae8fd929af773a4ec515e7 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 14:49:09 +0800
Subject: [PATCH 22/28] =?UTF-8?q?:sparkles:=20=E5=AE=8C=E5=96=84=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=9B=9E=E5=A1=AB?=
 =?UTF-8?q?=E3=80=81=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8D=E4=B8=8E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=99=84=E4=BB=B6=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复上传成功后表格不回显，附件类型可切换，未匹配文件名默认其他文件；列表附件上传支持合同文件/其它附件。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../vehicle-attachment-upload/main.vue        | 107 ++++-
 .../contract-attachment-section.vue           | 445 +++++++++++-------
 src/views/business/contract-manage-change.vue |   3 -
 src/views/business/contract-manage.vue        | 106 ++++-
 4 files changed, 454 insertions(+), 207 deletions(-)

diff --git a/src/components/vehicle-attachment-upload/main.vue b/src/components/vehicle-attachment-upload/main.vue
index 436efec..81961de 100644
--- a/src/components/vehicle-attachment-upload/main.vue
+++ b/src/components/vehicle-attachment-upload/main.vue
@@ -212,7 +212,14 @@ export default {
         .filter(Boolean);
     },
     acceptText() {
-      return this.acceptedList.join(',');
+      return this.acceptedList
+        .map(item => {
+          const value = String(item).trim();
+          if (!value || value.includes('/') || value.startsWith('.')) return value;
+          return `.${value}`;
+        })
+        .filter(Boolean)
+        .join(',');
     },
     tipText() {
       return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
@@ -304,12 +311,22 @@ export default {
       });
     },
     handleSuccess(response, file, files) {
-      if (!response || response.success === false || (response.code && response.code !== 200)) {
+      const code = response?.code;
+      const codeInvalid = code !== undefined && code !== null && code !== '' && Number(code) !== 200;
+      if (!response || response.success === false || codeInvalid) {
         this.$message.error((response && response.msg) || '上传失败');
         return;
       }
-      this.emitUploadFiles(this.multiple ? files : [file]);
-      this.$emit('success', this.normalizeUploadFile(file));
+      if (file && !file.response) {
+        file.response = response;
+      }
+      const normalized = this.normalizeUploadFile(file, response);
+      if (!normalized.url) {
+        this.$message.error('上传成功但未返回文件地址');
+        return;
+      }
+      this.$emit('success', normalized);
+      this.emitUploadFiles(this.multiple ? files : [file], normalized);
       this.$message.success('上传成功');
     },
     handleChange(file, files) {
@@ -323,35 +340,89 @@ export default {
       this.emitUploadFiles(files);
       return true;
     },
-    emitUploadFiles(files) {
-      const list = files
-        .filter(file => file.status === 'success' || this.getFileUrl(file))
-        .map(this.normalizeUploadFile)
+    emitUploadFiles(files, preferredFile) {
+      const list = (files || [])
+        .filter(file => {
+          if (file?.status === 'fail') return false;
+          return (
+            file?.status === 'success' ||
+            this.getFileUrl(file) ||
+            file?.response?.data ||
+            file?.response?.link ||
+            file?.response
+          );
+        })
+        .map(file => this.normalizeUploadFile(file))
         .filter(item => item.url);
-      this.$emit('update:modelValue', list);
-      this.$emit('change', list);
+
+      if (preferredFile?.url) {
+        const exists = list.some(
+          item =>
+            (preferredFile.uid && item.uid && String(item.uid) === String(preferredFile.uid)) ||
+            item.url === preferredFile.url
+        );
+        if (!exists) list.push(preferredFile);
+      }
+
+      const current = this.parseValue(this.modelValue).map(item => ({
+        ...item,
+        url: this.getFileUrl(item),
+      }));
+      const merged = [...current];
+      list.forEach(file => {
+        const index = merged.findIndex(
+          item =>
+            (file.uid && item.uid && String(item.uid) === String(file.uid)) ||
+            (file.url && this.getFileUrl(item) === file.url)
+        );
+        if (index >= 0) merged.splice(index, 1, { ...merged[index], ...file });
+        else merged.push(file);
+      });
+
+      const result = merged.filter(item => this.getFileUrl(item));
+      this.$emit('update:modelValue', result);
+      this.$emit('change', result);
     },
-    normalizeUploadFile(file) {
-      const data = (file.response && file.response.data) || file.data || file;
-      const url = data.link || data.url || data.domain || file.url || '';
+    normalizeUploadFile(file, responseOverride) {
+      const response = responseOverride || file?.response;
+      let data = {};
+      if (response && typeof response === 'object') {
+        if (response.data && typeof response.data === 'object') {
+          data = response.data;
+        } else if (response.link || response.url || response.domain) {
+          data = response;
+        }
+      }
+      if (!data.link && !data.url && !data.domain) {
+        data = file?.data && typeof file.data === 'object' ? file.data : file || {};
+      }
+      const url =
+        data.link ||
+        data.url ||
+        data.domain ||
+        data.fileLink ||
+        data.fileUrl ||
+        file?.url ||
+        file?.link ||
+        '';
       const originalName =
         data.originalName ||
-        file.originalName ||
-        file.name ||
+        file?.originalName ||
+        file?.name ||
         data.name ||
         this.getFileName(url) ||
         '附件';
       const extension = this.getExtension({ name: originalName, url });
       return {
         ...data,
-        uid: file.uid || data.uid,
+        uid: file?.uid || data.uid,
         originalName,
         name: originalName,
         url,
         link: data.link || url,
-        size: data.size || data.attachSize || file.size || '',
+        size: data.size || data.attachSize || file?.size || '',
         extension,
-        mimeType: data.mimeType || data.contentType || file.raw?.type || MIME_MAP[extension] || '',
+        mimeType: data.mimeType || data.contentType || file?.raw?.type || MIME_MAP[extension] || '',
       };
     },
     handlePreview(file) {
diff --git a/src/views/business/components/contract-attachment-section.vue b/src/views/business/components/contract-attachment-section.vue
index 297b52c..10119b9 100644
--- a/src/views/business/components/contract-attachment-section.vue
+++ b/src/views/business/components/contract-attachment-section.vue
@@ -1,94 +1,102 @@
 <template>
-  <section
-    class="contract-manage-form__section contract-manage-form__section--panel contract-manage-form__section--attachment"
-  >
-    <div class="contract-manage-form__attachment-head">
-      <div class="dialog-section-title">{{ title }}</div>
-      <el-button type="primary" :disabled="!rows.length" @click="batchDownload">批量下载</el-button>
-    </div>
-    <el-table
-      :data="rows"
-      border
-      class="contract-manage-form__attachment-table"
-      @selection-change="selected = $event"
+  <div class="contract-attachment-section">
+    <section
+      v-if="!dialogOnly"
+      class="contract-manage-form__section contract-manage-form__section--panel contract-manage-form__section--attachment"
     >
-      <el-table-column v-if="!readonly" type="selection" width="55" align="center" />
-      <el-table-column type="index" label="序号" width="70" align="center" />
-      <el-table-column v-if="attachmentType" label="附件类型" min-width="160" align="center">
-        <template #default="{ row }">
-          <span v-if="readonly || isRowLocked(row)">{{ row.fileType || '-' }}</span>
-          <el-select
-            v-else
-            :model-value="row.fileType"
-            placeholder="请选择"
-            :teleported="false"
-            :fit-input-width="true"
-            @update:model-value="value => updateRowFileType(row, value)"
-          >
-            <el-option
-              v-for="item in contractAttachmentTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件名"
-        min-width="240"
-        align="left"
-        header-align="left"
-        show-overflow-tooltip
+      <div class="contract-manage-form__attachment-head">
+        <div class="dialog-section-title">{{ title }}</div>
+        <el-button type="primary" :disabled="!rows.length" @click="batchDownload"
+          >批量下载</el-button
+        >
+      </div>
+      <el-table
+        :data="rows"
+        border
+        class="contract-manage-form__attachment-table"
+        @selection-change="selected = $event"
       >
-        <template #default="{ row }">
-          <el-link type="primary" @click="preview?.(row, rows)">{{ attachmentName(row) }}</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="description" label="附件描述" min-width="220">
-        <template #default="{ row }">
-          <span v-if="readonly || isRowLocked(row)">{{ row.description || '-' }}</span>
-          <el-input
-            v-else
-            :model-value="row.description"
-            maxlength="200"
-            @update:model-value="value => updateRowDescription(row, value)"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="文件大小" width="120" align="center">
-        <template #default="{ row }">{{ formatSize(row.size) }}</template>
-      </el-table-column>
-      <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
-      <el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
-      <el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
-        <template #default="{ row, $index }">
-          <span v-if="isRowLocked(row)">-</span>
-          <el-link v-else type="danger" @click="remove($index)">删除</el-link>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column v-if="!readonly" type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column v-if="attachmentType" label="附件类型" min-width="160" align="center">
+          <template #default="{ row, $index }">
+            <span v-if="readonly || isRowLocked(row)">{{ row.fileType || '-' }}</span>
+            <el-select
+              v-else
+              :model-value="row.fileType"
+              placeholder="请选择"
+              style="width: 100%"
+              teleported
+              clearable
+              @update:model-value="value => updateRowFileType($index, value)"
+            >
+              <el-option
+                v-for="item in contractAttachmentTypeOptions"
+                :key="`${item.value}-${item.label}`"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="文件名"
+          min-width="240"
+          align="left"
+          header-align="left"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">
+            <el-link type="primary" @click="preview?.(row, rows)">{{
+              attachmentName(row)
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="description" label="附件描述" min-width="220">
+          <template #default="{ row, $index }">
+            <span v-if="readonly || isRowLocked(row)">{{ row.description || '-' }}</span>
+            <el-input
+              v-else
+              :model-value="row.description"
+              maxlength="200"
+              @update:model-value="value => updateRowDescription($index, value)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="文件大小" width="120" align="center">
+          <template #default="{ row }">{{ formatSize(row.size) }}</template>
+        </el-table-column>
+        <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
+        <el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
+        <el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
+          <template #default="{ row, $index }">
+            <span v-if="isRowLocked(row)">-</span>
+            <el-link v-else type="danger" @click="remove($index)">删除</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <div v-if="!readonly" class="contract-manage-form__attachment-upload">
-      <template v-if="useUploadDialog">
-        <el-button type="primary" plain @click="openUploadDialog">上传附件</el-button>
-        <span class="contract-manage-form__attachment-tip">
-          支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M
-        </span>
-      </template>
-      <vehicle-attachment-upload
-        v-else
-        :model-value="rows"
-        :file-types="attachmentFileTypes"
-        :max-size="50"
-        show-tip
-        tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M"
-        :show-file-list="false"
-        button-text="上传附件"
-        @update:model-value="handleChange"
-        @change="handleChange"
-      />
-    </div>
+      <div v-if="!readonly" class="contract-manage-form__attachment-upload">
+        <template v-if="useUploadDialog">
+          <el-button type="primary" plain @click="openUploadDialog">上传附件</el-button>
+          <span class="contract-manage-form__attachment-tip">
+            支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M
+          </span>
+        </template>
+        <vehicle-attachment-upload
+          v-else
+          :model-value="rows"
+          :file-types="attachmentFileTypes"
+          :max-size="50"
+          show-tip
+          tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M"
+          :show-file-list="false"
+          button-text="上传附件"
+          @change="handleChange"
+          @success="handleUploadSuccess"
+        />
+      </div>
+    </section>
 
     <el-dialog
       v-model="uploadDialogVisible"
@@ -103,7 +111,12 @@
       <div class="contract-attachment-upload-dialog__body">
         <div class="contract-attachment-upload-dialog__field">
           <span class="contract-attachment-upload-dialog__label">附件位置</span>
-          <el-select v-model="uploadDialogLocation" placeholder="请选择附件位置" style="width: 100%">
+          <el-select
+            v-model="uploadDialogLocation"
+            placeholder="请选择附件位置"
+            style="width: 100%"
+            @change="syncUploadDialogTypeByLocation"
+          >
             <el-option
               v-for="item in resolvedLocationOptions"
               :key="item"
@@ -149,7 +162,7 @@
         </div>
       </template>
     </el-dialog>
-  </section>
+  </div>
 </template>
 
 <script>
@@ -159,11 +172,11 @@ import { getUploadHeaders } from '@/utils/upload';
 import { downloadFileByUrl } from '@/utils/util';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 
-const CONTRACT_ATTACHMENT_TYPE_OTHER = '其它文件';
+const CONTRACT_ATTACHMENT_TYPE_OTHER = '其他文件';
 export const defaultContractAttachmentTypeOptions = [
   { label: '合同文件', value: '合同文件' },
   { label: '双章归档文件', value: '双章归档文件' },
-  { label: '其它文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER },
+  { label: '其他文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER },
 ];
 /** @deprecated 兼容旧引用，实际选项由业务字典 contract_attachment_type 动态加载 */
 export const contractAttachmentTypeOptions = defaultContractAttachmentTypeOptions;
@@ -206,21 +219,32 @@ const normalizeAttachmentTypeText = value => {
     .replace(/[\s_\-—–·•()（）\[\]【】{}《》<>“”"'、，,。.]/g, '');
 };
 
+const isOtherAttachmentTypeOption = item => {
+  const text = `${item?.label || ''}${item?.value || ''}`;
+  return (
+    String(item?.value) === CONTRACT_ATTACHMENT_TYPE_OTHER ||
+    String(item?.value) === '其它文件' ||
+    text.includes('其他文件') ||
+    text.includes('其它文件') ||
+    text.includes('其他') ||
+    text.includes('其它')
+  );
+};
+
 const attachmentTypeKeywords = fileType => {
-  if (fileType === '双章归档文件') return ['双章归档文件', '双章归档', '双章'];
-  if (fileType === '合同文件') return ['合同文件', '合同'];
-  return [fileType];
+  const text = String(fileType || '');
+  if (text.includes('双章')) return ['双章归档文件', '双章归档', '双章'];
+  if (text.includes('合同') && !text.includes('其他') && !text.includes('其它')) {
+    return ['合同文件', '合同'];
+  }
+  if (isOtherAttachmentTypeOption({ label: text, value: text })) return [];
+  return text ? [text] : [];
 };
 
 const resolveOtherAttachmentType = (options = []) => {
   const list = options.length ? options : defaultContractAttachmentTypeOptions;
-  const matched = list.find(
-    item =>
-      String(item.value) === CONTRACT_ATTACHMENT_TYPE_OTHER ||
-      String(item.label).includes('其它') ||
-      String(item.label).includes('其他')
-  );
-  return matched?.value || list[list.length - 1]?.value || CONTRACT_ATTACHMENT_TYPE_OTHER;
+  const matched = list.find(isOtherAttachmentTypeOption);
+  return matched?.value || CONTRACT_ATTACHMENT_TYPE_OTHER;
 };
 
 export const resolveContractAttachmentType = (
@@ -228,22 +252,27 @@ export const resolveContractAttachmentType = (
   options = defaultContractAttachmentTypeOptions
 ) => {
   const list = options.length ? options : defaultContractAttachmentTypeOptions;
+  const otherType = resolveOtherAttachmentType(list);
   const values = list.map(item => item.value);
   if (values.includes(row.fileType)) return row.fileType;
+  const matchedByLabel = list.find(item => String(item.label) === String(row.fileType));
+  if (matchedByLabel) return matchedByLabel.value;
   const fileName = normalizeAttachmentTypeText(attachmentName(row));
-  const otherType = resolveOtherAttachmentType(list);
   if (!fileName) return otherType;
   const matched = list
-    .filter(item => item.value !== otherType)
+    .filter(item => !isOtherAttachmentTypeOption(item))
     .flatMap(item =>
-      attachmentTypeKeywords(item.value).map(keyword => ({
-        value: item.value,
-        keyword: normalizeAttachmentTypeText(keyword),
-      }))
+      attachmentTypeKeywords(item.value)
+        .concat(attachmentTypeKeywords(item.label))
+        .map(keyword => ({
+          value: item.value,
+          keyword: normalizeAttachmentTypeText(keyword),
+        }))
     )
     .filter(item => item.keyword)
     .sort((a, b) => b.keyword.length - a.keyword.length)
     .find(item => fileName.includes(item.keyword));
+  // 文件名未命中任何附件类型时，默认「其他文件」
   return matched?.value || otherType;
 };
 
@@ -277,11 +306,12 @@ export default {
     lockApproved: Boolean,
     markApprovedOnUpload: Boolean,
     useUploadDialog: Boolean,
+    dialogOnly: Boolean,
     attachmentLocation: { type: String, default: '合同文件' },
     attachmentLocationOptions: { type: Array, default: null },
     preview: { type: Function, default: null },
   },
-  emits: ['update:rows', 'upload-to-location'],
+  emits: ['update:rows', 'upload-to-location', 'upload-confirmed'],
   data() {
     return {
       selected: [],
@@ -323,12 +353,28 @@ export default {
         .then(res => {
           const options = mapDictOptions(res);
           if (options.length) {
-            this.contractAttachmentTypeOptions = options;
+            // 字典缺少「其他文件」时补上，保证未匹配文件名可默认选中
+            this.contractAttachmentTypeOptions = options.some(isOtherAttachmentTypeOption)
+              ? options
+              : [...options, { label: '其他文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER }];
             if (
-              !options.some(item => String(item.value) === String(this.uploadDialogType))
+              !this.contractAttachmentTypeOptions.some(
+                item => String(item.value) === String(this.uploadDialogType)
+              )
             ) {
               this.uploadDialogType = this.defaultAttachmentType;
             }
+            // 字典加载后，把已有行的中文类型名对齐到 dictKey，保证下拉可选中
+            if (this.attachmentType && (this.rows || []).length) {
+              const aligned = (this.rows || []).map(row => ({
+                ...row,
+                fileType: resolveContractAttachmentType(row, this.contractAttachmentTypeOptions),
+              }));
+              const changed = aligned.some(
+                (row, index) => row.fileType !== this.rows[index]?.fileType
+              );
+              if (changed) this.update(aligned);
+            }
           }
         })
         .catch(() => {
@@ -339,24 +385,76 @@ export default {
       return this.lockApproved && isAttachmentApproved(row);
     },
     update(rows) {
-      this.$emit('update:rows', rows);
+      this.$emit('update:rows', Array.isArray(rows) ? rows.map(item => ({ ...item })) : []);
     },
-    updateRowFileType(row, value) {
-      if (this.isRowLocked(row)) return;
-      row.fileType = value;
-      this.update([...this.rows]);
+    enrichUploadedRow(row, existing) {
+      const uploadUserName = this.$store.getters.userInfo?.realName || '';
+      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+      const next = {
+        ...existing,
+        ...row,
+        description: row.description || existing?.description || '',
+        uploadUserName: existing?.uploadUserName || row.uploadUserName || uploadUserName,
+        uploadTime: existing?.uploadTime || row.uploadTime || uploadTime,
+        approved: existing?.approved || row.approved || false,
+      };
+      if (this.attachmentType) {
+        next.fileType = existing?.fileType
+          ? existing.fileType
+          : resolveContractAttachmentType(
+              { ...next, fileType: '' },
+              this.contractAttachmentTypeOptions
+            );
+      }
+      if (this.markApprovedOnUpload && !existing) next.approved = true;
+      return next;
     },
-    updateRowDescription(row, value) {
-      if (this.isRowLocked(row)) return;
-      row.description = value;
-      this.update([...this.rows]);
+    findExistingRow(row, rows = this.rows) {
+      const fileUrl = attachmentUrl(row);
+      return (rows || []).find(item => {
+        const sameUid = row.uid && item.uid && String(row.uid) === String(item.uid);
+        const sameUrl = fileUrl && attachmentUrl(item) === fileUrl;
+        return sameUid || sameUrl;
+      });
+    },
+    updateRowFileType(index, value) {
+      const rows = [...(this.rows || [])];
+      const row = rows[index];
+      if (!row || this.isRowLocked(row)) return;
+      rows[index] = { ...row, fileType: value };
+      this.update(rows);
+    },
+    updateRowDescription(index, value) {
+      const rows = [...(this.rows || [])];
+      const row = rows[index];
+      if (!row || this.isRowLocked(row)) return;
+      rows[index] = { ...row, description: value };
+      this.update(rows);
+    },
+    resolveTypeByLocation(location) {
+      const options = this.contractAttachmentTypeOptions || [];
+      const locationText = String(location || '');
+      if (locationText.includes('其它') || locationText.includes('其他')) {
+        return this.defaultAttachmentType;
+      }
+      const matched = options.find(
+        item =>
+          String(item.value) === locationText ||
+          String(item.label) === locationText ||
+          String(item.value).includes('合同') ||
+          String(item.label).includes('合同')
+      );
+      return matched?.value || options[0]?.value || this.defaultAttachmentType;
+    },
+    syncUploadDialogTypeByLocation() {
+      this.uploadDialogType = this.resolveTypeByLocation(this.uploadDialogLocation);
     },
     openUploadDialog() {
       const options = this.resolvedLocationOptions;
       this.uploadDialogLocation = options.includes(this.attachmentLocation)
         ? this.attachmentLocation
         : options[0] || this.attachmentLocation;
-      this.uploadDialogType = this.defaultAttachmentType;
+      this.syncUploadDialogTypeByLocation();
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
       this.uploadDialogVisible = true;
@@ -365,7 +463,7 @@ export default {
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
       this.uploadDialogLocation = this.attachmentLocation;
-      this.uploadDialogType = this.defaultAttachmentType;
+      this.syncUploadDialogTypeByLocation();
     },
     beforeUpload(file) {
       const extension = String(file.name || '')
@@ -408,13 +506,18 @@ export default {
         ...this.uploadDialogFiles.filter(item => String(item.uid) !== String(file.uid)),
         normalized,
       ];
-      this.uploadDialogType = resolveContractAttachmentType(
-        {
-          ...normalized,
-          fileType: '',
-        },
-        this.contractAttachmentTypeOptions
-      );
+      const locationText = String(this.uploadDialogLocation || '');
+      if (!(locationText.includes('其它') || locationText.includes('其他'))) {
+        this.uploadDialogType = resolveContractAttachmentType(
+          {
+            ...normalized,
+            fileType: '',
+          },
+          this.contractAttachmentTypeOptions
+        );
+      } else {
+        this.uploadDialogType = this.defaultAttachmentType;
+      }
       this.$message.success('上传成功');
     },
     handleDialogError() {
@@ -451,50 +554,39 @@ export default {
         uploadTime: row.uploadTime || uploadTime,
         ...(this.markApprovedOnUpload ? { approved: true } : {}),
       }));
-      if (this.uploadDialogLocation === this.attachmentLocation) {
-        this.update([...(this.rows || []), ...appended]);
-      } else {
-        this.$emit('upload-to-location', {
-          location: this.uploadDialogLocation,
-          rows: appended,
-        });
-      }
+      // 统一交给父组件按附件位置写入对应列表，避免同位置双写或跨位置不显示
+      this.$emit('upload-to-location', {
+        location: this.uploadDialogLocation,
+        rows: appended,
+      });
       this.uploadDialogVisible = false;
+      this.$emit('upload-confirmed', {
+        location: this.uploadDialogLocation,
+        rows: appended,
+      });
     },
-    handleChange(rows) {
-      const uploadUserName = this.$store.getters.userInfo?.realName || '';
-      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+    handleChange(list) {
+      if (!Array.isArray(list)) return;
+      // 上传组件偶发回传空列表时，禁止清空已有表格数据
+      if (!list.length) return;
       const existingRows = this.rows || [];
-      this.update(
-        (rows || []).map(row => {
-          const fileUrl = attachmentUrl(row);
-          const existing = existingRows.find(item => {
-            const sameUid = row.uid && item.uid && String(row.uid) === String(item.uid);
-            const sameUrl = fileUrl && attachmentUrl(item) === fileUrl;
-            return sameUid || sameUrl;
-          });
-          if (existing && this.isRowLocked(existing)) return { ...existing };
-          const next = {
-            ...existing,
-            ...row,
-            description: row.description || existing?.description || '',
-            uploadUserName: existing?.uploadUserName || row.uploadUserName || uploadUserName,
-            uploadTime: existing?.uploadTime || row.uploadTime || uploadTime,
-            approved: existing?.approved || row.approved || false,
-          };
-          if (this.attachmentType) {
-            next.fileType = resolveContractAttachmentType(
-              {
-                ...next,
-                fileType: existing?.fileType || row.fileType,
-              },
-              this.contractAttachmentTypeOptions
-            );
-          }
-          if (this.markApprovedOnUpload && !existing) next.approved = true;
-          return next;
-        })
-      );
+      const nextRows = list.map(row => {
+        const existing = this.findExistingRow(row, existingRows);
+        if (existing && this.isRowLocked(existing)) return { ...existing };
+        return this.enrichUploadedRow(row, existing);
+      });
+      existingRows.forEach(item => {
+        if (!this.isRowLocked(item)) return;
+        if (this.findExistingRow(item, nextRows)) return;
+        nextRows.unshift({ ...item });
+      });
+      this.update(nextRows);
+    },
+    handleUploadSuccess(file) {
+      const url = attachmentUrl(file);
+      if (!file || !url) return;
+      if (this.findExistingRow(file)) return;
+      this.update([...(this.rows || []), this.enrichUploadedRow(file)]);
     },
     remove(index) {
       const row = this.rows[index];
@@ -502,7 +594,7 @@ export default {
         this.$message.warning('已审核通过的附件不允许删除');
         return;
       }
-      const rows = [...this.rows];
+      const rows = [...(this.rows || [])];
       rows.splice(index, 1);
       this.update(rows);
     },
@@ -515,7 +607,7 @@ export default {
       downloadFileByUrl(url, attachmentName(row));
     },
     batchDownload() {
-      (this.selected.length ? this.selected : this.rows).forEach(this.download);
+      (this.selected.length ? this.selected : this.rows || []).forEach(this.download);
     },
     formatSize(size) {
       const value = Number(size);
@@ -532,7 +624,7 @@ export default {
 .contract-manage-form__section {
   margin: 12px 0 0;
   padding: 14px 16px 16px;
-  overflow: hidden;
+  overflow: visible;
   background: #fff;
   border-radius: 6px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -555,6 +647,15 @@ export default {
   }
 }
 
+.contract-manage-form__attachment-table {
+  :deep(.el-table__body-wrapper),
+  :deep(.el-table__header-wrapper),
+  :deep(.el-table__cell),
+  :deep(.cell) {
+    overflow: visible;
+  }
+}
+
 .contract-manage-form__attachment-head {
   display: flex;
   align-items: center;
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index 96d3c62..5d78d9e 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -189,7 +189,6 @@
         title="合同文件"
         description
         attachment-type
-        use-upload-dialog
         :attachment-location-options="changeAttachmentLocationOptions"
         :rows="contractFileRows"
         :preview="previewAttachment"
@@ -258,7 +257,6 @@
         title="其它附件"
         description
         attachment-type
-        use-upload-dialog
         attachment-location="其它附件"
         :attachment-location-options="changeAttachmentLocationOptions"
         :rows="attachments"
@@ -285,7 +283,6 @@
         title="变更材料"
         description
         attachment-type
-        use-upload-dialog
         attachment-location="变更材料"
         :attachment-location-options="changeAttachmentLocationOptions"
         :rows="changeMaterials"
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index a0d860c..36c3819 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -592,7 +592,6 @@
           title="合同文件"
           description
           attachment-type
-          use-upload-dialog
           :attachment-location-options="contractAttachmentLocationOptions"
           :lock-approved="isAttachmentUploadMode || hasApprovedContractFiles"
           :mark-approved-on-upload="isAttachmentUploadMode"
@@ -813,7 +812,6 @@
           title="其它附件"
           description
           attachment-type
-          use-upload-dialog
           attachment-location="其它附件"
           :attachment-location-options="contractAttachmentLocationOptions"
           :readonly="isAttachmentUploadMode"
@@ -925,6 +923,21 @@
       @save="saveBillingPlan"
     />
 
+    <contract-attachment-section
+      ref="listAttachmentUploader"
+      dialog-only
+      title="合同文件"
+      description
+      attachment-type
+      use-upload-dialog
+      mark-approved-on-upload
+      :attachment-location-options="['合同文件', '其它附件']"
+      :rows="listUploadContractFileRows"
+      @update:rows="listUploadContractFileRows = $event"
+      @upload-to-location="handleListAttachmentUploadToLocation"
+      @upload-confirmed="handleListAttachmentUploadConfirmed"
+    />
+
     <el-dialog
       v-model="attachmentDocumentPreviewVisible"
       :title="attachmentPreviewFile.name || '附件预览'"
@@ -1236,6 +1249,9 @@ export default {
       organizationLoading: false,
       contractFileRows: [],
       attachmentRows: [],
+      listUploadContractFileRows: [],
+      listUploadAttachmentRows: [],
+      attachmentUploadFromList: false,
       attachmentImagePreviewVisible: false,
       attachmentImagePreviewUrls: [],
       attachmentImagePreviewIndex: 0,
@@ -1899,20 +1915,86 @@ export default {
         return;
       }
       this.submitAction = 'attachment';
-      this.api
+      const contractFileRows = this.attachmentUploadFromList
+        ? this.listUploadContractFileRows
+        : this.contractFileRows;
+      const attachmentRows = this.attachmentUploadFromList
+        ? this.listUploadAttachmentRows
+        : this.attachmentRows;
+      return this.api
         .updateAttachments({
           id: this.form.id,
-          contractFileJson: JSON.stringify(this.contractFileRows),
-          attachmentsJson: JSON.stringify(this.attachmentRows),
+          contractFileJson: JSON.stringify(contractFileRows),
+          attachmentsJson: JSON.stringify(attachmentRows),
         })
         .then(() => {
           this.$message.success('附件保存成功');
+          if (this.attachmentUploadFromList) {
+            this.attachmentUploadFromList = false;
+            this.listUploadContractFileRows = [];
+            this.listUploadAttachmentRows = [];
+            this.onLoad(this.page, this.query);
+            return;
+          }
           this.closeForm();
         })
         .finally(() => {
           this.submitAction = '';
         });
     },
+    openAttachmentUploadDialog(row = {}) {
+      if (!row?.id) {
+        this.$message.warning('合同不存在，无法上传附件');
+        return;
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
+      this.attachmentUploadFromList = true;
+      this.listUploadContractFileRows = [];
+      this.listUploadAttachmentRows = [];
+      this.form = { ...defaultForm(), id: row.id };
+      this.api
+        .getDetail(row.id)
+        .then(res => {
+          const detail = res.data?.data || {};
+          this.form = {
+            ...defaultForm(),
+            ...detail,
+            id: detail.id || row.id,
+          };
+          this.listUploadContractFileRows = normalizeContractFileRows(
+            parseArray(detail.contractFileJson)
+          );
+          this.listUploadAttachmentRows = parseArray(detail.attachmentsJson);
+          this.$nextTick(() => {
+            this.$refs.listAttachmentUploader?.openUploadDialog?.();
+          });
+        })
+        .catch(() => {
+          this.attachmentUploadFromList = false;
+          this.$message.error('合同详情加载失败');
+        })
+        .finally(() => {
+          loading.close();
+        });
+    },
+    handleListAttachmentUploadConfirmed() {
+      if (!this.attachmentUploadFromList) return;
+      this.submitAttachmentUpload();
+    },
+    handleListAttachmentUploadToLocation({ location, rows = [] }) {
+      if (!rows.length) return;
+      if (location === '合同文件') {
+        this.listUploadContractFileRows = [...(this.listUploadContractFileRows || []), ...rows];
+        return;
+      }
+      if (location === '其它附件') {
+        this.listUploadAttachmentRows = [...(this.listUploadAttachmentRows || []), ...rows];
+      }
+    },
     loadProjectOptions() {
       if (this.projectLoading) return;
       this.projectLoading = true;
@@ -2749,15 +2831,7 @@ export default {
         return;
       }
       if (operation.action === 'attachmentUpload') {
-        this.$router.push({
-          path: '/business/contract-manage/form',
-          query: {
-            mode: 'edit',
-            id: row.id,
-            name: '附件上传',
-            attachmentUpload: '1',
-          },
-        });
+        this.openAttachmentUploadDialog(row);
         return;
       }
       const run = value => {
@@ -2978,6 +3052,10 @@ export default {
       box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
     }
 
+    &--attachment {
+      overflow: visible;
+    }
+
     > .dialog-section-title,
     :deep(.dialog-section-title) {
       margin-bottom: 20px;

From 5352d799af576fb76d79b5ddff1e070d4dbc6757 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 14:49:09 +0800
Subject: [PATCH 23/28] =?UTF-8?q?:sparkles:=20=E8=BF=90=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B7=B2=E5=AE=8C=E6=88=90=E9=9A=90=E8=97=8F=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E8=B7=AF=E7=BA=BF=E5=B9=B6=E7=A7=BB=E9=99=A4=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

已完成运单不再展示变更运输路线入口，变更弹窗去掉拖拽路线编辑区。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../components/business-crud-page.vue         |  71 ++-----
 .../components/waybill-manage-page.vue        | 174 ++++++++++++------
 2 files changed, 128 insertions(+), 117 deletions(-)

diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index 16ce010..f6c27e2 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -2478,7 +2478,7 @@
                 {{ formatTransportPlanDetailTransportType(waybillTransportMode(detailRow)) }}
               </span>
               <el-link
-                v-if="detailRow.id"
+                v-if="detailRow.id && canChangeWaybillRoute(detailRow)"
                 class="business-crud-page__waybill-route-change-link"
                 type="primary"
                 @click="openWaybillRouteChangeDialog"
@@ -2947,35 +2947,6 @@
               </el-table-column>
             </el-table>
           </section-card>
-          <section-card title="路线编辑">
-            <template #extra>
-              <span class="business-crud-page__route-change-hint">拖拽调整顺序</span>
-            </template>
-            <div
-              v-if="waybillRouteChangeNodes.length"
-              class="business-crud-page__route-change-list"
-            >
-              <div
-                v-for="(node, index) in waybillRouteChangeNodes"
-                :key="node.key || index"
-                class="business-crud-page__route-change-item"
-                draggable="true"
-                @dragstart="handleWaybillRouteChangeDragStart(index)"
-                @dragover.prevent
-                @drop="handleWaybillRouteChangeDrop(index)"
-              >
-                <span class="business-crud-page__route-change-type">
-                  {{ waybillRouteChangeTypeText(index) }}
-                </span>
-                <span>{{ node.address }}</span>
-                <span class="business-crud-page__route-change-tags">
-                  <el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag>
-                </span>
-                <el-icon><Rank /></el-icon>
-              </div>
-            </div>
-            <el-empty v-else description="暂无路线" :image-size="60" />
-          </section-card>
           <el-form label-width="auto">
             <el-form-item label="变更备注" style="margin-top: 8px">
               <el-input
@@ -5311,7 +5282,7 @@ import { openImportDialog } from '@/utils/import-excel';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
-import { Location, OfficeBuilding, Rank, Search } from '@element-plus/icons-vue';
+import { Location, OfficeBuilding, Search } from '@element-plus/icons-vue';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import {
@@ -5574,7 +5545,6 @@ export default {
   components: {
     BillingPlanEditor,
     PageAvueForm,
-    Rank,
     ElImageViewer,
     OpenFileViewer,
   },
@@ -5637,7 +5607,6 @@ export default {
       waybillRouteChangeNodes: [],
       waybillRouteChangeRemark: '',
       waybillRouteChangeRecords: [],
-      waybillRouteChangeDragIndex: -1,
       waybillRouteChangeSaving: false,
       mileageDialog: {
         visible: false,
@@ -7438,7 +7407,7 @@ export default {
         : [];
     },
     openWaybillRouteChangeDialog() {
-      if (!this.detailRow.id) return;
+      if (!this.detailRow.id || !this.canChangeWaybillRoute(this.detailRow)) return;
       this.restoreWaybillRouteChangeRecords();
       this.waybillRouteChangeTab = 'change';
       this.waybillRouteChangeRemark = '';
@@ -7455,22 +7424,11 @@ export default {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
       this.waybillRouteChangeBox = true;
     },
-    waybillRouteChangeTypeText(index) {
-      if (index === 0) return '起';
-      if (index === this.waybillRouteChangeNodes.length - 1) return '终';
-      return '经';
-    },
-    handleWaybillRouteChangeDragStart(index) {
-      this.waybillRouteChangeDragIndex = index;
-    },
-    handleWaybillRouteChangeDrop(index) {
-      if (this.waybillRouteChangeDragIndex < 0 || this.waybillRouteChangeDragIndex === index)
-        return;
-      const nodes = [...this.waybillRouteChangeNodes];
-      const [node] = nodes.splice(this.waybillRouteChangeDragIndex, 1);
-      nodes.splice(index, 0, node);
-      this.waybillRouteChangeNodes = nodes;
-      this.waybillRouteChangeDragIndex = -1;
+    canChangeWaybillRoute(row = {}) {
+      const status = String(this.statusValue(row) || row.businessStatus || row.status || '');
+      if (status === 'completed') return false;
+      const statusName = String(row.businessStatusName || row.statusName || '');
+      return !statusName.includes('已完成');
     },
     updateWaybillRouteChangeNodes() {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
@@ -7519,9 +7477,8 @@ export default {
         row.departureAddress !== row.originalDepartureAddress ||
         row.arrivalAddress !== row.originalArrivalAddress;
       const routeJson = JSON.stringify(this.waybillRouteChangeNodes);
-      const originalRouteJson = this.detailRow.routeJson || '';
-      if (!changed && routeJson === originalRouteJson && !this.waybillRouteChangeRemark) {
-        this.$message.warning('请修改地址、调整路线或填写变更备注');
+      if (!changed && !this.waybillRouteChangeRemark) {
+        this.$message.warning('请修改地址或填写变更备注');
         return;
       }
       if (typeof this.api.changeRoute !== 'function') {
@@ -7529,11 +7486,9 @@ export default {
         return;
       }
 
-      const content = changed
-        ? `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
-            row.departureAddress || '-'
-          }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
-        : '调整运输路线顺序';
+      const content = `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
+        row.departureAddress || '-'
+      }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`;
       const records = [
         {
           changeTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 21143b6..a787d26 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -1786,7 +1786,7 @@
                 }}
               </el-tag>
               <el-link
-                v-if="detailRow.id"
+                v-if="detailRow.id && canChangeWaybillRoute(detailRow)"
                 class="waybill-manage-page__waybill-route-change-link"
                 type="primary"
                 @click="openWaybillRouteChangeDialog"
@@ -1802,7 +1802,18 @@
                 :class="{ 'is-plan': item[0] === 'planName' }"
               >
                 <span class="waybill-manage-page__waybill-label">{{ item[1] }}</span>
-                <span :class="['waybill-manage-page__waybill-value', { 'is-link': item[2] }]">
+                <el-link
+                  v-if="canOpenWaybillDetailSummaryLink(item[0])"
+                  type="primary"
+                  class="waybill-manage-page__waybill-value is-link"
+                  @click="handleWaybillDetailSummaryClick(item[0])"
+                >
+                  {{ formatDetailValue(detailRow, item[0]) }}
+                </el-link>
+                <span
+                  v-else
+                  :class="['waybill-manage-page__waybill-value', { 'is-link': item[2] }]"
+                >
                   {{ formatDetailValue(detailRow, item[0]) }}
                 </span>
               </div>
@@ -2423,35 +2434,6 @@
               </el-table-column>
             </el-table>
           </section-card>
-          <section-card title="路线编辑">
-            <template #extra>
-              <span class="waybill-manage-page__route-change-hint">拖拽调整顺序</span>
-            </template>
-            <div
-              v-if="waybillRouteChangeNodes.length"
-              class="waybill-manage-page__route-change-list"
-            >
-              <div
-                v-for="(node, index) in waybillRouteChangeNodes"
-                :key="node.key || index"
-                class="waybill-manage-page__route-change-item"
-                draggable="true"
-                @dragstart="handleWaybillRouteChangeDragStart(index)"
-                @dragover.prevent
-                @drop="handleWaybillRouteChangeDrop(index)"
-              >
-                <span class="waybill-manage-page__route-change-type">
-                  {{ waybillRouteChangeTypeText(index) }}
-                </span>
-                <span>{{ node.address }}</span>
-                <span class="waybill-manage-page__route-change-tags">
-                  <el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag>
-                </span>
-                <el-icon><Rank /></el-icon>
-              </div>
-            </div>
-            <el-empty v-else description="暂无路线" :image-size="60" />
-          </section-card>
           <el-form label-width="auto">
             <el-form-item label="变更备注" style="margin-top: 8px">
               <el-input
@@ -3116,6 +3098,7 @@ import {
   getList as getProjectList,
 } from '@/api/business/project-apply';
 import { getList as getLoadingList } from '@/api/business/loading-manage';
+import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
 import {
   getDetail as getShippingPlanDetail,
@@ -3140,7 +3123,7 @@ import { openImportDialog } from '@/utils/import-excel';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
-import { InfoFilled, Location, OfficeBuilding, Rank, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
+import { InfoFilled, Location, OfficeBuilding, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import {
@@ -3316,7 +3299,6 @@ export default {
     PageDetail,
     InfoFilled,
     WarnTriangleFilled,
-    Rank,
     ElImageViewer,
     OpenFileViewer,
   },
@@ -3389,7 +3371,6 @@ export default {
       waybillRouteChangeNodes: [],
       waybillRouteChangeRemark: '',
       waybillRouteChangeRecords: [],
-      waybillRouteChangeDragIndex: -1,
       waybillRouteChangeSaving: false,
       waybillLocateLoading: false,
       waybillLocateInfo: null,
@@ -4684,6 +4665,90 @@ export default {
         query: { id, name: '配载单详情' },
       });
     },
+    waybillDetailCustomerLabel(row = {}) {
+      return row.customer || row.fullName || row.shortName || row.customerName || row.customerCode || '';
+    },
+    waybillDetailCustomerId(row = {}) {
+      return row.id || row.customerId || '';
+    },
+    canOpenWaybillDetailSummaryLink(prop) {
+      if (this.isPublicWaybillView) return false;
+      const row = this.detailRow || {};
+      const value = this.formatDetailValue(row, prop);
+      if (!value || value === '-') return false;
+      if (prop === 'customerName') return Boolean(row.customerName);
+      if (prop === 'contractNo') return Boolean(row.contractId);
+      if (prop === 'projectName') return Boolean(row.projectId);
+      return false;
+    },
+    handleWaybillDetailSummaryClick(prop) {
+      if (prop === 'customerName') return this.openWaybillDetailCustomer();
+      if (prop === 'contractNo') return this.openWaybillDetailContract();
+      if (prop === 'projectName') return this.openWaybillDetailProject();
+    },
+    async resolveWaybillDetailCustomerId() {
+      const row = this.detailRow || {};
+      if (row.customerId) return row.customerId;
+      const name = String(row.customerName || '').trim();
+      if (!name) return '';
+      if (row.projectId) {
+        try {
+          const res = await getProjectDetail(row.projectId);
+          const customers = this.parseJsonArray(res.data?.data?.customerJson);
+          const matched =
+            customers.find(item => this.waybillDetailCustomerLabel(item) === name) ||
+            customers.find(item => {
+              const label = this.waybillDetailCustomerLabel(item);
+              return label && (name.includes(label) || label.includes(name));
+            });
+          const id = this.waybillDetailCustomerId(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 openWaybillDetailCustomer() {
+      if (!this.detailRow?.customerName) return;
+      const customerId = await this.resolveWaybillDetailCustomerId();
+      if (!customerId) {
+        this.$message.warning('未找到对应客商档案，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/vehicle/customer-archive/form',
+        query: { id: String(customerId), name: '查看客商档案', view: '1' },
+      });
+    },
+    openWaybillDetailContract() {
+      if (!this.detailRow?.contractId) {
+        this.$message.warning('合同信息缺失，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: this.detailRow.contractId, name: '合同详情' },
+      });
+    },
+    openWaybillDetailProject() {
+      if (!this.detailRow?.projectId) {
+        this.$message.warning('项目信息缺失，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/business/project-apply/form',
+        query: { mode: 'view', id: this.detailRow.projectId, name: '查看项目管理' },
+      });
+    },
     loadWaybillDetailProcessNodes(projectId) {
       this.waybillDetailProcessNodes = [];
       if (!projectId) return Promise.resolve([]);
@@ -4854,7 +4919,7 @@ export default {
         : [];
     },
     openWaybillRouteChangeDialog() {
-      if (!this.detailRow.id) return;
+      if (!this.detailRow.id || !this.canChangeWaybillRoute(this.detailRow)) return;
       this.restoreWaybillRouteChangeRecords();
       this.waybillRouteChangeTab = 'change';
       this.waybillRouteChangeRemark = '';
@@ -4871,22 +4936,11 @@ export default {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
       this.waybillRouteChangeBox = true;
     },
-    waybillRouteChangeTypeText(index) {
-      if (index === 0) return '起';
-      if (index === this.waybillRouteChangeNodes.length - 1) return '终';
-      return '经';
-    },
-    handleWaybillRouteChangeDragStart(index) {
-      this.waybillRouteChangeDragIndex = index;
-    },
-    handleWaybillRouteChangeDrop(index) {
-      if (this.waybillRouteChangeDragIndex < 0 || this.waybillRouteChangeDragIndex === index)
-        return;
-      const nodes = [...this.waybillRouteChangeNodes];
-      const [node] = nodes.splice(this.waybillRouteChangeDragIndex, 1);
-      nodes.splice(index, 0, node);
-      this.waybillRouteChangeNodes = nodes;
-      this.waybillRouteChangeDragIndex = -1;
+    canChangeWaybillRoute(row = {}) {
+      const status = String(this.statusValue(row) || row.businessStatus || row.status || '');
+      if (status === 'completed') return false;
+      const statusName = String(row.businessStatusName || row.statusName || '');
+      return !statusName.includes('已完成');
     },
     updateWaybillRouteChangeNodes() {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
@@ -4935,9 +4989,8 @@ export default {
         row.departureAddress !== row.originalDepartureAddress ||
         row.arrivalAddress !== row.originalArrivalAddress;
       const routeJson = JSON.stringify(this.waybillRouteChangeNodes);
-      const originalRouteJson = this.detailRow.routeJson || '';
-      if (!changed && routeJson === originalRouteJson && !this.waybillRouteChangeRemark) {
-        this.$message.warning('请修改地址、调整路线或填写变更备注');
+      if (!changed && !this.waybillRouteChangeRemark) {
+        this.$message.warning('请修改地址或填写变更备注');
         return;
       }
       if (typeof this.api.changeRoute !== 'function') {
@@ -4945,11 +4998,9 @@ export default {
         return;
       }
 
-      const content = changed
-        ? `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
-            row.departureAddress || '-'
-          }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
-        : '调整运输路线顺序';
+      const content = `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
+        row.departureAddress || '-'
+      }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`;
       const records = [
         {
           changeTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -9814,7 +9865,12 @@ export default {
     white-space: nowrap;
 
     &.is-link {
+      display: inline;
+      justify-content: flex-start;
+      max-width: 100%;
       color: #409eff;
+      font-weight: 500;
+      vertical-align: baseline;
     }
   }
 

From fbfb563254c2be310314ea02c3a802642a8afd94 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 14:49:09 +0800
Subject: [PATCH 24/28] =?UTF-8?q?:sparkles:=20=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B9=BF=E8=A5=BF=E7=99=BE=E5=BC=BA=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在企业性质右侧展示客商档案的广西百强标识。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/views/business/project-apply.vue | 36 +++++++++++++---------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 8b61737..a4a10f4 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -525,6 +525,11 @@
             </template>
           </el-table-column>
           <el-table-column prop="companyNature" label="企业性质" min-width="140" align="center" />
+          <el-table-column label="是否广西百强" min-width="140" align="center">
+            <template #default="{ row }">
+              {{ formatGuangxiTop100(row.guangxiTop100) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="legalPerson" label="法定代表人" min-width="140" align="center" />
           <el-table-column
             prop="address"
@@ -759,9 +764,6 @@
           <template v-if="isChangeDialog">
             <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
             <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
-            <el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
-              保存
-            </el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
               提交
             </el-button>
@@ -1903,13 +1905,7 @@ export default {
         this.closeProjectForm();
       });
     },
-    saveChangeProject() {
-      this.submitChangeForm(false);
-    },
     submitChangeProject() {
-      this.submitChangeForm(true);
-    },
-    submitChangeForm(needSubmit) {
       this.$refs.projectForm.validate(valid => {
         if (!valid) {
           this.handleValidateFail();
@@ -1917,19 +1913,12 @@ export default {
         }
         if (!this.validateAttachmentFileTypes()) return;
         this.submitLoading = true;
-        const request = needSubmit ? this.api.submitChange : this.api.saveChange;
-        request(this.normalizeSubmitForm({ includeChangeType: true }))
+        // 变更记录仅在提交时生成，保存草稿不落记录
+        this.api
+          .submitChange(this.normalizeSubmitForm({ includeChangeType: true }))
           .then(res => {
             if (res.data?.success === false || res.data?.data === false) {
-              this.$message.error(
-                res.data?.msg || `${needSubmit ? '提交' : '保存'}失败，请联系管理员`
-              );
-              return;
-            }
-            if (!needSubmit) {
-              this.$message.success('保存成功!');
-              this.closeProjectForm();
-              this.onLoad(this.page, this.query);
+              this.$message.error(res.data?.msg || '提交失败，请联系管理员');
               return;
             }
             const id = this.form.id;
@@ -2122,6 +2111,11 @@ export default {
     normalizeReadonlyAmount(value) {
       return this.normalizeOptionalSentinel(value);
     },
+    formatGuangxiTop100(value) {
+      if (value === 1 || value === '1') return '是';
+      if (value === 0 || value === '0') return '否';
+      return value || '';
+    },
     normalizeOptionalSentinel(value, emptyValue = '') {
       return value === null || value === undefined || value === '' || Number(value) === -1
         ? emptyValue
@@ -2528,6 +2522,8 @@ export default {
         id: item.id,
         credit: item.maxCreditLimit || item.applyCreditLimit || '',
         companyNature: item.customerNature || '',
+        guangxiTop100:
+          item.guangxiTop100 === 0 || item.guangxiTop100 === 1 ? item.guangxiTop100 : null,
         legalPerson: item.legalPerson || '',
         address: item.registeredAddress || '',
         contact: defaultContact.contactName || item.principal || '',

From ae1f2fa09fdfd65719483269dcc10908d760a74c Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 14:49:09 +0800
Subject: [PATCH 25/28] =?UTF-8?q?:lipstick:=20=E8=B0=83=E6=95=B4=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E9=A2=9D=E5=BA=A6=E5=BC=B9=E7=AA=97=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E4=B8=8E=20dialogWidth=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

统一表单控件宽度，并修正 Avue dialogWidth 数值写法避免重复 px。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/option/business/temporary-credit-limit.js |  2 +-
 src/views/business/temporary-credit-limit.vue | 38 +++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/option/business/temporary-credit-limit.js b/src/option/business/temporary-credit-limit.js
index e069f7d..eab56af 100644
--- a/src/option/business/temporary-credit-limit.js
+++ b/src/option/business/temporary-credit-limit.js
@@ -334,7 +334,7 @@ export const option = {
     },
     ...auditColumns.map(column => ({ ...column, hide: true })),
   ])),
-  dialogWidth: '1100px',
+  dialogWidth: 1100,
   menuFixed: 'right',
   menuWidth: 320,
   index: false,
diff --git a/src/views/business/temporary-credit-limit.vue b/src/views/business/temporary-credit-limit.vue
index 03c9aa0..490706f 100644
--- a/src/views/business/temporary-credit-limit.vue
+++ b/src/views/business/temporary-credit-limit.vue
@@ -184,7 +184,7 @@
       title="查看临时额度申请"
       append-to-body
       destroy-on-close
-      width="1100px"
+      :width="formDialogWidth"
       class="temporary-credit-limit-dialog temporary-credit-limit-detail-dialog"
     >
       <div v-loading="detailLoading" class="business-crud-page__detail-content">
@@ -415,6 +415,13 @@ export default {
     detailSections() {
       return this.config.detailSections || [];
     },
+    formDialogWidth() {
+      const width = this.tableOption?.dialogWidth ?? option.dialogWidth ?? 1100;
+      if (typeof width === 'number' || /^\d+$/.test(String(width))) {
+        return `${width}px`;
+      }
+      return String(width);
+    },
     isAdmin() {
       const authority = this.userInfo?.authority;
       return Array.isArray(authority)
@@ -956,8 +963,8 @@ export default {
 <style lang="scss" scoped>
 .temporary-credit-limit-page {
   &__field {
-    width: 100%;
-    max-width: 240px;
+    width: 240px;
+    max-width: 100%;
   }
 
   &__attachment-head {
@@ -1141,7 +1148,7 @@ export default {
     border-radius: 0 !important;
   }
 
-  // 新增/编辑：控件限宽，避免宽屏下撑满列宽贴到弹窗右边缘
+  // 新增/编辑：input/select 与「项目名称」同宽（240px），备注 textarea 保持整行
   &:not(.temporary-credit-limit-detail-dialog) {
     .el-form-item__content {
       min-width: 0;
@@ -1151,20 +1158,26 @@ export default {
     .el-form-item__content > .el-select,
     .el-form-item__content > .el-date-editor,
     .el-form-item__content > .el-cascader,
-    .el-form-item__content > .el-textarea,
+    .el-form-item__content > div > .el-input,
+    .el-form-item__content > div > .el-select,
+    .el-form-item__content > div > .el-date-editor,
+    .el-form-item__content > div > .el-cascader,
     .temporary-credit-limit-page__field {
-      width: 100%;
-      max-width: 240px;
+      width: 240px !important;
+      max-width: 100%;
     }
 
-    .el-form-item__content > .el-textarea {
-      max-width: 100%;
+    .el-form-item__content > .el-textarea,
+    .el-form-item__content > div > .el-textarea,
+    .el-form-item__content .el-textarea {
+      width: 100% !important;
+      max-width: 100% !important;
     }
 
     .el-date-editor.el-input,
     .el-date-editor.el-input__wrapper {
-      width: 100%;
-      max-width: 240px;
+      width: 240px !important;
+      max-width: 100%;
     }
   }
 }
@@ -1173,8 +1186,9 @@ export default {
   width: 180px !important;
 }
 
-// 新增/编辑/查看：高度随内容自适应，超出时再滚动；去掉强制全屏导致的底部大片空白
+// 新增/编辑/查看：宽度与高度规则统一（Avue setPx 对 '1100px' 会拼成 '1100pxpx'，故 option 用数字 1100）
 .temporary-credit-limit-dialog.el-dialog {
+  width: 1100px !important;
   margin-top: 20px !important;
   margin-bottom: 20px !important;
   height: auto !important;

From 694fe1a4339b352c954936d8c494bed2e9cefbaa Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 14:49:09 +0800
Subject: [PATCH 26/28] =?UTF-8?q?:wrench:=20=E5=BC=80=E5=8F=91=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E9=BB=98=E8=AE=A4=E6=8C=87=E5=90=91=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=BD=91=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

补充本地网关端口说明，避免误把 Nacos 8080 当作业务网关。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 vite.config.mjs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vite.config.mjs b/vite.config.mjs
index cc153b2..3c635fd 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -51,8 +51,10 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
+          // 本地网关默认 80 端口（blade-gateway bootstrap.yml）；开发时需先启动网关及 blade-auth/blade-system 等服务
+          // 注意：本机 8080 一般是 Nacos，不是业务网关
           target: 'http://localhost',
-          //target: 'https://saber3.bladex.cn/api',
+          // target: 'http://172.16.203.228:8000', // 仅联调远程网关时启用（且不要 rewrite）
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },

From a919781d4fa40db2c9310a26c17b380c5c721732 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 18:35:27 +0800
Subject: [PATCH 27/28] =?UTF-8?q?:sparkles:=20=E5=AE=8C=E5=96=84=E9=85=8D?=
 =?UTF-8?q?=E8=BD=BD=E7=A1=AE=E8=AE=A4=E3=80=81=E6=89=BF=E8=BF=90=E5=95=86?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=BF=87=E6=BB=A4=E5=8F=B8=E6=9C=BA=E4=B8=8E?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

配载草稿确认生成正式单并优化详情/列表地址市区展示；运单调度等按承运商联系人所属组织筛选司机车辆；统一地图搜索结果与登录默认账号清理。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/components/address-map-picker/main.vue    |  34 +-
 src/components/map-search-results/main.vue    | 203 +++++-
 src/option/business/waybill-manage.js         |   8 +-
 src/page/login/facelogin.vue                  |   4 +-
 src/page/login/userlogin.vue                  |   4 +-
 src/styles/common.scss                        |  13 +-
 src/utils/carrier-org-resource.js             | 140 ++++
 src/utils/map-search.js                       |  39 ++
 src/views/base/common-address.vue             |  10 +-
 src/views/business/common-route.vue           |  10 +-
 .../components/business-crud-page.vue         | 168 +++--
 .../components/master-order-dispatch.vue      |  65 +-
 .../components/master-order-editor.vue        |  20 +-
 .../components/shipping-template-page.vue     |  18 +-
 .../components/transport-plan-page.vue        | 188 ++++--
 .../components/waybill-manage-page.vue        | 293 +++++++-
 src/views/business/loading-manage.vue         | 637 +++++++++++++++---
 .../business/transport-plan-dispatch.vue      | 103 ++-
 src/views/vehicle/customer-archive.vue        |  53 +-
 19 files changed, 1701 insertions(+), 309 deletions(-)
 create mode 100644 src/utils/carrier-org-resource.js
 create mode 100644 src/utils/map-search.js

diff --git a/src/components/address-map-picker/main.vue b/src/components/address-map-picker/main.vue
index aab6ba6..ac8800f 100644
--- a/src/components/address-map-picker/main.vue
+++ b/src/components/address-map-picker/main.vue
@@ -10,12 +10,8 @@
       <el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
     </div>
     <div class="address-map-picker__content">
-      <map-search-results
-        v-if="searchResults.length"
-        :results="searchResults"
-        @select="selectSearchResult"
-      />
       <div ref="map" class="address-map-picker__map"></div>
+      <map-search-results :results="searchResults" @select="selectSearchResult" />
     </div>
     <div class="address-map-picker__info">{{ status }}</div>
     <template #footer>
@@ -28,6 +24,8 @@
 </template>
 
 <script>
+import { normalizeMapSearchResults } from '@/utils/map-search';
+
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 let amapLoader;
@@ -214,19 +212,14 @@ export default {
         .then(result => {
           if (!result) return;
           const geocodes = result.geocodes || (result.location ? [result] : []);
-          this.searchResults = geocodes.map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || item.address || keyword,
-            address: item.formattedAddress || item.address || keyword,
-            location: item.location,
-          }));
-          const point = geocodes[0]?.location || result.location;
+          this.searchResults = normalizeMapSearchResults(geocodes, keyword);
+          const point = this.searchResults[0]?.location || result.location;
           if (!point) {
             throw new Error('未找到匹配地址');
           }
           return this.$nextTick().then(() => {
             this.amap?.resize();
-            this.pickPoint(point, geocodes[0]?.formattedAddress || keyword);
+            this.pickPoint(point, this.searchResults[0]?.address || keyword);
           });
         })
         .catch(() => {
@@ -320,7 +313,6 @@ export default {
   }
 
   &__map {
-    flex: 1 1 auto;
     width: 100%;
     min-width: 0;
     height: 420px;
@@ -328,9 +320,19 @@ export default {
   }
 
   &__content {
-    display: flex;
-    gap: 12px;
+    position: relative;
+    display: block;
     min-width: 0;
+    overflow: visible;
+
+    .address-map-picker__map {
+      position: relative;
+      z-index: 1;
+    }
+
+    :deep(.map-search-results) {
+      z-index: 2000;
+    }
   }
 
   &__info {
diff --git a/src/components/map-search-results/main.vue b/src/components/map-search-results/main.vue
index 2cd3b73..c50ef14 100644
--- a/src/components/map-search-results/main.vue
+++ b/src/components/map-search-results/main.vue
@@ -1,20 +1,55 @@
 <template>
   <div v-if="results.length" class="map-search-results">
-    <div class="map-search-results__title">搜索结果</div>
-    <el-empty v-if="!results.length" description="暂无搜索结果" :image-size="60" />
-    <div
-      v-for="(item, index) in results"
-      :key="item.id || index"
-      class="map-search-results__item"
-      @click="$emit('select', item)"
-    >
-      <div class="map-search-results__name">{{ item.name || item.address || '未命名地址' }}</div>
-      <div class="map-search-results__address">{{ item.address || item.name || '-' }}</div>
+    <div class="map-search-results__list">
+      <div
+        v-for="(item, index) in pageResults"
+        :key="item.id || `${currentPage}-${index}`"
+        class="map-search-results__item"
+        :class="{ 'is-active': isActive(item, index) }"
+        @click="handleSelect(item, index)"
+      >
+        <img
+          v-if="item.photo || item.image"
+          class="map-search-results__thumb"
+          :src="item.photo || item.image"
+          alt=""
+        />
+        <div class="map-search-results__body">
+          <div class="map-search-results__name">
+            {{ item.name || item.address || '未命名地址' }}
+          </div>
+          <div class="map-search-results__address">
+            地址：{{ item.address || item.name || '-' }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="totalPages > 1" class="map-search-results__pager">
+      <button
+        v-for="page in visiblePages"
+        :key="page"
+        type="button"
+        class="map-search-results__page"
+        :class="{ 'is-active': page === currentPage }"
+        @click="currentPage = page"
+      >
+        {{ page }}
+      </button>
+      <button
+        type="button"
+        class="map-search-results__page map-search-results__page--next"
+        :disabled="currentPage >= totalPages"
+        @click="goNext"
+      >
+        下一页
+      </button>
     </div>
   </div>
 </template>
 
 <script>
+const PAGE_SIZE = 5;
+
 export default {
   props: {
     results: {
@@ -23,43 +58,167 @@ export default {
     },
   },
   emits: ['select'],
+  data() {
+    return {
+      currentPage: 1,
+      activeKey: '',
+    };
+  },
+  computed: {
+    totalPages() {
+      return Math.max(1, Math.ceil((this.results || []).length / PAGE_SIZE));
+    },
+    pageResults() {
+      const start = (this.currentPage - 1) * PAGE_SIZE;
+      return (this.results || []).slice(start, start + PAGE_SIZE);
+    },
+    visiblePages() {
+      const maxButtons = 3;
+      let start = Math.max(1, this.currentPage - 1);
+      let end = Math.min(this.totalPages, start + maxButtons - 1);
+      start = Math.max(1, end - maxButtons + 1);
+      const pages = [];
+      for (let page = start; page <= end; page += 1) {
+        pages.push(page);
+      }
+      return pages;
+    },
+  },
+  watch: {
+    results() {
+      this.currentPage = 1;
+      this.activeKey = '';
+    },
+  },
+  methods: {
+    resultKey(item, index) {
+      return item?.id ?? `${this.currentPage}-${index}`;
+    },
+    isActive(item, index) {
+      return this.activeKey === this.resultKey(item, index);
+    },
+    handleSelect(item, index) {
+      this.activeKey = this.resultKey(item, index);
+      this.$emit('select', item);
+    },
+    goNext() {
+      if (this.currentPage < this.totalPages) {
+        this.currentPage += 1;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .map-search-results {
-  width: 260px;
-  height: 420px;
-  overflow-y: auto;
-  border: 1px solid #eff1f7;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 2000;
+  display: flex;
+  flex-direction: column;
+  width: 360px;
+  max-height: 360px;
+  overflow: hidden;
   background: #fff;
-  flex: 0 0 260px;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.12);
+  pointer-events: auto;
 
-  &__title {
-    padding: 10px 12px;
-    border-bottom: 1px solid #eff1f7;
-    font-weight: 600;
+  &__list {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow-y: auto;
   }
 
   &__item {
+    display: flex;
+    gap: 10px;
+    align-items: flex-start;
     padding: 10px 12px;
     cursor: pointer;
-    border-bottom: 1px solid #f5f5f5;
+    border-bottom: 1px solid #ebeef5;
   }
 
-  &__item:hover {
-    background: #f5f9ff;
+  &__item:hover,
+  &__item.is-active {
+    background: #f5f5f5;
+  }
+
+  &__thumb {
+    flex: 0 0 48px;
+    width: 48px;
+    height: 48px;
+    object-fit: cover;
+    border: 1px solid #ebeef5;
+    background: #fafafa;
+  }
+
+  &__body {
+    flex: 1 1 auto;
+    min-width: 0;
   }
 
   &__name {
+    overflow: hidden;
     color: #303133;
     font-size: 14px;
+    font-weight: 600;
+    line-height: 1.4;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
   &__address {
     margin-top: 4px;
     color: #909399;
     font-size: 12px;
+    line-height: 1.5;
+    word-break: break-all;
+  }
+
+  &__pager {
+    display: flex;
+    flex: 0 0 auto;
+    flex-wrap: wrap;
+    gap: 6px;
+    align-items: center;
+    padding: 8px 10px;
+    border-top: 1px solid #ebeef5;
+    background: #fff;
+  }
+
+  &__page {
+    min-width: 28px;
+    height: 28px;
+    padding: 0 8px;
+    color: #606266;
+    font-size: 13px;
+    line-height: 26px;
+    text-align: center;
+    background: #fff;
+    border: 1px solid #dcdfe6;
+    cursor: pointer;
+
+    &:hover:not(:disabled) {
+      color: #409eff;
+      border-color: #409eff;
+    }
+
+    &.is-active {
+      color: #409eff;
+      border-color: #409eff;
+    }
+
+    &:disabled {
+      color: #c0c4cc;
+      cursor: not-allowed;
+    }
+
+    &--next {
+      min-width: 56px;
+    }
   }
 }
 </style>
diff --git a/src/option/business/waybill-manage.js b/src/option/business/waybill-manage.js
index fe51191..c981066 100644
--- a/src/option/business/waybill-manage.js
+++ b/src/option/business/waybill-manage.js
@@ -543,7 +543,8 @@ export const option = {
         prop: 'projectName',
         formslot: true,
         search: true,
-        searchLabel: '项目',
+        searchLabel: '项目名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 22,
         span: 6,
         order: 890,
@@ -555,6 +556,7 @@ export const option = {
         prop: 'customerName',
         search: true,
         searchLabel: '客户名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 21,
         minWidth: 150,
         addDisplay: false,
@@ -576,6 +578,7 @@ export const option = {
         prop: 'driverName',
         search: true,
         searchLabel: '司机名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 14,
         minWidth: 120,
         display: false,
@@ -626,6 +629,7 @@ export const option = {
         prop: 'carrierName',
         search: true,
         searchLabel: '承运商名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 15,
         minWidth: 150,
         display: false,
@@ -729,6 +733,7 @@ export const option = {
         prop: 'planName',
         formslot: true,
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 7,
         span: 6,
         order: 870,
@@ -738,6 +743,7 @@ export const option = {
         label: '货物类型',
         prop: 'cargoType',
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 18,
         formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
         minWidth: 130,
diff --git a/src/page/login/facelogin.vue b/src/page/login/facelogin.vue
index e1da201..0c09cb7 100644
--- a/src/page/login/facelogin.vue
+++ b/src/page/login/facelogin.vue
@@ -13,8 +13,8 @@ export default {
   data() {
     return {
       loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
       },
     };
   },
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index d981745..c22a330 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -93,9 +93,9 @@ export default {
         //角色ID
         roleId: '',
         //用户名
-        username: 'admin',
+        username: '',
         //密码
-        password: 'admin',
+        password: '',
         //账号类型
         type: 'account',
         //验证码的值
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 892329c..97be467 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -150,12 +150,15 @@ a {
   bottom: 0;
 }
 .map-picker-content {
-  display: flex;
-  gap: 12px;
+  position: relative;
+  display: block;
+  min-width: 0;
+  overflow: visible;
 
   > [class$='__map'],
   > .address-map {
-    flex: 1 1 auto;
+    position: relative;
+    z-index: 1;
     width: 100%;
     min-width: 0;
     box-sizing: border-box;
@@ -165,4 +168,8 @@ a {
       height: 100% !important;
     }
   }
+
+  > .map-search-results {
+    z-index: 2000;
+  }
 }
diff --git a/src/utils/carrier-org-resource.js b/src/utils/carrier-org-resource.js
new file mode 100644
index 0000000..65ffbc5
--- /dev/null
+++ b/src/utils/carrier-org-resource.js
@@ -0,0 +1,140 @@
+import { getDetail, getList as getCustomerList } from '@/api/vehicle/customer-archive';
+import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
+
+const orgNameCache = new Map();
+
+const extractRecords = res => {
+  const data = res?.data?.data ?? res?.data ?? res;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  return [];
+};
+
+const normalizeOrgName = value => String(value || '').trim();
+
+const uniqueOrgNames = (values = []) => {
+  const seen = new Set();
+  const result = [];
+  values.forEach(value => {
+    const name = normalizeOrgName(value);
+    if (!name || seen.has(name)) return;
+    seen.add(name);
+    result.push(name);
+  });
+  return result;
+};
+
+/**
+ * 解析承运商客商档案上联系人的所属组织（branchName），无联系人时回退客商所属组织。
+ */
+export const resolveCarrierOrganizationNames = async ({ carrierId, carrierName } = {}) => {
+  const id = String(carrierId || '').trim();
+  const name = normalizeOrgName(carrierName);
+  const cacheKey = id || name;
+  if (!cacheKey) return [];
+  if (orgNameCache.has(cacheKey)) return orgNameCache.get(cacheKey);
+
+  let detail = null;
+  if (id) {
+    try {
+      const res = await getDetail(id);
+      detail = res?.data?.data || res?.data || null;
+    } catch (error) {
+      detail = null;
+    }
+  }
+  if (!detail && name) {
+    try {
+      const res = await getCustomerList(1, 20, { fullName: name });
+      const records = extractRecords(res);
+      const matched =
+        records.find(item => normalizeOrgName(item.fullName || item.customerName) === name) ||
+        records[0];
+      if (matched?.id) {
+        const detailRes = await getDetail(matched.id);
+        detail = detailRes?.data?.data || detailRes?.data || matched;
+      }
+    } catch (error) {
+      detail = null;
+    }
+  }
+
+  const contacts = Array.isArray(detail?.contacts) ? detail.contacts : [];
+  const orgNames = uniqueOrgNames([
+    ...contacts.map(item => item.branchName),
+    detail?.deptName,
+    detail?.organizationName,
+  ]);
+  orgNameCache.set(cacheKey, orgNames);
+  if (id && name) orgNameCache.set(name, orgNames);
+  return orgNames;
+};
+
+export const clearCarrierOrganizationCache = (carrier = {}) => {
+  const id = String(carrier.carrierId || '').trim();
+  const name = normalizeOrgName(carrier.carrierName);
+  if (id) orgNameCache.delete(id);
+  if (name) orgNameCache.delete(name);
+};
+
+export const matchOrganizationName = (value, orgNames = []) => {
+  const text = normalizeOrgName(value);
+  if (!text || !orgNames.length) return false;
+  return orgNames.some(org => text === org || text.includes(org) || org.includes(text));
+};
+
+const filterByOrganizations = (records = [], orgNames = []) => {
+  if (!orgNames.length) return [];
+  return records.filter(item => matchOrganizationName(item.organizationName, orgNames));
+};
+
+/**
+ * 按承运商联系人所属组织筛选司机。
+ * 未选择承运商时返回空列表（需先选承运商）。
+ */
+export const fetchDriversByCarrierOrganizations = async (
+  query = {},
+  { carrierId, carrierName } = {}
+) => {
+  if (!String(carrierId || '').trim() && !normalizeOrgName(carrierName)) {
+    return [];
+  }
+  const orgNames = await resolveCarrierOrganizationNames({ carrierId, carrierName });
+  if (!orgNames.length) return [];
+
+  const size = Math.max(Number(query.size) || 50, 50);
+  const params = { ...query };
+  delete params.size;
+  // 单组织时用后端模糊条件缩小范围；多组织再前端精确过滤
+  if (orgNames.length === 1) {
+    params.organizationName = orgNames[0];
+  }
+  const res = await getDriverList(1, Math.min(size * 5, 200), params);
+  return filterByOrganizations(extractRecords(res), orgNames).slice(0, size);
+};
+
+/**
+ * 按承运商联系人所属组织筛选车辆。
+ * 未选择承运商时返回空列表。
+ */
+export const fetchVehiclesByCarrierOrganizations = async (
+  query = {},
+  { carrierId, carrierName } = {}
+) => {
+  if (!String(carrierId || '').trim() && !normalizeOrgName(carrierName)) {
+    return [];
+  }
+  const orgNames = await resolveCarrierOrganizationNames({ carrierId, carrierName });
+  if (!orgNames.length) return [];
+
+  const size = Math.max(Number(query.size) || 50, 50);
+  const params = { ...query };
+  delete params.size;
+  if (orgNames.length === 1) {
+    params.organizationName = orgNames[0];
+  }
+  const res = await getVehicleList(1, Math.min(size * 5, 200), params);
+  return filterByOrganizations(extractRecords(res), orgNames).slice(0, size);
+};
diff --git a/src/utils/map-search.js b/src/utils/map-search.js
new file mode 100644
index 0000000..a2bf1dd
--- /dev/null
+++ b/src/utils/map-search.js
@@ -0,0 +1,39 @@
+/**
+ * 将高德 Geocoder 结果规范化为地图选址浮层列表数据。
+ * @param {Array|Object} geocodesOrResult geocodes 数组，或含 geocodes/location 的结果对象
+ * @param {string} keyword 搜索关键词兜底文案
+ * @returns {Array<{id: string|number, name: string, address: string, location: any, photo: string}>}
+ */
+export function normalizeMapSearchResults(geocodesOrResult, keyword = '') {
+  const fallback = String(keyword || '').trim();
+  let list = [];
+  if (Array.isArray(geocodesOrResult)) {
+    list = geocodesOrResult;
+  } else if (geocodesOrResult && typeof geocodesOrResult === 'object') {
+    if (Array.isArray(geocodesOrResult.geocodes)) {
+      list = geocodesOrResult.geocodes;
+    } else if (geocodesOrResult.location) {
+      list = [geocodesOrResult];
+    }
+  }
+
+  return list.map((item, index) => {
+    const buildingName = pickNamedField(item?.building);
+    const neighborhoodName = pickNamedField(item?.neighborhood);
+    const address = item?.formattedAddress || item?.address || fallback || '-';
+    return {
+      id: item?.id || index,
+      name: buildingName || neighborhoodName || address,
+      address,
+      location: item?.location,
+      photo: item?.photo || item?.image || '',
+    };
+  });
+}
+
+function pickNamedField(value) {
+  if (!value) return '';
+  if (typeof value === 'string') return value.trim();
+  if (typeof value === 'object' && value.name) return String(value.name).trim();
+  return '';
+}
diff --git a/src/views/base/common-address.vue b/src/views/base/common-address.vue
index cc31086..724cb2a 100644
--- a/src/views/base/common-address.vue
+++ b/src/views/base/common-address.vue
@@ -233,8 +233,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="mapSearchResults" @select="selectMapSearchResult" />
         <div ref="amap" class="common-address-page__map"></div>
+        <map-search-results :results="mapSearchResults" @select="selectMapSearchResult" />
       </div>
       <div class="common-address-page__map-info">
         <span>{{ mapStatus }}</span>
@@ -270,6 +270,7 @@ import { createOption } from '@/option/base/common-address';
 import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { getToken } from '@/utils/auth';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { isMobile } from '@/utils/validate';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
@@ -1117,12 +1118,7 @@ export default {
           this.ensureAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.mapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.mapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.mapStatus = '未找到匹配地址';
diff --git a/src/views/business/common-route.vue b/src/views/business/common-route.vue
index e595c0d..54fe158 100644
--- a/src/views/business/common-route.vue
+++ b/src/views/business/common-route.vue
@@ -289,8 +289,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="routeMapSearchResults" @select="selectRouteMapSearchResult" />
         <div ref="routeAmap" class="common-route-page__map"></div>
+        <map-search-results :results="routeMapSearchResults" @select="selectRouteMapSearchResult" />
       </div>
       <div class="common-route-page__map-info">
         <span>{{ routeMapStatus }}</span>
@@ -323,6 +323,7 @@ import { addressTypeOptions } from '@/option/base/common-address';
 import { config, excelOption, option } from '@/option/business/common-route';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { List, Search } from '@element-plus/icons-vue';
@@ -616,12 +617,7 @@ export default {
         })
         .then(() => this.runAmapGeocode('location', keyword))
         .then(result => {
-          this.routeMapSearchResults = (result.geocodes || []).map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || keyword,
-            address: item.formattedAddress || keyword,
-            location: item.location,
-          }));
+          this.routeMapSearchResults = normalizeMapSearchResults(result, keyword);
           const point = this.resolveMapPoint(result);
           if (!point) {
             this.routeMapStatus = '未找到匹配地址';
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index f6c27e2..4c2f4f3 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -4007,7 +4007,7 @@
               </el-input>
               <div class="business-crud-page__dispatch-quantity-hint">
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -4064,7 +4064,11 @@
               </el-input>
             </el-form-item>
             <el-form-item label="其他费用合计">
-              <el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入">
+              <el-input
+                v-model="dispatchItemForm.otherFeeTotal"
+                placeholder="请输入"
+                @input="value => handleDispatchNumberInput('otherFeeTotal', value)"
+              >
                 <template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template>
               </el-input>
             </el-form-item>
@@ -4996,8 +5000,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
         <div ref="transportAmap" class="business-crud-page__map"></div>
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
       </div>
       <div class="business-crud-page__map-info">
         <span>{{ transportMapStatus }}</span>
@@ -5271,7 +5275,7 @@ import {
   getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
 import { getList as getCarrierCustomerList } from '@/api/vehicle/customer-archive';
-import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
@@ -5279,6 +5283,7 @@ import { packageOptions } from '@/option/business/common';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
@@ -6340,19 +6345,21 @@ export default {
       if (this.dispatchItemForm.taskEntryMode !== 'full') {
         const quantity = Number(this.dispatchItemForm.quantity || 0);
         const unitPrice = Number(this.dispatchItemForm.unitPrice || 0);
-        const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+        const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+        const otherFeeTotal = Number(otherFeeRaw || 0);
         const hasFreight = this.dispatchItemForm.unitPrice !== '' && quantity > 0;
-        const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+        const hasOtherFee = otherFeeRaw !== '';
         if (!hasFreight && !hasOtherFee) return '';
         const total = (hasFreight ? quantity * unitPrice : 0) + (hasOtherFee ? otherFeeTotal : 0);
         return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
       }
-      const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+      const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+      const otherFeeTotal = Number(otherFeeRaw || 0);
       const freightTotal = this.dispatchItemCargoRows.reduce(
         (total, cargo) => total + Number(this.dispatchCargoFreightAmount(cargo) || 0),
         0
       );
-      const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+      const hasOtherFee = otherFeeRaw !== '';
       if (!freightTotal && !hasOtherFee) return '';
       const total = freightTotal + (hasOtherFee ? otherFeeTotal : 0);
       return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
@@ -8919,6 +8926,7 @@ export default {
         this.form.carrierContractId = '';
       }
       this.form.carrierType = nextValue;
+      this.clearTaskDriverVehicleFields();
       if (this.isWaybillDetailLayout) {
         this.taskCarrierRequestId += 1;
         this.taskCarrierOptions = [];
@@ -9036,25 +9044,58 @@ export default {
     },
     handleTaskCarrierChange(value) {
       const carrier = this.taskCarrierOptions.find(item =>
-        [item.value, item.customerName, item.carrierName, item.fullName, item.name].some(name =>
-          String(name || '') === String(value || '')
-        )
+        [
+          item.value,
+          item.customerName,
+          item.carrierName,
+          item.fullName,
+          item.name,
+          item.carrierContractId,
+        ].some(name => String(name || '') === String(value || ''))
       );
       if (this.isWaybillDetailLayout && this.form.carrierType === '承运商') {
         this.form.carrierContractId = carrier?.carrierContractId || '';
         this.form.carrierId = carrier?.carrierId || '';
         this.form.carrierName = carrier?.carrierName || value || '';
-        return;
+      } else {
+        this.form.carrierId = carrier?.id || carrier?.carrierId || '';
+        this.form.carrierName = value || '';
       }
-      this.form.carrierId = carrier?.id || '';
-      this.form.carrierName = value || '';
+      this.clearTaskDriverVehicleFields();
+    },
+    clearTaskDriverVehicleFields() {
+      this.form.driverId = '';
+      this.form.driverName = '';
+      this.form.driverPhone = '';
+      this.form.vehicleNo = '';
+      this.form.trailerVehicleNo = '';
+      this.form.escortName = '';
+      this.form.escortPhone = '';
+      this.taskDriverOptions = [];
+    },
+    getActiveCarrierFilter() {
+      if (this.dispatchItemBox) {
+        return {
+          carrierId: this.dispatchItemForm.carrierId || '',
+          carrierName: this.dispatchItemForm.carrierName || '',
+        };
+      }
+      return {
+        carrierId: this.form.carrierId || '',
+        carrierName: this.form.carrierName || '',
+      };
     },
     loadTaskDriverOptions() {
       if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
+      const carrier = this.getActiveCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.taskDriverOptions = [];
+        return Promise.resolve([]);
+      }
       this.taskDriverLoading = true;
-      return getDriverList(1, 9999, {})
-        .then(res => {
-          this.taskDriverOptions = extractRecords(res);
+      return fetchDriversByCarrierOrganizations({ size: 9999, posts: '司机' }, carrier)
+        .then(records => {
+          this.taskDriverOptions = records;
           return this.taskDriverOptions;
         })
         .finally(() => {
@@ -9063,10 +9104,17 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getActiveCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskDriverLoading = true;
-      getDriverList(1, 20, keyword ? { driverName: keyword } : {})
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.taskDriverOptions = records;
           callback(
             records.map(item => ({
@@ -10239,12 +10287,7 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -12760,6 +12803,9 @@ export default {
         ...baseRow,
         ...(index >= 0 ? row : {}),
       };
+      this.dispatchItemForm.otherFeeTotal = this.normalizeDispatchFeeValue(
+        this.dispatchItemForm.otherFeeTotal
+      );
       this.dispatchItemForm.carrierType = this.dispatchItemForm.carrierType || '承运商';
       const goodsRows = this.parseJsonArray(this.dispatchItemForm.goodsJson);
       this.dispatchItemCargoRows = (goodsRows.length ? goodsRows : [this.dispatchItemForm]).map(
@@ -12816,6 +12862,7 @@ export default {
         }
       }
       this.dispatchItemForm.carrierType = nextValue;
+      this.clearDispatchDriverVehicleFields();
       this.loadDispatchCarrierOptions(this.dispatchRow);
     },
     isDispatchCarrierRequired(carrierType) {
@@ -12945,20 +12992,39 @@ export default {
       });
       if (this.dispatchIsCarrierMode) {
         this.dispatchItemForm.carrierContractId = carrier?.carrierContractId || '';
-        this.dispatchItemForm.carrierId = '';
+        this.dispatchItemForm.carrierId = carrier?.carrierId || '';
         this.dispatchItemForm.carrierName = carrier?.carrierName || '';
-        return;
+      } else {
+        this.dispatchItemForm.carrierContractId = '';
+        this.dispatchItemForm.carrierId = carrier?.id || carrier?.carrierId || '';
+        this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
       }
-      this.dispatchItemForm.carrierContractId = '';
-      this.dispatchItemForm.carrierId = carrier?.id || '';
-      this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
+      this.clearDispatchDriverVehicleFields();
+    },
+    clearDispatchDriverVehicleFields() {
+      this.dispatchItemForm.driverId = '';
+      this.dispatchItemForm.driverName = '';
+      this.dispatchItemForm.driverPhone = '';
+      this.dispatchItemForm.vehicleNo = '';
+      this.dispatchItemForm.trailerVehicleNo = '';
+      this.dispatchItemForm.escortName = '';
+      this.dispatchItemForm.escortPhone = '';
+      this.taskDriverOptions = [];
     },
     loadDispatchDriverOptions() {
       if (this.taskDriverLoading) return Promise.resolve([]);
+      const carrier = {
+        carrierId: this.dispatchItemForm.carrierId || '',
+        carrierName: this.dispatchItemForm.carrierName || '',
+      };
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.taskDriverOptions = [];
+        return Promise.resolve([]);
+      }
       this.taskDriverLoading = true;
-      return getDriverList(1, 9999, {})
-        .then(res => {
-          this.taskDriverOptions = extractRecords(res);
+      return fetchDriversByCarrierOrganizations({ size: 9999, posts: '司机' }, carrier)
+        .then(records => {
+          this.taskDriverOptions = records;
           return this.taskDriverOptions;
         })
         .finally(() => {
@@ -13035,6 +13101,11 @@ export default {
       this.dispatchItemForm[prop] =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
     },
+    normalizeDispatchFeeValue(value) {
+      if (value === undefined || value === null || value === '') return '';
+      if (Number(value) === -1) return '';
+      return value;
+    },
     addDispatchCargoRow(index = -1) {
       const nextRow = this.normalizeTransportCargoRow({ priceUnit: '元/吨' });
       if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
@@ -13118,6 +13189,12 @@ export default {
         }, 0)
       );
     },
+    /** 精简录入提示：可调度余量扣减当前本次数量后的剩余 */
+    dispatchItemHintRemainingQuantity(row = {}) {
+      const available = this.dispatchItemRemainingQuantity(row);
+      const current = this.parseDispatchQuantity(row.quantity);
+      return Math.max(available - current, 0);
+    },
     pruneDispatchPendingRows(rows = []) {
       const planQuantities = new Map();
       this.dispatchPlanGoodsRows.forEach(goods => {
@@ -13364,14 +13441,29 @@ export default {
               }),
             ];
       const firstGoods = goodsRows[0] || {};
+      const quantitySum = goodsRows.reduce(
+        (sum, goods) => sum + this.parseDispatchQuantity(goods.quantity),
+        0
+      );
+      const quantityText = quantitySum
+        ? this.formatDispatchQuantity(quantitySum)
+        : firstGoods.quantity || this.dispatchItemForm.quantity || '';
+      const otherFeeTotal = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
       const nextRow = {
         ...this.dispatchItemForm,
         goodsJson: JSON.stringify(goodsRows),
         cargoType: firstGoods.cargoType || this.dispatchItemForm.cargoType || '',
         cargoTypeCode: firstGoods.cargoTypeCode || this.dispatchItemForm.cargoTypeCode || '',
         cargoTypePath: firstGoods.cargoTypePath || this.dispatchItemForm.cargoTypePath || [],
-        cargoName: firstGoods.cargoName || this.dispatchItemForm.cargoName || '',
-        quantity: firstGoods.quantity || this.dispatchItemForm.quantity || '',
+        cargoName:
+          goodsRows
+            .map(goods => goods.cargoName || goods.goodsName || '')
+            .filter(Boolean)
+            .join('.') ||
+          firstGoods.cargoName ||
+          this.dispatchItemForm.cargoName ||
+          '',
+        quantity: quantityText,
         quantityUnit: firstGoods.quantityUnit || this.dispatchItemForm.quantityUnit || '',
         unitPrice: firstGoods.unitPrice || '',
         priceUnit: firstGoods.priceUnit || '',
@@ -13379,7 +13471,7 @@ export default {
         freightJson: JSON.stringify({
           currency: this.dispatchItemForm.freightCurrency || 'CNY',
           totalFreightAmount: this.dispatchItemFreightSubtotal,
-          otherFreightAmount: this.dispatchItemForm.otherFeeTotal || '',
+          otherFreightAmount: otherFeeTotal,
           freightItems: goodsRows.map((cargo, index) => ({
             cargoIndex: index,
             cargoName: cargo.cargoName || '',
@@ -13395,7 +13487,7 @@ export default {
       };
       nextRow.cargoInfo = this.formatDispatchCargoInfo({}, nextRow);
       nextRow.freight = this.getDispatchFeeFields({}, nextRow).freight;
-      nextRow.otherFeeTotal = this.dispatchItemForm.otherFeeTotal || '';
+      nextRow.otherFeeTotal = otherFeeTotal;
       const quantityUnit = this.getDispatchQuantityUnit(nextRow);
       const otherDispatchedQuantity = this.dispatchRows.reduce((total, row, index) => {
         if (
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 019a265..9b0f04a 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -156,11 +156,11 @@
             <el-row :gutter="16">
               <template v-if="isRoad(route)">
                 <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
-                <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-autocomplete :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" :debounce="300" :fetch-suggestions="fetchDriverSuggestions" clearable placeholder="请输入司机" :loading="driverLoading" @select="item => handleDriverSuggestionSelect(route, item)" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-autocomplete :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" :debounce="300" :fetch-suggestions="(query, cb) => fetchDriverSuggestions(route, query, cb)" clearable placeholder="请输入司机" :loading="driverLoading" @select="item => handleDriverSuggestionSelect(route, item)" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item :label="route.carrierType === '承运商' ? '手机号' : '司机手机号'" :required="route.carrierType !== '承运商'"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="车牌号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="挂车车牌号"><el-input v-model="route.trailerVehicleNo" placeholder="请输入" /></el-form-item></el-col>
-                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人"><el-autocomplete v-model="route.escortName" :debounce="300" :fetch-suggestions="fetchEscortSuggestions" clearable placeholder="请输入" :loading="escortLoading" @select="item => handleEscortSuggestionSelect(route, item)" /></el-form-item></el-col>
+                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人"><el-autocomplete v-model="route.escortName" :debounce="300" :fetch-suggestions="(query, cb) => fetchEscortSuggestions(route, query, cb)" clearable placeholder="请输入" :loading="escortLoading" @select="item => handleEscortSuggestionSelect(route, item)" /></el-form-item></el-col>
                 <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人手机号"><el-input v-model="route.escortPhone" placeholder="请输入" /></el-form-item></el-col>
               </template>
               <template v-else>
@@ -233,7 +233,7 @@
 
 <script>
 import * as api from '@/api/business/master-order';
-import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { isMobile } from '@/utils/validate';
 
 const unwrapRecords = res => {
@@ -290,7 +290,7 @@ export default {
     },
   },
   async mounted() {
-    await Promise.all([this.load(), this.loadCarrierOptions(), this.loadDriverOptions()]);
+    await Promise.all([this.load(), this.loadCarrierOptions()]);
     this.applySelfOperatedCarrierDefaults();
   },
   methods: {
@@ -727,6 +727,7 @@ export default {
       route.carrierName = '';
       route.carrierId = '';
       route.carrierContractId = '';
+      this.clearRouteDriverVehicleFields(route);
       if (value === '承运商') {
         route.trailerVehicleNo = '';
         route.escortName = '';
@@ -746,6 +747,24 @@ export default {
       route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
       route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
       route.carrierName = contract?.carrierName || '';
+      this.clearRouteDriverVehicleFields(route);
+    },
+    clearRouteDriverVehicleFields(route) {
+      if (!route) return;
+      route.driverId = '';
+      route.driverName = '';
+      route.driverPhone = '';
+      route.vehicleNo = '';
+      route.trailerVehicleNo = '';
+      route.escortName = '';
+      route.escortPhone = '';
+      this.driverOptions = [];
+    },
+    getRouteCarrierFilter(route = {}) {
+      return {
+        carrierId: route.carrierId || '',
+        carrierName: route.carrierName || '',
+      };
     },
     carrierOptionValue(item = {}) {
       return item.contractId || item.id || item.value || item.carrierName || '';
@@ -817,18 +836,30 @@ export default {
         route.carrierContractId = '';
       });
     },
-    async loadDriverOptions(keyword = '') {
+    async loadDriverOptions(route = {}, keyword = '') {
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.driverOptions = [];
+        return [];
+      }
       this.driverLoading = true;
       try {
-        this.driverOptions = unwrapRecords(
-          await getDriverList(1, 20, { driverName: keyword, posts: '司机' })
+        this.driverOptions = await fetchDriversByCarrierOrganizations(
+          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+          carrier
         );
+        return this.driverOptions;
       } finally {
         this.driverLoading = false;
       }
     },
-    fetchDriverSuggestions(queryString, callback) {
-      this.loadDriverOptions(String(queryString || '').trim())
+    fetchDriverSuggestions(route, queryString, callback) {
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
+      this.loadDriverOptions(route, String(queryString || '').trim())
         .then(() =>
           callback(
             this.driverOptions.map(item => ({
@@ -846,13 +877,21 @@ export default {
       const drivingVehicle = String(item.drivingVehicle || '').trim();
       if (drivingVehicle) route.vehicleNo = drivingVehicle;
     },
-    fetchEscortSuggestions(queryString, callback) {
+    fetchEscortSuggestions(route, queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.escortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           callback(
-            unwrapRecords(res).map(item => ({
+            records.map(item => ({
               ...item,
               value: this.driverOptionLabel(item),
             }))
diff --git a/src/views/business/components/master-order-editor.vue b/src/views/business/components/master-order-editor.vue
index 70dfa62..43e6525 100644
--- a/src/views/business/components/master-order-editor.vue
+++ b/src/views/business/components/master-order-editor.vue
@@ -402,8 +402,8 @@
         >
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="mapSearchResults" @select="selectAddressMapSearchResult" />
         <div ref="addressMap" class="address-map" />
+        <map-search-results :results="mapSearchResults" @select="selectAddressMapSearchResult" />
       </div>
       <div class="address-map-status">
         {{ mapStatus
@@ -601,6 +601,7 @@ let amapLoader;
 import { getList as getCommonRouteList } from '@/api/business/common-route';
 import * as api from '@/api/business/master-order';
 import { formatUpdateUserName } from '@/utils/audit';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { isMobile } from '@/utils/validate';
 export default {
   components: {
@@ -1285,14 +1286,8 @@ export default {
             )
         )
         .then(result => {
-          const geocodes = result?.geocodes || [];
-          this.mapSearchResults = geocodes.map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || this.mapKeyword,
-            address: item.formattedAddress || this.mapKeyword,
-            location: item.location,
-          }));
-          const point = geocodes[0]?.location;
+          this.mapSearchResults = normalizeMapSearchResults(result, this.mapKeyword);
+          const point = this.mapSearchResults[0]?.location;
           if (!point) return this.$message.warning('地图搜索无匹配地址');
           this.pickAddressMap(point, this.mapKeyword);
         })
@@ -2199,8 +2194,15 @@ export default {
   display: flex;
   gap: 8px;
   margin-bottom: 12px;
+
+  .el-input {
+    flex: 1;
+    min-width: 0;
+  }
 }
 .address-map {
+  width: 100%;
+  min-width: 0;
   height: 440px;
 }
 .address-map-status {
diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue
index 3b33a8f..dcc7b72 100644
--- a/src/views/business/components/shipping-template-page.vue
+++ b/src/views/business/components/shipping-template-page.vue
@@ -931,11 +931,11 @@
         /><el-button type="primary" @click="searchTransportMapKeyword">搜索</el-button>
       </div>
       <div class="map-picker-content">
+        <div ref="transportMap" class="shipping-template-page__map" />
         <map-search-results
           :results="transportMapSearchResults"
           @select="selectTransportMapSearchResult"
         />
-        <div ref="transportMap" class="shipping-template-page__map" />
       </div>
       <div class="shipping-template-page__map-info">{{ transportMapStatus }}</div>
       <template #footer
@@ -1098,6 +1098,7 @@ import {
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary } from '@/api/system/dictbiz';
 import { packageOptions } from '@/option/business/common';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { Location } from '@element-plus/icons-vue';
@@ -2615,12 +2616,7 @@ export default {
         .then(() => this.ensureTransportMapGeocoder())
         .then(() => this.runTransportMapGeocode('location', keyword))
         .then(result => {
-          this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || keyword,
-            address: item.formattedAddress || keyword,
-            location: item.location,
-          }));
+          this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
           const point = this.resolveTransportMapPoint(result);
           if (!point) throw new Error('未找到匹配地址');
           return this.$nextTick().then(() => {
@@ -3754,6 +3750,12 @@ export default {
 .shipping-template-page__map-toolbar {
   display: flex;
   gap: 8px;
+  margin-bottom: 12px;
+
+  .el-input {
+    flex: 1;
+    min-width: 0;
+  }
 }
 .shipping-template-page__dialog-search {
   margin-bottom: 8px;
@@ -3766,11 +3768,9 @@ export default {
   justify-content: flex-end;
 }
 .shipping-template-page__map {
-  flex: 1 1 auto;
   width: 100%;
   min-width: 0;
   height: 480px;
-  margin-top: 12px;
 }
 :deep(.shipping-template-page__map > .amap-container) {
   width: 100% !important;
diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue
index 9d02e48..1780e79 100644
--- a/src/views/business/components/transport-plan-page.vue
+++ b/src/views/business/components/transport-plan-page.vue
@@ -637,13 +637,14 @@
                 <span>|</span>
                 {{ detailRow.planNo || '-' }}
               </h2>
-              <span class="detail-status-text is-dispatching">
+              <span class="detail-status-text" :class="detailStatusTextClass">
                 {{ displayStatus(detailRow, 'businessStatus') }}
               </span>
               <span class="detail-status-text detail-transport-type">
                 {{
                   detailRow.transportTypeName ||
-                  formatTransportPlanDetailTransportType(detailRow.transportType)
+                  formatTransportPlanDetailTransportType(detailRow.transportType) ||
+                  '-'
                 }}
               </span>
             </div>
@@ -1231,7 +1232,7 @@
                 {{ dispatchDialogStatusText }}
               </el-tag>
               <el-tag type="primary" effect="light">
-                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路运输' }}
+                {{ formatDispatchTransportType(dispatchRow.transportType) || '-' }}
               </el-tag>
             </div>
           </div>
@@ -1931,7 +1932,7 @@
                 class="transport-plan-page__dispatch-quantity-hint"
               >
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -1997,7 +1998,11 @@
               </el-input>
             </el-form-item>
             <el-form-item label="其他费用合计">
-              <el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入">
+              <el-input
+                v-model="dispatchItemForm.otherFeeTotal"
+                placeholder="请输入"
+                @input="value => handleDispatchNumberInput('otherFeeTotal', value)"
+              >
                 <template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template>
               </el-input>
             </el-form-item>
@@ -2547,8 +2552,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
         <div ref="transportAmap" class="transport-plan-page__map"></div>
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
       </div>
       <div class="transport-plan-page__map-info">
         <span>{{ transportMapStatus }}</span>
@@ -2729,13 +2734,14 @@ import {
   getList as getProjectList,
 } from '@/api/business/project-apply';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
-import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
 import { packageOptions } from '@/option/business/common';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
@@ -3284,6 +3290,23 @@ export default {
     isTransportPlanDetailLayout() {
       return this.detailBox;
     },
+    detailStatusTextClass() {
+      const status = this.detailRow?.businessStatus;
+      if (status === 2 || status === '2' || status === 'completed') {
+        return 'status-text-success';
+      }
+      if (status === 1 || status === '1' || status === 'dispatching') {
+        return 'is-dispatching';
+      }
+      if (
+        status === 3 ||
+        status === '3' ||
+        ['rejected', 'change_rejected', 'cancelled', 'withdrawn'].includes(status)
+      ) {
+        return 'is-danger';
+      }
+      return 'is-info';
+    },
     transportPlanGoodsText() {
       const text = this.formatTransportPlanGoodsInfo(this.detailRow);
       return text && text !== '-' ? text : '暂无货物信息';
@@ -3526,17 +3549,19 @@ export default {
     },
     dispatchItemFreightTotal() {
       if (this.dispatchItemForm.taskEntryMode !== 'full') {
-        const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+        const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+        const otherFeeTotal = Number(otherFeeRaw || 0);
         const freight = this.dispatchItemFreightSubtotal;
         const hasFreight = freight !== '';
-        const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+        const hasOtherFee = otherFeeRaw !== '';
         if (!hasFreight && !hasOtherFee) return '';
         const total = (hasFreight ? Number(freight) : 0) + (hasOtherFee ? otherFeeTotal : 0);
         return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
       }
-      const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+      const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+      const otherFeeTotal = Number(otherFeeRaw || 0);
       const freightSubtotal = this.dispatchItemFreightSubtotal;
-      const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+      const hasOtherFee = otherFeeRaw !== '';
       if (freightSubtotal === '' && !hasOtherFee) return '';
       const total = Number(freightSubtotal || 0) + (hasOtherFee ? otherFeeTotal : 0);
       return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
@@ -4841,10 +4866,17 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getDispatchCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskDriverLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.taskDriverOptions = records;
           callback(
             records.map(item => ({
@@ -4863,10 +4895,17 @@ export default {
     },
     fetchTaskEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getDispatchCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskEscortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           this.taskEscortOptions = records;
           callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
         })
@@ -5738,12 +5777,7 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -7241,11 +7275,13 @@ export default {
         freightInfo.freightItems?.[0]?.unitPrice ??
         '';
       const otherFeeTotal =
-        item.otherFeeTotal ??
-        plan.otherFeeTotal ??
-        freightInfo.otherFeeTotal ??
-        freightInfo.otherFreightAmount ??
-        '';
+        this.normalizeDispatchFeeValue(
+          item.otherFeeTotal ??
+            plan.otherFeeTotal ??
+            freightInfo.otherFeeTotal ??
+            freightInfo.otherFreightAmount ??
+            ''
+        );
       const quantity = Number(
         item.quantity ||
           item.cargoQuantity ||
@@ -7560,6 +7596,9 @@ export default {
         ...baseRow,
         ...(index >= 0 ? row : {}),
       };
+      this.dispatchItemForm.otherFeeTotal = this.normalizeDispatchFeeValue(
+        this.dispatchItemForm.otherFeeTotal
+      );
       this.dispatchItemForm.carrierType = this.dispatchItemForm.carrierType || '承运商';
       this.loadDispatchCarrierOptions(this.dispatchRow).then(() => {
         this.applyDispatchSelfCarrierDefaults();
@@ -7611,6 +7650,7 @@ export default {
       this.dispatchItemForm.carrierName = '';
       this.dispatchItemForm.carrierId = '';
       this.dispatchItemForm.carrierContractId = '';
+      this.clearDispatchDriverVehicleFields();
       if (nextValue === '承运商') {
         this.dispatchItemForm.trailerVehicleNo = '';
         this.dispatchItemForm.escortName = '';
@@ -7798,12 +7838,29 @@ export default {
         this.dispatchItemForm.carrierContractId = carrier?.carrierContractId || '';
         this.dispatchItemForm.carrierId = carrier?.carrierId || '';
         this.dispatchItemForm.carrierName = carrier?.carrierName || '';
-        return;
+      } else {
+        this.dispatchItemForm.carrierContractId = '';
+        this.dispatchItemForm.carrierId = '';
+        this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
       }
-      this.dispatchItemForm.carrierContractId = '';
-      this.dispatchItemForm.carrierId =
-        this.dispatchItemForm.carrierType === '自运' ? '' : carrier?.id || '';
-      this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
+      this.clearDispatchDriverVehicleFields();
+    },
+    clearDispatchDriverVehicleFields() {
+      this.dispatchItemForm.driverId = '';
+      this.dispatchItemForm.driverName = '';
+      this.dispatchItemForm.driverPhone = '';
+      this.dispatchItemForm.vehicleNo = '';
+      this.dispatchItemForm.trailerVehicleNo = '';
+      this.dispatchItemForm.escortName = '';
+      this.dispatchItemForm.escortPhone = '';
+      this.taskDriverOptions = [];
+      this.taskEscortOptions = [];
+    },
+    getDispatchCarrierFilter() {
+      return {
+        carrierId: this.dispatchItemForm.carrierId || '',
+        carrierName: this.dispatchItemForm.carrierName || '',
+      };
     },
     handleDispatchCargoQuantityInput(row, value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
@@ -7820,6 +7877,11 @@ export default {
       this.dispatchItemForm[prop] =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
     },
+    normalizeDispatchFeeValue(value) {
+      if (value === undefined || value === null || value === '') return '';
+      if (Number(value) === -1) return '';
+      return value;
+    },
     addDispatchCargoRow(index = -1) {
       const nextRow = this.normalizeTransportCargoRow({ priceUnit: '元/吨' });
       if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
@@ -7972,6 +8034,12 @@ export default {
         }, 0)
       );
     },
+    /** 精简录入提示：可调度余量扣减当前本次数量后的剩余 */
+    dispatchItemHintRemainingQuantity(row = {}) {
+      const available = this.dispatchItemRemainingQuantity(row);
+      const current = this.parseDispatchQuantity(row.quantity);
+      return Math.max(available - current, 0);
+    },
     pruneDispatchPendingRows(rows = []) {
       const planQuantities = new Map();
       this.dispatchPlanGoodsRows.forEach(goods => {
@@ -8220,14 +8288,29 @@ export default {
               }),
             ];
       const firstGoods = goodsRows[0] || {};
+      const quantitySum = goodsRows.reduce(
+        (sum, goods) => sum + this.parseDispatchQuantity(goods.quantity),
+        0
+      );
+      const quantityText = quantitySum
+        ? this.formatDispatchQuantity(quantitySum)
+        : firstGoods.quantity || this.dispatchItemForm.quantity || '';
+      const otherFeeTotal = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
       const nextRow = {
         ...this.dispatchItemForm,
         goodsJson: JSON.stringify(goodsRows),
         cargoType: firstGoods.cargoType || this.dispatchItemForm.cargoType || '',
         cargoTypeCode: firstGoods.cargoTypeCode || this.dispatchItemForm.cargoTypeCode || '',
         cargoTypePath: firstGoods.cargoTypePath || this.dispatchItemForm.cargoTypePath || [],
-        cargoName: firstGoods.cargoName || this.dispatchItemForm.cargoName || '',
-        quantity: firstGoods.quantity || this.dispatchItemForm.quantity || '',
+        cargoName:
+          goodsRows
+            .map(goods => goods.cargoName || goods.goodsName || '')
+            .filter(Boolean)
+            .join('.') ||
+          firstGoods.cargoName ||
+          this.dispatchItemForm.cargoName ||
+          '',
+        quantity: quantityText,
         quantityUnit: firstGoods.quantityUnit || this.dispatchItemForm.quantityUnit || '',
         unitPrice: firstGoods.unitPrice || '',
         priceUnit: firstGoods.priceUnit || '',
@@ -8235,7 +8318,7 @@ export default {
         freightJson: JSON.stringify({
           currency: this.dispatchContractCurrency || this.dispatchItemForm.freightCurrency || 'RMB',
           totalFreightAmount: this.dispatchItemFreightSubtotal,
-          otherFreightAmount: this.dispatchItemForm.otherFeeTotal || '',
+          otherFreightAmount: otherFeeTotal,
           freightItems: goodsRows.map((cargo, index) => ({
             cargoIndex: index,
             cargoName: cargo.cargoName || '',
@@ -8251,7 +8334,7 @@ export default {
       };
       nextRow.cargoInfo = this.formatDispatchCargoInfo({}, nextRow);
       nextRow.freight = this.dispatchItemFreightSubtotal;
-      nextRow.otherFeeTotal = this.dispatchItemForm.otherFeeTotal || '';
+      nextRow.otherFeeTotal = otherFeeTotal;
       const quantityUnit = this.getDispatchQuantityUnit(nextRow);
       const otherDispatchedQuantity = this.dispatchRows.reduce((total, row, index) => {
         if (
@@ -9348,19 +9431,36 @@ export default {
       }
     }
 
-    :deep(.el-tag) {
-      height: 36px;
-      padding: 0 14px;
-      border: 0;
+    .detail-status-text {
+      display: inline-flex;
+      align-items: center;
+      height: 28px;
+      padding: 0 12px;
       border-radius: 8px;
-      font-size: 14px;
-      line-height: 36px;
+      font-size: 13px;
+      line-height: 28px;
     }
 
-    :deep(.is-dispatching) {
+    .status-text-success,
+    .is-dispatching {
       color: #67c23a;
       background: #e1f3d8;
     }
+
+    .detail-transport-type {
+      color: #409eff;
+      background: #ecf5ff;
+    }
+
+    .is-danger {
+      color: #f56c6c;
+      background: #fef0f0;
+    }
+
+    .is-info {
+      color: #909399;
+      background: #f4f4f5;
+    }
   }
 
   &__transport-plan-detail-overview {
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index a787d26..71ea562 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -1939,12 +1939,17 @@
                     }}</strong
                   >
                 </div>
-                <div
-                  v-if="!waybillIsCarrier(detailRow)"
-                  class="waybill-manage-page__waybill-detail-field"
-                >
+                <div class="waybill-manage-page__waybill-detail-field">
                   <span>里程(km)</span
-                  ><strong>{{ normalizeMileageValue(detailRow.mileage) || '-' }}</strong>
+                  ><strong>{{ waybillDetailMileage(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划发货日期</span
+                  ><strong>{{ waybillDetailEstimatedStartTime(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划完成日期</span
+                  ><strong>{{ waybillDetailEstimatedEndTime(detailRow) || '-' }}</strong>
                 </div>
               </template>
               <template v-else-if="waybillIsNonRoadTransport(detailRow)">
@@ -1966,12 +1971,32 @@
                 <div class="waybill-manage-page__waybill-detail-field">
                   <span>仓位</span><strong>{{ detailRow.cabinNo || '-' }}</strong>
                 </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>预计发货日期</span
+                  ><strong>{{ waybillDetailEstimatedStartTime(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>预计完成日期</span
+                  ><strong>{{ waybillDetailEstimatedEndTime(detailRow) || '-' }}</strong>
+                </div>
               </template>
               <template v-else>
                 <div class="waybill-manage-page__waybill-detail-field">
                   <span>{{ waybillVehicleNoLabel(detailRow) }}</span>
                   <strong>{{ detailRow.vehicleNo || '-' }}</strong>
                 </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>里程(km)</span
+                  ><strong>{{ waybillDetailMileage(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划发货日期</span
+                  ><strong>{{ waybillDetailEstimatedStartTime(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划完成日期</span
+                  ><strong>{{ waybillDetailEstimatedEndTime(detailRow) || '-' }}</strong>
+                </div>
               </template>
               <div
                 class="waybill-manage-page__waybill-detail-field"
@@ -2851,8 +2876,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
         <div ref="transportAmap" class="waybill-manage-page__map"></div>
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
       </div>
       <div class="waybill-manage-page__map-info">
         <span>{{ transportMapStatus }}</span>
@@ -3112,6 +3137,9 @@ import {
 import { getPunchRecords as getWaybillPunchRecords, locateVehicle, trackVehicle } from '@/api/business/waybill-manage';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import {
+  fetchDriversByCarrierOrganizations,
+} from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
@@ -3120,11 +3148,12 @@ import { formatUpdateUserName } from '@/utils/audit';
 import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { InfoFilled, Location, OfficeBuilding, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
-import { ElImageViewer } from 'element-plus';
+import { ElAutocomplete, ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import {
   fallbackPlugin,
@@ -3634,6 +3663,7 @@ export default {
     this.detailPageLocked = this.isStandaloneWaybillDetailPage;
     this.formModeLocked = this.$route.query.mode || '';
     if (this.isPublicWaybillView) return;
+    this.setupSearchAutocompletes();
     if (this.config.enableAllDept && this.isAdmin) {
       this.allDept = 1;
     }
@@ -4292,8 +4322,12 @@ export default {
       ) {
         return false;
       }
+      // 进行中的运单隐藏取消（与 config.canCancel / isInProgressStatus 对齐）
+      if (typeof this.config.canCancel === 'function' && !this.config.canCancel(row)) {
+        return false;
+      }
       const status = this.statusValue(row);
-      return ['pending', 'processing', 'running'].includes(status);
+      return status === 'pending';
     },
     canComplete(row) {
       if (
@@ -4524,6 +4558,42 @@ export default {
     waybillIsCarrier(row = {}) {
       return String(row.carrierTypeName || row.carrierType || '').trim() === '承运商';
     },
+    waybillDetailTaskInfo(row = {}) {
+      return this.parseJsonObject(row.taskInfoJson || row.taskInfo || {});
+    },
+    waybillDetailMileage(row = {}) {
+      const taskInfo = this.waybillDetailTaskInfo(row);
+      const goodsRows = this.parseJsonArray(row.goodsJson);
+      const firstGoods = goodsRows[0] || {};
+      return this.normalizeMileageValue(
+        row.mileage || taskInfo.mileage || firstGoods.mileage || ''
+      );
+    },
+    waybillDetailEstimatedStartTime(row = {}) {
+      const taskInfo = this.waybillDetailTaskInfo(row);
+      const value =
+        row.estimatedStartTime ||
+        row.planStartDate ||
+        taskInfo.estimatedStartTime ||
+        taskInfo.planStartDate ||
+        '';
+      return this.formatWaybillDetailDate(value);
+    },
+    waybillDetailEstimatedEndTime(row = {}) {
+      const taskInfo = this.waybillDetailTaskInfo(row);
+      const value =
+        row.estimatedEndTime ||
+        row.planEndDate ||
+        taskInfo.estimatedEndTime ||
+        taskInfo.planEndDate ||
+        '';
+      return this.formatWaybillDetailDate(value);
+    },
+    formatWaybillDetailDate(value) {
+      const text = String(value || '').trim();
+      if (!text) return '';
+      return text.slice(0, 10);
+    },
     waybillVehicleNoLabel(row = {}) {
       return this.waybillIsRoadTransport(row) ? '车牌号' : '船/航/班列号';
     },
@@ -6398,6 +6468,15 @@ export default {
       this.form.carrierName = '';
       this.form.carrierId = '';
       this.form.carrierContractId = '';
+      this.form.driverId = '';
+      this.form.driverName = '';
+      this.form.driverPhone = '';
+      this.form.vehicleNo = '';
+      this.form.trailerVehicleNo = '';
+      this.form.escortName = '';
+      this.form.escortPhone = '';
+      this.taskDriverOptions = [];
+      this.taskEscortOptions = [];
       if (nextValue === '承运商') {
         this.form.trailerVehicleNo = '';
         this.form.escortName = '';
@@ -6651,17 +6730,36 @@ export default {
         this.form.carrierContractId = carrier?.carrierContractId || '';
         this.form.carrierId = carrier?.carrierId || '';
         this.form.carrierName = carrier?.carrierName || '';
-        return;
+      } else {
+        this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
+        this.form.carrierName = value || '';
       }
-      this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
-      this.form.carrierName = value || '';
+      // 承运商变更后清空司机/车辆，避免跨组织脏数据
+      this.form.driverId = '';
+      this.form.driverName = '';
+      this.form.driverPhone = '';
+      this.form.vehicleNo = '';
+      this.form.trailerVehicleNo = '';
+      this.form.escortName = '';
+      this.form.escortPhone = '';
+      this.taskDriverOptions = [];
+      this.taskEscortOptions = [];
+    },
+    getTaskCarrierFilter() {
+      return {
+        carrierId: this.form.carrierId || '',
+        carrierName: this.form.carrierName || '',
+      };
     },
     loadTaskDriverOptions() {
       if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
       this.taskDriverLoading = true;
-      return getDriverList(1, 9999, { posts: '司机' })
-        .then(res => {
-          this.taskDriverOptions = extractRecords(res);
+      return fetchDriversByCarrierOrganizations(
+        { size: 9999, posts: '司机' },
+        this.getTaskCarrierFilter()
+      )
+        .then(records => {
+          this.taskDriverOptions = records;
           return this.taskDriverOptions;
         })
         .finally(() => {
@@ -6670,10 +6768,17 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getTaskCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskDriverLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.taskDriverOptions = records;
           callback(
             records.map(item => ({
@@ -6692,10 +6797,17 @@ export default {
     },
     fetchTaskEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getTaskCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskEscortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           this.taskEscortOptions = records;
           callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
         })
@@ -7835,12 +7947,7 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -8463,6 +8570,123 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    setupSearchAutocompletes() {
+      const fields = [
+        {
+          prop: 'projectName',
+          placeholder: '请选择或输入项目名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getProjectList(1, 20, keyword ? { projectName: keyword } : {}),
+              getValue: item => item.projectName || item.name || '',
+            }),
+        },
+        {
+          prop: 'customerName',
+          placeholder: '请选择或输入客户名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getCustomerArchiveList(1, 20, {
+                  ...(keyword ? { fullName: keyword } : {}),
+                  customerType: '客户',
+                }),
+              getValue: item => item.fullName || item.customerName || item.name || '',
+            }),
+        },
+        {
+          prop: 'cargoType',
+          placeholder: '请选择或输入货物类型',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getCargoTypeList(1, 20, keyword ? { cargoName: keyword } : {}),
+              getValue: item => item.cargoName || item.typeName || item.name || item.label || '',
+            }),
+        },
+        {
+          prop: 'carrierName',
+          placeholder: '请选择或输入承运商名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getCustomerArchiveList(1, 20, {
+                  ...(keyword ? { fullName: keyword } : {}),
+                  customerType: '承运商',
+                }),
+              getValue: item =>
+                item.fullName || item.carrierName || item.customerName || item.name || '',
+            }),
+        },
+        {
+          prop: 'driverName',
+          placeholder: '请选择或输入司机名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getDriverList(1, 20, {
+                  ...(keyword ? { driverName: keyword } : {}),
+                  posts: '司机',
+                }),
+              getValue: item => item.driverName || item.name || '',
+            }),
+        },
+        {
+          prop: 'planName',
+          placeholder: '请选择或输入计划名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getShippingPlanList(1, 20, keyword ? { planName: keyword } : {}),
+              getValue: item => item.planName || item.name || '',
+            }),
+        },
+      ];
+      fields.forEach(field => {
+        const column = this.findColumn?.(this.option.column, field.prop);
+        if (!column) return;
+        column.searchPlaceholder = field.placeholder;
+        column.renderSearch = scope =>
+          this.renderSearchAutocomplete(scope, field.prop, field.placeholder, field.fetch);
+      });
+    },
+    renderSearchAutocomplete(scope, prop, placeholder, fetchSuggestions) {
+      return h(ElAutocomplete, {
+        modelValue: scope.row?.[prop] ?? '',
+        'onUpdate:modelValue': value => {
+          if (scope.row) scope.row[prop] = value ?? '';
+        },
+        fetchSuggestions,
+        debounce: 300,
+        clearable: true,
+        triggerOnFocus: true,
+        placeholder,
+        style: 'width: 100%',
+        valueKey: 'value',
+        fitInputWidth: true,
+      });
+    },
+    fetchSearchNameSuggestions(queryString, callback, { request, getValue }) {
+      const keyword = String(queryString || '').trim();
+      Promise.resolve(request(keyword))
+        .then(res => {
+          const records = extractRecords(res);
+          const seen = new Set();
+          const options = [];
+          records.forEach(item => {
+            const value = String(getValue(item) || '').trim();
+            if (!value || seen.has(value)) return;
+            seen.add(value);
+            options.push({ ...item, value });
+          });
+          callback(options);
+        })
+        .catch(error => {
+          window.console.log(error);
+          callback([]);
+        });
+    },
     searchChange(params, done) {
       this.query = {
         ...params,
@@ -8728,10 +8952,21 @@ export default {
     },
     fetchReassignDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const row = this.reassignDrawer.row || {};
+      const carrier = {
+        carrierId: row.carrierId || '',
+        carrierName: row.carrierName || '',
+      };
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.reassignDrawer.driverLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.reassignDriverOptions = records;
           callback(
             records.map(item => ({
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index b42f4a3..459c6dc 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -289,29 +289,53 @@
       <el-table-column label="承运类型" prop="carrierType" min-width="120" show-overflow-tooltip />
       <el-table-column label="发货地" prop="departureAddress" min-width="180">
         <template #default="{ row }">
-          <el-tooltip :content="formatFullRouteAddress(row, 'departure')" placement="top">
+          <el-tooltip
+            v-if="formatFullRouteAddress(row, 'departure')"
+            :content="formatFullRouteAddress(row, 'departure')"
+            placement="top"
+            :show-after="120"
+          >
             <div class="loading-manage-page__address-cell">
               {{ formatRouteAddress(row, 'departure') }}
             </div>
           </el-tooltip>
+          <div v-else class="loading-manage-page__address-cell">
+            {{ formatRouteAddress(row, 'departure') }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="途经地" prop="transitAddress" min-width="190">
         <template #default="{ row }">
-          <el-tooltip :content="formatFullRouteAddress(row, 'transit')" placement="top">
+          <el-tooltip
+            v-if="formatFullRouteAddress(row, 'transit')"
+            :content="formatFullRouteAddress(row, 'transit')"
+            placement="top"
+            :show-after="120"
+          >
             <div class="loading-manage-page__address-cell">
               {{ formatRouteAddress(row, 'transit') }}
             </div>
           </el-tooltip>
+          <div v-else class="loading-manage-page__address-cell">
+            {{ formatRouteAddress(row, 'transit') }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="到货地" prop="arrivalAddress" min-width="180">
         <template #default="{ row }">
-          <el-tooltip :content="formatFullRouteAddress(row, 'arrival')" placement="top">
+          <el-tooltip
+            v-if="formatFullRouteAddress(row, 'arrival')"
+            :content="formatFullRouteAddress(row, 'arrival')"
+            placement="top"
+            :show-after="120"
+          >
             <div class="loading-manage-page__address-cell">
               {{ formatRouteAddress(row, 'arrival') }}
             </div>
           </el-tooltip>
+          <div v-else class="loading-manage-page__address-cell">
+            {{ formatRouteAddress(row, 'arrival') }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="承运商" prop="carrierName" min-width="160" show-overflow-tooltip />
@@ -386,26 +410,74 @@
       v-if="isStandalonePage"
       class="loading-manage-dialog loading-manage-form-dialog loading-manage-form-page"
     >
-      <div class="archive-page-form__title">{{
-        isStandaloneDetailPage ? detailPageTitle : formPageTitle
-      }}</div>
+      <div v-if="!isStandaloneDetailPage" class="archive-page-form__title">{{ formPageTitle }}</div>
       <div v-loading="dialogLoading" class="loading-manage-dialog__body">
         <div v-if="dialogReadonly" class="loading-detail">
           <section-card title="配载单详情">
             <div class="loading-detail__summary">
-              <div class="loading-detail__heading">配载单详情</div>
               <div>{{ dialogForm.loadingNo || '-' }}</div>
               <el-tag :type="detailStatusType">{{ statusText(dialogForm) }}</el-tag>
               <el-tag type="primary">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag>
             </div>
             <div class="loading-detail__task-row">
-              <div class="loading-detail__field">
-                <span class="loading-detail__label">任务信息</span
-                ><span class="loading-detail__value">{{ taskSummary }}</span>
+              <div class="loading-detail__task-main">
+                <span class="loading-detail__label">任务信息</span>
+                <div class="loading-detail__task-grid">
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">承运商</span>
+                    <span class="loading-detail__value">{{ detailTaskField('carrierName') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">司机</span>
+                    <span class="loading-detail__value">{{ detailTaskField('driverName') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">车牌号</span>
+                    <span class="loading-detail__value">{{ detailTaskField('vehicleNo') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">手机号</span>
+                    <span class="loading-detail__value">{{ detailTaskField('driverPhone') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">里程</span>
+                    <span class="loading-detail__value">{{
+                      detailTaskMileage ? `${detailTaskMileage} km` : '-'
+                    }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">预计发货日期</span>
+                    <span class="loading-detail__value">{{
+                      detailTaskDate('estimatedStartDate')
+                    }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">预计完成日期</span>
+                    <span class="loading-detail__value">{{
+                      detailTaskDate('estimatedEndDate')
+                    }}</span>
+                  </div>
+                  <template v-if="isSelfCarrierDetail">
+                    <div class="loading-detail__field">
+                      <span class="loading-detail__label">挂车车牌号</span>
+                      <span class="loading-detail__value">{{
+                        detailTaskField('trailerVehicleNo')
+                      }}</span>
+                    </div>
+                    <div class="loading-detail__field">
+                      <span class="loading-detail__label">押运人</span>
+                      <span class="loading-detail__value">{{ detailTaskField('escortName') }}</span>
+                    </div>
+                    <div class="loading-detail__field">
+                      <span class="loading-detail__label">押运人手机号</span>
+                      <span class="loading-detail__value">{{ detailTaskField('escortPhone') }}</span>
+                    </div>
+                  </template>
+                </div>
               </div>
-              <div class="loading-detail__field">
-                <span class="loading-detail__label">附件</span
-                ><span class="loading-detail__value"
+              <div class="loading-detail__field loading-detail__attachment-field">
+                <span class="loading-detail__label">附件</span>
+                <span class="loading-detail__value"
                   ><el-link
                     v-for="file in detailAttachments"
                     :key="file.url || file.name"
@@ -441,7 +513,19 @@
                   >
                 </div>
                 <div class="loading-detail__step-address">
-                  {{ node.displayAddress || formatAddressText(node.address) }}
+                  <el-tooltip
+                    v-if="formatDetailRouteTooltip(node)"
+                    :content="formatDetailRouteTooltip(node)"
+                    placement="top"
+                    :show-after="120"
+                  >
+                    <span class="loading-detail__step-address-text">{{
+                      formatDetailRouteShort(node)
+                    }}</span>
+                  </el-tooltip>
+                  <span v-else class="loading-detail__step-address-text">{{
+                    formatDetailRouteShort(node)
+                  }}</span>
                 </div>
                 <div class="loading-detail__step-tags">
                   <el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag>
@@ -1175,9 +1259,10 @@
                 </el-form-item>
                 <el-form-item label="里程（km）">
                   <el-input
-                    v-model="dialogForm.mileage"
+                    :model-value="normalizeLoadingMileage(dialogForm.mileage)"
                     clearable
                     placeholder="请输入"
+                    :disabled="dialogReadonly"
                     @input="handleMileageInput"
                   />
                 </el-form-item>
@@ -1408,6 +1493,7 @@ import { getList as getContractList } from '@/api/business/contract-manage';
 import { getParentOptions as getCargoTypeOptions } from '@/api/base/cargo-type';
 import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { getList as getProcessConfigList } from '@/api/business/process-config';
 import { getList as getCommonAddressList } from '@/api/base/common-address';
 import {
@@ -1427,6 +1513,7 @@ const defaultCandidateTransportType = '';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 const loadingCreateWaybillsStorageKey = 'loading-manage-create-waybills';
+const loadingManageListRefreshKey = 'loading-manage-list-refresh';
 let detailAmapLoader;
 
 const createSearchForm = () => ({
@@ -1511,6 +1598,14 @@ const normalizeLoadingMileage = value => {
   return value;
 };
 
+// 提交时未填写里程传 null，禁止自动填充 -1
+const toSubmitMileage = value => {
+  const normalized = normalizeLoadingMileage(value);
+  if (normalized === '') return null;
+  const number = Number(normalized);
+  return Number.isFinite(number) ? number : null;
+};
+
 const createCopiedDialogForm = (detail = {}) => {
   const form = createDialogForm();
   Object.keys(form).forEach(prop => {
@@ -1691,6 +1786,12 @@ export default {
           .join(' / ') || '-'
       );
     },
+    isSelfCarrierDetail() {
+      return String(this.dialogForm.carrierType || '').trim() === '自运';
+    },
+    detailTaskMileage() {
+      return normalizeLoadingMileage(this.dialogForm.mileage);
+    },
     detailAttachments() {
       return parseJsonArray(this.dialogForm.attachmentsJson || this.dialogForm.attachmentJson).map(
         item =>
@@ -1748,12 +1849,29 @@ export default {
   deactivated() {
     this.closeInnerDialogs();
   },
+  activated() {
+    if (this.isStandalonePage) return;
+    if (sessionStorage.getItem(loadingManageListRefreshKey)) {
+      sessionStorage.removeItem(loadingManageListRefreshKey);
+      this.loadTable();
+    }
+  },
   beforeUnmount() {
     this.closeInnerDialogs();
   },
   watch: {
     $route(to, from) {
-      if (!this.isStandalonePage) return;
+      if (!this.isStandalonePage) {
+        // 从表单/详情返回列表时刷新，避免草稿确认后仍显示旧状态
+        if (
+          from?.path?.includes('/loading-manage/form') ||
+          from?.path?.includes('/loading-manage/detail')
+        ) {
+          sessionStorage.removeItem(loadingManageListRefreshKey);
+          this.loadTable();
+        }
+        return;
+      }
       this.syncStandaloneTagTitle();
       if (this.isStandaloneDetailPage) {
         // 记录变化或上一个页面不是详情态（例如从表单页/列表页进来）时重新拉取详情
@@ -1982,6 +2100,157 @@ export default {
         value.includes('highway')
       );
     },
+    // 与总单详情一致：公路地址压缩为「市 区县」
+    formatRoadLocation(value) {
+      const text = String(value || '')
+        .replace(/[\/／\s]+/g, '')
+        .trim();
+      if (!text) return '';
+
+      const parts = this.parseWaybillAddress(text);
+      let city = String(parts.city || '').trim();
+      let district = String(parts.district || '').trim();
+      let detail = String(parts.detailAddress || '').trim();
+
+      // 自治州/地区/盟下还有「XX市 + 区县」时，以市级作为展示主体
+      if (/(?:自治州|地区|盟)$/.test(city) && detail) {
+        const nestedCityMatch = detail.match(/^(.+?市)/);
+        if (nestedCityMatch) {
+          city = nestedCityMatch[1];
+          detail = detail.slice(nestedCityMatch[1].length);
+          const nestedDistrictMatch = detail.match(
+            /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+          );
+          if (nestedDistrictMatch) district = nestedDistrictMatch[1];
+        } else if (!district) {
+          const nestedDistrictMatch = detail.match(
+            /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+          );
+          if (nestedDistrictMatch) district = nestedDistrictMatch[1];
+        }
+      }
+
+      // 市级后紧跟区县，但 parse 未拆出时再补一次
+      if (city && !district && detail) {
+        const nestedDistrictMatch = detail.match(
+          /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+        );
+        if (nestedDistrictMatch) district = nestedDistrictMatch[1];
+      }
+
+      if (city && district) {
+        // 兼容「梅县区」：命中「县」后还需保留后面的「区」
+        if (district.endsWith('县') && detail.startsWith(`${district}区`)) {
+          district = `${district}区`;
+        }
+        return `${city} ${district}`;
+      }
+      if (city) return city;
+      if (district) return district;
+
+      // 兜底压缩
+      const withoutProvince = text.replace(/^.*?(?:省|自治区|特别行政区)/, '');
+      const cityMatch = withoutProvince.match(/.+?(?:市|自治州|州(?!市)|盟(?!市)|地区)/);
+      if (!cityMatch) return text;
+      const fallbackCity = cityMatch[0];
+      const districtSource = withoutProvince.slice(fallbackCity.length);
+      const districtMatch = districtSource.match(
+        /^[^市州盟]*?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/
+      );
+      if (!districtMatch) {
+        // 州后面是县级市时，继续解析市 + 区
+        const nestedCityMatch = districtSource.match(/^(.+?市)/);
+        if (nestedCityMatch) {
+          const nestedDistrictSource = districtSource.slice(nestedCityMatch[1].length);
+          const nestedDistrictMatch = nestedDistrictSource.match(
+            /^[^市州盟]*?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/
+          );
+          if (nestedDistrictMatch) {
+            return `${nestedCityMatch[1]} ${nestedDistrictMatch[0]}`;
+          }
+          return nestedCityMatch[1];
+        }
+        return fallbackCity;
+      }
+      const fallbackDistrict = `${districtMatch[0]}${
+        districtSource.slice(districtMatch[0].length).startsWith('区') ? '区' : ''
+      }`;
+      return `${fallbackCity} ${fallbackDistrict}`;
+    },
+    isStationLikeName(value) {
+      const text = String(value || '').trim();
+      if (!text) return false;
+      return (
+        /(?:火车站|高铁站|客运站|货运站|港口|码头|机场|空港|航站楼)$/.test(text) ||
+        /(?<!市|州|盟|区|县|旗)站$/.test(text)
+      );
+    },
+    // 详情运输路线短展示：公路仅市区，非公路仅名称
+    formatDetailRouteShort(node = {}) {
+      const name = String(node.name || '').trim();
+      const address = String(node.address || '').trim();
+      const displayAddress = String(node.displayAddress || '').trim();
+      if (!this.isRoadTransportType(this.dialogForm.transportType)) {
+        if (name) return name;
+        if (this.isStationLikeName(displayAddress)) return displayAddress;
+        if (this.isStationLikeName(address)) return address;
+        return displayAddress || address || '-';
+      }
+      const enriched = this.enrichRouteNodeRegion(node);
+      // 合并节点地址与运单上的市/区字段，避免只解析到市
+      const region = this.mergeRouteAddressParts(enriched.cityName, enriched.districtName, '');
+      const source = this.mergeRouteAddressParts(
+        address,
+        displayAddress,
+        region,
+        enriched.name || name
+      );
+      const formatted = this.formatRoadLocation(source);
+      if (enriched.cityName && enriched.districtName) {
+        return `${enriched.cityName} ${enriched.districtName}`;
+      }
+      if (/(?:市|州|盟|区|县|旗)/.test(formatted)) return formatted;
+      return formatted || name || displayAddress || address || '-';
+    },
+    // 公路悬停展示完整地址；非公路不展示 tooltip
+    formatDetailRouteTooltip(node = {}) {
+      if (!this.isRoadTransportType(this.dialogForm.transportType)) return '';
+      const enriched = this.enrichRouteNodeRegion(node);
+      const region = this.mergeRouteAddressParts(enriched.cityName, enriched.districtName, '');
+      const full = this.mergeRouteAddressParts(
+        String(node.address || '').trim(),
+        String(node.displayAddress || '').trim(),
+        region,
+        String(node.name || enriched.name || '').trim()
+      );
+      const short = this.formatDetailRouteShort(node);
+      if (!full) return '';
+      return full === short ? '' : full;
+    },
+    // 按装/卸标签从已选运单回填市、区，补充 routeJson 中缺失的区县
+    enrichRouteNodeRegion(node = {}) {
+      const tags = Array.isArray(node.tags) ? node.tags : [];
+      const result = { cityName: '', districtName: '', name: '' };
+      for (const tag of tags) {
+        const text = String(tag || '');
+        const loadMatch = text.match(/^装(\d+)$/);
+        const unloadMatch = text.match(/^卸(\d+)$/);
+        const index = Number((loadMatch || unloadMatch)?.[1] || 0) - 1;
+        if (index < 0) continue;
+        const row = this.selectedWaybillRows[index];
+        if (!row) continue;
+        const prefix = loadMatch ? 'departure' : 'arrival';
+        result.cityName = String(
+          row[`${prefix}CityName`] || row[`${prefix}City`] || ''
+        ).trim();
+        result.districtName = String(
+          row[`${prefix}DistrictName`] || row[`${prefix}District`] || ''
+        ).trim();
+        result.name = String(row[`${prefix}Name`] || '').trim();
+        if (result.cityName || result.districtName || result.name) break;
+      }
+      return result;
+    },
     splitText(value) {
       if (!value) return [];
       return String(value)
@@ -2019,37 +2288,72 @@ export default {
     formatRouteAddress(row, type) {
       const prefix =
         type === 'departure' ? 'departure' : type === 'arrival' ? 'arrival' : 'transit';
-      if (type !== 'transit') {
-        const address = row[`${prefix}Address`];
-        const region = this.routeProvinceName(row, prefix);
-        const district = row[`${prefix}DistrictName`];
-        const source = this.mergeRouteAddressParts(region, district, address);
-        return this.formatProvinceCityDistrict(source) || '-';
+      if (type === 'transit') {
+        const values = this.splitText(row.transitAddress || row.transitName || '')
+          .map(value => this.formatListRouteShort(row, value, value))
+          .filter(value => value && value !== '-');
+        return [...new Set(values)].join('，') || '-';
       }
-      const values = [
-        row[`${prefix}RegionName`],
-        row[`${prefix}DistrictName`],
-        row[`${prefix}Address`],
-      ]
-        .filter(Boolean)
-        .flatMap(value => this.splitText(value))
-        .map(value => this.formatProvinceCityDistrict(value))
-        .filter(Boolean);
-      return [...new Set(values)].join(',') || '-';
+      const name = String(row[`${prefix}Name`] || '').trim();
+      const address = String(row[`${prefix}Address`] || '').trim();
+      const cityName = String(
+        row[`${prefix}CityName`] || row[`${prefix}City`] || ''
+      ).trim();
+      const districtName = String(
+        row[`${prefix}DistrictName`] || row[`${prefix}District`] || ''
+      ).trim();
+      if (
+        this.isRoadTransportType(row?.transportType) &&
+        cityName &&
+        districtName
+      ) {
+        return `${cityName} ${districtName}`;
+      }
+      const region = this.mergeRouteAddressParts(
+        this.routeProvinceName(row, prefix),
+        cityName,
+        districtName
+      );
+      const source = this.mergeRouteAddressParts(region, '', address || name);
+      return this.formatListRouteShort(row, name, source || address || name);
     },
     formatFullRouteAddress(row, type) {
+      if (!this.isRoadTransportType(row?.transportType)) return '';
       const prefix =
         type === 'departure' ? 'departure' : type === 'arrival' ? 'arrival' : 'transit';
-      if (type !== 'transit') {
-        const address = row[`${prefix}Address`];
-        const region = this.routeProvinceName(row, prefix);
-        const district = row[`${prefix}DistrictName`];
-        return this.mergeRouteAddressParts(region, district, address) || '-';
+      if (type === 'transit') {
+        const values = this.splitText(row.transitAddress || '')
+          .map(value => String(value || '').trim())
+          .filter(Boolean);
+        const full = [...new Set(values)].join('，');
+        const short = this.formatRouteAddress(row, 'transit');
+        return full && full !== short ? full : '';
       }
-      const values = [row.transitRegionName, row.transitDistrictName, row.transitAddress]
-        .filter(Boolean)
-        .flatMap(value => this.splitText(value));
-      return [...new Set(values)].join('，') || '-';
+      const name = String(row[`${prefix}Name`] || '').trim();
+      const address = String(row[`${prefix}Address`] || '').trim();
+      const region = this.mergeRouteAddressParts(
+        this.routeProvinceName(row, prefix),
+        row[`${prefix}CityName`] || row[`${prefix}City`],
+        row[`${prefix}DistrictName`] || row[`${prefix}District`]
+      );
+      const full = this.mergeRouteAddressParts(region, '', address || name);
+      const short = this.formatRouteAddress(row, type);
+      if (!full) return '';
+      return full === short ? '' : full;
+    },
+    // 列表短地址：公路「市 区县」，非公路仅名称
+    formatListRouteShort(row = {}, name = '', address = '') {
+      const rawName = String(name || '').trim();
+      const rawAddress = String(address || '').trim();
+      if (!this.isRoadTransportType(row?.transportType)) {
+        if (rawName) return rawName;
+        if (this.isStationLikeName(rawAddress)) return rawAddress;
+        return rawAddress || '-';
+      }
+      const source = rawAddress || rawName;
+      const formatted = this.formatRoadLocation(source);
+      if (/(?:市|州|盟)/.test(formatted)) return formatted;
+      return formatted || rawName || rawAddress || '-';
     },
     formatWaybillAddress(row, type) {
       const prefix = type === 'departure' ? 'departure' : 'arrival';
@@ -2275,7 +2579,8 @@ export default {
           this.dialogForm = row.copy
             ? createCopiedDialogForm(detail)
             : { ...createDialogForm(), ...detail };
-          this.dialogForm.mileage = normalizeLoadingMileage(this.dialogForm.mileage);
+          this.applyLoadingTaskInfoFromDetail(this.dialogForm);
+          this.applyLoadingMileageFromDetail(this.dialogForm);
           await this.restoreWaybillRows(
             this.dialogForm.waybillIdsJson,
             this.dialogForm.loadingSubNos
@@ -2612,6 +2917,8 @@ export default {
           ...this.buildQueryParams(this.candidateQuery),
           businessStatus: 'pending',
           onlyUnassignedLoading: 1,
+          // 仅查当前账户所属组织及子组织下的运单
+          allDept: 0,
           ...(this.dialogMode === 'add' ? { transportType: 'road' } : {}),
         };
         const transportType = this.getCandidateTransportTypeQuery(query.transportType);
@@ -2706,12 +3013,16 @@ export default {
         .map(row => row.waybillNo)
         .filter(Boolean)
         .join('，');
-      this.dialogForm.waybillIdsJson = JSON.stringify(
-        rows
-          .map(row => row.id)
-          .filter(Boolean)
-          .map(id => String(id))
-      );
+      const rowIds = rows
+        .map(row => row.id)
+        .filter(Boolean)
+        .map(id => String(id));
+      // 回显失败仅有运单号时，保留原 waybillIdsJson，避免确认提交清空运单绑定
+      if (rowIds.length) {
+        this.dialogForm.waybillIdsJson = JSON.stringify(rowIds);
+      } else if (!String(this.dialogForm.waybillIdsJson || '').trim()) {
+        this.dialogForm.waybillIdsJson = '[]';
+      }
       this.dialogForm.projectName = uniqueText(rows, 'projectName');
       this.dialogForm.customerName = uniqueText(rows, 'customerName');
       this.dialogForm.originalNo = uniqueText(rows, 'originalNo');
@@ -2838,29 +3149,95 @@ export default {
         remark: item.remark || '',
       };
     },
+    applyLoadingMileageFromDetail(form = this.dialogForm) {
+      let taskMileage = '';
+      try {
+        const taskInfo = JSON.parse(form.taskInfoJson || '{}');
+        taskMileage = taskInfo?.mileage;
+      } catch (error) {
+        taskMileage = '';
+      }
+      form.mileage = normalizeLoadingMileage(
+        form.mileage !== undefined && form.mileage !== null && form.mileage !== ''
+          ? form.mileage
+          : taskMileage
+      );
+    },
+    applyLoadingTaskInfoFromDetail(form = this.dialogForm) {
+      let taskInfo = {};
+      try {
+        taskInfo = JSON.parse(form.taskInfoJson || '{}') || {};
+      } catch (error) {
+        taskInfo = {};
+      }
+      if (!taskInfo || typeof taskInfo !== 'object' || Array.isArray(taskInfo)) return;
+      const fields = [
+        'carrierType',
+        'carrierName',
+        'carrierContractId',
+        'driverName',
+        'driverPhone',
+        'vehicleNo',
+        'trailerVehicleNo',
+        'escortName',
+        'escortPhone',
+        'estimatedStartDate',
+        'estimatedEndDate',
+        'taskRemark',
+      ];
+      fields.forEach(prop => {
+        if (
+          (form[prop] === undefined || form[prop] === null || form[prop] === '') &&
+          taskInfo[prop] !== undefined &&
+          taskInfo[prop] !== null &&
+          taskInfo[prop] !== ''
+        ) {
+          form[prop] = taskInfo[prop];
+        }
+      });
+      if (
+        (form.mileage === undefined || form.mileage === null || form.mileage === '') &&
+        taskInfo.mileage !== undefined
+      ) {
+        form.mileage = normalizeLoadingMileage(taskInfo.mileage);
+      }
+    },
+    detailTaskField(prop) {
+      const value = String(this.dialogForm?.[prop] ?? '').trim();
+      return value || '-';
+    },
+    detailTaskDate(prop) {
+      const value = String(this.dialogForm?.[prop] ?? '').trim();
+      return value ? value.slice(0, 10) : '-';
+    },
     normalizePayload() {
       this.syncRouteAddressFields();
       this.rebuildSummaryFromWaybills(false);
       this.dialogForm.mileage = normalizeLoadingMileage(this.dialogForm.mileage);
+      const mileage = toSubmitMileage(this.dialogForm.mileage);
+      const taskInfo = {
+        carrierType: this.dialogForm.carrierType,
+        carrierName: this.dialogForm.carrierName,
+        carrierContractId: this.dialogForm.carrierContractId,
+        driverName: this.dialogForm.driverName,
+        driverPhone: this.dialogForm.driverPhone,
+        vehicleNo: this.dialogForm.vehicleNo,
+        trailerVehicleNo: this.dialogForm.trailerVehicleNo,
+        escortName: this.dialogForm.escortName,
+        escortPhone: this.dialogForm.escortPhone,
+        estimatedStartDate: this.dialogForm.estimatedStartDate,
+        estimatedEndDate: this.dialogForm.estimatedEndDate,
+        taskRemark: this.dialogForm.taskRemark,
+      };
+      if (mileage !== null) {
+        taskInfo.mileage = mileage;
+      }
       return {
         ...this.dialogForm,
+        mileage,
         routeJson: JSON.stringify(this.routeNodes),
         goodsJson: JSON.stringify(this.cargoRows),
-        taskInfoJson: JSON.stringify({
-          carrierType: this.dialogForm.carrierType,
-          carrierName: this.dialogForm.carrierName,
-          carrierContractId: this.dialogForm.carrierContractId,
-          driverName: this.dialogForm.driverName,
-          driverPhone: this.dialogForm.driverPhone,
-          vehicleNo: this.dialogForm.vehicleNo,
-          trailerVehicleNo: this.dialogForm.trailerVehicleNo,
-          escortName: this.dialogForm.escortName,
-          escortPhone: this.dialogForm.escortPhone,
-          mileage: this.dialogForm.mileage,
-          estimatedStartDate: this.dialogForm.estimatedStartDate,
-          estimatedEndDate: this.dialogForm.estimatedEndDate,
-          taskRemark: this.dialogForm.taskRemark,
-        }),
+        taskInfoJson: JSON.stringify(taskInfo),
       };
     },
     validatePayload(draftMode = false) {
@@ -2915,7 +3292,7 @@ export default {
       return true;
     },
     async saveDraft() {
-      if (!this.validatePayload(true)) return;
+      // 暂存不做任何业务校验，直接保存
       this.dialogSaving = 'draft';
       try {
         const res = await loadingApi.saveDraft(this.normalizePayload());
@@ -2923,7 +3300,7 @@ export default {
           ...this.dialogForm,
           ...(res.data?.data || res.data || {}),
         };
-        this.dialogForm.mileage = normalizeLoadingMileage(this.dialogForm.mileage);
+        this.applyLoadingMileageFromDetail(this.dialogForm);
         ElMessage.success('暂存成功');
         this.loadTable();
       } finally {
@@ -2934,7 +3311,11 @@ export default {
       if (!this.validatePayload(false)) return;
       this.dialogSaving = 'submit';
       try {
-        const payload = this.normalizePayload();
+        const payload = {
+          ...this.normalizePayload(),
+          // 确认生成正式配载单（待执行），覆盖草稿状态
+          businessStatus: 'pending',
+        };
         if (this.dialogMode === 'reassign') {
           await loadingApi.reassign(payload);
           ElMessage.success('派单成功');
@@ -2942,6 +3323,7 @@ export default {
           await loadingApi.submit(payload);
           ElMessage.success('确认成功');
         }
+        sessionStorage.setItem(loadingManageListRefreshKey, '1');
         this.closeLoadingDialog();
         this.loadTable();
       } finally {
@@ -3027,6 +3409,7 @@ export default {
       this.dialogForm.carrierContractId = '';
       this.dialogForm.carrierName = '';
       this.dialogForm.carrierId = '';
+      this.clearDialogDriverVehicleFields();
       if (this.dialogForm.carrierType === '承运商') {
         this.dialogForm.trailerVehicleNo = '';
         this.dialogForm.escortName = '';
@@ -3046,6 +3429,23 @@ export default {
       this.dialogForm.carrierContractId =
         this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
       this.dialogForm.carrierName = contract?.carrierName || '';
+      this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
+      this.clearDialogDriverVehicleFields();
+    },
+    clearDialogDriverVehicleFields() {
+      this.dialogForm.driverName = '';
+      this.dialogForm.driverPhone = '';
+      this.dialogForm.vehicleNo = '';
+      this.dialogForm.trailerVehicleNo = '';
+      this.dialogForm.escortName = '';
+      this.dialogForm.escortPhone = '';
+      this.driverOptions = [];
+    },
+    getDialogCarrierFilter() {
+      return {
+        carrierId: this.dialogForm.carrierId || '',
+        carrierName: this.dialogForm.carrierName || '',
+      };
     },
     handleDriverChange(value) {
       const driver = this.driverOptions.find(item => (item.driverName || item.name) === value);
@@ -3057,7 +3457,7 @@ export default {
       }
     },
     fetchDriverSuggestions(queryString, callback) {
-      this.loadDriverOptions(String(queryString || '').trim())
+      this.loadDialogDriverOptions(String(queryString || '').trim())
         .then(() =>
           callback(
             this.driverOptions.map(item => ({
@@ -3080,11 +3480,19 @@ export default {
     },
     fetchEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getDialogCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.escortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           callback(
-            unwrapRecords(res).map(item => ({
+            records.map(item => ({
               ...item,
               value: item.driverName || item.name || '',
             }))
@@ -3104,6 +3512,7 @@ export default {
     handleMileageInput(value) {
       this.dialogForm.mileage = String(value || '').replace(/[^\d.]/g, '');
     },
+    normalizeLoadingMileage,
     transportTypeLabel(value) {
       if (!value) return '-';
       return (
@@ -3153,12 +3562,29 @@ export default {
       this.driverLoading = true;
       try {
         this.driverOptions = unwrapRecords(
-          await getDriverList(1, 20, { driverName: keyword, posts: '司机' })
+          await getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
         );
       } finally {
         this.driverLoading = false;
       }
     },
+    async loadDialogDriverOptions(keyword = '') {
+      const carrier = this.getDialogCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.driverOptions = [];
+        return [];
+      }
+      this.driverLoading = true;
+      try {
+        this.driverOptions = await fetchDriversByCarrierOrganizations(
+          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+          carrier
+        );
+        return this.driverOptions;
+      } finally {
+        this.driverLoading = false;
+      }
+    },
     async loadCarrierOptions(keyword = '') {
       this.carrierLoading = true;
       try {
@@ -3220,15 +3646,39 @@ export default {
           } else {
             this.dialogForm.carrierContractId = '';
             this.dialogForm.carrierName = '';
+            this.dialogForm.carrierId = '';
           }
           return this.taskCarrierOptions;
         }
         if (this.dialogForm.carrierType === '自运' && contracts.length) {
-          this.taskCarrierOptions = contracts;
-          const current = contracts.find(item => item.carrierName === this.dialogForm.carrierName);
+          this.taskCarrierOptions = contracts
+            .map(item => ({
+              ...item,
+              carrierName:
+                item.partyB ||
+                item.partyBName ||
+                item.contractPartyB ||
+                item.customerContractPartyB ||
+                item.carrierName ||
+                '',
+              carrierId:
+                item.partyBId ||
+                item.partyBUserId ||
+                item.contractPartyBId ||
+                item.customerContractPartyBId ||
+                item.carrierId ||
+                '',
+            }))
+            .filter(item => item.carrierName);
+          const current = this.taskCarrierOptions.find(
+            item => item.carrierName === this.dialogForm.carrierName
+          );
           this.dialogForm.carrierContractId = '';
-          this.dialogForm.carrierName = current?.carrierName || contracts[0].carrierName || '';
-          return contracts;
+          this.dialogForm.carrierName =
+            current?.carrierName || this.taskCarrierOptions[0]?.carrierName || '';
+          this.dialogForm.carrierId =
+            current?.carrierId || this.taskCarrierOptions[0]?.carrierId || '';
+          return this.taskCarrierOptions;
         }
         if (this.dialogForm.carrierType !== '自运') {
           this.taskCarrierOptions = [];
@@ -3262,6 +3712,7 @@ export default {
         }));
         this.dialogForm.carrierContractId = '';
         this.dialogForm.carrierName = partyBNames[0] || '';
+        this.dialogForm.carrierId = '';
         return this.taskCarrierOptions;
       } catch (error) {
         if (requestId !== this.taskCarrierRequestId) return [];
@@ -3611,11 +4062,6 @@ export default {
       line-height: 28px;
     }
   }
-  .loading-detail__heading {
-    font-size: 20px;
-    font-weight: 600;
-    margin-right: 8px;
-  }
   .loading-detail__route-title {
     display: inline-flex;
     align-items: center;
@@ -3627,9 +4073,24 @@ export default {
   }
   .loading-detail__task-row {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: minmax(0, 1fr) 220px;
     gap: 24px;
     padding-bottom: 4px;
+    align-items: start;
+  }
+  .loading-detail__task-main {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    min-width: 0;
+  }
+  .loading-detail__task-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 16px 24px;
+  }
+  .loading-detail__attachment-field {
+    min-width: 0;
   }
   .loading-detail__field {
     display: flex;
@@ -3645,6 +4106,8 @@ export default {
     flex-wrap: wrap;
     gap: 8px;
     text-align: left;
+    color: #303133;
+    word-break: break-all;
   }
   .loading-detail__steps {
     display: flex;
@@ -3701,6 +4164,14 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
   }
+  .loading-detail__step-address-text {
+    display: inline-block;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: bottom;
+    cursor: default;
+  }
   .loading-detail__step-tags {
     display: flex;
     justify-content: center;
@@ -3887,5 +4358,9 @@ export default {
   .loading-detail__bottom-grid {
     grid-template-columns: 1fr;
   }
+
+  .loading-detail__task-grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
 }
 </style>
diff --git a/src/views/business/transport-plan-dispatch.vue b/src/views/business/transport-plan-dispatch.vue
index 045284a..4bb22bf 100644
--- a/src/views/business/transport-plan-dispatch.vue
+++ b/src/views/business/transport-plan-dispatch.vue
@@ -11,7 +11,7 @@
             {{ planData.businessStatusName || '-' }}
           </span>
           <span class="detail-status-text detail-transport-type">
-            {{ planData.transportTypeName || '公路运输' }}
+            {{ transportTypeLabel }}
           </span>
         </div>
         <div class="transport-plan-dispatch-page__summary-grid">
@@ -123,16 +123,20 @@
           </el-button>
         </template>
         <el-table
-          :data="dispatchList"
+          :data="pagedDispatchList"
           border
           height="100%"
           row-key="id"
           class="transport-plan-dispatch-page__table"
         >
-          <el-table-column type="index" label="序号" width="70" align="center" fixed="left" />
+          <el-table-column label="序号" width="70" align="center" fixed="left">
+            <template #default="{ $index }">
+              {{ dispatchRowIndex($index) }}
+            </template>
+          </el-table-column>
           <el-table-column label="运输方式" min-width="180" align="center" show-overflow-tooltip>
             <template #default="{ row }">
-              {{ row.transportTypeName || '-' }}
+              {{ formatTransportType(row.transportTypeName || row.transportType) }}
             </template>
           </el-table-column>
           <el-table-column prop="carrierType" label="承运类型" min-width="150" align="center" show-overflow-tooltip />
@@ -177,6 +181,17 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="transport-plan-dispatch-page__pagination">
+          <el-pagination
+            v-model:current-page="dispatchPage.currentPage"
+            v-model:page-size="dispatchPage.pageSize"
+            :page-sizes="dispatchPage.pageSizes"
+            layout="total, sizes, prev, pager, next"
+            :total="dispatchList.length"
+            @current-change="handleDispatchCurrentChange"
+            @size-change="handleDispatchSizeChange"
+          />
+        </div>
       </section-card>
 
       <!-- 底部按钮 -->
@@ -202,6 +217,7 @@
 
 <script>
 import { getDetail, dispatch } from '@/api/business/transport-plan';
+import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 import TransportPlanPage from './components/transport-plan-page.vue';
 import * as api from '@/api/business/transport-plan';
@@ -209,6 +225,12 @@ import { config, option } from '@/option/business/transport-plan';
 
 const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
 
+const normalizeDictOptions = (list = []) =>
+  (Array.isArray(list) ? list : []).map(item => ({
+    label: item.dictValue || item.label || '',
+    value: item.dictKey ?? item.value ?? '',
+  }));
+
 export default {
   name: 'TransportPlanDispatch',
   components: {
@@ -223,6 +245,12 @@ export default {
       dispatchList: [],
       attachmentList: [],
       transportPlanPageVisible: false,
+      transportTypeOptions: [],
+      dispatchPage: {
+        currentPage: 1,
+        pageSize: 10,
+        pageSizes: [10, 20, 50, 100],
+      },
       api,
       config,
       option,
@@ -232,6 +260,15 @@ export default {
     planId() {
       return this.$route.query.planId;
     },
+    transportTypeLabel() {
+      return this.formatTransportType(
+        this.planData.transportTypeName || this.planData.transportType
+      );
+    },
+    pagedDispatchList() {
+      const start = (this.dispatchPage.currentPage - 1) * this.dispatchPage.pageSize;
+      return this.dispatchList.slice(start, start + this.dispatchPage.pageSize);
+    },
     statusTextClass() {
       const status = this.planData.businessStatus;
       if (status === 2 || status === '2') return 'status-text-success';
@@ -306,13 +343,34 @@ export default {
     },
   },
   created() {
-    this.loadPlanData();
+    this.loadTransportTypeOptions().finally(() => {
+      this.loadPlanData();
+    });
   },
   mounted() {
     // 初始化 transport-plan-page 组件用于打开弹窗
     this.transportPlanPageVisible = true;
   },
   methods: {
+    loadTransportTypeOptions() {
+      return getDictionary({ code: 'transport_type' })
+        .then(res => {
+          this.transportTypeOptions = normalizeDictOptions(res.data?.data || []);
+        })
+        .catch(() => {
+          this.transportTypeOptions = [];
+        });
+    },
+    formatTransportType(value) {
+      const transportType = String(value || '').trim();
+      if (!transportType) return '-';
+      // 已是中文标签时直接展示
+      if (/[\u4e00-\u9fff]/.test(transportType)) return transportType;
+      const item = this.transportTypeOptions.find(
+        option => String(option.value ?? '').toLowerCase() === transportType.toLowerCase()
+      );
+      return item?.label || transportType;
+    },
     loadPlanData() {
       if (!this.planId) {
         this.$message.error('缺少计划ID参数');
@@ -327,6 +385,7 @@ export default {
             this.planData = res.data.data || {};
             this.attachmentList = this.parseAttachments(this.planData.attachmentsJson);
             this.dispatchList = this.parseDispatchList(this.planData);
+            this.dispatchPage.currentPage = 1;
           } else {
             this.$message.error(res.data?.msg || '加载数据失败');
           }
@@ -448,8 +507,30 @@ export default {
       }
       this.openPageDispatchItemDialog(-1);
     },
+    dispatchRowIndex(index) {
+      return (this.dispatchPage.currentPage - 1) * this.dispatchPage.pageSize + index + 1;
+    },
+    resolveDispatchGlobalIndex(pageIndex) {
+      return (this.dispatchPage.currentPage - 1) * this.dispatchPage.pageSize + pageIndex;
+    },
+    syncDispatchPage() {
+      const maxPage = Math.max(
+        1,
+        Math.ceil(this.dispatchList.length / this.dispatchPage.pageSize) || 1
+      );
+      if (this.dispatchPage.currentPage > maxPage) {
+        this.dispatchPage.currentPage = maxPage;
+      }
+    },
+    handleDispatchCurrentChange(currentPage) {
+      this.dispatchPage.currentPage = currentPage;
+    },
+    handleDispatchSizeChange(pageSize) {
+      this.dispatchPage.pageSize = pageSize;
+      this.dispatchPage.currentPage = 1;
+    },
     handleEdit(row, index) {
-      this.openPageDispatchItemDialog(index, row);
+      this.openPageDispatchItemDialog(this.resolveDispatchGlobalIndex(index), row);
     },
     openPageDispatchItemDialog(index = -1, row) {
       this.$nextTick(() => {
@@ -469,6 +550,7 @@ export default {
         originalSave.apply(component, args);
         if (!component.dispatchItemBox) {
           this.dispatchList = [...(component.dispatchRows || [])];
+          this.syncDispatchPage();
         }
       };
       component.__dispatchListSaveSynced = true;
@@ -479,7 +561,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        this.dispatchList.splice(index, 1);
+        this.dispatchList.splice(this.resolveDispatchGlobalIndex(index), 1);
+        this.syncDispatchPage();
         this.$message.success('删除成功');
       });
     },
@@ -782,6 +865,12 @@ export default {
     flex: 1;
   }
 
+  &__pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding-top: 12px;
+  }
+
   &__actions {
     display: flex;
     gap: 8px;
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 00088e8..31df353 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1132,17 +1132,18 @@
                 <el-input v-model="row.email" maxlength="100" :disabled="readonly" />
               </template>
             </el-table-column>
-            <el-table-column label="所属部门" min-width="200">
+            <el-table-column label="所属部门" min-width="220">
               <template #default="{ row }">
                 <el-input
                   v-if="!isInternalCustomer"
                   :model-value="row.deptNames"
                   disabled
                 />
-                <el-select
+                <el-cascader
                   v-else
                   v-model="row.deptIdList"
-                  multiple
+                  :options="deptTree"
+                  :props="invoiceDeptCascaderProps"
                   collapse-tags
                   collapse-tags-tooltip
                   filterable
@@ -1150,14 +1151,7 @@
                   :disabled="readonly"
                   placeholder="请选择所属部门"
                   @change="() => handleInvoiceContactDeptChange(row)"
-                >
-                  <el-option
-                    v-for="item in invoiceDeptOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
+                />
               </template>
             </el-table-column>
             <el-table-column label="备注" min-width="160">
@@ -2095,6 +2089,18 @@ export default {
         expandTrigger: 'click',
       };
     },
+    // 发票联系信息所属部门：级联多选，可勾选任意层级
+    invoiceDeptCascaderProps() {
+      return {
+        value: 'value',
+        label: 'label',
+        children: 'children',
+        multiple: true,
+        checkStrictly: true,
+        emitPath: false,
+        expandTrigger: 'click',
+      };
+    },
     // 所属组织级联值：archiveForm.deptId 只存选中的部门 ID（单选），
     // 级联控件需要根到选中节点的完整路径，两者在此做双向转换——
     // 部门树是异步加载的，依赖 deptTree 可保证树加载完成后回显自动刷新。
@@ -2156,12 +2162,6 @@ export default {
     isInternalCustomer() {
       return this.archiveForm.customerKind === 'internal';
     },
-    invoiceDeptOptions() {
-      return this.flattenDept(this.deptTree).map(item => ({
-        label: item.rawLabel,
-        value: String(item.value),
-      }));
-    },
     isTemporaryToFormal() {
       return (
         Boolean(this.archiveForm.id) &&
@@ -3432,7 +3432,17 @@ export default {
       this.invoiceForm.contacts.splice(index, 1);
     },
     handleInvoiceContactDeptChange(row) {
-      const ids = Array.isArray(row.deptIdList) ? row.deptIdList.map(item => String(item)) : [];
+      // emitPath=false 时，多选级联值为选中节点 id 数组
+      const rawList = Array.isArray(row.deptIdList) ? row.deptIdList : [];
+      const ids = rawList
+        .map(item => {
+          if (Array.isArray(item)) {
+            return item.length ? String(item[item.length - 1]) : '';
+          }
+          return item !== undefined && item !== null && item !== '' ? String(item) : '';
+        })
+        .filter(Boolean);
+      row.deptIdList = ids;
       row.deptIds = ids.join(',');
       row.deptNames = ids.map(id => this.findDeptLabel(id)).filter(Boolean).join('、');
     },
@@ -5434,7 +5444,12 @@ export default {
   width: 100%;
 
   :deep(.el-input),
-  :deep(.el-select) {
+  :deep(.el-select),
+  :deep(.el-cascader) {
+    width: 100%;
+  }
+
+  :deep(.el-cascader .el-input) {
     width: 100%;
   }
 }

From aa26beda28615030c2914600fa97523d57510e95 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 23 Sep 2026 18:36:18 +0800
Subject: [PATCH 28/28] =?UTF-8?q?:sparkles:=20MK=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E9=A1=B5=E3=80=81=E9=A2=84=E7=BB=93=E7=AE=97=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E5=9C=B0=E5=9B=BE=E9=80=89=E5=9D=80?=
 =?UTF-8?q?=E4=B8=8E=E8=AE=A4=E8=AF=81=E5=AF=86=E7=A0=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 03c69cc..3043a7e 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,9 @@
 VITE_APP_ENV = 'development'
 
 #接口地址
-# 开发环境建议填 [/api]：由下方 vite.config.mjs 的 proxy 同源转发到后端(172.16.203.228:8000)，避免跨域(CORS)被浏览器拦截
-# 如需直连线上绝对地址(如 http://172.16.203.228:8000/api)，必须让后端 CORS 把 Allow-Origin 改为具体前端域名，不能用 `*`(配合 credentials 会被浏览器拒绝)
+# 开发环境建议填 [/api]：由 vite.config.mjs 的 proxy 同源转发到本地网关 http://localhost（80）
+# 本地需先启动：Nacos + blade-gateway(80) + blade-auth + blade-system 等；8080 端口一般是 Nacos 控制台不是网关
+# 如需临时联调远程，把 vite proxy target 改为 http://172.16.203.228:8000 并去掉 rewrite
 VITE_APP_API=/api
 
 #调试参数