feat: 付款申请列表新增金蝶锁状态标识并拦截锁定态作废入口

- vehicle-attachment-table 新增 kingdee-invoice-no/show-view-actions props：piaozone path 型附件查看经 A801-2 代理取流进弹窗预览（objectURL 弹窗关闭回收），下载/批量下载走金蝶代理串行触发
- 查看态展示查看/下载操作列，编辑态为查看/下载/删除；未传 props 的页面行为不变
- 收票登记表单页接入（编辑/查看态均生效），kingdee-attachment.js 导出 requestKingdeeFile 供组件复用

.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
 
 #调试参数

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+pnpm-lock.yaml
 /dist
 
 /tests/e2e/videos/

.workbuddy/memory/2026-09-30.md

@@ -0,0 +1,11 @@
+# 2026-09-30
+
+## /wel/index 首页重构为运营数据看板（按蓝湖效果图）
+- 新增依赖：echarts ^6.1.0（corepack pnpm add echarts）。
+- 重构 `src/views/wel/index.vue`：改为「核心经营指标 / 运输结构 / 业务单元情况 / 项目情况 / 财务情况 / 车队与线路 / 车务管理 / 底部占比与趋势」8 大板块 + 版权页脚，删除原欢迎横幅/快捷入口。
+- 新增文件：
+  - `src/views/wel/chart-options.js`：排行条形/盈亏双向/环形/分组柱/面积折线/堆叠柱 6 类 option 生成器（fmt 千分位、红涨绿跌 rich label）。
+  - `src/views/wel/dashboard.scss`：看板公共样式，各组件 scoped `@import '../dashboard.scss'`（子目录注意路径）。
+  - `src/views/wel/components/`：wel-chart.vue（ECharts 封装：ResizeObserver + activated resize + dispose）、wel-filters.vue（统计时间/条件筛选 mock）、rank-panel.vue（排行/盈亏通用面板）、section-kpi / section-structure / section-business / section-project / section-finance / section-fleet / section-vehicle / section-summary.vue。
+- 数据全部为 Mock，组件内已注释标注对接点；蓝湖红字标注的指标口径未定，待后端统计接口（估 12~18 个）确定后替换。
+- 自检：dev server(2889) 下所有新文件及 `?vue&type=style&...&lang.scss` 均 200；`/node_modules/.vite/deps/echarts.js` 200。vite build 因 facelogin.vue 沙箱中断不可用，未跑。

package.json

@@ -6,7 +6,8 @@
     "prod": "vite --mode production",
     "build": "vite build",
     "build:prod": "vite build --mode production",
-    "serve": "vite preview --host"
+    "serve": "vite preview --host",
+    "typecheck": "vue-tsc --noEmit"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
@@ -23,6 +24,7 @@
     "crypto-js": "^4.1.1",
     "dayjs": "^1.10.6",
     "disable-devtool": "^0.3.8",
+    "echarts": "^6.1.0",
     "element-plus": "^2.14.2",
     "exceljs": "^4.4.0",
     "highlight.js": "^11.9.0",
@@ -46,9 +48,11 @@
     "prettier": "^2.8.7",
     "sass": "^1.85.1",
     "terser": "^5.31.1",
+    "typescript": "^7.0.2",
     "unplugin-auto-import": "^0.11.2",
     "vite": "^5.4.19",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-vue-setup-extend": "^0.4.0"
+    "vite-plugin-vue-setup-extend": "^0.4.0",
+    "vue-tsc": "^3.3.11"
   }
 }

pnpm-lock.yaml

@@ -5,9 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 patchedDependencies:
-  '@smallwei/avue':
-    hash: 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
-    path: patches/@smallwei__avue.patch
+  '@smallwei/avue': 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
 
 importers:
 
@@ -33,16 +31,16 @@ importers:
         version: 1.7.0
       '@smallwei/avue':
         specifier: ~3.9.2
-        version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)
+        version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)
       animate.css:
         specifier: ^4.1.1
         version: 4.1.1
       avue-plugin-ueditor:
         specifier: ^1.0.4
-        version: 1.0.4(axios@1.16.0)(vue@3.5.34)
+        version: 1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34)
       axios:
         specifier: ^1.13.5
-        version: 1.16.0
+        version: 1.16.0(debug@4.4.3(supports-color@7.2.0))
       codemirror:
         specifier: ^5.65.21
         version: 5.65.21
@@ -55,6 +53,9 @@ importers:
       disable-devtool:
         specifier: ^0.3.8
         version: 0.3.9
+      echarts:
+        specifier: ^6.1.0
+        version: 6.1.0
       element-plus:
         specifier: ^2.14.2
         version: 2.14.2(vue@3.5.34)
@@ -63,13 +64,13 @@ importers:
         version: 4.4.0
       highlight.js:
         specifier: ^11.9.0
-        version: 11.11.1
+        version: 11.12.0
       js-base64:
         specifier: ^3.7.4
-        version: 3.7.8
+        version: 3.9.4
       js-cookie:
         specifier: ^3.0.0
-        version: 3.0.5
+        version: 3.0.8
       js-md5:
         specifier: ^0.7.3
         version: 0.7.3
@@ -127,7 +128,7 @@ importers:
         version: 5.4.21(sass@1.99.0)(terser@5.46.2)
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
+        version: 0.5.1(supports-color@7.2.0)(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
       vite-plugin-vue-setup-extend:
         specifier: ^0.4.0
         version: 0.4.0(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
@@ -1208,6 +1209,7 @@ packages:
 
   crypto-js@4.2.0:
     resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+    deprecated: Active development of CryptoJS has been discontinued. This library is no longer maintained.
 
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
@@ -1453,8 +1455,8 @@ packages:
   heic2any@0.0.4:
     resolution: {integrity: sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==}
 
-  highlight.js@11.11.1:
-    resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
+  highlight.js@11.12.0:
+    resolution: {integrity: sha512-nbfWpyRMcMrPMmDwJB+dhX/eiaPKtc2RB+0QZskqJ3WjRA/FDS0e9hZrx8EC/lbEv8gXy98FcDbNa/dspAaJMg==}
     engines: {node: '>=12.0.0'}
 
   hls.js@1.6.16:
@@ -1532,12 +1534,11 @@ packages:
   isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
-  js-base64@3.7.8:
-    resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==}
+  js-base64@3.9.4:
+    resolution: {integrity: sha512-PtOMXpEGuP0RRiRXsjzHzl44dMHxSu2CPvAhinupR1tBa88me+1DPqsobl7eupn5UukjLkln1ZnAOAOXOrYG0Q==}
 
-  js-cookie@3.0.5:
-    resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
-    engines: {node: '>=14'}
+  js-cookie@3.0.8:
+    resolution: {integrity: sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw==}
 
   js-md5@0.7.3:
     resolution: {integrity: sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==}
@@ -2653,10 +2654,10 @@ snapshots:
       countup.js: 2.10.0
       signature_pad: 5.1.3
 
-  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)':
+  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)':
     dependencies:
       '@element-plus/icons-vue': 2.3.2(vue@3.5.34)
-      axios: 0.21.4
+      axios: 0.21.4(debug@4.4.3(supports-color@7.2.0))
       countup.js: 1.9.3
       dayjs: 1.11.20
       element-plus: 2.14.2(vue@3.5.34)
@@ -2792,25 +2793,25 @@ snapshots:
     dependencies:
       vue: 3.5.34
 
-  '@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
+  '@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 3.0.0
       is-url: 1.2.4
       lodash.throttle: 4.1.1
-      nanoid: 3.3.12
-      slate: 0.72.8
+      nanoid: 5.1.11
+      slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       prismjs: 1.30.0
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
+  '@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
       '@types/event-emitter': 0.3.5
       '@uppy/core': 2.3.4
@@ -2826,9 +2827,9 @@ snapshots:
       lodash.foreach: 4.5.0
       lodash.throttle: 4.1.1
       lodash.toarray: 4.4.0
-      nanoid: 3.3.12
+      nanoid: 5.1.11
       scroll-into-view-if-needed: 3.1.0
-      slate: 0.72.8
+      slate: 0.123.0
       slate-history: 0.115.0(slate@0.123.0)
       snabbdom: 3.6.3
 
@@ -2836,13 +2837,13 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       is-hotkey: 0.2.0
       lodash.camelcase: 4.3.0
@@ -2855,16 +2856,16 @@ snapshots:
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       lodash.debounce: 4.0.8
       lodash.throttle: 4.1.1
@@ -2872,22 +2873,22 @@ snapshots:
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       lodash.foreach: 4.5.0
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       nanoid: 5.1.11
       slate: 0.123.0
@@ -3064,22 +3065,22 @@ snapshots:
 
   asynckit@0.4.0: {}
 
-  avue-plugin-ueditor@1.0.4(axios@1.16.0)(vue@3.5.34):
+  avue-plugin-ueditor@1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34):
     dependencies:
       '@wangeditor/editor': 5.1.23
       '@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34)
-      axios: 1.16.0
+      axios: 1.16.0(debug@4.4.3(supports-color@7.2.0))
       vue: 3.5.34
 
-  axios@0.21.4:
+  axios@0.21.4(debug@4.4.3(supports-color@7.2.0)):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
     transitivePeerDependencies:
       - debug
 
-  axios@1.16.0:
+  axios@1.16.0(debug@4.4.3(supports-color@7.2.0)):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
       form-data: 4.0.5
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
@@ -3247,9 +3248,11 @@ snapshots:
 
   dayjs@1.11.20: {}
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@7.2.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 7.2.0
 
   delayed-stream@1.0.0: {}
 
@@ -3457,7 +3460,9 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
-  follow-redirects@1.16.0: {}
+  follow-redirects@1.16.0(debug@4.4.3(supports-color@7.2.0)):
+    optionalDependencies:
+      debug: 4.4.3(supports-color@7.2.0)
 
   form-data@4.0.5:
     dependencies:
@@ -3546,7 +3551,7 @@ snapshots:
 
   heic2any@0.0.4: {}
 
-  highlight.js@11.11.1: {}
+  highlight.js@11.12.0: {}
 
   hls.js@1.6.16: {}
 
@@ -3605,9 +3610,9 @@ snapshots:
 
   isarray@1.0.0: {}
 
-  js-base64@3.7.8: {}
+  js-base64@3.9.4: {}
 
-  js-cookie@3.0.5: {}
+  js-cookie@3.0.8: {}
 
   js-md5@0.7.3: {}
 
@@ -4152,10 +4157,10 @@ snapshots:
 
   uuid@8.3.2: {}
 
-  vite-plugin-compression@0.5.1(vite@5.4.21(sass@1.99.0)(terser@5.46.2)):
+  vite-plugin-compression@0.5.1(supports-color@7.2.0)(vite@5.4.21(sass@1.99.0)(terser@5.46.2)):
     dependencies:
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 10.1.0
       vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
     transitivePeerDependencies:

pnpm-workspace.yaml

@@ -1,5 +1,10 @@
 packages:
   - '.'
 
+allowBuilds:
+  '@parcel/watcher': set this to true or false
+  es5-ext: set this to true or false
+  esbuild: set this to true or false
+
 patchedDependencies:
   '@smallwei/avue': patches/@smallwei__avue.patch

src/api/base/currency.js

@@ -58,3 +58,14 @@ export const changeStatus = (id, status) => {
     },
   });
 };
+
+export const getBfiExchangeRate = (currencyCode, effectdate) => {
+  return request({
+    url: '/blade-transport/bfi/exchange-rate',
+    method: 'get',
+    params: {
+      currencyCode,
+      effectdate,
+    },
+  });
+};

src/api/business/process-config.js

@@ -22,6 +22,18 @@ export const getVoucherImages = (waybillId, params = {}) =>
       ...params,
     },
   });
+export const getVoucherFolders = waybillId =>
+  request({
+    url: '/blade-transport/process-config/voucher-folders',
+    method: 'get',
+    params: { waybillId },
+  });
+export const getVoucherFolderDetail = (voucherId, plateNo) =>
+  request({
+    url: '/blade-transport/process-config/voucher-folder-detail',
+    method: 'get',
+    params: { voucherId, plateNo },
+  });
 export const submit = api.submit;
 export const remove = api.remove;
 export const copy = api.copy;

src/api/business/waybill-manage.js

@@ -67,6 +67,16 @@ export const getImportDetails = params => request({ url: `${baseUrl}/import-batc
 export const removeImportBatches = ids => request({ url: `${baseUrl}/import-batch/remove`, method: 'post', params: { ids } });
 export const getImportOptions = () => request({ url: `${baseUrl}/import-batch/options`, method: 'get' });
 export const exportImportTemplate = () => request({ url: `${baseUrl}/import-batch/export-template`, method: 'get', responseType: 'blob' });
-export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data });
-export const validateImport = data => request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, responseType: 'blob' });
-export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });
+export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data, timeout: 120000 });
+export const validateImport = data =>
+  request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, timeout: 120000 });
+export const exportImportFailures = data =>
+  request({
+    url: `${baseUrl}/import-batch/export-failures`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 120000,
+  });
+export const confirmImport = data =>
+  request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });

src/api/payment/invoiceApplication.js

@@ -22,7 +22,7 @@ export const approve = data => request({ url: `${baseUrl}/approve`, method: 'pos
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
 
 export const invoiceTypeOptions = [
   { label: '电子专票', value: 'electronic_special' },

src/api/payment/invoiceReceipt.js

@@ -5,8 +5,17 @@ const baseUrl = '/blade-transport/invoice-receipt';
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
-export const getInvoicePool = keyword =>
-  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params: { keyword } });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
+export const downloadInvoicePoolAttachment = invoiceNo =>
+  // 金蝶票池发票文件下载（后端代理 A801-2 流式回源），耗时较普通接口长，放宽到 120s
+  request({
+    url: `${baseUrl}/invoice-pool/attachment/download`,
+    method: 'get',
+    params: { invoiceNo },
+    responseType: 'blob',
+    timeout: 120000,
+  });
 export const getSettlementCandidates = (keyword, receiptId) =>
   request({
     url: `${baseUrl}/settlement-candidates`,
@@ -25,8 +34,8 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+export const pushKingdee = ids =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
@@ -36,8 +45,9 @@ export const approvalStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
-export const kingdeeStatusOptions = [
-  { label: '未同步', value: 'unsynced' },
-  { label: '已同步', value: 'synced' },
-  { label: '同步失败', value: 'failed' },
+export const kingdeePushStatusOptions = [
+  { label: '未推送', value: 'unsynced' },
+  { label: '已保存收票单', value: 'pushed' },
+  { label: '已指定应付', value: 'assigned' },
+  { label: '推送失败', value: 'failed' },
 ];

src/api/payment/paymentApplication.js

@@ -16,15 +16,20 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+// 同步金蝶涉及多次金蝶远程接口调用（A103-2 预检 + A103-1/A103-3 推送），单笔可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+// 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
+// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
+export const syncKingdeeResult = () =>
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
 
 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' },
@@ -36,5 +41,8 @@ export const approvalStatusOptions = [
 export const kingdeeStatusOptions = [
   { label: '未生成', value: 'unsynced' },
   { label: '已生成', value: 'synced' },
+  { label: '付款中', value: 'paying' },
+  { label: '已付款', value: 'paid' },
+  { label: '已关闭', value: 'closed' },
   { label: '生成失败', value: 'failed' },
 ];

src/api/payment/receiptClaimRecord.js

@@ -8,14 +8,24 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 export const updateAttachments = data =>
   request({ url: `${baseUrl}/attachments`, method: 'post', data });
 export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
+export const queryKingdeeResult = () =>
+  request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });
 
 export const claimStatusOptions = [
   { label: '已认领', value: 'claimed' },
   { label: '已作废', value: 'voided' },
 ];
 
+export const pushStatusOptions = [
+  { label: '未推送', value: 'none' },
+  { label: '已推送', value: 'pushed' },
+  { label: '推送失败', value: 'failed' },
+];
+
 export const kingdeeBillStatusOptions = [
   { label: '未生成', value: 'none' },
+  { label: '已推送', value: 'pushed' },
   { label: '审核通过', value: 'approved' },
+  { label: '已收款', value: 'received' },
   { label: '处理失败', value: 'failed' },
 ];

src/api/payment/receiptFlow.js

@@ -12,10 +12,25 @@ export const getSettlementCandidates = (keyword, flowId) =>
     params: { keyword, flowId },
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
-export const sync = data => request({ url: `${baseUrl}/sync`, method: 'post', data });
+export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
+export const pushKingdee = flowId =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },
   { label: '部分认领', value: 'partial' },
   { label: '认领完成', value: 'claimed' },
 ];
+
+export const pushStatusOptions = [
+  { label: '未推送', value: 'none' },
+  { label: '已推送', value: 'pushed' },
+  { label: '推送失败', value: 'failed' },
+];
+
+export const kingdeeBillStatusOptions = [
+  { label: '已推送', value: 'pushed' },
+  { label: '审核通过', value: 'approved' },
+  { label: '已收款', value: 'received' },
+  { label: '处理失败', value: 'failed' },
+];

src/api/settlement/formalSettlement.js

@@ -30,8 +30,9 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+// 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存），可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
 export const getDetailFees = detailId =>
   request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
 export const getReceiptClaims = formalSettlementId =>
@@ -48,3 +49,5 @@ export const applyPayments = data =>
   request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
 export const claimInvoices = data =>
   request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });

src/api/system/business-process.js

@@ -6,8 +6,9 @@ import request from '@/axios';
  * @param {string} data.templateCode 模板编码
  * @param {string} data.submitIdentity 提交人（手机号）
  * @param {string} data.loginName 登录账号（手机号）
- * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
  * @param {string} [data.subject] 流程标题
+ * @param {string} [data.bizType] 业务类型
  */
 export const processSubmit = data => {
   return request({
@@ -20,7 +21,7 @@ export const processSubmit = data => {
 /**
  * 调用 MK processDelete 删除审核流（驳回后重新提交前使用）
  * @param {Object} data
- * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} data.bizId 业务主键
  */
 export const processDelete = data => {
   return request({
@@ -29,3 +30,30 @@ export const processDelete = data => {
     data,
   });
 };
+
+/**
+ * 查询 MK 流程实例是否仍存在（有数据则无需删除/重新提交）
+ * @param {Object} params
+ * @param {string} params.bizId 业务主键
+ */
+export const hasMkProcessInstance = params => {
+  return request({
+    url: '/blade-system/businessProcess/hasMkProcessInstance',
+    method: 'get',
+    params,
+  });
+};
+
+/**
+ * 获取 MK 审批页跳转链接（后端按 thirdParty.mk 配置拼接，含 SSO）
+ * @param {Object} params
+ * @param {string} [params.bizId] 业务 id（如客商 id）
+ * @param {string} [params.processInstanceId] 流程实例 id
+ */
+export const getMKApprovalUrl = params => {
+  return request({
+    url: '/blade-system/businessProcess/getMKApprovalUrl',
+    method: 'get',
+    params,
+  });
+};

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',

src/api/vehicle/customer-archive.js

@@ -152,6 +152,28 @@ export const getScoreTemplate = quantificationId => {
   });
 };
 
+export const queryKingdeeCustomer = creditCode => {
+  return request({
+    url: '/blade-transport/bfi/customer/query-by-credit-code',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      creditCode,
+    },
+  });
+};
+
+export const syncKingdee = id => {
+  return request({
+    url: '/blade-transport/customer-archive/sync-kingdee',
+    method: 'post',
+    timeout: 30000,
+    params: {
+      id,
+    },
+  });
+};
+
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
     url: '/blade-transport/baidu-ocr/recognize-url',

src/axios.js

@@ -264,10 +264,18 @@ axios.interceptors.response.use(
   },
   error => {
     NProgress.done();
+    // 网络级失败（HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应）
+    // 原为静默 reject，接口报错页面无任何感知；统一补错误提示，取消请求与刷新令牌请求除外
+    if (!axios.isCancel(error) && !isRefreshTokenRequest(error?.config)) {
+      ElMessage({
+        message: error?.response?.data?.msg || '请求失败，请稍后重试',
+        type: 'error',
+      });
+    }
+    return Promise.reject(new Error(error));
     // 保留原始 axios 错误对象：下游（如导入失败明细解析）需要 error.response
     // 读取响应体。若包装成 new Error(error)，response 会丢失、message 退化成
     // "[object Object]"，用户只能看到无意义的通用提示。
-    return Promise.reject(error);
   }
 );
 

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,8 +24,10 @@
 </template>
 
 <script>
-const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
-const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
+
+const AMAP_KEY = '13dcb15bc29bfe9c432d17ecd808b812';
+const AMAP_SECURITY_CODE = 'f9d036ef29e376e15d309e0de5c0f7ab';
 let amapLoader;
 
 export default {
@@ -42,6 +40,14 @@ export default {
       type: String,
       default: '',
     },
+    longitude: {
+      type: [String, Number],
+      default: '',
+    },
+    latitude: {
+      type: [String, Number],
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'confirm'],
   data() {
@@ -66,9 +72,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 +90,32 @@ export default {
     }
   },
   methods: {
+    hasCoordinateValue(value) {
+      return value !== '' && value !== null && value !== undefined;
+    },
+    buildInitialSelection() {
+      // Number('') === 0，空字符串不能当有效坐标，否则会落到 [0,0]（非洲附近）
+      if (!this.hasCoordinateValue(this.longitude) || !this.hasCoordinateValue(this.latitude)) {
+        return {};
+      }
+      const longitude = Number(this.longitude);
+      const latitude = Number(this.latitude);
+      if (
+        !Number.isFinite(longitude) ||
+        !Number.isFinite(latitude) ||
+        longitude < -180 ||
+        longitude > 180 ||
+        latitude < -90 ||
+        latitude > 90
+      ) {
+        return {};
+      }
+      return {
+        longitude,
+        latitude,
+        address: this.address || '',
+      };
+    },
     loadAmap() {
       if (window.AMap && window.AMap.Map) {
         return Promise.resolve();
@@ -110,15 +144,29 @@ export default {
           return new Promise(resolve => {
             this.$nextTick(() => {
               if (!this.$refs.map) return resolve(null);
+              const initial = this.buildInitialSelection();
+              const hasPoint =
+                Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude);
+              const center = hasPoint
+                ? [initial.longitude, initial.latitude]
+                : [116.40769, 39.89945];
+              const zoom = hasPoint ? 14 : 11;
               if (!this.amap) {
                 this.amap = new window.AMap.Map(this.$refs.map, {
-                  center: [116.40769, 39.89945],
-                  zoom: 11,
+                  center,
+                  zoom,
                 });
                 this.amap.on('click', event => this.pickPoint(event.lnglat));
               } else {
                 this.amap.resize();
                 this.clearMarker();
+                this.amap.setZoomAndCenter(zoom, center);
+              }
+              if (hasPoint) {
+                const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
+                this.renderMarker(point);
+                this.selected = { ...initial };
+                this.status = initial.address || '已选点，可确认回填';
               }
               resolve(this.amap);
             });
@@ -176,23 +224,17 @@ export default {
       this.searchResults = [];
       this.searching = true;
       this.initMap()
-        .then(map => (map ? this.runGeocode('location', keyword) : null))
-        .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;
-          if (!point) {
+        .then(map => (map ? searchAmapPlaceText(keyword) : null))
+        .then(pois => {
+          if (!pois) return;
+          this.searchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.searchResults[0];
+          if (!first?.location) {
             throw new Error('未找到匹配地址');
           }
           return this.$nextTick().then(() => {
             this.amap?.resize();
-            this.pickPoint(point, geocodes[0]?.formattedAddress || keyword);
+            this.pickPoint(first.location, first.address || first.name || keyword);
           });
         })
         .catch(() => {
@@ -209,8 +251,10 @@ export default {
       }
     },
     pickPoint(point, fallbackAddress = '') {
-      const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
-      const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
+      const longitude =
+        typeof point.getLng === 'function' ? point.getLng() : point.lng ?? point.longitude;
+      const latitude =
+        typeof point.getLat === 'function' ? point.getLat() : point.lat ?? point.latitude;
       if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
         this.$message.warning('选点坐标无效');
         return;
@@ -254,11 +298,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;
     },
   },
@@ -278,7 +330,6 @@ export default {
   }
 
   &__map {
-    flex: 1 1 auto;
     width: 100%;
     min-width: 0;
     height: 420px;
@@ -286,9 +337,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 {

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>

src/components/kingdee-invoice-pool-dialog/main.vue

@@ -0,0 +1,434 @@
+<template>
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
+    <el-form :model="query" inline label-width="130px" @submit.prevent>
+      <el-form-item label="发票号码">
+        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开票日期">
+        <el-date-picker
+          v-model="query.invoiceDateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </el-form-item>
+      <el-form-item label="开票单位">
+        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="受票单位">
+        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开票单位（销方）">
+        <el-select
+          v-model="query.salerTaxNo"
+          clearable
+          filterable
+          remote
+          reserve-keyword
+          :remote-method="keyword => searchCustomers(keyword, 'saler')"
+          :loading="customerLoading.saler"
+          placeholder="输入名称搜索或直接粘贴税号"
+          style="width: 220px"
+          @keyup.enter="handleQuery"
+        >
+          <el-option
+            v-for="item in customerOptions.saler"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="受票单位（购方）">
+        <el-select
+          v-model="query.buyerTaxNo"
+          clearable
+          filterable
+          remote
+          reserve-keyword
+          :remote-method="keyword => searchCustomers(keyword, 'buyer')"
+          :loading="customerLoading.buyer"
+          placeholder="输入名称搜索或直接粘贴税号"
+          style="width: 220px"
+          @keyup.enter="handleQuery"
+        >
+          <el-option
+            v-for="item in customerOptions.buyer"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发票类型">
+        <el-select
+          v-model="query.invoiceType"
+          clearable
+          filterable
+          placeholder="不限"
+          style="width: 230px"
+        >
+          <el-option
+            v-for="option in invoiceTypeOptions"
+            :key="option.value"
+            :label="option.label"
+            :value="option.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="认领状态">
+        <el-select v-model="query.claimed" clearable placeholder="不限" style="width: 120px">
+          <el-option label="未认领" :value="false" />
+          <el-option label="已认领" :value="true" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="登记状态">
+        <el-select v-model="query.registered" clearable placeholder="不限" style="width: 120px">
+          <el-option label="未登记" :value="false" />
+          <el-option label="已登记" :value="true" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="loading" @click="resetQuery">重置</el-button>
+        <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      ref="poolTable"
+      v-loading="loading"
+      :data="rows"
+      :row-key="rowKey"
+      border
+      height="520"
+      :highlight-current-row="!multiple"
+      @selection-change="selection => (selected = selection)"
+      @row-dblclick="handleRowDblclick"
+    >
+      <el-table-column v-if="multiple" type="selection" width="52" fixed="left" align="center" reserve-selection />
+      <el-table-column v-else width="52" align="center" fixed="left">
+        <template #default="{ row }">
+          <el-radio
+            :model-value="current && current.invoiceNo"
+            :value="row.invoiceNo"
+            @change="current = row"
+          >
+            <span></span>
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
+      <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
+      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
+      <el-table-column prop="issuerName" label="开票单位" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="receiverName" label="受票单位" min-width="180" show-overflow-tooltip />
+      <el-table-column label="金额(含税)" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="税率" min-width="90" align="center">
+        <template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
+      </el-table-column>
+      <el-table-column label="税额" min-width="120" align="right">
+        <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="剩余可用金额" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.availableTaxAmount) }}</template>
+      </el-table-column>
+      <!--<el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="210" show-overflow-tooltip />-->
+      <el-table-column label="认领状态" min-width="100" align="center">
+        <template #default="{ row }">
+          <el-tag v-if="row.claimed" type="danger" size="small">已认领</el-tag>
+          <el-tag v-else type="info" size="small">未认领</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="登记状态" min-width="100" align="center">
+        <template #default="{ row }">
+          <el-tag v-if="row.registered" type="warning" size="small">已登记</el-tag>
+          <el-tag v-else type="info" size="small">未登记</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" width="120" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-link
+            type="primary"
+            :underline="false"
+            :disabled="attachmentBusy === row.invoiceNo"
+            @click.stop="viewAttachment(row)"
+            >查看</el-link
+          >
+          <el-link
+            type="primary"
+            :underline="false"
+            :disabled="attachmentBusy === row.invoiceNo"
+            @click.stop="downloadAttachment(row)"
+            >下载</el-link
+          >
+        </template>
+      </el-table-column>
+      <el-table-column v-if="!multiple" label="操作" width="90" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-link type="primary" @click.stop="confirmRows([row])">选择</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="kingdee-pool-dialog__pager">
+      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+      <el-pagination
+        v-model:current-page="page.current"
+        v-model:page-size="page.size"
+        :total="page.total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+        :disabled="loading"
+        @current-change="load"
+        @size-change="handleSizeChange"
+      />
+    </div>
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ confirmText }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import request from '@/axios';
+import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  viewKingdeeInvoiceFile,
+} from '@/utils/kingdee-attachment';
+
+export default {
+  name: 'KingdeeInvoicePoolDialog',
+  props: {
+    modelValue: { type: Boolean, required: true },
+    title: { type: String, default: '查询金蝶票据池' },
+    confirmText: { type: String, default: '确定' },
+    multiple: { type: Boolean, default: false },
+    initialInvoiceNo: { type: String, default: '' },
+    queryApi: { type: Function, required: true },
+  },
+  emits: ['update:modelValue', 'confirm'],
+  data() {
+    return {
+      loading: false,
+      // 与后端 BfiConstant.INVOICE_TYPE_NAMES 对齐：value 为发票类型编码（镜像按 invoice_type_code 精确匹配）
+      // 选票场景只开放数电票（普票/专票）
+      invoiceTypeOptions: [
+        { value: '26', label: '数电发票（普通发票）' },
+        { value: '27', label: '数电发票（增值税专用发票）' },
+      ],
+      rows: [],
+      selected: [],
+      current: null,
+      page: { current: 1, size: 10, total: 0 },
+      // 正在查看/下载附件的发票号（行级 loading 守卫）
+      attachmentBusy: null,
+      // 销/购方客商下拉：远程按名称搜客商档案，选中带出税号查询；手动输入的裸税号直接作为值过滤
+      customerOptions: { saler: [], buyer: [] },
+      customerLoading: { saler: false, buyer: false },
+      query: this.emptyQuery(),
+    };
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    emptyQuery() {
+      return {
+        invoiceNo: '',
+        // 默认查近一个月，随请求传后端并在页面回显
+        invoiceDateRange: [this.$dayjs().subtract(1, 'month').format('YYYY-MM-DD'), this.$dayjs().format('YYYY-MM-DD')],
+        salerName: '',
+        buyerName: '',
+        salerTaxNo: '',
+        buyerTaxNo: '',
+        invoiceType: '',
+        claimed: null,
+        registered: null,
+      };
+    },
+    // 镜像行主键为 id，回源入库前的响应仍可能无 id，用发票号码兜底
+    rowKey(row) {
+      return row.id || row.invoiceNo;
+    },
+    // 票池行附件字段为复数 attachmentsJson，行内首项即发票文件（{source,path,name}）
+    rowAttachment(row = {}) {
+      const value = row.attachmentsJson;
+      if (!value) return null;
+      let parsed = value;
+      if (typeof value === 'string') {
+        try {
+          parsed = JSON.parse(value);
+        } catch {
+          return null;
+        }
+      }
+      return Array.isArray(parsed) ? parsed[0] || null : parsed || null;
+    },
+    attachmentName(row) {
+      const attachment = this.rowAttachment(row);
+      return attachment?.name || `${row.invoiceNo || '发票'}.pdf`;
+    },
+    async viewAttachment(row) {
+      const attachment = this.rowAttachment(row);
+      if (!isKingdeePathAttachment(attachment)) {
+        this.$message.warning('当前发票暂无可查看附件');
+        return;
+      }
+      this.attachmentBusy = row.invoiceNo;
+      try {
+        await viewKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
+      } finally {
+        this.attachmentBusy = null;
+      }
+    },
+    async downloadAttachment(row) {
+      const attachment = this.rowAttachment(row);
+      if (!isKingdeePathAttachment(attachment)) {
+        this.$message.warning('当前发票暂无可下载附件');
+        return;
+      }
+      this.attachmentBusy = row.invoiceNo;
+      try {
+        await downloadKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
+      } finally {
+        this.attachmentBusy = null;
+      }
+    },
+    handleOpen() {
+      this.query = this.emptyQuery();
+      this.query.invoiceNo = this.initialInvoiceNo || '';
+      this.current = null;
+      this.selected = [];
+      this.$refs.poolTable?.clearSelection();
+      this.page.current = 1;
+      this.load();
+    },
+    handleQuery() {
+      this.page.current = 1;
+      this.load();
+    },
+    handleSizeChange() {
+      this.page.current = 1;
+      this.load();
+    },
+    resetQuery() {
+      this.query = this.emptyQuery();
+      this.handleQuery();
+    },
+    // 客商名称远程搜索：含 18 位社会信用代码特征（数字+大写字母）时按裸税号直查；
+    // 否则搜客商档案，取客商发票信息（blade_customer_invoice_info）的抬头/税号作选项——票池税号是开票税号，非统一信用代码
+    async searchCustomers(keyword, side) {
+      const text = String(keyword || '').trim();
+      if (!text) return;
+      if (/^[0-9A-Z]{15,20}$/.test(text)) {
+        this.customerOptions[side] = [{ label: `${text}（手输税号）`, value: text }];
+        return;
+      }
+      this.customerLoading[side] = true;
+      try {
+        const data = this.unwrap(await getCustomerList(1, 20, { fullName: text }));
+        const customers = (data.records || []).filter(item => item.id);
+        if (!customers.length) {
+          this.customerOptions[side] = [];
+          return;
+        }
+        // 列表接口不带发票信息，逐户取 detail（detail 组装 invoices，每户一张发票信息）
+        const options = await Promise.all(
+          customers.map(async customer => {
+            const detail = this.unwrap(await request({ url: '/blade-transport/customer-archive/detail', method: 'get', params: { id: customer.id } }));
+            return (detail?.invoices || [])
+              .filter(invoice => invoice.taxNo)
+              .map(invoice => ({ label: `${invoice.invoiceTitle || customer.fullName}（${invoice.taxNo}）`, value: invoice.taxNo }));
+          })
+        );
+        this.customerOptions[side] = options.flat().filter(
+          (option, index, list) => list.findIndex(item => item.value === option.value) === index
+        );
+      } finally {
+        this.customerLoading[side] = false;
+      }
+    },
+    unwrap(response) {
+      const body = response?.data || response || {};
+      return body?.data || body;
+    },
+    async load() {
+      this.loading = true;
+      try {
+        const range = this.query.invoiceDateRange || [];
+        const data = this.unwrap(
+          await this.queryApi({
+            current: this.page.current,
+            size: this.page.size,
+            invoiceNo: this.query.invoiceNo || undefined,
+            invoiceDateStart: range[0] || undefined,
+            invoiceDateEnd: range[1] || undefined,
+            salerName: this.query.salerName || undefined,
+            buyerName: this.query.buyerName || undefined,
+            salerTaxNo: this.query.salerTaxNo || undefined,
+            buyerTaxNo: this.query.buyerTaxNo || undefined,
+            invoiceType: this.query.invoiceType || undefined,
+            claimed: this.query.claimed ?? undefined,
+            registered: this.query.registered ?? undefined,
+          })
+        );
+        this.rows = data.records || [];
+        this.page.total = Number(data.total || 0);
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleRowDblclick(row) {
+      if (!this.multiple) {
+        this.confirmRows([row]);
+      }
+    },
+    handleConfirm() {
+      const picked = this.multiple ? this.selected : this.current ? [this.current] : [];
+      this.confirmRows(picked);
+    },
+    confirmRows(rows) {
+      if (!rows.length) {
+        this.$message.warning(this.multiple ? '请至少选择一条发票' : '请选择一张发票');
+        return;
+      }
+      this.$emit('confirm', rows);
+      this.visible = false;
+    },
+    formatMoney(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : '-';
+    },
+    formatRate(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? `${number}%` : '-';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.kingdee-pool-dialog__pager {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 12px;
+  gap: 16px;
+}
+.kingdee-pool-dialog__pager-tip {
+  color: #909399;
+  font-size: 12px;
+}
+</style>

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>

src/components/vehicle-attachment-table/main.vue

@@ -40,9 +40,23 @@
       </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="{ $index }">
-          <el-link type="danger" @click="removeAttachment($index)">删除</el-link>
+      <el-table-column
+        v-if="!readonly || showViewActions"
+        label="操作"
+        :width="readonly ? 120 : 170"
+        align="center"
+        fixed="right"
+      >
+        <template #default="{ row, $index }">
+          <div class="vehicle-attachment-table__actions">
+            <el-link type="primary" :disabled="kingdeeBusy" @click="previewAttachment(row)"
+              >查看</el-link
+            >
+            <el-link type="primary" :disabled="kingdeeBusy" @click="downloadAttachment(row)"
+              >下载</el-link
+            >
+            <el-link v-if="!readonly" type="danger" @click="removeAttachment($index)">删除</el-link>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -68,6 +82,7 @@
       width="90%"
       top="4vh"
       class="vehicle-attachment-table__viewer-dialog"
+      @closed="handlePreviewClosed"
     >
       <pdf-preview
         v-if="documentPreviewVisible && previewFile.url && previewFile.isPdf"
@@ -108,6 +123,11 @@ import '@open-file-viewer/core/style.css';
 import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 import PdfPreview from '@/components/pdf-preview/main.vue';
 import { downloadFileByUrl } from '@/utils/util';
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  requestKingdeeFile,
+} from '@/utils/kingdee-attachment';
 
 const attachmentFileTypes = [
   'pdf',
@@ -153,6 +173,16 @@ export default {
       type: Number,
       default: 500,
     },
+    // 金蝶侧附件（piaozone path 型）代理下载所依赖的发票号；行内自带 invoiceNo 时优先用行内值
+    kingdeeInvoiceNo: {
+      type: String,
+      default: '',
+    },
+    // 查看态也展示「查看/下载」操作列（编辑态始终展示，含删除）
+    showViewActions: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue'],
   data() {
@@ -164,6 +194,10 @@ export default {
       imagePreviewIndex: 0,
       documentPreviewVisible: false,
       previewFile: {},
+      // 金蝶侧附件代理请求进行中（行级按钮共享 loading 守卫，防重复触发）
+      kingdeeBusy: false,
+      // 金蝶附件预览用的 objectURL，弹窗关闭时回收
+      kingdeeObjectUrl: '',
       viewerPlugins,
       viewerToolbar: {
         download: true,
@@ -198,6 +232,12 @@ export default {
     attachmentUrl(row = {}) {
       return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || row.src || '';
     },
+    kingdeeInvoiceNoOf(row = {}) {
+      return row.invoiceNo || this.kingdeeInvoiceNo || '';
+    },
+    isKingdeeRow(row = {}) {
+      return isKingdeePathAttachment(row) && Boolean(this.kingdeeInvoiceNoOf(row));
+    },
     attachmentExtension(row = {}) {
       const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0];
       const index = source.lastIndexOf('.');
@@ -245,6 +285,10 @@ export default {
       return `${(value / 1024 / 1024).toFixed(1)}MB`;
     },
     downloadAttachment(row) {
+      // 金蝶侧附件（piaozone path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
+      if (this.isKingdeeRow(row)) {
+        return this.downloadKingdeeAttachment(row);
+      }
       const url = this.attachmentUrl(row);
       if (!url) {
         this.$message.warning('附件地址为空，无法下载');
@@ -252,20 +296,47 @@ export default {
       }
       downloadFileByUrl(url, this.attachmentName(row));
     },
+    async downloadKingdeeAttachment(row) {
+      if (this.kingdeeBusy) return;
+      this.kingdeeBusy = true;
+      try {
+        await downloadKingdeeInvoiceFile(this.kingdeeInvoiceNoOf(row), this.attachmentName(row));
+      } finally {
+        this.kingdeeBusy = false;
+      }
+    },
     batchDownload() {
       const rows = this.selectedRows.length ? this.selectedRows : this.rows;
-      const downloadableRows = rows.filter(row => this.attachmentUrl(row));
-      if (!downloadableRows.length) {
+      const kingdeeRows = rows.filter(row => this.isKingdeeRow(row));
+      const urlRows = rows.filter(row => !this.isKingdeeRow(row) && this.attachmentUrl(row));
+      if (!kingdeeRows.length && !urlRows.length) {
         this.$message.warning(
           this.selectedRows.length ? '所选附件暂无可下载地址' : '暂无可下载附件'
         );
         return;
       }
-      downloadableRows.forEach((row, index) => {
+      urlRows.forEach((row, index) => {
         window.setTimeout(() => this.downloadAttachment(row), index * 500);
       });
+      // 金蝶侧附件走代理接口，串行触发避免并发重复回源
+      this.downloadKingdeeRows(kingdeeRows);
+    },
+    async downloadKingdeeRows(rows) {
+      if (this.kingdeeBusy) return;
+      this.kingdeeBusy = true;
+      try {
+        for (const row of rows) {
+          await downloadKingdeeInvoiceFile(this.kingdeeInvoiceNoOf(row), this.attachmentName(row));
+        }
+      } finally {
+        this.kingdeeBusy = false;
+      }
     },
     previewAttachment(row) {
+      // 金蝶侧附件经 A801-2 代理取流后进弹窗预览，OSS 直链维持原逻辑
+      if (this.isKingdeeRow(row)) {
+        return this.previewKingdeeAttachment(row);
+      }
       const url = this.attachmentUrl(row);
       if (!url) {
         this.$message.warning('附件地址为空，无法预览');
@@ -288,6 +359,42 @@ export default {
       };
       this.documentPreviewVisible = true;
     },
+    async previewKingdeeAttachment(row) {
+      // OFD 版式文件浏览器无法在线渲染，直接提示下载，避免拉流后预览失败
+      if (this.attachmentExtension(row) === 'ofd') {
+        this.$message.warning('OFD 版式文件不支持在线预览，请使用下载获取后查看');
+        return;
+      }
+      if (this.kingdeeBusy) return;
+      this.kingdeeBusy = true;
+      try {
+        const blob = await requestKingdeeFile(this.kingdeeInvoiceNoOf(row));
+        this.releaseKingdeeObjectUrl();
+        const isPdf = this.isPdf(row) || String(blob.type || '').includes('application/pdf');
+        this.kingdeeObjectUrl = URL.createObjectURL(blob);
+        this.previewFile = {
+          name: this.attachmentName(row),
+          url: this.kingdeeObjectUrl,
+          mimeType: isPdf ? 'application/pdf' : blob.type || '',
+          isPdf,
+        };
+        this.documentPreviewVisible = true;
+      } catch (error) {
+        if (!error?.silent) this.$message.error(error?.message || '附件预览失败');
+      } finally {
+        this.kingdeeBusy = false;
+      }
+    },
+    handlePreviewClosed() {
+      this.releaseKingdeeObjectUrl();
+      this.previewFile = {};
+    },
+    releaseKingdeeObjectUrl() {
+      if (this.kingdeeObjectUrl) {
+        URL.revokeObjectURL(this.kingdeeObjectUrl);
+        this.kingdeeObjectUrl = '';
+      }
+    },
     handlePreviewUnsupported() {
       this.$message.warning('当前文件暂不支持在线预览');
     },
@@ -318,6 +425,17 @@ export default {
     text-decoration: underline;
   }
 
+  &__actions {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 12px;
+
+    :deep(.el-link) {
+      font-size: 13px;
+    }
+  }
+
   &__upload {
     display: flex;
     justify-content: flex-start;

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) {

src/option/base/common-address.js

@@ -146,6 +146,13 @@ export const createOption = () => ({
       showWordLimit: true,
       rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '更新时间',
       prop: 'updateTime',

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,

src/option/business/common-cargo.js

@@ -35,26 +35,7 @@ export const formatCargoValue = value => {
 };
 
 export const option = createCrudOption([
-  {
-    label: '一级货物类型',
-    prop: 'firstCargoTypeName',
-    formslot: true,
-    order: 60,
-    span: 12,
-    minWidth: 150,
-    editDisabled: true,
-    rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
-  },
-  {
-    label: '二级货物类型',
-    prop: 'secondCargoTypeName',
-    formslot: true,
-    order: 59,
-    span: 12,
-    minWidth: 150,
-    editDisabled: true,
-    rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
-  },
+  // ---------- 列表字段（顺序即表格展示顺序） ----------
   {
     label: '货物名称',
     prop: 'cargoName',
@@ -79,12 +60,24 @@ export const option = createCrudOption([
     ],
   },
   {
-    label: '一级货物类型编码',
-    prop: 'firstCargoTypeCode',
-    hide: true,
-    display: false,
-    addDisplay: false,
+    label: '一级货物类型',
+    prop: 'firstCargoTypeName',
+    formslot: true,
+    order: 60,
+    span: 12,
+    minWidth: 150,
     editDisabled: true,
+    rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
+  },
+  {
+    label: '二级货物类型',
+    prop: 'secondCargoTypeName',
+    formslot: true,
+    order: 59,
+    span: 12,
+    minWidth: 150,
+    editDisabled: true,
+    rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
   },
   {
     label: '二级货物类型编码',
@@ -92,9 +85,132 @@ export const option = createCrudOption([
     display: false,
     addDisplay: false,
     editDisabled: true,
-    minWidth: 180,
+    minWidth: 160,
   },
-  // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
+  {
+    label: '包装',
+    prop: 'packageType',
+    type: 'select',
+    dicData: packageOptions,
+    order: 39,
+    span: 12,
+    minWidth: 100,
+  },
+  {
+    label: '品牌',
+    prop: 'brand',
+    search: false,
+    order: 40,
+    span: 12,
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('品牌', 50),
+  },
+  {
+    label: '规格',
+    prop: 'specification',
+    order: 29,
+    span: 12,
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('规格', 50),
+  },
+  {
+    label: '型号',
+    prop: 'model',
+    order: 19,
+    span: 12,
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('型号', 50, true),
+  },
+  {
+    label: '单价',
+    prop: 'cargoValue',
+    formslot: true,
+    order: 30,
+    formatter: row => formatCargoValue(row.cargoValue),
+    minWidth: 120,
+    rules: [
+      {
+        validator: (rule, value, callback) => {
+          if (value === undefined || value === null || value === '') {
+            callback();
+            return;
+          }
+          if (!/^\d+(\.\d{1,2})?$/.test(String(value))) {
+            callback(new Error('单价只能输入数字，最多保留2位小数'));
+            return;
+          }
+          callback();
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  {
+    label: '计价单位',
+    prop: 'priceUnit',
+    type: 'select',
+    dicData: [],
+    display: false,
+    minWidth: 120,
+  },
+  {
+    label: '尺寸',
+    prop: 'sizeText',
+    minWidth: 120,
+    addDisplay: false,
+    editDisplay: false,
+    rules: textRule('尺寸', 100),
+  },
+  {
+    label: '说明',
+    prop: 'descriptionOne',
+    order: 20,
+    span: 12,
+    minWidth: 160,
+    placeholder: '请输入',
+    rules: textRule('说明', 100),
+  },
+  {
+    label: '备注',
+    prop: 'remark',
+    type: 'textarea',
+    order: 10,
+    minRows: 2,
+    span: 24,
+    maxlength: 200,
+    showWordLimit: true,
+    placeholder: '请输入',
+    rules: textRule('备注', 200),
+  },
+  {
+    label: '组织',
+    prop: 'deptName',
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  ...auditColumns
+    .filter(column => ['createUserName', 'createTime', 'updateTime'].includes(column.prop))
+    .sort(
+      (first, second) =>
+        ['createUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
+        ['createUserName', 'createTime', 'updateTime'].indexOf(second.prop)
+    ),
+
+  // ---------- 表单隐藏字段 ----------
+  {
+    label: '一级货物类型编码',
+    prop: 'firstCargoTypeCode',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisabled: true,
+  },
+
+  // ---------- 搜索字段（与表格、表单独立） ----------
   {
     label: '货物名称',
     prop: 'searchCargoName',
@@ -186,118 +302,6 @@ export const option = createCrudOption([
     editDisplay: false,
     viewDisplay: false,
   },
-  {
-    label: '包装',
-    prop: 'packageType',
-    type: 'select',
-    dicData: packageOptions,
-    order: 39,
-    span: 12,
-    minWidth: 100,
-  },
-  {
-    label: '品牌',
-    prop: 'brand',
-    search: false,
-    order: 40,
-    span: 12,
-    minWidth: 120,
-    placeholder: '请输入',
-    rules: textRule('品牌', 50),
-  },
-  {
-    label: '规格',
-    prop: 'specification',
-    order: 29,
-    span: 12,
-    minWidth: 120,
-    placeholder: '请输入',
-    rules: textRule('规格', 50),
-  },
-  {
-    label: '货值',
-    prop: 'cargoValue',
-    formslot: true,
-    order: 30,
-    formatter: row => formatCargoValue(row.cargoValue),
-    minWidth: 120,
-    rules: [
-      {
-        validator: (rule, value, callback) => {
-          if (value === undefined || value === null || value === '') {
-            callback();
-            return;
-          }
-          if (!/^\d+(\.\d{1,2})?$/.test(String(value))) {
-            callback(new Error('货值只能输入数字，最多保留2位小数'));
-            return;
-          }
-          callback();
-        },
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '计价单位',
-    prop: 'priceUnit',
-    type: 'select',
-    dicData: [],
-    display: false,
-    minWidth: 120,
-  },
-  {
-    label: '型号',
-    prop: 'model',
-    order: 19,
-    span: 12,
-    minWidth: 120,
-    placeholder: '请输入',
-    rules: textRule('型号', 50, true),
-  },
-  {
-    label: '尺寸',
-    prop: 'sizeText',
-    minWidth: 120,
-    addDisplay: false,
-    editDisplay: false,
-    rules: textRule('尺寸', 100),
-  },
-  {
-    label: '说明',
-    prop: 'descriptionOne',
-    order: 20,
-    span: 12,
-    minWidth: 160,
-    placeholder: '请输入',
-    rules: textRule('说明', 100),
-  },
-  {
-    label: '备注',
-    prop: 'remark',
-    type: 'textarea',
-    order: 10,
-    minRows: 2,
-    span: 24,
-    maxlength: 200,
-    showWordLimit: true,
-    placeholder: '请输入',
-    rules: textRule('备注', 200),
-  },
-  {
-    label: '组织',
-    prop: 'deptName',
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-  },
-  ...auditColumns
-    .filter(column => ['updateTime', 'createTime'].includes(column.prop))
-    .sort(
-      (first, second) =>
-        ['updateTime', 'createTime'].indexOf(first.prop) -
-        ['updateTime', 'createTime'].indexOf(second.prop)
-    ),
 ]);
 
 // 搜索栏标签统一加宽，给较长的货物类型字段预留足够展示空间。

src/option/business/common-route.js

@@ -281,14 +281,13 @@ export const option = {
       filterable: true,
     },
     ...auditColumns
-      .filter(column => column.prop !== 'createUserName')
       .map(column =>
         ['createTime', 'updateTime'].includes(column.prop) ? { ...column, minWidth: 190 } : column
       )
       .sort(
         (first, second) =>
-          ['updateUserName', 'updateTime', 'createTime'].indexOf(first.prop) -
-          ['updateUserName', 'updateTime', 'createTime'].indexOf(second.prop)
+          ['createUserName', 'updateUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
+          ['createUserName', 'updateUserName', 'createTime', 'updateTime'].indexOf(second.prop)
       ),
   ]),
   dialogCustomClass: 'avue-dialog--common-route',

src/option/business/contract-manage.js

@@ -114,7 +114,7 @@ export const config = {
   operations: [
     {
       action: 'flow',
-      label: '查看流程',
+      label: '流程',
       statusProp: 'approvalStatus',
       status: ['reviewing', 'change_reviewing'],
       stage: ['temporary', 'formal'],
@@ -206,7 +206,7 @@ export const config = {
     },
     {
       action: 'flow',
-      label: '查看流程',
+      label: '流程',
       statusProp: 'approvalStatus',
       status: ['approved', 'change_approved'],
       stage: ['formal', 'terminated'],
@@ -532,6 +532,13 @@ export const option = createCrudOption([
     order: 30,
     minWidth: 110,
   },
+  {
+    label: '创建人',
+    prop: 'createUserName',
+    minWidth: 120,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '创建时间',
     prop: 'createTime',
@@ -730,7 +737,7 @@ export const option = createCrudOption([
     labelWidth: 0,
   },
   ...auditColumns
-    .filter(column => column.prop !== 'createTime')
+    .filter(column => !['createTime', 'createUserName'].includes(column.prop))
     .map(column => ({ ...column, hide: true })),
 ]);
 

src/option/business/loading-manage.js

@@ -31,7 +31,7 @@ export const loadingManageConfig = {
   exportColumns: [
     { prop: 'loadingNo', label: '配载单号' },
     { prop: 'loadingSubNos', label: '配载子单号' },
-    { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号' },
+    { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
     { prop: 'driverName', label: '司机' },
     { prop: 'driverPhone', label: '联系电话' },
     { prop: 'carrierType', label: '承运类型' },
@@ -41,6 +41,7 @@ export const loadingManageConfig = {
     { prop: 'carrierName', label: '承运商' },
     { prop: 'transportType', label: '运输方式' },
     { prop: 'dataSource', label: '数据来源' },
+    { prop: 'createUserName', label: '创建人' },
     { prop: 'createTime', label: '创建时间' },
     { prop: 'updateTime', label: '更新时间' },
     { prop: 'currentProcessNode', label: '过程节点' },

src/option/business/process-config.js

@@ -112,12 +112,12 @@ export const option = {
       editDisplay: false,
     },
     ...auditColumns
-      .filter(column => ['updateTime', 'createTime'].includes(column.prop))
+      .filter(column => ['createUserName', 'createTime', 'updateTime'].includes(column.prop))
       .map(column => ({ ...column, minWidth: 190 }))
       .sort(
         (first, second) =>
-          ['updateTime', 'createTime'].indexOf(first.prop) -
-          ['updateTime', 'createTime'].indexOf(second.prop)
+          ['createUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
+          ['createUserName', 'createTime', 'updateTime'].indexOf(second.prop)
       ),
     {
       label: '项目ID集合',

src/option/business/project-apply.js

@@ -57,16 +57,24 @@ export const config = {
       action: 'submitApproval',
       label: '提交',
       statusProp: 'approvalStatus',
-      status: ['draft'],
+      status: ['draft', 'rejected', 'withdrawn'],
       permission: 'project_apply_submit',
     },
     {
       action: 'withdraw',
       label: '撤回',
       statusProp: 'approvalStatus',
-      status: ['reviewing'],
+      status: ['draft', 'reviewing'],
       permission: 'project_apply_withdraw',
     },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing', 'change_reviewing'],
+      permission: 'project_apply_approve',
+      mkOnly: true,
+    },
     {
       action: 'approve',
       label: '通过',
@@ -74,6 +82,7 @@ export const config = {
       statusProp: 'approvalStatus',
       status: ['reviewing', 'change_reviewing'],
       permission: 'project_apply_approve',
+      localOnly: true,
     },
     {
       action: 'reject',
@@ -82,6 +91,7 @@ export const config = {
       statusProp: 'approvalStatus',
       status: ['reviewing', 'change_reviewing'],
       permission: 'project_apply_reject',
+      localOnly: true,
     },
     {
       action: 'startChange',
@@ -442,5 +452,9 @@ export const option = createCrudOption([
     span: 24,
     hide: true,
   },
-  ...auditColumns.map(column => ({ ...column, hide: true })),
+  ...auditColumns.map(column =>
+    ['createUserName', 'createTime'].includes(column.prop)
+      ? column
+      : { ...column, hide: true }
+  ),
 ]);

src/option/business/temporary-credit-limit.js

@@ -332,9 +332,13 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
-    ...auditColumns.map(column => ({ ...column, hide: true })),
+    ...auditColumns.map(column =>
+      ['createUserName', 'createTime'].includes(column.prop)
+        ? column
+        : { ...column, hide: true }
+    ),
   ])),
-  dialogWidth: '96%',
+  dialogWidth: 1100,
   menuFixed: 'right',
   menuWidth: 320,
   index: false,

src/option/business/transport-plan.js

@@ -249,9 +249,10 @@ export const config = {
       title: '其它信息',
       fields: [
         ['remark', '备注'],
+        ['createUserName', '创建人'],
+        ['createTime', '创建时间'],
         ['updateUserName', '更新人'],
         ['updateTime', '更新时间'],
-        ['createTime', '创建时间'],
       ],
     },
   ],
@@ -457,6 +458,9 @@ export const option = {
         showWordLimit: true,
         rules: textRule('备注', 200),
       },
+      {
+        ...auditColumn('createUserName'),
+      },
       {
         ...auditColumn('updateUserName'),
       },

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,
@@ -563,10 +565,10 @@ export const option = {
         display: false,
       },
       {
-        label: '车牌号/航班号/船号/班列号',
+        label: '车牌号/船班号/船次号/班次号',
         prop: 'vehicleNo',
         search: true,
-        searchLabel: '车/船/航班/班列',
+        searchLabel: '车牌号/船班号/船次号/班次号',
         searchOrder: 13,
         minWidth: 210,
         display: 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,15 +733,30 @@ export const option = {
         prop: 'planName',
         formslot: true,
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 7,
         span: 6,
         order: 870,
         minWidth: 150,
+        formatter: row => {
+          const value = row?.planName;
+          if (
+            value === undefined ||
+            value === null ||
+            value === '' ||
+            String(value) === '-1' ||
+            Number(value) === -1
+          ) {
+            return '';
+          }
+          return value;
+        },
       },
       {
         label: '货物类型',
         prop: 'cargoType',
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 18,
         formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
         minWidth: 130,
@@ -864,6 +883,9 @@ export const option = {
         viewDisplay: false,
         display: false,
       },
+      {
+        ...auditColumn('createUserName'),
+      },
       {
         ...auditColumn('createTime'),
       },

src/option/payment/invoiceApplication.js

@@ -13,6 +13,8 @@ export const invoiceApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];
 
 export const invoiceApplicationDetailColumns = [

src/option/payment/invoiceReceipt.js

@@ -11,6 +11,8 @@ export const invoiceReceiptTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
-  { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/payment/paymentApplication.js

@@ -17,4 +17,6 @@ export const paymentApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
+  { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/payment/receiptFlow.js

@@ -8,5 +8,11 @@ export const receiptFlowTableColumns = [
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
+  { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
+  { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
+  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
+  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
+  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];

src/option/settlement/formalSettlementTable.js

@@ -21,6 +21,8 @@ export const formalSettlementTableColumns = [
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
+  { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
+  { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
   { label: '创建时间', prop: 'createTime', minWidth: 170 },
 ];

src/option/settlement/receivable-payable-detail.js

@@ -88,6 +88,8 @@ export const updateFeeFormFields = [
 ];
 
 export const transferSearchFields = [
+  { label: '单据号', prop: 'documentNo', type: 'input' },
+  { label: '合同编码', prop: 'contractNo', type: 'input' },
   { label: '合同名称', prop: 'contractName', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
   { label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
@@ -104,7 +106,7 @@ export const generateWaybillColumns = [
   { label: '运单号', prop: 'waybillNo', minWidth: 160, link: true },
   { label: '项目名称', prop: 'projectName', minWidth: 160 },
   { label: '客户/委托方', prop: 'customerName', minWidth: 160 },
-  { label: '车牌号/航班号/船号/班列号', prop: 'vehicleNo', minWidth: 190 },
+  { label: '车牌号/船班号/船次号/班次号', prop: 'vehicleNo', minWidth: 190 },
   { label: '司机', prop: 'driverName', minWidth: 120 },
   { label: '承运商', prop: 'carrierName', minWidth: 160 },
   { label: '运输类型', prop: 'transportType', minWidth: 130 },

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,

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 === '') {

src/option/transportCapacity/driver.js

@@ -125,6 +125,23 @@ export const option = {
       slot: true,
       minWidth: 160,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '准驾车型',
       prop: 'drivingType',

src/option/transportCapacity/transport-ship.js

@@ -91,6 +91,23 @@ export const option = {
       minWidth: 140,
       align: 'center',
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '',
       prop: 'expireStatus',

src/option/transportCapacity/transport-vehicle.js

@@ -151,6 +151,23 @@ export const option = {
       minWidth: 130,
       align: 'center',
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '',
       prop: 'expireStatus',

src/option/vehicle/accident-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -10,6 +10,9 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) =>
+  value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value;
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -135,6 +138,7 @@ export const option = {
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -146,6 +150,7 @@ export const option = {
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -204,6 +209,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -281,6 +294,8 @@ export const exportColumns = [
   { prop: 'insuranceClaimAmount', label: '保险理赔金额' },
   { prop: 'accidentReasonDamage', label: '事故原因及损坏情况' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/annual-inspection-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -10,6 +10,9 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) =>
+  value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value;
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -159,6 +162,7 @@ export const option = {
       minWidth: 100,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [
         { required: true, message: '请输入费用', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -206,6 +210,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -282,6 +294,8 @@ export const exportColumns = [
   { prop: 'fee', label: '费用（元）' },
   { prop: 'assessmentUnit', label: '评定（复核）单位' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/equipment-ledger.js

@@ -147,6 +147,15 @@ export const option = {
       viewDisplay: false,
       minWidth: 170,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -224,6 +233,8 @@ export const exportColumns = [
   { prop: 'specificationModel', label: '规格型号' },
   { prop: 'remark', label: '备注' },
   { prop: 'originalEquipmentNo', label: '原厂设备号' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/etc-record.js

@@ -172,6 +172,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -218,6 +226,8 @@ export const exportColumns = [
   { prop: 'exitStation', label: '出口站' },
   { prop: 'dataSource', label: '数据来源' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/insurance-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -141,6 +141,7 @@ export const option = {
       formslot: true,
       append: '元',
       minWidth: 120,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value),
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -150,6 +151,7 @@ export const option = {
       formslot: true,
       append: '元',
       minWidth: 120,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value),
       rules: [
         { required: true, message: '请输入保费', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -159,6 +161,7 @@ export const option = {
       label: '发票号',
       prop: 'invoiceNo',
       minWidth: 150,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || String(value) === '-1' ? '' : value),
       rules: [{ max: 80, message: '最多 80 个字符', trigger: 'blur' }],
     },
     {
@@ -168,6 +171,7 @@ export const option = {
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
       minWidth: 120,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || String(value) === '-1' ? '' : value),
     },
     {
       label: '备注',
@@ -178,6 +182,14 @@ export const option = {
       hide: true,
       rules: [{ max: 200, message: '备注最多 200 个字', trigger: 'blur' }],
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -256,6 +268,8 @@ export const exportColumns = [
   { prop: 'invoiceNo', label: '发票号' },
   { prop: 'invoiceDate', label: '开票日期' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/mileage-record.js

@@ -1,6 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
-const isEmpty = value => value === undefined || value === null || value === '';
+const isEmpty = value =>
+  value === undefined || value === null || value === '' || Number(value) === -1;
 
 const validateNonNegative = (rule, value, callback) => {
   if (isEmpty(value)) {
@@ -12,6 +13,8 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) => (isEmpty(value) ? '' : value);
+
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -60,6 +63,7 @@ export const option = {
       append: 'km',
       minWidth: 210,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -70,6 +74,7 @@ export const option = {
       append: 'km',
       minWidth: 210,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -80,6 +85,7 @@ export const option = {
       append: 'km',
       minWidth: 170,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -90,6 +96,7 @@ export const option = {
       append: 'km',
       minWidth: 170,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -133,6 +140,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -208,6 +223,8 @@ export const exportColumns = [
   { prop: 'monthlyMileage', label: '本月行驶里程数' },
   { prop: 'totalMileage', label: '累计行驶里程数' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/oil-electric-record.js

@@ -1,6 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
-const isEmpty = value => value === undefined || value === null || value === '';
+const isEmpty = value =>
+  value === undefined || value === null || value === '' || Number(value) === -1;
 
 const validateNonNegative = (rule, value, callback) => {
   if (isEmpty(value)) {
@@ -12,6 +13,8 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) => (isEmpty(value) ? '' : value);
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -124,6 +127,7 @@ export const option = {
       type: 'input',
       formslot: true,
       minWidth: 110,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -133,6 +137,7 @@ export const option = {
       formslot: true,
       append: '元/升',
       minWidth: 120,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -141,6 +146,7 @@ export const option = {
       type: 'input',
       formslot: true,
       minWidth: 130,
+      formatter: formatEmptySentinel,
       rules: [
         { required: true, message: '请输入交易金额', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -152,6 +158,7 @@ export const option = {
       type: 'input',
       formslot: true,
       minWidth: 110,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -225,6 +232,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -304,6 +319,8 @@ export const exportColumns = [
   { prop: 'balance', label: '余额' },
   { prop: 'station', label: '站点' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/other-expense-record.js

@@ -165,6 +165,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -209,6 +217,8 @@ export const exportColumns = [
   { prop: 'amount', label: '金额' },
   { prop: 'dataSource', label: '数据来源' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/tire-replacement-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -11,7 +11,7 @@ const validateNonNegative = (rule, value, callback) => {
 };
 
 const validatePositiveInteger = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (!Number.isInteger(Number(value)) || Number(value) <= 0) {
     callback(new Error('换胎数量必须为正整数'));
@@ -20,6 +20,9 @@ const validatePositiveInteger = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) =>
+  value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value;
+
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -98,6 +101,7 @@ export const option = {
       minWidth: 110,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validatePositiveInteger, trigger: 'blur' }],
     },
     {
@@ -108,6 +112,7 @@ export const option = {
       minWidth: 120,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [
         { required: true, message: '请输入换胎费用', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -142,6 +147,14 @@ export const option = {
       slot: true,
       formslot: true,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -217,6 +230,8 @@ export const exportColumns = [
   { prop: 'replacementCost', label: '换胎费用' },
   { prop: 'replacementDescription', label: '换胎说明' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/transport-change-record.js

@@ -97,6 +97,14 @@ export const option = {
       slot: true,
       formslot: true,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -169,6 +177,8 @@ export const exportColumns = [
   { prop: 'changeItem', label: '变更事项' },
   { prop: 'changeContent', label: '变更内容' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/violation-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -11,7 +11,7 @@ const validateNonNegative = (rule, value, callback) => {
 };
 
 const validateDeductPoints = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (!Number.isInteger(Number(value)) || Number(value) < 0 || Number(value) > 15) {
     callback(new Error('被扣分数范围为 0-15 分'));
@@ -20,6 +20,9 @@ const validateDeductPoints = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) =>
+  value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value;
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -150,6 +153,7 @@ export const option = {
       minWidth: 100,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -160,6 +164,7 @@ export const option = {
       minWidth: 110,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateDeductPoints, trigger: 'blur' }],
     },
     {
@@ -216,6 +221,14 @@ export const option = {
       slot: true,
       formslot: true,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -294,6 +307,8 @@ export const exportColumns = [
   { prop: 'processStatus', label: '状态' },
   { prop: 'processDescription', label: '过程描述' },
   { prop: 'processResult', label: '处理结果' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/page/login/facelogin.vue

@@ -13,8 +13,8 @@ export default {
   data() {
     return {
       loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
       },
     };
   },

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: '',

src/page/login/userlogin.vue

@@ -93,9 +93,9 @@ export default {
         //角色ID
         roleId: '',
         //用户名
-        username: 'admin',
+        username: '',
         //密码
-        password: 'admin',
+        password: '',
         //账号类型
         type: 'account',
         //验证码的值

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,
@@ -106,21 +106,10 @@ export default [
       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'),
+    component: () => import('@/views/settlement/pre-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -131,7 +120,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 +131,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,
@@ -150,6 +139,39 @@ export default [
       bizType: 'payment-application',
     },
   },
+  {
+    path: '/payment/invoice-application/public-view',
+    name: '查看开票申请信息',
+    component: () => import('@/views/payment/invoice-application-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'invoice-application',
+    },
+  },
+  {
+    path: '/payment/invoice-receipt/public-view',
+    name: '查看收票登记信息',
+    component: () => import('@/views/payment/invoice-receipt-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'invoice-receipt',
+    },
+  },
+  {
+    path: '/payment/bill-payment/public-view',
+    name: '查看汇票付款信息',
+    component: () => import('@/views/payment/bill-payment-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'bill-payment',
+    },
+  },
   {
     path: '/',
     name: '主页',

src/store/getters.js

@@ -1,8 +1,12 @@
+import { isAdministrator as checkAdministrator } from '@/utils/auth';
+
 const getters = {
   tag: state => state.tags.tag,
   language: state => state.common.language,
   setting: state => state.common.setting,
   userInfo: state => state.user.userInfo,
+  // 超级管理员：角色别名中包含 administrator
+  isAdministrator: state => checkAdministrator(state.user.userInfo),
   colorName: state => state.common.colorName,
   themeName: state => state.common.themeName,
   isMacOs: (state, getters) => getters.themeName === 'mac-os',

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;
+  }
 }

src/utils/auth.js

@@ -6,8 +6,31 @@ const RefreshTokenKey = website.refreshTokenKey;
 const SessionId = 'JSESSIONID';
 const UserId = 'b-user-id';
 
+/** 超级管理员角色别名 */
+export const ADMINISTRATOR_ROLE_ALIAS = 'administrator';
+
+/**
+ * 是否超级管理员：角色别名中包含 administrator 即为超级管理员
+ *
+ * @param {object|string|string[]} [userInfoOrAuthority] 用户信息，或 authority / role_name 字符串/数组
+ * @returns {boolean}
+ */
+export function isAdministrator(userInfoOrAuthority) {
+  let authority = userInfoOrAuthority;
+  if (authority && typeof authority === 'object' && !Array.isArray(authority)) {
+    authority = authority.authority ?? authority.role_name ?? authority.roleName ?? '';
+  }
+  const roles = Array.isArray(authority)
+    ? authority
+    : String(authority || '')
+        .split(/[,，]/)
+        .map(role => role.trim())
+        .filter(Boolean);
+  return roles.some(role => String(role).trim() === ADMINISTRATOR_ROLE_ALIAS);
+}
+
 export function getToken() {
-  return Cookies.get(TokenKey);
+    return Cookies.get(TokenKey);
 }
 
 export function setToken(token) {

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);
+};

src/utils/kingdee-attachment.js

@@ -0,0 +1,91 @@
+/**
+ * 金蝶侧发票附件查看/下载公共工具
+ *
+ * 票池发票附件为 {source:'piaozone', path, name}：path 是金蝶侧文件 id（非 http 直链），
+ * 须由后端代理 A801-2 流式回源；OSS 直链附件（url/link/fileUrl）仍由前端直连下载/预览。
+ * 入口共用：票池弹窗、正式结算认领发票行、付款申请发票附件行、收票登记附件表。
+ */
+import { ElMessage } from 'element-plus';
+import { downloadFile } from '@/utils/util';
+import { downloadInvoicePoolAttachment } from '@/api/payment/invoiceReceipt';
+
+/**
+ * 金蝶侧附件判定：source=piaozone，或有 path 且非 http(s) 直链
+ * @param {Object|Null} attachment 附件对象（attachmentsJson/attachmentJson 行内首项）
+ * @returns {Boolean}
+ */
+export const isKingdeePathAttachment = attachment => {
+  if (!attachment) return false;
+  if (attachment.source === 'piaozone') return true;
+  return Boolean(attachment.path) && !/^https?:\/\//i.test(attachment.path);
+};
+
+/**
+ * 请求金蝶文件流：成功返回 Blob；业务失败为 HTTP 200 + R.fail JSON（响应通道未写流时后端即失败），
+ * 按 Content-Type 识别并抛出带 msg 的错误；网络级失败拦截器已提示，标记 silent 避免重复提示。
+ * 供查看（弹窗内预览）/下载两类入口复用
+ * @param {String} invoiceNo 发票号码
+ * @returns {Promise<Blob>}
+ */
+export const requestKingdeeFile = async invoiceNo => {
+  let res;
+  try {
+    res = await downloadInvoicePoolAttachment(invoiceNo);
+  } catch (error) {
+    throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
+  }
+  const blob = res?.data;
+  if (!(blob instanceof Blob)) {
+    throw new Error('响应不是文件流');
+  }
+  if (blob.type && blob.type.includes('application/json')) {
+    let message = '附件下载失败';
+    try {
+      const parsed = JSON.parse(await blob.text());
+      message = parsed.msg || parsed.message || message;
+    } catch {
+      // 错误体非 JSON 时按默认提示
+    }
+    throw new Error(message);
+  }
+  return blob;
+};
+
+/**
+ * 下载金蝶侧发票附件（经 A801-2 后端代理），失败统一 ElMessage 提示
+ * @param {String} invoiceNo 发票号码
+ * @param {String} fileName 下载文件名（缺省按 发票号.pdf）
+ */
+export const downloadKingdeeInvoiceFile = async (invoiceNo, fileName) => {
+  if (!invoiceNo) {
+    ElMessage.warning('当前发票缺少发票号码，无法下载金蝶侧附件');
+    return;
+  }
+  try {
+    const blob = await requestKingdeeFile(invoiceNo);
+    downloadFile(blob, fileName || `${invoiceNo}.pdf`);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
+  }
+};
+
+/**
+ * 新窗口预览金蝶侧发票附件：拉取 Blob 转 objectURL（PDF 可预览；OFD 等浏览器不可预览的格式由浏览器触发下载）
+ * @param {String} invoiceNo 发票号码
+ * @param {String} fileName 预览文件名（缺省按 发票号.pdf）
+ */
+export const viewKingdeeInvoiceFile = async (invoiceNo, fileName) => {
+  if (!invoiceNo) {
+    ElMessage.warning('当前发票缺少发票号码，无法预览金蝶侧附件');
+    return;
+  }
+  try {
+    const blob = await requestKingdeeFile(invoiceNo);
+    const url = URL.createObjectURL(blob);
+    window.open(url, '_blank');
+    // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
+    setTimeout(() => URL.revokeObjectURL(url), 60000);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
+  }
+};

src/utils/map-search.js

@@ -0,0 +1,162 @@
+/** 地点搜索 v5/place/text 使用的「Web 服务」类型 Key */
+export const AMAP_WEB_SERVICE_KEY = 'b43016a0d1f5b0c32211560392059708';
+
+/**
+ * 高德地点关键词搜索（Web 服务 v5）。
+ * @see https://restapi.amap.com/v5/place/text
+ * @param {string} keyword 地点关键字
+ * @param {{ key?: string, pageSize?: number, pageNum?: number, region?: string, cityLimit?: boolean }} options
+ * @returns {Promise<Array>}
+ */
+export function searchAmapPlaceText(keyword, options = {}) {
+  const key = options.key || AMAP_WEB_SERVICE_KEY;
+  const pageSize = options.pageSize || 20;
+  const pageNum = options.pageNum || 1;
+  if (!key) {
+    return Promise.reject(new Error('高德地图 Key 未配置'));
+  }
+  const trimmed = String(keyword || '').trim();
+  if (!trimmed) {
+    return Promise.reject(new Error('请输入地址关键词'));
+  }
+
+  const params = new URLSearchParams({
+    key,
+    keywords: trimmed,
+    page_size: String(pageSize),
+    page_num: String(pageNum),
+    show_fields: 'photos',
+  });
+  if (options.region) {
+    params.set('region', options.region);
+  }
+  if (options.cityLimit != null) {
+    params.set('city_limit', options.cityLimit ? 'true' : 'false');
+  }
+
+  return fetch(`https://restapi.amap.com/v5/place/text?${params.toString()}`)
+    .then(response => {
+      if (!response.ok) {
+        throw new Error('高德地点搜索请求失败');
+      }
+      return response.json();
+    })
+    .then(data => {
+      if (String(data?.status) === '1') {
+        return Array.isArray(data.pois) ? data.pois : [];
+      }
+      const error = new Error(data?.info || '高德地点搜索失败');
+      error.code = data?.infocode;
+      throw error;
+    });
+}
+
+/**
+ * 将高德 Geocoder / place/text 结果规范化为地图选址浮层列表数据。
+ * @param {Array|Object} geocodesOrResult geocodes/pois 数组，或含 geocodes/pois/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.pois)) {
+      list = geocodesOrResult.pois;
+    } else if (Array.isArray(geocodesOrResult.geocodes)) {
+      list = geocodesOrResult.geocodes;
+    } else if (geocodesOrResult.location) {
+      list = [geocodesOrResult];
+    }
+  }
+
+  return list
+    .map((item, index) => {
+      if (!item) return null;
+      if (isPlacePoi(item)) {
+        const address = buildPoiAddress(item) || fallback || '-';
+        return {
+          id: item.id || index,
+          name: String(item.name || '').trim() || address,
+          address,
+          location: parseMapLocation(item.location),
+          photo: pickPoiPhoto(item),
+        };
+      }
+
+      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: parseMapLocation(item?.location),
+        photo: item?.photo || item?.image || '',
+      };
+    })
+    .filter(item => item && item.location);
+}
+
+export function parseMapLocation(location) {
+  if (!location) return null;
+  if (typeof location.getLng === 'function' && typeof location.getLat === 'function') {
+    return location;
+  }
+  if (typeof location === 'string') {
+    const parts = location.split(',');
+    const lng = Number(parts[0]);
+    const lat = Number(parts[1]);
+    if (!Number.isFinite(lng) || !Number.isFinite(lat)) return null;
+    return { lng, lat };
+  }
+  if (Number.isFinite(Number(location.lng)) && Number.isFinite(Number(location.lat))) {
+    return { lng: Number(location.lng), lat: Number(location.lat) };
+  }
+  if (
+    Number.isFinite(Number(location.longitude)) &&
+    Number.isFinite(Number(location.latitude))
+  ) {
+    return { lng: Number(location.longitude), lat: Number(location.latitude) };
+  }
+  return null;
+}
+
+function isPlacePoi(item) {
+  return Boolean(item && item.name && item.location && (item.id || item.typecode || item.adname));
+}
+
+function buildPoiAddress(item) {
+  const detail = String(item.address || '').trim();
+  const region = [item.pname, item.cityname, item.adname]
+    .map(value => String(value || '').trim())
+    .filter(Boolean);
+  // 直辖市等场景省市名可能重复
+  const uniqueRegion = region.filter((value, index) => region.indexOf(value) === index);
+  const prefix = uniqueRegion.join('');
+  if (prefix && detail) {
+    if (detail.startsWith(prefix)) return detail;
+    return `${prefix}${detail}`;
+  }
+  return detail || prefix || String(item.name || '').trim();
+}
+
+function pickPoiPhoto(item) {
+  const photos = item?.photos;
+  if (Array.isArray(photos) && photos.length) {
+    return photos[0]?.url || '';
+  }
+  if (photos && typeof photos === 'object') {
+    return photos.url || '';
+  }
+  return 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 '';
+}

src/utils/mk-approval.js

@@ -1,5 +1,5 @@
 import { getDictionary } from '@/api/system/dictbiz';
-import { processDelete, processSubmit } from '@/api/system/business-process';
+import { hasMkProcessInstance, processDelete, processSubmit } from '@/api/system/business-process';
 import { ElMessage } from 'element-plus';
 
 export const MK_BIZ = {
@@ -7,43 +7,80 @@ export const MK_BIZ = {
     dictName: '提交客商审核流',
     subjectPrefix: '客商准入审批',
     rejected: ['rejected'],
+    approved: ['approved'],
   },
   'project-apply': {
     dictName: '提交项目审核流',
     subjectPrefix: '项目审批',
     rejected: ['rejected', 'change_rejected', 'withdrawn'],
+    approved: ['approved', 'change_approved'],
   },
   'contract-manage': {
     dictName: '提交合同审核流',
     subjectPrefix: '合同审批',
     rejected: ['rejected', 'change_rejected', 'withdrawn'],
-  },
-  'waybill-manage': {
-    dictName: '提交运单审核流',
-    subjectPrefix: '运单审批',
-    rejected: ['rejected', 'returned'],
+    approved: ['approved', 'change_approved'],
   },
   'pre-settlement': {
     dictName: '提交预结算审核流',
     subjectPrefix: '预结算审批',
     rejected: ['returned'],
+    approved: ['approved'],
   },
   'formal-settlement': {
     dictName: '提交正式结算审核流',
     subjectPrefix: '正式结算审批',
     rejected: ['returned'],
+    approved: ['approved'],
   },
   'payment-application': {
     dictName: '提交付款审核流',
     subjectPrefix: '付款审批',
     rejected: ['returned'],
+    approved: ['approved'],
+  },
+  'invoice-application': {
+    dictName: '提交开票审核流',
+    subjectPrefix: '开票审批',
+    rejected: ['returned'],
+    approved: ['approved'],
+  },
+  'invoice-receipt': {
+    dictName: '提交收票审核流',
+    subjectPrefix: '收票审批',
+    rejected: ['returned'],
+    approved: ['approved'],
+  },
+  'bill-payment': {
+    dictName: '提交汇票付款审核流',
+    subjectPrefix: '汇票付款审批',
+    rejected: ['returned'],
+    approved: ['approved'],
   },
 };
 
-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';
+}
+
+/** 加载业务字典并判断是否开启 MK */
+export async function loadMkEnabled() {
+  const list = await loadMkTemplateList();
+  return isMkEnabled(list);
+}
+
+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}」，无法提交审核流`);
@@ -52,9 +89,26 @@ export async function resolveMkTemplateCode(dictName) {
   return String(templateCode);
 }
 
+/**
+ * 是否属于「审核通过后再提交」需要新建表单实例的状态
+ */
+export function isMkApprovedStatus(bizType, approvalStatus) {
+  const conf = MK_BIZ[bizType];
+  if (!conf) return false;
+  return (conf.approved || []).includes(approvalStatus);
+}
+
+/**
+ * 提交 MK 审核流
+ * @param {Object} options
+ * @param {string} options.bizType 业务类型
+ * @param {string|number} options.bizId 业务主键（后端据此生成/复用 formInstanceId）
+ * @param {string} [options.subjectName] 标题后缀
+ * @param {string} [options.approvalStatus] 提交前的审批状态（须在业务 submit 改状态前取值；通过态强制新建实例）
+ */
 export async function submitMkApprovalFlow({
   bizType,
-  formInstanceId,
+  bizId,
   subjectName = '',
   approvalStatus = '',
 }) {
@@ -62,17 +116,34 @@ export async function submitMkApprovalFlow({
   if (!conf) {
     return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`));
   }
-  if ((conf.rejected || []).includes(approvalStatus)) {
-    await processDelete({ formInstanceId: String(formInstanceId) });
+  if (bizId == null || bizId === '') {
+    return Promise.reject(new Error('业务id不能为空'));
   }
-  const templateCode = await resolveMkTemplateCode(conf.dictName);
+  const list = await loadMkTemplateList();
+  if (!isMkEnabled(list)) {
+    return;
+  }
+  const bizIdText = String(bizId);
+  const forceNewFormInstance = isMkApprovedStatus(bizType, approvalStatus);
+  // 审核通过后再提交必须新建流程；其余场景已有有效实例则跳过
+  if (!forceNewFormInstance) {
+    const existsRes = await hasMkProcessInstance({ bizId: bizIdText });
+    if (existsRes?.data?.data) {
+      return;
+    }
+  }
+  if ((conf.rejected || []).includes(approvalStatus)) {
+    await processDelete({ bizId: bizIdText });
+  }
+  const templateCode = await resolveMkTemplateCode(conf.dictName, list);
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
-    : `${conf.subjectPrefix}：${formInstanceId}`;
+    : `${conf.subjectPrefix}：${bizIdText}`;
   return processSubmit({
     templateCode,
-    formInstanceId: String(formInstanceId),
+    bizId: bizIdText,
     subject,
     bizType,
+    forceNewFormInstance,
   });
 }

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();
+}

src/views/authority/apikey.vue

@@ -24,7 +24,7 @@
           type="danger"
           icon="el-icon-delete"
           plain
-          v-if="userInfo.authority.includes('admin')"
+          v-if="isAdministrator"
           @click="handleDelete"
           >删除
         </el-button>
@@ -43,19 +43,19 @@
       <template #menu="{ row }">
         <el-link
           type="primary"
-          v-if="row.status === -1 && userInfo.authority.includes('admin')"
+          v-if="row.status === -1 && isAdministrator"
           @click.stop="handleEnable(row)"
           >启用
         </el-link>
         <el-link
           type="primary"
-          v-if="row.status === 1 && userInfo.authority.includes('admin')"
+          v-if="row.status === 1 && isAdministrator"
           @click.stop="handleDisable(row)"
           >禁用
         </el-link>
         <el-link
           type="primary"
-          v-if="userInfo.authority.includes('admin')"
+          v-if="isAdministrator"
           @click.stop="handleRowLog(row)"
           >日志
         </el-link>
@@ -522,7 +522,7 @@ sortable: true, span: 24, width: 180 },
     };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(['userInfo', 'isAdministrator']),
     ids() {
       let ids = [];
       this.selectionList.forEach(ele => {

src/views/authority/ratelimit.vue

@@ -24,7 +24,7 @@
           type="danger"
           icon="el-icon-delete"
           plain
-          v-if="userInfo.authority.includes('administrator')"
+          v-if="isAdministrator"
           @click="handleDelete"
           >删除
         </el-button>
@@ -54,19 +54,19 @@
       <template #menu="{ row }">
         <el-link
           type="primary"
-          v-if="row.status !== 1 && userInfo.authority.includes('administrator')"
+          v-if="row.status !== 1 && isAdministrator"
           @click.stop="handleEnable(row)"
           >启用
         </el-link>
         <el-link
           type="primary"
-          v-if="row.status === 1 && userInfo.authority.includes('administrator')"
+          v-if="row.status === 1 && isAdministrator"
           @click.stop="handleDisable(row)"
           >禁用
         </el-link>
         <el-link
           type="primary"
-          v-if="userInfo.authority.includes('administrator')"
+          v-if="isAdministrator"
           @click.stop="handleRowLog(row)"
           >日志
         </el-link>
@@ -401,7 +401,7 @@ sortable: true, span: 24, width: 170 },
     };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(['userInfo', 'isAdministrator']),
     ids() {
       let ids = [];
       this.selectionList.forEach(ele => {

src/views/authority/role.vue

@@ -31,7 +31,7 @@
         <el-button
           icon="el-icon-setting"
           @click="handleRole"
-          v-if="userInfo.authority.includes('admin')"
+          v-if="isAdministrator"
           plain
           >权限设置
         </el-button>
@@ -39,7 +39,7 @@
       <template #menu="{ row }">
         <el-link
           type="primary"
-          v-if="userInfo.authority.includes('admin')"
+          v-if="isAdministrator"
           style="border: 0; background-color: transparent !important"
           @click.stop="handleRowRole(row)"
           >权限设置
@@ -354,7 +354,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['userInfo', 'permission']),
+    ...mapGetters(['userInfo', 'permission', 'isAdministrator']),
     permissionList() {
       return {
         addBtn: this.validData(this.permission.role_add, false),

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>
 
@@ -132,8 +150,9 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } 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' },
             ],
           },
@@ -438,6 +460,13 @@ export default {
             showWordLimit: true,
             rules: [{ max: 200, message: '备注不能超过200字', trigger: 'blur' }],
           },
+          {
+            label: '创建人',
+            prop: 'createUserName',
+            addDisplay: false,
+            editDisplay: false,
+            minWidth: 120,
+          },
           {
             label: '更新人',
             prop: 'updateUserName',
@@ -526,10 +555,7 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     ids() {
       let ids = [];
@@ -669,6 +695,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 +966,13 @@ export default {
     white-space: nowrap;
   }
 }
+
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>

src/views/base/common-address.vue

@@ -182,8 +182,8 @@
           <el-input
             v-model="form.regionName"
             readonly
+            disabled
             placeholder="行政区划自动带出"
-            :disabled="dialogReadonly"
           />
           <el-input
             v-model="form.detailAddress"
@@ -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>
@@ -269,7 +269,8 @@ import { exportBlob } from '@/api/common';
 import { createOption } from '@/option/base/common-address';
 import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 import { isMobile } from '@/utils/validate';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
@@ -323,16 +324,16 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     ids() {
       return this.selectionList.map(item => item.id).join(',');
     },
   },
   created() {
+    if (this.isAdmin) {
+      this.allDept = 1;
+    }
     this.initDeptTree();
   },
   methods: {
@@ -1111,36 +1112,32 @@ export default {
         this.$message.warning('请输入地址关键词');
         return;
       }
+      if (this.mapLoading) return;
+      this.mapSearchResults = [];
+      this.mapLoading = true;
       this.loadAmap()
-        .then(() => {
-          this.mapLoading = true;
-          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,
-              }));
-              const point = this.resolveMapPoint(result);
-              if (!point) {
-                this.mapStatus = '未找到匹配地址';
-                this.$message.warning('地图搜索无匹配地址');
-                return;
-              }
-              this.pickMapPoint(point, keyword);
-            })
-            .catch(() => {
-              this.mapStatus = '地图搜索失败';
-              this.$message.error('地图搜索失败，请稍后重试');
-            })
-            .finally(() => {
-              this.mapLoading = false;
-            });
+        .then(() => searchAmapPlaceText(keyword))
+        .then(pois => {
+          this.mapSearchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.mapSearchResults[0];
+          if (!first?.location) {
+            this.mapStatus = '未找到匹配地址';
+            this.$message.warning('地图搜索无匹配地址');
+            return;
+          }
+          return this.$nextTick().then(() => {
+            if (typeof this.amap?.resize === 'function') {
+              this.amap.resize();
+            }
+            this.pickMapPoint(first.location, first.address || first.name || keyword);
+          });
         })
         .catch(() => {
-          this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
+          this.mapStatus = '未找到匹配地址';
+          this.$message.warning('地图搜索无匹配地址');
+        })
+        .finally(() => {
+          this.mapLoading = false;
         });
     },
     selectMapSearchResult(item) {

src/views/base/fee-item.vue

@@ -238,6 +238,13 @@ export default {
               value: 'value',
             },
           },
+          {
+            label: '创建人',
+            prop: 'createUserName',
+            minWidth: 120,
+            addDisplay: false,
+            editDisplay: false,
+          },
           {
             label: '更新人',
             prop: 'updateUserName',

src/views/base/insurance-ocr-template.vue

@@ -143,6 +143,7 @@
 import { mapGetters } from 'vuex';
 import { getDetail, getList, remove, submit } from '@/api/base/insurance-ocr-template';
 import SectionCard from '@/components/section-card/main.vue';
+import { isAdministrator } from '@/utils/auth';
 
 const insuranceFieldKeys = [
   '保险类型',
@@ -203,7 +204,7 @@ export default {
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     isAdmin() {
-      return String(this.userInfo.authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     selectionIds() {
       return this.selectionList.map(item => item.id).join(',');

src/views/base/measurement-unit.vue

@@ -82,6 +82,7 @@
 import { mapGetters } from 'vuex';
 import { changeStatus, getDetail, getList, remove, submit } from '@/api/base/measurement-unit';
 import { createOption } from '@/option/base/measurement-unit';
+import { isAdministrator } from '@/utils/auth';
 
 export default {
   data() {
@@ -111,7 +112,7 @@ export default {
       return this.selectionList.map(item => item.id).join(',');
     },
     isAdmin() {
-      return String(this.userInfo?.authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
   },
   methods: {

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>
 
@@ -262,14 +270,18 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } 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' },
             ],
           },
@@ -608,6 +621,13 @@ export default {
             showWordLimit: true,
             rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
           },
+          {
+            label: '创建人',
+            prop: 'createUserName',
+            addDisplay: false,
+            editDisplay: false,
+            minWidth: 120,
+          },
           {
             label: '更新人',
             prop: 'updateUserName',
@@ -695,10 +715,7 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     isParentRegionLocked() {
       return this.form.category === '码头';
@@ -1040,6 +1057,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 +1139,7 @@ export default {
         return false;
       }
       if (isBlank(row.detailAddress)) {
-        this.$message.warning('请输入详细地址');
+        this.$message.warning('请选择详细地址');
         return false;
       }
       if (isBlank(row.longitude)) {
@@ -1399,6 +1431,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">

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>
 
@@ -132,14 +150,18 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } 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' },
             ],
           },
@@ -411,6 +433,13 @@ export default {
             showWordLimit: true,
             rules: [{ max: 200, message: '备注不能超过200字', trigger: 'blur' }],
           },
+          {
+            label: '创建人',
+            prop: 'createUserName',
+            addDisplay: false,
+            editDisplay: false,
+            minWidth: 120,
+          },
           {
             label: '更新人',
             prop: 'updateUserName',
@@ -497,10 +526,7 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     ids() {
       let ids = [];
@@ -652,6 +678,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 +959,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">

src/views/base/region.vue

@@ -26,6 +26,7 @@
               </el-form-item>
               <el-form-item label="区域层级">
                 <el-select v-model="searchForm.regionLevel" clearable placeholder="请选择" style="width: 200px;">
+                  <el-option label="国家" :value="0" />
                   <el-option label="省份" :value="1" />
                   <el-option label="省市" :value="2" />
                   <el-option label="区县" :value="3" />
@@ -42,6 +43,13 @@
         </section-card>
 
         <el-button-group>
+          <el-button
+            v-if="permission.region_add"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addCountry"
+            >新增国家
+          </el-button>
           <el-button
             v-if="permission.region_add"
             type="primary"
@@ -112,14 +120,7 @@
               placeholder="请输入国家编码，如 +86"
               v-model="regionForm.code"
             />
-            <el-input
-              v-else-if="isProvinceRegion"
-              placeholder="请输入省级区划编号"
-              v-model="regionForm.subCode"
-            />
-            <el-input v-else placeholder="请输入 区划子编号" v-model="regionForm.subCode">
-              <template #prepend>{{ regionForm.parentCode }}</template>
-            </el-input>
+            <el-input v-else placeholder="请输入区划编号" v-model="regionForm.subCode" />
           </template>
         </avue-form>
         <el-dialog title="行政区划数据导入" append-to-body v-model="excelBox" width="555px">
@@ -253,9 +254,10 @@ export default {
             dicUrl: '/blade-system/dict/dictionary?code=region',
             dicFormatter: response => {
               const list = Array.isArray(response) ? response : response?.data;
-              return (Array.isArray(list) ? list : [])
-                .filter(item => Number(item.dictKey) !== 0)
-                .map(item => ({ ...item, dictKey: Number(item.dictKey) }));
+              return (Array.isArray(list) ? list : []).map(item => ({
+                ...item,
+                dictKey: Number(item.dictKey),
+              }));
             },
             props: {
               label: 'dictValue',
@@ -410,9 +412,6 @@ export default {
     isCountryRegion() {
       return Number(this.regionForm.regionLevel) === 0;
     },
-    isProvinceRegion() {
-      return Number(this.regionForm.regionLevel) === 1;
-    },
     isEditRegion() {
       return !validatenull(this.regionForm.originalCode);
     },
@@ -476,10 +475,7 @@ export default {
       getDetail(this.treeCode).then(res => {
         this.regionForm = res.data.data;
         this.regionForm.originalCode = this.regionForm.code;
-        this.regionForm.subCode =
-          this.regionForm.parentCode === this.topCode
-            ? this.regionForm.code
-            : this.regionForm.code.replace(this.regionForm.parentCode, '');
+        this.regionForm.subCode = this.regionForm.code;
         this.loadParentOptions(this.regionForm.parentCode, this.regionForm.parentName);
       });
     },
@@ -500,25 +496,31 @@ export default {
       };
     },
     addChildren() {
-      if (validatenull(this.regionForm.code) || validatenull(this.regionForm.name)) {
+      const current = this.regionForm || {};
+      const parentCode = current.originalCode || current.code;
+      if (validatenull(parentCode) || validatenull(current.name)) {
         this.$message.warning('请先选择一项区划');
         return;
       }
-      if (Number(this.regionForm.regionLevel) >= 3) {
+      if (Number(current.regionLevel) >= 3) {
         this.$message.warning('区县已是末级，不能新增下级');
         return;
       }
-      const parentCode = this.regionForm.code;
-      const parentName = this.regionForm.name;
-      const parentGroupCode = this.regionForm.parentCode || this.topCode;
+      const parentName = current.name;
+      const parentGroupCode = current.parentCode || this.topCode;
       this.setRegionColumnDisplay('code', true);
-      this.regionForm.parentCode = parentCode;
-      this.regionForm.parentName = parentName;
-      this.regionForm.code = '';
-      this.regionForm.subCode = '';
-      this.regionForm.originalCode = '';
-      this.regionForm.name = '';
-      this.regionForm.regionLevel = Number(this.regionForm.regionLevel) + 1;
+      this.regionForm = {
+        parentCode,
+        parentName,
+        code: '',
+        subCode: '',
+        originalCode: '',
+        name: '',
+        regionLevel: Number(current.regionLevel) + 1,
+        sort: 1,
+        remark: '',
+        status: 1,
+      };
       this.loadParentOptionsByGroup(parentGroupCode, parentCode, parentName);
     },
     setRegionColumnDisplay(prop, display) {
@@ -536,8 +538,7 @@ export default {
       if (this.isCountryRegion) {
         return;
       }
-      const parentCode = this.isProvinceRegion ? '' : this.regionForm.parentCode || '';
-      this.regionForm.code = parentCode + (this.regionForm.subCode || '');
+      this.regionForm.code = this.regionForm.subCode || '';
     },
     getRootParentOptions() {
       return [
@@ -586,16 +587,28 @@ export default {
         this.parentOptions = this.ensureSelectedParent(options, selectedCode, selectedName);
       });
     },
-    handleSubmit(form, done) {
-      if (Number(form.regionLevel) === 0) {
-        form.parentCode = this.topCode;
-        form.ancestors = this.topCode;
-        form.subCode = form.code;
-      } else {
-        const parentCode = Number(form.regionLevel) === 1 ? '' : form.parentCode;
-        form.code = parentCode + form.subCode;
+    buildRegionPayload(form) {
+      const source = validatenull(this.regionForm) ? form || {} : this.regionForm;
+      const regionLevel = Number(source.regionLevel);
+      const isNew = validatenull(source.originalCode);
+      const payload = {
+        code: regionLevel === 0 ? source.code : source.subCode,
+        parentCode: regionLevel === 0 ? this.topCode : source.parentCode,
+        name: source.name,
+        regionLevel,
+        sort: source.sort,
+        remark: source.remark,
+        status: source.status == null || source.status === '' ? 1 : source.status,
+      };
+      if (!isNew) {
+        payload.originalCode = source.originalCode;
+        payload.dataSource = source.dataSource;
       }
-      submit(form).then(
+      return payload;
+    },
+    handleSubmit(form, done) {
+      const payload = this.buildRegionPayload(form);
+      submit(payload).then(
         () => {
           this.$message({
             type: 'success',

src/views/business/common-cargo.vue

@@ -204,7 +204,7 @@ import { exportBlob } from '@/api/common';
 import { getDeptTree } from '@/api/system/dept';
 import { config, excelOption, formatCargoValue, option } from '@/option/business/common-cargo';
 import { getDictionary } from '@/api/system/dictbiz';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
 import { downloadXls } from '@/utils/util';
 import { mapGetters } from 'vuex';
@@ -250,16 +250,14 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     ids() {
       return this.selectionList.map(item => item.id).join(',');
     },
   },
   created() {
+    this.applyDefaultDeptSearch();
     this.initDeptTree();
     this.loadPriceUnitOptions();
   },
@@ -273,6 +271,26 @@ export default {
       if (Array.isArray(data)) return data;
       return (data && data.records) || [];
     },
+    defaultDeptId() {
+      // 用户可能绑定多个组织（逗号分隔），搜索下拉是单选，只取当前会话第一个组织 ID。
+      const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
+      return String(raw)
+        .split(',')
+        .map(item => item.trim())
+        .filter(Boolean)[0] || '';
+    },
+    applyDefaultDeptSearch() {
+      const deptId = this.defaultDeptId();
+      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+      if (!deptId || !deptColumn) return;
+      deptColumn.searchValue = deptId;
+      this.query = { ...this.query, deptId };
+      this.$nextTick(() => {
+        if (this.$refs.crud?.searchForm) {
+          this.$refs.crud.searchForm.searchDeptId = deptId;
+        }
+      });
+    },
     initDeptTree() {
       getDeptTree(this.userInfo.tenantId).then(res => {
         this.deptOptions = this.flattenDept(res.data.data || []);
@@ -280,6 +298,18 @@ export default {
         if (deptColumn) {
           deptColumn.dicData = this.deptOptions;
         }
+        // dicData 异步到位后再回填，避免下拉选项为空时清空已选组织，导致请求丢失 deptId。
+        const deptId = String(this.query.deptId || this.defaultDeptId() || '');
+        if (!deptId) return;
+        if (deptColumn) {
+          deptColumn.searchValue = deptId;
+        }
+        this.query = { ...this.query, deptId };
+        this.$nextTick(() => {
+          if (this.$refs.crud?.searchForm) {
+            this.$refs.crud.searchForm.searchDeptId = deptId;
+          }
+        });
       });
     },
     loadPriceUnitOptions() {
@@ -307,9 +337,13 @@ export default {
     flattenDept(tree, level = 0) {
       const result = [];
       tree.forEach(item => {
+        // 雪花 ID 必须保持字符串，避免 JS Number 精度丢失导致筛错组织。
+        const id =
+          item.id === undefined || item.id === null || item.id === '' ? '' : String(item.id);
+        if (!id) return;
         result.push({
           label: `${'　'.repeat(level)}${item.title || item.deptName || item.name}`,
-          value: item.id,
+          value: id,
         });
         if (item.children && item.children.length) {
           result.push(...this.flattenDept(item.children, level + 1));
@@ -317,6 +351,18 @@ export default {
       });
       return result;
     },
+    normalizeListQuery(params = {}) {
+      const query = { ...params, ...this.query };
+      const rawDeptId = query.deptId ?? query.searchDeptId;
+      delete query.searchDeptId;
+      if (rawDeptId !== undefined && rawDeptId !== null && String(rawDeptId).trim() !== '') {
+        query.deptId = String(rawDeptId).split(',')[0].trim();
+      } else {
+        delete query.deptId;
+      }
+      query.allDept = this.isAdmin ? 1 : 0;
+      return query;
+    },
     normalizeCargoTypeOptions(list = []) {
       return list
         .map(item => ({
@@ -485,7 +531,7 @@ export default {
         return false;
       }
       if (row.cargoValue && !/^\d+(\.\d{1,2})?$/.test(String(row.cargoValue))) {
-        this.$message.warning('货值只能输入数字，最多保留2位小数');
+        this.$message.warning('单价只能输入数字，最多保留2位小数');
         return false;
       }
       if (!row.model) {
@@ -619,13 +665,14 @@ export default {
     },
     searchReset() {
       this.query = {};
+      this.applyDefaultDeptSearch();
       this.page.currentPage = 1;
-      this.onLoad(this.page);
+      this.onLoad(this.page, this.query);
     },
     searchChange(params, done) {
-      this.query = params;
+      this.query = this.normalizeListQuery(params);
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page, this.query);
       done();
     },
     selectionChange(list) {
@@ -648,8 +695,10 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      const query = this.normalizeListQuery(params);
+      this.query = query;
       api
-        .getList(page.currentPage, page.pageSize, { ...params, ...this.query, allDept: 0 })
+        .getList(page.currentPage, page.pageSize, query)
         .then(res => {
           const result = res.data.data;
           this.page.total = result.total;
@@ -662,8 +711,7 @@ export default {
     },
     buildExportParams() {
       return {
-        ...this.query,
-        allDept: 0,
+        ...this.normalizeListQuery(this.query),
         ids: this.ids,
         [this.website.tokenHeader]: getToken(),
       };

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>
@@ -321,8 +321,9 @@ import { exportBlob } from '@/api/common';
 import { getDeptTree } from '@/api/system/dept';
 import { addressTypeOptions } from '@/option/base/common-address';
 import { config, excelOption, option } from '@/option/business/common-route';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 import { downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { List, Search } from '@element-plus/icons-vue';
@@ -389,10 +390,7 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     ids() {
       return this.selectionList.map(item => item.id).join(',');
@@ -489,7 +487,7 @@ export default {
       this.addressLoading = true;
       getCommonAddressList(this.addressPage.currentPage, this.addressPage.pageSize, {
         ...this.addressQuery,
-        allDept: 0,
+        allDept: this.isAdmin ? 1 : 0,
       })
         .then(res => {
           const data = res.data.data || {};
@@ -609,30 +607,29 @@ export default {
         this.$message.warning('请输入地址关键词');
         return;
       }
+      if (this.routeMapLoading) return;
+      this.routeMapSearchResults = [];
+      this.routeMapLoading = true;
       this.loadAmap()
-        .then(() => {
-          this.routeMapLoading = true;
-          return this.ensureRouteAmapGeocoder();
-        })
-        .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,
-          }));
-          const point = this.resolveMapPoint(result);
-          if (!point) {
+        .then(() => searchAmapPlaceText(keyword))
+        .then(pois => {
+          this.routeMapSearchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.routeMapSearchResults[0];
+          if (!first?.location) {
             this.routeMapStatus = '未找到匹配地址';
             this.$message.warning('地图搜索无匹配地址');
             return;
           }
-          this.pickRouteMapPoint(point, keyword);
+          return this.$nextTick().then(() => {
+            if (typeof this.routeAmap?.resize === 'function') {
+              this.routeAmap.resize();
+            }
+            this.pickRouteMapPoint(first.location, first.address || first.name || keyword);
+          });
         })
         .catch(() => {
-          this.routeMapStatus = '地图搜索失败';
-          this.$message.error('地图搜索失败，请稍后重试');
+          this.routeMapStatus = '未找到匹配地址';
+          this.$message.warning('地图搜索无匹配地址');
         })
         .finally(() => {
           this.routeMapLoading = false;
@@ -1028,7 +1025,11 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       api
-        .getList(page.currentPage, page.pageSize, { ...params, ...this.query, allDept: 0 })
+        .getList(page.currentPage, page.pageSize, {
+          ...params,
+          ...this.query,
+          allDept: this.isAdmin ? 1 : 0,
+        })
         .then(res => {
           const result = res.data.data;
           this.page.total = result.total;
@@ -1042,7 +1043,7 @@ export default {
     buildExportParams() {
       return {
         ...this.query,
-        allDept: 0,
+        allDept: this.isAdmin ? 1 : 0,
         ids: this.ids,
         [this.website.tokenHeader]: getToken(),
       };

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}”不能重复`);

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"
@@ -2423,7 +2423,7 @@
                   <span v-else>-</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" width="200" />
+              <el-table-column prop="vehicleNo" label="车牌号/船班号/船次号/班次号" width="200" />
               <el-table-column prop="driverName" label="司机" width="128" />
               <el-table-column prop="carrierName" label="承运商" width="192" />
               <el-table-column label="运输方式" width="192">
@@ -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"
@@ -2909,14 +2909,15 @@
                     原：{{ row.originalDepartureAddress || '-' }}
                   </div>
                   <el-input
-                    v-model="row.departureAddress"
-                    placeholder="请选择或输入地址"
-                    @input="updateWaybillRouteChangeNodes"
+                    :model-value="row.departureAddress"
+                    readonly
+                    placeholder="请点击地图选点"
+                    @click="openWaybillRouteChangeMapDialog(row, 'departure')"
                   >
                     <template #suffix>
                       <el-icon
                         class="business-crud-page__route-change-location"
-                        @click="openWaybillCommonAddressDialog(row, 'departure')"
+                        @click.stop="openWaybillRouteChangeMapDialog(row, 'departure')"
                       >
                         <Location />
                       </el-icon>
@@ -2930,14 +2931,15 @@
                     原：{{ row.originalArrivalAddress || '-' }}
                   </div>
                   <el-input
-                    v-model="row.arrivalAddress"
-                    placeholder="请选择或输入地址"
-                    @input="updateWaybillRouteChangeNodes"
+                    :model-value="row.arrivalAddress"
+                    readonly
+                    placeholder="请点击地图选点"
+                    @click="openWaybillRouteChangeMapDialog(row, 'arrival')"
                   >
                     <template #suffix>
                       <el-icon
                         class="business-crud-page__route-change-location"
-                        @click="openWaybillCommonAddressDialog(row, 'arrival')"
+                        @click.stop="openWaybillRouteChangeMapDialog(row, 'arrival')"
                       >
                         <Location />
                       </el-icon>
@@ -2947,35 +2949,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
@@ -3022,49 +2995,6 @@
       </template>
     </el-dialog>
 
-    <el-dialog
-      v-model="waybillCommonAddressBox"
-      title="选择常用地址"
-      append-to-body
-      width="900px"
-      class="business-crud-page__common-address-dialog"
-    >
-      <div class="business-crud-page__common-address-toolbar">
-        <el-input
-          v-model="waybillCommonAddressQuery.addressName"
-          clearable
-          placeholder="请输入地址名称"
-          @keyup.enter="loadWaybillCommonAddresses"
-        />
-        <el-button type="primary" @click="loadWaybillCommonAddresses">查询</el-button>
-      </div>
-      <el-table
-        v-loading="waybillCommonAddressLoading"
-        :data="waybillCommonAddressRows"
-        border
-        @row-dblclick="selectWaybillCommonAddress"
-      >
-        <el-table-column prop="addressName" label="地址名称" min-width="180" />
-        <el-table-column prop="regionName" label="区域" min-width="180" />
-        <el-table-column prop="detailAddress" label="详细地址" min-width="260" />
-        <el-table-column label="操作" width="90">
-          <template #default="{ row }">
-            <el-link type="primary" @click="selectWaybillCommonAddress(row)">选择</el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-      <template #footer>
-        <el-pagination
-          v-model:current-page="waybillCommonAddressPage.currentPage"
-          v-model:page-size="waybillCommonAddressPage.pageSize"
-          layout="total, prev, pager, next"
-          :total="waybillCommonAddressPage.total"
-          @current-change="loadWaybillCommonAddresses"
-        />
-        <el-button @click="waybillCommonAddressBox = false">关闭</el-button>
-      </template>
-    </el-dialog>
-
     <el-dialog
       v-if="config.enableTransportPlanImport"
       v-model="transportPlanImportBox"
@@ -3543,7 +3473,7 @@
             </el-table-column>
             <el-table-column
               prop="vehicleNo"
-              label="车牌号/航班号/船号/班列号"
+              label="车牌号/船班号/船次号/班次号"
               min-width="200"
               align="center"
               show-overflow-tooltip
@@ -4036,7 +3966,7 @@
               </el-input>
               <div class="business-crud-page__dispatch-quantity-hint">
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -4093,7 +4023,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>
@@ -4194,7 +4128,7 @@
           </el-form-item>
           <el-form-item
             v-if="dispatchItemForm.carrierType"
-            :label="dispatchIsNonRoadTransport ? '船/航/班列号' : '车牌号'"
+            :label="dispatchIsNonRoadTransport ? '船班号/船次号/班次号' : '车牌号'"
             required
           >
             <el-input v-model="dispatchItemForm.vehicleNo" placeholder="请输入" />
@@ -5007,6 +4941,7 @@
       v-model="transportMapBox"
       width="920px"
       @opened="initTransportAmap"
+      @closed="waybillRouteChangeMapTarget = null"
     >
       <div class="business-crud-page__map-toolbar">
         <el-input
@@ -5025,8 +4960,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>
@@ -5035,7 +4970,7 @@
         >
       </div>
       <template #footer>
-        <el-button @click="transportMapBox = false">取消</el-button>
+        <el-button @click="closeTransportMapDialog">取消</el-button>
         <el-button
           type="primary"
           :disabled="!transportMapSelected.longitude"
@@ -5300,18 +5235,19 @@ 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';
 import { packageOptions } from '@/option/business/common';
 import { formatUpdateUserName } from '@/utils/audit';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 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 +5510,6 @@ export default {
   components: {
     BillingPlanEditor,
     PageAvueForm,
-    Rank,
     ElImageViewer,
     OpenFileViewer,
   },
@@ -5637,7 +5572,6 @@ export default {
       waybillRouteChangeNodes: [],
       waybillRouteChangeRemark: '',
       waybillRouteChangeRecords: [],
-      waybillRouteChangeDragIndex: -1,
       waybillRouteChangeSaving: false,
       mileageDialog: {
         visible: false,
@@ -5659,18 +5593,7 @@ export default {
           },
         ],
       },
-      waybillCommonAddressBox: false,
-      waybillCommonAddressLoading: false,
-      waybillCommonAddressQuery: {
-        addressName: '',
-      },
-      waybillCommonAddressRows: [],
-      waybillCommonAddressTarget: null,
-      waybillCommonAddressPage: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
+      waybillRouteChangeMapTarget: null,
       transportPlanImportBox: false,
       transportPlanImportLoading: false,
       transportPlanImportFiles: [],
@@ -6101,7 +6024,7 @@ export default {
       return this.config.permission === 'waybill_manage' && !this.isRoadTransport;
     },
     transportVehicleNoLabel() {
-      return this.isRoadTransport ? '车牌号' : '船/航/班列号';
+      return this.isRoadTransport ? '车牌号' : '船班号/船次号/班次号';
     },
     transportPlanImportDuplicateCount() {
       return this.transportPlanImportRows.filter(row => row._duplicate).length;
@@ -6371,19 +6294,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)));
@@ -6423,10 +6348,7 @@ export default {
       return this.currencyRemark(currency);
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     canViewAllDept() {
       return this.isAdmin;
@@ -7145,7 +7067,7 @@ export default {
       return String(row.carrierTypeName || row.carrierType || '').trim() === '承运商';
     },
     waybillVehicleNoLabel(row = {}) {
-      return this.waybillIsRoadTransport(row) ? '车牌号' : '船/航/班列号';
+      return this.waybillIsRoadTransport(row) ? '车牌号' : '船班号/船次号/班次号';
     },
     waybillUnitPrice(row = {}) {
       const price = row.unitPrice || row.price || '';
@@ -7438,7 +7360,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,63 +7377,31 @@ 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);
     },
-    openWaybillCommonAddressDialog(row, field) {
-      this.waybillCommonAddressTarget = { row, field };
-      this.waybillCommonAddressQuery = { addressName: '' };
-      this.waybillCommonAddressPage.currentPage = 1;
-      this.waybillCommonAddressBox = true;
-      this.loadWaybillCommonAddresses();
-    },
-    loadWaybillCommonAddresses() {
-      this.waybillCommonAddressLoading = true;
-      getCommonAddressList(
-        this.waybillCommonAddressPage.currentPage,
-        this.waybillCommonAddressPage.pageSize,
-        {
-          ...this.waybillCommonAddressQuery,
-          allDept: 0,
-        }
-      )
-        .then(res => {
-          const data = res.data?.data || {};
-          this.waybillCommonAddressRows = data.records || [];
-          this.waybillCommonAddressPage.total = data.total || 0;
-        })
-        .finally(() => {
-          this.waybillCommonAddressLoading = false;
-        });
-    },
-    selectWaybillCommonAddress(address) {
-      const target = this.waybillCommonAddressTarget;
-      if (!target) return;
-      target.row[`${target.field}Address`] =
-        [address.regionName, address.detailAddress || address.addressName]
-          .filter(Boolean)
-          .join('') ||
-        address.addressName ||
-        '';
-      this.updateWaybillRouteChangeNodes();
-      this.waybillCommonAddressBox = false;
+    openWaybillRouteChangeMapDialog(row, field) {
+      if (!row || !field) return;
+      this.waybillRouteChangeMapTarget = { row, field };
+      this.transportMapTarget = field;
+      this.transportMapKeyword = row[`${field}Address`] || row[`${field}Name`] || '';
+      this.transportMapSelected = this.buildTransportMapSelection({
+        lng: row[`${field}Longitude`],
+        lat: row[`${field}Latitude`],
+        address: row[`${field}Address`],
+        regionName: row[`${field}Name`],
+        regionCode: row[`${field}RegionCode`],
+      });
+      this.transportMapStatus = this.transportMapSelected.longitude
+        ? '已加载当前选点，可重新选点'
+        : '可搜索地址或点击地图选点';
+      this.transportMapBox = true;
     },
     async confirmWaybillRouteChange() {
       const row = this.waybillRouteChangeRows[0] || {};
@@ -7519,9 +7409,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 +7418,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'),
@@ -7784,8 +7671,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)) {
@@ -8964,6 +8851,7 @@ export default {
         this.form.carrierContractId = '';
       }
       this.form.carrierType = nextValue;
+      this.clearTaskDriverVehicleFields();
       if (this.isWaybillDetailLayout) {
         this.taskCarrierRequestId += 1;
         this.taskCarrierOptions = [];
@@ -9081,25 +8969,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(() => {
@@ -9108,10 +9029,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 => ({
@@ -9488,7 +9416,7 @@ export default {
         }
       } else {
         const invalidLengthField = [
-          ['vehicleNo', '船/航/班列号', 30],
+          ['vehicleNo', '船班号/船次号/班次号', 30],
           ['captainName', '船长', 20],
           ['cabinNo', '舱位', 30],
           ['containerNo', '箱号', 30],
@@ -10198,10 +10126,15 @@ export default {
         this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
       });
     },
+    closeTransportMapDialog() {
+      this.transportMapBox = false;
+      this.waybillRouteChangeMapTarget = null;
+    },
     openTransportMapDialog(target) {
       if (this.dialogReadonly) return;
       if (!this.ensureTransportTypeBeforeAddress()) return;
       const prefix = target === 'departure' ? 'departure' : 'arrival';
+      this.waybillRouteChangeMapTarget = null;
       this.transportMapTarget = prefix;
       this.transportMapKeyword = this.form[`${prefix}Address`] || this.form[`${prefix}Name`] || '';
       this.transportMapSelected = this.buildTransportMapSelection({
@@ -10278,36 +10211,32 @@ export default {
         this.$message.warning('请输入地址关键词');
         return;
       }
+      if (this.transportMapLoading) return;
+      this.transportMapSearchResults = [];
+      this.transportMapLoading = true;
       this.loadAmap()
-        .then(() => {
-          this.transportMapLoading = true;
-          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,
-              }));
-              const point = this.resolveMapPoint(result);
-              if (!point) {
-                this.transportMapStatus = '未找到匹配地址';
-                this.$message.warning('地图搜索无匹配地址');
-                return;
-              }
-              this.pickTransportMapPoint(point, keyword);
-            })
-            .catch(() => {
-              this.transportMapStatus = '地图搜索失败';
-              this.$message.error('地图搜索失败，请稍后重试');
-            })
-            .finally(() => {
-              this.transportMapLoading = false;
-            });
+        .then(() => searchAmapPlaceText(keyword))
+        .then(pois => {
+          this.transportMapSearchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.transportMapSearchResults[0];
+          if (!first?.location) {
+            this.transportMapStatus = '未找到匹配地址';
+            this.$message.warning('地图搜索无匹配地址');
+            return;
+          }
+          return this.$nextTick().then(() => {
+            if (typeof this.transportAmap?.resize === 'function') {
+              this.transportAmap.resize();
+            }
+            this.pickTransportMapPoint(first.location, first.address || first.name || keyword);
+          });
         })
         .catch(() => {
-          this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
+          this.transportMapStatus = '未找到匹配地址';
+          this.$message.warning('地图搜索无匹配地址');
+        })
+        .finally(() => {
+          this.transportMapLoading = false;
         });
     },
     selectTransportMapSearchResult(item) {
@@ -10365,6 +10294,23 @@ export default {
         this.$message.warning('请先搜索或点击地图完成选点');
         return;
       }
+      if (this.waybillRouteChangeMapTarget) {
+        const { row, field } = this.waybillRouteChangeMapTarget;
+        row[`${field}Address`] =
+          this.transportMapSelected.detailAddress || row[`${field}Address`] || '';
+        if (this.transportMapSelected.regionName) {
+          row[`${field}Name`] = this.transportMapSelected.regionName;
+        }
+        row[`${field}Longitude`] = this.transportMapSelected.longitude;
+        row[`${field}Latitude`] = this.transportMapSelected.latitude;
+        if (this.transportMapSelected.regionCode) {
+          row[`${field}RegionCode`] = this.transportMapSelected.regionCode;
+        }
+        this.updateWaybillRouteChangeNodes();
+        this.waybillRouteChangeMapTarget = null;
+        this.transportMapBox = false;
+        return;
+      }
       const prefix = this.transportMapTarget;
       this.form[`${prefix}Address`] =
         this.transportMapSelected.detailAddress || this.form[`${prefix}Address`];
@@ -12805,6 +12751,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(
@@ -12861,6 +12810,7 @@ export default {
         }
       }
       this.dispatchItemForm.carrierType = nextValue;
+      this.clearDispatchDriverVehicleFields();
       this.loadDispatchCarrierOptions(this.dispatchRow);
     },
     isDispatchCarrierRequired(carrierType) {
@@ -12990,20 +12940,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(() => {
@@ -13080,6 +13049,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);
@@ -13163,6 +13137,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 => {
@@ -13246,7 +13226,7 @@ export default {
         [
           'vehicleNo',
           ['water', 'rail', 'air'].includes(this.resolveTransportMode(row.transportType))
-            ? '船/航/班列号'
+            ? '船班号/船次号/班次号'
             : '车牌号',
         ],
       ];
@@ -13326,7 +13306,7 @@ export default {
             ['escortPhone', '押运人手机号', 20],
           ]
         : [
-            ['vehicleNo', '船/航/班列号', 30],
+            ['vehicleNo', '船班号/船次号/班次号', 30],
             ['captainName', '船长', 20],
             ['cabinNo', '舱位', 30],
             ['containerNo', '箱号', 30],
@@ -13409,14 +13389,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 || '',
@@ -13424,7 +13419,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 || '',
@@ -13440,7 +13435,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 (
@@ -15867,16 +15862,6 @@ export default {
     white-space: pre-wrap;
   }
 
-  &__common-address-toolbar {
-    display: flex;
-    gap: 8px;
-    margin-bottom: 12px;
-
-    .el-input {
-      width: 260px;
-    }
-  }
-
   @media (max-width: 1200px) {
     &__waybill-summary-grid {
       grid-template-columns: repeat(4, minmax(130px, 1fr));

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,8 +111,18 @@
       <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%"
+            @change="syncUploadDialogTypeByLocation"
+          >
+            <el-option
+              v-for="item in resolvedLocationOptions"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
           </el-select>
         </div>
         <div class="contract-attachment-upload-dialog__field">
@@ -144,7 +162,7 @@
         </div>
       </template>
     </el-dialog>
-  </section>
+  </div>
 </template>
 
 <script>
@@ -154,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;
@@ -201,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 = (
@@ -223,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;
 };
 
@@ -272,16 +306,19 @@ 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'],
+  emits: ['update:rows', 'upload-to-location', 'upload-confirmed'],
   data() {
     return {
       selected: [],
       attachmentFileTypes,
       contractAttachmentTypeOptions: [...defaultContractAttachmentTypeOptions],
       uploadDialogVisible: false,
+      uploadDialogLocation: '合同文件',
       uploadDialogType: resolveOtherAttachmentType(defaultContractAttachmentTypeOptions),
       uploadDialogFiles: [],
       uploadDialogFileList: [],
@@ -300,6 +337,11 @@ export default {
     defaultAttachmentType() {
       return resolveOtherAttachmentType(this.contractAttachmentTypeOptions);
     },
+    resolvedLocationOptions() {
+      const options = (this.attachmentLocationOptions || []).filter(Boolean);
+      if (options.length) return options;
+      return ['合同文件', '其它附件'];
+    },
   },
   created() {
     this.loadAttachmentTypeOptions();
@@ -311,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(() => {
@@ -327,20 +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() {
-      this.uploadDialogType = this.defaultAttachmentType;
+      const options = this.resolvedLocationOptions;
+      this.uploadDialogLocation = options.includes(this.attachmentLocation)
+        ? this.attachmentLocation
+        : options[0] || this.attachmentLocation;
+      this.syncUploadDialogTypeByLocation();
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
       this.uploadDialogVisible = true;
@@ -348,7 +462,8 @@ export default {
     resetUploadDialog() {
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
-      this.uploadDialogType = this.defaultAttachmentType;
+      this.uploadDialogLocation = this.attachmentLocation;
+      this.syncUploadDialogTypeByLocation();
     },
     beforeUpload(file) {
       const extension = String(file.name || '')
@@ -391,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() {
@@ -416,6 +536,10 @@ export default {
         this.$message.warning('请先上传附件');
         return;
       }
+      if (!this.uploadDialogLocation) {
+        this.$message.warning('请选择附件位置');
+        return;
+      }
       if (!this.uploadDialogType) {
         this.$message.warning('请选择附件类型');
         return;
@@ -430,43 +554,39 @@ export default {
         uploadTime: row.uploadTime || uploadTime,
         ...(this.markApprovedOnUpload ? { approved: true } : {}),
       }));
-      this.update([...(this.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];
@@ -474,7 +594,7 @@ export default {
         this.$message.warning('已审核通过的附件不允许删除');
         return;
       }
-      const rows = [...this.rows];
+      const rows = [...(this.rows || [])];
       rows.splice(index, 1);
       this.update(rows);
     },
@@ -487,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);
@@ -504,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);
@@ -527,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;

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>
@@ -69,14 +79,21 @@
     <section v-if="master" class="master-goods-card">
       <div class="master-goods-card__heading"><h3>货物信息</h3></div>
       <el-table :data="master.goods || []" border>
+        <el-table-column type="index" label="序号" width="60" align="center" />
         <el-table-column prop="cargoName" label="货物名称" min-width="150" />
-        <el-table-column prop="cargoType" label="类型" min-width="130" />
+        <el-table-column prop="cargoType" min-width="130">
+          <template #header
+            ><span>货物类型<span class="required-asterisk">*</span></span></template
+          >
+        </el-table-column>
         <el-table-column prop="packageType" label="包装" min-width="120" />
-        <el-table-column label="数量" min-width="100"><template #default="{ row }">{{ row.quantity ?? '-' }}{{ row.quantityUnit ? ` ${row.quantityUnit}` : '' }}</template></el-table-column>
+        <el-table-column prop="quantity" label="数量" min-width="100" />
+        <el-table-column prop="quantityUnit" label="数量单位" width="100" />
         <el-table-column prop="brand" label="品牌" min-width="120" />
-        <el-table-column prop="specification" label="规格" min-width="150" />
-        <el-table-column prop="model" label="型号" min-width="150" />
-        <el-table-column prop="materialCode" label="物料编码" min-width="130" />
+        <el-table-column prop="specification" label="规格" min-width="120" />
+        <el-table-column prop="model" label="型号" min-width="120" />
+        <el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
+        <el-table-column label="操作" width="100" align="center" fixed="right" />
       </el-table>
       <el-empty v-if="!(master.goods || []).length" description="暂无货物信息" :image-size="56" />
     </section>
@@ -132,6 +149,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 +300,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; } }
@@ -305,5 +351,7 @@ export default {
 .transport-plan-detail { margin-top: 20px; h4 { margin: 0 0 12px; padding-left: 12px; border-left: 4px solid #409eff; font-size: 15px; } }
 .master-goods-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
 .master-goods-card__heading { padding: 20px 24px 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
+.master-goods-card :deep(.el-table) { margin: 0 24px 20px; width: auto; }
+.required-asterisk { margin-left: 4px; color: #f56c6c; }
 @media screen and (max-width: 1200px) { .detail-meta { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
 </style>

src/views/business/components/master-order-dispatch.vue

@@ -51,9 +51,29 @@
     <section v-for="(route, index) in routes" :key="route.segmentNo" class="dispatch-section" :data-segment="route.segmentNo">
       <header class="segment-header">
         <div>
-          <el-checkbox v-model="route.selected">
+          <el-tooltip
+            v-if="!canDispatchSegment(route)"
+            content="需等上一段运单完成到达后才能调度"
+            placement="top"
+          >
+            <span class="segment-checkbox-wrap">
+              <el-checkbox :model-value="false" disabled>
+                <span class="segment-checkbox-label">
+                  <span class="segment-checkbox-no">{{ route.segmentNo }}：</span>
+                  <span class="segment-checkbox-path"
+                    >{{ dispatchLocationName(route, 'departure') }} → {{ dispatchLocationName(route, 'arrival') }}</span
+                  >
+                </span>
+              </el-checkbox>
+            </span>
+          </el-tooltip>
+          <el-checkbox
+            v-else
+            v-model="route.selected"
+            @change="value => handleSegmentSelect(route, value)"
+          >
             <span class="segment-checkbox-label">
-              <span>{{ route.segmentNo }}：</span>
+              <span class="segment-checkbox-no">{{ route.segmentNo }}：</span>
               <el-tooltip
                 :content="`${dispatchLocationName(route, 'departure')} → ${dispatchLocationName(route, 'arrival')}`"
                 placement="top"
@@ -65,7 +85,15 @@
             </span>
           </el-checkbox>
         </div>
-        <div>总量 {{ formatQuantity(totalQuantity) }} {{ quantityUnitLabel }}，已调度 <em>{{ formatQuantity(dispatchedQuantity(route)) }} {{ quantityUnitLabel }}</em>，剩余 <em>{{ formatQuantity(remaining(route)) }} {{ quantityUnitLabel }}</em></div>
+        <div>
+          总量 {{ formatQuantity(totalQuantity) }} {{ quantityUnitLabel }}，已调度
+          <em>{{ formatQuantity(dispatchedQuantity(route)) }} {{ quantityUnitLabel }}</em>，剩余
+          <em>{{ formatQuantity(remaining(route)) }} {{ quantityUnitLabel }}</em>
+          <template v-if="index > 0">
+            ，上一段已到达
+            <em>{{ formatQuantity(previousArrivedQuantity(route)) }} {{ quantityUnitLabel }}</em>
+          </template>
+        </div>
       </header>
       <div v-show="route.selected" class="segment-content">
         <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form">
@@ -78,16 +106,28 @@
             <el-col :span="12">
               <el-form-item label="发货地址" required><el-input :model-value="addressText(route.departureName, route.departureAddress)" disabled /></el-form-item>
             </el-col>
-            <el-col :span="4"><el-form-item label="联系人"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item></el-col>
-            <el-col :span="4"><el-form-item label="联系方式"><el-input v-model="route.departurePhone" placeholder="请输入" /></el-form-item></el-col>
+            <el-col :span="4"
+              ><el-form-item label="联系人" label-width="68px" class="dispatch-form__compact-label"
+                ><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item
+            ></el-col>
+            <el-col :span="4"
+              ><el-form-item label="联系方式" label-width="80px" class="dispatch-form__compact-label"
+                ><el-input v-model="route.departurePhone" placeholder="请输入" /></el-form-item
+            ></el-col>
             <el-col :span="4"><el-form-item :label="dateStartLabel(route)"><el-date-picker v-model="route.estimatedStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" /></el-form-item></el-col>
           </el-row>
           <el-row :gutter="16">
             <el-col :span="12">
               <el-form-item label="收货地址" required><el-input :model-value="addressText(route.arrivalName, route.arrivalAddress)" disabled /></el-form-item>
             </el-col>
-            <el-col :span="4"><el-form-item label="联系人"><el-input v-model="route.arrivalContact" placeholder="请输入" /></el-form-item></el-col>
-            <el-col :span="4"><el-form-item label="联系方式"><el-input v-model="route.arrivalPhone" placeholder="请输入" /></el-form-item></el-col>
+            <el-col :span="4"
+              ><el-form-item label="联系人" label-width="68px" class="dispatch-form__compact-label"
+                ><el-input v-model="route.arrivalContact" placeholder="请输入" /></el-form-item
+            ></el-col>
+            <el-col :span="4"
+              ><el-form-item label="联系方式" label-width="80px" class="dispatch-form__compact-label"
+                ><el-input v-model="route.arrivalPhone" placeholder="请输入" /></el-form-item
+            ></el-col>
             <el-col :span="4"><el-form-item :label="dateEndLabel(route)"><el-date-picker v-model="route.estimatedEndTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" /></el-form-item></el-col>
           </el-row>
         </el-form>
@@ -156,16 +196,59 @@
             <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="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-input v-model="route.escortPhone" placeholder="请输入" /></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"
+                      clearable
+                      trigger-on-focus
+                      :debounce="300"
+                      :fetch-suggestions="fetchDriverSuggestions"
+                      :loading="driverLoading"
+                      placeholder="请输入司机"
+                      @mousedown="() => handleDriverFocus(route)"
+                      @focus="() => handleDriverFocus(route)"
+                      @select="handleDriverSuggestionSelect"
+                  /></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"
+                      clearable
+                      trigger-on-focus
+                      :debounce="300"
+                      :fetch-suggestions="fetchEscortSuggestions"
+                      :loading="escortLoading"
+                      placeholder="请输入"
+                      @mousedown="() => handleDriverFocus(route)"
+                      @focus="() => handleDriverFocus(route)"
+                      @select="handleEscortSuggestionSelect"
+                  /></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>
                 <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><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="船班号/船次号/班次号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船长"><el-input v-model="route.captainName" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="联系电话"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="箱号"><el-input v-model="route.containerNo" placeholder="请输入" /></el-form-item></el-col>
@@ -233,7 +316,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 => {
@@ -249,7 +332,23 @@ export default {
   props: { id: [String, Number] },
   emits: ['back'],
   data() {
-    return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
+    return {
+      loading: false,
+      submitting: false,
+      master: null,
+      routes: [],
+      pending: [],
+      pendingExpanded: false,
+      editingId: null,
+      driverInputs: {},
+      activeSuggestRoute: null,
+      carrierOptions: [],
+      driverOptions: [],
+      carrierLoading: false,
+      driverLoading: false,
+      escortLoading: false,
+      quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'],
+    };
   },
   computed: {
     totalQuantity() { return (this.master?.goods || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0); },
@@ -290,11 +389,12 @@ export default {
     },
   },
   async mounted() {
-    await Promise.all([this.load(), this.loadCarrierOptions(), this.loadDriverOptions()]);
+    await Promise.all([this.load(), this.loadCarrierOptions()]);
     this.applySelfOperatedCarrierDefaults();
   },
   methods: {
     async load() {
+      if (!this.id) return;
       this.loading = true;
       try {
         const res = await api.getDetail(this.id);
@@ -452,12 +552,29 @@ export default {
     dispatchedQuantity(route) {
       return this.quantityNumber(route.dispatchedQuantity) + this.pendingSegmentQuantity(route);
     },
+    previousArrivedQuantity(route) {
+      const routeIndex = this.routes.indexOf(route);
+      if (routeIndex <= 0) return null;
+      return this.quantityNumber(this.routes[routeIndex - 1]?.arrivedQuantity);
+    },
+    canDispatchSegment(route) {
+      const previousArrived = this.previousArrivedQuantity(route);
+      if (previousArrived === null) return true;
+      return previousArrived > 0;
+    },
     remaining(route) {
-      return Math.max(
-        0,
-        this.totalQuantity -
-          this.dispatchedQuantity(route)
-      );
+      const masterRemaining = Math.max(0, this.totalQuantity - this.dispatchedQuantity(route));
+      const previousArrived = this.previousArrivedQuantity(route);
+      if (previousArrived === null) return masterRemaining;
+      return Math.max(0, Math.min(masterRemaining, previousArrived - this.dispatchedQuantity(route)));
+    },
+    handleSegmentSelect(route, value) {
+      if (value && !this.canDispatchSegment(route)) {
+        route.selected = false;
+        this.$message.warning(
+          `${route.segmentNo}需等上一段运单完成到达后才能调度（上一段已到达 ${this.formatQuantity(this.previousArrivedQuantity(route))} ${this.quantityUnitLabel}）`
+        );
+      }
     },
     formatQuantity(value) { const number = Number(value || 0); return Number.isInteger(number) ? number : number.toFixed(3).replace(/\.?0+$/, ''); },
     formatAmount(value) { return Number(value || 0).toFixed(2); },
@@ -517,7 +634,7 @@ export default {
         })),
       });
     },
-    currencyLabel(value) { return ({ CNY: '人民币', RMB: '人民币', USD: '美元', EUR: '欧元' })[value] || value || '人民币'; },
+    currencyLabel(value) { return ({ CNY: '元', RMB: '元', USD: '美元', EUR: '欧元' })[value] || value || '元'; },
     quantityNumber(value) { return Number(value || 0); },
     goodsKey(goods = {}, includeUnit = true) {
       return [
@@ -562,13 +679,14 @@ export default {
       }, 0);
     },
     validatePreviousSegmentCompletedQuantity(route, goods) {
-      const routeIndex = this.routes.indexOf(route);
-      if (routeIndex <= 0) return true;
-      const previousCompletedQuantity = this.quantityNumber(
-        this.routes[routeIndex - 1]?.arrivedQuantity
-      );
+      const previousCompletedQuantity = this.previousArrivedQuantity(route);
+      if (previousCompletedQuantity === null) return true;
+      if (previousCompletedQuantity <= 0) {
+        this.$message.warning(`${route.segmentNo}需等上一段运单完成到达后才能调度`);
+        return false;
+      }
       const currentDispatchQuantity = (goods || []).reduce(
-        (sum, item) => sum + this.quantityNumber(item.dispatchQuantity),
+        (sum, item) => sum + this.quantityNumber(item.dispatchQuantity ?? item.quantity),
         0
       );
       const dispatchTotal =
@@ -577,7 +695,7 @@ export default {
         currentDispatchQuantity;
       if (dispatchTotal <= previousCompletedQuantity) return true;
       this.$message.warning(
-        `${route.segmentNo}调度总量不能大于上一段已完成数量（${this.formatQuantity(previousCompletedQuantity)} ${this.quantityUnitLabel}）`
+        `${route.segmentNo}调度总量不能大于上一段已到达数量（${this.formatQuantity(previousCompletedQuantity)} ${this.quantityUnitLabel}）`
       );
       return false;
     },
@@ -726,6 +844,7 @@ export default {
       route.carrierName = '';
       route.carrierId = '';
       route.carrierContractId = '';
+      this.clearRouteDriverVehicleFields(route);
       if (value === '承运商') {
         route.trailerVehicleNo = '';
         route.escortName = '';
@@ -745,6 +864,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 || '';
@@ -816,29 +953,57 @@ export default {
         route.carrierContractId = '';
       });
     },
-    async loadDriverOptions(keyword = '') {
+    handleDriverFocus(route) {
+      this.activeSuggestRoute = route;
+    },
+    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())
-        .then(() =>
+      const route = this.activeSuggestRoute || {};
+      const carrier = this.getRouteCarrierFilter(route);
+      const keyword = String(queryString || '').trim();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        if (!keyword) this.$message.warning('请先选择承运商');
+        return;
+      }
+      this.driverLoading = true;
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
+          this.driverOptions = records;
           callback(
-            this.driverOptions.map(item => ({
+            records.map(item => ({
               ...item,
               value: this.driverOptionLabel(item),
             }))
-          )
-        )
-        .catch(() => callback([]));
+          );
+        })
+        .catch(() => callback([]))
+        .finally(() => {
+          this.driverLoading = false;
+        });
     },
-    handleDriverSuggestionSelect(route, item = {}) {
+    handleDriverSuggestionSelect(item = {}) {
+      const route = this.activeSuggestRoute;
+      if (!route) return;
       route.driverName = this.driverOptionLabel(item);
       route.driverId = item.id || item.driverId || '';
       route.driverPhone = item.mobile || item.driverPhone || item.phone || route.driverPhone || '';
@@ -846,12 +1011,22 @@ export default {
       if (drivingVehicle) route.vehicleNo = drivingVehicle;
     },
     fetchEscortSuggestions(queryString, callback) {
+      const route = this.activeSuggestRoute || {};
       const keyword = String(queryString || '').trim();
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        if (!keyword) this.$message.warning('请先选择承运商');
+        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),
             }))
@@ -862,7 +1037,9 @@ export default {
           this.escortLoading = false;
         });
     },
-    handleEscortSuggestionSelect(route, item = {}) {
+    handleEscortSuggestionSelect(item = {}) {
+      const route = this.activeSuggestRoute;
+      if (!route) return;
       route.escortName = this.driverOptionLabel(item);
       const phone = item.mobile || item.driverPhone || item.phone || '';
       if (phone) route.escortPhone = phone;
@@ -887,6 +1064,10 @@ export default {
     addToPending(route, continueDispatch) {
       const goods = route.goods.filter(item => Number(item.dispatchQuantity) > 0);
       if (!goods.length) return this.$message.warning('请填写本次数量');
+      if (!this.canDispatchSegment(route)) {
+        return this.$message.warning(`${route.segmentNo}需等上一段运单完成到达后才能调度`);
+      }
+      if (!this.validatePreviousSegmentCompletedQuantity(route, goods)) return;
       if (!this.validateDispatchGoods(route, goods)) return;
       this.syncFreightItems(route);
       if (!this.validateFreightItems(route)) return;
@@ -1001,9 +1182,11 @@ export default {
 .pending-list-spacer { height: min(436px, calc(100vh - 130px)); }
 .master-overview, .dispatch-section { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
 .overview-heading, .segment-header, .pending-bar { display: flex; align-items: center; justify-content: space-between; }
-.segment-header :deep(.el-checkbox.is-checked .el-checkbox__label) { font-size: 16px; font-weight: 700; }
-.segment-checkbox-label { display: inline-flex; align-items: center; min-width: 0; }
-.segment-checkbox-path { display: inline-block; white-space: nowrap; }
+.segment-checkbox-wrap { display: inline-flex; max-width: 100%; }
+.segment-checkbox-label { display: inline-flex; align-items: center; min-width: 0; font-size: 14px; font-weight: 400; color: #303133; }
+/* 仅「段X：」加粗加大，冒号右侧路线保持常规字号 */
+.segment-checkbox-no { font-size: 16px; font-weight: 700; color: #303133; }
+.segment-checkbox-path { display: inline-block; white-space: nowrap; font-size: 14px; font-weight: 400; }
 .overview-heading { padding: 18px 24px 12px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
 .overview-content { display: grid; grid-template-columns: minmax(400px, .9fr) minmax(620px, 1.6fr); gap: 28px; padding: 8px 24px 20px; }
 .overview-meta { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 18px 24px; margin: 0; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { margin: 0; color: #409eff; font-size: 14px; word-break: break-all; } }
@@ -1015,6 +1198,12 @@ export default {
 .segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } }
 .segment-content { padding: 16px 24px; }
 .dispatch-form { :deep(.el-form-item) { margin-bottom: 14px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } :deep(.el-input-group__append .el-select) { width: auto; } }
+/* 短标签按自身宽度，避免被「预计发货日期」等长标签把左侧撑开 */
+.dispatch-form__compact-label {
+  :deep(.el-form-item__label) {
+    justify-content: flex-end;
+  }
+}
 .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; } }

src/views/business/components/master-order-editor.vue

@@ -9,6 +9,7 @@
               ><el-select
                 v-model="form.projectId"
                 filterable
+                :disabled="isBasicRouteReadonly"
                 placeholder="请输入并选择"
                 @change="projectChange"
                 ><el-option
@@ -20,7 +21,7 @@
             ><el-form-item label="客户合同" prop="contractName"
               ><el-select
                 v-model="form.contractId"
-                :disabled="!form.projectId"
+                :disabled="isBasicRouteReadonly || !form.projectId"
                 placeholder="选择项目后带出"
                 @change="contractChange"
                 ><el-option
@@ -41,6 +42,7 @@
             ><el-form-item label="备注"
               ><el-input
                 v-model="form.remark"
+                :disabled="isBasicRouteReadonly"
                 maxlength="200"
                 show-word-limit
                 placeholder="请输入" /></el-form-item></el-col></el-row
@@ -49,7 +51,7 @@
     <section>
       <div class="section-head">
         <h3>收发货信息</h3>
-        <div class="section-head__actions">
+        <div v-if="!isBasicRouteReadonly" class="section-head__actions">
           <el-link type="primary" @click="addRoute">新增途经点</el-link>
           <el-link type="primary" @click="openRouteDialog">选择线路</el-link>
         </div>
@@ -62,13 +64,13 @@
               <div class="route-node-form">
                   <el-form-item label="发货地" required class="route-address-form-item"
                     ><div class="route-address-inputs"
-                      ><el-input v-if="isNonRoadAddress('departure')" v-model="form.departureName" class="route-address-name" readonly placeholder="请选择站点" /><el-cascader v-else v-model="addressRegionPaths.departure" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('departure', value)" /><el-input v-model="form.departureAddress" class="route-address-detail" readonly placeholder="请输入详细地址" @click="handleAddressDetailClick('departure')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" @click="openCommonAddress('departure')" /></el-tooltip></div
+                      ><el-input v-if="isNonRoadAddress('departure')" v-model="form.departureName" class="route-address-name" readonly :disabled="isBasicRouteReadonly" placeholder="请选择站点" /><el-cascader v-else v-model="addressRegionPaths.departure" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="isBasicRouteReadonly" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('departure', value)" /><el-input v-model="form.departureAddress" class="route-address-detail" readonly :disabled="isBasicRouteReadonly" placeholder="请输入详细地址" @click="handleAddressDetailClick('departure')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="isBasicRouteReadonly" @click="openCommonAddress('departure')" /></el-tooltip></div
                   ></el-form-item>
                   <el-form-item label="联系人" class="route-contact-form-item"
-                    ><el-input v-model="form.departureContact" placeholder="请输入"
+                    ><el-input v-model="form.departureContact" :disabled="isBasicRouteReadonly" placeholder="请输入"
                   /></el-form-item>
                   <el-form-item label="联系方式" class="route-phone-form-item"
-                    ><el-input v-model="form.departurePhone" placeholder="请输入"
+                    ><el-input v-model="form.departurePhone" :disabled="isBasicRouteReadonly" placeholder="请输入"
                   /></el-form-item>
                   <el-form-item label="计划开始" class="route-date-form-item"
                     ><el-date-picker
@@ -76,6 +78,7 @@
                       type="date"
                       format="YYYY-MM-DD"
                       value-format="YYYY-MM-DD"
+                      :disabled="isBasicRouteReadonly"
                       placeholder="请选择"
                   /></el-form-item>
               </div>
@@ -83,7 +86,7 @@
           </div>
           <template v-for="(route, index) in form.routes" :key="index">
             <div class="route-flow-segment">
-              <div class="route-step-title"><span class="route-segment-label">{{ circledSegmentNumber(index + 1) }} 段{{ index + 1 }}</span><el-tooltip :content="getRouteTitle(index).replace(`段${index + 1}：`, '')" placement="top"><span class="route-title-path">{{ formatRouteTitle(getRouteTitle(index), index + 1) }}</span></el-tooltip><div class="route-transport-control"><span>运输方式<span class="required-asterisk">*</span></span><el-select v-model="route.transportType" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div>
+              <div class="route-step-title"><span class="route-segment-label">{{ circledSegmentNumber(index + 1) }} 段{{ index + 1 }}</span><el-tooltip :content="getRouteTitle(index).replace(`段${index + 1}：`, '')" placement="top"><span class="route-title-path">{{ formatRouteTitle(getRouteTitle(index), index + 1) }}</span></el-tooltip><div class="route-transport-control"><span>运输方式<span class="required-asterisk">*</span></span><el-select v-model="route.transportType" :disabled="isBasicRouteReadonly" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div>
             </div>
             <div class="route-flow-row">
               <span class="route-flow-marker route-flow-marker--middle">经</span>
@@ -91,16 +94,16 @@
                 <div class="route-node-form">
                   <el-form-item label="途经地" required class="route-address-form-item"
                     ><div class="route-address-inputs"
-                      ><el-input v-if="isNonRoadAddress(`route-${index}`)" v-model="route.departureName" class="route-address-name" readonly :disabled="!route.transportType" placeholder="请先选择运输方式" /><el-cascader v-else v-model="addressRegionPaths[`route-${index}`]" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!route.transportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange(`route-${index}`, value)" /><el-input v-model="route.departureAddress" class="route-address-detail" readonly :disabled="!route.transportType" placeholder="请先选择运输方式" @click="handleAddressDetailClick(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="!route.transportType" @click="openCommonAddress(`route-${index}`)" /></el-tooltip></div
+                      ><el-input v-if="isNonRoadAddress(`route-${index}`)" v-model="route.departureName" class="route-address-name" readonly :disabled="isBasicRouteReadonly || !route.transportType" placeholder="请先选择运输方式" /><el-cascader v-else v-model="addressRegionPaths[`route-${index}`]" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="isBasicRouteReadonly || !route.transportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange(`route-${index}`, value)" /><el-input v-model="route.departureAddress" class="route-address-detail" readonly :disabled="isBasicRouteReadonly || !route.transportType" placeholder="请先选择运输方式" @click="handleAddressDetailClick(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="isBasicRouteReadonly || !route.transportType" @click="openCommonAddress(`route-${index}`)" /></el-tooltip></div
                   ></el-form-item>
-                  <el-form-item label="联系人" class="route-contact-form-item"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item>
-                  <el-form-item label="联系方式" class="route-phone-form-item"><div class="route-contact-actions"><el-input v-model="route.departurePhone" placeholder="请输入" /><el-tooltip v-if="index === form.routes.length - 1" content="新增途经点" placement="top"><el-button class="route-action-button" type="primary" link @click="addRoute"><el-icon><CirclePlus /></el-icon></el-button></el-tooltip><el-tooltip content="删除途经点" placement="top"><el-button class="route-action-button" type="danger" link @click="removeRoute(index)"><el-icon><Remove /></el-icon></el-button></el-tooltip></div></el-form-item>
+                  <el-form-item label="联系人" class="route-contact-form-item"><el-input v-model="route.departureContact" :disabled="isBasicRouteReadonly" placeholder="请输入" /></el-form-item>
+                  <el-form-item label="联系方式" class="route-phone-form-item"><div class="route-contact-actions"><el-input v-model="route.departurePhone" :disabled="isBasicRouteReadonly" placeholder="请输入" /><template v-if="!isBasicRouteReadonly"><el-tooltip v-if="index === form.routes.length - 1" content="新增途经点" placement="top"><el-button class="route-action-button" type="primary" link @click="addRoute"><el-icon><CirclePlus /></el-icon></el-button></el-tooltip><el-tooltip content="删除途经点" placement="top"><el-button class="route-action-button" type="danger" link @click="removeRoute(index)"><el-icon><Remove /></el-icon></el-button></el-tooltip></template></div></el-form-item>
                 </div>
               </div>
             </div>
           </template>
           <div class="route-flow-segment">
-            <div class="route-step-title"><span class="route-segment-label">{{ circledSegmentNumber(form.routes.length + 1) }} 段{{ form.routes.length + 1 }}</span><el-tooltip :content="getFinalRouteTitle().replace(`段${form.routes.length + 1}：`, '')" placement="top"><span class="route-title-path">{{ formatRouteTitle(getFinalRouteTitle(), form.routes.length + 1) }}</span></el-tooltip><div class="route-transport-control"><span>运输方式<span class="required-asterisk">*</span></span><el-select v-model="form.finalTransportType" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div>
+            <div class="route-step-title"><span class="route-segment-label">{{ circledSegmentNumber(form.routes.length + 1) }} 段{{ form.routes.length + 1 }}</span><el-tooltip :content="getFinalRouteTitle().replace(`段${form.routes.length + 1}：`, '')" placement="top"><span class="route-title-path">{{ formatRouteTitle(getFinalRouteTitle(), form.routes.length + 1) }}</span></el-tooltip><div class="route-transport-control"><span>运输方式<span class="required-asterisk">*</span></span><el-select v-model="form.finalTransportType" :disabled="isBasicRouteReadonly" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div>
           </div>
           <div class="route-flow-row">
             <span class="route-flow-marker route-flow-marker--end">终</span>
@@ -108,18 +111,19 @@
               <div class="route-node-form">
                   <el-form-item label="收货地" required class="route-address-form-item"
                     ><div class="route-address-inputs"
-                      ><el-input v-if="isNonRoadAddress('arrival')" v-model="form.arrivalName" class="route-address-name" readonly :disabled="!form.finalTransportType" placeholder="请先选择运输方式" /><el-cascader v-else v-model="addressRegionPaths.arrival" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!form.finalTransportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('arrival', value)" /><el-input v-model="form.arrivalAddress" class="route-address-detail" readonly :disabled="!form.finalTransportType" placeholder="请先选择运输方式" @click="handleAddressDetailClick('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="!form.finalTransportType" @click="openCommonAddress('arrival')" /></el-tooltip></div
+                      ><el-input v-if="isNonRoadAddress('arrival')" v-model="form.arrivalName" class="route-address-name" readonly :disabled="isBasicRouteReadonly || !form.finalTransportType" placeholder="请先选择运输方式" /><el-cascader v-else v-model="addressRegionPaths.arrival" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="isBasicRouteReadonly || !form.finalTransportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('arrival', value)" /><el-input v-model="form.arrivalAddress" class="route-address-detail" readonly :disabled="isBasicRouteReadonly || !form.finalTransportType" placeholder="请先选择运输方式" @click="handleAddressDetailClick('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="isBasicRouteReadonly || !form.finalTransportType" @click="openCommonAddress('arrival')" /></el-tooltip></div
                   ></el-form-item>
                   <el-form-item label="联系人" class="route-contact-form-item"
-                    ><el-input v-model="form.arrivalContact" placeholder="请输入" /></el-form-item>
+                    ><el-input v-model="form.arrivalContact" :disabled="isBasicRouteReadonly" placeholder="请输入" /></el-form-item>
                   <el-form-item label="联系方式" class="route-phone-form-item"
-                    ><el-input v-model="form.arrivalPhone" placeholder="请输入" /></el-form-item>
+                    ><el-input v-model="form.arrivalPhone" :disabled="isBasicRouteReadonly" placeholder="请输入" /></el-form-item>
                   <el-form-item label="计划结束" class="route-date-form-item"
                     ><el-date-picker
                       v-model="form.planEndTime"
                       type="date"
                       format="YYYY-MM-DD"
                       value-format="YYYY-MM-DD"
+                      :disabled="isBasicRouteReadonly"
                       placeholder="请选择"
                   /></el-form-item>
               </div>
@@ -144,6 +148,7 @@
             ><el-autocomplete
               v-model="row.cargoName"
               clearable
+              :disabled="isGoodsCategoryLocked(row)"
               placeholder="请输入货物名称"
               :debounce="300"
               :fetch-suggestions="
@@ -168,22 +173,29 @@
               :placeholder="row.cargoType || '请选择'"
               clearable
               filterable
+              :disabled="isGoodsCategoryLocked(row)"
               :loading="cargoTypeLoading"
               @visible-change="visible => visible && loadCargoTypeOptions()"
               @change="value => handleCargoTypeChange(row, value)"
             /></template></el-table-column
-        ><el-table-column label="数量" width="180" class-name="master-editor__quantity-cell"
+        ><el-table-column label="数量" width="200" class-name="master-editor__quantity-cell"
           ><template #header><span>数量<span class="required-asterisk">*</span></span></template>
           <template #default="{ row }"
-            ><el-input
-              v-model="row.quantity"
-              inputmode="decimal"
-              placeholder="请输入"
-              @input="value => handleQuantityInput(row, value)" /></template></el-table-column
+            ><div class="master-editor__quantity-field"
+              ><el-input
+                v-model="row.quantity"
+                inputmode="decimal"
+                placeholder="请输入"
+                @input="value => handleQuantityInput(row, value)"
+                @blur="() => enforceMinDispatchedQuantity(row)"
+              /><small v-if="dispatchedQuantityOf(row) > 0" class="master-editor__quantity-hint"
+                >已调度 {{ formatDispatchedQuantity(dispatchedQuantityOf(row)) }}，不可低于此值</small
+              ></div
+            ></template></el-table-column
         ><el-table-column label="数量单位" width="120"
           ><template #header><span>数量单位<span class="required-asterisk">*</span></span></template>
           <template #default="{ row }"
-            ><el-select v-model="row.quantityUnit"
+            ><el-select v-model="row.quantityUnit" :disabled="isGoodsCategoryLocked(row)"
               ><el-option v-for="unit in quantityUnitOptions" :key="unit" :label="unit" :value="unit" /></el-select></template></el-table-column
         ><el-table-column label="包装" width="130"
           ><template #default="{ row }"
@@ -218,7 +230,7 @@
                 >新增</el-link
               ><el-link
                 type="danger"
-                :disabled="form.goods.length === 1"
+                :disabled="form.goods.length === 1 || isGoodsCategoryLocked(form.goods[$index])"
                 @click="removeGoods($index)"
                 >删除</el-link
               ></div
@@ -272,10 +284,9 @@
           </el-table-column>
           <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
           <el-table-column prop="uploadTime" label="上传时间" width="170" align="center" sortable />
-          <el-table-column label="操作" width="120" align="center" fixed="right">
-            <template #default="{ row, $index }">
+          <el-table-column label="操作" width="80" align="center" fixed="right">
+            <template #default="{ $index }">
               <el-link type="danger" @click="removeAttachment($index)">删除</el-link>
-              <el-link type="primary" @click="downloadAttachment(row)">下载</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -402,8 +413,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 +612,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, searchAmapPlaceText } from '@/utils/map-search';
 import { isMobile } from '@/utils/validate';
 export default {
   components: {
@@ -706,6 +718,31 @@ export default {
   },
   computed: {
     ...mapGetters(['userInfo']),
+    // 非草稿编辑：基本信息与收发货路线只读
+    isBasicRouteReadonly() {
+      return Boolean(this.id) && Boolean(this.form.businessStatus) && this.form.businessStatus !== 'draft';
+    },
+    // 品类 → 已调度量（各分段取最大值；优先用详情返回的 dispatchedGoods）
+    dispatchedGoodsMap() {
+      const map = {};
+      const source = this.form.dispatchedGoods;
+      if (source && typeof source === 'object' && !Array.isArray(source)) {
+        Object.entries(source).forEach(([key, qty]) => {
+          const number = Number(qty);
+          if (Number.isFinite(number)) map[key] = number;
+        });
+        return map;
+      }
+      (this.form.routeProgress || []).forEach(route => {
+        const goods = route?.dispatchedGoods || {};
+        Object.entries(goods).forEach(([key, qty]) => {
+          const number = Number(qty);
+          if (!Number.isFinite(number)) return;
+          map[key] = Math.max(map[key] || 0, number);
+        });
+      });
+      return map;
+    },
     lastRouteName() {
       return this.form.routes[this.form.routes.length - 1]?.departureName || '途经地';
     },
@@ -1104,6 +1141,7 @@ export default {
       return row.regionCode || row.districtCode || row.areaCode || row.adcode || '';
     },
     openCommonAddress(target) {
+      if (this.isBasicRouteReadonly) return;
       this.addressTarget = target;
       if (this.addressTransportMode(target) !== 'road') {
         this.stationQuery = {};
@@ -1209,6 +1247,7 @@ export default {
       this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
     },
     handleAddressDetailClick(target) {
+      if (this.isBasicRouteReadonly) return;
       if (this.addressTransportMode(target) !== 'road') {
         this.openCommonAddress(target);
         return;
@@ -1216,6 +1255,7 @@ export default {
       this.openAddressMap(target);
     },
     openAddressMap(target) {
+      if (this.isBasicRouteReadonly) return;
       if (this.addressTransportMode(target) !== 'road') {
         this.$message.info('非公路运输地址不能使用地图选择');
         return;
@@ -1273,30 +1313,31 @@ export default {
         .catch(() => this.$message.error('高德地图组件加载失败'));
     },
     searchAddressMap() {
-      if (!this.mapKeyword.trim()) return this.$message.warning('请输入地址关键词');
+      const keyword = String(this.mapKeyword || '').trim();
+      if (!keyword) return this.$message.warning('请输入地址关键词');
+      if (this.mapLoading) return;
+      this.mapSearchResults = [];
+      this.mapLoading = true;
       this.loadAmap()
-        .then(() => this.ensureAddressGeocoder())
-        .then(
-          () =>
-            new Promise((resolve, reject) =>
-              this.addressMapGeocoder.getLocation(this.mapKeyword, (status, result) =>
-                status === 'complete' ? resolve(result) : reject(result)
-              )
-            )
-        )
-        .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;
-          if (!point) return this.$message.warning('地图搜索无匹配地址');
-          this.pickAddressMap(point, this.mapKeyword);
+        .then(() => searchAmapPlaceText(keyword))
+        .then(pois => {
+          this.mapSearchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.mapSearchResults[0];
+          if (!first?.location) {
+            this.mapStatus = '未找到匹配地址';
+            return this.$message.warning('地图搜索无匹配地址');
+          }
+          return this.$nextTick().then(() => {
+            this.pickAddressMap(first.location, first.address || first.name || keyword);
+          });
         })
-        .catch(() => this.$message.error('地图搜索失败'));
+        .catch(() => {
+          this.mapStatus = '未找到匹配地址';
+          this.$message.warning('地图搜索无匹配地址');
+        })
+        .finally(() => {
+          this.mapLoading = false;
+        });
     },
     selectAddressMapSearchResult(item) {
       if (item && item.location) {
@@ -1662,6 +1703,7 @@ export default {
       });
     },
     openRouteDialog() {
+      if (this.isBasicRouteReadonly) return;
       this.routeQuery = {};
       this.routePage.current = 1;
       this.routeDialogVisible = true;
@@ -1719,12 +1761,28 @@ export default {
       return { segmentNo: `段${index + 1}`, transportType: '' };
     },
     addRoute() {
+      if (this.isBasicRouteReadonly) return;
       this.form.routes.push(this.createRoute());
     },
     removeRoute(index) {
+      if (this.isBasicRouteReadonly) return;
       this.form.routes.splice(index, 1);
       this.syncAddressRegionPaths();
     },
+    goodsKey(row = {}) {
+      return `${row.cargoName || ''}\u0000${row.cargoType || ''}`;
+    },
+    dispatchedQuantityOf(row = {}) {
+      return Number(this.dispatchedGoodsMap[this.goodsKey(row)] || 0);
+    },
+    formatDispatchedQuantity(value) {
+      const number = Number(value);
+      if (!Number.isFinite(number)) return '0';
+      return String(number);
+    },
+    isGoodsCategoryLocked(row = {}) {
+      return this.dispatchedQuantityOf(row) > 0;
+    },
     addGoods(index) {
       this.form.goods.splice(index + 1, 0, {
         quantityUnit: quantityUnitOptions[0],
@@ -1734,6 +1792,13 @@ export default {
       });
     },
     removeGoods(index) {
+      const row = this.form.goods[index];
+      if (this.isGoodsCategoryLocked(row)) {
+        this.$message.warning(
+          `货物【${row.cargoName || ''}】已有调度量，不能删除`
+        );
+        return;
+      }
       if (this.form.goods.length > 1) this.form.goods.splice(index, 1);
     },
     handleQuantityInput(row, value) {
@@ -1741,6 +1806,42 @@ export default {
       const [integer = '', ...decimals] = text.split('.');
       row.quantity = decimals.length ? `${integer}.${decimals.join('').slice(0, 3)}` : integer;
     },
+    enforceMinDispatchedQuantity(row = {}) {
+      const min = this.dispatchedQuantityOf(row);
+      if (min <= 0) return true;
+      const current = Number(row.quantity);
+      if (!Number.isFinite(current) || current < min) {
+        row.quantity = String(min);
+        this.$message.warning(
+          `货物【${row.cargoName || ''}】数量不能低于已调度量（${this.formatDispatchedQuantity(min)}）`
+        );
+        return false;
+      }
+      return true;
+    },
+    validateGoodsDispatchedQuantity() {
+      const totals = {};
+      (this.form.goods || []).forEach(row => {
+        const key = this.goodsKey(row);
+        totals[key] = (totals[key] || 0) + (Number(row.quantity) || 0);
+      });
+      for (const [key, qty] of Object.entries(this.dispatchedGoodsMap)) {
+        const dispatched = Number(qty) || 0;
+        if (dispatched <= 0) continue;
+        const cargoName = String(key).split('\u0000')[0] || '未知货物';
+        if (!(key in totals)) {
+          this.$message.warning(`货物【${cargoName}】已有调度量，不能删除或变更品类`);
+          return false;
+        }
+        if ((totals[key] || 0) < dispatched) {
+          this.$message.warning(
+            `货物【${cargoName}】数量不能低于已调度量（${this.formatDispatchedQuantity(dispatched)}）`
+          );
+          return false;
+        }
+      }
+      return true;
+    },
     syncAttachmentsJson() {
       this.form.attachmentsJson = JSON.stringify(this.attachmentRows);
     },
@@ -1863,6 +1964,7 @@ export default {
           return this.$message.warning(`请完整填写第${invalidRouteIndex + 1}段途经地及运输方式`);
         if (!this.form.finalTransportType) return this.$message.warning('请填写最后一段运输方式');
       }
+      if (!this.validateGoodsDispatchedQuantity()) return false;
       const payload = {
         ...this.form,
         planStartTime: this.normalizeDateTimeValue(this.form.planStartTime),
@@ -1948,6 +2050,16 @@ export default {
     margin-bottom: 14px;
   }
 }
+.master-editor__quantity-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.master-editor__quantity-hint {
+  color: #e6a23c;
+  font-size: 12px;
+  line-height: 1.2;
+}
 .goods-heading {
   display: flex;
   margin-bottom: 8px;
@@ -2199,8 +2311,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 {

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, searchAmapPlaceText } from '@/utils/map-search';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { Location } from '@element-plus/icons-vue';
@@ -1114,6 +1115,7 @@ import '@open-file-viewer/core/style.css';
 import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 import { h, resolveComponent } from 'vue';
 import { mapGetters } from 'vuex';
+import { isAdministrator } from '@/utils/auth';
 
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
@@ -1360,7 +1362,7 @@ export default {
     },
     isAdmin() {
       return (
-        String(this.userInfo?.authority || '').includes('admin') ||
+        isAdministrator(this.userInfo) ||
         this.userInfo?.authority?.includes?.('admin')
       );
     },
@@ -2610,26 +2612,22 @@ export default {
     searchTransportMapKeyword() {
       const keyword = String(this.transportMapKeyword || '').trim();
       if (!keyword) return this.$message.warning('请输入地址关键词');
+      if (this.transportMapLoading) return;
+      this.transportMapSearchResults = [];
       this.transportMapLoading = true;
       this.loadAmap()
-        .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,
-          }));
-          const point = this.resolveTransportMapPoint(result);
-          if (!point) throw new Error('未找到匹配地址');
+        .then(() => searchAmapPlaceText(keyword))
+        .then(pois => {
+          this.transportMapSearchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.transportMapSearchResults[0];
+          if (!first?.location) throw new Error('未找到匹配地址');
           return this.$nextTick().then(() => {
             this.transportMapInstance?.resize();
-            return this.pickMapPoint(point, keyword);
+            return this.pickMapPoint(first.location, first.address || first.name || keyword);
           });
         })
         .catch(() => {
-          this.transportMapStatus = '地图搜索失败';
+          this.transportMapStatus = '未找到匹配地址';
           this.$message.warning('地图搜索无匹配地址');
         })
         .finally(() => {
@@ -3754,6 +3752,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 +3770,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;

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>
@@ -755,7 +756,7 @@
                   <span v-else>-</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" width="200" />
+              <el-table-column prop="vehicleNo" label="车牌号/船班号/船次号/班次号" width="200" />
               <el-table-column prop="driverName" label="司机" width="128" />
               <el-table-column prop="carrierName" label="承运商" width="192" />
               <el-table-column label="运输方式" width="192">
@@ -1231,7 +1232,7 @@
                 {{ dispatchDialogStatusText }}
               </el-tag>
               <el-tag type="primary" effect="light">
-                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路运输' }}
+                {{ formatDispatchTransportType(dispatchRow.transportType) || '-' }}
               </el-tag>
             </div>
           </div>
@@ -1400,7 +1401,7 @@
             </el-table-column>
             <el-table-column
               prop="vehicleNo"
-              label="车牌号/航班号/船号/班列号"
+              label="车牌号/船班号/船次号/班次号"
               min-width="200"
               align="center"
               show-overflow-tooltip
@@ -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>
@@ -2092,7 +2097,7 @@
           </el-form-item>
           <el-form-item
             v-if="dispatchItemForm.carrierType"
-            :label="dispatchIsNonRoadTransport ? '船/航/班列号' : '车牌号'"
+            :label="dispatchIsNonRoadTransport ? '船班号/船次号/班次号' : '车牌号'"
             required
           >
             <el-input v-model="dispatchItemForm.vehicleNo" placeholder="请输入" />
@@ -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 { getToken, isAdministrator } from '@/utils/auth';
+import { normalizeMapSearchResults, searchAmapPlaceText } 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)));
@@ -3585,10 +3610,7 @@ export default {
       return this.currencyRemark(value);
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     canCreate() {
       return this.hasPermission(`${this.config.permission}_add`);
@@ -4841,10 +4863,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 +4892,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 || '' })));
         })
@@ -5732,36 +5768,32 @@ export default {
         this.$message.warning('请输入地址关键词');
         return;
       }
+      if (this.transportMapLoading) return;
+      this.transportMapSearchResults = [];
+      this.transportMapLoading = true;
       this.loadAmap()
-        .then(() => {
-          this.transportMapLoading = true;
-          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,
-              }));
-              const point = this.resolveMapPoint(result);
-              if (!point) {
-                this.transportMapStatus = '未找到匹配地址';
-                this.$message.warning('地图搜索无匹配地址');
-                return;
-              }
-              this.pickTransportMapPoint(point, keyword);
-            })
-            .catch(() => {
-              this.transportMapStatus = '地图搜索失败';
-              this.$message.error('地图搜索失败，请稍后重试');
-            })
-            .finally(() => {
-              this.transportMapLoading = false;
-            });
+        .then(() => searchAmapPlaceText(keyword))
+        .then(pois => {
+          this.transportMapSearchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.transportMapSearchResults[0];
+          if (!first?.location) {
+            this.transportMapStatus = '未找到匹配地址';
+            this.$message.warning('地图搜索无匹配地址');
+            return;
+          }
+          return this.$nextTick().then(() => {
+            if (typeof this.transportAmap?.resize === 'function') {
+              this.transportAmap.resize();
+            }
+            this.pickTransportMapPoint(first.location, first.address || first.name || keyword);
+          });
         })
         .catch(() => {
-          this.$message.error('高德地图组件加载失败，请稍后重试或重新打开弹窗');
+          this.transportMapStatus = '未找到匹配地址';
+          this.$message.warning('地图搜索无匹配地址');
+        })
+        .finally(() => {
+          this.transportMapLoading = false;
         });
     },
     selectTransportMapSearchResult(item) {
@@ -7241,11 +7273,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 +7594,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 +7648,7 @@ export default {
       this.dispatchItemForm.carrierName = '';
       this.dispatchItemForm.carrierId = '';
       this.dispatchItemForm.carrierContractId = '';
+      this.clearDispatchDriverVehicleFields();
       if (nextValue === '承运商') {
         this.dispatchItemForm.trailerVehicleNo = '';
         this.dispatchItemForm.escortName = '';
@@ -7798,12 +7836,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 +7875,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 +8032,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 => {
@@ -8055,7 +8121,7 @@ export default {
         [
           'vehicleNo',
           ['water', 'rail', 'air'].includes(this.resolveTransportMode(row.transportType))
-            ? '船/航/班列号'
+            ? '船班号/船次号/班次号'
             : '车牌号',
         ],
       ];
@@ -8136,7 +8202,7 @@ export default {
             ['escortPhone', '押运人手机号', 20],
           ]
         : [
-            ['vehicleNo', '船/航/班列号', 30],
+            ['vehicleNo', '船班号/船次号/班次号', 30],
             ['captainName', '船长', 20],
             ['cabinNo', '舱位', 30],
             ['containerNo', '箱号', 30],
@@ -8220,14 +8286,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 +8316,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 +8332,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 +9429,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 {

src/views/business/components/voucher-execution-detail.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="voucher-folder-page voucher-folder-page--embedded">
+    <section class="voucher-folder-page__search">
+      <el-form :model="query" label-position="right" label-width="160px">
+        <div class="voucher-folder-page__search-grid">
+          <el-form-item label="车牌号">
+            <el-input v-model="query.plateNo" clearable placeholder="请输入" />
+          </el-form-item>
+          <el-form-item label="是否关联运单">
+            <el-select v-model="query.matched" clearable placeholder="全部">
+              <el-option label="是" :value="1" />
+              <el-option label="否" :value="0" />
+            </el-select>
+          </el-form-item>
+          <div class="voucher-folder-page__search-actions">
+            <el-button type="primary" @click="search">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+          </div>
+        </div>
+      </el-form>
+    </section>
+    <section class="voucher-folder-page__table-wrap">
+      <div class="voucher-folder-page__title">{{ batchTitle }}</div>
+      <el-table v-loading="loading" :data="pageRows" border class="voucher-folder-page__table">
+        <el-table-column type="index" label="序号" width="70" :index="rowIndex" />
+        <el-table-column prop="voucherNo" label="执行凭证号" min-width="220">
+          <template #default="{ row }">
+            <el-link type="primary" @click="openViewer(row)">{{ row.voucherNo }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="plateNo" label="车牌号" min-width="150" />
+        <el-table-column prop="folderName" label="文件夹名称" min-width="160" />
+        <el-table-column prop="matched" label="是否关联运单" width="130">
+          <template #default="{ row }">{{ row.matched === 1 ? '是' : '否' }}</template>
+        </el-table-column>
+        <el-table-column prop="processStatus" label="处理状态" width="130" />
+        <el-table-column prop="createTime" label="创建时间" min-width="180" />
+        <el-table-column prop="updateTime" label="更新时间" min-width="180" />
+        <el-table-column label="操作" width="120" fixed="right">
+          <template #default="{ row }">
+            <div class="voucher-folder-page__actions">
+              <el-link type="primary" @click="openViewer(row)">查看</el-link>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="voucher-folder-page__pagination">
+        <el-pagination
+          v-model:current-page="page.current"
+          v-model:page-size="page.size"
+          :total="filteredRows.length"
+          :page-sizes="[10, 20, 50]"
+          layout="total, prev, pager, next, sizes"
+          @size-change="page.current = 1"
+        />
+      </div>
+    </section>
+
+    <el-dialog v-model="viewerVisible" title="执行凭证详情" width="960px" destroy-on-close>
+      <div v-loading="viewerLoading" class="voucher-folder-page__viewer">
+        <div class="voucher-folder-page__viewer-info">
+          <span>执行凭证号：{{ viewer.voucherNo || '-' }}</span>
+          <span>文件夹名称：{{ viewer.folderName || '-' }}</span>
+          <span>是否关联运单：{{ viewer.matched === 1 ? '是' : '否' }}</span>
+          <span>
+            配载单号：
+            <el-link v-if="viewer.loadingNo" type="primary" @click="goToLoading(viewer.loadingNo)">
+              {{ viewer.loadingNo }}
+            </el-link>
+            <template v-else>-</template>
+          </span>
+        </div>
+        <div v-if="viewerFiles.length" class="voucher-folder-page__images">
+          <el-image
+            v-for="(file, index) in viewerFiles"
+            :key="file.id || file.url || index"
+            :src="file.url"
+            :preview-src-list="viewerFiles.map(item => item.url).filter(Boolean)"
+            :initial-index="index"
+            fit="cover"
+          />
+        </div>
+        <el-empty v-else description="暂无凭证文件" />
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { computed, reactive, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import { getVoucherFolderDetail, getVoucherFolders } from '@/api/business/process-config';
+
+const props = defineProps({
+  waybillId: {
+    type: [String, Number],
+    default: '',
+  },
+});
+
+const router = useRouter();
+const loading = ref(false);
+const rows = ref([]);
+const page = reactive({ current: 1, size: 10 });
+const query = reactive({ plateNo: '', matched: undefined });
+const appliedQuery = reactive({ plateNo: '', matched: undefined });
+const viewerVisible = ref(false);
+const viewerLoading = ref(false);
+const viewer = ref({});
+const viewerFiles = ref([]);
+
+const batchTitle = computed(() => {
+  const batchNos = [...new Set(rows.value.map(item => item.voucherBatchNo).filter(Boolean))];
+  return batchNos.length === 1 ? batchNos[0] : '执行凭证详情';
+});
+const filteredRows = computed(() => {
+  const plateNo = String(appliedQuery.plateNo || '').trim();
+  return rows.value.filter(item => {
+    const plateMatched = !plateNo || String(item.plateNo || '').includes(plateNo);
+    const relatedMatched =
+      appliedQuery.matched === undefined || appliedQuery.matched === null || appliedQuery.matched === ''
+        ? true
+        : item.matched === appliedQuery.matched;
+    return plateMatched && relatedMatched;
+  });
+});
+const pageRows = computed(() => {
+  const start = (page.current - 1) * page.size;
+  return filteredRows.value.slice(start, start + page.size);
+});
+const rowIndex = index => (page.current - 1) * page.size + index + 1;
+
+const load = async () => {
+  if (!props.waybillId) {
+    rows.value = [];
+    return;
+  }
+  loading.value = true;
+  try {
+    const res = await getVoucherFolders(props.waybillId);
+    rows.value = res.data?.data || [];
+  } catch (error) {
+    rows.value = [];
+    ElMessage.error(error.message || '获取执行凭证失败');
+  } finally {
+    loading.value = false;
+  }
+};
+const search = () => {
+  appliedQuery.plateNo = query.plateNo;
+  appliedQuery.matched = query.matched;
+  page.current = 1;
+};
+const reset = () => {
+  query.plateNo = '';
+  query.matched = undefined;
+  search();
+};
+const openViewer = async row => {
+  viewerVisible.value = true;
+  viewerLoading.value = true;
+  viewer.value = row;
+  viewerFiles.value = [];
+  try {
+    const res = await getVoucherFolderDetail(row.voucherId, row.plateNo);
+    viewer.value = res.data?.data || row;
+    viewerFiles.value = viewer.value.files || [];
+  } catch (error) {
+    ElMessage.error(error.message || '获取凭证详情失败');
+  } finally {
+    viewerLoading.value = false;
+  }
+};
+const goToLoading = loadingNo => {
+  router.push({ path: '/business/loading-manage', query: { loadingNo } });
+};
+
+watch(
+  () => props.waybillId,
+  () => {
+    page.current = 1;
+    load();
+  },
+  { immediate: true }
+);
+</script>
+
+<style scoped lang="scss">
+.voucher-folder-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: 360px 360px 1fr;
+    gap: 8px 24px;
+  }
+  &__search-actions {
+    display: flex;
+    justify-content: flex-end;
+    gap: 8px;
+  }
+  &__table-wrap {
+    padding: 12px;
+    background: #fff;
+  }
+  &__title {
+    padding-bottom: 12px;
+    color: #303133;
+    font-size: 16px;
+    font-weight: 600;
+  }
+  &__actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+  &__pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding-top: 12px;
+  }
+  &__viewer {
+    min-height: 360px;
+  }
+  &__viewer-info {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 28px;
+    padding-bottom: 20px;
+    color: #303133;
+  }
+  &__images {
+    display: grid;
+    grid-template-columns: repeat(5, 140px);
+    gap: 20px;
+  }
+  &__images :deep(.el-image) {
+    width: 140px;
+    height: 100px;
+    border: 6px solid #cfcfcf;
+    cursor: zoom-in;
+  }
+  :deep(.el-table) {
+    --el-table-border-color: #eff1f7;
+  }
+  :deep(.el-table__body tr:nth-child(even) > td) {
+    background: #fafafa;
+  }
+  :deep(.el-form-item) {
+    margin-bottom: 8px;
+  }
+  :deep(.el-form-item__label) {
+    white-space: nowrap;
+  }
+  :deep(.el-input),
+  :deep(.el-select) {
+    width: 100%;
+  }
+}
+
+@media (max-width: 900px) {
+  .voucher-folder-page__search-grid {
+    grid-template-columns: 1fr 1fr;
+  }
+  .voucher-folder-page__search-actions {
+    grid-column: 1 / -1;
+  }
+}
+</style>

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"
@@ -202,7 +202,7 @@
     <section-card class="waybill-search">
       <el-form :inline="true" :model="detailQuery"
       >
-        <el-form-item label="车牌号/船号"
+        <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
@@ -219,12 +219,14 @@
         prop="loadingIdentifier"
         label="配载标识号"
         min-width="130"
-      /><el-table-column
+      >
+        <template #default="{ row }">{{ row.loadingIdentifier || row.loadingNo || '' }}</template>
+      </el-table-column><el-table-column
         prop="vehicleNo"
-        label="车牌号/航班号/船号/班列号"
+        label="车牌号/船班号/船次号/班次号"
         min-width="190"
       /><el-table-column prop="transportType" label="运输方式" width="110">
-        <template #default="{ row }">{{ transportTypeLabel(row.transportType) }}</template>
+        <template #default="{ row }">{{ transportTypeLabel(row) }}</template>
       </el-table-column>
       <el-table-column
         prop="driverName"
@@ -334,6 +336,7 @@
         label-width="auto"
         class="archive-form"
       >
+        <div class="dialog-section-title">项目信息</div>
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目" prop="projectId">
@@ -444,16 +447,21 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="dialog-section-title waybill-import-create__import-title">导入运单明细</div>
+        <p v-if="!projectInfoReady" class="waybill-import-create__import-hint">
+          请先选择项目、客户合同和承运信息，再导入运单明细
+        </p>
         <el-form-item label="运单明细表" prop="file"
           ><el-upload
             action="#"
             accept=".xls,.xlsx"
             :auto-upload="false"
             :limit="1"
+            :disabled="!projectInfoReady"
             :file-list="files"
             :on-change="fileChange"
             :on-remove="fileRemove"
-            ><el-button type="primary">添加附件</el-button></el-upload
+            ><el-button type="primary" :disabled="!projectInfoReady">导入</el-button></el-upload
           ><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
         >
@@ -479,6 +487,7 @@
         :data="previewRows"
         border
         max-height="440"
+        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
         @selection-change="rowSelection = $event"
         ><el-table-column type="selection" width="55" /><el-table-column
           type="index"
@@ -564,14 +573,18 @@
               /><span v-else>{{ formatCell(row, column) }}</span></template
             ><span v-else>{{ formatCell(row, column) }}</span></template
           ></el-table-column
-        ><el-table-column label="操作" width="180" fixed="right"
+        ><el-table-column label="操作" width="220" fixed="right"
           ><template #default="{ row }"
-            ><template v-if="row._editing"
-              ><el-link type="primary" @click="saveRow(row)">保存</el-link
-              ><el-link type="primary" @click="cancelRow(row)">取消</el-link></template
-            ><template v-else
-              ><el-link type="primary" @click="editRow(row)">编辑</el-link
-              ><el-link type="danger" @click="deleteRow(row)">删除</el-link></template
+            ><div class="waybill-import-create__row-actions"
+              ><template v-if="row._editing"
+                ><el-link type="primary" @click="saveRow(row)">保存</el-link
+                ><el-link type="primary" @click="cancelRow(row)">取消</el-link></template
+              ><template v-else
+                ><el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)"
+                  >确认</el-link
+                ><el-link type="primary" @click="editRow(row)">编辑</el-link
+                ><el-link type="danger" @click="deleteRow(row)">删除</el-link></template
+              ></div
             ></template
           ></el-table-column
         ></el-table
@@ -579,6 +592,7 @@
     </section>
     <div v-if="createPage" class="waybill-import-create__footer">
       <el-button @click="closeCreate">取消</el-button>
+      <el-button @click="saveDraft">保存草稿</el-button>
       <el-button type="primary" @click="confirmImport">确认导入</el-button>
     </div>
   </component>
@@ -586,7 +600,7 @@
 
 <script setup>
 import { computed, onMounted, reactive, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import dayjs from 'dayjs';
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
@@ -601,6 +615,7 @@ import SectionCard from '@/components/section-card/main.vue';
 
 const props = defineProps({ modelValue: Boolean, standalone: Boolean, createPage: Boolean });
 const emit = defineEmits(['update:modelValue', 'closed']);
+const route = useRoute();
 const router = useRouter();
 const visible = computed({
   get: () => props.modelValue,
@@ -621,8 +636,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: '更新时间' },
 ];
@@ -656,10 +671,10 @@ const createDefaultForm = () => ({
   file: null,
 });
 const form = reactive(createDefaultForm());
-// 批量导入状态仅保留草稿与导入完成两种，与后端 importStatus 取值一致。
+// 导入状态与运单业务状态一致：进行中、已完成。
 const importStatusOptions = [
-  { label: '进行中', value: 'draft' },
-  { label: '导入完成', value: 'completed' },
+  { label: '进行中', value: 'running' },
+  { label: '已完成', value: 'completed' },
 ];
 // 编辑草稿时明细已入库，此时不再强制重新上传附件。
 const validateImportFile = (rule, value, callback) =>
@@ -705,6 +720,21 @@ const carrierContractsLoaded = ref(false),
   hasCarrierContracts = ref(null);
 const carrierTypes = ['承运商', '自运'];
 const isSelfOperated = computed(() => form.carrierType === '自运');
+const projectInfoReady = computed(() => {
+  if (
+    !form.projectId ||
+    !String(form.customerName || '').trim() ||
+    !form.contractId ||
+    !form.carrierType ||
+    !form.status ||
+    !form.importType
+  ) {
+    return false;
+  }
+  return isSelfOperated.value
+    ? Boolean(String(form.carrierName || '').trim())
+    : Boolean(form.carrierContractId);
+});
 // 项目下没有承运商合同时只允许自运，与运单管理的承运类型收窄规则一致。
 const carrierTypeOptions = computed(() =>
   carrierContractsLoaded.value && hasCarrierContracts.value === false ? ['自运'] : carrierTypes
@@ -733,7 +763,7 @@ const detailColumns = [
   { prop: 'batchNo', label: '运单批次号', minWidth: 150 },
   { prop: 'originalNo', label: '原始单号', editor: 'input', minWidth: 150 },
   { prop: 'loadingIdentifier', label: '配载标识号', editor: 'input', minWidth: 150 },
-  { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号', editor: 'input', minWidth: 220 },
+  { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号', editor: 'input', minWidth: 220 },
   { prop: 'transportType', label: '运输方式', editor: 'transportType', minWidth: 150 },
   { prop: 'driverName', label: '司机/船长姓名', editor: 'driver', minWidth: 170 },
   { prop: 'driverPhone', label: '司机/船长手机号', editor: 'input', minWidth: 150 },
@@ -763,7 +793,7 @@ const detailColumns = [
   { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
 ];
 const requiredDetailFields = [
-  { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号' },
+  { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
   { prop: 'transportType', label: '运输方式' },
   { prop: 'departureAddress', label: '发货地址' },
   { prop: 'arrivalAddress', label: '到货地址' },
@@ -976,33 +1006,78 @@ const loadCommonCargoOptions = async row => {
     commonCargoLoadingMap.value = { ...commonCargoLoadingMap.value, [key]: false };
   }
 };
+const TRANSPORT_TYPE_DEFAULTS = [
+  { label: '公路运输', value: 'road', dictKey: 'road', dictValue: '公路运输' },
+  { label: '铁路运输', value: 'railway', dictKey: 'railway', dictValue: '铁路运输' },
+  { label: '水路运输', value: 'river', dictKey: 'river', dictValue: '水路运输' },
+  { label: '航空运输', value: 'air', dictKey: 'air', dictValue: '航空运输' },
+];
+const readDictionaryList = res => {
+  const payload = res?.data?.data ?? res?.data ?? res;
+  if (Array.isArray(payload)) return payload;
+  if (Array.isArray(payload?.records)) return payload.records;
+  if (Array.isArray(payload?.data)) return payload.data;
+  return [];
+};
+const normalizeTransportTypeOptions = list => {
+  const options = [];
+  const append = item => {
+    if (!item || typeof item !== 'object') return;
+    const dictKey = String(item.dictKey ?? item.value ?? '').trim();
+    const dictValue = String(item.dictValue ?? item.label ?? '').trim();
+    if (dictKey === '-1') {
+      (item.children || []).forEach(append);
+      return;
+    }
+    if (dictKey || dictValue) {
+      options.push({
+        label: dictValue || dictKey,
+        value: dictKey || dictValue,
+        dictKey,
+        dictValue,
+      });
+    }
+    (item.children || []).forEach(append);
+  };
+  (list || []).forEach(append);
+  return options.length ? options : TRANSPORT_TYPE_DEFAULTS;
+};
+const applyTransportTypeOptions = res => {
+  transportTypeOptions.value = normalizeTransportTypeOptions(readDictionaryList(res));
+};
 const loadEditorOptions = async () => {
   const [dictRes, cargoTypeRes, driverRes] = await Promise.all([
     getDictionary({ code: 'transport_type' }),
     getCargoTypeList(1, 9999),
     getDriverList(1, 9999, {}),
   ]);
-  transportTypeOptions.value = extractRecords(dictRes).map(item => ({
-    label: item.dictValue || item.label,
-    value: item.dictKey || item.value,
-  }));
+  applyTransportTypeOptions(dictRes);
   cargoTypeOptions.value = buildCargoTypeTree(extractRecords(cargoTypeRes));
   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,
-  }));
+  try {
+    applyTransportTypeOptions(await getDictionary({ code: 'transport_type' }));
+  } catch (error) {
+    transportTypeOptions.value = TRANSPORT_TYPE_DEFAULTS;
+  }
 };
 const transportTypeLabel = value => {
-  if (value === null || value === undefined || value === '') return '-';
-  return (
-    transportTypeOptions.value.find(item => String(item.value) === String(value))?.label || value
+  const source = value && typeof value === 'object' ? value : null;
+  const stored = source ? source.transportType : value;
+  const named = String(source?.transportTypeName || '').trim();
+  const text = String(stored ?? '').trim();
+  if (named && named !== text) return named;
+  if (!text && !named) return '-';
+  const target = (named || text).toLowerCase();
+  const matched = transportTypeOptions.value.find(item =>
+    [item.value, item.dictKey, item.label, item.dictValue].some(
+      candidate => String(candidate ?? '').trim().toLowerCase() === target
+    )
   );
+  return matched?.dictValue || matched?.label || named || text || '-';
 };
 const loadBatches = async () => {
   const res = await api.getImportBatches({ ...query, current: page.current, size: page.size });
@@ -1011,7 +1086,7 @@ const loadBatches = async () => {
 };
 onMounted(() => {
   if (props.standalone) loadBatches();
-  if (props.createPage) openCreate();
+  if (props.createPage) openCreatePage();
 });
 watch(
   () => props.modelValue,
@@ -1034,16 +1109,18 @@ const loadDetails = async () => {
   details.value = res.data?.data?.records || [];
   detailPage.total = res.data?.data?.total || 0;
 };
-const openCreate = async () => {
+const openCreate = () => prepareCreateForm(true);
+const prepareCreateForm = async generateCode => {
   resetCreateForm();
   createVisible.value = true;
-  const [projectRes, , optionRes, batchNo] = await Promise.all([
+  const requests = [
     getProjectList(1, 9999, projectQueryParams),
     loadEditorOptions(),
     api.getImportOptions?.(),
-    generateBatchNo(),
-  ]);
-  form.batchNo = batchNo;
+  ];
+  if (generateCode) requests.push(generateBatchNo());
+  const [projectRes, , optionRes, batchNo] = await Promise.all(requests);
+  if (generateCode) form.batchNo = batchNo || '';
   projects.value = projectRes.data?.data?.records || [];
   const data = optionRes?.data?.data || {};
   queryCarriers.value = data.carriers || [];
@@ -1082,27 +1159,78 @@ const loadBatchRows = async batchId => {
     _key: `${id || 'row'}-${index}`,
     batchNo: item.batchNo || form.batchNo,
   }));
+  refreshDuplicateFlags();
   rowSelection.value = [];
   previewTab.value = 'all';
 };
-const editBatch = async row => {
-  await openCreate();
+const editBatch = row => {
+  router.push({
+    path: '/business/waybill-import/form',
+    query: { id: row.id, batchNo: row.batchNo || '' },
+  });
+};
+const openCreatePage = async () => {
+  const batchId = route.query.id;
+  if (!batchId) {
+    await openCreate();
+    return;
+  }
+  const res = await api.getImportBatches({
+    id: batchId,
+    batchNo: route.query.batchNo || '',
+    current: 1,
+    size: 20,
+  });
+  const batch = (res.data?.data?.records || []).find(item => String(item.id) === String(batchId));
+  if (!batch) {
+    ElMessage.warning('未找到导入批次');
+    router.push({ path: '/business/waybill-import' });
+    return;
+  }
+  await fillEditForm(batch);
+};
+const fillEditForm = async row => {
+  await prepareCreateForm(false);
   const snapshot = { ...row };
+  const savedCarrierId = String(snapshot.carrierIds || snapshot.carrierId || '')
+    .split(',')
+    .map(item => item.trim())
+    .find(Boolean);
   if (snapshot.projectId) await projectChange(snapshot.projectId);
+  const project = projects.value.find(item => String(item.id) === String(snapshot.projectId));
   Object.assign(form, snapshot, {
-    projectId: snapshot.projectId || '',
+    id: snapshot.id || '',
+    batchNo: snapshot.batchNo || '',
+    projectId: project?.id || snapshot.projectId || '',
     projectName: snapshot.projectName || form.projectName,
     // 列表返回的是 importStatus，表单沿用 status 字段提交给后端。
-    status: snapshot.importStatus || 'completed',
+    status:
+      snapshot.importStatus === 'running' || snapshot.importStatus === 'completed'
+        ? snapshot.importStatus
+        : 'completed',
     file: null,
+    carrierIds: [],
   });
+  const plan = plans.value.find(item => String(item.id) === String(snapshot.planId));
+  // 接口数字 null 会序列化为 -1，未选计划时回填为空
+  form.planId =
+    plan && Number(plan.id) !== -1 && Number(plan.id) > 0
+      ? plan.id
+      : normalizeOptionalPlanId(snapshot.planId) || '';
   const contract = contracts.value.find(item => String(item.id) === String(snapshot.contractId));
   form.contractId = contract?.id || '';
   form.carrierType = snapshot.carrierType || '承运商';
   contractChange(form.contractId);
   syncCarrierOptions();
+  const carrierOption =
+    form.carrierType === '自运'
+      ? null
+      : carrierOptions.value.find(item => String(item.id) === String(savedCarrierId || '')) ||
+        carrierOptions.value.find(item => item.carrierName === snapshot.carrierName);
   const carrierValue =
-    form.carrierType === '自运' ? snapshot.carrierName : snapshot.carrierContractId;
+    form.carrierType === '自运'
+      ? snapshot.carrierName
+      : snapshot.carrierContractId || carrierOption?.value;
   if (carrierValue) carrierChange(carrierValue);
   await loadBatchRows(snapshot.id);
 };
@@ -1170,6 +1298,12 @@ const carrierChange = value => {
   if (!isSelfOperated.value) form.carrierContractId = item.carrierContractId || '';
 };
 const fileChange = async (file, list) => {
+  if (!projectInfoReady.value) {
+    ElMessage.warning('请先选择项目、客户合同和承运信息，再导入运单明细');
+    files.value = [];
+    form.file = null;
+    return;
+  }
   if (file.raw?.size > 50 * 1024 * 1024) {
     ElMessage.warning('单个文件大小不能超过50M');
     files.value = [];
@@ -1190,7 +1324,7 @@ const fileChange = async (file, list) => {
   const keyMap = {
     originalNo: ['原始单号'],
     loadingIdentifier: ['配载标识号'],
-    vehicleNo: ['车牌号/航班号/船号/班列号'],
+    vehicleNo: ['车牌号/船班号/船次号/班次号', '车牌号/航班号/船号/班列号'],
     transportType: ['运输方式', '运输类型'],
     driverName: ['司机/船长姓名', '司机/船长'],
     driverPhone: ['司机/船长手机号'],
@@ -1227,7 +1361,6 @@ const fileChange = async (file, list) => {
     const text = String(value ?? '').trim();
     return text.slice(0, 10);
   };
-  const count = new Map();
   // 先解析数据，但不填充到 rows.value
   const parsedRows = source.map((item, index) => {
     const row = { _key: `${Date.now()}-${index}`, ...item, batchNo: form.batchNo };
@@ -1241,14 +1374,9 @@ const fileChange = async (file, list) => {
     row.actualEndDate = normalizeImportDate(row.actualEndDate);
     row.planStartDate = normalizeImportDate(row.planStartDate);
     row.planEndDate = normalizeImportDate(row.planEndDate);
-    const duplicateKey = JSON.stringify(Object.keys(keyMap).map(key => row[key]));
-    count.set(duplicateKey, (count.get(duplicateKey) || 0) + 1);
-    row._duplicateKey = duplicateKey;
     return row;
   });
-  parsedRows.forEach(row => {
-    row._duplicate = count.get(row._duplicateKey) > 1;
-  });
+  refreshDuplicateFlags(parsedRows);
 
   // 调用后端校验接口，校验通过才填充表格
   const isValid = await performValidation(parsedRows);
@@ -1268,67 +1396,175 @@ const fileRemove = () => {
   form.file = null;
 };
 
-const performValidation = async (parsedRows) => {
+/** 运单批量导入每次请求最多提交行数，避免网关 body 超限。 */
+const IMPORT_BATCH_SIZE = 100;
+
+const importFieldText = value => String(value ?? '').trim();
+
+/** 同一运单批次号下，全部导入字段一致时标记为疑似重复。已在线确认的行不再标为重复。 */
+const refreshDuplicateFlags = (list = rows.value) => {
+  const groups = new Map();
+  list.forEach(row => {
+    const signature = detailColumns.map(column => importFieldText(row[column.prop])).join('\u0001');
+    const batchNo = importFieldText(row.batchNo || form.batchNo);
+    if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
+      row._duplicateConfirmed = false;
+    }
+    row._duplicateSignature = signature;
+    const groupKey = `${batchNo}\u0002${signature}`;
+    const group = groups.get(groupKey) || [];
+    group.push(row);
+    groups.set(groupKey, group);
+  });
+  groups.forEach(group => {
+    const duplicated = group.length > 1;
+    group.forEach(row => {
+      row._duplicate = duplicated && !row._duplicateConfirmed;
+    });
+  });
+};
+
+const confirmDuplicateRow = row => {
+  row._duplicateConfirmed = true;
+  refreshDuplicateFlags();
+  ElMessage.success('已确认，该行将按正常数据导入');
+};
+
+const stripInternalRowFields = row => {
+  const { _key, _duplicate, _duplicateKey, _duplicateConfirmed, _duplicateSignature, _editing, _editSnapshot, ...data } = row;
+  return data;
+};
+
+/**
+ * 按配载标识号 / 同一运单标识号尽量同组，再按 IMPORT_BATCH_SIZE 切分。
+ * 返回 [{ rows, globalIndexes }]，globalIndexes 与 rows 一一对应。
+ */
+const chunkImportRows = sourceRows => {
+  if (!sourceRows?.length) return [];
+  const groups = [];
+  const groupIndexByKey = new Map();
+  sourceRows.forEach((row, globalIndex) => {
+    const loadingIdentifier = String(row.loadingIdentifier || '').trim();
+    const waybillIdentifier = String(row.waybillIdentifier || '').trim();
+    let groupKey = '';
+    if (loadingIdentifier) groupKey = `L:${loadingIdentifier}`;
+    else if (waybillIdentifier) groupKey = `W:${waybillIdentifier}`;
+    else groupKey = `R:${globalIndex}`;
+    let groupPos = groupIndexByKey.get(groupKey);
+    if (groupPos == null) {
+      groupPos = groups.length;
+      groupIndexByKey.set(groupKey, groupPos);
+      groups.push({ rows: [], globalIndexes: [] });
+    }
+    groups[groupPos].rows.push(row);
+    groups[groupPos].globalIndexes.push(globalIndex);
+  });
+
+  const chunks = [];
+  let current = { rows: [], globalIndexes: [] };
+  const flush = () => {
+    if (!current.rows.length) return;
+    chunks.push(current);
+    current = { rows: [], globalIndexes: [] };
+  };
+  groups.forEach(group => {
+    // 单组超过上限时整组单独成批，保证跨行一致性校验与多货物合并完整。
+    if (group.rows.length > IMPORT_BATCH_SIZE) {
+      flush();
+      chunks.push(group);
+      return;
+    }
+    if (current.rows.length + group.rows.length > IMPORT_BATCH_SIZE) {
+      flush();
+    }
+    current.rows.push(...group.rows);
+    current.globalIndexes.push(...group.globalIndexes);
+  });
+  flush();
+  return chunks;
+};
+
+const downloadImportFailures = async failureRows => {
+  if (!failureRows.length) return;
+  const response = await api.exportImportFailures({
+    rows: failureRows.map(row => stripInternalRowFields(row)),
+  });
+  const blob = response.data || response;
+  downloadXls(blob, `运单导入失败明细_${dayjs().format('YYYYMMDDHHmmss')}.xlsx`);
+};
+
+/** 按每批 100 条请求校验，全部批次结束后再汇总失败行。 */
+const collectImportValidationErrors = async rowList => {
+  const errorMap = new Map();
+  for (const chunk of chunkImportRows(rowList)) {
+    const response = await api.validateImport(buildImportPayload(form.status, chunk.rows));
+    const result = response?.data?.data ?? response?.data ?? response;
+    if (result?.success === false || (Array.isArray(result?.errors) && result.errors.length)) {
+      (result.errors || []).forEach(error => {
+        const localIndex = Number(error.rowIndex);
+        if (Number.isNaN(localIndex) || localIndex < 0 || localIndex >= chunk.globalIndexes.length) {
+          return;
+        }
+        errorMap.set(chunk.globalIndexes[localIndex], error.errorMessage || '校验失败');
+      });
+    }
+  }
+  return errorMap;
+};
+
+const exportCollectedImportFailures = async (rowList, errorMap, exportAll = false) => {
+  const indexedRows = exportAll
+    ? rowList.map((row, globalIndex) => [globalIndex, errorMap.get(globalIndex) || ''])
+    : [...errorMap.entries()].sort((left, right) => left[0] - right[0]);
+  const failureRows = indexedRows.map(([globalIndex, errorMessage]) => ({
+    ...stripInternalRowFields(rowList[globalIndex]),
+    errorMessage,
+  }));
+  await downloadImportFailures(failureRows);
+  ElMessage.warning('数据校验失败，已自动下载错误明细表，请修正后重新上传');
+};
+
+const performValidation = async parsedRows => {
   if (!parsedRows || !parsedRows.length) return false;
 
   try {
-    // 构建校验请求参数
-    const payload = {
-      ...form,
-      rows: parsedRows.map(row => {
-        const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, ...data } = row;
-        return data;
-      })
-    };
+    const chunks = chunkImportRows(parsedRows);
+    const errorMap = new Map();
 
-    // 调用后端校验接口
-    const response = await api.validateImport(payload);
-
-    // 检查响应类型
-    const blob = response.data || response;
-
-    // 如果是 Blob，需要检查其 MIME 类型
-    if (blob instanceof Blob) {
-      // Excel 文件的 MIME 类型
-      if (blob.type.includes('application/vnd.ms-excel') ||
-          blob.type.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
-        // 校验失败，下载错误明细
-        const url = window.URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = url;
-        link.download = `运单导入失败明细_${dayjs().format('YYYYMMDDHHmmss')}.xlsx`;
-        link.click();
-        window.URL.revokeObjectURL(url);
-        ElMessage.warning('数据校验失败，已自动下载错误明细表，请修正后重新上传');
-        return false;
-      } else if (blob.type.includes('application/json')) {
-        // 可能是 JSON 响应被当作 Blob，需要解析
-        const text = await blob.text();
-        const json = JSON.parse(text);
-        if (json.success) {
-          ElMessage.success('数据校验通过');
-          return true;
-        } else {
-          ElMessage.error(json.msg || '校验失败');
-          return false;
-        }
-      } else {
-        // 其他类型，默认认为是校验通过
-        ElMessage.success('数据校验通过');
-        return true;
+    for (const chunk of chunks) {
+      const payload = {
+        ...form,
+        rows: chunk.rows.map(stripInternalRowFields),
+      };
+      const response = await api.validateImport(payload);
+      const result = response?.data?.data ?? response?.data ?? response;
+      if (result?.success === false || (Array.isArray(result?.errors) && result.errors.length)) {
+        (result.errors || []).forEach(error => {
+          const localIndex = Number(error.rowIndex);
+          if (Number.isNaN(localIndex) || localIndex < 0 || localIndex >= chunk.globalIndexes.length) {
+            return;
+          }
+          const globalIndex = chunk.globalIndexes[localIndex];
+          errorMap.set(globalIndex, error.errorMessage || '校验失败');
+        });
       }
-    } else {
-      // 不是 Blob，直接判断
-      ElMessage.success('数据校验通过');
-      return true;
     }
+
+    if (errorMap.size) {
+      await exportCollectedImportFailures(parsedRows, errorMap);
+      return false;
+    }
+
+    ElMessage.success('数据校验通过');
+    return true;
   } catch (error) {
     console.error('校验失败:', error);
-    ElMessage.error('校验接口调用失败');
+    ElMessage.error(error?.message || '校验接口调用失败');
     return false;
   }
 };
-const formatCell = (row, column) => row[column.prop] || '';
+const formatCell = (row, column) =>
+  column.prop === 'transportType' ? transportTypeLabel(row) : row[column.prop] || '';
 const updateEditorValue = (column, row, value) => {
   if (column.editor === 'number') {
     const [integer = '', decimal = ''] = String(value || '')
@@ -1403,6 +1639,7 @@ const editRow = row => {
 const saveRow = row => {
   row._editing = false;
   delete row._editSnapshot;
+  refreshDuplicateFlags();
 };
 const cancelRow = row => {
   if (row._editSnapshot) Object.assign(row, row._editSnapshot);
@@ -1411,11 +1648,13 @@ const cancelRow = row => {
 };
 const deleteRow = row => {
   rows.value = rows.value.filter(item => item !== row);
+  refreshDuplicateFlags();
 };
 const removeSelectedRows = () => {
   const keys = new Set(rowSelection.value.map(row => row._key));
   rows.value = rows.value.filter(row => !keys.has(row._key));
   rowSelection.value = [];
+  refreshDuplicateFlags();
 };
 const firstNotEmpty = (...values) => values.find(value => String(value ?? '').trim()) ?? '';
 const normalizeOptionalImportNumber = (value, emptySentinels = []) => {
@@ -1442,9 +1681,22 @@ const normalizeImportRow = row => ({
     row['*运输方式']
   ),
 });
-const buildImportPayload = (status = form.status) => {
+const normalizeOptionalPlanId = value => {
+  if (value === undefined || value === null || value === '') return null;
+  return Number(value) === -1 || Number(value) <= 0 ? null : value;
+};
+const buildImportPayload = (status = form.status, rowList = rows.value, extra = {}) => {
   const { file, ...batch } = form;
-  return { ...batch, status, rows: rows.value.map(normalizeImportRow) };
+  const planId = normalizeOptionalPlanId(batch.planId);
+  return {
+    ...batch,
+    planId,
+    // 未选计划时不带占位名称，避免落库/回显 -1
+    planName: planId ? batch.planName || undefined : null,
+    status,
+    rows: rowList.map(normalizeImportRow).map(stripInternalRowFields),
+    ...extra,
+  };
 };
 // 独立页面下返回批次列表路由，弹窗形态下关闭新建面板并刷新列表。
 const backToList = () => {
@@ -1454,22 +1706,72 @@ const backToList = () => {
 // 保存草稿：批次与已解析明细一并入库，成功后返回批次列表。
 const saveDraft = async () => {
   await formRef.value?.validateField(draftRequiredFields);
-  await api.saveImportDraft(buildImportPayload('draft'));
+  const chunks = chunkImportRows(rows.value);
+  if (!chunks.length) {
+    ElMessage.warning('请上传至少一条运单明细');
+    return;
+  }
+  // 草稿编辑时首批带原 id 覆盖；后续批 append，避免整包超限。
+  let batchId = form.id || '';
+  for (let i = 0; i < chunks.length; i++) {
+    const append = i > 0;
+    const payload = buildImportPayload('draft', chunks[i].rows, {
+      id: append ? batchId : batchId || undefined,
+      append,
+    });
+    const response = await api.saveImportDraft(payload);
+    const batch = response?.data?.data ?? response?.data ?? response;
+    batchId = batch?.id || batchId;
+  }
+  if (batchId) form.id = batchId;
   ElMessage.success('保存草稿成功');
   backToList();
 };
 const confirmImport = async () => {
-  // 导入状态选择草稿时不生成正式运单，等同于保存草稿。
-  if (form.status === 'draft') return saveDraft();
   await formRef.value?.validate();
   if (!validateImportRows()) return;
   const count = rows.value.filter(row => row._duplicate).length;
-  if (count) await ElMessageBox.confirm(`当前导入有${count}条重复数据，是否确认导入？`, '提示');
-  if (form.importType === 'settlement')
+  if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
+  if (form.importType === 'settlement' && form.status === 'completed')
     await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');
-  await api.confirmImport(buildImportPayload());
-  ElMessage.success('导入成功');
-  backToList();
+
+  const chunks = chunkImportRows(rows.value);
+  let errorMap;
+  try {
+    errorMap = await collectImportValidationErrors(rows.value);
+  } catch (error) {
+    console.error('校验失败:', error);
+    ElMessage.error(error?.message || '校验接口调用失败');
+    return;
+  }
+  if (errorMap.size) {
+    await exportCollectedImportFailures(rows.value, errorMap, true);
+    return;
+  }
+  // 校验全部通过后才分批落库，避免前面批次已入库、后面批次校验失败。
+  const draftBatchId = form.id || '';
+  let batchId = '';
+  try {
+    for (let i = 0; i < chunks.length; i++) {
+      const append = i > 0;
+      const payload = buildImportPayload(form.status, chunks[i].rows, {
+        id: append ? batchId : draftBatchId || undefined,
+        append,
+      });
+      const response = await api.confirmImport(payload);
+      const batch = response?.data?.data ?? response?.data ?? response;
+      batchId = batch?.id || batchId;
+    }
+    ElMessage.success('导入成功');
+    backToList();
+  } catch (error) {
+    console.error('确认导入失败:', error);
+    ElMessage.error(
+      batchId
+        ? `部分数据可能已导入（批次已创建），请到批次详情核对后重试：${error?.message || '导入失败'}`
+        : error?.message || '导入失败'
+    );
+  }
 };
 </script>
 
@@ -1562,6 +1864,15 @@ const confirmImport = async () => {
   &__detail-panel {
     margin-top: 12px;
   }
+  &__import-title {
+    margin-top: 8px;
+  }
+  &__import-hint {
+    margin: 0 0 12px;
+    color: #909399;
+    font-size: 13px;
+    line-height: 20px;
+  }
   &__form-actions {
     display: flex;
     justify-content: flex-end;
@@ -1574,6 +1885,14 @@ const confirmImport = async () => {
     gap: 24px;
     margin-bottom: 8px;
   }
+  &__row-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+  :deep(.is-duplicate-row > td.el-table__cell) {
+    background: #fff7e8;
+  }
   &__file-tip {
     margin: 0 24px;
     color: #606266;

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="是否范本">
@@ -189,10 +189,11 @@
         title="合同文件"
         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 +219,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>
@@ -256,11 +257,12 @@
         title="其它附件"
         description
         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">
@@ -281,11 +283,12 @@
         title="变更材料"
         description
         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 +346,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 +432,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 +491,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 +653,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,8 +677,8 @@ 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; },
-    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(); },
+    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', bizId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected' }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
 </script>
@@ -654,6 +702,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; }

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>

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="是否范本">
@@ -592,12 +592,13 @@
           title="合同文件"
           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 +647,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 +656,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>
@@ -811,12 +812,13 @@
           title="其它附件"
           description
           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
@@ -921,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 || '附件预览'"
@@ -962,44 +979,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"
@@ -1027,16 +1010,18 @@ 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';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { config, option } from '@/option/business/contract-manage';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } 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,
@@ -1049,6 +1034,11 @@ import { fallbackPlugin, imagePlugin, officePlugin, textPlugin } from '@open-fil
 import '@open-file-viewer/core/style.css';
 import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 
+const contractManageListRoute = '/business/contract-manage';
+const contractManageFormRoute = '/business/contract-manage/form';
+const contractManageDetailRoute = '/business/contract-manage/detail';
+const contractManageListRefreshKey = 'contract-manage-list-refresh';
+
 const clone = value => JSON.parse(JSON.stringify(value));
 const normalizeOptionalInteger = (value, emptyValue = null) => {
   if (value === undefined || value === null || value === '' || Number(value) < 0) {
@@ -1058,7 +1048,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 +1098,7 @@ const defaultForm = () => ({
   settlementCurrency: '',
   invoiceCycle: '',
   paymentDays: '',
-  contractAmount: '',
+  contractAmount: null,
   templateFlag: 0,
   originalContractNo: '',
   electronicSealFlag: 0,
@@ -1181,7 +1179,14 @@ const attachmentViewerPlugins = [
 
 export default {
   name: 'ContractManage',
-  components: { ContractAttachmentSection, BillingPlanEditor, ElImageViewer, OpenFileViewer, PdfPreview },
+  components: {
+    ContractAttachmentSection,
+    BillingPlanEditor,
+    ChangeRecordDetailDialog,
+    ElImageViewer,
+    OpenFileViewer,
+    PdfPreview,
+  },
   data() {
     return {
       api,
@@ -1249,6 +1254,9 @@ export default {
       organizationLoading: false,
       contractFileRows: [],
       attachmentRows: [],
+      listUploadContractFileRows: [],
+      listUploadAttachmentRows: [],
+      attachmentUploadFromList: false,
       attachmentImagePreviewVisible: false,
       attachmentImagePreviewUrls: [],
       attachmentImagePreviewIndex: 0,
@@ -1272,7 +1280,7 @@ export default {
       formalSettlementRuleForm: defaultSettlementRule(),
       paymentRatioRows: [],
       changeRecordRows: [],
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['现结', '日结', '周结', '月结', '按固定天数周期'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       detailLoading: false,
       detailRow: {},
@@ -1293,6 +1301,9 @@ export default {
       flowBox: false,
       flowUrl: '',
       processInstanceId: '',
+      // 页面形态在实例创建时锁定，避免 keep-alive 缓存后随全局 $route 翻转
+      formPageLocked: false,
+      detailPageLocked: false,
     };
   },
   computed: {
@@ -1301,22 +1312,22 @@ export default {
       return { addBtn: this.canCreate };
     },
     isAdmin() {
-      const authority = this.userInfo?.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     canCreate() {
       return this.hasPermission(`${this.config.permission}_add`);
     },
     isListPage() {
-      return !this.isFormPage && !this.isDetailPage;
+      return !this.formPageLocked && !this.detailPageLocked && !this.isPublicViewPage;
     },
     isFormPage() {
-      return this.$route.path === '/business/contract-manage/form';
+      return this.formPageLocked;
     },
     isDetailPage() {
-      return this.$route.path === '/business/contract-manage/detail';
+      return this.detailPageLocked || this.isPublicViewPage;
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/business/contract-manage/public-view';
     },
     formMode() {
       return this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -1331,6 +1342,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 +1440,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) => ({
@@ -1459,9 +1487,21 @@ export default {
     },
   },
   watch: {
-    '$route.fullPath'() {
-      if (this.isFormPage) this.initFormPage();
-      if (this.isDetailPage) this.initDetailPage();
+    $route(to, from) {
+      if (this.isListPage) {
+        if (
+          to.path === contractManageListRoute &&
+          (from?.path?.includes('/contract-manage/form') ||
+            from?.path?.includes('/contract-manage/detail') ||
+            from?.path?.includes('/contract-manage/change'))
+        ) {
+          sessionStorage.removeItem(contractManageListRefreshKey);
+          this.onLoad(this.page, this.query);
+        }
+        return;
+      }
+      if (this.formPageLocked && to.path === contractManageFormRoute) this.initFormPage();
+      if (this.detailPageLocked && to.path === contractManageDetailRoute) this.initDetailPage();
     },
     settlementConfigTab(tab, oldTab) {
       if (tab === oldTab) return;
@@ -1473,13 +1513,28 @@ export default {
     },
   },
   created() {
-    this.loadProjectOptions();
-    this.loadSettlementDictionaries();
-    this.loadOrganizationOptions();
+    this.formPageLocked = this.$route.path === contractManageFormRoute;
+    this.detailPageLocked =
+      this.$route.path === contractManageDetailRoute || this.isPublicViewPage;
+    if (!this.isPublicViewPage) {
+      this.loadProjectOptions();
+      this.loadSettlementDictionaries();
+      this.loadOrganizationOptions();
+    }
     if (this.isFormPage) this.initFormPage();
     if (this.isDetailPage) this.initDetailPage();
   },
+  activated() {
+    if (!this.isListPage) return;
+    if (sessionStorage.getItem(contractManageListRefreshKey)) {
+      sessionStorage.removeItem(contractManageListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
   methods: {
+    markContractManageListNeedRefresh() {
+      sessionStorage.setItem(contractManageListRefreshKey, '1');
+    },
     buildTableOption() {
       return {
         ...option,
@@ -1552,7 +1607,7 @@ export default {
       });
     },
     normalizeSearch(params = {}) {
-      const query = { ...params };
+      const query = { ...params, allDept: this.isAdmin ? 1 : 0 };
       if (query.organizationName) {
         const id = Array.isArray(query.organizationName)
           ? query.organizationName.at(-1)
@@ -1621,7 +1676,7 @@ export default {
     },
     openForm(mode, row = {}) {
       this.$router.push({
-        path: '/business/contract-manage/form',
+        path: contractManageFormRoute,
         query:
           mode === 'edit'
             ? { mode, id: row.id, name: '编辑合同管理' }
@@ -1675,7 +1730,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'),
@@ -1714,8 +1769,9 @@ export default {
       this.$nextTick(() => this.$refs.contractForm?.clearValidate());
     },
     closeForm() {
+      this.markContractManageListNeedRefresh();
       this.$router.$avueRouter?.closeTag?.();
-      this.$router.push('/business/contract-manage');
+      this.$router.push(contractManageListRoute);
     },
     validateBase(action) {
       if (action === 'temporary') {
@@ -1813,6 +1869,7 @@ export default {
     submitCreate(action) {
       if (this.submitAction || !this.validateBase(action)) return;
       this.submitAction = action;
+      const previousApprovalStatus = this.form.approvalStatus || '';
       const submit = {
         ...this.normalizeSubmit(),
         contractStage: action === 'formal' ? 'temporary' : 'draft',
@@ -1831,9 +1888,9 @@ export default {
             ).then(() =>
               submitMkApprovalFlow({
                 bizType: 'contract-manage',
-                formInstanceId: id,
+                bizId: id,
                 subjectName: saved.contractName || submit.contractName || '',
-                approvalStatus: saved.approvalStatus || submit.approvalStatus || '',
+                approvalStatus: previousApprovalStatus || saved.approvalStatus || submit.approvalStatus || '',
               })
             );
           }
@@ -1869,7 +1926,7 @@ export default {
           }
           return submitMkApprovalFlow({
             bizType: 'contract-manage',
-            formInstanceId: payload.id || this.form.id,
+            bizId: payload.id || this.form.id,
             subjectName: payload.contractName || this.form.contractName || '',
             approvalStatus: this.form.approvalStatus || 'change_rejected',
           }).then(() => {
@@ -1888,20 +1945,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;
@@ -2118,6 +2241,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 +2278,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 +2346,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 +2366,7 @@ export default {
       } else {
         next.customPeriods = [];
       }
-      if (next.settlementType !== '固定天数周期结算') next.cycleDays = '';
+      if (!this.isFixedCycleSettlementType(next.settlementType)) next.cycleDays = '';
       return next;
     },
     syncSettlementConfig() {
@@ -2245,7 +2389,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 +2480,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 +2498,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 +2550,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 || {});
         })
@@ -2416,8 +2562,9 @@ export default {
         });
     },
     closeDetail() {
+      this.markContractManageListNeedRefresh();
       this.$router.$avueRouter?.closeTag?.();
-      this.$router.push('/business/contract-manage');
+      this.$router.push(contractManageListRoute);
     },
     applyDetailState(detail = {}) {
       this.detailRow = {
@@ -2576,7 +2723,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 +2819,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' ||
@@ -2706,15 +2862,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 => {
@@ -2725,7 +2873,7 @@ export default {
             ? request().then(() =>
                 submitMkApprovalFlow({
                   bizType: 'contract-manage',
-                  formInstanceId: row.id,
+                  bizId: row.id,
                   subjectName: row.contractName || '',
                   approvalStatus: row.approvalStatus || '',
                 })
@@ -2759,7 +2907,7 @@ export default {
     },
     handleCopy(row) {
       this.$router.push({
-        path: '/business/contract-manage/form',
+        path: contractManageFormRoute,
         query: { mode: 'add', copyId: row.id, name: '新增合同管理' },
       });
     },
@@ -2900,25 +3048,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;
 }
@@ -2954,6 +3083,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;
@@ -3018,13 +3151,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 +3208,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%;

src/views/business/master-order.vue

@@ -70,6 +70,8 @@
               <p class="project-name">{{ row.projectName || '-' }}</p>
               <p>{{ timeRange(row) }}</p>
               <p>{{ goodsSummary(row) }}</p>
+              <p>创建人：{{ row.createUserName || '-' }}</p>
+              <p>创建时间：{{ row.createTime || '-' }}</p>
             </section>
             <section class="route-progress">
               <div class="route-track">
@@ -132,7 +134,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 +155,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 +186,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 +205,7 @@ export default {
     '$route.query': {
       immediate: true,
       handler() {
+        if (!this.isOwnedRoute) return;
         this.syncTagTitle();
         if (this.mode === 'list') this.load();
       },

src/views/business/process-config.vue

@@ -416,7 +416,7 @@ import { getList as getProjectList } from '@/api/business/project-apply';
 import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { config, option } from '@/option/business/process-config';
-import { getToken } from '@/utils/auth';
+import { getToken, isAdministrator } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
 import { mapGetters } from 'vuex';
 import NProgress from 'nprogress';
@@ -524,10 +524,7 @@ export default {
       };
     },
     isAdmin() {
-      const authority = this.userInfo && this.userInfo.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     ids() {
       return this.selectionList.map(item => item.id).join(',');
@@ -696,7 +693,7 @@ export default {
       return getProjectList(1, 50, {
         projectName: keyword,
         approvalStatus: 'approved',
-        allDept: 0,
+        allDept: this.isAdmin ? 1 : 0,
       })
         .then(res => {
           const data = res.data.data || {};