Merge remote-tracking branch 'websoft/dev'

✨ 角色管理列表接入分页
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-06 09:36:51 +08:00 · 2026-11-06 09:32:50 +08:00 · 2026-11-06 09:32:36 +08:00 · 2026-11-05 15:09:16 +08:00 · 2026-11-05 15:04:42 +08:00 · 2026-11-05 15:01:28 +08:00
119 changed files with 9591 additions and 19269 deletions
@@ -2,6 +2,7 @@
 node_modules
 pnpm-lock.yaml
 /dist
+/dist.zip

 /tests/e2e/videos/
 /tests/e2e/screenshots/
@@ -4,10 +4,11 @@
  "scripts": {
    "dev": "vite --host",
    "prod": "vite --mode production",
-    "build": "vite build",
-    "build:prod": "vite build --mode production",
+    "build": "vite build && node scripts/zip-dist.mjs",
+    "build:prod": "vite build --mode production && node scripts/zip-dist.mjs",
+    "zip:dist": "node scripts/zip-dist.mjs",
    "serve": "vite preview --host",
-    "typecheck": "vue-tsc --noEmit"
+    "typecheck": "vue-tsc -p jsconfig.json --noEmit"
  },
  "dependencies": {
    "@element-plus/icons-vue": "^2.3.1",
@@ -48,7 +49,7 @@
    "prettier": "^2.8.7",
    "sass": "^1.85.1",
    "terser": "^5.31.1",
-    "typescript": "^7.0.2",
+    "typescript": "5.9.3",
    "unplugin-auto-import": "^0.11.2",
    "vite": "^5.4.19",
    "vite-plugin-compression": "^0.5.1",
@@ -13,31 +13,31 @@ importers:
    dependencies:
      '@element-plus/icons-vue':
        specifier: ^2.3.1
-        version: 2.3.2(vue@3.5.34(typescript@7.0.2))
+        version: 2.3.2(vue@3.5.34(typescript@5.9.3))
      '@open-file-viewer/core':
        specifier: ^0.1.27
        version: 0.1.27(pdfjs-dist@6.1.200)
      '@open-file-viewer/vue':
        specifier: ^0.1.27
-        version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@7.0.2))
+        version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@5.9.3))
      '@saber/nf-design-base-elp':
        specifier: ^1.3.0
        version: 1.3.0
      '@saber/nf-form-design-elp':
        specifier: ^1.6.1
-        version: 1.6.1(vue@3.5.34(typescript@7.0.2))
+        version: 1.6.1(vue@3.5.34(typescript@5.9.3))
      '@saber/nf-form-elp':
        specifier: ^1.6.3
        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(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))
+        version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))
      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(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@7.0.2))
+        version: 1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@5.9.3))
      axios:
        specifier: ^1.13.5
        version: 1.16.0(debug@4.4.3(supports-color@7.2.0))
@@ -58,7 +58,7 @@ importers:
        version: 6.1.0
      element-plus:
        specifier: ^2.14.2
-        version: 2.14.2(vue@3.5.34(typescript@7.0.2))
+        version: 2.14.2(vue@3.5.34(typescript@5.9.3))
      exceljs:
        specifier: ^4.4.0
        version: 4.4.0
@@ -85,29 +85,29 @@ importers:
        version: 0.4.0
      vue:
        specifier: ^3.5.13
-        version: 3.5.34(typescript@7.0.2)
+        version: 3.5.34(typescript@5.9.3)
      vue-i18n:
        specifier: ^11.4.2
-        version: 11.4.2(vue@3.5.34(typescript@7.0.2))
+        version: 11.4.2(vue@3.5.34(typescript@5.9.3))
      vue-pdf-embed:
        specifier: ^2.1.6
-        version: 2.1.6(vue@3.5.34(typescript@7.0.2))
+        version: 2.1.6(vue@3.5.34(typescript@5.9.3))
      vue-router:
        specifier: ^4.3.2
-        version: 4.6.4(vue@3.5.34(typescript@7.0.2))
+        version: 4.6.4(vue@3.5.34(typescript@5.9.3))
      vue3-clipboard:
        specifier: ^1.0.0
-        version: 1.0.0(vue@3.5.34(typescript@7.0.2))
+        version: 1.0.0(vue@3.5.34(typescript@5.9.3))
      vuex:
        specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.34(typescript@7.0.2))
+        version: 4.1.0(vue@3.5.34(typescript@5.9.3))
      xlsx:
        specifier: 0.18.5
        version: 0.18.5
    devDependencies:
      '@vitejs/plugin-vue':
        specifier: ^5.2.4
-        version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@7.0.2))
+        version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@5.9.3))
      '@vue/compiler-sfc':
        specifier: ^3.4.27
        version: 3.5.34
@@ -121,11 +121,11 @@ importers:
        specifier: ^5.31.1
        version: 5.46.2
      typescript:
-        specifier: ^7.0.2
-        version: 7.0.2
+        specifier: 5.9.3
+        version: 5.9.3
      unplugin-auto-import:
        specifier: ^0.11.2
-        version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2)))(rollup@4.60.3)
+        version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3)))(rollup@4.60.3)
      vite:
        specifier: ^5.4.19
        version: 5.4.21(sass@1.99.0)(terser@5.46.2)
@@ -137,7 +137,7 @@ importers:
        version: 0.4.0(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
      vue-tsc:
        specifier: ^3.3.11
-        version: 3.3.13(typescript@7.0.2)
+        version: 3.3.13(typescript@5.9.3)

 packages:

@@ -771,126 +771,6 @@ packages:
  '@types/web-bluetooth@0.0.21':
    resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}

-  '@typescript/typescript-aix-ppc64@7.0.2':
-    resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@typescript/typescript-darwin-arm64@7.0.2':
-    resolution: {integrity: sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@typescript/typescript-darwin-x64@7.0.2':
-    resolution: {integrity: sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@typescript/typescript-freebsd-arm64@7.0.2':
-    resolution: {integrity: sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@typescript/typescript-freebsd-x64@7.0.2':
-    resolution: {integrity: sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@typescript/typescript-linux-arm64@7.0.2':
-    resolution: {integrity: sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@typescript/typescript-linux-arm@7.0.2':
-    resolution: {integrity: sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm]
-    os: [linux]
-
-  '@typescript/typescript-linux-loong64@7.0.2':
-    resolution: {integrity: sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@typescript/typescript-linux-mips64el@7.0.2':
-    resolution: {integrity: sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==}
-    engines: {node: '>=16.20.0'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@typescript/typescript-linux-ppc64@7.0.2':
-    resolution: {integrity: sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==}
-    engines: {node: '>=16.20.0'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@typescript/typescript-linux-riscv64@7.0.2':
-    resolution: {integrity: sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@typescript/typescript-linux-s390x@7.0.2':
-    resolution: {integrity: sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==}
-    engines: {node: '>=16.20.0'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@typescript/typescript-linux-x64@7.0.2':
-    resolution: {integrity: sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [linux]
-
-  '@typescript/typescript-netbsd-arm64@7.0.2':
-    resolution: {integrity: sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm64]
-    os: [netbsd]
-
-  '@typescript/typescript-netbsd-x64@7.0.2':
-    resolution: {integrity: sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@typescript/typescript-openbsd-arm64@7.0.2':
-    resolution: {integrity: sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm64]
-    os: [openbsd]
-
-  '@typescript/typescript-openbsd-x64@7.0.2':
-    resolution: {integrity: sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@typescript/typescript-sunos-x64@7.0.2':
-    resolution: {integrity: sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@typescript/typescript-win32-arm64@7.0.2':
-    resolution: {integrity: sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==}
-    engines: {node: '>=16.20.0'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@typescript/typescript-win32-x64@7.0.2':
-    resolution: {integrity: sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==}
-    engines: {node: '>=16.20.0'}
-    cpu: [x64]
-    os: [win32]
-
  '@uppy/companion-client@2.2.2':
    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}

@@ -2194,9 +2074,9 @@ packages:
  typedarray@0.0.6:
    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}

-  typescript@7.0.2:
-    resolution: {integrity: sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==}
-    engines: {node: '>=16.20.0'}
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
    hasBin: true

  ufo@1.6.4:
@@ -2408,9 +2288,9 @@ snapshots:

  '@ctrl/tinycolor@4.2.0': {}

-  '@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2))':
+  '@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3))':
    dependencies:
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  '@esbuild/aix-ppc64@0.21.5':
    optional: true
@@ -2651,10 +2531,10 @@ snapshots:
    transitivePeerDependencies:
      - geotiff

-  '@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@7.0.2))':
+  '@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@5.9.3))':
    dependencies:
      '@open-file-viewer/core': 0.1.27(pdfjs-dist@6.1.200)
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  '@parcel/watcher-android-arm64@2.5.6':
    optional: true
@@ -2806,9 +2686,9 @@ snapshots:
      codemirror: 5.65.21
      randomcolor: 0.6.2

-  '@saber/nf-form-design-elp@1.6.1(vue@3.5.34(typescript@7.0.2))':
+  '@saber/nf-form-design-elp@1.6.1(vue@3.5.34(typescript@5.9.3))':
    dependencies:
-      vuedraggable: 4.1.0(vue@3.5.34(typescript@7.0.2))
+      vuedraggable: 4.1.0(vue@3.5.34(typescript@5.9.3))
    transitivePeerDependencies:
      - vue

@@ -2820,16 +2700,16 @@ 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(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))':
+  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))':
    dependencies:
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
      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(typescript@7.0.2))
+      element-plus: 2.14.2(vue@3.5.34(typescript@5.9.3))
      lodash: 4.18.1
      lodash-es: 4.18.1
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)
    transitivePeerDependencies:
      - debug

@@ -2856,66 +2736,6 @@ snapshots:

  '@types/web-bluetooth@0.0.21': {}

-  '@typescript/typescript-aix-ppc64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-darwin-arm64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-darwin-x64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-freebsd-arm64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-freebsd-x64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-arm64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-arm@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-loong64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-mips64el@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-ppc64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-riscv64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-s390x@7.0.2':
-    optional: true
-
-  '@typescript/typescript-linux-x64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-netbsd-arm64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-netbsd-x64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-openbsd-arm64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-openbsd-x64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-sunos-x64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-win32-arm64@7.0.2':
-    optional: true
-
-  '@typescript/typescript-win32-x64@7.0.2':
-    optional: true
-
  '@uppy/companion-client@2.2.2':
    dependencies:
      '@uppy/utils': 4.1.3
@@ -2945,10 +2765,10 @@ snapshots:
      '@uppy/utils': 4.1.3
      nanoid: 3.3.12

-  '@vitejs/plugin-vue@5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@7.0.2))':
+  '@vitejs/plugin-vue@5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@5.9.3))':
    dependencies:
      vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  '@volar/language-core@2.4.28':
    dependencies:
@@ -2956,13 +2776,13 @@ snapshots:

  '@volar/source-map@2.4.28': {}

-  '@volar/typescript@2.4.28(typescript@7.0.2)':
+  '@volar/typescript@2.4.28(typescript@5.9.3)':
    dependencies:
      '@volar/language-core': 2.4.28
      path-browserify: 1.0.1
      vscode-uri: 3.2.0
    optionalDependencies:
-      typescript: 7.0.2
+      typescript: 5.9.3

  '@vue/compiler-core@3.5.34':
    dependencies:
@@ -3022,51 +2842,51 @@ snapshots:
      '@vue/shared': 3.5.34
      csstype: 3.2.3

-  '@vue/server-renderer@3.5.34(vue@3.5.34(typescript@7.0.2))':
+  '@vue/server-renderer@3.5.34(vue@3.5.34(typescript@5.9.3))':
    dependencies:
      '@vue/compiler-ssr': 3.5.34
      '@vue/shared': 3.5.34
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  '@vue/shared@3.5.34': {}

-  '@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2))':
+  '@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3))':
    dependencies:
      '@types/web-bluetooth': 0.0.21
      '@vueuse/metadata': 14.3.0
-      '@vueuse/shared': 14.3.0(vue@3.5.34(typescript@7.0.2))
-      vue: 3.5.34(typescript@7.0.2)
+      '@vueuse/shared': 14.3.0(vue@3.5.34(typescript@5.9.3))
+      vue: 3.5.34(typescript@5.9.3)

  '@vueuse/metadata@14.3.0': {}

-  '@vueuse/shared@14.3.0(vue@3.5.34(typescript@7.0.2))':
+  '@vueuse/shared@14.3.0(vue@3.5.34(typescript@5.9.3))':
    dependencies:
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.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/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)':
    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@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      dom7: 3.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
      is-url: 1.2.4
      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/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)':
    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@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
      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@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)':
    dependencies:
      '@types/event-emitter': 0.3.5
      '@uppy/core': 2.3.4
      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      dom7: 3.0.0
+      dom7: 4.0.6
      event-emitter: 0.3.5
      html-void-elements: 3.0.0
      i18next: 23.16.8
@@ -3087,13 +2907,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@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)
+      '@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/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@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)
+      '@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)
      dom7: 4.0.6
      is-hotkey: 0.2.0
      lodash.camelcase: 4.3.0
@@ -3106,16 +2926,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@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/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)':
    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@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
      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/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)':
    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@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.debounce: 4.0.8
      lodash.throttle: 4.1.1
@@ -3123,22 +2943,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@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/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)':
    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@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)
+      '@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@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)':
+  '@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)':
    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@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
      nanoid: 5.1.11
      slate: 0.123.0
@@ -3185,10 +3005,10 @@ snapshots:
      slate-history: 0.66.0(slate@0.72.8)
      snabbdom: 3.6.3

-  '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@7.0.2))':
+  '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@5.9.3))':
    dependencies:
      '@wangeditor/editor': 5.1.23
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  '@wangeditor/editor@5.1.23':
    dependencies:
@@ -3317,12 +3137,12 @@ snapshots:

  asynckit@0.4.0: {}

-  avue-plugin-ueditor@1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@7.0.2)):
+  avue-plugin-ueditor@1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      '@wangeditor/editor': 5.1.23
-      '@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@7.0.2))
+      '@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@5.9.3))
      axios: 1.16.0(debug@4.4.3(supports-color@7.2.0))
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  axios@0.21.4(debug@4.4.3(supports-color@7.2.0)):
    dependencies:
@@ -3575,15 +3395,15 @@ snapshots:
      tslib: 2.3.0
      zrender: 6.1.0

-  element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)):
+  element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      '@ctrl/tinycolor': 4.2.0
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
      '@floating-ui/dom': 1.7.6
      '@popperjs/core': '@sxzz/popperjs-es@2.11.8'
      '@types/lodash': 4.17.24
      '@types/lodash-es': 4.17.12
-      '@vueuse/core': 14.3.0(vue@3.5.34(typescript@7.0.2))
+      '@vueuse/core': 14.3.0(vue@3.5.34(typescript@5.9.3))
      async-validator: 4.2.5
      dayjs: 1.11.20
      lodash: 4.18.1
@@ -3591,7 +3411,7 @@ snapshots:
      lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.18.1)(lodash@4.18.1)
      memoize-one: 6.0.0
      normalize-wheel-es: 1.2.0
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)
      vue-component-type-helpers: 3.3.6

  end-of-stream@1.4.5:
@@ -4352,28 +4172,7 @@ snapshots:

  typedarray@0.0.6: {}

-  typescript@7.0.2:
-    optionalDependencies:
-      '@typescript/typescript-aix-ppc64': 7.0.2
-      '@typescript/typescript-darwin-arm64': 7.0.2
-      '@typescript/typescript-darwin-x64': 7.0.2
-      '@typescript/typescript-freebsd-arm64': 7.0.2
-      '@typescript/typescript-freebsd-x64': 7.0.2
-      '@typescript/typescript-linux-arm': 7.0.2
-      '@typescript/typescript-linux-arm64': 7.0.2
-      '@typescript/typescript-linux-loong64': 7.0.2
-      '@typescript/typescript-linux-mips64el': 7.0.2
-      '@typescript/typescript-linux-ppc64': 7.0.2
-      '@typescript/typescript-linux-riscv64': 7.0.2
-      '@typescript/typescript-linux-s390x': 7.0.2
-      '@typescript/typescript-linux-x64': 7.0.2
-      '@typescript/typescript-netbsd-arm64': 7.0.2
-      '@typescript/typescript-netbsd-x64': 7.0.2
-      '@typescript/typescript-openbsd-arm64': 7.0.2
-      '@typescript/typescript-openbsd-x64': 7.0.2
-      '@typescript/typescript-sunos-x64': 7.0.2
-      '@typescript/typescript-win32-arm64': 7.0.2
-      '@typescript/typescript-win32-x64': 7.0.2
+  typescript@5.9.3: {}

  ufo@1.6.4: {}

@@ -4397,7 +4196,7 @@ snapshots:

  universalify@2.0.1: {}

-  unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2)))(rollup@4.60.3):
+  unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3)))(rollup@4.60.3):
    dependencies:
      '@antfu/utils': 0.7.10
      '@rollup/pluginutils': 5.3.0(rollup@4.60.3)
@@ -4406,7 +4205,7 @@ snapshots:
      unimport: 1.3.0(rollup@4.60.3)
      unplugin: 1.16.1
    optionalDependencies:
-      '@vueuse/core': 14.3.0(vue@3.5.34(typescript@7.0.2))
+      '@vueuse/core': 14.3.0(vue@3.5.34(typescript@5.9.3))
    transitivePeerDependencies:
      - rollup

@@ -4465,54 +4264,54 @@ snapshots:

  vue-component-type-helpers@3.3.6: {}

-  vue-i18n@11.4.2(vue@3.5.34(typescript@7.0.2)):
+  vue-i18n@11.4.2(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      '@intlify/core-base': 11.4.2
      '@intlify/devtools-types': 11.4.2
      '@intlify/shared': 11.4.2
      '@vue/devtools-api': 6.6.4
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

-  vue-pdf-embed@2.1.6(vue@3.5.34(typescript@7.0.2)):
+  vue-pdf-embed@2.1.6(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      pdfjs-dist: 6.2.108
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

-  vue-router@4.6.4(vue@3.5.34(typescript@7.0.2)):
+  vue-router@4.6.4(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      '@vue/devtools-api': 6.6.4
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

-  vue-tsc@3.3.13(typescript@7.0.2):
+  vue-tsc@3.3.13(typescript@5.9.3):
    dependencies:
-      '@volar/typescript': 2.4.28(typescript@7.0.2)
+      '@volar/typescript': 2.4.28(typescript@5.9.3)
      '@vue/language-core': 3.3.13
-      typescript: 7.0.2
+      typescript: 5.9.3

-  vue3-clipboard@1.0.0(vue@3.5.34(typescript@7.0.2)):
+  vue3-clipboard@1.0.0(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      clipboard: 2.0.11
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

-  vue@3.5.34(typescript@7.0.2):
+  vue@3.5.34(typescript@5.9.3):
    dependencies:
      '@vue/compiler-dom': 3.5.34
      '@vue/compiler-sfc': 3.5.34
      '@vue/runtime-dom': 3.5.34
-      '@vue/server-renderer': 3.5.34(vue@3.5.34(typescript@7.0.2))
+      '@vue/server-renderer': 3.5.34(vue@3.5.34(typescript@5.9.3))
      '@vue/shared': 3.5.34
    optionalDependencies:
-      typescript: 7.0.2
+      typescript: 5.9.3

-  vuedraggable@4.1.0(vue@3.5.34(typescript@7.0.2)):
+  vuedraggable@4.1.0(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      sortablejs: 1.14.0
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

-  vuex@4.1.0(vue@3.5.34(typescript@7.0.2)):
+  vuex@4.1.0(vue@3.5.34(typescript@5.9.3)):
    dependencies:
      '@vue/devtools-api': 6.6.4
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

  webpack-virtual-modules@0.6.2: {}

@@ -0,0 +1,25 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync, rmSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+const root = process.cwd();
+const distDir = resolve(root, 'dist');
+const zipPath = resolve(root, 'dist.zip');
+
+if (!existsSync(distDir) || !statSync(distDir).isDirectory()) {
+  console.error('[zip-dist] dist 目录不存在，请先完成构建');
+  process.exit(1);
+}
+
+if (existsSync(zipPath)) {
+  rmSync(zipPath);
+}
+
+// 压缩 dist 内文件到根级（解压即 index.html / assets，便于直接上传部署）
+execFileSync('zip', ['-qr', zipPath, '.', '-x', '*.DS_Store', '-x', '__MACOSX/*'], {
+  cwd: distDir,
+  stdio: 'inherit',
+});
+
+const sizeMb = (statSync(zipPath).size / (1024 * 1024)).toFixed(2);
+console.log(`[zip-dist] 已生成 ${zipPath}（${sizeMb} MB）`);
@@ -0,0 +1,61 @@
+import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/contract-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromContract = (contractId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-contract`,
+    method: 'post',
+    params: { contractId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+    timeout: APPROVE_TIMEOUT,
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });
+
+export const markSyncStatus = (ids, syncStatus) =>
+  request({
+    url: `${baseUrl}/mark-sync-status`,
+    method: 'post',
+    params: { ids, syncStatus },
+  });
@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';

 const baseUrl = '/blade-transport/contract-manage';
@@ -36,8 +37,7 @@ export const approve = id =>
    url: `${baseUrl}/approve`,
    method: 'post',
    params: { id },
-    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
-    timeout: 120000,
+    timeout: APPROVE_TIMEOUT,
  });

 export const reject = id =>
@@ -93,10 +93,10 @@ export const expireStats = params =>
    params,
  });

-/** 按合同负责部门预览下一合同编号 */
-export const nextContractNo = organizationId =>
+/** 按平台公司 + 业务部门预览下一合同编号 */
+export const nextContractNo = (organizationId, platformCompanyId) =>
  request({
    url: `${baseUrl}/next-contract-no`,
    method: 'get',
-    params: { organizationId },
+    params: { organizationId, platformCompanyId },
  });
@@ -2,6 +2,43 @@ import request from '@/axios';

 const baseUrl = '/blade-transport/hcs';

+/** 进程内缓存，避免列表页重复请求推送开关 */
+let immediateEnabledCache = null;
+let immediateEnabledPromise = null;
+
+/**
+ * 查询 HCS 即时推送开关（thirdParty.hcs.push.immediate-enabled）。
+ * 关闭时项目管理/合同管理隐藏「推送合规」「批量推送合规」。
+ */
+export const getPushConfig = () =>
+  request({
+    url: `${baseUrl}/push-config`,
+    method: 'get',
+  });
+
+export const loadHcsImmediateEnabled = () => {
+  if (immediateEnabledCache !== null) {
+    return Promise.resolve(immediateEnabledCache);
+  }
+  if (immediateEnabledPromise) {
+    return immediateEnabledPromise;
+  }
+  immediateEnabledPromise = getPushConfig()
+    .then(res => {
+      const data = res?.data?.data ?? res?.data ?? {};
+      immediateEnabledCache = data.immediateEnabled === true || data.immediateEnabled === 'true';
+      return immediateEnabledCache;
+    })
+    .catch(() => {
+      immediateEnabledCache = false;
+      return false;
+    })
+    .finally(() => {
+      immediateEnabledPromise = null;
+    });
+  return immediateEnabledPromise;
+};
+
 // 合规推送涉及 HCS 远程多次调用（风险校验+附件转传+起草），可达 20s+，覆盖全局 10s 超时
 export const repush = (bizType, id) =>
  request({
@@ -32,11 +69,11 @@ export const refreshMasterData = () =>
    timeout: 60000,
  });

-export const getRisk = customerCode =>
+export const getRisk = (customerCode, creditCode, customerName) =>
  request({
    url: `${baseUrl}/risk`,
    method: 'get',
-    params: { customerCode },
+    params: { customerCode, creditCode, customerName },
    timeout: 30000,
  });

@@ -24,11 +24,16 @@ export const getDetail = id =>
    },
  });

-export const getCarrierContracts = projectIds =>
+export const getCarrierContracts = (projectIds, waybillIds = []) =>
  request({
    url: `${baseUrl}/carrier-contracts`,
    method: 'get',
-    params: { projectIds: (projectIds || []).join(',') },
+    params: {
+      projectIds: (projectIds || []).join(','),
+      ...(waybillIds || []).filter(Boolean).length
+        ? { waybillIds: (waybillIds || []).filter(Boolean).join(',') }
+        : {},
+    },
  });

 export const saveDraft = row =>
@@ -0,0 +1,54 @@
+import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/project-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromProject = (projectId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-project`,
+    method: 'post',
+    params: { projectId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+    timeout: APPROVE_TIMEOUT,
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });
@@ -14,6 +14,13 @@ export const cancel = api.cancel;
 export const reassign = api.reassign;
 export const complete = api.complete;
 export const batchComplete = api.batchComplete;
+/** 确认回单：回单节点配成「需业务员确认」时用；后端校验司机打卡节点齐全且无未了结异常后才置完成 */
+export const confirmReturn = id =>
+  request({
+    url: `${baseUrl}/confirm-return`,
+    method: 'post',
+    params: { id },
+  });
 export const changeRoute = data =>
  request({
    url: `${baseUrl}/change-route`,
@@ -2,7 +2,7 @@ import request from '@/axios';
 import { ElLoading, ElMessage } from 'element-plus';

 /** 审核按钮统一超时：审批通过后可能同步推送金蝶等耗时操作，覆盖全局 10s */
-export const APPROVE_TIMEOUT = 30000;
+export const APPROVE_TIMEOUT = 60 * 1000;

 /**
 * 文件流返回
@@ -38,6 +38,15 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 export const pushKingdee = ids =>
  request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
+// 先票后款：发票明细查询（收票登记明细区块按票号带出发票明细行）
+export const invoiceDetailQuery = invoiceNo =>
+  request({ url: `${baseUrl}/invoice-detail-query`, method: 'get', params: { invoiceNo } });
+// 先票后款：结算单认领收票单候选分页（审批通过且未被有效应付结算单认领）
+export const claimCandidates = params =>
+  request({ url: `${baseUrl}/claim-candidates`, method: 'get', params });
+// 先票后款：结算单已认领收票登记列表（发票登记对话框回显已认领票）
+export const claimedReceipts = formalSettlementId =>
+  request({ url: `${baseUrl}/claimed-list`, method: 'get', params: { formalSettlementId } });

 export const approvalStatusOptions = [
  { label: '草稿', value: 'draft' },
@@ -27,13 +27,13 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
 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', timeout: 30000, params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: APPROVE_TIMEOUT, params: { id } });
 // 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: APPROVE_TIMEOUT, data: ids });
 // 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
 export const syncKingdeeResult = () =>
-  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });

 export const paymentTypeOptions = [
  { label: '项目预付', value: 'project_advance' },
@@ -8,20 +8,12 @@ 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' },
@@ -2,6 +2,9 @@ import request from '@/axios';

 const baseUrl = '/blade-transport/receipt-flow';

+/** 收款流水同步需远程拉取金蝶收款单并逐条落库，覆盖全局 10s 超时 */
+export const SYNC_TIMEOUT = 30000;
+
 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 } });
@@ -12,9 +15,7 @@ export const getSettlementCandidates = (keyword, flowId) =>
    params: { keyword, flowId },
  });
 export const claim = data => request({ url: `${baseUrl}/claim`, 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 sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });

 export const claimStatusOptions = [
  { label: '未认领', value: 'unclaimed' },
@@ -22,12 +23,6 @@ export const claimStatusOptions = [
  { label: '认领完成', value: 'claimed' },
 ];

-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
  { label: '已推送', value: 'pushed' },
  { label: '审核通过', value: 'approved' },
@@ -58,5 +58,21 @@ export const applyPayments = data =>
  request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
 export const claimInvoices = data =>
  request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
+// 先票后款：发票登记确认推送（认领收票单逐单 A302-6 指定应付），涉及多次金蝶远程调用，覆盖全局超时
+export const invoiceAssignKingdee = id =>
+  request({
+    url: `${baseUrl}/invoice-assign-kingdee`,
+    method: 'post',
+    timeout: 30000,
+    params: { id },
+  });
+// 先票后款：查看页重推认领收票单（收票单A303-2+指定应付A302-6 一步式），涉及多次金蝶远程调用，覆盖全局超时
+export const repushClaimedInvoice = (id, invoiceNo, matchedAmount) =>
+  request({
+    url: `${baseUrl}/repush-claimed-invoice`,
+    method: 'post',
+    timeout: 30000,
+    params: { id, invoiceNo, matchedAmount },
+  });
 export const queryInvoicePool = params =>
  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
@@ -0,0 +1,42 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-system/business-dept-config';
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+
+export const getDetail = id =>
+  request({
+    url: `${baseUrl}/detail`,
+    method: 'get',
+    params: { id },
+  });
+
+export const submit = row =>
+  request({
+    url: `${baseUrl}/submit`,
+    method: 'post',
+    data: row,
+  });
+
+export const remove = ids =>
+  request({
+    url: `${baseUrl}/remove`,
+    method: 'post',
+    params: { ids },
+  });
+
+export const getByPlatformDept = (platformCompanyId, businessDeptId) =>
+  request({
+    url: `${baseUrl}/by-platform-dept`,
+    method: 'get',
+    params: { platformCompanyId, businessDeptId },
+  });
@@ -12,6 +12,7 @@ export const MK_SUBMIT_TIMEOUT = 30000;
 * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
 * @param {string} [data.subject] 流程标题
 * @param {string} [data.bizType] 业务类型
+ * @param {Object} [data.tempVarData] MK 临时变量（如 { projectType }）
 */
 export const processSubmit = data => {
  return request({
@@ -139,3 +139,10 @@ export const getPlatformCompanySelect = () => {
    method: 'get',
  });
 };
+
+export const getBusinessDeptSelect = () => {
+  return request({
+    url: '/blade-system/dept/business-dept-select',
+    method: 'get',
+  });
+};
@@ -0,0 +1,19 @@
+import request from '@/axios';
+
+export const getRoleMenuDataScopeTree = roleId => {
+  return request({
+    url: '/blade-system/role-menu-data-scope/tree',
+    method: 'get',
+    params: {
+      roleId,
+    },
+  });
+};
+
+export const submitRoleMenuDataScope = data => {
+  return request({
+    url: '/blade-system/role-menu-data-scope/submit',
+    method: 'post',
+    data,
+  });
+};
@@ -91,3 +91,14 @@ export const recognizeBaiduOcr = (imageUrl, type, side = '') => {
    },
  });
 };
+
+export const recognizeQualificationCertificateOcr = imageUrl => {
+  return request({
+    url: '/blade-transport/baidu-ocr/qualification-certificate',
+    method: 'post',
+    timeout: 60000,
+    params: {
+      imageUrl,
+    },
+  });
+};
@@ -152,6 +152,34 @@ export const getScoreTemplate = quantificationId => {
  });
 };

+/** 线下评分 Excel 模板下载 */
+export const downloadScoreExcelTemplate = quantificationId => {
+  return request({
+    url: '/blade-transport/customer-archive/score-excel-template',
+    method: 'get',
+    responseType: 'blob',
+    params: {
+      quantificationId,
+    },
+  });
+};
+
+/** 线下评分 Excel 导入（成功返回评分明细 JSON；失败返回失败明细 Excel 流） */
+export const importScoreExcel = (quantificationId, file) => {
+  const formData = new FormData();
+  formData.append('file', file);
+  return request({
+    url: '/blade-transport/customer-archive/score-import',
+    method: 'post',
+    data: formData,
+    responseType: 'blob',
+    timeout: 60000,
+    params: {
+      quantificationId,
+    },
+  });
+};
+
 export const queryKingdeeCustomer = creditCode => {
  return request({
    url: '/blade-transport/bfi/customer/query-by-credit-code',
@@ -163,6 +191,42 @@ export const queryKingdeeCustomer = creditCode => {
  });
 };

+// 金蝶供应商编码查询（A901-1）：新增客商填写信用代码后即时回显
+export const querySupplierCode = creditCode => {
+  return request({
+    url: '/blade-transport/customer-archive/query-supplier-code',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      creditCode,
+    },
+  });
+};
+
+// 金蝶开户行查询（A905-3）：收款信息填写开户行失焦后精确匹配带出联行号
+export const queryKingdeeBank = bankName => {
+  return request({
+    url: '/blade-transport/customer-archive/query-bank',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      bankName,
+    },
+  });
+};
+
+// 金蝶联行号校验（A905-3）：收款信息保存前按联行号精确匹配，查不到不允许保存
+export const queryKingdeeBankByNumber = cnapsCode => {
+  return request({
+    url: '/blade-transport/customer-archive/query-bank-by-number',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      cnapsCode,
+    },
+  });
+};
+
 export const syncKingdee = id => {
  return request({
    url: '/blade-transport/customer-archive/sync-kingdee',
@@ -176,12 +240,11 @@ export const syncKingdee = id => {

 export const recognizeBusinessLicenseOcr = imageUrl => {
  return request({
-    url: '/blade-transport/baidu-ocr/recognize-url',
+    url: '/blade-transport/baidu-ocr/business-license',
    method: 'post',
    timeout: 60000,
    params: {
      imageUrl,
-      type: 'business_license',
    },
  });
 };
@@ -105,12 +105,27 @@ const isJsonContentType = res => {
  return contentType.includes('application/json') || contentType.includes('text/json');
 };

+/**
+ * 是否为可按文本读取的 Blob / Blob-like（含跨 realm）。
+ * 禁止对普通业务 JSON 对象调用 .text()。
+ */
+const isBlobLikeData = value =>
+  value != null &&
+  typeof value === 'object' &&
+  typeof value.size === 'number' &&
+  typeof value.type === 'string' &&
+  typeof value.text === 'function';
+
 /**
 * 判断响应体是否已是解析好的对象（无需再解析）。
 * 注意 Blob 也是 object，必须排除，否则会把待解析的文件流误判为已完成。
 */
 const isPlainObject = value =>
-  value !== null && typeof value === 'object' && !(value instanceof Blob);
+  value !== null &&
+  typeof value === 'object' &&
+  !(value instanceof Blob) &&
+  !isBlobLikeData(value) &&
+  !(value instanceof ArrayBuffer);
 //跨域请求，允许保存cookie
 axios.defaults.withCredentials = true;
 // NProgress Configuration
@@ -190,15 +205,20 @@ axios.interceptors.response.use(
    // 用户就会以为系统崩了——而后端其实返回了明确的业务提示（如「未读取到数据行…」）。
    // 这里按 Content-Type 判断：JSON 才解析回对象；真·文件流（Excel 等）保持原样不动。
    // 兼容 Blob（浏览器 responseType='blob'）与 string（非浏览器环境）两种形态。
+    // 仅对真正的 Blob/Blob-like 调 .text()，避免业务 JSON 已解析后出现
+    // 「e.data.text is not a function」。
    if (isJsonContentType(res) && !isPlainObject(res.data)) {
      try {
        let text = '';
-        if (typeof res.data?.text === 'function') {
-          text = await res.data.text();
-        } else if (typeof res.data === 'string') {
-          text = res.data;
-        } else if (typeof res.data?.arrayBuffer === 'function') {
-          text = new TextDecoder().decode(await res.data.arrayBuffer());
+        const raw = res.data;
+        if (isBlobLikeData(raw) || (typeof Blob !== 'undefined' && raw instanceof Blob)) {
+          text = await raw.text();
+        } else if (typeof raw === 'string') {
+          text = raw;
+        } else if (raw && typeof raw.arrayBuffer === 'function') {
+          text = new TextDecoder().decode(await raw.arrayBuffer());
+        } else if (raw instanceof ArrayBuffer) {
+          text = new TextDecoder().decode(raw);
        }
        const parsed = typeof text === 'string' && text ? JSON.parse(text) : null;
        if (parsed && typeof parsed === 'object') {
@@ -208,10 +228,11 @@ axios.interceptors.response.use(
        // 声明是 JSON 却解析失败：保持原样，交给下游按文件处理
      }
    }
-    //获取状态信息
-    const status = res.data.error_code || res.data.code || res.status;
+    // 获取状态信息：文件流没有 code/msg，必须退回 HTTP status，禁止读 Blob 上的幽灵字段
+    const payload = isPlainObject(res.data) ? res.data : {};
+    const status = Number(payload.error_code || payload.code || res.status);
    const statusWhiteList = website.statusWhiteList || [];
-    const message = res.data.msg || res.data.error_description || '系统错误';
+    const message = payload.msg || payload.error_description || '系统错误';
    //如果在白名单里则自行catch逻辑处理
    if (statusWhiteList.includes(status)) return Promise.reject(res);

@@ -12,6 +12,8 @@ import { h } from 'vue';
 *   1. 混入本 mixin：mixins: [organizationSearch]
 *   2. option 中「所属组织」列加上 searchslot: true（prop 为 organizationName 或 deptName 均可）
 *   3. 在 created / 初始化时调用 this.loadOrganizationOptions()
+ *   4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
+ *      该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
 *
 * 说明：
 *   - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
@@ -26,6 +28,12 @@ import { h } from 'vue';
 */
 const ORG_PROPS = ['organizationName', 'deptName'];

+// 「未分配组织」筛选项的哨兵值：不是真实组织名，选中后提交给后端的就是这串字面量。
+// 后端 TransportBusiConstant.UNASSIGNED_ORG_FILTER、DriverMapper.xml / TransportVehicleMapper.xml
+// 的 organizationName 分支以及司机、车辆导出查询都按它改判为 organization_name = ''；
+// 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
+const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';
+
 export default {
  data() {
    return {
@@ -34,9 +42,18 @@ export default {
      organizationTreeOptions: [],
      organizationTreeFlatOptions: [],
      organizationLoading: false,
+      // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
+      enableUnassignedOrgFilter: false,
    };
  },
  computed: {
+    // 搜索栏级联的选项：开关打开时在真实组织最前面追加「未分配组织」。
+    // 不能直接改 organizationTreeOptions——司机/车辆页的编辑表单也用这棵树选组织。
+    organizationSearchTreeOptions() {
+      return this.enableUnassignedOrgFilter
+        ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
+        : this.organizationTreeOptions;
+    },
    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
    organizationCascaderProps() {
      return {
@@ -61,7 +78,7 @@ export default {
            ? this.excludeExternalOrganization(source)
            : source;
          this.organizationTreeOptions = this.normalizeOrgTree(tree);
-          this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationTreeOptions);
+          this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationSearchTreeOptions);
          const option = this.tableOption || this.option;
          if (!option) return;
          ORG_PROPS.forEach(prop => {
@@ -100,12 +117,20 @@ export default {
        };
      });
    },
+    // 哨兵节点的 id 与 rawLabel 都取哨兵值，resolveOrgName 取到的仍是哨兵而不是某个真实组织名
+    unassignedOrgOption() {
+      return { id: UNASSIGNED_ORG_FILTER, label: '未分配组织', rawLabel: UNASSIGNED_ORG_FILTER };
+    },
    flattenOrgTree(tree = []) {
      return (tree || []).flatMap(item => [
        { id: String(item.id), label: item.label, rawLabel: item.rawLabel },
        ...this.flattenOrgTree(item.children || []),
      ]);
    },
+    // 组织列渲染用：空串或纯空白即「未分配组织」（组织列 NOT NULL，无组织存空串）
+    isBlankOrganizationName(value) {
+      return String(value ?? '').trim() === '';
+    },
    // 兼容两种入参：级联路径数组（取末级）或单个部门 id
    findOrgById(id) {
      const value = Array.isArray(id) ? id.at(-1) : id;
@@ -155,7 +180,7 @@ export default {
          // 级联单选：modelValue 必须是 id 路径数组，否则控件内部状态会错乱导致无法再次选中
          if (scope.row) scope.row[prop] = Array.isArray(value) ? value : [];
        },
-        options: this.organizationTreeOptions,
+        options: this.organizationSearchTreeOptions,
        props: {
          label: 'label',
          value: 'id',
@@ -38,6 +38,7 @@ export const createOption = () => ({
  delBtn: false,
  selection: true,
  dialogClickModal: false,
+  menuWidth: 320,
  menuFixed: 'right',
  column: [
    {
@@ -42,6 +42,7 @@ export const waybillStatusOptions = [
  { label: '草稿', value: 'draft' },
  { label: '待执行', value: 'pending' },
  { label: '进行中', value: 'running' },
+  { label: '待回单确认', value: 'pending_return_confirm' },
  { label: '已完成', value: 'completed' },
  { label: '已取消', value: 'cancelled' },
 ];
@@ -0,0 +1,221 @@
+import {
+  approvalStatusOptions,
+  contractCategoryOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  signTypeOptions,
+} from './common';
+
+const listDicFormatter = res => {
+  const 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;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
+const projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
+export const changeTypeOptions = [
+  { label: '合同信息变更', value: '合同信息变更' },
+  { label: '结算规则变更', value: '结算规则变更' },
+];
+
+export const config = {
+  title: '合同变更',
+  permission: 'contract_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'contract_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing', 'rejected', 'approved'],
+      permission: 'contract_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '合同编号',
+    prop: 'contractNo',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 20,
+    minWidth: 160,
+  },
+  {
+    label: '合同名称',
+    prop: 'contractName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 30,
+    minWidth: 180,
+  },
+  {
+    label: '所属项目',
+    prop: 'projectName',
+    search: true,
+    searchType: 'select',
+    searchPlaceholder: '请选择',
+    searchOrder: 60,
+    dicUrl: '/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
+    dicFormatter: projectNameDicFormatter,
+    props: {
+      label: 'projectName',
+      value: 'projectName',
+    },
+    filterable: true,
+    minWidth: 160,
+  },
+  {
+    label: '所属组织',
+    prop: 'organizationName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 10,
+    minWidth: 150,
+  },
+  {
+    label: '合同类别',
+    prop: 'contractCategory',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 70,
+    dicData: contractCategoryOptions,
+    minWidth: 130,
+  },
+  {
+    label: '签约类型',
+    prop: 'signType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 50,
+    dicData: signTypeOptions,
+    minWidth: 120,
+  },
+  {
+    label: '甲方',
+    prop: 'partyA',
+    minWidth: 160,
+  },
+  {
+    label: '乙方',
+    prop: 'partyB',
+    minWidth: 160,
+  },
+  {
+    label: '开始日期',
+    prop: 'startDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '结束日期',
+    prop: 'endDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力起',
+    prop: 'temporaryStartDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力止',
+    prop: 'temporaryEndDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '经办人',
+    prop: 'handlerUserName',
+    minWidth: 120,
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '审核状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 40,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);
@@ -65,10 +65,12 @@ export const config = {
        ['contractName', '合同名称'],
        ['projectName', '所属项目'],
        ['organizationName', '合同负责部门'],
+        ['platformCompanyName', '平台公司'],
        ['contractCategory', '合同类别'],
        ['signType', '签约类型'],
        ['partyA', '甲方'],
        ['partyB', '乙方'],
+        ['partyC', '丙方'],
        ['handlerUserName', '经办人'],
        ['signDate', '签订日期'],
        ['applyDate', '申请日期'],
@@ -247,11 +249,22 @@ export const option = createCrudOption([
    hide: true,
    labelWidth: 0,
  },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 14,
+    searchPlaceholder: '请输入甲/乙方名称',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+  },
  {
    label: '合同编号',
    prop: 'contractNo',
    search: true,
-    searchOrder: 6,
+    searchOrder: 8,
    searchPlaceholder: '请输入',
    order: 185,
    maxlength: 100,
@@ -264,7 +277,7 @@ export const option = createCrudOption([
    align: 'left',
    headerAlign: 'left',
    search: true,
-    searchOrder: 7,
+    searchOrder: 1,
    searchPlaceholder: '请输入',
    order: 180,
    slot: true,
@@ -276,7 +289,7 @@ export const option = createCrudOption([
    label: '所属项目',
    prop: 'projectName',
    search: true,
-    searchOrder: 8,
+    searchOrder: 11,
    searchType: 'select',
    searchPlaceholder: '请选择',
    formslot: true,
@@ -311,12 +324,19 @@ export const option = createCrudOption([
    minWidth: 150,
    rules: selectRule('合同负责部门'),
  },
+  {
+    label: '平台公司',
+    prop: 'platformCompanyName',
+    minWidth: 180,
+    order: 115,
+    display: false,
+  },
  {
    label: '合同类别',
    prop: 'contractCategory',
    type: 'select',
    search: true,
-    searchOrder: 9,
+    searchOrder: 12,
    searchPlaceholder: '请选择',
    order: 170,
    dicData: contractCategoryOptions,
@@ -328,7 +348,7 @@ export const option = createCrudOption([
    prop: 'signType',
    type: 'select',
    search: true,
-    searchOrder: 10,
+    searchOrder: 13,
    searchPlaceholder: '请选择',
    span: 8,
    order: 190,
@@ -337,11 +357,11 @@ export const option = createCrudOption([
    rules: selectRule('签约类型'),
  },
  {
-    label: '生效类型',
+    label: '合同状态',
    prop: 'effectiveType',
    type: 'select',
    search: true,
-    searchOrder: 5,
+    searchOrder: 6,
    searchPlaceholder: '请选择',
    dicData: effectiveTypeOptions,
    hide: true,
@@ -350,24 +370,23 @@ export const option = createCrudOption([
  {
    label: '甲方',
    prop: 'partyA',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 160,
-    filterable: true,
    minWidth: 160,
-    rules: selectRule('甲方'),
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '乙方',
    prop: 'partyB',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 150,
-    filterable: true,
    minWidth: 160,
-    rules: selectRule('乙方'),
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '丙方',
+    prop: 'partyC',
+    minWidth: 160,
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '合同期限',
@@ -613,7 +632,7 @@ export const option = createCrudOption([
    prop: 'hcsSyncStatus',
    type: 'select',
    search: true,
-    searchOrder: 6,
+    searchOrder: 7,
    searchPlaceholder: '请选择',
    slot: true,
    dicData: hcsSyncStatusOptions,
@@ -621,6 +640,15 @@ export const option = createCrudOption([
    addDisplay: false,
    editDisplay: false,
  },
+  {
+    label: '客商风险',
+    prop: 'customerRisk',
+    slot: true,
+    order: 189,
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
  {
    label: '金蝶合同ID',
    prop: 'kingdeeId',
@@ -634,7 +662,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 7,
+    searchOrder: 9,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -646,7 +674,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 8,
+    searchOrder: 10,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -0,0 +1,161 @@
+import {
+  approvalStatusOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  projectTypeOptions,
+} from './common';
+
+export const changeTypeOptions = [
+  { label: '项目变更', value: '项目变更' },
+  { label: '项目备案调整', value: '项目备案调整' },
+];
+
+export const config = {
+  title: '项目变更',
+  permission: 'project_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved', 'rejected', 'withdrawn'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'project_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '项目编号',
+    prop: 'projectCode',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 70,
+    minWidth: 160,
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 60,
+    minWidth: 180,
+  },
+  {
+    label: '变更类型',
+    prop: 'changeType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 10,
+    dicData: changeTypeOptions,
+    minWidth: 130,
+  },
+  {
+    label: '项目类型',
+    prop: 'projectType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 20,
+    dicData: projectTypeOptions,
+    minWidth: 110,
+  },
+  {
+    label: '客户名称',
+    prop: 'customerNames',
+    minWidth: 160,
+  },
+  {
+    label: '下游承运商',
+    prop: 'carrierNames',
+    minWidth: 160,
+  },
+  {
+    label: '承办部门',
+    prop: 'undertakeDeptName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 50,
+    minWidth: 140,
+  },
+  {
+    label: '项目负责人',
+    prop: 'principalUserName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 40,
+    minWidth: 120,
+  },
+  {
+    label: '审批状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 30,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '审核通过时间',
+    prop: 'approvedTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);
@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
  const text = Object.entries(groups)
    .map(([unit, group]) => {
      const quantity = formatGoodsQuantity(group.quantity);
-      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
+      const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+      return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
    })
    .join('； ');

@@ -471,7 +471,7 @@ export const config = {
    endDateRange: ['endDateStart', 'endDateEnd'],
    createTimeRange: ['createTimeStart', 'createTimeEnd'],
  },
-  actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete'],
+  actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete', 'confirmReturn'],
  detailButton: true,
  statusProp: 'businessStatus',
  statusTextProp: 'businessStatusName',
@@ -483,6 +483,8 @@ export const config = {
      row.requireAccept === true ||
      row.requireAccept === 1 ||
      requiresDriverAcceptConfirmation(row);
+    // 待回单确认由末位打卡产生，司机必然已接单
+    if (status === 'pending_return_confirm') return '待回单确认';
    // 需司机接单且尚未接单 → 待执行（含库中仍为 running 的历史数据展示校正）
    if (needAccept && !hasDriverAcceptRecord(row) && !terminalStatuses.includes(status)) {
      return '待执行';
@@ -504,7 +506,7 @@ export const config = {
    return !isDriverRejectedWaybill(row);
  },
  canCancel(row) {
-    // 进行中的运单不允许取消
+    // 进行中的运单不允许取消；待回单确认仍可取消（与页面 canCancel 一致）
    return !isInProgressStatus(row, row.businessStatusName);
  },
  deleteStatus: ['draft'],
@@ -169,7 +169,8 @@ export const paymentApplicationOption = ({
    { label: '当前节点', prop: 'currentNode', minWidth: 120, formatter: textFormatter },
    { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
    { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
-    { label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
+    { label: '金蝶单据状态', prop: 'kingdeeStatusName', slot: true, minWidth: 130 },
+    { label: '已指定应付', prop: 'kingdeeAssignStatus', slot: true, minWidth: 120 },
    { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
    { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
  ],
@@ -1,7 +1,7 @@
 export const receiptClaimRecordTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
  { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
  { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
  { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
  { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
@@ -1,18 +1,23 @@
 export const receiptFlowTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
  { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
  { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
  { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
  { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
+  { prop: 'payeeName', label: '收款人（公司）', minWidth: 150 },
+  //{ prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
+  //{ prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
  { 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: 'remainingAmount', label: '剩余可认领金额', minWidth: 140, money: true },
+  { prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
+  //{ prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
  { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];
@@ -16,6 +16,7 @@ import {
  approvalStatusOptions,
  invoiceStatusOptions,
  kingdeeSyncStatusOptions,
+  kingdeeWriteOffStatusOptions,
  paymentStatusOptions,
 } from './formalSettlementSearch';
 import { formalSettlementTableColumns } from './formalSettlementTable';
@@ -87,23 +88,29 @@ const COLUMN_EXTRA = {
    searchPlaceholder: '请选择',
  },
  kingdeeLockStatus: { slot: true },
+  kingdeeWriteOffStatus: { slot: true },
+  kingdeeAssignStatus: { slot: true },
  createTime: { width: 180 },
 };

-const buildTableColumns = () =>
-  formalSettlementTableColumns.map(column => {
-    const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
-    if (column.money) {
-      extra.formatter = moneyFormatter;
-      extra.align = 'right';
-    }
-    // link / status 标记的列统一走单元格插槽
-    if (column.link || column.status) extra.slot = true;
-    if (!extra.formatter) extra.formatter = textFormatter;
-    return { ...column, ...extra };
-  });
+// 已指定应付仅付款结算单（先票后款 A302-6）有，收款结算单不展示
+const buildTableColumns = settlementType =>
+  formalSettlementTableColumns
+    .filter(column => !(settlementType === 'receivable' && column.prop === 'kingdeeAssignStatus'))
+    .map(column => {
+      const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
+      if (column.money) {
+        extra.formatter = moneyFormatter;
+        extra.align = 'right';
+      }
+      // link / status 标记的列统一走单元格插槽
+      if (column.link || column.status) extra.slot = true;
+      // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+      if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
+      return { ...column, ...extra };
+    });

-export const formalSettlementOption = () => ({
+export const formalSettlementOption = (settlementType = '') => ({
  height: 'auto',
  calcHeight: 32,
  tip: false,
@@ -111,7 +118,7 @@ export const formalSettlementOption = () => ({
  emptyBtnText: '重置',
  searchShow: true,
  searchIcon: true,
-  searchLabelWidth: 88,
+  searchLabelWidth: 100,
  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
  searchMenuSpan: 4,
  searchIndex: 4,
@@ -165,9 +172,10 @@ export const formalSettlementOption = () => ({
      type: 'daterange',
    }),
    // ---------- 表格列（部分兼搜索项） ----------
-    ...buildTableColumns(),
+    ...buildTableColumns(settlementType),
  ],
 });

 export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
+export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
 export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);
@@ -34,6 +34,11 @@ export const kingdeeSyncStatusOptions = [
  { label: '同步失败', value: 'failed' },
 ];

+export const kingdeeWriteOffStatusOptions = [
+  { label: '未冲销', value: 'unwrittenoff' },
+  { label: '已冲销', value: 'writtenoff' },
+];
+
 export const formalSettlementSearchFields = [
  { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
@@ -25,7 +25,9 @@ export const formalSettlementTableColumns = [
  { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
  { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
  { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
+  { label: '金蝶冲销状态', prop: 'kingdeeWriteOffStatus', minWidth: 135 },
  { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
+  { label: '已指定应付', prop: 'kingdeeAssignStatus', minWidth: 120 },
  { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
  { label: '创建人', prop: 'createUserName', minWidth: 110 },
  { label: '创建时间', prop: 'createTime', minWidth: 170 },
@@ -8,8 +8,20 @@ export const preSettlementFormFields = [
  { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
  { label: '合同编号', prop: 'contractNo', readonly: true },
  { label: '项目名称', prop: 'projectName', readonly: true },
-  { label: '收款方', prop: 'payeeName', readonly: true },
-  { label: '付款方', prop: 'payerName', readonly: true },
+  {
+    label: '收款方',
+    prop: 'payeeName',
+    type: 'select',
+    optionsKey: 'payeeOptions',
+    required: true,
+  },
+  {
+    label: '付款方',
+    prop: 'payerName',
+    type: 'select',
+    optionsKey: 'payerOptions',
+    required: true,
+  },
  { label: '结算类型', prop: 'settlementType', readonly: true },
  { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
  { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
@@ -24,6 +36,8 @@ export const preSettlementFormFields = [

 export const preSettlementFormRules = {
  contractId: [{ required: true, message: '请选择合同名称', trigger: 'change' }],
+  payeeName: [{ required: true, message: '请选择收款方', trigger: 'change' }],
+  payerName: [{ required: true, message: '请选择付款方', trigger: 'change' }],
  exchangeRateDate: [
    {
      validator: (_rule, value, callback, source) => {
@@ -14,6 +14,11 @@ const validatePhone = (rule, value, callback) => {
    callback(new Error('请输入手机号'));
    return;
  }
+  // 详情回显为脱敏手机号（含 *）时放行，未修改则提交时剔除该字段
+  if (phone.includes('*')) {
+    callback();
+    return;
+  }
  if (!/^1\d{10}$/.test(phone)) {
    callback(new Error('请输入正确的手机号'));
    return;
@@ -121,6 +126,62 @@ export default {
      order: 60,
      rules: [{ required: true, message: '请选择小程序身份', trigger: 'change' }],
    },
+    {
+      label: '所属组织',
+      prop: 'deptId',
+      formslot: true,
+      hide: true,
+      span: 24,
+      order: 55,
+      // 所属组织可为空：为空表示未分配组织，账号的数据权限为空集
+    },
+    {
+      label: '所属组织',
+      prop: 'deptName',
+      minWidth: 180,
+      overHidden: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      order: 54,
+    },
+    {
+      label: '数据权限范围',
+      prop: 'dataScopeRange',
+      type: 'radio',
+      span: 24,
+      hide: true,
+      order: 53,
+      value: 1,
+      dicData: [
+        { label: '仅所属组织', value: 1 },
+        { label: '全部组织', value: 2 },
+        { label: '自定义', value: 3 },
+      ],
+      rules: [{ required: true, message: '请选择数据权限范围', trigger: 'change' }],
+    },
+    {
+      label: '数据层级范围',
+      prop: 'dataLevelRange',
+      type: 'radio',
+      span: 24,
+      hide: true,
+      order: 52,
+      value: 1,
+      dicData: [
+        { label: '包含下级', value: 1 },
+        { label: '仅本级', value: 2 },
+      ],
+      rules: [{ required: true, message: '请选择数据层级范围', trigger: 'change' }],
+    },
+    {
+      label: '数据权限',
+      prop: 'dataScopeDeptIds',
+      formslot: true,
+      span: 24,
+      hide: true,
+      order: 51,
+    },
    {
      label: '性别',
      prop: 'sex',
@@ -142,10 +203,9 @@ export default {
      overHidden: true,
      hide: true,
      addDisplay: false,
-      editDisplay: true,
+      editDisplay: false,
      viewDisplay: true,
      order: 40,
-      placeholder: '可清空以解绑微信',
    },
    {
      label: '状态',
@@ -315,29 +315,6 @@ export const userOption = safe => {
              { label: '承运商', value: 2 },
            ],
          },
-          {
-            label: '数据权限范围',
-            prop: 'dataScopeRange',
-            type: 'radio',
-            span: 24,
-            value: 1,
-            dicData: [
-              { label: '仅所属组织', value: 1 },
-              { label: '全部组织', value: 2 },
-              { label: '自定义', value: 3 },
-            ],
-          },
-          {
-            label: '数据层级范围',
-            prop: 'dataLevelRange',
-            type: 'radio',
-            span: 24,
-            value: 1,
-            dicData: [
-              { label: '包含下级', value: 1 },
-              { label: '仅本级', value: 2 },
-            ],
-          },
          {
            label: '备注',
            prop: 'remark',
@@ -48,6 +48,7 @@ export const option = {
      searchOrder: 1,
      searchslot: true,
      slot: true,
+      overHidden: true,
      minWidth: 150,
    },
    {
@@ -55,6 +56,8 @@ export const option = {
      prop: 'useDepartment',
      search: true,
      searchOrder: 3,
+      slot: true,
+      overHidden: true,
      minWidth: 140,
    },
    {
@@ -95,6 +95,17 @@ export default [
      bizType: 'project-apply',
    },
  },
+  {
+    path: '/business/project-change/public-view',
+    name: '查看项目变更信息',
+    component: () => import('@/views/business/project-apply-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'project-change',
+    },
+  },
  {
    path: '/business/contract-manage/public-view',
    name: '查看合同信息',
@@ -106,6 +117,17 @@ export default [
      bizType: 'contract-manage',
    },
  },
+  {
+    path: '/business/contract-change/public-view',
+    name: '查看合同变更信息',
+    component: () => import('@/views/business/contract-change-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'contract-change',
+    },
+  },
  {
    path: '/settlement/pre-settlement/public-view',
    name: '查看预付结算单信息',
@@ -104,6 +104,22 @@ export default [
      },
    ],
  },
+  {
+    // 兼容旧菜单路径：按 detailNo 解析应付/应收后跳转到拆分后的列表页
+    path: '/settlement/formal-settlement',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '正式结算单兼容跳转',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-redirect.vue')),
+      },
+    ],
+  },
  {
    path: '/settlement/formal-settlement/form',
    component: Layout,
@@ -113,7 +129,39 @@ export default [
        name: '新增编辑结算单',
        meta: {
          keepAlive: false,
-          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
+          // 付款结算单表单入口，高亮付款结算单菜单
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 收款结算单表单入口：与付款结算单共用表单组件，仅高亮菜单不同
+    path: '/settlement/receipt-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑收款结算单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/receipt-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 付款结算单表单入口：与 settlementListPath('payable') + '/form' 对应
+    path: '/settlement/payment-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑付款结算单',
+        meta: {
+          keepAlive: false,
          activeMenu: '/settlement/payment-settlement',
        },
        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
@@ -198,6 +246,18 @@ export default [
      },
    ],
  },
+  {
+    path: '/business/project-change/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '项目变更表单',
+        meta: { keepAlive: false, activeMenu: '/business/project-change' },
+        component: loadView(() => import('@/views/business/project-apply.vue')),
+      },
+    ],
+  },
  {
    path: '/business/waybill-manage/form',
    component: Layout,
@@ -342,6 +402,18 @@ export default [
      },
    ],
  },
+  {
+    path: '/business/contract-change/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '合同变更表单',
+        meta: { keepAlive: false, activeMenu: '/business/contract-change' },
+        component: loadView(() => import('@/views/business/contract-manage-change.vue')),
+      },
+    ],
+  },
  {
    path: '/wel',
    component: () =>
@@ -622,7 +622,7 @@
  background: #fff;
 }

-// 合同管理新增/编辑弹窗（business-crud-page 封装 → avue-crud，弹窗带 avue-crud__dialog class）
+// 合同管理新增/编辑弹窗（avue-crud，弹窗带 avue-crud__dialog class）
 // 复刻 waybill-manage 方案：接近全屏、压过库内置 .avue-dialog 的 calc(100% - 200px)，
 // 并解开 body 的 200px 上限、抵消全局 footer 的 -30px 上移
 .contract-manage-dialog.el-dialog {
@@ -26,6 +26,35 @@ const uniqueOrgNames = (values = []) => {
  return result;
 };

+// 候选司机取数上限：超出后只能靠关键字缩小范围
+const DRIVER_CANDIDATE_MAX_SIZE = 200;
+
+/**
+ * 派单候选司机：租户内的司机档案，按岗位等条件过滤。
+ *
+ * 与组织、承运商都无关——司机档案与组织树、承运商之间没有外键，`organization_name`
+ * 只是自由文本，用它做匹配会让小程序自动建档的司机永远进不了候选。
+ */
+export const fetchDriverCandidates = async (query = {}) => {
+  const params = { ...query };
+  const size = Math.min(Math.max(Number(params.size) || 50, 50), DRIVER_CANDIDATE_MAX_SIZE);
+  delete params.size;
+  const res = await getDriverList(1, size, params);
+  return extractRecords(res).slice(0, size);
+};
+
+/**
+ * 司机候选项的展示文本：姓名（手机尾号后 4 位）。
+ *
+ * 只用于下拉渲染。写回表单的仍是姓名本身，别把带尾号的文本当值用。
+ */
+export const driverOptionText = (item = {}) => {
+  const name = normalizeOrgName(item.driverName || item.name);
+  const mobile = String(item.mobile || item.phone || item.driverPhone || '').trim();
+  if (!name) return '';
+  return mobile.length >= 4 ? `${name}（${mobile.slice(-4)}）` : name;
+};
+
 /**
 * 解析承运商客商档案上联系人的所属组织（branchName），无联系人时回退客商所属组织。
 */
@@ -72,13 +101,6 @@ export const resolveCarrierOrganizationNames = async ({ carrierId, carrierName }
  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;
@@ -90,34 +112,9 @@ const filterByOrganizations = (records = [], orgNames = []) => {
  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 = {},
@@ -106,6 +106,9 @@ const CERT_SNAPSHOT_GROUPS = {
      fields: [
        { key: 'realName', label: '真实姓名' },
        { key: 'idCardNo', label: '身份证号' },
+        { key: 'birthday', label: '出生年月', type: TYPE_DATE },
+        { key: 'addressRegion', label: '住址' },
+        { key: 'address', label: '详细地址' },
        { key: 'idCardFrontUrl', label: '身份证正面照', type: TYPE_IMAGE },
        { key: 'idCardBackUrl', label: '身份证反面照', type: TYPE_IMAGE },
        { key: 'idCardValidStart', label: '身份证有效期起', type: TYPE_DATE },
@@ -88,7 +88,7 @@ export const parseBlobJson = async data => {
 *
 * 这里补上这一步：从错误响应的 Blob 里取出后端 `msg`，取不到再退回通用文案。
 */
-const resolveErrorMessage = async error => {
+export const resolveImportErrorMessage = async error => {
  const payload = error?.response?.data ?? error?.data;
  if (isBusinessJson(payload) && payload.msg) {
    return payload.msg;
@@ -109,6 +109,26 @@ const resolveErrorMessage = async error => {
  return fallback;
 };

+/**
+ * 统一消费导入接口响应：成功 JSON / 失败 Excel 流。
+ * 兼容 axios 已把 JSON Blob 解析成对象的情况，禁止再对普通对象调 .text()。
+ */
+export const consumeImportResponse = async (res, options = {}) => {
+  const { businessName = '导入', dayjsFormat } = options;
+  if (isExcelResponse(res)) {
+    return {
+      kind: 'excel',
+      blob: res?.data,
+      fileName: `${businessName}导入失败明细${dayjsFormat || ''}.xlsx`,
+    };
+  }
+  const result = isBusinessJson(res?.data) ? res.data : await parseBlobJson(res?.data);
+  if (Number(result?.code) !== 200) {
+    throw new Error(result?.msg || '导入失败');
+  }
+  return { kind: 'success', result };
+};
+
 /**
 * 加工后端返回的导入失败明细 Excel。
 * 若传入 failDetailDecorator（函数），则动态加载 exceljs 读取 blob 流，
@@ -235,7 +255,7 @@ export const handleImportExcel = async (vm, option, column, businessName, onSucc
    // 拦截器已提示过的错误（如后端 400 返回的业务提示）不再重复弹一次，
    // 只保留一次清晰的中文提示。
    if (!error?._notified) {
-      vm.$message.error(await resolveErrorMessage(error));
+      vm.$message.error(await resolveImportErrorMessage(error));
    }
    notifyUploadError(option, error);
  } finally {
@@ -0,0 +1,24 @@
+/**
+ * 金蝶单据状态公共映射
+ */
+
+/** 金蝶单据状态 → el-tag 颜色类型（failed 状态列表页悬浮展示失败原因） */
+export const KINGDEE_STATUS_TAG_TYPES = {
+  synced: 'success',
+  paid: 'success',
+  invoiced: 'success',
+  paying: 'warning',
+  failed: 'danger',
+};
+
+/** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
+
+/** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */
+export const KINGDEE_WRITEOFF_TAG_TYPES = {
+  writtenoff: 'success',
+  unwrittenoff: 'warning',
+};
+
+/** 金蝶冲销状态 → el-tag 颜色类型，未映射状态（null=未校验）返回 info */
+export const kingdeeWriteOffTagType = status => KINGDEE_WRITEOFF_TAG_TYPES[status] || 'info';
@@ -15,12 +15,24 @@ export const MK_BIZ = {
    rejected: ['rejected', 'change_rejected', 'withdrawn'],
    approved: ['approved', 'change_approved'],
  },
+  'project-change': {
+    dictName: '提交项目变更审核流',
+    subjectPrefix: '项目变更审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
  'contract-manage': {
    dictName: '提交合同审核流',
    subjectPrefix: '合同审批',
    rejected: ['rejected', 'change_rejected', 'withdrawn'],
    approved: ['approved', 'change_approved'],
  },
+  'contract-change': {
+    dictName: '提交合同变更审核流',
+    subjectPrefix: '合同变更审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
  'pre-settlement': {
    dictName: '提交预结算审核流',
    subjectPrefix: '预付结算审批',
@@ -142,6 +154,7 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
 * @param {string} [options.subjectName] 标题后缀
 * @param {string} [options.approvalStatus] 提交前的审批状态
 * @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
+ * @param {Object} [options.tempVarData] 传给 MK 的临时变量（如项目类型 projectType）
 * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
 */
 export async function submitMkApprovalFlow({
@@ -150,6 +163,7 @@ export async function submitMkApprovalFlow({
  subjectName = '',
  approvalStatus = '',
  mkEnabled,
+  tempVarData,
 } = {}) {
  const conf = MK_BIZ[bizType];
  if (!conf) {
@@ -190,12 +204,16 @@ export async function submitMkApprovalFlow({
  const subject = subjectName
    ? `${conf.subjectPrefix}：${subjectName}`
    : `${conf.subjectPrefix}：${bizIdText}`;
-  await processSubmit({
+  const submitPayload = {
    templateCode,
    bizId: bizIdText,
    subject,
    bizType,
    forceNewFormInstance,
-  });
+  };
+  if (tempVarData != null && typeof tempVarData === 'object') {
+    submitPayload.tempVarData = tempVarData;
+  }
+  await processSubmit(submitPayload);
  return true;
 }
@@ -0,0 +1,28 @@
+/**
+ * 客商/合同风险标签公共展示逻辑（黑名单=金蝶黑名单 A801-5 命中，与后端 HcsCreditCheckSupport 口径一致）：
+ * 等级与黑名单组合展示、等级在前；内部组织客商默认无风险
+ */
+
+/** 金蝶黑名单命中判定（客商档案行：失信类别/列入事由任一非空） */
+export function isKingdeeBlack(category, reason) {
+  return !!(category || reason);
+}
+
+/** 合同行黑名单判定（推送链路按金蝶命中口径落库 kingdeeBlackStatus=yes） */
+export function isContractBlack(blackStatus) {
+  return String(blackStatus || '').toLowerCase() === 'yes';
+}
+
+/** 风险标签文案：riskLevel=C101-1 等级（0/1/2）；isBlack=金蝶黑名单命中；customerKind=internal 显示"无风险" */
+export function resolveRiskTagName(riskLevel, isBlack, customerKind) {
+  const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[riskLevel] || '';
+  if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
+  if (levelName) return levelName;
+  if (customerKind === 'internal') return '无风险';
+  return '';
+}
+
+/** 是否红色风险标签（黑名单命中或高风险） */
+export function isRiskyTag(riskLevel, isBlack) {
+  return isBlack || riskLevel === '2';
+}
@@ -6,6 +6,7 @@
      :data="data"
      ref="crud"
      v-model="form"
+      v-model:page="page"
      :permission="permissionList"
      :before-open="beforeOpen"
      @row-del="rowDel"
@@ -50,7 +51,7 @@
      title="角色权限配置"
      append-to-body
      v-model="box"
-      width="345px"
+      width="960px"
      @close="handleDialogClose"
    >
      <el-tabs type="border-card">
@@ -100,41 +101,26 @@
            align="middle"
            style="margin-bottom: 12px; background: #f5f7fa; padding: 6px 10px; border-radius: 4px"
          >
-            <span style="display: inline-flex; align-items: center">
-              <el-switch
-                v-model="dataScopeLinked"
-                active-text="节点联动"
-                size="small"
-                @change="handleLinkedChange('treeDataScope')"
-              />
-              <el-tooltip content="开启后勾选父节点会自动勾选所有子节点，关闭则可独立勾选任意节点" placement="top">
-                <el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
-              </el-tooltip>
-            </span>
-            <el-button-group>
-              <el-button
-                size="small"
-                plain
-                @click="handleSelectAll('treeDataScope', dataScopeGrantList)"
-                >全选</el-button
-              >
-              <el-button
-                size="small"
-                plain
-                @click="handleInvertSelect('treeDataScope', dataScopeGrantList, dataScopeLinked)"
-                >反选</el-button
-              >
-            </el-button-group>
+            <span style="color: #606266; font-size: 13px"
+              >勾选多个菜单后点击「设置」，可批量配置数据权限；设置后菜单旁展示当前范围</span
+            >
+            <el-button type="primary" size="small" @click="openDataScopeSetting">设置</el-button>
          </el-row>
          <el-tree
-            :data="dataScopeGrantList"
+            :data="roleDataScopeMenuTree"
            show-checkbox
-            :check-strictly="!dataScopeLinked"
            node-key="id"
-            ref="treeDataScope"
-            :default-checked-keys="dataScopeTreeObj"
+            ref="treeRoleDataScope"
            :props="props"
          >
+            <template #default="{ data }">
+              <span class="role-data-scope-node">
+                <span>{{ data.title }}</span>
+                <span v-if="getMenuScopeLabel(data.id)" class="role-data-scope-tag"
+                  >【{{ getMenuScopeLabel(data.id) }}】</span
+                >
+              </span>
+            </template>
          </el-tree>
        </el-tab-pane>
        <el-tab-pane label="接口权限">
@@ -188,6 +174,45 @@
        </span>
      </template>
    </el-dialog>
+
+    <el-dialog
+      title="数据权限设置"
+      append-to-body
+      v-model="dataScopeSettingBox"
+      width="560px"
+      class="role-data-scope-setting-dialog"
+    >
+      <el-form label-position="right" label-width="auto">
+        <el-form-item label="角色名称">
+          <el-input v-model="dataScopeSetting.roleName" disabled />
+        </el-form-item>
+        <el-form-item label="数据权限">
+          <el-radio-group v-model="dataScopeSetting.scopeType">
+            <el-radio :value="1">所在部门及下级</el-radio>
+            <el-radio :value="2">全部组织</el-radio>
+            <el-radio :value="3">本人创建</el-radio>
+            <el-radio :value="4">自定义组织</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="Number(dataScopeSetting.scopeType) === 4" label="组织">
+          <el-tree
+            ref="treeCustomDept"
+            :data="deptTree"
+            show-checkbox
+            node-key="id"
+            default-expand-all
+            :props="{ label: 'title', children: 'children' }"
+            style="width: 100%; max-height: 320px; overflow: auto; border: 1px solid #ebeef5; padding: 8px"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dataScopeSettingBox = false">取消</el-button>
+          <el-button type="primary" @click="submitDataScopeSetting">保存</el-button>
+        </span>
+      </template>
+    </el-dialog>
  </basic-container>
 </template>

@@ -196,37 +221,44 @@ import {
  add,
  getList,
  getRole,
-  getRoleAlias,
  getRoleTreeById,
  grant,
  grantTree,
  remove,
  update,
 } from '@/api/system/role';
+import { getRoleMenuDataScopeTree, submitRoleMenuDataScope } from '@/api/system/roleDataScope';
+import { getDeptTree } from '@/api/system/dept';
 import { mapGetters } from 'vuex';
 import website from '@/config/website';
-import { validatenull } from '@/utils/validate';

 export default {
  data() {
    return {
      form: {},
      box: false,
+      dataScopeSettingBox: false,
      props: {
        label: 'title',
        value: 'key',
      },
      menuGrantList: [],
-      dataScopeGrantList: [],
      apiScopeGrantList: [],
      apiGrantList: [],
      menuTreeObj: [],
-      dataScopeTreeObj: [],
      apiScopeTreeObj: [],
      menuLinked: false,
-      dataScopeLinked: false,
      apiScopeLinked: false,
      currentRoleIds: [],
+      currentRoleName: '',
+      roleDataScopeMenuTree: [],
+      roleDataScopeMap: {},
+      deptTree: [],
+      dataScopeSetting: {
+        roleName: '',
+        scopeType: 2,
+        menuIds: [],
+      },
      selectionList: [],
      query: {},
      loading: true,
@@ -309,32 +341,19 @@ export default {
            ],
          },
          {
-            label: '角色别名',
-            labelTip: '用于权限校验与标注的属性,可手动录入也可点击现有别名快速录入',
+            label: '角色标识',
+            labelTip: '用于权限校验与标注的属性',
            prop: 'roleAlias',
            search: true,
            span: 24,
            rules: [
              {
                required: true,
-                message: '请输入角色别名',
+                message: '请输入角色标识',
                trigger: 'blur',
              },
            ],
          },
-          {
-            label: '现有别名',
-            labelTip: '当前系统已存在的角色别名,点击可快速录入',
-            prop: 'currentAlias',
-            type: 'radio',
-            dicData: [],
-            props: {
-              label: 'roleName',
-              value: 'roleAlias',
-            },
-            hide: true,
-            span: 24,
-          },
          {
            label: '角色排序',
            prop: 'sort',
@@ -378,14 +397,6 @@ export default {
      return ids;
    },
  },
-  watch: {
-    'form.currentAlias'() {
-      const alias = this.form.currentAlias;
-      if (!validatenull(alias)) {
-        this.form.roleAlias = alias;
-      }
-    },
-  },
  methods: {
    initData(roleId) {
      getRoleTreeById(roleId).then(res => {
@@ -452,9 +463,9 @@ export default {
    },
    submit() {
      const menuList = this.$refs.treeMenu.getCheckedKeys();
-      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-      grant(this.currentRoleIds, menuList, dataScopeList, apiScopeList).then(() => {
+      // 数据权限已改为角色菜单配置；传 null 跳过原生 dataScope 更新，避免误清历史配置
+      grant(this.currentRoleIds, menuList, null, apiScopeList).then(() => {
        this.box = false;
        this.$message({
          type: 'success',
@@ -465,6 +476,84 @@ export default {
        this.onLoad(this.page);
      });
    },
+    getMenuScopeLabel(menuId) {
+      const scope = this.roleDataScopeMap[String(menuId)];
+      return scope ? scope.scopeTypeName : '';
+    },
+    loadRoleDataScopeTree(roleId) {
+      return getRoleMenuDataScopeTree(roleId).then(res => {
+        const data = res.data.data || {};
+        this.currentRoleName = data.roleName || '';
+        this.roleDataScopeMenuTree = data.menuTree || [];
+        const scopeMap = {};
+        (data.scopes || []).forEach(item => {
+          scopeMap[String(item.menuId)] = item;
+        });
+        this.roleDataScopeMap = scopeMap;
+      });
+    },
+    openDataScopeSetting() {
+      const tree = this.$refs.treeRoleDataScope;
+      if (!tree) {
+        return;
+      }
+      const menuIds = tree.getCheckedKeys();
+      if (!menuIds || menuIds.length === 0) {
+        this.$message.warning('请先勾选要设置的菜单');
+        return;
+      }
+      this.dataScopeSetting = {
+        roleName: this.currentRoleName,
+        scopeType: 2,
+        menuIds,
+      };
+      const loadDept =
+        this.deptTree && this.deptTree.length
+          ? Promise.resolve()
+          : getDeptTree(this.userInfo.tenantId).then(res => {
+              this.deptTree = res.data.data || [];
+            });
+      loadDept.then(() => {
+        this.dataScopeSettingBox = true;
+        this.$nextTick(() => {
+          if (this.$refs.treeCustomDept) {
+            this.$refs.treeCustomDept.setCheckedKeys([]);
+          }
+        });
+      });
+    },
+    submitDataScopeSetting() {
+      const roleId = this.currentRoleIds && this.currentRoleIds[0];
+      if (!roleId) {
+        this.$message.warning('角色信息异常，请重新打开权限配置');
+        return;
+      }
+      const scopeType = Number(this.dataScopeSetting.scopeType || 2);
+      let deptIds = [];
+      if (scopeType === 4) {
+        deptIds = this.$refs.treeCustomDept ? this.$refs.treeCustomDept.getCheckedKeys() : [];
+        if (!deptIds.length) {
+          this.$message.warning('自定义组织时请勾选组织');
+          return;
+        }
+      }
+      submitRoleMenuDataScope({
+        roleId,
+        menuIds: this.dataScopeSetting.menuIds,
+        scopeType,
+        deptIds,
+      }).then(() => {
+        this.$message.success('数据权限设置成功');
+        this.dataScopeSettingBox = false;
+        this.loadRoleDataScopeTree(roleId).then(() => {
+          this.$nextTick(() => {
+            if (this.$refs.treeRoleDataScope) {
+              this.$refs.treeRoleDataScope.setCheckedKeys([]);
+            }
+          });
+        });
+      });
+    },
    rowSave(row, done, loading) {
      add(this.withTenantId(row)).then(
        () => {
@@ -547,10 +636,6 @@ export default {
          this.form.parentId = '';
        }
      }
-      getRoleAlias().then(res => {
-        const column = this.findColumn(this.option.column, 'currentAlias');
-        column.dicData = res.data.data;
-      });
      done();
    },
    handleRole() {
@@ -563,58 +648,52 @@ export default {
        return;
      }
      this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
      this.apiScopeTreeObj = [];
-      // 保存当前要配置权限的角色ID
      this.currentRoleIds = this.idsArray;
-      grantTree().then(res => {
-        this.menuGrantList = res.data.data.menu;
-        this.dataScopeGrantList = res.data.data.dataScope;
-        this.apiScopeGrantList = res.data.data.apiScope;
-        getRole(this.ids).then(res => {
-          this.menuTreeObj = res.data.data.menu;
-          this.dataScopeTreeObj = res.data.data.dataScope;
-          this.apiScopeTreeObj = res.data.data.apiScope;
-          this.box = true;
-          this.$nextTick(() => {
-            this.applyCheckedKeys('treeMenu', this.menuTreeObj);
-            this.applyCheckedKeys('treeDataScope', this.dataScopeTreeObj);
-            this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
-          });
+      this.currentRoleName = (this.selectionList[0] && this.selectionList[0].roleName) || '';
+      const roleId = this.currentRoleIds[0];
+      Promise.all([grantTree(), getRole(this.ids), this.loadRoleDataScopeTree(roleId)]).then(results => {
+        const grantRes = results[0];
+        const roleRes = results[1];
+        this.menuGrantList = grantRes.data.data.menu;
+        this.apiScopeGrantList = grantRes.data.data.apiScope;
+        this.menuTreeObj = roleRes.data.data.menu;
+        this.apiScopeTreeObj = roleRes.data.data.apiScope;
+        this.box = true;
+        this.$nextTick(() => {
+          this.applyCheckedKeys('treeMenu', this.menuTreeObj);
+          this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
        });
      });
    },
    handleRowRole(row) {
      this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
      this.apiScopeTreeObj = [];
-      // 保存当前要配置权限的角色ID（单个行操作）
      this.currentRoleIds = [row.id];
-      grantTree().then(res => {
-        this.menuGrantList = res.data.data.menu;
-        this.dataScopeGrantList = res.data.data.dataScope;
-        this.apiScopeGrantList = res.data.data.apiScope;
-        getRole(row.id).then(res => {
-          this.menuTreeObj = res.data.data.menu;
-          this.dataScopeTreeObj = res.data.data.dataScope;
-          this.apiScopeTreeObj = res.data.data.apiScope;
-          this.box = true;
-          this.$nextTick(() => {
-            this.applyCheckedKeys('treeMenu', this.menuTreeObj);
-            this.applyCheckedKeys('treeDataScope', this.dataScopeTreeObj);
-            this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
-          });
+      this.currentRoleName = row.roleName || '';
+      Promise.all([grantTree(), getRole(row.id), this.loadRoleDataScopeTree(row.id)]).then(results => {
+        const grantRes = results[0];
+        const roleRes = results[1];
+        this.menuGrantList = grantRes.data.data.menu;
+        this.apiScopeGrantList = grantRes.data.data.apiScope;
+        this.menuTreeObj = roleRes.data.data.menu;
+        this.apiScopeTreeObj = roleRes.data.data.apiScope;
+        this.box = true;
+        this.$nextTick(() => {
+          this.applyCheckedKeys('treeMenu', this.menuTreeObj);
+          this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
        });
      });
    },
    handleDialogClose() {
-      // 对话框关闭时清空选择状态和权限树数据
      this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
      this.apiScopeTreeObj = [];
      this.menuLinked = false;
-      this.dataScopeLinked = false;
      this.apiScopeLinked = false;
+      this.roleDataScopeMenuTree = [];
+      this.roleDataScopeMap = {};
+      this.currentRoleName = '';
+      this.dataScopeSettingBox = false;
      this.selectionClear();
    },
    handleDelete() {
@@ -651,7 +730,9 @@ export default {
    onLoad(page, params = {}) {
      this.loading = true;
      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data;
+        const data = res.data.data || {};
+        this.data = data.records || [];
+        this.page.total = data.total || 0;
        this.loading = false;
        this.selectionClear();
      });
@@ -659,3 +740,15 @@ export default {
  },
 };
 </script>
+
+<style scoped>
+.role-data-scope-node {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+.role-data-scope-tag {
+  color: #409eff;
+  font-size: 12px;
+}
+</style>
@@ -60,6 +60,13 @@
        </el-tag>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="hasPermission('airport_master_view')"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          type="primary"
          v-if="hasPermission('airport_master_edit')"
@@ -279,7 +286,7 @@ export default {
        editBtn: false,
        selection: true,
        dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
        column: [
          {
            label: '编码',
@@ -68,6 +68,13 @@
        </el-tag>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.currency_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          type="primary"
          v-if="permission.currency_edit"
@@ -171,7 +178,7 @@ export default {
        editBtn: false,
        selection: true,
        dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
        menuFixed: 'right',
        column: [
          {
@@ -36,6 +36,13 @@
        </el-tag>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.customer_type_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          type="primary"
          v-if="permission.customer_type_edit"
@@ -102,7 +109,7 @@ export default {
        editBtn: false,
        selection: true,
        dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
        column: [
          {
            label: '中文名称',
@@ -76,6 +76,13 @@
        </el-input>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.fee_item_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          type="primary"
          v-if="permission.fee_item_edit"
@@ -141,7 +148,7 @@ export default {
        editBtn: false,
        selection: true,
        dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
        column: [
          {
            label: '费用类型',
@@ -46,6 +46,13 @@
        </el-tag>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          v-if="hasPermission('measurement_unit_view')"
+          type="primary"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          v-if="hasPermission('measurement_unit_edit')"
          type="primary"
@@ -134,6 +134,13 @@
        </div>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="hasPermission('port_terminal_view')"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          type="primary"
          v-if="hasPermission('port_terminal_edit')"
@@ -370,7 +377,7 @@ export default {
        editBtn: false,
        selection: true,
        dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
        column: [
          {
            label: '编码',
@@ -60,6 +60,13 @@
        </el-tag>
      </template>
      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="hasPermission('railway_station_view')"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
        <el-link
          type="primary"
          v-if="hasPermission('railway_station_edit')"
@@ -250,7 +257,7 @@ export default {
        editBtn: false,
        selection: true,
        dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
        column: [
          {
            label: '编码',
@@ -280,6 +280,23 @@ export default {
        .filter(Boolean)[0] || '';
    },
    applyDefaultDeptSearch() {
+      // 超管默认不限组织，避免预填当前组织后看不到其他组织/无组织数据。
+      if (this.isAdmin) {
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+        if (deptColumn) {
+          deptColumn.searchValue = undefined;
+        }
+        const nextQuery = { ...this.query };
+        delete nextQuery.deptId;
+        delete nextQuery.searchDeptId;
+        this.query = nextQuery;
+        this.$nextTick(() => {
+          if (this.$refs.crud?.searchForm) {
+            this.$refs.crud.searchForm.searchDeptId = undefined;
+          }
+        });
+        return;
+      }
      const deptId = this.defaultDeptId();
      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
      if (!deptId || !deptColumn) return;
@@ -298,7 +315,8 @@ export default {
        if (deptColumn) {
          deptColumn.dicData = this.deptOptions;
        }
-        // dicData 异步到位后再回填，避免下拉选项为空时清空已选组织，导致请求丢失 deptId。
+        // 超管不回填默认组织；普通用户在 dicData 到位后再回填，避免下拉清空已选组织。
+        if (this.isAdmin) return;
        const deptId = String(this.query.deptId || this.defaultDeptId() || '');
        if (!deptId) return;
        if (deptColumn) {
@@ -12,12 +12,12 @@
        <el-descriptions-item label="方案名称">{{
            displayValue(draft.planName)
          }}</el-descriptions-item>
+        <el-descriptions-item label="适用客商">{{
+            displayValue(draft.customerName || partyOptionLabel(draft.partyRowId))
+          }}</el-descriptions-item>
        <el-descriptions-item label="运输方式">{{
            transportModeLabel(draft.transportMode)
          }}</el-descriptions-item>
-        <el-descriptions-item label="默认方案">{{
-            isDefaultPlan(draft) ? '是' : '否'
-          }}</el-descriptions-item>
        <el-descriptions-item label="备注">{{ displayValue(draft.remark) }}</el-descriptions-item>
      </el-descriptions>
      <el-form
@@ -37,6 +37,20 @@
            :disabled="readonly" /></el-form-item
          ></el-col>
          <el-col :span="8"
+          ><el-form-item label="适用客商" prop="partyRowId"
+          ><el-select
+            v-model="draft.partyRowId"
+            clearable
+            filterable
+            placeholder="请选择适用客商"
+            @change="handlePartyChange"
+          ><el-option
+            v-for="item in partyOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value" /></el-select></el-form-item
+          ></el-col>
+          <el-col :span="8"
          ><el-form-item label="运输方式" prop="transportMode"
          ><el-select
            v-model="draft.transportMode"
@@ -51,16 +65,6 @@
            :label="item.label"
            :value="item.value" /></el-select></el-form-item
          ></el-col>
-          <el-col :span="8"
-          ><el-form-item
-          ><el-checkbox v-model="draft.defaultPlan" :disabled="readonly">默认方案</el-checkbox
-          ><el-tooltip content="同一运输方式仅支持配置一个默认计费方案" placement="top">
-            <el-icon class="billing-plan-editor__default-tip"
-            ><InfoFilled
-            /></el-icon> </el-tooltip
-          ></el-form-item
-          ></el-col
-          >
          <el-col :span="24"
          ><el-form-item label="备注"
          ><el-input
@@ -380,6 +384,7 @@ import { InfoFilled } from '@element-plus/icons-vue';
 import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 import { currencyUnit } from '@/utils/currency';
+// InfoFilled 仅用于保底计费重量列头提示

 const clone = value => JSON.parse(JSON.stringify(value));
 /** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
@@ -433,6 +438,7 @@ export default {
    index: { type: Number, default: -1 },
    readonly: Boolean,
    settlementCurrency: { type: String, default: 'RMB' },
+    partyOptions: { type: Array, default: () => [] },
  },
  emits: ['update:modelValue', 'save'],
  data() {
@@ -476,6 +482,7 @@ export default {
      cargoRequest: null,
      formRules: {
        planName: [{ required: true, message: '请输入方案名称', trigger: 'blur' }],
+        partyRowId: [{ required: true, message: '请选择适用客商', trigger: 'change' }],
        transportMode: [{ required: true, message: '请选择运输方式', trigger: 'change' }],
      },
    };
@@ -516,10 +523,24 @@ export default {
      handler(value) {
        if (this.modelValue) {
          this.draft = this.normalizePlan(value);
+          this.applyDefaultPartySelection();
          this.loadRuleItems();
        }
      },
    },
+    modelValue(visible) {
+      if (visible) {
+        this.$nextTick(() => this.applyDefaultPartySelection());
+      }
+    },
+    partyOptions: {
+      deep: true,
+      handler() {
+        if (this.modelValue) {
+          this.applyDefaultPartySelection();
+        }
+      },
+    },
  },
  methods: {
    displayValue(value) {
@@ -539,27 +560,62 @@ export default {
      );
      return this.displayValue(option?.label || this.draft.transportModeLabel || value);
    },
-    isDefaultPlan(plan) {
-      return (
-        plan?.defaultPlan === true ||
-        plan?.defaultPlan === 1 ||
-        ['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
-      );
-    },
    normalizePlan(value = {}) {
      const plan = {
        planName: '',
+        partyRowId: '',
+        partyRole: '',
+        customerId: '',
+        customerName: '',
        transportMode: '',
        transportModeLabel: '',
-        defaultPlan: false,
        remark: '',
        ...clone(value || {}),
      };
+      // 一个客商对应一个方案，不再维护默认方案字段
+      delete plan.defaultPlan;
      plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule =>
        this.normalizeRule(rule)
      );
      return plan;
    },
+    partyOptionLabel(partyRowId) {
+      const matched = (this.partyOptions || []).find(
+        item => String(item.value) === String(partyRowId)
+      );
+      return matched?.label || '';
+    },
+    /**
+     * 仅一个可选客商时默认选中（客户合同仅一个甲方的常见场景）
+     */
+    applyDefaultPartySelection() {
+      if (this.readonly) {
+        return;
+      }
+      const options = this.partyOptions || [];
+      if (options.length !== 1) {
+        return;
+      }
+      const current = String(this.draft.partyRowId || '');
+      const only = options[0];
+      const onlyValue = String(only?.value || only?.partyRowId || '');
+      if (!onlyValue) {
+        return;
+      }
+      if (current && current === onlyValue) {
+        return;
+      }
+      this.handlePartyChange(only.value || only.partyRowId);
+    },
+    handlePartyChange(partyRowId) {
+      const matched = (this.partyOptions || []).find(
+        item => String(item.value) === String(partyRowId)
+      );
+      this.draft.partyRowId = matched?.partyRowId || matched?.value || '';
+      this.draft.partyRole = matched?.partyRole || '';
+      this.draft.customerId = matched?.customerId || '';
+      this.draft.customerName = matched?.customerName || '';
+    },
    normalizeRule(rule = {}) {
      const next = { ...defaultRule(), ...clone(rule) };
      if (next.billingType === '阶梯单价' && next.minimumBillingWeight === '') {
@@ -1032,6 +1088,11 @@ export default {
      this.$refs.formRef.validate(valid => {
        if (!valid || !this.validateRules()) return;
        const plan = clone(this.draft);
+        this.handlePartyChange(plan.partyRowId);
+        plan.partyRowId = this.draft.partyRowId;
+        plan.partyRole = this.draft.partyRole;
+        plan.customerId = this.draft.customerId;
+        plan.customerName = this.draft.customerName;
        const transportMode = this.transportModeOptions.find(
          item => String(item.value) === String(plan.transportMode)
        );
@@ -38,7 +38,7 @@
        contract.hcsFdId || '-'
      }}</el-descriptions-item>
      <el-descriptions-item label="客商风险">
-        <template v-if="contract.hcsRiskLevel || contract.hcsBlackStatus">
+        <template v-if="contract.hcsRiskLevel || contract.kingdeeBlackStatus">
          <el-tag
            v-if="isBlacklist"
            type="danger"
@@ -130,7 +130,7 @@ export default {
  name: 'HcsContractPanel',
  components: { UploadFilled },
  props: {
-    // 合同详情行（须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/hcsBlackStatus/hcsSpecStatus 等）
+    // 合同详情行（须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/kingdeeBlackStatus/hcsSpecStatus 等）
    contract: { type: Object, required: true },
  },
  emits: ['refresh'],
@@ -152,7 +152,7 @@ export default {
      return this.contract.hcsSyncMsg || '';
    },
    isBlacklist() {
-      return String(this.contract.hcsBlackStatus || '').toLowerCase() === 'yes';
+      return String(this.contract.kingdeeBlackStatus || '').toLowerCase() === 'yes';
    },
    specLabel() {
      return SPEC_STATUS_OPTIONS.find(item => item.value === this.contract.hcsSpecStatus)?.label || '';
@@ -294,8 +294,8 @@ export default {
        query: { id: String(customerId), name: '查看客商档案', view: '1' },
      });
    },
-    waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
-    waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
+    waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', pending_return_confirm: '待回单确认', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
+    waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', pending_return_confirm: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
    statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; },
    statusType(value) { return ({ waiting_dispatch: 'warning', dispatching: 'success', completed: 'primary', closed: 'danger' })[value] || 'info'; },
  },
@@ -195,7 +195,7 @@
          <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-form">
            <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-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : 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
@@ -210,7 +210,11 @@
                      @mousedown="() => handleDriverFocus(route)"
                      @focus="() => handleDriverFocus(route)"
                      @select="handleDriverSuggestionSelect"
-                  /></el-form-item
+                    >
+                      <template #default="{ item }">
+                        <span>{{ driverOptionText(item) }}</span>
+                      </template>
+                    </el-autocomplete></el-form-item
                ></el-col>
                <el-col :span="6"
                  ><el-form-item
@@ -239,7 +243,11 @@
                      @mousedown="() => handleDriverFocus(route)"
                      @focus="() => handleDriverFocus(route)"
                      @select="handleEscortSuggestionSelect"
-                  /></el-form-item
+                    >
+                      <template #default="{ item }">
+                        <span>{{ driverOptionText(item) }}</span>
+                      </template>
+                    </el-autocomplete></el-form-item
                ></el-col>
                <el-col v-if="route.carrierType !== '承运商'" :span="6"
                  ><el-form-item label="押运人手机号"
@@ -247,7 +255,7 @@
                ></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="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : 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="船长"><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>
@@ -316,7 +324,7 @@

 <script>
 import * as api from '@/api/business/master-order';
-import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } from '@/utils/carrier-org-resource';
 import { formatContractOptionLabel } from '@/utils/contract';
 import {
  currencyUnit,
@@ -403,6 +411,7 @@ export default {
    this.applySelfOperatedCarrierDefaults();
  },
  methods: {
+    driverOptionText,
    loadQuantityUnitOptions() {
      if (this.quantityUnitLoading) return this.quantityUnitLoadPromise;
      this.quantityUnitLoading = true;
@@ -911,6 +920,8 @@ export default {
      route.carrierName = '';
      route.carrierId = '';
      route.carrierContractId = '';
+      route.carrierPartyId = '';
+      route.carrierPartyRole = '';
      this.clearRouteDriverVehicleFields(route);
      if (value === '承运商') {
        route.trailerVehicleNo = '';
@@ -921,15 +932,18 @@ export default {
        if (value === '自运') this.applySelfOperatedCarrierDefaults(route);
      });
    },
-    handleCarrierContractChange(route, contractId) {
+    handleCarrierContractChange(route, selectedValue) {
      const contract = this.carrierOptions.find(
        item =>
+          this.carrierOptionValue(item) === String(selectedValue || '') ||
          [item.contractId, item.carrierName, item.id].some(
-            value => String(value || '') === String(contractId || '')
+            value => String(value || '') === String(selectedValue || '')
          )
      );
      route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
-      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
+      route.carrierPartyId = route.carrierType !== '自运' ? contract?.carrierPartyId || '' : '';
+      route.carrierPartyRole = route.carrierType !== '自运' ? contract?.carrierPartyRole || '' : '';
+      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || contract?.customerId || '' : '';
      route.carrierName = contract?.carrierName || '';
      this.clearRouteDriverVehicleFields(route);
    },
@@ -944,22 +958,24 @@ export default {
      route.escortPhone = '';
      this.driverOptions = [];
    },
-    getRouteCarrierFilter(route = {}) {
-      return {
-        carrierId: route.carrierId || '',
-        carrierName: route.carrierName || '',
-      };
-    },
    carrierOptionValue(item = {}) {
-      return item.contractId || item.id || item.value || item.carrierName || '';
+      return [item.contractId || item.id || '', item.carrierPartyId || '', item.carrierName || ''].join(
+        '__'
+      );
+    },
+    carrierSelectedValue(route = {}) {
+      return this.carrierOptionValue({
+        contractId: route.carrierContractId,
+        carrierPartyId: route.carrierPartyId,
+        carrierName: route.carrierName,
+      });
    },
    carrierOptionLabel(item) {
-      const duplicateCount = this.carrierOptions.filter(option => option.carrierName === item.carrierName).length;
-      if (duplicateCount <= 1) {
-        return item.carrierName;
-      }
+      const roleLabel = item.carrierPartyRole === 'C' ? '丙方' : item.carrierPartyRole === 'B' ? '乙方' : '';
+      const nameWithRole =
+        roleLabel && item.carrierName ? `${item.carrierName}（${roleLabel}）` : item.carrierName;
      const contractLabel = formatContractOptionLabel(item);
-      return contractLabel ? `${item.carrierName}（${contractLabel}）` : item.carrierName;
+      return contractLabel ? `${nameWithRole} - ${contractLabel}` : nameWithRole;
    },
    driverOptionLabel(item) { return item.driverName || item.name || ''; },
    driverOptionKey(item) { return item.id || item.driverId || this.driverOptionLabel(item) || item.mobile; },
@@ -980,19 +996,22 @@ export default {
            ...item,
            contractId: item.contractId || item.carrierContractId || item.id || '',
            carrierName:
+              item.carrierName ||
              item.partyB ||
              item.partyBName ||
              item.contractPartyB ||
              item.customerContractPartyB ||
-              item.carrierName ||
              '',
            carrierId:
+              item.customerId ||
              item.partyBId ||
              item.partyBUserId ||
              item.contractPartyBId ||
              item.customerContractPartyBId ||
              item.carrierId ||
              '',
+            carrierPartyId: item.carrierPartyId || '',
+            carrierPartyRole: item.carrierPartyRole || '',
          }))
          .filter(item => item.carrierName);
      } finally {
@@ -1026,36 +1045,22 @@ export default {
      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 = await fetchDriversByCarrierOrganizations(
-          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-          carrier
-        );
+        this.driverOptions = await fetchDriverCandidates({
+          size: 20,
+          ...(keyword ? { driverName: keyword } : {}),
+          posts: '司机',
+        });
        return this.driverOptions;
      } finally {
        this.driverLoading = false;
      }
    },
    fetchDriverSuggestions(queryString, callback) {
-      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
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
        .then(records => {
          this.driverOptions = records;
          callback(
@@ -1080,19 +1085,13 @@ 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;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
        .then(records => {
          callback(
            records.map(item => ({
@@ -1154,7 +1153,7 @@ export default {
        id: `${route.segmentNo}-${item.cargoName}-${Date.now()}-${Math.random()}`,
        batchNo,
        segmentNo: route.segmentNo, relationNo: route.segmentNo, documentType: route.documentType, transportType: route.transportType, carrierType: route.carrierType,
-        carrierContractId: route.carrierContractId, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
+        carrierContractId: route.carrierContractId, carrierPartyId: route.carrierPartyId, carrierPartyRole: route.carrierPartyRole, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
        departureName: route.departureName, departureAddress: route.departureAddress, departureContact: route.departureContact, departurePhone: route.departurePhone,
        arrivalName: route.arrivalName, arrivalAddress: route.arrivalAddress, arrivalContact: route.arrivalContact, arrivalPhone: route.arrivalPhone,
        estimatedStartTime: route.estimatedStartTime, estimatedEndTime: route.estimatedEndTime,
@@ -94,7 +94,7 @@
                <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="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-input v-if="isNonRoadAddress(`route-${index}`)" v-model="route.departureName" class="route-address-name" readonly :disabled="isBasicRouteReadonly" placeholder="请选择站点" /><el-cascader v-else v-model="addressRegionPaths[`route-${index}`]" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="isBasicRouteReadonly" 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" placeholder="请输入详细地址" @click="handleAddressDetailClick(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="isBasicRouteReadonly" @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" :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>
@@ -111,7 +111,7 @@
              <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="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-input v-if="isNonRoadAddress('arrival')" v-model="form.arrivalName" class="route-address-name" readonly :disabled="isBasicRouteReadonly" placeholder="请选择站点" /><el-cascader v-else v-model="addressRegionPaths.arrival" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="isBasicRouteReadonly" 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" placeholder="请输入详细地址" @click="handleAddressDetailClick('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="OfficeBuilding" :disabled="isBasicRouteReadonly" @click="openCommonAddress('arrival')" /></el-tooltip></div
                  ></el-form-item>
                  <el-form-item label="联系人" class="route-contact-form-item"
                    ><el-input v-model="form.arrivalContact" :disabled="isBasicRouteReadonly" placeholder="请输入" /></el-form-item>
@@ -352,7 +352,12 @@
      @opened="loadAddressList"
    >
      <div class="route-dialog__search common-address-dialog__search">
-        <el-form :model="addressQuery" label-position="right" label-width="auto">
+        <el-form
+          class="dialog-form-label-fixed"
+          :model="addressQuery"
+          label-position="right"
+          label-width="96px"
+        >
          <el-row :gutter="16">
            <el-col :span="6">
              <el-form-item label="地址名称">
@@ -446,7 +451,12 @@
      @opened="loadStationList"
    >
      <div class="route-dialog__search">
-        <el-form :model="stationQuery" label-position="right" label-width="auto">
+        <el-form
+          class="dialog-form-label-fixed"
+          :model="stationQuery"
+          label-position="right"
+          label-width="96px"
+        >
          <el-row :gutter="16">
            <el-col :span="8"><el-form-item label="站点名称"><el-input v-model="stationQuery.name" clearable placeholder="请输入" /></el-form-item></el-col>
            <el-col :span="8"><el-form-item label="详细地址"><el-input v-model="stationQuery.detailAddress" clearable placeholder="请输入" /></el-form-item></el-col>
@@ -652,6 +662,8 @@ export default {
      addressQuery: {},
      addressPage: { current: 1, size: 10, total: 0 },
      addressRegionPaths: { departure: [], arrival: [] },
+      // 程序回填省市区时抑制 cascader @change，避免空值回调把已填地址清空
+      suppressAddressRegionChange: false,
      regionOptions: [],
      regionLoading: false,
      regionRequest: null,
@@ -714,7 +726,7 @@ export default {
        'msg',
        'zip',
      ],
-      transports: ['公路运输', '铁路运输', '水路运输', '航空运输'],
+      transports: ['铁路运输', '水路运输', '航空运输', '公路运输'],
      quantityUnitOptions: [],
      quantityUnitLoading: false,
      form: {
@@ -798,6 +810,7 @@ export default {
  methods: {
    formatContractOptionLabel,
    defaultQuantityUnit() {
+      if (this.quantityUnitOptions.includes('吨')) return '吨';
      return this.quantityUnitOptions[0] || '吨';
    },
    loadQuantityUnitOptions() {
@@ -888,26 +901,63 @@ export default {
    findRegionPathByName(options = [], regionName = '', parents = []) {
      const target = String(regionName || '').replace(/\s+/g, '');
      if (!target) return [];
+      let suffixMatch = [];
      for (const item of options) {
        const nextParents = [...parents, item];
        const name = nextParents.map(region => region.title || region.name || '').join('');
        if (name === target) return nextParents.map(region => region.id);
+        // 常用地址可能缺省名，允许「市+区」后缀命中完整省市区路径
+        if (!suffixMatch.length && name.endsWith(target) && target.length >= 2) {
+          suffixMatch = nextParents.map(region => region.id);
+        }
        const path = this.findRegionPathByName(item.children, target, nextParents);
        if (path.length) return path;
      }
-      return [];
+      return suffixMatch;
    },
    findRegionPathByCode(options = [], regionCode = '', parents = []) {
      const target = String(regionCode || '').trim();
      if (!target) return [];
      for (const item of options) {
        const nextParents = [...parents, item];
-        if (String(item.id) === target) return nextParents.map(region => region.id);
+        if (String(item.id) === target || String(item.value || '') === target) {
+          return nextParents.map(region => region.id);
+        }
        const path = this.findRegionPathByCode(item.children, target, nextParents);
        if (path.length) return path;
      }
      return [];
    },
+    resolveRegionPath(field) {
+      if (!field) return [];
+      const codePath = this.findRegionPathByCode(
+        this.regionOptions,
+        field.model[field.regionCode]
+      );
+      if (codePath.length) return codePath;
+      const namePath = this.findRegionPathByName(this.regionOptions, field.model[field.name]);
+      if (namePath.length) return namePath;
+      const composed = [field.model[field.provinceName], field.model[field.cityName], field.model[field.districtName]]
+        .filter(Boolean)
+        .join('');
+      return this.findRegionPathByName(this.regionOptions, composed);
+    },
+    setAddressRegionPath(target, path = []) {
+      const nextPath = Array.isArray(path) ? path.map(item => String(item)) : [];
+      const current = this.addressRegionPaths[target] || [];
+      if (
+        current.length === nextPath.length &&
+        current.every((item, index) => String(item) === String(nextPath[index]))
+      ) {
+        return;
+      }
+      this.suppressAddressRegionChange = true;
+      // Vue3 直接写动态 key，避免整体替换对象导致其它 cascader 重建并触发空 @change
+      this.addressRegionPaths[target] = nextPath;
+      this.$nextTick(() => {
+        this.suppressAddressRegionChange = false;
+      });
+    },
    regionLabels(path = []) {
      let options = this.regionOptions;
      const labels = [];
@@ -946,10 +996,22 @@ export default {
      this.setAddressRegionNames(field, [provinceMatch?.[0], cityMatch?.[0], districtMatch?.[0]]);
    },
    handleAddressRegionChange(target, value) {
+      if (this.suppressAddressRegionChange) return;
      const field = this.addressModel(target);
      const path = Array.isArray(value) ? value.map(item => String(item)) : [];
-      this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
+      this.setAddressRegionPath(target, path);
      if (!field) return;
+      // 程序回填/重建过程中 cascader 可能短暂抛出空值，不能据此清空已选常用地址
+      if (!path.length) {
+        const hasExisting =
+          String(field.model[field.name] || '').trim() ||
+          String(field.model[field.address] || '').trim() ||
+          String(field.model[field.regionCode] || '').trim();
+        if (hasExisting) {
+          this.$nextTick(() => this.syncAddressRegionPath(target));
+          return;
+        }
+      }
      const labels = this.regionLabels(path);
      field.model[field.name] = labels.join('');
      field.model[field.regionCode] = path.at(-1) || '';
@@ -958,19 +1020,29 @@ export default {
    },
    syncAddressRegionPath(target) {
      const field = this.addressModel(target);
-      if (!field) return;
-      const codePath = this.findRegionPathByCode(this.regionOptions, field.model[field.regionCode]);
-      const path = codePath.length
-        ? codePath
-        : this.findRegionPathByName(this.regionOptions, field.model[field.name]);
-      this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
+      if (!field || !this.regionOptions.length) return;
+      const path = this.resolveRegionPath(field);
+      this.setAddressRegionPath(target, path);
      if (path.length) this.setAddressRegionNames(field, this.regionLabels(path));
    },
    syncAddressRegionPaths() {
      if (!this.regionOptions.length) return;
-      ['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(target => {
-        this.syncAddressRegionPath(target);
-      });
+      this.suppressAddressRegionChange = true;
+      try {
+        ['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(
+          target => {
+            const field = this.addressModel(target);
+            if (!field) return;
+            const path = this.resolveRegionPath(field);
+            this.addressRegionPaths[target] = path;
+            if (path.length) this.setAddressRegionNames(field, this.regionLabels(path));
+          }
+        );
+      } finally {
+        this.$nextTick(() => {
+          this.suppressAddressRegionChange = false;
+        });
+      }
    },
    async loadDetail(id) {
      const res = await api.getDetail(id);
@@ -1144,13 +1216,15 @@ export default {
      };
    },
    addressTransportType(target) {
-      if (target.startsWith('route-')) {
-        return this.form.routes[Number(target.slice(6))]?.transportType || '';
+      const key = String(target || '');
+      if (key.startsWith('route-')) {
+        return String(this.form.routes[Number(key.slice(6))]?.transportType || '');
      }
-      return target === 'arrival' ? this.form.finalTransportType : this.form.routes[0]?.transportType || '';
+      if (key === 'arrival') return String(this.form.finalTransportType || '');
+      return String(this.form.routes[0]?.transportType || '');
    },
    addressTransportMode(target) {
-      const type = this.addressTransportType(target);
+      const type = String(this.addressTransportType(target) || '');
      if (type.includes('铁路')) return 'rail';
      if (type.includes('水路') || type.includes('水运') || type.includes('海运')) return 'water';
      if (type.includes('航空') || type.includes('空运')) return 'air';
@@ -1164,8 +1238,7 @@ export default {
      const field = this.addressModel(target);
      if (!field) return false;
      const siteCode = String(field.model[field.siteCode] || '').trim();
-      // 地址展示模式由实际选择的数据决定：有站点编码表示非公路站点名称，
-      // 没有站点编码则保留省市区级联，避免切换运输方式时改写已有地址。
+      // 展示模式由已选数据决定：有站点编码则显示站点名，否则省市区；暂不按运输方式强制站点限制。
      return Boolean(siteCode && siteCode !== '/');
    },
    resolveAddressRegionCode(row = {}) {
@@ -1174,12 +1247,7 @@ export default {
    openCommonAddress(target) {
      if (this.isBasicRouteReadonly) return;
      this.addressTarget = target;
-      if (this.addressTransportMode(target) !== 'road') {
-        this.stationQuery = {};
-        this.stationPage.current = 1;
-        this.stationDialogVisible = true;
-        return;
-      }
+      // 暂不按运输方式限制站点：统一走常用地址选择。
      this.addressQuery = {};
      this.addressPage.current = 1;
      this.addressDialogVisible = true;
@@ -1224,8 +1292,9 @@ export default {
      this.stationPage.current = 1;
      this.loadStationList();
    },
-    selectStation(row) {
-      const target = this.addressModel(this.addressTarget);
+    async selectStation(row) {
+      const targetKey = this.addressTarget;
+      const target = this.addressModel(targetKey);
      if (!target) return;
      const station = this.normalizeStation(row);
      target.model[target.name] = station.stationName || station.regionName;
@@ -1236,7 +1305,9 @@ export default {
      target.model[target.siteCode] = station.stationCode;
      this.setAddressRegionNamesFromRow(target, station);
      this.stationDialogVisible = false;
-      this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
+      await this.loadRegionOptions();
+      await this.$nextTick();
+      this.syncAddressRegionPath(targetKey);
    },
    async loadAddressList() {
      this.addressLoading = true;
@@ -1262,8 +1333,9 @@ export default {
      this.addressPage.current = 1;
      this.loadAddressList();
    },
-    selectAddress(row) {
-      const target = this.addressModel(this.addressTarget);
+    async selectAddress(row) {
+      const targetKey = this.addressTarget;
+      const target = this.addressModel(targetKey);
      if (!target) return;
      target.model[target.name] = row.regionName || row.addressName || '';
      target.model[target.address] = row.detailAddress || row.address || '';
@@ -1275,22 +1347,17 @@ export default {
      target.model[target.siteCode] = '';
      this.setAddressRegionNamesFromRow(target, row);
      this.addressDialogVisible = false;
-      this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
+      await this.loadRegionOptions();
+      // nextTick 确保途经点动态 key 已挂载 cascader 后再回填路径
+      await this.$nextTick();
+      this.syncAddressRegionPath(targetKey);
    },
    handleAddressDetailClick(target) {
      if (this.isBasicRouteReadonly) return;
-      if (this.addressTransportMode(target) !== 'road') {
-        this.openCommonAddress(target);
-        return;
-      }
      this.openAddressMap(target);
    },
    openAddressMap(target) {
      if (this.isBasicRouteReadonly) return;
-      if (this.addressTransportMode(target) !== 'road') {
-        this.$message.info('非公路运输地址不能使用地图选择');
-        return;
-      }
      const field = this.addressModel(target);
      if (!field) return;
      this.mapTarget = target;
@@ -1690,7 +1757,11 @@ export default {
          '',
        cargoTypePath,
        quantity: row.quantity || '',
-        quantityUnit: row.quantityUnit || this.defaultQuantityUnit(),
+        // 常用货物单位若为空或「个」，新建总单统一默认「吨」
+        quantityUnit:
+          !row.quantityUnit || String(row.quantityUnit).trim() === '个'
+            ? this.defaultQuantityUnit()
+            : row.quantityUnit,
        packageType: row.packageType || row.package || '',
        brand: row.brand || '',
        specification: row.specification || row.spec || '',
@@ -1775,17 +1846,21 @@ export default {
      return formatUpdateUserName(row);
    },
    selectRoute(route) {
+      // 先写入运输方式（会触发地点清空），再回填线路地址，避免被清空逻辑覆盖。
+      this.form.finalTransportType = '公路运输';
+      if (!this.form.routes.length) this.addRoute();
+      if (this.form.routes[0]) this.form.routes[0].transportType = '公路运输';
      this.form.departureName = route.departureName || '';
      this.form.departureAddress = route.departureAddress || '';
      this.form.departureContact = route.departureContact || '';
      this.form.departurePhone = route.departurePhone || '';
+      this.form.departureSiteCode = '';
      this.form.arrivalName = route.arrivalName || '';
      this.form.arrivalAddress = route.arrivalAddress || '';
      this.form.arrivalContact = route.arrivalContact || '';
      this.form.arrivalPhone = route.arrivalPhone || '';
+      this.form.arrivalSiteCode = '';
      this.syncAddressRegionPaths();
-      this.form.finalTransportType = '公路运输';
-      if (!this.form.routes.length) this.addRoute();
      this.routeDialogVisible = false;
    },
    createRoute(index = this.form.routes.length) {
@@ -1793,12 +1868,23 @@ export default {
    },
    addRoute() {
      if (this.isBasicRouteReadonly) return;
-      this.form.routes.push(this.createRoute());
+      const index = this.form.routes.length;
+      this.form.routes.push(this.createRoute(index));
+      this.addressRegionPaths[`route-${index}`] = [];
    },
    removeRoute(index) {
      if (this.isBasicRouteReadonly) return;
      this.form.routes.splice(index, 1);
-      this.syncAddressRegionPaths();
+      const nextPaths = { departure: this.addressRegionPaths.departure || [], arrival: this.addressRegionPaths.arrival || [] };
+      this.form.routes.forEach((route, routeIndex) => {
+        nextPaths[`route-${routeIndex}`] = this.addressRegionPaths[`route-${routeIndex >= index ? routeIndex + 1 : routeIndex}`] || [];
+      });
+      this.suppressAddressRegionChange = true;
+      this.addressRegionPaths = nextPaths;
+      this.$nextTick(() => {
+        this.suppressAddressRegionChange = false;
+        this.syncAddressRegionPaths();
+      });
    },
    goodsKey(row = {}) {
      return `${row.cargoName || ''}\u0000${row.cargoType || ''}`;
@@ -10,7 +10,7 @@
        :class="{ 'punch-record-photos__grid--edit': editable }"
      >
        <div
-          v-for="(item, groupIndex) in group.items"
+          v-for="item in group.items"
          :key="`${item.photo.url}-${item.index}`"
          class="punch-record-photos__item"
          @click="handlePreview(item.index)"
@@ -23,8 +23,6 @@
            :lazy="lazy"
            fit="cover"
          />
-          <!-- 主图 = 该类型的第一张，按上传顺序取；没有独立字段，也不可切换 -->
-          <div v-if="groupIndex === 0" class="punch-record-photos__badge">主图</div>
          <el-link
            v-if="editable"
            class="punch-record-photos__remove"
@@ -59,7 +57,7 @@
 import { computed } from 'vue';

 // 打卡照片是每个打卡节点必有的一个照片类型，不由过程配置的凭证类型决定；
-// 它与各凭证类型各自最多 9 张，同一类型下第一张即界面上的「主图」。
+// 它与各凭证类型各自最多 9 张。
 const PUNCH_PHOTO_TYPE = '打卡照片';
 // 照片没带类型时的兜底名称，与后端落库时的兜底口径一致
 const PHOTO_TYPE_FALLBACK = '凭证';
@@ -252,18 +250,6 @@ const countText = group =>
    }
  }

-  &__badge {
-    position: absolute;
-    top: 0;
-    left: 0;
-    padding: 0 6px;
-    border-radius: 4px 0 4px 0;
-    background: rgba(64, 158, 255, 0.9);
-    font-size: 12px;
-    line-height: 18px;
-    color: #fff;
-  }
-
  &__remove {
    align-self: center;
    font-size: 12px;
@@ -1870,7 +1870,11 @@
                :fetch-suggestions="fetchTaskDriverSuggestions"
                :loading="taskDriverLoading"
                @select="item => handleTaskDriverSelect('dispatch', item)"
-              />
+              >
+                <template #default="{ item }">
+                  <span>{{ driverOptionText(item) }}</span>
+                </template>
+              </el-autocomplete>
            </el-form-item>
            <el-form-item
              :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
@@ -1893,7 +1897,11 @@
                :fetch-suggestions="fetchTaskEscortSuggestions"
                :loading="taskEscortLoading"
                @select="handleTaskEscortSelect"
-              />
+              >
+                <template #default="{ item }">
+                  <span>{{ driverOptionText(item) }}</span>
+                </template>
+              </el-autocomplete>
            </el-form-item>
            <el-form-item v-if="dispatchItemForm.carrierType !== '承运商'" label="押运人手机号">
              <el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
@@ -2760,7 +2768,7 @@ import {
  getList as getProjectList,
 } from '@/api/business/project-apply';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
-import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } 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';
@@ -3809,6 +3817,7 @@ export default {
  },
  methods: {
    formatContractOptionLabel,
+    driverOptionText,
    initStandaloneFormPage() {
      if (!this.isStandaloneFormPage) return;
      const mode = this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -3940,9 +3949,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatDispatchQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
+          const typeName =
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
        })
        .join('； ');
    },
@@ -4178,6 +4187,7 @@ export default {
        waiting: ['待执行', 'is-pending'],
        processing: ['进行中', 'is-processing'],
        running: ['进行中', 'is-processing'],
+        pending_return_confirm: ['待回单确认', 'is-pending'],
        completed: ['已完成', 'is-completed'],
        cancelled: ['已取消', 'is-cancelled'],
      };
@@ -4988,16 +4998,8 @@ export default {
    },
    fetchTaskDriverSuggestions(queryString, callback) {
      const keyword = String(queryString || '').trim();
-      const carrier = this.getDispatchCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
      this.taskDriverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
        .then(records => {
          this.taskDriverOptions = records;
          callback(
@@ -5017,16 +5019,12 @@ export default {
    },
    fetchTaskEscortSuggestions(queryString, callback) {
      const keyword = String(queryString || '').trim();
-      const carrier = this.getDispatchCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
      this.taskEscortLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
        .then(records => {
          this.taskEscortOptions = records;
          callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
@@ -7551,12 +7549,13 @@ export default {
      }, {});

      const cargoInfo = Object.values(groups)
-        .map(
-          group =>
-            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
-              group.quantity
-            )}${group.unit ? ` ${group.unit}` : ''}`
-        )
+        .map(group => {
+          const typeName =
+            group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
+          return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
+        })
        .join('； ');
      return cargoInfo || plan.goodsInfo || '';
    },
@@ -8044,12 +8043,6 @@ export default {
      this.taskDriverOptions = [];
      this.taskEscortOptions = [];
    },
-    getDispatchCarrierFilter() {
-      return {
-        carrierId: this.dispatchItemForm.carrierId || '',
-        carrierName: this.dispatchItemForm.carrierName || '',
-      };
-    },
    handleDispatchCargoQuantityInput(row, value) {
      const text = String(value || '').replace(/[^\d.]/g, '');
      const parts = text.split('.');
@@ -1381,11 +1381,23 @@ const formatOptionalNumber = value => {
  const normalized = normalizeOptionalImportNumber(value);
  return normalized === null || normalized === undefined ? '' : normalized;
 };
+// 明细接口返回运单实体字段 startDate/endDate/estimatedStartTime/estimatedEndTime，
+// 而明细表与编辑回填按导入列字段名 actualStartDate 等读取，重载后在此对齐，否则实际/预计时间列为空。
+const detailDateAliases = {
+  actualStartDate: 'startDate',
+  actualEndDate: 'endDate',
+  planStartDate: 'estimatedStartTime',
+  planEndDate: 'estimatedEndTime',
+};
 const normalizeDetailRow = row => {
  const next = { ...(row || {}) };
  OPTIONAL_NUMBER_PROPS.forEach(prop => {
    next[prop] = formatOptionalNumber(next[prop]);
  });
+  Object.entries(detailDateAliases).forEach(([prop, source]) => {
+    if (String(next[prop] ?? '').trim()) return;
+    if (String(next[source] ?? '').trim()) next[prop] = next[source];
+  });
  return next;
 };
 const normalizeImportRow = row => ({
@@ -1200,7 +1200,11 @@
                  :loading="taskDriverLoading"
                  :disabled="dialogReadonly"
                  @select="handleTaskDriverSelect"
-                />
+                >
+                  <template #default="{ item }">
+                    <span>{{ driverOptionText(item) }}</span>
+                  </template>
+                </el-autocomplete>
              </el-form-item>
              <el-form-item
                v-if="isRoadTransport"
@@ -1279,7 +1283,11 @@
                  :loading="taskEscortLoading"
                  :disabled="dialogReadonly"
                  @select="handleTaskEscortSelect"
-                />
+                >
+                  <template #default="{ item }">
+                    <span>{{ driverOptionText(item) }}</span>
+                  </template>
+                </el-autocomplete>
              </el-form-item>
              <el-form-item v-if="showRoadEscortFields" label="押运人手机号">
                <el-input
@@ -1594,6 +1602,13 @@
          <el-link type="primary" v-if="canComplete(row)" @click="handleAction('complete', row)">
            {{ completeActionLabel }}
          </el-link>
+          <el-link
+            type="primary"
+            v-if="canConfirmReturn(row)"
+            @click="handleAction('confirmReturn', row)"
+          >
+            {{ completeActionLabel }}
+          </el-link>
          <el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
            维护里程
          </el-link>
@@ -1653,7 +1668,11 @@
              style="width: 100%"
              @select="handleReassignDriverSelect"
              @change="handleReassignDriverChange"
-            />
+            >
+              <template #default="{ item }">
+                <span>{{ driverOptionText(item) }}</span>
+              </template>
+            </el-autocomplete>
          </el-form-item>
          <el-form-item
            label="手机号"
@@ -2252,6 +2271,13 @@
                              <span v-if="record.volume">体积 {{ record.volume }}方</span>
                              <span v-if="record.quantity">数量 {{ record.quantity }}</span>
                            </div>
+                            <!-- 里程只挂在末位节点上（needMileage 由后端下发），显示的是运单里程 -->
+                            <div
+                              v-if="record.needMileage && Number(record.mileage) > 0"
+                              class="waybill-manage-page__punch-record-line"
+                            >
+                              里程 {{ record.mileage }} 公里
+                            </div>
                            <div
                              v-if="record.remark"
                              class="waybill-manage-page__punch-record-line"
@@ -2848,6 +2874,20 @@
                />
              </el-form-item>
            </el-col>
+            <!-- 里程只在末位打卡节点出现：后端按「末位 + 计费规则含里程」下发 needMileage，前端不自己推 -->
+            <el-col v-if="waybillPunchEditMileageVisible" :span="8">
+              <el-form-item label="里程">
+                <el-input
+                  v-model="waybillPunchEditForm.mileage"
+                  maxlength="10"
+                  :disabled="waybillPunchEditMileageLocked"
+                  placeholder="请输入"
+                  @input="handleWaybillPunchMileageInput"
+                >
+                  <template #append>公里</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
            <el-col :span="24">
              <el-form-item label="备注">
                <el-input
@@ -3683,6 +3723,7 @@ import {
  getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
 import {
+  getList as getWaybillList,
  getPunchRecords as getWaybillPunchRecords,
  locateVehicle,
  savePunchRecord,
@@ -3692,9 +3733,7 @@ import VoucherExecutionDetail from './voucher-execution-detail.vue';
 import PunchRecordPhotos from './punch-record-photos.vue';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
-import {
-  fetchDriversByCarrierOrganizations,
-} from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } 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';
@@ -4011,6 +4050,7 @@ export default {
        weight: '',
        volume: '',
        quantity: '',
+        mileage: '',
        remark: '',
        photos: [],
      },
@@ -4370,9 +4410,15 @@ export default {
        addBtn: this.canCreate,
      };
    },
-    // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水
+    // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水。
+    // 时间轴的「编辑打卡 / 补卡」链接是本页唯一写入入口，提交固定 punched=true。
+    // 取消打卡不在本页；待回单确认的运单不显示该链接。
    canEditWaybillPunchRecord() {
-      return this.hasPermission(`${this.config.permission}_edit`) && !this.readonlyScope;
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !this.readonlyScope &&
+        this.statusValue(this.detailRow) !== 'pending_return_confirm'
+      );
    },
    waybillPunchEditNode() {
      return this.findWaybillPunchEditNodeConfig(this.waybillPunchEditRecord);
@@ -4407,6 +4453,15 @@ export default {
    waybillPunchEditPunchDisabled() {
      return this.waybillPunchEditNode?.punch === false;
    },
+    // 里程：后端下发 needMileage 才出现（末位打卡节点 + 计费规则含里程）；在途打卡不采集里程
+    waybillPunchEditMileageVisible() {
+      const record = this.waybillPunchEditRecord || {};
+      return record.needMileage === true && record.type !== 'enroute';
+    },
+    // 已生成结算单的运单里程冻结：输入框置灰，改动由后端拒绝
+    waybillPunchEditMileageLocked() {
+      return this.waybillPunchEditRecord?.mileageLocked === true;
+    },
    waybillPunchEditRules() {
      return { punchTime: [{ required: true, message: '请选择打卡时间', trigger: 'change' }] };
    },
@@ -4595,9 +4650,14 @@ export default {
    },
    taskCarrierValue: {
      get() {
-        return this.form.carrierType === '自运'
-          ? this.form.carrierName || ''
-          : this.form.carrierContractId || this.form.carrierName || '';
+        if (this.form.carrierType === '自运') {
+          return this.form.carrierName || '';
+        }
+        return this.taskCarrierOptionValue({
+          carrierContractId: this.form.carrierContractId,
+          carrierPartyId: this.form.carrierPartyId,
+          carrierName: this.form.carrierName,
+        });
      },
      set(value) {
        this.handleTaskCarrierChange(value);
@@ -4800,6 +4860,7 @@ export default {
  },
  methods: {
    formatContractOptionLabel,
+    driverOptionText,
    parseRouteChangeContent,
    // 页面被 keep-alive 缓存/卸载时调用，关闭本页所有 append-to-body 的弹窗，
    // 避免 Teleport 出去的 DOM 残留在 body 上盖住后续页面（详见 data 里的说明）。
@@ -4957,9 +5018,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
+          const typeName =
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
        })
        .join('； ');
    },
@@ -5060,11 +5121,16 @@ export default {
      );
    },
    canCopy(row) {
+      if (!row) return false;
+      // 归属本账号可见范围的运单允许复制。跨组织但项目归属本账号的记录会被标成只读，
+      // 只读仅拦截编辑/删除，不拦截复制。具备查看、新增、编辑或复制权限即可使用。
      return (
        this.hasAction('copy') &&
-        this.hasPermission(`${this.config.permission}_copy`) &&
        !this.readonlyScope &&
-        !row.readonly
+        (this.hasPermission(`${this.config.permission}_copy`) ||
+          this.hasPermission(`${this.config.permission}_add`) ||
+          this.hasPermission(`${this.config.permission}_edit`) ||
+          this.hasPermission(`${this.config.permission}_view`))
      );
    },
    canEnable(row) {
@@ -5099,7 +5165,8 @@ export default {
        return false;
      }
      const status = this.statusValue(row);
-      return status === 'pending';
+      // 待回单确认可取消，取消不生成应收应付
+      return status === 'pending' || status === 'pending_return_confirm';
    },
    canComplete(row) {
      if (
@@ -5111,8 +5178,22 @@ export default {
        return false;
      }
      const status = this.statusValue(row);
+      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
+      // 只有确认回单不可用时才退回这里的普通完成
+      if (status === 'pending_return_confirm') {
+        return !this.canConfirmReturn(row);
+      }
      return status === 'processing' || status === 'running';
    },
+    canConfirmReturn(row) {
+      return (
+        this.hasAction('confirmReturn') &&
+        this.hasPermission(`${this.config.permission}_complete`) &&
+        !this.readonlyScope &&
+        !row.readonly &&
+        this.statusValue(row) === 'pending_return_confirm'
+      );
+    },
    canMaintainMileage(row) {
      return (
        this.config.permission === 'waybill_manage' &&
@@ -5926,6 +6007,8 @@ export default {
        weight: record.weight || '',
        volume: record.volume || '',
        quantity: record.quantity || '',
+        // 里程只有正整数口径，后端若仍下发 "200.00" 会过不了提交时的正整数校验
+        mileage: Number(record.mileage) > 0 ? String(Number(record.mileage)) : '',
        remark: record.remark || '',
        photos: (record.photos || [])
          .filter(photo => photo?.url)
@@ -6001,10 +6084,22 @@ export default {
      photos.splice(index, 1);
      this.waybillPunchEditForm.photos = photos;
    },
+    // 里程只收整数：非数字直接丢掉，长度与「维护里程」一致（≤10 位）
+    handleWaybillPunchMileageInput(value) {
+      this.waybillPunchEditForm.mileage = String(value || '')
+        .replace(/\D/g, '')
+        .slice(0, 10);
+    },
    async submitWaybillPunchRecordEdit() {
      await this.$refs.waybillPunchRecordEditFormRef.validate();
      const record = this.waybillPunchEditRecord;
      const form = this.waybillPunchEditForm;
+      // 管理端里程选填：留空表示不改动运单里程，所以只校验填了值的情况
+      const mileageText = String(form.mileage || '').trim();
+      if (this.waybillPunchEditMileageVisible && mileageText && !/^[1-9]\d{0,9}$/.test(mileageText)) {
+        this.$message.warning('里程必须为不超过10位的正整数');
+        return;
+      }
      const submit =
        typeof this.api?.savePunchRecord === 'function' ? this.api.savePunchRecord : savePunchRecord;
      this.waybillPunchRecordEditDialog.submitting = true;
@@ -6023,6 +6118,8 @@ export default {
          weight: form.weight,
          volume: form.volume,
          quantity: form.quantity,
+          // 不传代表不改；后端按 null 处理
+          mileage: mileageText ? Number(mileageText) : undefined,
          remark: form.remark,
          photos: form.photos.map(photo => ({ url: photo.url, type: photo.type })),
        });
@@ -6543,6 +6640,9 @@ export default {
      if (status === 'completed') {
        return 'primary';
      }
+      if (status === 'pending_return_confirm') {
+        return 'warning';
+      }
      return 'warning';
    },
    normalizeRow(row, saveAsDraft = false) {
@@ -7195,6 +7295,8 @@ export default {
        this.form.carrierName = '';
        this.form.carrierId = '';
        this.form.carrierContractId = '';
+        this.form.carrierPartyId = '';
+        this.form.carrierPartyRole = '';
        this.hasProjectProcessConfig = false;
        this.waybillProcessConfigRows = [];
        return;
@@ -7209,6 +7311,8 @@ export default {
      this.form.carrierName = '';
      this.form.carrierId = '';
      this.form.carrierContractId = '';
+      this.form.carrierPartyId = '';
+      this.form.carrierPartyRole = '';
      this.loadProjectProcessConfigState();
      this.loadTaskCarrierOptions(project);
      if (this.contractSelectEnabled) {
@@ -7665,6 +7769,8 @@ export default {
      this.form.carrierName = '';
      this.form.carrierId = '';
      this.form.carrierContractId = '';
+      this.form.carrierPartyId = '';
+      this.form.carrierPartyRole = '';
      this.form.driverId = '';
      this.form.driverName = '';
      this.form.driverPhone = '';
@@ -7719,7 +7825,9 @@ export default {
    },
    taskCarrierOptionValue(item = {}) {
      if (this.form.carrierType !== '自运') {
-        return item.carrierContractId || item.value || item.id || '';
+        if (item.value) return item.value;
+        return [item.carrierContractId || item.id || '', item.carrierPartyId || '', item.carrierName || '']
+          .join('__');
      }
      return (
        item.carrierName ||
@@ -7757,55 +7865,76 @@ export default {
      names.forEach(append);
      return options;
    },
+    parseContractPartyRows(partyJson, fallbackName = '', partyRole = 'B') {
+      const rows = this.parseJsonArray(partyJson)
+        .map(item => ({
+          id: item.id || '',
+          customerId: item.customerId || '',
+          customerName: String(item.customerName || '').trim(),
+          creditCode: item.creditCode || '',
+          partyRole,
+        }))
+        .filter(item => item.customerName);
+      if (rows.length) return rows;
+      return String(fallbackName || '')
+        .split(/[、,，]/)
+        .map(name => name.trim())
+        .filter(Boolean)
+        .map(name => ({
+          id: '',
+          customerId: '',
+          customerName: name,
+          creditCode: '',
+          partyRole,
+        }));
+    },
    getWaybillCarrierContractOptions(contracts = []) {
-      const carrierNameCounts = contracts.reduce((counts, contract) => {
-        const carrierName = String(
-          contract.partyB ||
-          contract.partyBName ||
-          contract.contractPartyB ||
-          contract.customerContractPartyB ||
-          contract.secondParty ||
-          contract.secondPartyName ||
-          ''
-        ).trim();
-        if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
-        return counts;
-      }, {});
-      return contracts
-        .map(contract => {
-          const carrierName = String(
+      const options = [];
+      contracts.forEach(contract => {
+        if (!contract?.id) return;
+        const parties = [
+          ...this.parseContractPartyRows(contract.partyBJson, contract.partyB, 'B'),
+          ...this.parseContractPartyRows(contract.partyCJson, contract.partyC, 'C'),
+        ];
+        if (!parties.length) {
+          const fallbackName = String(
            contract.partyB ||
-            contract.partyBName ||
-            contract.contractPartyB ||
-            contract.customerContractPartyB ||
-            contract.secondParty ||
-            contract.secondPartyName ||
-            ''
+              contract.partyBName ||
+              contract.contractPartyB ||
+              contract.customerContractPartyB ||
+              contract.secondParty ||
+              contract.secondPartyName ||
+              ''
          ).trim();
-          if (!carrierName || !contract.id) return null;
-          const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
-          return {
+          if (fallbackName) {
+            parties.push({
+              id: '',
+              customerId: '',
+              customerName: fallbackName,
+              creditCode: '',
+              partyRole: 'B',
+            });
+          }
+        }
+        const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
+        parties.forEach(party => {
+          const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
+          const optionValue = [contract.id, party.id || '', party.customerName].join('__');
+          options.push({
            id: contract.id,
-            carrierId:
-              contract.partyBId ||
-              contract.partyBUserId ||
-              contract.contractPartyBId ||
-              contract.customerContractPartyBId ||
-              contract.secondPartyId ||
-              contract.secondPartyUserId ||
-              contract.carrierId ||
-              '',
-            value: contract.id,
-            label:
-              carrierNameCounts[carrierName] > 1
-                ? `${carrierName}（${contractIdentifier}）`
-                : carrierName,
-            carrierName,
-            fullName: carrierName,
+            carrierId: party.customerId || '',
+            value: optionValue,
+            label: `${party.customerName}（${roleLabel}） - ${contractIdentifier}`,
+            carrierName: party.customerName,
+            fullName: party.customerName,
            carrierContractId: contract.id,
-          };
-        })
-        .filter(Boolean);
+            carrierPartyId: party.id || '',
+            carrierPartyRole: party.partyRole,
+            creditCode: party.creditCode || '',
+          });
+        });
+      });
+      return options;
    },
    resetWaybillCarrierContractState() {
      this.waybillCarrierContractRequestId += 1;
@@ -7835,6 +7964,8 @@ export default {
            this.form.carrierName = '';
            this.form.carrierId = '';
            this.form.carrierContractId = '';
+            this.form.carrierPartyId = '';
+            this.form.carrierPartyRole = '';
          }
          return options;
        })
@@ -7925,10 +8056,14 @@ export default {
      );
      if (this.form.carrierType !== '自运') {
        this.form.carrierContractId = carrier?.carrierContractId || '';
+        this.form.carrierPartyId = carrier?.carrierPartyId || '';
+        this.form.carrierPartyRole = carrier?.carrierPartyRole || '';
        this.form.carrierId = carrier?.carrierId || '';
        this.form.carrierName = carrier?.carrierName || '';
      } else {
        this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
+        this.form.carrierPartyId = '';
+        this.form.carrierPartyRole = '';
        this.form.carrierName = value || '';
      }
      // 承运商变更后清空司机/车辆，避免跨组织脏数据
@@ -7942,19 +8077,10 @@ export default {
      this.taskDriverOptions = [];
      this.taskEscortOptions = [];
    },
-    getTaskCarrierFilter() {
-      return {
-        carrierId: this.form.carrierId || '',
-        carrierName: this.form.carrierName || '',
-      };
-    },
    loadTaskDriverOptions() {
      if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
      this.taskDriverLoading = true;
-      return fetchDriversByCarrierOrganizations(
-        { size: 9999, posts: '司机' },
-        this.getTaskCarrierFilter()
-      )
+      return fetchDriverCandidates({ size: 9999, posts: '司机' })
        .then(records => {
          this.taskDriverOptions = records;
          return this.taskDriverOptions;
@@ -7965,16 +8091,8 @@ export default {
    },
    fetchTaskDriverSuggestions(queryString, callback) {
      const keyword = String(queryString || '').trim();
-      const carrier = this.getTaskCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
      this.taskDriverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
        .then(records => {
          this.taskDriverOptions = records;
          callback(
@@ -7994,16 +8112,12 @@ export default {
    },
    fetchTaskEscortSuggestions(queryString, callback) {
      const keyword = String(queryString || '').trim();
-      const carrier = this.getTaskCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
      this.taskEscortLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
        .then(records => {
          this.taskEscortOptions = records;
          callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
@@ -10150,8 +10264,14 @@ export default {
        cancel: '取消',
        complete: this.completeActionLabel,
        reassign: '重新派单',
+        confirmReturn: '完成',
      }[action];
-      this.$confirm(`确定${actionName}该${this.config.title}?`, '提示', {
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      const confirmText =
+        action === 'confirmReturn'
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
+          : `确定${actionName}该${this.config.title}?`;
+      this.$confirm(confirmText, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
@@ -10204,20 +10324,8 @@ export default {
    },
    fetchReassignDriverSuggestions(queryString, callback) {
      const keyword = String(queryString || '').trim();
-      const row = this.reassignDrawer.row || {};
-      const carrier = {
-        carrierId: row.carrierId || '',
-        carrierName: row.carrierName || '',
-      };
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
      this.reassignDrawer.driverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
        .then(records => {
          this.reassignDriverOptions = records;
          callback(
@@ -10356,7 +10464,14 @@ export default {
        this.$message.warning('请选择至少一条数据');
        return;
      }
-      this.$confirm('确定完成选中的运单?', '提示', {
+      const pendingReturnCount = this.selectionList.filter(
+        row => this.statusValue(row) === 'pending_return_confirm'
+      ).length;
+      const tip =
+        pendingReturnCount > 0
+          ? `确定完成选中的运单？其中 ${pendingReturnCount} 条为待回单确认，确认后将转为已完成。`
+          : '确定完成选中的运单?';
+      this.$confirm(tip, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
@@ -10370,25 +10485,38 @@ export default {
          this.onLoad(this.page, this.query);
        });
    },
-    handleRoadLoading() {
+    async handleRoadLoading() {
      if (!this.selectionList.length) {
        this.$message.warning('请选择至少一条数据');
        return;
      }
-      const nonRoadWaybills = this.selectionList.filter(row => !this.waybillIsRoadTransport(row));
-      if (nonRoadWaybills.length) {
-        this.$message.warning('公路配载仅支持运输方式为“公路运输”的运单');
+      const selectedIds = this.selectionList.map(row => row.id).filter(Boolean);
+      if (!selectedIds.length) {
+        this.$message.warning('请选择至少一条数据');
        return;
      }
-      const unavailableWaybills = this.selectionList.filter(
-        row =>
-          !['processing', 'running'].includes(this.statusValue(row)) ||
-          row.loadingId ||
-          row.loadingManageId ||
-          row.loadingNo
-      );
-      if (unavailableWaybills.length) {
-        this.$message.warning('公路配载仅支持进行中且未配载的运单');
+      // 可配载与否只看后端查询结果
+      let loadableIds;
+      try {
+        const res = await getWaybillList(1, selectedIds.length, {
+          loadableOnly: 1,
+          ids: selectedIds.join(','),
+        });
+        loadableIds = new Set(extractRecords(res).map(row => String(row.id)));
+      } catch (error) {
+        this.$message.error('校验运单可配载状态失败，请重试');
+        return;
+      }
+      const rejectedRows = this.selectionList.filter(row => !loadableIds.has(String(row.id)));
+      if (rejectedRows.length) {
+        const rejectedText = rejectedRows
+          .map(row => {
+            const reason = this.roadLoadingRejectReasonText(row);
+            const no = row.waybillNo || row.id || '';
+            return `${no}（${reason}）`;
+          })
+          .join('、');
+        this.$message.warning(`${rejectedText}；公路配载仅支持公路、待执行且未配载的运单`);
        return;
      }
      try {
@@ -10411,6 +10539,13 @@ export default {
        },
      });
    },
+    // 只给后端判定为不可配载的运单生成可读原因，本身不参与准入判定
+    roadLoadingRejectReasonText(row = {}) {
+      if (!this.waybillIsRoadTransport(row)) return '非公路运输';
+      if (String(row.businessStatus || '') !== 'pending') return '状态不是待执行';
+      if (row.loadingNo) return '已关联配载单';
+      return '运单数据可能已变化，请刷新后重试';
+    },
  },
 };
 </script>
@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="contract-change" :get-form="getForm">
+    <contract-manage-change ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import ContractManageChange from '@/views/business/contract-manage-change.vue';
+
+export default {
+  name: 'ContractChangePublicView',
+  components: { MkPublicShell, ContractManageChange },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.form || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
+    },
+  },
+};
+</script>
@@ -0,0 +1,407 @@
+<template>
+  <basic-container class="contract-change-page">
+    <avue-crud
+      :option="tableOption"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="tableForm"
+      ref="crud"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="primary" plain :loading="hcsRepushingId === 'batch'" @click="handleHcsBatchRepush">
+          批量同步
+        </el-button>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="hasPermission(`${config.permission}_delete`)"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+
+      <template #approvalStatus="{ row }">
+        {{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
+      </template>
+
+      <template #syncStatus="{ row }">
+        <el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
+          {{ syncLabel(row.syncStatus) }}
+        </el-tag>
+        <span v-else>-</span>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link type="primary" v-if="canView(row)" @click="openForm('view', row)"> 查看 </el-link>
+        <el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)"> 编辑 </el-link>
+        <el-link type="danger" v-if="canDelete(row)" @click="rowDel(row)"> 删除 </el-link>
+        <el-link
+          v-for="operation in customOperations(row)"
+          :key="operation.action"
+          :type="
+            operation.type === 'warning'
+              ? 'warning'
+              : operation.type === 'success'
+                ? 'success'
+                : 'primary'
+          "
+          @click="handleCustomOperation(operation, row)"
+        >
+          {{ operation.label }}
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import * as api from '@/api/business/contract-change';
+import { repushBatch as hcsRepushBatch } from '@/api/business/hcs';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { config, option } from '@/option/business/contract-change';
+import { approvalStatusOptions } from '@/option/business/common';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { isAdministrator } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+
+const contractChangeFormRoute = '/business/contract-change/form';
+const contractChangeListRefreshKey = 'contract-change-list-refresh';
+
+export default {
+  name: 'ContractChange',
+  data() {
+    return {
+      api,
+      config,
+      tableForm: {},
+      tableOption: this.buildTableOption(),
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      selectionList: [],
+      mkEnabled: false,
+      hcsRepushingId: null,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo', 'website']),
+    permissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+      };
+    },
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
+  activated() {
+    if (sessionStorage.getItem(contractChangeListRefreshKey)) {
+      sessionStorage.removeItem(contractChangeListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
+  methods: {
+    buildTableOption() {
+      return {
+        ...option,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 320,
+        column: (option.column || []).map(column => ({
+          ...column,
+          display: false,
+          align: 'center',
+          headerAlign: 'center',
+        })),
+      };
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission && this.permission[code], false);
+    },
+    statusLabel(status) {
+      return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+    },
+    syncLabel(value) {
+      return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
+    },
+    syncTagType(value) {
+      return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
+    },
+    canHcsRepush(row) {
+      return row.approvalStatus === 'approved' && row.contractId && row.syncStatus !== 'synced';
+    },
+    handleHcsBatchRepush() {
+      if (this.hcsRepushingId) return;
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      const rows = this.selectionList.filter(item => this.canHcsRepush(item));
+      if (!rows.length) {
+        this.$message.warning('请选择审批通过且未同步成功的变更单');
+        return;
+      }
+      this.$confirm(`确定同步选中的${rows.length}条合同变更到合规系统?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在推送合规，请稍候…',
+          background: 'rgba(255, 255, 255, 0.6)',
+        });
+        this.hcsRepushingId = 'batch';
+        const contractIds = [...new Set(rows.map(item => item.contractId))];
+        const changeIds = rows.map(item => item.id).join(',');
+        hcsRepushBatch('contract', contractIds)
+          .then(res => {
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || '批量同步失败');
+              return api.markSyncStatus(changeIds, 'failed');
+            }
+            return api.markSyncStatus(changeIds, 'synced').then(() => {
+              this.$message.success(res.data?.data || '批量同步成功');
+              this.onLoad(this.page, this.query);
+            });
+          })
+          .catch(() => api.markSyncStatus(changeIds, 'failed'))
+          .finally(() => {
+            this.hcsRepushingId = null;
+            loading.close();
+          });
+      });
+    },
+    inStatus(row, statusList) {
+      if (!statusList || !statusList.length) return true;
+      return statusList.includes(row.approvalStatus);
+    },
+    canEdit(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.editStatus)
+      );
+    },
+    canDelete(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_delete`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.deleteStatus)
+      );
+    },
+    canView(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_view`) &&
+        this.inStatus(row, this.config.viewStatus)
+      );
+    },
+    canOperation(operation, row) {
+      if (operation.permission && !this.hasPermission(operation.permission)) return false;
+      if (
+        row.readonly &&
+        ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)
+      ) {
+        return false;
+      }
+      return this.inStatus(row, operation.status);
+    },
+    customOperations(row) {
+      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
+        return this.canOperation(operation, row);
+      });
+    },
+    openForm(mode, row = {}) {
+      const query = { mode, id: row.id };
+      if (mode === 'edit') query.name = '编辑合同变更';
+      else if (mode === 'view') query.name = '查看合同变更';
+      this.$router.push({ path: contractChangeFormRoute, query });
+    },
+    handleCustomOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
+      const run = () => {
+        const request = () => this.api[operation.action](row.id);
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? submitMkApprovalFlow({
+                bizType: 'contract-change',
+                bizId: row.id,
+                subjectName: row.contractName || '',
+                approvalStatus: row.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
+              }).then(() => request())
+            : request();
+        const loading =
+          operation.action === 'approve'
+            ? this.$loading({
+                lock: true,
+                text: '正在推送合规，请稍候…',
+                background: 'rgba(255, 255, 255, 0.6)',
+              })
+            : null;
+        afterMk
+          .then(res => {
+            if (operation.action === 'approve' && res.data?.data === false) {
+              this.$message.warning(res.data?.msg);
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
+              return;
+            }
+            this.$message.success(`${operation.label}成功`);
+            this.onLoad(this.page, this.query);
+          })
+          .finally(() => loading && loading.close());
+      };
+      this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => run());
+    },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('变更单ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud?.toggleSelection?.();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(row.id).then(() => {
+          this.$message.success('删除成功!');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    handleDelete() {
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(this.ids).then(() => {
+          this.$message.success('删除成功!');
+          this.selectionClear();
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const values = {
+        ...this.query,
+        ...params,
+      };
+      this.api
+        .getList(page.currentPage, page.pageSize, values)
+        .then(res => {
+          const data = res.data.data || {};
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.contract-change-page {
+  :deep(.avue-crud__menu) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>
@@ -1,18 +1,32 @@
 <template>
  <basic-container class="contract-change-page">
    <div class="archive-page-form__title">{{ pageTitle }}</div>
-    <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto" class="contract-change-form">
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :disabled="pageReadonly"
+      label-position="right"
+      label-width="auto"
+      class="contract-change-form"
+    >
      <section class="change-section contract-basic-section">
        <div class="dialog-section-title">基本信息</div>
        <div class="contract-basic-section__grid">
          <el-form-item label="变更类型" class="contract-basic-section__change-type">
-            <el-radio-group v-model="form.changeType">
+            <el-radio-group v-model="form.changeType" :disabled="pageReadonly">
              <el-radio label="合同信息变更" />
+              <el-radio label="结算规则变更" />
              <el-radio label="终止合同" />
            </el-radio-group>
          </el-form-item>
          <el-form-item label="签约类型" prop="signType">
-            <el-select v-model="form.signType" placeholder="请选择签约类型" clearable>
+            <el-select
+              v-model="form.signType"
+              placeholder="请选择签约类型"
+              clearable
+              :disabled="isSettlementRuleChange"
+            >
              <el-option
                v-for="item in signTypeOptions"
                :key="item.value"
@@ -21,8 +35,14 @@
              />
            </el-select>
          </el-form-item>
-          <el-form-item label="合同编号">
-            <el-input v-model="form.contractNo" disabled />
+          <el-form-item label="合同编号" prop="contractNo">
+            <el-input
+              v-model="form.contractNo"
+              maxlength="100"
+              clearable
+              placeholder="请输入合同编号"
+              :disabled="isSettlementRuleChange"
+            />
          </el-form-item>
          <el-form-item label="合同名称" prop="contractName">
            <el-input
@@ -30,6 +50,7 @@
              maxlength="100"
              show-word-limit
              placeholder="请输入合同名称"
+              :disabled="isSettlementRuleChange"
            />
          </el-form-item>
          <el-form-item label="合同类型">
@@ -80,6 +101,7 @@
                format="YYYY-MM-DD"
                value-format="YYYY-MM-DD"
                placeholder="请输入"
+                :disabled="isSettlementRuleChange"
              />
              <span>至</span>
              <el-date-picker
@@ -88,6 +110,7 @@
                format="YYYY-MM-DD"
                value-format="YYYY-MM-DD"
                placeholder="请输入"
+                :disabled="isSettlementRuleChange"
              />
            </div>
          </el-form-item>
@@ -95,6 +118,7 @@
            <el-input
              v-model="form.paymentDays"
              placeholder="请输入"
+              :disabled="isSettlementRuleChange"
              @input="value => positiveIntegerInput('paymentDays', value)"
            >
              <template #suffix>天</template>
@@ -105,22 +129,36 @@
              :model-value="contractAmountDisplay"
              placeholder="请输入"
              clearable
+              :disabled="isSettlementRuleChange"
              @input="handleContractAmountInput"
              @blur="formatContractAmountField"
              @clear="form.contractAmount = null"
            />
          </el-form-item>
          <el-form-item label="是否范本">
-            <el-select v-model="form.templateFlag" placeholder="请选择">
+            <el-select
+              v-model="form.templateFlag"
+              placeholder="请选择"
+              :disabled="isSettlementRuleChange"
+            >
              <el-option label="否" :value="0" />
              <el-option label="是" :value="1" />
            </el-select>
          </el-form-item>
          <el-form-item label="原件合同编号">
-            <el-input v-model="form.originalContractNo" maxlength="100" placeholder="请输入" />
+            <el-input
+              v-model="form.originalContractNo"
+              maxlength="100"
+              placeholder="请输入"
+              :disabled="isSettlementRuleChange"
+            />
          </el-form-item>
          <el-form-item label="是否电子章">
-            <el-select v-model="form.electronicSealFlag" placeholder="请选择">
+            <el-select
+              v-model="form.electronicSealFlag"
+              placeholder="请选择"
+              :disabled="isSettlementRuleChange"
+            >
              <el-option label="否" :value="0" />
              <el-option label="是" :value="1" />
            </el-select>
@@ -129,13 +167,19 @@
            <el-input
              v-model="form.invoiceCycle"
              placeholder="请输入"
+              :disabled="isSettlementRuleChange"
              @input="value => positiveIntegerInput('invoiceCycle', value)"
            >
              <template #suffix>天</template>
            </el-input>
          </el-form-item>
          <el-form-item label="结算币种" prop="settlementCurrency">
-            <el-select v-model="form.settlementCurrency" placeholder="请选择结算币种" clearable>
+            <el-select
+              v-model="form.settlementCurrency"
+              placeholder="请选择结算币种"
+              clearable
+              :disabled="isSettlementRuleChange"
+            >
              <el-option
                v-for="item in settlementCurrencyOptions"
                :key="item.value"
@@ -145,7 +189,12 @@
            </el-select>
          </el-form-item>
          <el-form-item label="合同格式">
-            <el-select v-model="form.contractFormat" placeholder="请选择合同格式" clearable>
+            <el-select
+              v-model="form.contractFormat"
+              placeholder="请选择合同格式"
+              clearable
+              :disabled="isSettlementRuleChange"
+            >
              <el-option
                v-for="item in contractFormatOptions"
                :key="item.value"
@@ -158,19 +207,30 @@
            <el-input
              v-model="form.copyCount"
              placeholder="请输入"
+              :disabled="isSettlementRuleChange"
              @input="value => positiveIntegerInput('copyCount', value)"
            >
              <template #suffix>份</template>
            </el-input>
          </el-form-item>
          <el-form-item label="是否需要加盖法人章">
-            <el-select v-model="form.legalSealFlag" placeholder="请选择" clearable>
+            <el-select
+              v-model="form.legalSealFlag"
+              placeholder="请选择"
+              clearable
+              :disabled="isSettlementRuleChange"
+            >
              <el-option label="否" :value="0" />
              <el-option label="是" :value="1" />
            </el-select>
          </el-form-item>
          <el-form-item label="结算方式">
-            <el-select v-model="form.settlementMode" placeholder="请选择结算方式" clearable>
+            <el-select
+              v-model="form.settlementMode"
+              placeholder="请选择结算方式"
+              clearable
+              :disabled="isSettlementRuleChange"
+            >
              <el-option
                v-for="item in settlementModeOptions"
                :key="item.value"
@@ -191,6 +251,7 @@
            maxlength="1000"
            show-word-limit
            placeholder="请输入合同主要内容"
+            :disabled="isSettlementRuleChange"
          />
        </el-form-item>
        <el-form-item label="其他事项说明" class="contract-basic-section__remark">
@@ -201,6 +262,7 @@
            maxlength="200"
            show-word-limit
            placeholder="请输入其他事项说明"
+            :disabled="isSettlementRuleChange"
          />
        </el-form-item>
        <!-- 风险客商提示：合同已推送合规并留痕高风险/黑名单时展示，变更提交同样要求特批附件 -->
@@ -214,6 +276,7 @@
        title="用印材料"
        description
        attachment-type
+        :readonly="isSettlementRuleChange"
        :attachment-location-options="changeAttachmentLocationOptions"
        :rows="contractFileRows"
        :preview="previewAttachment"
@@ -224,12 +287,39 @@
      <section class="change-section">
        <div class="section-head">
          <div class="dialog-section-title">计费信息</div>
-          <el-button v-if="feeGenerationMode !== 'manual'" type="primary" plain @click="addPlan"
+          <el-button
+            v-if="!pageReadonly && feeGenerationMode !== 'manual'"
+            type="primary"
+            plain
+            @click="addPlan"
            >添加</el-button
          >
        </div>
-        <el-radio-group v-model="feeGenerationMode"><el-radio label="system">系统生成</el-radio><el-radio label="manual">账单导入生成</el-radio></el-radio-group>
-        <el-table :data="plans" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column prop="planName" label="方案名称" min-width="220" /><el-table-column label="默认方案" min-width="120"><template #default="{ row }">{{ row.defaultPlan ? '是' : '否' }}</template></el-table-column><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column label="操作" width="180"><template #default="{ row, $index }"><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
+        <el-radio-group v-model="feeGenerationMode"
+          ><el-radio label="system">系统生成</el-radio
+          ><el-radio label="manual">账单导入生成</el-radio></el-radio-group
+        >
+        <el-table :data="plans" border class="change-table">
+          <el-table-column type="index" label="序号" width="70" />
+          <el-table-column prop="planName" label="方案名称" min-width="180" />
+          <el-table-column label="适用客商" min-width="180">
+            <template #default="{ row }">
+              {{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" min-width="200" />
+          <el-table-column v-if="!pageReadonly" label="操作" width="180">
+            <template #default="{ row, $index }">
+              <el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
+              <el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
+            </template>
+          </el-table-column>
+          <el-table-column v-else label="操作" width="100">
+            <template #default="{ row, $index }">
+              <el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
+            </template>
+          </el-table-column>
+        </el-table>
      </section>

      <section class="change-section">
@@ -248,19 +338,106 @@
            <el-radio :label="0">关闭</el-radio>
          </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-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>
-          <el-form-item v-if="showSettlementCycleDays" label="周期天数" required><el-select v-model="settlementRule.cycleDays" placeholder="请选择周期天数"><el-option v-for="item in cycleDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
+        <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-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>
+          <el-form-item v-if="showSettlementCycleDays" label="周期天数" required
+            ><el-select v-model="settlementRule.cycleDays" placeholder="请选择周期天数"
+              ><el-option
+                v-for="item in cycleDayOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+          /></el-select></el-form-item>
        </el-form>
-        <el-table v-if="settlementRule.autoGenerate === 1 && showSettlementCustomPeriods" :data="settlementRule.customPeriods || []" border class="change-table custom-periods-table">
+        <el-table
+          v-if="settlementRule.autoGenerate === 1 && showSettlementCustomPeriods"
+          :data="settlementRule.customPeriods || []"
+          border
+          class="change-table custom-periods-table"
+        >
          <el-table-column type="index" label="序号" width="70" />
-          <el-table-column label="运单区间-开始日" min-width="180"><template #default="{ row, $index }"><el-select :model-value="row.startDay" placeholder="请选择" clearable @update:model-value="value => handleCustomPeriodStartDayChange($index, value)"><el-option v-for="item in billCutoffDayOptions" :key="`start-${item.value}`" :label="item.label" :value="item.value" /></el-select></template></el-table-column>
-          <el-table-column label="运单区间-结束日" min-width="200"><template #default="{ row, $index }"><el-select :model-value="row.endDay" placeholder="请选择" clearable @update:model-value="value => handleCustomPeriodEndDayChange($index, value)"><el-option v-for="item in customPeriodEndDayOptions(row)" :key="item.value" :label="item.label" :value="item.value" /></el-select></template></el-table-column>
-          <el-table-column label="操作" width="100"><template #default="{ $index }"><el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link><el-link v-else type="danger" @click="removeCustomPeriodRow($index)">删除</el-link></template></el-table-column>
-          <template #empty><el-link type="primary" @click="addCustomPeriodRow">添加</el-link></template>
+          <el-table-column label="运单区间-开始日" min-width="180"
+            ><template #default="{ row, $index }"
+              ><el-select
+                :model-value="row.startDay"
+                placeholder="请选择"
+                clearable
+                @update:model-value="value => handleCustomPeriodStartDayChange($index, value)"
+                ><el-option
+                  v-for="item in billCutoffDayOptions"
+                  :key="`start-${item.value}`"
+                  :label="item.label"
+                  :value="item.value"
+              /></el-select></template
+          ></el-table-column>
+          <el-table-column label="运单区间-结束日" min-width="200"
+            ><template #default="{ row, $index }"
+              ><el-select
+                :model-value="row.endDay"
+                placeholder="请选择"
+                clearable
+                @update:model-value="value => handleCustomPeriodEndDayChange($index, value)"
+                ><el-option
+                  v-for="item in customPeriodEndDayOptions(row)"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              /></el-select></template
+          ></el-table-column>
+          <el-table-column v-if="!pageReadonly" label="操作" width="100"
+            ><template #default="{ $index }"
+              ><el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link
+              ><el-link v-else type="danger" @click="removeCustomPeriodRow($index)"
+                >删除</el-link
+              ></template
+            ></el-table-column
+          >
+          <template #empty
+            ><el-link v-if="!pageReadonly" type="primary" @click="addCustomPeriodRow">添加</el-link></template
+          >
        </el-table>
      </section>

@@ -268,24 +445,57 @@
        <div class="dialog-section-title">
          付款比例设置
          <el-tooltip content="非必填；配置付款比例时，合计必须等于100%。" placement="top">
-            <el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
+            <el-icon style="margin-left: 4px; color: #909399; cursor: pointer"
+              ><el-icon-question-filled
+            /></el-icon>
          </el-tooltip>
        </div>
        <el-table :data="paymentRatioRows" border class="change-table">
          <el-table-column type="index" label="序号" width="70" />
          <el-table-column prop="paymentTerm" label="付款笔数" min-width="180" />
-          <el-table-column label="付款比例上限（%）" min-width="220"><template #default="{ row }"><el-input-number v-model="row.ratioLimit" :min="0" :max="100" :precision="2" controls-position="right" /></template></el-table-column>
-          <el-table-column label="备注" min-width="220"><template #default="{ row }"><el-input v-model="row.remark" maxlength="200" /></template></el-table-column>
-          <el-table-column label="操作" width="100"><template #default="{ $index }"><el-link type="danger" @click="paymentRatioRows.splice($index, 1)">删除</el-link></template></el-table-column>
+          <el-table-column label="付款比例上限（%）" min-width="220"
+            ><template #default="{ row }"
+              ><el-input-number
+                v-model="row.ratioLimit"
+                :min="0"
+                :max="100"
+                :precision="2"
+                controls-position="right"
+                :disabled="isSettlementRuleChange"
+            /></template
+          ></el-table-column>
+          <el-table-column label="备注" min-width="220"
+            ><template #default="{ row }"
+              ><el-input
+                v-model="row.remark"
+                maxlength="200"
+                :disabled="isSettlementRuleChange"
+            /></template
+          ></el-table-column>
+          <el-table-column v-if="!pageReadonly && !isSettlementRuleChange" label="操作" width="100"
+            ><template #default="{ $index }"
+              ><el-link type="danger" @click="paymentRatioRows.splice($index, 1)"
+                >删除</el-link
+              ></template
+            ></el-table-column
+          >
        </el-table>
-        <el-button type="primary" plain @click="addPaymentRatioRow">添加</el-button>
+        <el-button
+          v-if="!pageReadonly && !isSettlementRuleChange"
+          type="primary"
+          plain
+          @click="addPaymentRatioRow"
+          >添加</el-button
+        >
      </section>

      <billing-plan-editor
        v-model="planDialogVisible"
        :value="planEditor"
        :index="planEditorIndex"
+        :readonly="pageReadonly"
        :settlement-currency="form.settlementCurrency"
+        :party-options="billingPartyOptions"
        @save="savePlan"
      />

@@ -295,6 +505,7 @@
        attachment-type
        attachment-location="附件（佐证材料等）"
        attachment-type-dict-code="contract_supporting_attachment_type"
+        :readonly="isSettlementRuleChange"
        :attachment-location-options="changeAttachmentLocationOptions"
        :rows="attachments"
        :preview="previewAttachment"
@@ -327,8 +538,9 @@
        @update:rows="changeMaterials = $event"
        @upload-to-location="handleAttachmentUploadToLocation"
      />
-      <div class="page-footer">
-        <el-button @click="$router.back()">取消</el-button>
+      <div v-if="!pageReadonly" class="page-footer">
+        <el-button @click="goBack">取消</el-button>
+        <el-button v-if="isContractChangeModule" @click="saveDraft">保存草稿</el-button>
        <el-button type="primary" @click="submit">提交</el-button>
      </div>
    </el-form>
@@ -341,7 +553,9 @@
 </template>

 <script>
-import * as api from '@/api/business/contract-manage';
+import * as contractApi from '@/api/business/contract-manage';
+import * as changeApi from '@/api/business/contract-change';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
@@ -379,6 +593,8 @@ const defaultContractFormatOptions = [
  { label: '电子合同', value: '电子合同' },
  { label: '纸质合同', value: '纸质合同' },
 ];
+const contractChangeListRoute = '/business/contract-change';
+const contractChangeListRefreshKey = 'contract-change-list-refresh';
 const normalizeOptionalPositiveInteger = value => {
  if (value === undefined || value === null || value === '') return null;
  const number = Number(value);
@@ -418,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
    endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
  }));

+const createPartyRow = (row = {}) => ({
+  id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
+  customerId: row.customerId || '',
+  customerName: row.customerName || '',
+  creditCode: row.creditCode || row.unifiedCreditCode || '',
+  contactId: row.contactId || '',
+  contactName: row.contactName || '',
+  contactPhone: row.contactPhone || '',
+});
+
+const partyRoleLabel = role => {
+  if (role === 'A') return '甲方';
+  if (role === 'B') return '乙方';
+  if (role === 'C') return '丙方';
+  return role || '';
+};
+
+const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
+  const rows = (() => {
+    if (Array.isArray(partyJson)) return partyJson;
+    if (!partyJson) return [];
+    try {
+      const data = JSON.parse(partyJson);
+      return Array.isArray(data) ? data : [];
+    } catch (error) {
+      return [];
+    }
+  })().map(item => createPartyRow(item));
+  if (rows.length) return rows;
+  if (fallbackName) {
+    return String(fallbackName)
+      .split(/[、,]/)
+      .map(name => name.trim())
+      .filter(Boolean)
+      .map(name => createPartyRow({ customerName: name }));
+  }
+  return requireOne ? [createPartyRow()] : [];
+};
+
 export default {
  components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
  data() {
@@ -425,6 +680,9 @@ export default {
      form: {},
      period: [],
      plans: [],
+      partyARows: [],
+      partyBRows: [],
+      partyCRows: [],
      attachments: [],
      contractFiles: [],
      contractFileRows: [],
@@ -463,7 +721,7 @@ export default {
      settlementModeDictOptions: [],
      contractFormatDictOptions: [],
      planDialogVisible: false,
-      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
+      planEditor: { planName: '', remark: '', rules: [] },
      planEditorIndex: -1,
      billingElements: [
        '按重量',
@@ -475,6 +733,24 @@ export default {
        '按数量',
      ],
      rules: {
+        contractNo: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.isSettlementRuleChange) {
+                return callback();
+              }
+              const contractNo = String(value || '').trim();
+              if (!contractNo) {
+                return callback(new Error('请输入合同编号'));
+              }
+              if (contractNo.length > 100) {
+                return callback(new Error('合同编号不能超过100个字符'));
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
        contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
        contractAmount: [
          { required: true, message: '请输入合同金额', trigger: 'blur' },
@@ -497,12 +773,25 @@ export default {
  },
  computed: {
    pageTitle() {
+      if (this.pageReadonly) return this.$route.query.name || '查看合同变更';
      return this.$route.query.name || '合同变更';
    },
+    isContractChangeModule() {
+      return (
+        this.$route.path === '/business/contract-change/form' ||
+        this.$route.path === '/business/contract-change/public-view'
+      );
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/business/contract-change/public-view';
+    },
+    pageReadonly() {
+      return this.isPublicViewPage || this.$route.query.mode === 'view';
+    },
    // 高风险/黑名单客商提示：按合同推送合规留痕 hcs_risk_level/hcs_black_status 判定（与合同详情口径一致）
    riskTipText() {
      const riskLevel = String(this.form.hcsRiskLevel || '').trim();
-      const blacklist = String(this.form.hcsBlackStatus || '').toLowerCase() === 'yes';
+      const blacklist = String(this.form.kingdeeBlackStatus || '').toLowerCase() === 'yes';
      if (riskLevel !== '2' && !blacklist) return '';
      const parties = [this.form.partyA, this.form.partyB]
        .map(name => String(name || '').trim())
@@ -510,7 +799,36 @@ export default {
        .join('、');
      return `【${parties || '相对方'}】：被列入外部黑名单；涉贪污受贿裁判相关提及方（3年以上及其他）；被执行人信息；买卖合同纠纷；劳动纠纷；重大纠纷。提交变更前须上传「特批附件」类型附件`;
    },
+    isSettlementRuleChange() {
+      return this.form.changeType === '结算规则变更';
+    },
+    /**
+     * 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
+     */
+    billingPartyOptions() {
+      const category = String(this.form.contractCategory || '').trim();
+      const allowedRoles =
+        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
+      return [
+        ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
+        ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
+        ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
+      ]
+        .filter(row => allowedRoles.includes(row.partyRole))
+        .filter(row => row.customerName || row.customerId)
+        .map(row => ({
+          value: row.id,
+          label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
+          partyRole: row.partyRole,
+          partyRowId: row.id,
+          customerId: row.customerId,
+          customerName: row.customerName,
+        }));
+    },
    changeAttachmentLocationOptions() {
+      if (this.isSettlementRuleChange) {
+        return ['变更材料'];
+      }
      return ['用印材料', '附件（佐证材料等）', '变更材料'];
    },
    contractAmountDisplay() {
@@ -611,13 +929,25 @@ export default {
    async load() {
      const id = this.$route.query.id;
      if (!id) return;
-      const res = await api.getDetail(id);
-      const data = res.data?.data || res.data || {};
+      let data = {};
+      if (this.isPublicViewPage) {
+        const res = await getMkPublicDetail('contract-change', id);
+        data = res.data?.data || res.data || {};
+      } else if (this.isContractChangeModule) {
+        const res = await changeApi.getDetail(id);
+        data = res.data?.data || res.data || {};
+      } else {
+        const res = await contractApi.getDetail(id);
+        data = res.data?.data || res.data || {};
+      }
+      const isChangeRecord = this.isContractChangeModule || this.isPublicViewPage;
      this.form = {
        ...data,
-        changeContent: '',
-        changeReason: '',
-        changeAttachmentsJson: '',
+        // 独立变更单保留 contractId；旧路由以合同 id 作为主键
+        contractId: data.contractId || (isChangeRecord ? data.contractId : data.id),
+        changeContent: isChangeRecord ? data.changeContent || '' : '',
+        changeReason: isChangeRecord ? data.changeReason || '' : '',
+        changeAttachmentsJson: data.changeAttachmentsJson || '',
        copyCount: normalizeOptionalPositiveInteger(data.copyCount),
        invoiceCycle: normalizeOptionalPositiveInteger(data.invoiceCycle),
        paymentDays: normalizeOptionalPositiveInteger(data.paymentDays),
@@ -625,14 +955,17 @@ export default {
        templateFlag: data.templateFlag ?? 0,
        electronicSealFlag: data.electronicSealFlag ?? 0,
        archiveStatus: data.archiveStatus || '未归档',
-        changeType: '合同信息变更',
+        changeType: data.changeType || '合同信息变更',
      };
-      this.changeMaterials = [];
+      this.changeMaterials = this.parse(data.changeAttachmentsJson);
      this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
+      this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
+      this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
+      this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
      this.plans = this.parse(data.billingPlanJson);
      this.attachments = this.mergeChangeAttachments(
        this.parse(data.attachmentsJson),
-        this.parse(data.changeAttachmentsJson)
+        isChangeRecord ? [] : this.parse(data.changeAttachmentsJson)
      );
      this.contractFileRows = normalizeContractFileRows(this.parse(data.contractFileJson));
      const rules = this.parseObject(data.settlementRuleJson);
@@ -674,6 +1007,70 @@ export default {
        data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
      this.paymentRatioRows = this.parse(data.paymentRatioJson);
    },
+    goBack() {
+      if (this.isContractChangeModule) {
+        this.$router.push(contractChangeListRoute);
+        return;
+      }
+      this.$router.back();
+    },
+    buildChangePayload() {
+      if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule };
+      else this.formalSettlementConfig = { ...this.settlementRule };
+      const settlementRule = {
+        preSettlementConfig: this.preSettlementConfig,
+        formalSettlementConfig: this.formalSettlementConfig,
+      };
+      if (this.isSettlementRuleChange) {
+        return {
+          id: this.form.id,
+          contractId: this.form.contractId,
+          changeType: this.form.changeType,
+          changeContent: this.form.changeContent,
+          changeReason: this.form.changeReason,
+          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),
+          changeAttachmentsJson: JSON.stringify(this.changeMaterials),
+        };
+      }
+      return {
+        ...this.form,
+        contractId: this.form.contractId,
+        changeType: this.form.changeType || '合同信息变更',
+        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),
+      };
+    },
+    async saveDraft() {
+      if (this.form.changeType === '终止合同') {
+        this.$message.warning('终止合同无需保存草稿，请直接提交');
+        return;
+      }
+      const payload = this.buildChangePayload();
+      await changeApi.saveDraft(payload);
+      this.$message.success('草稿已保存');
+    },
    parse(value) {
      try {
        const result = JSON.parse(value || '[]');
@@ -723,10 +1120,32 @@ export default {
        .replace(/\D/g, '')
        .replace(/^0+/, '');
    },
-    addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
-    editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
-    toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
-    savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
+    addPlan() {
+      this.planEditorIndex = -1;
+      this.planEditor = {
+        planName: `计费方案${this.plans.length + 1}`,
+        remark: '',
+        rules: [{}],
+      };
+      this.planDialogVisible = true;
+    },
+    editPlan(row, index) {
+      this.planEditorIndex = index;
+      this.planEditor = JSON.parse(JSON.stringify(row));
+      this.planDialogVisible = true;
+    },
+    billingPlanCustomerLabel(row) {
+      const matched = this.billingPartyOptions.find(
+        item => String(item.partyRowId) === String(row.partyRowId)
+      );
+      return matched?.label || row.customerName || '';
+    },
+    savePlan(value, index) {
+      const nextPlan = { ...value };
+      delete nextPlan.defaultPlan;
+      if (index < 0) this.plans.push(nextPlan);
+      else this.plans.splice(index, 1, nextPlan);
+    },
    handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
    handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
    attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
@@ -736,6 +1155,12 @@ export default {
    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 (this.isSettlementRuleChange) {
+        if (location === '变更材料') {
+          this.changeMaterials = [...(this.changeMaterials || []), ...rows];
+        }
+        return;
+      }
      if (isContractSealMaterialLocation(location)) {
        this.contractFileRows = [...(this.contractFileRows || []), ...rows];
        return;
@@ -759,7 +1184,66 @@ export default {
    removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
    validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
-    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', bizId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected', mkEnabled: await loadMkEnabled().catch(() => false) }); this.$message.success('变更已提交'); this.$router.back(); },
+    async submit() {
+      if (this.form.changeType === '终止合同') {
+        const contractId = this.form.contractId || this.form.id;
+        await contractApi.terminate(contractId, this.form.changeReason);
+        this.$message.success('合同已终止');
+        this.goBack();
+        return;
+      }
+      await this.$refs.formRef.validate();
+      if (!this.isSettlementRuleChange) {
+        const contractNo = String(this.form.contractNo || '').trim();
+        if (!contractNo) {
+          this.$message.warning('请输入合同编号');
+          return;
+        }
+        if (contractNo.length > 100) {
+          this.$message.warning('合同编号不能超过100个字符');
+          return;
+        }
+        this.form.contractNo = contractNo;
+        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 payload = this.buildChangePayload();
+      if (this.isContractChangeModule) {
+        await changeApi.submit(payload);
+        await submitMkApprovalFlow({
+          bizType: 'contract-change',
+          bizId: this.form.id,
+          subjectName: this.form.contractName || '',
+          approvalStatus: this.form.approvalStatus || '',
+          mkEnabled: await loadMkEnabled().catch(() => false),
+        });
+        sessionStorage.setItem(contractChangeListRefreshKey, '1');
+        this.$message.success('变更已提交');
+        this.$router.push(contractChangeListRoute);
+        return;
+      }
+      await contractApi.submitChange(payload);
+      await submitMkApprovalFlow({
+        bizType: 'contract-manage',
+        bizId: this.form.id,
+        subjectName: this.form.contractName || '',
+        approvalStatus: this.form.approvalStatus || 'change_rejected',
+        mkEnabled: await loadMkEnabled().catch(() => false),
+      });
+      this.$message.success('变更已提交');
+      this.$router.back();
+    },
  },
 };
 </script>
@@ -245,7 +245,7 @@
                      <el-radio-group
                        v-model="row.confirmMode"
                        :disabled="dialogReadonly || !row.enabled"
-                        @change="handleReturnConfirmChange(row)"
+                        @change="syncNodeFields"
                      >
                        <el-radio label="yes">是</el-radio>
                        <el-radio label="no_confirm_complete">无需确认完成</el-radio>
@@ -253,10 +253,7 @@
                    </div>
                    <div class="process-config-form__require-line">
                      <span class="process-config-form__require-label">确认完成</span>
-                      <el-checkbox
-                        v-model="row.confirmInternal"
-                        :disabled="dialogReadonly || !row.enabled || row.confirmMode !== 'yes'"
-                        @change="syncNodeFields"
+                      <el-checkbox v-model="row.confirmInternal" :disabled="true"
                        >内部人员</el-checkbox
                      >
                    </div>
@@ -492,6 +489,12 @@ const NODE_TEMPLATES = [
  },
 ];

+// 过程配置必须覆盖装货端与卸货端各一个节点；货量下限只看装货端——
+// 到场没有货量开关，不能拿它顶替货量采集
+const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
+const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
+const CARGO_NODE_KEYS = ['load', 'dispatch'];
+
 export default {
  data() {
    return {
@@ -538,7 +541,6 @@ export default {
  created() {
    this.resetNodeRows();
    this.loadProjectOptions('');
-    this.applyDefaultDeptSearch();
    this.initDeptOptions();
  },
  methods: {
@@ -549,15 +551,18 @@ export default {
      row.confirmDriver = row.confirmMode === 'yes';
      this.syncNodeFields();
    },
-    handleReturnConfirmChange(row) {
-      row.confirmInternal = row.confirmMode === 'yes';
-      this.syncNodeFields();
-    },
    enforceAcceptDriver(node) {
      if (!node || (node.key !== 'accept' && node.name !== '接单')) return node;
      node.confirmDriver = node.confirmMode === 'yes';
      return node;
    },
+    // 回单「确认完成」只有内部人员一种角色，是否确认为「是」时即由内部人员确认，
+    // 界面上只读展示，值始终由 confirmMode 推导
+    enforceReturnInternal(node) {
+      if (!node || (node.key !== 'return' && node.name !== '回单')) return node;
+      node.confirmInternal = node.confirmMode === 'yes';
+      return node;
+    },
    initDeptOptions() {
      getDeptTree(this.userInfo.tenantId).then(res => {
        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
@@ -566,27 +571,6 @@ export default {
        }
      });
    },
-    defaultDeptId() {
-      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;
-        }
-      });
-    },
    flattenDept(tree, level = 0) {
      return tree.flatMap(item => {
        const id =
@@ -724,7 +708,7 @@ export default {
      this.projectLoading = true;
      return getProjectList(1, 50, {
        projectName: keyword,
-        approvalStatus: 'approved',
+        approvalStatuses: 'approved,change_approved',
        allDept: this.isAdmin ? 1 : 0,
      })
        .then(res => {
@@ -808,7 +792,10 @@ export default {
      this.syncNodeFields();
    },
    syncNodeFields() {
-      this.nodeRows.forEach(item => this.enforceAcceptDriver(item));
+      this.nodeRows.forEach(item => {
+        this.enforceAcceptDriver(item);
+        this.enforceReturnInternal(item);
+      });
      const enabledNodes = this.nodeRows.filter(item => item.enabled);
      this.form.includedNodes = enabledNodes.map(item => item.name).join(',');
      this.form.nodeConfigJson = JSON.stringify(
@@ -935,8 +922,24 @@ export default {
        this.$message.warning('备注不能超过500个字符');
        return false;
      }
-      if (!this.enabledNodes.length) {
-        this.$message.warning('请至少选择一个过程节点');
+      const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
+      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('发货、装货、到场至少选择一个');
+        return false;
+      }
+      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('卸货、到货、签收、回单至少选择一个');
+        return false;
+      }
+      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
+      const collectsCargo = CARGO_NODE_KEYS.some(key =>
+        this.nodeRows.some(
+          item =>
+            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
+        )
+      );
+      if (!collectsCargo) {
+        this.$message.warning('发货或装货至少勾选一个货量类型');
        return false;
      }
      const transit = this.nodeRows.find(item => item.key === 'transit');
@@ -1110,7 +1113,6 @@ export default {
    },
    searchReset() {
      this.query = {};
-      this.applyDefaultDeptSearch();
      this.page.currentPage = 1;
      this.onLoad(this.page, this.query);
    },
@@ -84,7 +84,8 @@ export default {
      this.postFormData('save', lbpmFormValues, this.buildFormData());
    },
    postFormData(status, formValues, formData) {
-      postMkPublicProcessMessage('project-apply', {
+      const bizType = this.$route.meta?.bizType || 'project-apply';
+      postMkPublicProcessMessage(bizType, {
        status,
        formValues: formValues || {},
        formData,
@@ -55,7 +55,7 @@
        <el-button
          type="warning"
          plain
-          v-if="!readonlyScope"
+          v-if="!readonlyScope && hcsImmediateEnabled"
          :loading="hcsRepushingId === 'batch'"
          @click="handleHcsBatchRepush"
        >
@@ -154,7 +154,7 @@
          {{ operation.label }}
        </el-link>
        <el-link
-          v-if="canHcsRepush(row)"
+          v-if="hcsImmediateEnabled && canHcsRepush(row)"
          type="warning"
          @click="handleHcsRepush(row)"
        >
@@ -249,35 +249,63 @@
            />
          </el-form-item>
          <el-form-item label="业务部门" prop="businessDeptId">
-            <el-cascader
-              v-model="businessDeptCascaderValue"
-              :options="businessDeptTreeOptions"
-              :props="deptCascaderProps"
-              placeholder="请选择"
-              filterable
-              clearable
-              :disabled="dialogReadonly"
-            />
+            <el-tooltip
+              placement="top"
+              :disabled="!shouldShowBusinessDeptTooltip"
+              :show-after="200"
+            >
+              <template #content>
+                <div class="project-apply-form__field-tooltip">{{ businessDeptTooltipText }}</div>
+              </template>
+              <span class="project-apply-form__field-tooltip-trigger">
+                <el-select
+                  v-model="form.businessDeptId"
+                  placeholder="请选择"
+                  filterable
+                  clearable
+                  :disabled="dialogReadonly"
+                  @change="handleBusinessDeptChange"
+                >
+                  <el-option
+                    v-for="item in deptOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </span>
+            </el-tooltip>
          </el-form-item>
          <el-form-item label="平台公司" prop="undertakeDeptId">
-            <el-select
-              v-model="form.undertakeDeptId"
-              placeholder="请选择"
-              multiple
-              collapse-tags
-              collapse-tags-tooltip
-              clearable
-              filterable
-              :disabled="dialogReadonly"
-              @change="handleUndertakeDeptChange"
+            <el-tooltip
+              placement="top"
+              :disabled="!shouldShowUndertakeDeptTooltip"
+              :show-after="200"
            >
-              <el-option
-                v-for="item in platformCompanyOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+              <template #content>
+                <div class="project-apply-form__field-tooltip">{{ undertakeDeptTooltipText }}</div>
+              </template>
+              <span class="project-apply-form__field-tooltip-trigger">
+                <el-select
+                  v-model="form.undertakeDeptId"
+                  placeholder="请选择"
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                  clearable
+                  filterable
+                  :disabled="dialogReadonly"
+                  @change="handleUndertakeDeptChange"
+                >
+                  <el-option
+                    v-for="item in platformCompanyOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </span>
+            </el-tooltip>
          </el-form-item>
          <el-form-item label="项目由来" prop="projectSource">
            <el-select
@@ -733,6 +761,96 @@
          />
        </div>

+        <template v-if="showProjectContractSection">
+          <div class="dialog-section-title project-apply-form__table-title">项目合同</div>
+          <el-table
+            v-loading="projectContractLoading"
+            :data="projectContractRows"
+            border
+            class="project-apply-form__table"
+          >
+            <el-table-column type="index" label="序号" width="80" align="center" />
+            <el-table-column
+              prop="contractCategory"
+              label="合同类型"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractNo"
+              label="合同编号"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                <el-link
+                  v-if="row.id && row.contractNo"
+                  type="primary"
+                  @click.stop="openProjectContractDetail(row)"
+                >
+                  {{ row.contractNo }}
+                </el-link>
+                <span v-else>{{ row.contractNo || '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="contractName"
+              label="合同名称"
+              min-width="160"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyA"
+              label="甲方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyB"
+              label="乙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyC"
+              label="丙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="startDate"
+              label="开始日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="endDate"
+              label="结束日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractAmount"
+              label="合同金额"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                {{ formatAmount(row.contractAmount) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+
        <div
          v-if="!isChangeDialog && !isNewProjectDialog"
          class="dialog-section-title project-apply-form__table-title"
@@ -810,7 +928,21 @@
          <template v-if="isChangeDialog">
            <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
+            <el-button
+              v-if="isProjectChangeModule && !dialogReadonly"
+              type="primary"
+              plain
+              :loading="submitLoading"
+              @click="saveProjectChangeDraft"
+            >
+              保存
+            </el-button>
+            <el-button
+              v-if="!dialogReadonly"
+              type="primary"
+              :loading="submitLoading"
+              @click="submitChangeProject"
+            >
              提交
            </el-button>
          </template>
@@ -948,14 +1080,20 @@
 import { exportBlob } from '@/api/common';
 import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
-import { repush as hcsRepush, repushBatch as hcsRepushBatch } from '@/api/business/hcs';
+import { getList as getContractManageList } from '@/api/business/contract-manage';
+import {
+  getRisk,
+  loadHcsImmediateEnabled,
+  repush as hcsRepush,
+  repushBatch as hcsRepushBatch,
+} from '@/api/business/hcs';
 import { Position } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
  getList as getCustomerArchiveList,
  getDetail as getCustomerArchiveDetail,
 } from '@/api/vehicle/customer-archive';
-import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { getList as getUserList } from '@/api/system/user';
@@ -985,6 +1123,7 @@ import {
  projectTypeOptions,
 } from '@/option/business/common';
 import { config, option } from '@/option/business/project-apply';
+import * as projectChangeApi from '@/api/business/project-change';

 const emptyForm = () => ({
  projectType: '',
@@ -1060,6 +1199,9 @@ const attachmentViewerPlugins = [
 const projectApplyListRoute = '/business/project-apply';
 const projectApplyFormRoute = '/business/project-apply/form';
 const projectApplyListRefreshKey = 'project-apply-list-refresh';
+const projectChangeListRoute = '/business/project-change';
+const projectChangeFormRoute = '/business/project-change/form';
+const projectChangeListRefreshKey = 'project-change-list-refresh';

 const otherAttachmentType = { label: '其他附件', value: '其他附件' };

@@ -1156,8 +1298,9 @@ export default {
        { label: '高风险', value: 'high', statKey: 'high' },
        { label: '中风险', value: 'medium', statKey: 'medium' },
      ],
-      // 合规（HCS）推送状态
+      // 合规（HCS）推送状态；受 thirdParty.hcs.push.immediate-enabled 控制显隐
      hcsRepushingId: null,
+      hcsImmediateEnabled: false,
      page: {
        pageSize: 10,
        pageSizes: [10, 20, 50, 100],
@@ -1245,7 +1388,40 @@ export default {
          },
        ],
        changeReason: [
-          { max: 2000, message: '变更原因不能超过2000个字符', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (!this.isChangeDialog) {
+                callback();
+                return;
+              }
+              if (!value || !String(value).trim()) {
+                callback(new Error('请输入变更原因'));
+                return;
+              }
+              if (String(value).length > 2000) {
+                callback(new Error('变更原因不能超过2000个字符'));
+                return;
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
+        changeType: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.isChangeDialog) {
+                callback();
+                return;
+              }
+              if (!value) {
+                callback(new Error('请选择变更类型'));
+                return;
+              }
+              callback();
+            },
+            trigger: 'change',
+          },
        ],
        projectIntro: [
          { max: 1000, message: '项目简介不能超过1000个字符', trigger: 'blur' },
@@ -1261,7 +1437,6 @@ export default {
        ],
      },
      deptOptions: [],
-      businessDeptTreeOptions: [],
      platformCompanyOptions: [],
      cargoTypeOptions: [],
      selectedCustomerId: [],
@@ -1304,6 +1479,8 @@ export default {
        'zip',
      ],
      changeRows: [],
+      projectContractRows: [],
+      projectContractLoading: false,
      changeRecordDetailVisible: false,
      changeRecordDetail: null,
      changeRecordDetailRows: [],
@@ -1326,30 +1503,27 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
-    // 部门级联配置：checkStrictly 允许选中任意层级，不必选到末级
-    deptCascaderProps() {
-      return {
-        label: 'label',
-        value: 'value',
-        children: 'children',
-        emitPath: true,
-        checkStrictly: true,
-        expandTrigger: 'click',
-      };
+    // 查看态禁用控件无 hover，用业务部门名称做 tooltip
+    businessDeptTooltipText() {
+      const id = this.form.businessDeptId;
+      if (id) {
+        const matched = this.deptOptions.find(item => String(item.value) === String(id));
+        if (matched?.rawLabel || matched?.label) {
+          return matched.rawLabel || matched.label;
+        }
+      }
+      return String(this.form.businessDeptName || '').trim();
    },
-    // 业务部门：form 存部门 id，级联控件用根到节点的 id 路径，两者在此双向转换
-    businessDeptCascaderValue: {
-      get() {
-        const id = this.form.businessDeptId;
-        return id ? this.findDeptPath(id, this.businessDeptTreeOptions) || [id] : [];
-      },
-      set(path) {
-        const value = Array.isArray(path)
-          ? path.filter(item => item !== undefined && item !== null && item !== '')
-          : [];
-        this.form.businessDeptId = value.length ? value.at(-1) : '';
-        this.handleBusinessDeptChange(this.form.businessDeptId);
-      },
+    undertakeDeptTooltipText() {
+      const name = String(this.form.undertakeDeptName || '').trim();
+      if (name) return name;
+      return this.resolveUndertakeDeptNames(this.parseUndertakeDeptIds(this.form.undertakeDeptId));
+    },
+    shouldShowBusinessDeptTooltip() {
+      return this.dialogReadonly && !!this.businessDeptTooltipText;
+    },
+    shouldShowUndertakeDeptTooltip() {
+      return this.dialogReadonly && !!this.undertakeDeptTooltipText;
    },
    permissionList() {
      return {
@@ -1374,17 +1548,29 @@ export default {
    isMajorProjectSupplementDialog() {
      return this.dialogType === 'majorSupplement';
    },
+    isProjectChangeModule() {
+      return this.$route.path === projectChangeFormRoute;
+    },
    isChangeDialog() {
-      return this.dialogType === 'change';
+      return this.dialogType === 'change' || this.isProjectChangeModule;
    },
    isNewProjectDialog() {
      return ['add', 'majorSupplement'].includes(this.dialogType);
    },
+    showProjectContractSection() {
+      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
+    },
    isProjectFormPage() {
      return this.isFormPageInstance;
    },
    isPublicViewPage() {
-      return this.$route.path === '/business/project-apply/public-view';
+      return (
+        this.$route.path === '/business/project-apply/public-view' ||
+        this.$route.path === '/business/project-change/public-view'
+      );
+    },
+    publicBizType() {
+      return this.$route.meta?.bizType || 'project-apply';
    },
    projectFormContainer() {
      // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
@@ -1447,11 +1633,18 @@ export default {
      .catch(() => {
        this.mkEnabled = false;
      });
+    loadHcsImmediateEnabled()
+      .then(enabled => {
+        this.hcsImmediateEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.hcsImmediateEnabled = false;
+      });
    this.loadDeptOptions();
    this.loadCargoTypeOptions();
    this.loadTransportTypeOptions();
    this.loadSettlementModeOptions();
-    if (this.$route.path === projectApplyFormRoute) {
+    if (this.$route.path === projectApplyFormRoute || this.$route.path === projectChangeFormRoute) {
      this.isFormPageInstance = true;
      this.openProjectFormPage();
    }
@@ -1517,14 +1710,14 @@ export default {
    },
    openPublicProjectForm() {
      const id = this.$route.query.id;
-      this.dialogType = 'view';
+      this.dialogType = this.publicBizType === 'project-change' ? 'change' : 'view';
      this.dialogReadonly = true;
      this.projectBox = true;
      if (!id) {
        this.$message.error('缺少项目ID');
        return;
      }
-      getMkPublicDetail('project-apply', id)
+      getMkPublicDetail(this.publicBizType, id)
        .then(res => {
          const detail = res.data?.data || {};
          this.applyPublicDictOptions(detail);
@@ -1552,9 +1745,10 @@ export default {
        detail.settlementMode
      );
      if (detail.businessDeptId) {
-        const label = detail.businessDeptName || String(detail.businessDeptId);
-        this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
-        this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
+        const id = String(detail.businessDeptId);
+        const label = detail.businessDeptName || id;
+        this.form.businessDeptId = id;
+        this.deptOptions = [{ label, rawLabel: label, value: id }];
      }
      const undertakeDeptIds = this.parseUndertakeDeptIds(detail.undertakeDeptId);
      const undertakeDeptNames = this.parseUndertakeDeptNames(detail.undertakeDeptName);
@@ -1587,15 +1781,32 @@ export default {
    openProjectFormPage() {
      const type = this.$route.query.mode || 'add';
      const id = this.$route.query.id;
-      this.dialogType = type;
+      this.dialogType = this.isProjectChangeModule ? (type === 'view' ? 'view' : 'change') : type;
      this.dialogReadonly = type === 'view';
      this.projectBox = true;
+      if (this.isProjectChangeModule) {
+        if (!id) {
+          this.$message.error('缺少项目变更ID');
+          return;
+        }
+        projectChangeApi.getDetail(id).then(res => {
+          const detail = res.data.data || {};
+          this.applyProjectDetail({
+            ...detail,
+            changeType: detail.changeType || '项目变更',
+            changeNo: detail.changeNo || '',
+            changeDate: detail.changeDate || this.$dayjs().format('YYYY-MM-DD'),
+          });
+        });
+        return;
+      }
      if (['add', 'majorSupplement'].includes(type)) {
        this.applyProjectDetail({
          ...emptyForm(),
          projectType: type === 'majorSupplement' ? '重大项目' : '普通项目',
        });
        this.fillDefaultUsers();
+        this.fillDefaultBusinessDept();
        return;
      }
      if (!id) return;
@@ -1612,6 +1823,12 @@ export default {
    },
    closeProjectForm() {
      if (this.isProjectFormPage) {
+        if (this.isProjectChangeModule) {
+          sessionStorage.setItem(projectChangeListRefreshKey, '1');
+          this.$router.$avueRouter?.closeTag?.();
+          this.$router.push(projectChangeListRoute);
+          return;
+        }
        this.markProjectApplyListNeedRefresh();
        this.$router.$avueRouter?.closeTag?.();
        this.$router.push(projectApplyListRoute);
@@ -1658,6 +1875,7 @@ export default {
    },
    canHcsRepush(row) {
      return (
+        this.hcsImmediateEnabled &&
        !this.readonlyScope &&
        ['approved', 'change_approved'].includes(row.approvalStatus) &&
        row.hcsSyncStatus !== 'synced'
@@ -1857,7 +2075,7 @@ export default {
    },
    handleCustomOperation(operation, row) {
      if (operation.action === 'startChange') {
-        this.openProjectDialog('change', row);
+        this.startIndependentProjectChange(row);
        return;
      }
      if (operation.action === 'mkAudit') {
@@ -1867,15 +2085,20 @@ export default {
      const run = value => {
        const args = operation.prompt ? [row.id, value] : [row.id];
        const request = () => this.api[operation.action](...args);
+        // 先本地提交再调 MK：MK 成功后会把状态同步成 reviewing，
+        // 若先 MK 再本地，已撤回/已驳回单据会被「当前状态不允许编辑」拦住。
        const afterMk =
          operation.action === 'submitApproval'
-            ? submitMkApprovalFlow({
-                bizType: 'project-apply',
-                bizId: row.id,
-                subjectName: row.projectName || '',
-                approvalStatus: row.approvalStatus || '',
-                mkEnabled: this.mkEnabled,
-              }).then(() => request())
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'project-apply',
+                  bizId: row.id,
+                  subjectName: row.projectName || '',
+                  approvalStatus: row.approvalStatus || '',
+                  mkEnabled: this.mkEnabled,
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
            : request();
        // 项目通过会同步等待合规推送，加遮罩防重复点击
        const loading =
@@ -1985,6 +2208,8 @@ export default {
      this.attachmentRows = [];
      this.selectedAttachmentRows = [];
      this.changeRows = [];
+      this.projectContractRows = [];
+      this.projectContractLoading = false;
      this.selectedCustomerId = [];
      this.selectedCarrierIds = [];
    },
@@ -2032,6 +2257,41 @@ export default {
        .filter(Boolean);
      this.syncSelectedCustomerOptions();
      this.ensureCurrentPlatformOption();
+      this.ensureCurrentBusinessDeptOption();
+      this.loadProjectContracts(row?.id);
+    },
+    loadProjectContracts(projectId) {
+      if (!this.showProjectContractSection || !projectId) {
+        this.projectContractRows = [];
+        this.projectContractLoading = false;
+        return;
+      }
+      this.projectContractLoading = true;
+      getContractManageList(1, 1000, { projectId })
+        .then(res => {
+          const data = res.data?.data;
+          const records = Array.isArray(data) ? data : data?.records || [];
+          this.projectContractRows = records.filter(
+            item => String(item.projectId) === String(projectId)
+          );
+        })
+        .catch(() => {
+          this.projectContractRows = [];
+          this.$message.error('项目合同加载失败');
+        })
+        .finally(() => {
+          this.projectContractLoading = false;
+        });
+    },
+    openProjectContractDetail(row) {
+      if (!row?.id) {
+        this.$message.warning('合同信息不完整，无法跳转');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: row.id, name: '合同详情' },
+      });
    },
    fillDefaultUsers() {
      const userId = this.userInfo?.userId || this.userInfo?.id || '';
@@ -2050,6 +2310,25 @@ export default {
        this.form.principalUserName = userName;
      }
    },
+    /**
+     * 新增/重大补录：业务部门默认取当前用户所属部门中第一个「是否业务部门=是」的组织。
+     */
+    fillDefaultBusinessDept() {
+      if (!['add', 'majorSupplement'].includes(this.dialogType)) return;
+      if (this.form.businessDeptId) return;
+      const raw = this.userInfo?.deptId || this.userInfo?.dept_id || '';
+      const userDeptIds = String(raw)
+        .split(/[,，]/)
+        .map(item => String(item || '').trim())
+        .filter(item => item && item !== '-1');
+      if (!userDeptIds.length || !this.deptOptions.length) return;
+      const matched = userDeptIds.find(id =>
+        this.deptOptions.some(item => String(item.value) === String(id))
+      );
+      if (!matched) return;
+      this.form.businessDeptId = matched;
+      this.handleBusinessDeptChange(matched);
+    },
    resolveUserRealName(row = {}, role) {
      return (
        row[`${role}RealName`] ||
@@ -2099,6 +2378,9 @@ export default {
                subjectName: name,
                approvalStatus: status,
                mkEnabled: this.mkEnabled,
+                tempVarData: {
+                  projectType: this.form.projectType || data.projectType || '',
+                },
              }).then(() => {
                this.$message.success('提交成功!');
                this.closeProjectForm();
@@ -2148,6 +2430,52 @@ export default {
        this.closeProjectForm();
      });
    },
+    startIndependentProjectChange(row) {
+      if (!row?.id) {
+        this.$message.warning('项目ID为空，无法发起变更');
+        return;
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '正在创建项目变更单…',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
+      projectChangeApi
+        .createFromProject(row.id)
+        .then(res => {
+          if (res.data?.success === false) {
+            this.$message.error(res.data?.msg || '创建项目变更失败');
+            return;
+          }
+          const detail = res.data?.data || {};
+          if (!detail.id) {
+            this.$message.error('创建项目变更失败：未返回变更单ID');
+            return;
+          }
+          this.$router.push({
+            path: projectChangeFormRoute,
+            query: { mode: 'edit', id: detail.id, name: '项目变更' },
+          });
+        })
+        .finally(() => loading.close());
+    },
+    saveProjectChangeDraft() {
+      if (!this.isProjectChangeModule) return;
+      this.submitLoading = true;
+      projectChangeApi
+        .saveDraft(this.normalizeSubmitForm({ includeChangeType: true }))
+        .then(res => {
+          if (res.data?.success === false || res.data?.data === false) {
+            this.$message.error(res.data?.msg || '保存失败，请联系管理员');
+            return;
+          }
+          this.$message.success('保存成功!');
+          this.closeProjectForm();
+        })
+        .finally(() => {
+          this.submitLoading = false;
+        });
+    },
    submitChangeProject() {
      this.$refs.projectForm.validate(valid => {
        if (!valid) {
@@ -2156,7 +2484,35 @@ export default {
        }
        if (!this.validateAttachmentFileTypes()) return;
        this.submitLoading = true;
-        // 变更记录仅在提交时生成，保存草稿不落记录
+        if (this.isProjectChangeModule) {
+          const payload = this.normalizeSubmitForm({ includeChangeType: true });
+          const approvalStatus = this.form.approvalStatus || '';
+          projectChangeApi
+            .submit(payload)
+            .then(res => {
+              if (res.data?.success === false || res.data?.data === false) {
+                this.$message.error(res.data?.msg || '提交失败，请联系管理员');
+                return;
+              }
+              const id = this.form.id;
+              return submitMkApprovalFlow({
+                bizType: 'project-change',
+                bizId: id,
+                subjectName: this.form.projectName || '',
+                approvalStatus,
+                mkEnabled: this.mkEnabled,
+                tempVarData: { projectType: this.form.projectType || '' },
+              }).then(() => {
+                this.$message.success('提交成功!');
+                this.closeProjectForm();
+              });
+            })
+            .finally(() => {
+              this.submitLoading = false;
+            });
+          return;
+        }
+        // 兼容旧入口：变更记录仅在提交时生成，保存草稿不落记录
        this.api
          .submitChange(this.normalizeSubmitForm({ includeChangeType: true }))
          .then(res => {
@@ -2171,6 +2527,7 @@ export default {
              subjectName: this.form.projectName || '',
              approvalStatus: this.form.approvalStatus || 'change_rejected',
              mkEnabled: this.mkEnabled,
+              tempVarData: { projectType: this.form.projectType || '' },
            }).then(() => {
              this.$message.success('提交成功!');
              this.closeProjectForm();
@@ -2574,10 +2931,10 @@ export default {
      return `${base}-BG${this.$dayjs().format('YYYYMMDD')}`;
    },
    handleBusinessDeptChange(value) {
-      // 兼容级联路径数组（取末级）与单个部门 id
-      const id = Array.isArray(value) ? value.at(-1) : value;
-      const dept = this.deptOptions.find(item => String(item.value) === String(id));
-      this.form.businessDeptName = dept ? dept.rawLabel : '';
+      const id = value == null || value === '' ? '' : String(value);
+      this.form.businessDeptId = id;
+      const dept = this.deptOptions.find(item => String(item.value) === id);
+      this.form.businessDeptName = dept ? dept.rawLabel || dept.label : '';
      this.$refs.projectForm?.validateField('businessDeptId');
    },
    handleUndertakeDeptChange(value) {
@@ -2615,34 +2972,45 @@ export default {
    firstUndertakeDeptId(value) {
      return this.parseUndertakeDeptIds(value)[0] || '';
    },
-    // 由部门 id 反查「根 → 该节点」的 id 路径，供级联回显（找不到返回 null）
-    findDeptPath(id, tree = [], parents = []) {
-      const target = Array.isArray(id) ? id.at(-1) : id;
-      if (target === undefined || target === null || target === '') return null;
-      for (const node of tree || []) {
-        const path = [...parents, node.value];
-        if (String(node.value) === String(target)) return path;
-        const matched = this.findDeptPath(target, node.children, path);
-        if (matched) return matched;
-      }
-      return null;
-    },
    handleProjectTypeChange() {
      this.normalizeAttachmentFileTypes();
      this.$refs.projectForm?.validateField('projectType');
    },
    loadDeptOptions() {
-      getDeptTree().then(res => {
-        const deptTree = res.data.data || [];
-        // 新增/编辑/重大补录/项目变更均可选择业务部门，排除外部组织
-        const businessDeptTree = ['add', 'edit', 'majorSupplement', 'change'].includes(this.dialogType)
-          ? this.excludeExternalOrganization(deptTree)
-          : deptTree;
-        this.deptOptions = this.flattenDept(businessDeptTree);
-        this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree);
-      });
+      getBusinessDeptSelect()
+        .then(res => {
+          const bizList = res.data.data || [];
+          // 仅展示「是否业务部门=是」的本级部门，扁平下拉
+          this.deptOptions = bizList
+            .map(item => {
+              const value = item.id == null || item.id === '' ? '' : String(item.id);
+              const label = item.deptName || item.fullName || item.title || item.name || value;
+              return {
+                label,
+                rawLabel: label,
+                value,
+              };
+            })
+            .filter(item => item.value);
+          this.fillDefaultBusinessDept();
+          this.ensureCurrentBusinessDeptOption();
+        })
+        .catch(() => {
+          this.deptOptions = [];
+        });
      this.loadPlatformCompanyOptions();
    },
+    ensureCurrentBusinessDeptOption() {
+      const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
+        ? ''
+        : String(this.form.businessDeptId);
+      if (!id) return;
+      this.form.businessDeptId = id;
+      const exists = this.deptOptions.some(item => String(item.value) === id);
+      if (exists) return;
+      const label = this.form.businessDeptName || id;
+      this.deptOptions.unshift({ label, rawLabel: label, value: id });
+    },
    loadPlatformCompanyOptions() {
      getPlatformCompanySelect().then(res => {
        const list = res.data.data || [];
@@ -2673,40 +3041,6 @@ export default {
        return matched ? matched.value : id;
      });
    },
-    excludeExternalOrganization(list = []) {
-      return list.reduce((result, item) => {
-        const deptName = item.title || item.deptName || item.name;
-        if (String(deptName || '').trim() === '外部组织') return result;
-        result.push({
-          ...item,
-          children: item.children?.length
-            ? this.excludeExternalOrganization(item.children)
-            : item.children,
-        });
-        return result;
-      }, []);
-    },
-    toDeptCascaderOptions(list = []) {
-      return list.map(item => ({
-        label: item.title || item.deptName || item.name,
-        value: item.id,
-        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
-      }));
-    },
-    flattenDept(list = [], level = 0) {
-      return list.reduce((result, item) => {
-        const label = item.title || item.deptName || item.name;
-        result.push({
-          label: `${'　'.repeat(level)}${label}`,
-          rawLabel: label,
-          value: item.id,
-        });
-        if (item.children && item.children.length) {
-          result.push(...this.flattenDept(item.children, level + 1));
-        }
-        return result;
-      }, []);
-    },
    loadCargoTypeOptions() {
      getSystemDictionary({ code: 'type_of_goods' }).then(res => {
        this.cargoTypeOptions = (res.data.data || []).map(item => ({
@@ -3042,6 +3376,20 @@ export default {
    width: 100%;
  }

+  &__field-tooltip-trigger {
+    display: block;
+    width: 100%;
+  }
+
+  &__field-tooltip {
+    max-width: 480px;
+    max-height: 240px;
+    overflow: auto;
+    white-space: pre-wrap;
+    word-break: break-word;
+    line-height: 1.5;
+  }
+
  :deep(.el-form-item) {
    //margin-bottom: 24px;
  }
@@ -0,0 +1,366 @@
+<template>
+  <basic-container class="project-change-page">
+    <avue-crud
+      :option="tableOption"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="tableForm"
+      ref="crud"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="hasPermission(`${config.permission}_delete`)"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+
+      <template #approvalStatus="{ row }">
+        {{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
+      </template>
+
+      <template #syncStatus="{ row }">
+        <el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
+          {{ syncLabel(row.syncStatus) }}
+        </el-tag>
+        <span v-else>-</span>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link
+          type="primary"
+          v-if="canView(row)"
+          @click="openForm('view', row)"
+        >
+          查看
+        </el-link>
+        <el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)">
+          编辑
+        </el-link>
+        <el-link
+          type="danger"
+          v-if="canDelete(row)"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+        <el-link
+          v-for="operation in customOperations(row)"
+          :key="operation.action"
+          :type="operation.type === 'warning' ? 'warning' : operation.type === 'success' ? 'success' : 'primary'"
+          @click="handleCustomOperation(operation, row)"
+        >
+          {{ operation.label }}
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import * as api from '@/api/business/project-change';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { config, option } from '@/option/business/project-change';
+import { approvalStatusOptions } from '@/option/business/common';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { isAdministrator } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+
+const projectChangeFormRoute = '/business/project-change/form';
+const projectChangeListRefreshKey = 'project-change-list-refresh';
+
+export default {
+  name: 'ProjectChange',
+  data() {
+    return {
+      api,
+      config,
+      tableForm: {},
+      tableOption: this.buildTableOption(),
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      selectionList: [],
+      mkEnabled: false,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo', 'website']),
+    permissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+      };
+    },
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
+  activated() {
+    if (sessionStorage.getItem(projectChangeListRefreshKey)) {
+      sessionStorage.removeItem(projectChangeListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
+  methods: {
+    buildTableOption() {
+      return {
+        ...option,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 320,
+        column: (option.column || []).map(column => ({
+          ...column,
+          display: false,
+          align: 'center',
+          headerAlign: 'center',
+        })),
+      };
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission && this.permission[code], false);
+    },
+    statusLabel(status) {
+      return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+    },
+    syncLabel(value) {
+      return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
+    },
+    syncTagType(value) {
+      return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
+    },
+    inStatus(row, statusList) {
+      if (!statusList || !statusList.length) return true;
+      return statusList.includes(row.approvalStatus);
+    },
+    canEdit(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.editStatus)
+      );
+    },
+    canDelete(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_delete`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.deleteStatus)
+      );
+    },
+    canView(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_view`) &&
+        this.inStatus(row, this.config.viewStatus)
+      );
+    },
+    canOperation(operation, row) {
+      if (operation.permission && !this.hasPermission(operation.permission)) return false;
+      if (row.readonly && ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)) {
+        return false;
+      }
+      return this.inStatus(row, operation.status);
+    },
+    customOperations(row) {
+      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
+        return this.canOperation(operation, row);
+      });
+    },
+    openForm(mode, row = {}) {
+      const query = { mode, id: row.id };
+      if (mode === 'edit') query.name = '编辑项目变更';
+      else if (mode === 'view') query.name = '查看项目变更';
+      this.$router.push({ path: projectChangeFormRoute, query });
+    },
+    handleCustomOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
+      const run = () => {
+        const request = () => this.api[operation.action](row.id);
+        // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'project-change',
+                  bizId: row.id,
+                  subjectName: row.projectName || '',
+                  approvalStatus: row.approvalStatus || '',
+                  mkEnabled: this.mkEnabled,
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
+            : request();
+        const loading =
+          operation.action === 'approve'
+            ? this.$loading({
+                lock: true,
+                text: '正在推送合规，请稍候…',
+                background: 'rgba(255, 255, 255, 0.6)',
+              })
+            : null;
+        afterMk
+          .then(res => {
+            if (operation.action === 'approve' && res.data?.data === false) {
+              this.$message.warning(res.data?.msg);
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
+              return;
+            }
+            this.$message.success(`${operation.label}成功`);
+            this.onLoad(this.page, this.query);
+          })
+          .finally(() => loading && loading.close());
+      };
+      this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => run());
+    },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('变更单ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud?.toggleSelection?.();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(row.id).then(() => {
+          this.$message.success('删除成功!');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    handleDelete() {
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(this.ids).then(() => {
+          this.$message.success('删除成功!');
+          this.selectionClear();
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const values = {
+        ...this.query,
+        ...params,
+      };
+      this.api
+        .getList(page.currentPage, page.pageSize, values)
+        .then(res => {
+          const data = res.data.data || {};
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.project-change-page {
+  :deep(.avue-crud__menu) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>
@@ -577,10 +577,7 @@ export default {
          this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
          return;
        }
-        if (!row.driverName) {
-          this.$message.warning(`第${index + 1}条调度明细缺少司机信息`);
-          return;
-        }
+        // 司机是否必填由调度明细弹窗按承运类型判定（承运商承运时司机选填），此处不再重复校验
        if (!row.vehicleNo) {
          this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
          return;
@@ -203,7 +203,11 @@
                @click="openBatchDialog(row)"
                >更换运单批次</el-link
              ><el-link
-                v-if="(row.processStatus !== '处理完成' || row.auditStatus === '待审核') && row.auditStatus !== '审核驳回'"
+                v-if="
+                  row.processStatus !== '处理失败' &&
+                  (row.processStatus !== '处理完成' || row.auditStatus === '待审核') &&
+                  row.auditStatus !== '审核驳回'
+                "
                type="primary"
                @click="openBatchDialog(row)"
                >更换运单批次</el-link
@@ -320,7 +324,7 @@
        <el-form-item label="执行凭证" required
        ><el-upload
          action="#"
-          accept=".zip,.7z"
+          accept=".zip"
          :auto-upload="false"
          :limit="1"
          :on-change="selectVoucherFile"
@@ -332,7 +336,7 @@
        >上传</el-button
        ><template #tip
        ><span class="voucher-manage-page__upload-tip"
-        >请上传车辆的执行凭证压缩包，支持zip、7z格式。 上传附件大于50M时为超大附件，确认提交后可在“批量补录->上传任务”中查看上传进度。</span
+        >请上传车辆的执行凭证压缩包，仅支持 zip 格式；无法解析的文件将标记为「处理失败」，可重新上传。上传附件大于50M时为超大附件，确认提交后可在“批量补录->上传任务”中查看上传进度。</span
        ></template
        ></el-upload
        ><el-progress
@@ -549,7 +553,7 @@
    ref="resumeFileInput"
    class="voucher-manage-page__hidden-file"
    type="file"
-    accept=".zip,.7z"
+    accept=".zip"
    @change="resumeFileSelected"
  />
 </template>
@@ -998,6 +1002,12 @@ const uploadVoucher = async file => {
 };
 const selectVoucherFile = file => {
  if (!file?.raw) return;
+  const fileName = String(file.raw.name || '').toLowerCase();
+  if (!fileName.endsWith('.zip')) {
+    ElMessage.warning('仅支持 zip 压缩包，无法解析的文件将标记为处理失败');
+    clearFile();
+    return;
+  }
  selectedVoucherFile.value = file.raw;
  editing.fileName = file.raw.name;
  editing.fileUrl = '';
@@ -6,7 +6,7 @@
    :config="config"
    :crud-option="option"
    :detail-id="detailId"
-    :menu-width="250"
+    :menu-width="320"
    standalone-form-page
  />
 </template>
@@ -271,7 +271,7 @@ export default {
          this.unwrapData(
            await billLedgerApi.getAvailableOptions(
              this.billDialog.keyword,
-              this.form.deptId,
+              undefined,
              this.form.billLedgerId
            )
          ) || [];
@@ -156,9 +156,17 @@ export default {
        });
    },
    async handleApprove(row) {
-      await api.approve({ id: row.id });
-      this.$message.success('审批通过');
-      this.loadTable();
+      await this.$confirm('确认审批通过该汇票付款？', '提示', { type: 'warning' });
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        await api.approve({ id: row.id });
+        this.$message.success('审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
    },
    async handleReturn(row) {
      const { value } = await this.$prompt('请输入驳回原因', '审批驳回');
@@ -251,10 +251,10 @@
                />
              </template>
            </el-table-column>
-            <el-table-column label="不含税单价" min-width="130">
+            <el-table-column label="合计金额" min-width="140">
              <template #default="{ row }">
                <el-input-number
-                  v-model="row.unitPriceNoTax"
+                  v-model="row.totalAmount"
                  :disabled="readonly"
                  :min="0"
                  :precision="2"
@@ -263,9 +263,6 @@
                />
              </template>
            </el-table-column>
-            <el-table-column label="不含税金额" min-width="130" align="right">
-              <template #default="{ row }">{{ formatMoney(row.amountNoTax) }}</template>
-            </el-table-column>
            <el-table-column label="税率" min-width="110">
              <template #default="{ row }">
                <el-select
@@ -282,17 +279,26 @@
                </el-select>
              </template>
            </el-table-column>
-            <el-table-column label="税额" min-width="120">
-              <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+            <el-table-column label="不含税单价" min-width="140" align="right">
+              <template #default="{ row }">{{ formatUnitPrice(row.unitPriceNoTax) }}</template>
            </el-table-column>
-            <el-table-column label="合计" min-width="130" align="right">
-              <template #default="{ row }">{{ formatMoney(row.totalAmount) }}</template>
+            <el-table-column label="不含税金额" min-width="130" align="right">
+              <template #default="{ row }">{{ formatMoney(row.amountNoTax) }}</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="170">
              <template #default="{ row }">
                <el-input v-model="row.remark" :disabled="readonly" maxlength="200" />
              </template>
            </el-table-column>
+            <el-table-column v-if="readonly" label="开票状态" min-width="90" align="center">
+              <template #default="{ row }">{{ sheet.invoiceStatusName || '未开票' }}</template>
+            </el-table-column>
+            <el-table-column v-if="readonly" label="金蝶开票结果备注" min-width="200">
+              <template #default="{ row }">{{ sheet.kingdeeResultRemark }}</template>
+            </el-table-column>
            <el-table-column v-if="!readonly" label="操作" width="110" fixed="right" align="center">
              <template #default="{ $index }">
                <div class="invoice-form-page__links">
@@ -323,17 +329,8 @@
          <el-table-column label="可开票金额" min-width="140" align="right">
            <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
          </el-table-column>
-          <el-table-column label="分摊发票金额" min-width="160">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.allocatedInvoiceAmount"
-                :disabled="readonly"
-                :min="0"
-                :max="Number(row.availableInvoiceAmount || 0)"
-                :precision="2"
-                :controls="false"
-              />
-            </template>
+          <el-table-column label="分摊发票金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
          </el-table-column>
        </el-table>
      </section-card>
@@ -454,6 +451,9 @@
        <el-table-column label="结算金额" min-width="130" align="right">
          <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
        </el-table-column>
+        <el-table-column label="已申请开票金额" min-width="140" align="right">
+          <template #default="{ row }">{{ formatMoney(row.invoicedAmount) }}</template>
+        </el-table-column>
        <el-table-column label="可开票金额" min-width="140" align="right">
          <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
        </el-table-column>
@@ -494,6 +494,9 @@ import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.v
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';

+// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
+const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
+
 let localId = 0;
 const emptyLine = () => ({
  localId: ++localId,
@@ -861,7 +864,6 @@ export default {
              keyword: this.settlementDialog.keyword,
              contractCategory: '客户合同',
              settlementType: 'receivable',
-              invoiceStatus: 'unreceived',
            }
          )
        );
@@ -913,7 +915,7 @@ export default {
        ...item,
        formalSettlementId: item.id,
        settlementId: item.id,
-        allocatedInvoiceAmount: rows.length === 1 ? Number(item.availableInvoiceAmount || 0) : 0,
+        allocatedInvoiceAmount: 0,
      }));
      this.form.projectName = first.projectName;
      this.form.deptName = first.deptName;
@@ -1108,15 +1110,30 @@ export default {
    addLine(sheet) {
      sheet.lines.push(emptyLine());
    },
+    /**
+     * 填写合计金额 + 税率后反算：
+     * 合计金额 = 数量 × 不含税单价 × (1 + 税率)
+     * 不含税单价 = 合计金额 / 数量 / (1 + 税率)，保留 6 位小数
+     * 不含税金额 = 数量 × 不含税单价，保留 2 位小数
+     */
    recalculateLine(row) {
      const quantity = Number(row.quantity || 0);
-      const unitPrice = Number(row.unitPriceNoTax || 0);
-      const amountNoTax = Number((quantity * unitPrice).toFixed(2));
+      const totalAmount = Number(Number(row.totalAmount || 0).toFixed(2));
      const rate = Number(row.taxRate || 0) / 100;
+      row.totalAmount = totalAmount;
+      row.amountWithTax = totalAmount;
+      if (quantity <= 0 || totalAmount <= 0) {
+        row.unitPriceNoTax = 0;
+        row.amountNoTax = 0;
+        row.taxAmount = 0;
+        return;
+      }
+      const factor = 1 + rate;
+      const unitPriceNoTax = Number((totalAmount / quantity / factor).toFixed(6));
+      const amountNoTax = Number((quantity * unitPriceNoTax).toFixed(2));
+      row.unitPriceNoTax = unitPriceNoTax;
      row.amountNoTax = amountNoTax;
-      row.taxAmount = rate ? Number((amountNoTax * rate).toFixed(2)) : 0;
-      row.totalAmount = Number((amountNoTax + row.taxAmount).toFixed(2));
-      row.amountWithTax = row.totalAmount;
+      row.taxAmount = Number((totalAmount - amountNoTax).toFixed(2));
    },
    validateBusiness() {
      if (!this.selectedDetailIds.length) throw new Error('请至少选择一条开票明细');
@@ -1129,12 +1146,14 @@ export default {
        for (const line of sheet.lines) {
          if (!line.goodsCategory || !line.goodsName) throw new Error('请完整填写商品和服务信息');
          if (
-            [line.quantity, line.unitPriceNoTax, line.amountNoTax, line.taxRate].some(
+            [line.quantity, line.totalAmount, line.unitPriceNoTax, line.amountNoTax, line.taxRate].some(
              Number.isNaN
            )
          ) {
            throw new Error('开票商品行金额格式不正确');
          }
+          if (Number(line.quantity || 0) <= 0) throw new Error('开票商品行数量必须大于0');
+          if (Number(line.totalAmount || 0) <= 0) throw new Error('开票商品行合计金额必须大于0');
        }
      }
    },
@@ -1211,6 +1230,7 @@ export default {
        mkEnabled: await loadMkEnabled().catch(() => false),
      });
      this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceApplicationListRefreshKey, '1');
      this.goBack();
    },
    async syncReferenceData() {
@@ -1234,6 +1254,9 @@ export default {
    formatMoney(value) {
      return Number(value || 0).toFixed(2);
    },
+    formatUnitPrice(value) {
+      return Number(value || 0).toFixed(6);
+    },
  },
 };
 </script>
@@ -125,6 +125,17 @@
              {{ displayValue(row[column.prop]) }}
            </el-tag>
            <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
+            <template v-else-if="column.prop === 'kingdeeStatusName'">
+              <el-tooltip
+                :disabled="row.kingdeeStatus !== 'failed'"
+                :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+                placement="top"
+              >
+                <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
+                  row.kingdeeStatusName || '-'
+                }}</el-tag>
+              </el-tooltip>
+            </template>
            <template v-else-if="column.prop === 'kingdeeLockStatus'">
              <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
                <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -238,6 +249,12 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';
+import { settlementListPath } from '@/utils/settlement-menu';
+
+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
+const invoiceApplicationListRoute = '/payment/invoice-application';

 const emptyQuery = () => ({
  applicationNo: '',
@@ -296,7 +313,28 @@ export default {
        this.mkEnabled = false;
      });
  },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === invoiceApplicationListRoute &&
+        from?.path?.includes('/invoice-application/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
  methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(invoiceApplicationListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(invoiceApplicationListRefreshKey);
+      this.loadTable();
+    },
    hasPermission(code) {
      return this.permission?.[code] !== false;
    },
@@ -360,12 +398,18 @@ export default {
          item => String(item.formalSettlementNo || '').trim() === normalizedNo
        );
        if (!row?.id) {
-          this.$message.warning('未找到对应的付款结算单');
+          this.$message.warning('未找到对应的结算单');
          return;
        }
+        // 开票申请关联的多为收款结算单，按单据类型路由到对应表单入口，避免误落付款结算单
        this.$router.push({
-          path: '/settlement/formal-settlement/form',
-          query: { mode: 'view', id: row.id, name: '查看正式结算' },
+          path: settlementListPath(row.settlementType) + '/form',
+          query: {
+            mode: 'view',
+            id: row.id,
+            settlementType: row.settlementType,
+            name: '查看正式结算',
+          },
        });
      } catch (error) {
        this.$message.error('正式结算单详情加载失败');
@@ -500,6 +544,7 @@ export default {
        ''
      );
    },
+    kingdeeStatusType,
    lockTag(row) {
      if (row.kingdeeLockStatus === 'locked') {
        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
@@ -53,15 +53,6 @@
              </el-tooltip>
            </el-form-item>
          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税率">
-              <el-input
-                :model-value="formatRate(form.taxRate)"
-                disabled
-                placeholder="从金蝶票据池带出"
-              />
-            </el-form-item>
-          </el-col>
          <el-col :span="6">
            <el-form-item label="开票金额">
              <el-input
@@ -109,22 +100,18 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="关联结算单" prop="settlementIds">
+            <el-form-item label="所属合同" prop="contractNo">
              <el-tooltip
-                :content="settlementLabel"
-                :disabled="!settlementLabel"
+                :content="form.contractName"
+                :disabled="!form.contractName"
                placement="top"
                :show-after="200"
              >
                <div class="receipt-form-page__overflow-trigger">
-                  <el-input
-                    :model-value="settlementLabel"
-                    readonly
-                    placeholder="请选择应付正式结算单"
-                  >
+                  <el-input :model-value="form.contractNo" readonly placeholder="请选择承运商合同">
                    <template v-if="!readonly" #append>
-                      <el-tooltip content="选择付款结算单" placement="top">
-                        <el-button :icon="Search" @click="openSettlementDialog" />
+                      <el-tooltip content="选择承运商合同" placement="top">
+                        <el-button :icon="Search" @click="openContractDialog" />
                      </el-tooltip>
                    </template>
                  </el-input>
@@ -132,11 +119,41 @@
              </el-tooltip>
            </el-form-item>
          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承办部门">
+              <el-input :model-value="form.deptName" disabled placeholder="从所属合同带出" />
+            </el-form-item>
+          </el-col>
        </el-row>
      </section-card>

+      <section-card title="发票明细">
+        <el-table :data="invoiceItems" border empty-text="选择金蝶票据池发票后带出发票明细行">
+          <el-table-column type="index" label="序号" width="64" align="center" />
+          <el-table-column prop="goodsName" label="货物名称" min-width="160" show-overflow-tooltip />
+          <el-table-column prop="specModel" label="规格型号" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" min-width="80" align="center" />
+          <el-table-column label="数量" min-width="100" align="right">
+            <template #default="{ row }">{{ formatQuantity(row.num) }}</template>
+          </el-table-column>
+          <el-table-column label="单价" min-width="110" align="right">
+            <template #default="{ row }">{{ formatMoney(row.unitPrice) }}</template>
+          </el-table-column>
+          <el-table-column label="金额" min-width="120" align="right">
+            <template #default="{ row }">{{ formatMoney(row.detailAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="税率" min-width="90" align="center">
+            <template #default="{ row }">{{ formatRateText(row.taxRate) }}</template>
+          </el-table-column>
+          <el-table-column label="税额" min-width="110" align="right">
+            <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+          </el-table-column>
+          <el-table-column prop="goodsCode" label="商品编码" min-width="140" show-overflow-tooltip />
+        </el-table>
+      </section-card>
+
      <section-card title="结算信息">
-        <el-table :data="form.settlements" border>
+        <el-table :data="form.settlements" border empty-text="暂无认领数据（认领关系由付款结算单侧维护）">
          <el-table-column type="index" label="序号" width="64" align="center" />
          <el-table-column
            label="结算单号"
@@ -156,17 +173,8 @@
          <el-table-column label="已收票金额" min-width="150" align="right">
            <template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
          </el-table-column>
-          <el-table-column label="分摊发票金额" min-width="180">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.allocatedInvoiceAmount"
-                :disabled="readonly"
-                :min="0"
-                :max="remainingAmount(row)"
-                :precision="2"
-                :controls="false"
-              />
-            </template>
+          <el-table-column label="分摊发票金额" min-width="150" align="right">
+            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
          </el-table-column>
        </el-table>
      </section-card>
@@ -217,69 +225,46 @@
      @confirm="handleInvoicePicked"
    />

-    <el-dialog
-      v-model="settlementDialog.visible"
-      title="选择应付正式结算单"
-      width="86%"
-      append-to-body
-    >
-      <div class="receipt-form-page__dialog-search">
-        <el-input
-          v-model="settlementDialog.keyword"
-          clearable
-          placeholder="结算单号、项目或合同"
-          @keyup.enter="loadSettlementCandidates"
-        />
-        <el-button type="primary" @click="loadSettlementCandidates">查询</el-button>
-      </div>
-      <el-table
-        ref="settlementTable"
-        v-loading="settlementDialog.loading"
-        :data="settlementDialog.rows"
-        row-key="id"
-        border
-        @selection-change="settlementDialog.selection = $event"
-      >
-        <el-table-column type="selection" width="52" align="center" reserve-selection />
-        <el-table-column
-          prop="formalSettlementNo"
-          label="结算单号"
-          min-width="170"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="projectName"
-          label="所属项目"
-          min-width="150"
-          show-overflow-tooltip
-        />
-        <el-table-column prop="deptName" label="所属组织" min-width="150" show-overflow-tooltip />
-        <el-table-column
-          prop="contractNo"
-          label="合同编号"
-          min-width="150"
-          show-overflow-tooltip
-        />
-        <el-table-column prop="payerName" label="付款方" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="payeeName" label="收款方" min-width="150" show-overflow-tooltip />
-        <el-table-column label="结算总金额" min-width="140" align="right">
-          <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
-        </el-table-column>
-        <el-table-column label="已收票金额" min-width="140" align="right">
-          <template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
-        </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right" align="center">
+    <el-dialog v-model="contractDialog.visible" title="选择承运商合同" width="920px" append-to-body>
+      <el-form :model="contractDialog.query" label-position="right" label-width="auto" inline @submit.prevent>
+        <el-form-item label="合同编号">
+          <el-input
+            v-model="contractDialog.query.contractNo"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
+          />
+        </el-form-item>
+        <el-form-item label="合同名称">
+          <el-input
+            v-model="contractDialog.query.contractName"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" :icon="Search" @click="searchContracts">查询</el-button>
+          <el-button @click="resetContractQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="contractDialog.loading" :data="contractDialog.rows" border>
+        <el-table-column prop="contractNo" label="合同编号" min-width="180" show-overflow-tooltip />
+        <el-table-column prop="contractName" label="合同名称" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="organizationName" label="承办部门" min-width="160" show-overflow-tooltip />
+        <el-table-column label="操作" width="80" align="center">
          <template #default="{ row }">
-            <el-link type="primary" @click.stop="selectSettlement(row)">选择</el-link>
+            <el-button type="primary" link @click="pickContract(row)">选择</el-button>
          </template>
        </el-table-column>
      </el-table>
-      <template #footer>
-        <el-button @click="settlementDialog.visible = false">取消</el-button>
-        <el-button type="primary" @click="confirmSettlements">
-          确定{{ settlementDialog.selection.length ? `（${settlementDialog.selection.length}）` : '' }}
-        </el-button>
-      </template>
+      <el-pagination
+        v-model:current-page="contractDialog.page.current"
+        v-model:page-size="contractDialog.page.size"
+        :total="contractDialog.page.total"
+        layout="total, prev, pager, next"
+        @current-change="loadContracts"
+      />
    </el-dialog>
  </basic-container>
 </template>
@@ -288,11 +273,15 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
+import { getList as getContractList } from '@/api/business/contract-manage';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';

+// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
+const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
+
 const emptyForm = () => ({
  id: null,
  invoiceNo: '',
@@ -310,6 +299,9 @@ const emptyForm = () => ({
  customerEmails: [],
  departmentEmails: [],
  projectName: '',
+  contractNo: '',
+  contractName: '',
+  deptId: null,
  deptName: '',
  payerName: '',
  payeeName: '',
@@ -330,26 +322,27 @@ export default {
      form: emptyForm(),
      customerEmailOptions: [],
      departmentEmailOptions: [],
+      invoiceItems: [],
+      contractDialog: {
+        visible: false,
+        loading: false,
+        rows: [],
+        page: { current: 1, size: 10, total: 0 },
+        query: { contractNo: '', contractName: '' },
+      },
      invoiceDialog: {
        visible: false,
      },
-      settlementDialog: {
-        visible: false,
-        loading: false,
-        keyword: '',
-        rows: [],
-        selection: [],
-      },
      rules: {
        invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }],
-        settlementIds: [{ required: true, validator: this.validateSettlements, trigger: 'change' }],
+        contractNo: [{ required: true, validator: this.validateContract, trigger: 'change' }],
        customerEmails: [{ validator: this.validateEmails, trigger: 'change' }],
        departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }],
      },
    };
  },
  computed: {
-    ...mapGetters(['permission']),
+    ...mapGetters(['permission', 'userInfo']),
    recordId() {
      return this.$route.query.id || '';
    },
@@ -363,15 +356,6 @@ export default {
      const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
      return this.hasPermission(code);
    },
-    settlementLabel() {
-      return this.form.settlements
-        .map(item => item.formalSettlementNo)
-        .filter(Boolean)
-        .join(',');
-    },
-    settlementIds() {
-      return this.form.settlements.map(item => item.formalSettlementId || item.settlementId);
-    },
  },
  created() {
    this.initialize();
@@ -419,14 +403,13 @@ export default {
      }
      const data = this.unwrapData(await api.getDetail(this.recordId));
      this.applyDetail(data);
-      if (this.settlementIds.length) await this.loadReferenceInformation();
    },
    async loadPublicDetail() {
      if (!this.recordId) return;
      const data = this.unwrapData(await getMkPublicDetail('invoice-receipt', this.recordId));
      this.applyDetail(data);
    },
-    applyDetail(data) {
+    async applyDetail(data) {
      this.form = {
        ...emptyForm(),
        ...data,
@@ -438,6 +421,7 @@ export default {
        })),
        attachments: this.parse(data.attachmentsJson),
      };
+      await this.loadInvoiceDetail();
    },
    validateInvoice(rule, value, callback) {
      if (!value) {
@@ -446,9 +430,9 @@ export default {
      }
      callback();
    },
-    validateSettlements(rule, value, callback) {
-      if (!this.form.settlements.length) {
-        callback(new Error('请选择应付正式结算单'));
+    validateContract(rule, value, callback) {
+      if (!this.form.contractNo) {
+        callback(new Error('请选择所属合同'));
        return;
      }
      callback();
@@ -469,7 +453,7 @@ export default {
    openInvoiceDialog() {
      this.invoiceDialog.visible = true;
    },
-    confirmInvoice(row, options = {}) {
+    async confirmInvoice(row, options = {}) {
      const selected = row;
      if (!selected) {
        this.$message.warning('请选择一张金蝶票据池发票');
@@ -504,92 +488,59 @@ export default {
        ...new Set([...this.departmentEmailOptions, ...this.form.departmentEmails]),
      ];
      this.invoiceDialog.visible = false;
+      await this.loadInvoiceDetail();
      this.$refs.formRef?.validateField('invoiceNo').catch(() => {});
      return true;
    },
-    async openSettlementDialog() {
-      this.settlementDialog.visible = true;
-      this.settlementDialog.selection = [];
-      await this.loadSettlementCandidates();
-      await this.$nextTick();
-      const selectedIds = new Set(this.settlementIds.map(id => String(id)));
-      this.settlementDialog.rows.forEach(row => {
-        if (selectedIds.has(String(row.id))) {
-          this.$refs.settlementTable?.toggleRowSelection(row, true);
-        }
-      });
-    },
-    async loadSettlementCandidates() {
-      this.settlementDialog.loading = true;
+    // 发票明细区块：按票号带出金蝶发票明细行（A801-1 镜像，推送 A303-2 分录同源）
+    async loadInvoiceDetail() {
+      if (!this.form.invoiceNo) {
+        this.invoiceItems = [];
+        return;
+      }
      try {
-        this.settlementDialog.rows =
-          this.unwrapData(
-            await api.getSettlementCandidates(this.settlementDialog.keyword, this.form.id)
-          ) || [];
+        this.invoiceItems = this.unwrapData(await api.invoiceDetailQuery(this.form.invoiceNo)) || [];
+      } catch {
+        this.invoiceItems = [];
+      }
+    },
+    // 所属合同=承运商合同：选择后带出承办部门（结算组织=承办部门对应平台公司金蝶编码，后端派生）
+    openContractDialog() {
+      this.contractDialog.visible = true;
+      this.searchContracts();
+    },
+    searchContracts() {
+      this.contractDialog.page.current = 1;
+      this.loadContracts();
+    },
+    resetContractQuery() {
+      this.contractDialog.query = { contractNo: '', contractName: '' };
+      this.searchContracts();
+    },
+    async loadContracts() {
+      this.contractDialog.loading = true;
+      try {
+        const res = await getContractList(this.contractDialog.page.current, this.contractDialog.page.size, {
+          ...this.contractDialog.query,
+          contractCategory: '承运商合同',
+          approvalStatuses: 'approved,change_approved',
+        });
+        const data = this.unwrapData(res) || {};
+        this.contractDialog.rows = data.records || [];
+        this.contractDialog.page.total = Number(data.total || 0);
      } finally {
-        this.settlementDialog.loading = false;
+        this.contractDialog.loading = false;
      }
    },
-    async confirmSettlements() {
-      const rows = this.settlementDialog.selection;
-      if (!rows.length) {
-        this.$message.warning('请至少选择一张应付正式结算单');
-        return;
-      }
-      const first = rows[0];
-      const incompatible = rows.some(
-        item =>
-          String(item.projectId) !== String(first.projectId) ||
-          String(item.deptId) !== String(first.deptId) ||
-          item.payerName !== first.payerName ||
-          item.payeeName !== first.payeeName
-      );
-      if (incompatible) {
-        this.$message.warning('关联结算单必须属于同一项目、组织及收付款方');
-        return;
-      }
-      const previousAmount = new Map(
-        this.form.settlements.map(item => [
-          String(item.formalSettlementId || item.settlementId),
-          item.allocatedInvoiceAmount,
-        ])
-      );
-      this.form.settlements = rows.map(item => ({
-        ...item,
-        formalSettlementId: item.id,
-        settlementId: item.id,
-        allocatedInvoiceAmount: previousAmount.has(String(item.id))
-          ? Number(previousAmount.get(String(item.id)) || 0)
-          : rows.length === 1
-            ? Number(item.settlementAmount || 0)
-            : 0,
-      }));
-      this.form.projectName = first.projectName;
-      this.form.deptName = first.deptName;
-      this.form.payerName = first.payerName;
-      this.form.payeeName = first.payeeName;
-      this.settlementDialog.visible = false;
-      await this.loadReferenceInformation();
-      this.$refs.formRef?.validateField('settlementIds').catch(() => {});
-    },
-    selectSettlement(row) {
-      this.$refs.settlementTable?.toggleRowSelection(row);
-    },
-    async loadReferenceInformation() {
-      const data = this.unwrapData(await api.getReferenceInformation(this.settlementIds.join(',')));
-      this.customerEmailOptions = data.customerEmails || [];
-      this.departmentEmailOptions = [
-        ...new Set([...this.departmentEmailOptions, ...(data.departmentEmails || [])]),
-      ];
-      if (!this.form.customerEmails.length && this.customerEmailOptions.length) {
-        this.form.customerEmails = [this.customerEmailOptions[0]];
-      }
-    },
-    remainingAmount(row) {
-      return Math.max(
-        Number(row.settlementAmount || 0) - Number(row.receivedInvoiceAmount || 0),
-        0
-      );
+    pickContract(row) {
+      if (!row) return;
+      Object.assign(this.form, {
+        contractNo: row.contractNo,
+        contractName: row.contractName,
+        deptName: row.organizationName,
+      });
+      this.contractDialog.visible = false;
+      this.$refs.formRef?.validateField('contractNo').catch(() => {});
    },
    openSettlementDetail(row) {
      const id = row.formalSettlementId || row.settlementId || row.id;
@@ -602,15 +553,6 @@ export default {
    validateBusiness() {
      const invoiceAmount = Number(this.form.invoiceAmount || 0);
      if (invoiceAmount <= 0) throw new Error('开票金额必须大于0');
-      for (const row of this.form.settlements) {
-        const allocated = Number(row.allocatedInvoiceAmount);
-        if (!Number.isFinite(allocated) || allocated < 0) {
-          throw new Error('分摊发票金额必须大于或等于0');
-        }
-        if (allocated - this.remainingAmount(row) > 0.001) {
-          throw new Error(`结算单${row.formalSettlementNo}的累计收票金额不能超过结算总金额`);
-        }
-      }
    },
    payload() {
      return {
@@ -631,10 +573,8 @@ export default {
        departmentEmails: this.form.departmentEmails.join(';'),
        attachmentsJson: JSON.stringify(this.form.attachments || []),
        remark: this.form.remark,
-        settlements: this.form.settlements.map(item => ({
-          settlementId: item.formalSettlementId || item.settlementId,
-          allocatedInvoiceAmount: item.allocatedInvoiceAmount,
-        })),
+        // 所属合同仅传编号，合同名称/承办部门由后端按编号带出（结算组织=合同承办部门）
+        contractNo: this.form.contractNo,
      };
    },
    async saveDraft() {
@@ -663,6 +603,7 @@ export default {
        mkEnabled: await loadMkEnabled().catch(() => false),
      });
      this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceReceiptListRefreshKey, '1');
      this.goBack();
    },
    async syncReferenceData() {
@@ -678,8 +619,7 @@ export default {
        this.$message.warning('金蝶票池未查询到该发票');
        return;
      }
-      if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return;
-      if (this.settlementIds.length) await this.loadReferenceInformation();
+      if (!(await this.confirmInvoice(invoice, { preserveUserInput: true }))) return;
      this.$message.success('同步成功');
    },
    goBack() {
@@ -688,8 +628,13 @@ export default {
    formatMoney(value) {
      return Number(value || 0).toFixed(2);
    },
-    formatRate(value) {
-      return value === null || value === undefined || value === '' ? '' : `${Number(value)}%`;
+    formatQuantity(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? String(number) : '-';
+    },
+    formatRateText(value) {
+      if (value === null || value === undefined || value === '') return '-';
+      return `${value}%`;
    },
  },
 };
@@ -738,15 +683,6 @@ export default {
 :global(.avue-layout--horizontal .receipt-form-page__actions) {
  left: 0;
 }
-.receipt-form-page__dialog-search {
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-  margin-bottom: 12px;
-}
-.receipt-form-page__dialog-search .el-input {
-  width: 360px;
-}
 .receipt-form-page :deep(.el-table) {
  --el-table-border-color: #eff1f7;
 }
@@ -223,6 +223,10 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';

+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
+const invoiceReceiptListRoute = '/payment/invoice-receipt';
+
 const emptyQuery = () => ({
  invoiceNo: '',
  invoiceDate: '',
@@ -281,7 +285,28 @@ export default {
        this.mkEnabled = false;
      });
  },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === invoiceReceiptListRoute &&
+        from?.path?.includes('/invoice-receipt/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
  methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(invoiceReceiptListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(invoiceReceiptListRefreshKey);
+      this.loadTable();
+    },
    hasPermission(code) {
      return this.permission?.[code] !== false;
    },
@@ -249,7 +249,7 @@
          <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="160">
            <template #default="{ row }">
              <el-input-number
-                v-if="multipleSettlementRows && !readonly"
+                v-if="!readonly"
                :model-value="row.paymentRatio"
                :min="0"
                :max="rowPaymentRatioMax(row)"
@@ -267,7 +267,7 @@
          <el-table-column prop="appliedAmount" label="付款金额" min-width="160">
            <template #default="{ row }">
              <el-input-number
-                v-if="multipleSettlementRows && !readonly"
+                v-if="!readonly"
                :model-value="row.appliedAmount"
                :min="0"
                :max="Number(row.payableAmount || 0)"
@@ -883,8 +883,6 @@ export default {
      // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
      payeeRisky: false,
      payeeRiskTip: '',
-      payeeRiskLevel: '',
-      payeeBlackStatus: '',
      attachmentRuleLoading: false,
      // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
      linkedSettlementAttachmentUrls: [],
@@ -1025,62 +1023,37 @@ export default {
    referenceSettlementCount() {
      return this.referenceSettlementNos.length;
    },
-    multipleSettlementRows() {
-      return this.referenceRows.length > 1;
-    },
    // 结算单号展示：单张显示单号；多张仅提示数量，明细在下方「结算信息」表，悬停可看全部单号
    referenceDisplayText() {
      if (this.referenceSettlementCount > 1) return `已选 ${this.referenceSettlementCount} 张结算单`;
      return this.referenceLabel;
    },
    settlementRows() {
-      if (this.referenceRows.length > 1) {
-        // 多结算单：行内比例/金额独立维护，不回落到表头比例（表头与结算信息不关联）
-        return this.referenceRows.map(item => {
-          const paymentRatio =
-            item.paymentRatio === undefined || item.paymentRatio === null || item.paymentRatio === ''
-              ? 0
-              : Number(item.paymentRatio);
-          const appliedAmount = Number(item.appliedAmount || 0);
-          return {
-            ...item,
-            paymentRatio,
-            appliedAmount,
-            ...this.buildSettlementRatioHint({ ...item, paymentRatio }),
-          };
-        });
-      }
-      if (this.referenceRows.length) {
-        return this.referenceRows.map(item => {
-          const appliedAmount =
-            item.fixedAppliedAmount === true
-              ? Number(item.appliedAmount || 0)
-              : Number(
-                  (
-                    (Number(item.settlementAmount || 0) * Number(this.form.paymentRatio || 0)) /
-                    100
-                  ).toFixed(2)
-                );
-          return {
-            ...item,
-            paymentRatio: this.form.paymentRatio,
-            appliedAmount,
-            ...this.buildSettlementRatioHint(item),
-          };
-        });
-      }
-      if (!this.referenceLabel) return [];
-      return [
-        {
-          settlementNo: this.referenceLabel,
-          settlementAmount: this.form.settlementAmount,
-          payableAmount: this.form.payableAmount,
-          paymentRatio: this.form.paymentRatio,
-          appliedAmount: this.form.appliedAmount,
-          paymentSequence: 1,
-          ...this.buildSettlementRatioHint({ paymentSequence: 1 }),
-        },
-      ];
+      const source = this.referenceRows.length
+        ? this.referenceRows
+        : this.referenceLabel
+          ? [
+              {
+                settlementNo: this.referenceLabel,
+                settlementAmount: this.form.settlementAmount,
+                payableAmount: this.form.payableAmount,
+                paymentRatio: null,
+                appliedAmount: null,
+                paymentSequence: 1,
+              },
+            ]
+          : [];
+      // 结算行比例/金额只取行内数据，不回落到付款基本信息
+      return source.map(item => {
+        const paymentRatio = this.nullableNumber(item.paymentRatio);
+        const appliedAmount = this.nullableNumber(item.appliedAmount);
+        return {
+          ...item,
+          paymentRatio,
+          appliedAmount,
+          ...this.buildSettlementRatioHint({ ...item, paymentRatio }),
+        };
+      });
    },
    highRiskPayee() {
      // 收款方 C101-1 高风险/黑名单，或客商等级 D/E/F（本地评级口径），命中须上传特批附件
@@ -1090,14 +1063,12 @@ export default {
        .toUpperCase();
      return ['D', 'D级', 'E', 'E级', 'F', 'F级'].includes(level) || level.includes('高风险');
    },
-    // 高风险/黑名单收款方提示（C101-1，同合同新增页风险客商提示口径；强制拦截在后端提交校验与金蝶推送门禁）
+    // 高风险/黑名单收款方提示（C101-1，强制拦截在后端提交校验与金蝶推送门禁）：
+    // 等级/黑名单明细以后端 riskTip 为准（黑名单=金蝶命中、等级=C101-1，统一口径），前端不再重复拼接
    payeeRiskText() {
      if (!this.payeeRisky) return '';
-      const levelMap = { 0: '低风险', 1: '中风险', 2: '高风险' };
-      const level = levelMap[this.payeeRiskLevel] || '未知';
-      const blacklist = String(this.payeeBlackStatus || '').trim().toLowerCase() === 'yes' ? '是' : '否';
      const tip = this.payeeRiskTip || `收款方[${this.form.payeeName || ''}]为高风险/黑名单客商`;
-      return `风险等级：${level}｜黑名单：${blacklist}。${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
+      return `${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
    },
    requiredAttachmentMaterials() {
      if (this.form.paymentType === 'project_advance') {
@@ -1149,11 +1120,12 @@ export default {
      if (
        this.amountSyncing ||
        this.form.paymentType === 'project_advance' ||
-        !this.paymentAmountBase
+        !this.paymentAmountBase ||
+        this.nullableNumber(this.form.paymentRatio) === null
      ) {
        return;
      }
-      // 结算金额变化时按上方比例重算申请付款金额，仍不联动结算信息明细
+      // 结算金额变化时只按上方比例重算申请付款金额，不改结算信息明细
      this.amountSyncing = true;
      this.form.appliedAmount = Number(
        ((this.paymentAmountBase * Number(this.form.paymentRatio || 0)) / 100).toFixed(2)
@@ -1251,14 +1223,6 @@ export default {
        callback();
        return;
      }
-      if (
-        selected.billType &&
-        selected.billType !== 'received' &&
-        !this.billMatchesSettlementParties(selected)
-      ) {
-        callback(new Error('汇票付款仅可选择收票类型，或出票单位与收票单位均为当前结算收付款方的汇票'));
-        return;
-      }
      if (selected.maturityDate) {
        const maturity = this.$dayjs(selected.maturityDate).startOf('day');
        const today = this.$dayjs().startOf('day');
@@ -1332,9 +1296,11 @@ export default {
      this.form = {
        ...emptyForm(),
        ...data,
+        // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
+        preSettlementId: this.isValidReferenceId(data.preSettlementId) ? data.preSettlementId : null,
        preSettlementIds: data.preSettlementIds?.length
          ? data.preSettlementIds
-          : data.preSettlementId
+          : this.isValidReferenceId(data.preSettlementId)
          ? [data.preSettlementId]
          : [],
        attachments: this.parse(data.attachmentsJson),
@@ -1380,9 +1346,13 @@ export default {
        this.form = {
          ...emptyForm(),
          ...data,
+          // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
+          preSettlementId: this.isValidReferenceId(data.preSettlementId)
+            ? data.preSettlementId
+            : null,
          preSettlementIds: data.preSettlementIds?.length
            ? data.preSettlementIds
-            : data.preSettlementId
+            : this.isValidReferenceId(data.preSettlementId)
            ? [data.preSettlementId]
            : [],
          attachments: this.parse(data.attachmentsJson),
@@ -1562,8 +1532,6 @@ export default {
            paymentSequence: amount.paymentSequence,
          }),
          settlementNo: item.formalSettlementNo || item.settlementNo || '',
-          appliedAmount: Number(item.appliedAmount || 0),
-          fixedAppliedAmount: true,
        };
      });
      this.seedMultipleRowPayments(referenceRows);
@@ -1575,27 +1543,6 @@ export default {
        (total, item) => total + Number(item.payableAmount || 0),
        0
      );
-      const multiple = referenceRows.length > 1;
-      // 多结算单：表头比例/申请金额独立；单结算单：沿用行金额或按比例计算
-      const paymentRatio = Number(this.form.paymentRatio || 0);
-      const rowsAppliedTotal = referenceRows.reduce(
-        (total, item) => total + Number(item.appliedAmount || 0),
-        0
-      );
-      const headerAppliedAmount = multiple
-        ? Number(((settlementAmount * paymentRatio) / 100).toFixed(2))
-        : Number(
-            (
-              rowsAppliedTotal > 0
-                ? rowsAppliedTotal
-                : (payableAmount * paymentRatio) / 100
-            ).toFixed(2)
-          );
-      const headerPaymentRatio = multiple
-        ? paymentRatio
-        : settlementAmount
-          ? Number(((headerAppliedAmount / settlementAmount) * 100).toFixed(2))
-          : paymentRatio;
      const settlementIds = rows.map(item => item.settlementId || item.id).filter(Boolean);
      this.amountSyncing = true;
      this.referenceRows = referenceRows;
@@ -1622,8 +1569,7 @@ export default {
        settlementAmount: Number(settlementAmount.toFixed(2)),
        payableAmount: Number(payableAmount.toFixed(2)),
        billType: '',
-        paymentRatio: headerPaymentRatio,
-        appliedAmount: headerAppliedAmount,
+        appliedAmount: this.headerAppliedAmountByRatio(settlementAmount),
        invoices: rows.flatMap(item =>
          this.createInvoiceRows(item.invoices || [], item.formalSettlementNo || item.settlementNo)
        ),
@@ -1647,17 +1593,22 @@ export default {
      });
    },
    clearFormalReferenceWhenPreOnly() {
+      // 纯预付引用才收敛为预付；-1 占位 id 不得充当预付关联
      const progressAdvance = this.form.paymentType === 'progress_advance';
      const onlyPre =
        progressAdvance ||
        (this.referenceRows.length > 0 &&
          this.referenceRows.every(item => item.referenceType === 'pre'));
      if (!onlyPre) return;
-      if (!this.form.preSettlementId) {
+      if (!this.isValidReferenceId(this.form.preSettlementId)) {
        const preId =
-          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
-          (progressAdvance ? this.form.settlementId : null);
-        if (preId) {
+          this.referenceRows.find(
+            item => item.referenceType === 'pre' && this.isValidReferenceId(item.id)
+          )?.id ||
+          (progressAdvance && this.isValidReferenceId(this.form.settlementId)
+            ? this.form.settlementId
+            : null);
+        if (this.isValidReferenceId(preId)) {
          this.form.preSettlementId = preId;
          this.form.preSettlementIds = [preId];
        }
@@ -1668,18 +1619,21 @@ export default {
    },
    restoreReferenceRows(data, fallbackRow) {
      const relations = Array.isArray(data?.settlements) ? data.settlements : [];
+      // 行级预付/正式类型以过滤占位 id 后的关联为准，决定点击结算单号的跳转目标
      const rows = relations
        .map(item => {
-          const isPre = Boolean(item.preSettlementId || item.preSettlementNo);
+          // 后端用 -1 占位空 id，必须先过滤再判预付，否则正式结算行会被误标为预付
+          const preId = this.isValidReferenceId(item.preSettlementId) ? item.preSettlementId : null;
+          const isPre = Boolean(preId || item.preSettlementNo);
          const settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
          if (!settlementNo) return null;
          return {
-            id: isPre ? item.preSettlementId || item.formalSettlementId : item.formalSettlementId,
+            id: isPre ? preId || item.formalSettlementId : item.formalSettlementId,
            settlementNo,
            referenceType: isPre ? 'pre' : 'formal',
            settlementAmount: Number(Number(item.settlementAmount || 0).toFixed(2)),
            payableAmount: Number(Number(item.payableAmount ?? item.settlementAmount ?? 0).toFixed(2)),
-            appliedAmount: Number(Number(item.appliedAmount || 0).toFixed(2)),
+            appliedAmount: this.nullableNumber(item.appliedAmount),
            paymentRatio: Number(item.settlementAmount || 0)
              ? Number(
                  (
@@ -1688,11 +1642,10 @@ export default {
                  ).toFixed(2)
                )
              : null,
-            fixedAppliedAmount: this.readonly,
          };
        })
        .filter(Boolean);
-      if (rows.length > 1) {
+      if (rows.length) {
        this.form.preSettlementIds = rows.filter(item => item.referenceType === 'pre').map(item => item.id);
        this.form.settlementIds = rows.filter(item => item.referenceType === 'formal').map(item => item.id);
        if (this.form.preSettlementIds.length) this.form.preSettlementId = this.form.preSettlementIds[0];
@@ -1703,9 +1656,10 @@ export default {
    },
    createReferenceRow(row) {
      const settlementAmount = Number(row.settlementAmount || 0);
+      // 后端以 -1 占位空预付 id，必须先校验否则正式结算行会被误判为预付
      const isPre = Boolean(
        row.preSettlementNo ||
-          row.preSettlementId ||
+          this.isValidReferenceId(row.preSettlementId) ||
          row.referenceType === 'pre' ||
          row.paymentType === 'progress_advance'
      );
@@ -1726,18 +1680,27 @@ export default {
        settlementAmount: Number(Number(settlementAmount || 0).toFixed(2)),
        payableAmount: Number(Math.max(0, payableAmount).toFixed(2)),
        paymentSequence: Number.isFinite(paymentSequence) && paymentSequence > 0 ? paymentSequence : 1,
+        paymentRatio: null,
+        appliedAmount: null,
      };
    },
+    nullableNumber(value) {
+      if (value === undefined || value === null || value === '') return null;
+      const amount = Number(value);
+      return Number.isFinite(amount) ? amount : null;
+    },
+    /** 付款基本信息内部：已填写比例时，按结算金额重算申请付款金额；不读取结算行付款金额。 */
+    headerAppliedAmountByRatio(settlementAmount) {
+      if (this.nullableNumber(this.form.paymentRatio) === null) return this.form.appliedAmount;
+      return Number(((Number(settlementAmount || 0) * Number(this.form.paymentRatio)) / 100).toFixed(2));
+    },
    /**
     * 按合同付款比例配置，判断当前付款次序是否超上限。
     * @param {Object} row 结算信息行（含 paymentSequence）
     */
    buildSettlementRatioHint(row = {}) {
      const sequence = Number(row.paymentSequence || 1);
-      const rawRatio =
-        row.paymentRatio !== undefined && row.paymentRatio !== null && row.paymentRatio !== ''
-          ? row.paymentRatio
-          : this.form.paymentRatio;
+      const rawRatio = row.paymentRatio;
      const paymentRatio = Number(rawRatio);
      const ratioConfig = this.contractPaymentRatioRows[sequence - 1];
      const ratioLimitValue = ratioConfig?.ratioLimit;
@@ -1880,21 +1843,6 @@ export default {
        (total, item) => total + Number(item.payableAmount || 0),
        0
      );
-      const multiple = this.referenceRows.length > 1;
-      const paymentRatio = Number(this.form.paymentRatio || 0);
-      const rowsAppliedTotal = this.referenceRows.reduce(
-        (total, item) => total + Number(item.appliedAmount || 0),
-        0
-      );
-      // 多结算单：表头申请金额只由上方比例计算；单结算单仍按可付款金额×比例
-      const headerAppliedAmount = multiple
-        ? Number(((settlementAmount * paymentRatio) / 100).toFixed(2))
-        : Number(((payableAmount * paymentRatio) / 100).toFixed(2));
-      const headerPaymentRatio = multiple
-        ? paymentRatio
-        : settlementAmount && rowsAppliedTotal > 0
-          ? Number(((rowsAppliedTotal / settlementAmount) * 100).toFixed(2))
-          : paymentRatio;
      // 尾款付款场景下选择预付结算单时保留尾款付款类型，不强制改为进度预付
      this.amountSyncing = true;
      Object.assign(this.form, {
@@ -1920,8 +1868,7 @@ export default {
        settlementAmount: Number(settlementAmount.toFixed(2)),
        payableAmount: Number(payableAmount.toFixed(2)),
        billType: '',
-        paymentRatio: headerPaymentRatio,
-        appliedAmount: headerAppliedAmount,
+        appliedAmount: this.headerAppliedAmountByRatio(settlementAmount),
      });
      this.rememberSettlementParties(first.payerName, first.payeeName);
      this.paymentRecords = [];
@@ -2405,8 +2352,6 @@ export default {
      this.payeeCustomerLevel = '';
      this.payeeRisky = false;
      this.payeeRiskTip = '';
-      this.payeeRiskLevel = '';
-      this.payeeBlackStatus = '';
      if (!partyBName) {
        if (!preserveCurrentValue) this.clearReceiptAccount();
        return;
@@ -2445,8 +2390,6 @@ export default {
            const risk = this.unwrapData(await getCustomerRisk(detail.customerCode)) || {};
            this.payeeRisky = Boolean(risk.risky);
            this.payeeRiskTip = risk.riskTip || '';
-            this.payeeRiskLevel = risk.fdRiskLevel || '';
-            this.payeeBlackStatus = risk.fdBlackStatus || '';
          } catch (error) {
            // 忽略风险查询异常，提交时后端 C101-1 强校验兜底
          }
@@ -2483,8 +2426,7 @@ export default {
      }
    },
    payeeReceiptLabel(item) {
-      const name = item.accountName || item.accountHolderName || '未命名收款方';
-      return item.bankAccount ? `${name}（${item.bankAccount}）` : name;
+      return item.accountName || item.accountHolderName || '未命名收款方';
    },
    receiptAccountLabel(item) {
      return [item.accountName || item.accountHolderName, item.bankName, item.bankAccount]
@@ -2642,7 +2584,7 @@ export default {
          this.unwrapData(
            await billLedgerApi.getAvailableOptions(
              keyword,
-              this.form.deptId,
+              undefined,
              selectedId,
              this.settlementPayerName,
              this.settlementPayeeName
@@ -2667,7 +2609,7 @@ export default {
          this.billPage.current,
          this.billPage.size,
          String(this.billQuery.keyword || '').trim() || undefined,
-          this.form.deptId,
+          undefined,
          this.form.billLedgerId,
          this.settlementPayerName,
          this.settlementPayeeName
@@ -2706,14 +2648,6 @@ export default {
      );
    },
    selectBill(row) {
-      if (
-        row?.billType &&
-        row.billType !== 'received' &&
-        !this.billMatchesSettlementParties(row)
-      ) {
-        ElMessage.warning('汇票付款仅可选择收票类型，或出票单位与收票单位均为当前结算收付款方的汇票');
-        return;
-      }
      if (row?.maturityDate) {
        const maturity = this.$dayjs(row.maturityDate).startOf('day');
        const today = this.$dayjs().startOf('day');
@@ -2775,7 +2709,8 @@ export default {
          this.referenceParams('formal')
        );
        const data = this.unwrapData(response) || {};
-        const records = data.records || [];
+        // 已调整的结算单为调整重推后的归档原单，金额已作废，不可再发起付款
+        const records = (data.records || []).filter(row => row.adjustStatus !== 'adjusted');
        this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
        this.formalPage.total = Number(data.total || 0);
      } finally {
@@ -2850,23 +2785,26 @@ export default {
    },
    async openSettlementDetail(row = {}) {
      const settlementNo = String(row.settlementNo || '').trim();
+      // 行上 referenceType 优先；发票行等只带单号的，按单号回查引用行；都缺省才回落表单级推断
+      const matchedReference = this.referenceRows.find(
+        item => String(item.settlementNo || '').trim() === settlementNo
+      );
+      const referenceType = row.referenceType || matchedReference?.referenceType;
      const isPre =
-        row.referenceType === 'pre' ||
-        this.form.paymentType === 'progress_advance' ||
-        Boolean(this.form.preSettlementId || this.form.preSettlementNo);
+        referenceType === 'pre' ||
+        (!referenceType &&
+          (this.form.paymentType === 'progress_advance' ||
+            Boolean(
+              this.isValidReferenceId(this.form.preSettlementId) || this.form.preSettlementNo
+            )));
      let id =
        row.id ||
        row.preSettlementId ||
        row.settlementId ||
+        matchedReference?.id ||
        (isPre
          ? this.form.preSettlementId || this.form.preSettlementIds?.[0]
          : this.form.settlementId || this.form.settlementIds?.[0]);
-      if (!id && settlementNo) {
-        const matched = this.referenceRows.find(
-          item => String(item.settlementNo || '').trim() === settlementNo
-        );
-        id = matched?.id;
-      }
      if (!id && settlementNo) {
        try {
          const listApi = isPre ? preApi.getList : formalApi.getList;
@@ -3136,22 +3074,54 @@ export default {
      return Number(Math.min(100, (payableAmount / settlementAmount) * 100).toFixed(2));
    },
    /**
-     * 多结算单行金额规范化：仅在行内反算比例，不使用表头比例灌入（表头与结算信息不关联）。
+     * 结算行金额规范化：只在行内反算比例，不使用付款基本信息的比例和申请金额。
     */
    seedMultipleRowPayments(rows = []) {
-      if (rows.length <= 1) return;
      rows.forEach(item => {
-        const settlementAmount = Number(item.settlementAmount || 0);
-        const payableAmount = Number(item.payableAmount || 0);
-        let applied = Number(item.appliedAmount || 0);
-        if (!Number.isFinite(applied) || applied < 0) applied = 0;
-        if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
-        item.appliedAmount = Number(applied.toFixed(2));
-        item.paymentRatio = settlementAmount
-          ? Number(((item.appliedAmount / settlementAmount) * 100).toFixed(2))
-          : 0;
+        if (this.nullableNumber(item.appliedAmount) === null && this.nullableNumber(item.paymentRatio) === null) {
+          item.appliedAmount = null;
+          item.paymentRatio = null;
+          return;
+        }
+        this.syncRowPayment(item, 'amount');
      });
    },
+    /**
+     * 结算行付款比例与付款金额联动。比例 = 付款金额 / 结算总金额。
+     * @param {'ratio'|'amount'} source 以哪一侧为准
+     */
+    syncRowPayment(row, source) {
+      const settlementAmount = Number(row.settlementAmount || 0);
+      const payableAmount = Number(row.payableAmount || 0);
+      if (source === 'ratio') {
+        const ratio = this.nullableNumber(row.paymentRatio);
+        if (ratio === null) {
+          row.paymentRatio = null;
+          row.appliedAmount = null;
+          return;
+        }
+        let applied = Number(((settlementAmount * ratio) / 100).toFixed(2));
+        if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
+        row.appliedAmount = applied;
+        row.paymentRatio = settlementAmount
+          ? Number(((applied / settlementAmount) * 100).toFixed(2))
+          : Number(ratio.toFixed(2));
+        return;
+      }
+      const appliedValue = this.nullableNumber(row.appliedAmount);
+      if (appliedValue === null) {
+        row.appliedAmount = null;
+        row.paymentRatio = null;
+        return;
+      }
+      let applied = appliedValue;
+      if (applied < 0) applied = 0;
+      if (applied > payableAmount) applied = payableAmount;
+      row.appliedAmount = Number(applied.toFixed(2));
+      row.paymentRatio = settlementAmount
+        ? Number(((row.appliedAmount / settlementAmount) * 100).toFixed(2))
+        : 0;
+    },
    findReferenceRow(row) {
      return this.referenceRows.find(
        item =>
@@ -3160,59 +3130,26 @@ export default {
          item.settlementNo === row.settlementNo
      );
    },
-    /** 结算信息付款金额合计 */
-    settlementRowsAppliedTotal(rows = this.referenceRows) {
-      return (rows || []).reduce((total, item) => total + Number(item.appliedAmount || 0), 0);
-    },
-    /** 结算信息合计不得超过上方申请付款金额 */
-    ensureSettlementAppliedWithinHeader(showWarning = true) {
-      if (!this.multipleSettlementRows) return true;
-      const headerApplied = Number(this.form.appliedAmount || 0);
-      const rowsTotal = Number(this.settlementRowsAppliedTotal().toFixed(2));
-      if (rowsTotal - headerApplied > 1e-8) {
-        if (showWarning) {
-          this.$message.warning(
-            `结算信息付款金额合计(${rowsTotal.toFixed(2)})不能大于申请付款金额(${headerApplied.toFixed(2)})`
-          );
-        }
-        return false;
-      }
-      return true;
-    },
    handleRowPaymentRatioChange(row, value) {
      const target = this.findReferenceRow(row);
      if (!target) return;
-      const settlementAmount = Number(target.settlementAmount || 0);
-      const payableAmount = Number(target.payableAmount || 0);
-      const ratio = value === null || value === undefined || value === '' ? 0 : Number(value);
-      let applied = Number(((settlementAmount * ratio) / 100).toFixed(2));
-      if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
-      target.appliedAmount = applied;
-      target.paymentRatio = settlementAmount
-        ? Number(((applied / settlementAmount) * 100).toFixed(2))
-        : Number(ratio.toFixed(2));
-      // 仅刷新结算金额/可付款金额合计，不回写表头申请金额与比例
-      this.syncHeaderSettlementTotalsFromRows();
-      this.ensureSettlementAppliedWithinHeader(true);
+      target.paymentRatio = value;
+      this.syncRowPayment(target, 'ratio');
+      this.syncHeaderSettlementTotalsFromRows(true);
    },
    handleRowAppliedAmountChange(row, value) {
      const target = this.findReferenceRow(row);
      if (!target) return;
-      const settlementAmount = Number(target.settlementAmount || 0);
-      const payableAmount = Number(target.payableAmount || 0);
-      let applied = value === null || value === undefined || value === '' ? 0 : Number(value);
-      if (!Number.isFinite(applied) || applied < 0) applied = 0;
-      if (applied > payableAmount) applied = payableAmount;
-      target.appliedAmount = Number(applied.toFixed(2));
-      target.paymentRatio = settlementAmount
-        ? Number(((target.appliedAmount / settlementAmount) * 100).toFixed(2))
-        : 0;
-      this.syncHeaderSettlementTotalsFromRows();
-      this.ensureSettlementAppliedWithinHeader(true);
+      target.appliedAmount = value;
+      this.syncRowPayment(target, 'amount');
+      this.syncHeaderSettlementTotalsFromRows(true);
    },
-    /** 多结算单时仅同步结算金额/可付款金额合计，申请付款金额与比例由上方独立维护 */
-    syncHeaderSettlementTotalsFromRows() {
-      if (this.referenceRows.length <= 1) return;
+    /**
+     * 结算信息行合计回填付款基本信息。
+     * @param {boolean} syncApplied 行内编辑时同步申请付款金额与比例；回显加载时保持原值，避免改写历史单据
+     */
+    syncHeaderSettlementTotalsFromRows(syncApplied = false) {
+      if (!this.referenceRows.length) return;
      const settlementAmount = this.referenceRows.reduce(
        (total, item) => total + Number(item.settlementAmount || 0),
        0
@@ -3221,9 +3158,21 @@ export default {
        (total, item) => total + Number(item.payableAmount || 0),
        0
      );
+      const appliedAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
      this.amountSyncing = true;
      this.form.settlementAmount = Number(settlementAmount.toFixed(2));
      this.form.payableAmount = Number(payableAmount.toFixed(2));
+      if (syncApplied) {
+        this.form.appliedAmount = Number(appliedAmount.toFixed(2));
+        if (this.paymentAmountBase) {
+          this.form.paymentRatio = Number(
+            ((appliedAmount / this.paymentAmountBase) * 100).toFixed(2)
+          );
+        }
+      }
      this.$nextTick(() => {
        this.amountSyncing = false;
        this.$refs.formRef?.validateField?.(['settlementAmount', 'appliedAmount']);
@@ -3317,8 +3266,8 @@ export default {
        settlementLines: (this.referenceRows || []).map(item => ({
          formalSettlementId: item.referenceType === 'formal' ? item.id : null,
          preSettlementId: item.referenceType === 'pre' ? item.id : null,
-          paymentRatio: item.paymentRatio,
-          appliedAmount: item.appliedAmount,
+          paymentRatio: this.nullableNumber(item.paymentRatio),
+          appliedAmount: this.nullableNumber(item.appliedAmount),
        })),
        paymentMethod,
        billLedgerId,
@@ -3379,20 +3328,33 @@ export default {
        ElMessage.warning('申请付款金额必填且必须大于0');
        return false;
      }
-      if (this.multipleSettlementRows) {
-        const invalidRow = this.referenceRows.find(
-          item => Number(item.appliedAmount || 0) > Number(item.payableAmount || 0)
-        );
+      if (this.isSettlementRelatedType && this.referenceRows.length) {
+        const invalidRow = this.referenceRows.find(item => {
+          const rowApplied = Number(item.appliedAmount || 0);
+          return !Number.isFinite(rowApplied) || rowApplied <= 0;
+        });
        if (invalidRow) {
          this.clearMessages();
-          ElMessage.warning(`${invalidRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
+          ElMessage.warning(`${invalidRow.settlementNo || '结算单'}请填写付款金额，且必须大于0`);
          return false;
        }
-        const rowsTotal = Number(this.settlementRowsAppliedTotal().toFixed(2));
-        if (rowsTotal - appliedAmount > 1e-8) {
+        const exceededRow = this.referenceRows.find(
+          item => Number(item.appliedAmount || 0) > Number(item.payableAmount || 0)
+        );
+        if (exceededRow) {
+          this.clearMessages();
+          ElMessage.warning(`${exceededRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
+          return false;
+        }
+        const rowAppliedTotal = this.referenceRows.reduce(
+          (total, item) => total + Number(item.appliedAmount || 0),
+          0
+        );
+        // 金蝶按付款基本信息申请金额推单，行合计不等时预付建档分摊会与金蝶金额不一致
+        if (Math.abs(rowAppliedTotal - appliedAmount) > 0.005) {
          this.clearMessages();
          ElMessage.warning(
-            `结算信息付款金额合计(${rowsTotal.toFixed(2)})不能大于申请付款金额(${appliedAmount.toFixed(2)})`
+            `结算行付款金额合计${rowAppliedTotal.toFixed(2)}与申请付款金额${appliedAmount.toFixed(2)}不一致，请调整`
          );
          return false;
        }
@@ -68,6 +68,35 @@
        <span v-else>-</span>
      </template>

+      <template #kingdeeStatusName="{ row }">
+        <el-tooltip
+          :disabled="row.kingdeeStatus !== 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+          placement="top"
+        >
+          <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
+            row.kingdeeStatusName || '-'
+          }}</el-tag>
+        </el-tooltip>
+      </template>
+
+      <template #kingdeeAssignStatus="{ row }">
+        <el-tooltip
+          :disabled="row.kingdeeAssignStatus !== 'failed'"
+          :content="row.kingdeeAssignFailReason || '收票单指定应付失败，可在对应付款结算单查看页重新推送'"
+          placement="top"
+        >
+          <el-tag
+            v-if="row.kingdeeAssignStatus"
+            :type="{ assigned: 'success', failed: 'danger' }[row.kingdeeAssignStatus] || 'info'"
+            size="small"
+          >
+            {{ { assigned: '已指定应付', failed: '指定失败' }[row.kingdeeAssignStatus] || '未指定' }}
+          </el-tag>
+          <span v-else>-</span>
+        </el-tooltip>
+      </template>
+
      <template #menu="{ row }">
        <el-link
          v-if="hasPermission('payment_application_view')"
@@ -151,6 +180,7 @@ import { paymentApplicationOption } from '@/option/payment/paymentApplication';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';

 const paymentApplicationListRoute = '/payment/payment-application';
 const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
@@ -328,15 +358,17 @@ export default {
      this.refreshChange();
    },
    async handleApprove(row) {
-      // 防止重复点击：请求进行中忽略后续点击
+      // 防止重复点击：请求进行中忽略后续点击，避免重复审批和重复提示
      if (this.approveLoading) return;
      this.approveLoading = true;
-      const loading = this.$loading({
-        lock: true,
-        text: '审批处理中，请稍候…',
-        background: 'rgba(255, 255, 255, 0.6)',
-      });
+      let loading = null;
      try {
+        await this.$confirm('确认审批通过该付款申请？', '提示', { type: 'warning' });
+        loading = this.$loading({
+          lock: true,
+          text: '审批处理中，请稍候…',
+          background: 'rgba(255, 255, 255, 0.6)',
+        });
        const res = await api.approve({ id: row.id });
        // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
        if (res.data.data === false) {
@@ -346,7 +378,7 @@ export default {
        }
        this.refreshChange();
      } finally {
-        loading.close();
+        loading?.close();
        this.approveLoading = false;
      }
    },
@@ -394,6 +426,12 @@ export default {
        return;
      }
      this.syncLoading = true;
+      // 批量同步金蝶逐单串行推送耗时较长，加遮罩防重复操作（照审批通过遮罩）
+      const loading = this.$loading({
+        lock: true,
+        text: '正在批量同步金蝶，请稍候…',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
      try {
        const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
        const failedList = data.filter(item => String(item).includes('同步失败'));
@@ -410,6 +448,7 @@ export default {
        this.warnAttachmentNotUploaded(rows.map(row => row.id));
      } finally {
        this.syncLoading = false;
+        loading.close();
      }
    },
    // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
@@ -461,6 +500,7 @@ export default {
        ''
      );
    },
+    kingdeeStatusType,
    lockTag(row) {
      if (row.kingdeeLockStatus === 'locked') {
        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
@@ -4,7 +4,7 @@
      <section-card title="收款信息">
        <el-row :gutter="32">
          <el-col :span="6">
-            <el-form-item label="认领通知单">
+            <el-form-item label="收款单号">
              <el-input v-model="form.receiptNoticeNo" disabled />
            </el-form-item>
          </el-col>
@@ -3,7 +3,7 @@
    <section-card v-if="searchVisible" class="claim-record-page__search">
      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
        <div class="claim-record-page__search-grid">
-          <el-form-item label="认领通知单">
+          <el-form-item label="收款单号">
            <el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
          </el-form-item>
          <el-form-item label="对方户名">
@@ -56,16 +56,6 @@
          <el-form-item v-show="searchExpanded" label="所属组织">
            <el-input v-model="query.claimerDeptName" clearable placeholder="请输入" />
          </el-form-item>
-          <el-form-item v-show="searchExpanded" label="推送状态">
-            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
-              <el-option
-                v-for="item in pushStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
          <el-form-item v-show="searchExpanded" label="金蝶单据状态">
            <el-select v-model="query.kingdeeBillStatus" clearable placeholder="请选择">
              <el-option
@@ -93,9 +83,6 @@

    <section class="claim-record-page__table-panel">
      <div class="claim-record-page__toolbar">
-        <el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
-          查询金蝶认领结果
-        </el-button>
        <table-header-tools
          :columns="columns"
          v-model:visible-column-keys="visibleColumnKeys"
@@ -131,11 +118,7 @@
        <el-table-column label="操作" width="120" fixed="right" align="center">
          <template #default="{ row }">
            <el-link
-              v-if="
-                hasPermission('receipt_claim_record_void') &&
-                  row.claimStatus === 'claimed' &&
-                  row.pushStatus !== 'pushed'
-              "
+              v-if="hasPermission('receipt_claim_record_void') && row.claimStatus === 'claimed'"
              type="danger"
              @click="handleVoid(row)"
              >作废</el-link
@@ -181,7 +164,6 @@ const emptyQuery = () => ({
  claimDateRange: [],
  claimerDeptName: '',
  kingdeeBillStatus: '',
-  pushStatus: '',
 });

 export default {
@@ -195,17 +177,15 @@ export default {
      searchExpanded: false,
      // 与 avue-crud 一致：搜索项数量超过 searchIndex（默认一行 4 项）时才显示“展开/收起”
      searchIndex: 4,
-      searchItemCount: 11,
+      searchItemCount: 10,
      searchVisible: true,
      tableSize: 'default',
      claimStatusOptions: api.claimStatusOptions,
      kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
-      pushStatusOptions: api.pushStatusOptions,
      columns: receiptClaimRecordTableColumns,
      visibleColumnKeys: receiptClaimRecordTableColumns.map(column => column.prop),
      rows: [],
      loading: false,
-      refreshing: false,
      page: { current: 1, size: 10, total: 0 },
    };
  },
@@ -272,7 +252,7 @@ export default {
    },
    async handleVoid(row) {
      await this.$confirm(
-        '作废后将回退本次认领金额，是否继续？',
+        '作废后将回退本次认领金额，并同步作废合同合规系统认领记录，是否继续？',
        '作废认领记录',
        { type: 'warning', confirmButtonText: '确定', cancelButtonText: '取消' }
      );
@@ -280,16 +260,6 @@ export default {
      this.$message.success('作废成功');
      await this.loadTable();
    },
-    async handleRefreshKingdeeResult() {
-      this.refreshing = true;
-      try {
-        const updated = Number(this.unwrapData(await api.queryKingdeeResult()) || 0);
-        this.$message.success(`金蝶认领结果回写完成，更新${updated}条`);
-        await this.loadTable();
-      } finally {
-        this.refreshing = false;
-      }
-    },
    hasPermission(code) {
      return this.isAdmin || this.validData(this.permission?.[code], false);
    },
@@ -7,7 +7,7 @@
          <el-table-column type="index" label="序号" width="64" align="center" />
          <el-table-column
            prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
            min-width="160"
            show-overflow-tooltip
          />
@@ -43,8 +43,8 @@
          <el-table-column label="已认领金额" min-width="130" align="right">
            <template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
          </el-table-column>
-          <el-table-column label="金蝶未认领金额" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
+          <el-table-column label="未匹配金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.unmatchAmountRec) }}</template>
          </el-table-column>
          <el-table-column label="剩余可认领金额" min-width="140" align="right">
            <template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
@@ -96,7 +96,7 @@
              formatMoney(row.settlement.claimedReceiptAmount)
            }}</template>
          </el-table-column>
-          <el-table-column label="认领通知单" min-width="180">
+          <el-table-column label="收款单号" min-width="180">
            <template #default="{ row }">{{ row.flow.receiptNoticeNo || '-' }}</template>
          </el-table-column>
          <el-table-column label="收款金额" min-width="140" align="right">
@@ -302,10 +302,8 @@ export default {
      );
    },
    flowRemaining(flow) {
-      const unclaimed = Number(flow.unclaimedAmount || 0);
-      const receipt = Number(flow.receiptAmount || 0);
-      const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
+      // 认领只登记本地：剩余可认领 = 收款金额 − 已认领金额
+      return Math.max(Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0), 0);
    },
    maxAllocation(row) {
      const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
@@ -355,12 +353,8 @@ export default {
      }
      for (const flow of this.flows) {
        const total = this.flowAllocatedTotal(flow.id);
-        const remaining = Math.max(
-          Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
-          0
-        );
-        if (total > remaining + 0.001) {
-          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`);
+        if (total > this.flowRemaining(flow) + 0.001) {
+          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过剩余可认领金额`);
          return;
        }
      }
@@ -12,7 +12,7 @@
      <section-card title="收款信息">
        <el-row :gutter="32">
          <el-col :span="6"
-            ><el-form-item label="认领通知单"
+            ><el-form-item label="收款单号"
              ><el-input v-model="form.receiptNoticeNo" disabled /></el-form-item
          ></el-col>
          <el-col :span="6"
@@ -48,8 +48,8 @@
              ><el-input :model-value="formatMoney(form.claimedAmount)" disabled /></el-form-item
          ></el-col>
          <el-col :span="6"
-            ><el-form-item label="金蝶未认领金额"
-              ><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
+            ><el-form-item label="未匹配金额"
+              ><el-input :model-value="formatMoney(form.unmatchAmountRec)" disabled /></el-form-item
          ></el-col>
          <el-col :span="6"
            ><el-form-item label="剩余可认领金额"
@@ -205,7 +205,7 @@ const emptyForm = () => ({
  transactionTime: '',
  detailSerialNo: '',
  claimedAmount: 0,
-  unclaimedAmount: 0,
+  unmatchAmountRec: 0,
  claimerName: '',
  claimerDeptName: '',
  claimDate: '',
@@ -252,11 +252,10 @@ export default {
      );
    },
    claimableAmount() {
-      const unclaimed = Number(this.form.unclaimedAmount || 0);
+      // 认领只登记本地：剩余可认领 = 收款金额 − 已认领金额
      const receipt = Number(this.form.receiptAmount || 0);
-      const ceiling =
-        unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - Number(this.form.claimedAmount || 0), 0);
+      const claimed = Number(this.form.claimedAmount || 0);
+      return Math.max(receipt - claimed, 0);
    },
  },
  created() {
@@ -3,7 +3,7 @@
    <section v-if="searchVisible" class="receipt-flow-page__search">
      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
        <div class="receipt-flow-page__search-grid">
-          <el-form-item label="认领通知单">
+          <el-form-item label="收款单号">
            <el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
          </el-form-item>
          <el-form-item label="对方户名">
@@ -15,16 +15,6 @@
          <el-form-item label="对方账号">
            <el-input v-model="query.counterpartyAccount" clearable placeholder="请输入" />
          </el-form-item>
-          <el-form-item label="推送状态">
-            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
-              <el-option
-                v-for="item in pushStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
          <el-form-item label="认领状态">
            <el-select v-model="query.claimStatus" clearable placeholder="请选择">
              <el-option
@@ -159,23 +149,10 @@
            <span v-else>{{ displayValue(row[column.prop]) }}</span>
          </template>
        </el-table-column>
-        <el-table-column label="操作" width="170" fixed="right" align="center">
+        <el-table-column label="操作" width="100" fixed="right" align="center">
          <template #default="{ row }">
-            <el-link
-              v-if="canClaim(row)"
-              type="primary"
-              :disabled="pushingId === row.id"
-              @click="openClaim(row)"
-              >认领</el-link
-            >
-            <el-link
-              v-if="canPush(row)"
-              type="warning"
-              :disabled="pushingId === row.id"
-              @click="handlePush(row)"
-              >推送金蝶</el-link
-            >
-            <span v-if="!canClaim(row) && !canPush(row)">-</span>
+            <el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
+            <span v-else>-</span>
          </template>
        </el-table-column>
      </el-table>
@@ -201,13 +178,13 @@
    >
      <div v-loading="detailDialog.loading">
        <el-descriptions :column="3" border>
-          <el-descriptions-item label="认领通知单">
+          <el-descriptions-item label="收款单号">
            {{ displayValue(detailDialog.data.receiptNoticeNo) }}
          </el-descriptions-item>
          <el-descriptions-item label="付款人">
            {{ displayValue(detailDialog.data.payerName) }}
          </el-descriptions-item>
-          <el-descriptions-item label="付款金额">
+          <el-descriptions-item label="收款金额">
            {{ formatMoney(detailDialog.data.receiptAmount) }}
          </el-descriptions-item>
          <el-descriptions-item label="交易时间">
@@ -236,13 +213,8 @@
          <el-descriptions-item label="剩余可认领金额">
            {{ formatMoney(detailDialog.data.remainingAmount) }}
          </el-descriptions-item>
-          <el-descriptions-item label="金蝶未认领金额">
-            {{ formatMoney(detailDialog.data.unclaimedAmount) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="推送状态">
-            <el-tag :type="statusType(detailDialog.data, { prop: 'pushStatusName' })">
-              {{ displayValue(detailDialog.data.pushStatusName) }}
-            </el-tag>
+          <el-descriptions-item label="未匹配金额">
+            {{ formatMoney(detailDialog.data.unmatchAmountRec) }}
          </el-descriptions-item>
          <el-descriptions-item label="金蝶收款单号">
            {{ displayValue(detailDialog.data.kingdeeBillNo) }}
@@ -250,9 +222,6 @@
          <el-descriptions-item label="金蝶状态">
            {{ displayValue(detailDialog.data.kingdeeBillStatusName) }}
          </el-descriptions-item>
-          <el-descriptions-item label="推送失败原因">
-            {{ displayValue(detailDialog.data.pushFailReason) }}
-          </el-descriptions-item>
          <el-descriptions-item label="摘要">
            {{ displayValue(detailDialog.data.summary) }}
          </el-descriptions-item>
@@ -267,9 +236,7 @@
          </el-table-column>
          <el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
          <el-table-column label="状态变化" min-width="170" align="center">
-            <template #default="{ row }">
-              {{ row.actionType === 'push' ? row.actionName : claimStatusChange(row) }}
-            </template>
+            <template #default="{ row }">{{ claimStatusChange(row) }}</template>
          </el-table-column>
          <el-table-column prop="content" label="认领说明" min-width="220" />
        </el-table>
@@ -297,7 +264,6 @@ const emptyQuery = () => ({
  summary: '',
  detailSerialNo: '',
  claimStatus: '',
-  pushStatus: '',
  kingdeeBillStatus: '',
  receiptAmountStart: undefined,
  receiptAmountEnd: undefined,
@@ -314,7 +280,6 @@ export default {
      ArrowUp,
      query: emptyQuery(),
      claimStatusOptions: api.claimStatusOptions,
-      pushStatusOptions: api.pushStatusOptions,
      kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
      columns: receiptFlowTableColumns,
      visibleColumnKeys: receiptFlowTableColumns.map(column => column.prop),
@@ -324,7 +289,6 @@ export default {
      selectedRows: [],
      loading: false,
      syncing: false,
-      pushingId: null,
      searchExpanded: false,
      // 与 avue-crud 一致：搜索项数量超过 searchIndex（默认一行 4 项）时才显示“展开/收起”
      searchIndex: 4,
@@ -389,7 +353,7 @@ export default {
      this.syncing = true;
      try {
        const syncedCount = Number(this.unwrapData(await api.sync()) || 0);
-        this.$message.success(`流水同步完成，共同步${syncedCount}条认领公告`);
+        this.$message.success(`流水同步完成，共同步${syncedCount}条收款流水`);
        await this.loadTable();
      } finally {
        this.syncing = false;
@@ -448,38 +412,7 @@ export default {
    canClaim(row) {
      return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
    },
-    canPush(row) {
-      return (
-        this.hasPermission('receipt_flow_push') &&
-        !!row.billId &&
-        row.claimStatus === 'claimed' &&
-        row.pushStatus !== 'pushed'
-      );
-    },
-    async handlePush(row) {
-      try {
-        await this.$confirm(
-          `确认将流水【${row.receiptNoticeNo || row.detailSerialNo || ''}】推送金蝶生成收款单？`,
-          '推送金蝶',
-          { type: 'warning' }
-        );
-      } catch {
-        return;
-      }
-      this.pushingId = row.id;
-      try {
-        const data = this.unwrapData(await api.pushKingdee(row.id));
-        const billNo = data?.kingdeeBillNo;
-        this.$message.success(billNo ? `推送成功，金蝶收款单号：${billNo}` : '推送成功');
-        await this.loadTable();
-      } finally {
-        this.pushingId = null;
-      }
-    },
    statusType(row, column) {
-      if (column?.prop === 'pushStatusName') {
-        return { pushed: 'success', failed: 'danger' }[row.pushStatus] || 'info';
-      }
      return (
        { claimed: 'success', partial: 'warning', unclaimed: 'info' }[row.claimStatus] || ''
      );
@@ -440,8 +440,15 @@
      />

      <section-card title="发票信息">
-        <div class="formal-editor__invoice-claim">
-          <el-button type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
+        <div v-if="editable" class="formal-editor__invoice-claim">
+          <!-- 先票后款：付款结算单选审批通过的收票单（全额认领）；收款结算单维持原票池认领 -->
+          <el-button
+            v-if="form.settlementType !== 'receivable'"
+            type="primary"
+            @click="openInvoiceReceiptDialog"
+            >选择收票单</el-button
+          >
+          <el-button v-else type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
        </div>
        <el-table :data="invoices" border>
          <el-table-column type="index" label="序号" width="64" align="center" />
@@ -452,11 +459,6 @@
          <el-table-column prop="invoiceType" label="发票类型" min-width="150" align="center">
            <template #default="{ row }">{{ displayValue(row.invoiceType) }}</template>
          </el-table-column>
-          <el-table-column prop="taxRate" label="税率" min-width="100" align="center">
-            <template #default="{ row }">
-              {{ row.taxRate === null || row.taxRate === undefined ? '-' : `${row.taxRate}%` }}
-            </template>
-          </el-table-column>
          <el-table-column
            prop="invoiceAmount"
            label="发票金额（含税）"
@@ -480,17 +482,44 @@
            align="center"
          >
            <template #default="{ row }">
+              <!-- 匹配结算单金额支持手动修改：编辑态全放开；查看页仅指定失败行（failed）开放，重推时一并保存生效 -->
              <el-input-number
-                v-if="editable"
+                v-if="canEditMatchedAmount(row)"
                v-model="row.matchedAmount"
                :min="0"
-                :max="Number(row.availableInvoiceAmount || 0)"
+                :max="Number(row.availableInvoiceAmount || row.invoiceAmount || 0)"
                :precision="2"
                :controls="false"
              />
              <span v-else>{{ formatMoney(row.matchedAmount) }}</span>
            </template>
          </el-table-column>
+          <el-table-column
+            v-if="form.settlementType !== 'receivable'"
+            label="是否已指定应付"
+            min-width="130"
+            align="center"
+          >
+            <template #default="{ row }">
+              <el-tooltip
+                :disabled="row.kingdeePushStatus !== 'failed'"
+                :content="row.kingdeePushMsg || '推送金蝶失败，可重新推送'"
+                placement="top"
+              >
+                <el-tag
+                  :type="
+                    { assigned: 'success', failed: 'danger' }[row.kingdeePushStatus] || 'info'
+                  "
+                  size="small"
+                >
+                  {{
+                    { assigned: '已指定应付', failed: '指定失败' }[row.kingdeePushStatus] ||
+                    '未指定'
+                  }}
+                </el-tag>
+              </el-tooltip>
+            </template>
+          </el-table-column>
          <el-table-column label="操作" width="220" fixed="right" align="center">
            <template #default="{ row, $index }">
              <div class="formal-editor__links">
@@ -506,6 +535,14 @@
                  @click="downloadInvoiceAttachment(row)"
                  >下载</el-link
                >
+                <!-- 查看页重推入口：付款结算单已同步金蝶且认领票未指定应付（failed/pushed） -->
+                <el-link
+                  v-if="canRepushInvoice(row)"
+                  type="warning"
+                  :disabled="repushing"
+                  @click="repushInvoice(row)"
+                  >重新推送</el-link
+                >
                <el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
              </div>
            </template>
@@ -546,6 +583,11 @@
        @confirm="handleInvoiceClaimConfirm"
      />

+      <invoice-receipt-candidates-dialog
+        v-model="invoiceReceiptDialog.visible"
+        @confirm="handleInvoiceReceiptConfirm"
+      />
+
      <section-card
        v-if="readonly"
        :title="form.settlementType === 'receivable' ? '收款信息' : '付款信息'"
@@ -559,7 +601,7 @@
          <el-table-column type="index" label="序号" width="64" align="center" />
          <el-table-column
            prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
            min-width="160"
            align="center"
          />
@@ -708,7 +750,9 @@
      :rows="changeRecordDetailRows"
    />
    <template v-if="!pageMode" #footer>
-      <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
+      <el-button v-if="canSync" type="primary" plain :loading="syncLoading" @click="handleSync"
+        >同步</el-button
+      >
      <el-button @click="visible = false">取消</el-button>
      <el-button
        v-if="editable"
@@ -724,7 +768,9 @@
      >
    </template>
    <div v-if="pageMode && !publicMode" class="formal-editor__page-actions">
-      <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
+      <el-button v-if="canSync" type="primary" plain :loading="syncLoading" @click="handleSync"
+        >同步</el-button
+      >
      <el-button @click="visible = false">取消</el-button>
      <el-button
        v-if="editable"
@@ -1049,8 +1095,10 @@ import {
  getNextNo,
  getReceiptClaims,
  claimInvoices as claimInvoicesApi,
+  repushClaimedInvoice,
  queryInvoicePool,
  save,
+  syncKingdee,
 } from '@/api/settlement/formalSettlement';
 import {
  getDetail as getPreSettlementDetail,
@@ -1063,6 +1111,7 @@ import {
  settlementDetailPath,
 } from '@/utils/settlement-detail-link';
 import { getBfiExchangeRate } from '@/api/base/currency';
+import InvoiceReceiptCandidatesDialog from './invoice-receipt-candidates-dialog.vue';
 import {
  createFormalSettlementForm,
  formalSettlementFormFields,
@@ -1105,6 +1154,7 @@ export default {
  components: {
    InfoFilled,
    KingdeeInvoicePoolDialog,
+    InvoiceReceiptCandidatesDialog,
    ChangeRecordDetailDialog,
    ProjectAdvanceWriteOff,
  },
@@ -1128,6 +1178,7 @@ export default {
      loading: false,
      draftSaving: false,
      saving: false,
+      syncLoading: false,
      form: createFormalSettlementForm(),
      sources: [],
      details: [],
@@ -1143,6 +1194,8 @@ export default {
      attachments: [],
      selectedAttachmentRows: [],
      invoices: [],
+      // 查看页认领收票单重推进行中（行级操作守卫）
+      repushing: false,
      // 开票申请经金蝶回写的发票结果（只读展示，含板式文件/数电PDF下载地址）
      issuedInvoices: [],
      // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
@@ -1152,6 +1205,10 @@ export default {
        selected: [],
        confirming: false,
      },
+      // 先票后款：付款结算单选收票单（审批通过+未认领）弹窗
+      invoiceReceiptDialog: {
+        visible: false,
+      },
      attachmentUploadFiles: [],
      attachmentTypeOptions: [],
      attachmentFileTypes: [
@@ -1271,6 +1328,16 @@ export default {
    editable() {
      return !this.readonly;
    },
+    // 查看页面「同步」按钮：仅已审批且未同步金蝶（含推送失败）的单据显示，口径与后端推送闸门一致
+    canSync() {
+      return (
+        this.readonly &&
+        !this.publicMode &&
+        this.hasPermission('sync') &&
+        this.form.approvalStatus === 'approved' &&
+        this.form.kingdeeSyncStatus !== 'synced'
+      );
+    },
    isAdmin() {
      return isAdministrator(this.userInfo);
    },
@@ -1388,16 +1455,12 @@ export default {
      },
      immediate: true,
    },
-    summaryTotal(value) {
-      this.form.settlementAmount = Number(value || 0).toFixed(2);
-      this.form.localSettlementAmount = (
-        Number(value || 0) * Number(this.form.exchangeRate || 1)
-      ).toFixed(2);
+    summaryTotal() {
+      this.syncSettlementAmountsFromSummary();
    },
-    'form.exchangeRate'(value) {
-      this.form.localSettlementAmount = (
-        Number(this.summaryTotal || 0) * Number(value || 1)
-      ).toFixed(2);
+    'form.exchangeRate'() {
+      if (this._skipExchangeRateRebuild) return;
+      this.buildSummaryFeesFromDetails();
    },
  },
  methods: {
@@ -1683,8 +1746,9 @@ export default {
          current.settlementAmount = current.originalAmount;
          summaryMap.set(key, current);
        });
+      // 先保留预结算手工费用行，再按明细本位币 + 结算汇率重算系统归集行
      this.summaryFees = [...summaryMap.values()];
-      if (!this.summaryFees.length) await this.refreshSummaryFees();
+      await this.refreshSummaryFees();
    },
    async loadAllContracts() {
      const response = await getContractOptions('');
@@ -1786,13 +1850,19 @@ export default {
    },
    async fetchBfiExchangeRate() {
      const currency = this.form.currency;
-      if (!currency || currency === 'RMB') return;
+      if (!currency || currency === 'RMB') {
+        this.buildSummaryFeesFromDetails();
+        return;
+      }
      if (!this.form.exchangeRateDate) return;
      try {
        const { data } = await getBfiExchangeRate(currency, this.form.exchangeRateDate);
        const rateData = data?.data;
        if (rateData?.excval != null) {
+          this._skipExchangeRateRebuild = true;
          this.form.exchangeRate = Number(rateData.excval);
+          this._skipExchangeRateRebuild = false;
+          this.buildSummaryFeesFromDetails();
        } else {
          this.$message.warning(`未查询到 ${currency} 的BFI汇率数据`);
        }
@@ -1800,6 +1870,37 @@ export default {
        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
      }
    },
+    /**
+     * 明细金额按本位币理解；外币结算时结算合计原金额/结算金额 = 本位币金额 / 结算汇率。
+     */
+    convertLocalToSettlementAmount(localAmount) {
+      const amount = Number(localAmount || 0);
+      if (!Number.isFinite(amount)) return 0;
+      if (this.isLocalCurrencySettlement) {
+        return Number(amount.toFixed(2));
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      if (rate <= 0) return 0;
+      return Number((amount / rate).toFixed(2));
+    },
+    /**
+     * 结算金额取结算合计原币汇总值；本位币合计 = 结算金额 × 结算汇率。
+     */
+    syncSettlementAmountsFromSummary() {
+      const settlementTotal = this.summaryFees.reduce(
+        (total, row) => total + Number(row.settlementAmount || 0),
+        0
+      );
+      this.form.settlementAmount = Number(settlementTotal || 0).toFixed(2);
+      if (this.isLocalCurrencySettlement) {
+        this.form.localSettlementAmount = this.form.settlementAmount;
+        this.form.exchangeRate = 1;
+        return;
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      this.form.localSettlementAmount =
+        rate > 0 ? (Number(this.form.settlementAmount || 0) * rate).toFixed(2) : '0.00';
+    },
    openCandidateDialog() {
      this.candidate.visible = true;
      this.candidate.page.current = 1;
@@ -2021,8 +2122,9 @@ export default {
          .map(row => [`${row.feeType}\u0000${row.feeItem}`, row])
      );
      const append = (feeItem, originalValue, settlementValue, fallbackFeeType = '') => {
-        const originalAmount = Number(originalValue || 0);
-        const settlementAmount = Number(settlementValue || 0);
+        // 明细费用按本位币归集，外币结算时再按汇率换算成结算原币金额
+        const originalAmount = this.convertLocalToSettlementAmount(originalValue);
+        const settlementAmount = this.convertLocalToSettlementAmount(settlementValue);
        if (!feeItem || !Number.isFinite(originalAmount) || !Number.isFinite(settlementAmount)) {
          return;
        }
@@ -2060,6 +2162,7 @@ export default {
      });
      const manualRows = this.summaryFees.filter(row => Number(row.manualFlag) === 1);
      this.summaryFees = [...generatedMap.values(), ...manualRows];
+      this.syncSettlementAmountsFromSummary();
    },
    // 每条明细对应的费用行：[调整前基准行, 调整后当前行]，缺少费用快照时退化为明细自身的汇总行。
    resolveDetailFeePairs(detail) {
@@ -2599,6 +2702,81 @@ export default {
    openInvoiceClaimDialog() {
      this.invoiceClaimDialog.visible = true;
    },
+    // 先票后款：选收票单（审批通过+未被认领），确认后按发票号全额认领
+    openInvoiceReceiptDialog() {
+      this.invoiceReceiptDialog.visible = true;
+    },
+    // 查看页重推入口展示条件：只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付（failed/pushed）
+    canRepushInvoice(row) {
+      return (
+        !this.editable &&
+        this.form.settlementType !== 'receivable' &&
+        this.form.approvalStatus === 'approved' &&
+        this.form.kingdeeSyncStatus === 'synced' &&
+        ['failed', 'pushed'].includes(row.kingdeePushStatus || '')
+      );
+    },
+    // 查看页匹配金额编辑仅开放指定失败行（failed）；pushed 行等待自动补偿指定，金额保持只读
+    canEditMatchedAmount(row) {
+      return (
+        this.editable ||
+        (this.form.settlementType !== 'receivable' &&
+          this.form.approvalStatus === 'approved' &&
+          this.form.kingdeeSyncStatus === 'synced' &&
+          row.kingdeePushStatus === 'failed')
+      );
+    },
+    // 重推 = 收票单A303-2 + 指定应付A302-6 一步式，服务端返回结果描述；完成后重载详情刷新状态
+    async repushInvoice(row) {
+      try {
+        await this.$confirm(`确认重新推送发票${row.invoiceNo || ''}到金蝶并指定应付?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        });
+      } catch {
+        return;
+      }
+      this.repushing = true;
+      try {
+        const data = this.unwrapData(
+          await repushClaimedInvoice(this.form.id, row.invoiceNo, Number(row.matchedAmount || 0))
+        );
+        this.$message.success(data || '重新推送成功');
+        await this.loadFormalDetail(this.form.id);
+      } finally {
+        this.repushing = false;
+      }
+    },
+    async handleInvoiceReceiptConfirm(rows) {
+      // 收票单行 → 结算单发票行：匹配金额固定=发票金额（全额认领），附件契约归一为单数 attachmentJson
+      const invoices = rows.map(row => ({
+        ...row,
+        attachmentJson: row.attachmentJson || row.attachmentsJson,
+        invoiceType: row.invoiceType || '',
+        taxRate: row.taxRate ?? null,
+        availableInvoiceAmount: Number(row.invoiceAmount || 0),
+        matchedAmount: Number(row.invoiceAmount || 0),
+      }));
+      if (!this.form.id) {
+        const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
+        this.invoices = [
+          ...this.invoices,
+          ...invoices.filter(row => !existingNumbers.has(String(row.invoiceNo))),
+        ];
+        this.$message.success(`已选择${invoices.length}条收票单，保存正式结算单后生效`);
+        return;
+      }
+      const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
+      const newInvoices = invoices.filter(row => !existingNumbers.has(String(row.invoiceNo)));
+      if (!newInvoices.length) {
+        this.$message.warning('所选收票单均已认领');
+        return;
+      }
+      await claimInvoicesApi({ formalSettlementId: this.form.id, invoices: newInvoices });
+      await this.loadFormalDetail(this.form.id);
+      this.$message.success('收票单认领成功，已同步正式结算单及关联付款单据');
+    },
    invoicePoolQueryApi(params) {
      return queryInvoicePool(params);
    },
@@ -2713,10 +2891,7 @@ export default {
        }
        matchedTotal += matchedAmount;
      }
-      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
-        this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
-        return false;
-      }
+      // 先票后款全额认领：匹配金额=发票全额，可超过结算金额，不再校验合计上限（收票状态按覆盖判定）
      return true;
    },
    removeInvoice(index) {
@@ -2851,8 +3026,30 @@ export default {
        remark: this.form.remark,
      };
    },
-    handleSyncPlaceholder() {
-      this.$message.info('开发中');
+    // 查看页面单张推送金蝶（A102-2/A302-2）：结果与异常原因弹框展示，成败后均刷新详情与列表
+    async handleSync() {
+      if (this.syncLoading) return;
+      this.syncLoading = true;
+      try {
+        const res = await syncKingdee(this.form.id, { meta: { suppressErrorMessage: true } });
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        let message = `同步成功：${this.unwrapData(res) || '-'}`;
+        if (['pending', 'partial'].includes(this.form.attachmentSyncStatus)) {
+          message += '\n该单附件未全部上传，可重推补传';
+        }
+        await this.$alert(message, '同步结果', { type: 'success', confirmButtonText: '知道了' });
+      } catch (error) {
+        const reason = String(error?.message || error || '未知错误').trim() || '未知错误';
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        await this.$alert(`同步失败，${reason}`, '同步结果', {
+          type: 'error',
+          confirmButtonText: '知道了',
+        });
+      } finally {
+        this.syncLoading = false;
+      }
    },
    async handleDraftSave() {
      // 保存草稿：不做表单校验，直接落草稿并返回列表刷新
@@ -3186,10 +3383,47 @@ export default {
      return files.length ? JSON.stringify(files) : '';
    },
    parseFeeItems(value) {
+      const raw = this.parseRawFeeItems(value);
+      const metaKeys = new Set([
+        'currency',
+        'totalFreightAmount',
+        'otherFreightAmount',
+        'freightItems',
+        'freightTotal',
+        'totalFreight',
+        'totalAmount',
+        'freight',
+        'freightAmount',
+        'transportFee',
+        'otherFeeTotal',
+        'otherAmount',
+      ]);
+      const result = {};
+      let otherFeeAmount = 0;
+      Object.entries(raw).forEach(([key, amount]) => {
+        if (!key) return;
+        if (key === 'otherFreightAmount' || key === 'otherFeeTotal' || key === 'otherAmount') {
+          otherFeeAmount += Number(amount || 0);
+          return;
+        }
+        if (metaKeys.has(key)) return;
+        if (amount && typeof amount === 'object') return;
+        result[key] = amount;
+      });
+      const hasOtherFee = Object.keys(result).some(
+        name => String(name).includes('其它费') || String(name).includes('其他费')
+      );
+      if (otherFeeAmount && !hasOtherFee) {
+        result['其它费用'] = otherFeeAmount;
+      }
+      return result;
+    },
+    parseRawFeeItems(value) {
      if (!value) return {};
-      if (typeof value === 'object') return value;
+      if (typeof value === 'object') return { ...value };
      try {
-        return JSON.parse(value);
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === 'object' ? parsed : {};
      } catch {
        return {};
      }
@@ -23,6 +23,15 @@
        @click="$emit('payment')"
        >付款申请</el-button
      >
+      <!-- 先票后款：付款结算单审批通过后可发票登记（关联收票单并推送指定应付），选中一条付款结算单操作 -->
+      <el-button
+        v-if="showPaymentAction && hasPermission('invoice_register')"
+        type="primary"
+        plain
+        :disabled="!selection.length"
+        @click="emitSingle('invoiceRegister')"
+        >发票登记</el-button
+      >
      <el-button
        v-if="hasPermission('sync')"
        type="primary"
@@ -60,7 +69,26 @@
      }}</el-tag>
    </template>

-    <template #kingdeeSyncStatus="{ row }">{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</template>
+    <template #kingdeeSyncStatus="{ row }">
+      <el-tooltip
+        :disabled="row.kingdeeSyncStatus !== 'failed'"
+        :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+        placement="top"
+      >
+        <el-tag :type="kingdeeStatusType(row.kingdeeSyncStatus)">{{
+          kingdeeSyncName(row.kingdeeSyncStatus)
+        }}</el-tag>
+      </el-tooltip>
+    </template>
+
+    <template #kingdeeWriteOffStatus="{ row }">
+      <el-tag
+        v-if="row.kingdeeSyncStatus === 'synced'"
+        :type="kingdeeWriteOffTagType(row.kingdeeWriteOffStatus)"
+        >{{ kingdeeWriteOffName(row.kingdeeWriteOffStatus) || '未校验' }}</el-tag
+      >
+      <span v-else>-</span>
+    </template>

    <template #kingdeeLockStatus="{ row }">
      <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
@@ -69,6 +97,23 @@
      <span v-else>-</span>
    </template>

+    <template #kingdeeAssignStatus="{ row }">
+      <el-tooltip
+        :disabled="row.kingdeeAssignStatus !== 'failed'"
+        :content="row.kingdeeAssignFailReason || '收票单指定应付失败，可在查看页对失败行重新推送'"
+        placement="top"
+      >
+        <el-tag
+          v-if="row.kingdeeAssignStatus"
+          :type="{ assigned: 'success', failed: 'danger' }[row.kingdeeAssignStatus] || 'info'"
+          size="small"
+        >
+          {{ { assigned: '已指定应付', failed: '指定失败' }[row.kingdeeAssignStatus] || '未指定' }}
+        </el-tag>
+        <span v-else>-</span>
+      </el-tooltip>
+    </template>
+
    <template #menu="{ row }">
      <el-link
        v-for="action in rowActions(row)"
@@ -83,7 +128,8 @@

 <script>
 import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
-import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeSyncName, kingdeeWriteOffName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeStatusType, kingdeeWriteOffTagType } from '@/utils/kingdee';

 export default {
  name: 'FormalSettlementTablePanel',
@@ -186,6 +232,7 @@ export default {
        ''
      );
    },
+    kingdeeStatusType,
    invoiceName(value, settlementType) {
      return invoiceStatusName(value, settlementType);
    },
@@ -195,6 +242,10 @@ export default {
    kingdeeSyncName(value) {
      return kingdeeSyncName(value);
    },
+    kingdeeWriteOffName(value) {
+      return kingdeeWriteOffName(value);
+    },
+    kingdeeWriteOffTagType,
    lockTag(row) {
      if (row.kingdeeLockStatus === 'locked') {
        return {
@@ -0,0 +1,186 @@
+<template>
+  <el-dialog
+    v-model="visible"
+    title="选择收票单"
+    width="86%"
+    append-to-body
+    destroy-on-close
+    @open="handleOpen"
+  >
+    <div class="invoice-candidates-dialog__search">
+      <el-input
+        v-model="keyword"
+        clearable
+        placeholder="发票号 / 销方（开票单位） / 购方（受票单位）"
+        @keyup.enter="handleQuery"
+      />
+      <el-button type="primary" :loading="loading" @click="handleQuery">查询</el-button>
+    </div>
+    <el-table
+      ref="candidatesTable"
+      v-loading="loading"
+      :data="rows"
+      row-key="id"
+      border
+      height="460"
+      @selection-change="selection = $event"
+    >
+      <el-table-column type="selection" width="52" fixed="left" align="center" reserve-selection />
+      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
+      <el-table-column prop="invoiceDate" label="开票日期" min-width="110" align="center">
+        <template #default="{ row }">{{ row.invoiceDate || '-' }}</template>
+      </el-table-column>
+      <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="140" align="right">
+        <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="推送状态" min-width="120" align="center">
+        <template #default="{ row }">
+          <el-tooltip
+            :disabled="row.kingdeePushStatus !== 'failed'"
+            :content="row.kingdeePushMsg || '推送金蝶失败，可在收票登记列表重推'"
+            placement="top"
+          >
+            <el-tag :type="pushStatusType(row.kingdeePushStatus)" size="small">
+              {{ pushStatusName(row.kingdeePushStatus) }}
+            </el-tag>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="invoice-candidates-dialog__pagination">
+      <el-pagination
+        v-model:current-page="page.current"
+        v-model:page-size="page.size"
+        :total="page.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @current-change="load"
+        @size-change="handleSizeChange"
+      />
+    </div>
+    <div class="invoice-candidates-dialog__tip">
+      仅列出审批通过且未被其他付款结算单认领的收票单
+    </div>
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">
+        确定{{ selection.length ? `（${selection.length}）` : '' }}
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { claimCandidates } from '@/api/payment/invoiceReceipt';
+
+export default {
+  name: 'InvoiceReceiptCandidatesDialog',
+  props: {
+    modelValue: { type: Boolean, required: true },
+  },
+  emits: ['update:modelValue', 'confirm'],
+  data() {
+    return {
+      loading: false,
+      keyword: '',
+      rows: [],
+      selection: [],
+      page: { current: 1, size: 10, total: 0 },
+    };
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    unwrap(response) {
+      const body = response?.data || response || {};
+      return body?.data || body;
+    },
+    handleOpen() {
+      this.keyword = '';
+      this.page = { current: 1, size: 10, total: 0 };
+      this.selection = [];
+      this.$refs.candidatesTable?.clearSelection?.();
+      this.load();
+    },
+    handleQuery() {
+      this.page.current = 1;
+      this.load();
+    },
+    handleSizeChange() {
+      this.page.current = 1;
+      this.load();
+    },
+    async load() {
+      this.loading = true;
+      try {
+        const data = this.unwrap(
+          await claimCandidates({
+            current: this.page.current,
+            size: this.page.size,
+            keyword: this.keyword,
+          })
+        );
+        this.rows = data?.records || [];
+        this.page.total = Number(data?.total || 0);
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleConfirm() {
+      if (!this.selection.length) {
+        this.$message.warning('请至少选择一条收票单');
+        return;
+      }
+      this.$emit('confirm', this.selection.map(row => ({ ...row })));
+      this.visible = false;
+    },
+    pushStatusName(value) {
+      return (
+        { pushed: '已保存收票单', assigned: '已指定应付', failed: '推送失败', unsynced: '未推送' }[
+          value
+        ] || '未推送'
+      );
+    },
+    pushStatusType(value) {
+      return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
+    },
+    formatMoney(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : '-';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.invoice-candidates-dialog__search {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-bottom: 12px;
+
+  .el-input {
+    width: 360px;
+  }
+}
+.invoice-candidates-dialog__pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+.invoice-candidates-dialog__tip {
+  margin-top: 8px;
+  color: #909399;
+  font-size: 12px;
+}
+</style>
@@ -989,6 +989,7 @@ import {
  save,
  submit,
 } from '@/api/settlement/preSettlement';
+import { getDetail as getContractDetail } from '@/api/business/contract-manage';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
 import {
  resolveReceivablePayableDetailId,
@@ -1072,6 +1073,8 @@ export default {
      changeTableColumns: changeRecordColumns,
      candidateColumns: candidateDetailColumns,
      contractOptions: [],
+      payerOptions: [],
+      payeeOptions: [],
      contractCategoryOptions,
      signTypeOptions,
      effectiveTypeOptions,
@@ -1332,9 +1335,12 @@ export default {
        if (value) this.initialize();
      },
    },
-    summaryTotal(value) {
-      this.form.settlementAmount = Number(value || 0).toFixed(2);
-      this.recalculateLocalAmount();
+    summaryTotal() {
+      this.syncSettlementAmountsFromSummary();
+    },
+    'form.exchangeRate'() {
+      if (this._skipExchangeRateRebuild) return;
+      this.buildSummaryFeesFromDetails();
    },
    filteredDetails: {
      handler(list) {
@@ -1388,18 +1394,34 @@ export default {
      const first = rows[0];
      const settlementType = this.initialData.settlementType || first.settlementType || 'payable';
      const contractId = first.contractId || '';
-      let contractPartyA = first.payerName || '';
-      let contractPartyB = first.payeeName || '';
-      if (contractId && (!contractPartyA || !contractPartyB)) {
+      let contractPartyA = '';
+      let contractPartyB = '';
+      let contractPartyAJson = '';
+      let contractPartyBJson = '';
+      if (contractId) {
        try {
-          const { data } = await getContractOptions(first.contractNo || '');
-          const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
-          contractPartyA = contractPartyA || matched?.partyA || '';
-          contractPartyB = contractPartyB || matched?.partyB || '';
+          const contractDetail = await this.fetchContractPartyDetail(contractId);
+          if (contractDetail) {
+            contractPartyA = contractDetail.partyA || '';
+            contractPartyB = contractDetail.partyB || '';
+            contractPartyAJson = contractDetail.partyAJson || '';
+            contractPartyBJson = contractDetail.partyBJson || '';
+          }
        } catch (error) {
          contractPartyA = '';
          contractPartyB = '';
        }
+        if (!contractPartyA && !contractPartyB) {
+          try {
+            const { data } = await getContractOptions(first.contractNo || '');
+            const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
+            contractPartyA = matched?.partyA || '';
+            contractPartyB = matched?.partyB || '';
+          } catch (error) {
+            contractPartyA = first.payerName || '';
+            contractPartyB = first.payeeName || '';
+          }
+        }
      }
      if (!this.contractOptions.some(item => String(item.id) === String(contractId))) {
        this.contractOptions.push({
@@ -1413,6 +1435,8 @@ export default {
          settlementType,
          partyA: contractPartyA,
          partyB: contractPartyB,
+          partyAJson: contractPartyAJson,
+          partyBJson: contractPartyBJson,
        });
      }
      this.handleContractChange(contractId);
@@ -1424,12 +1448,12 @@ export default {
        projectName: first.projectName || this.form.projectName,
        deptId: first.deptId || this.form.deptId,
        deptName: first.deptName || this.form.deptName,
-        payerName: this.form.payerName || contractPartyA,
-        payeeName: this.form.payeeName || contractPartyB,
        settlementType,
        currency: first.currency || 'RMB',
        localCurrency: first.localCurrency || 'RMB',
      });
+      // 明细带入的收付方若为单值且在选项中，优先保留；多方拼接值由下拉默认首项承接
+      this.applyPartySelection(first.payerName, first.payeeName);
      this.details = rows.map(row => this.normalizeSourceDetail(row));
      this.detailPage.current = 1;
      this.loading = true;
@@ -1513,6 +1537,8 @@ export default {
      this.billingRuleDialog.visible = false;
      this.billingRuleDialog.rule = null;
      this.contractOptions = [];
+      this.payerOptions = [];
+      this.payeeOptions = [];
      this.contractDialog.visible = false;
      this.contractDialog.expanded = false;
      this.contractDialog.rows = [];
@@ -1549,21 +1575,20 @@ export default {
        this.attachments = this.parseAttachments(detail.attachmentsJson);
        this.sortAttachments();
        this.selectedAttachmentRows = [];
-        if (
-          detail.contractId &&
-          !this.contractOptions.some(item => item.id === detail.contractId)
-        ) {
-          this.contractOptions.push({
-            id: detail.contractId,
+        if (detail.contractId) {
+          await this.ensureContractPartyOptions(detail.contractId, {
            contractNo: detail.contractNo,
            contractName: detail.contractName,
            projectId: detail.projectId,
            projectName: detail.projectName,
            deptId: detail.deptId,
            deptName: detail.deptName,
-            partyA: detail.payerName,
-            partyB: detail.payeeName,
+            settlementType: detail.settlementType,
          });
+          this.applyPartySelection(detail.payerName, detail.payeeName);
+        } else {
+          this.payerOptions = [];
+          this.payeeOptions = [];
        }
        if (this.publicMode && detail.detailFees) {
          Object.entries(detail.detailFees).forEach(([detailId, feeRows]) => {
@@ -1637,6 +1662,8 @@ export default {
        deptName: row.deptName || row.organizationName,
        partyA: row.partyA || row.payerName,
        partyB: row.partyB || row.payeeName,
+        partyAJson: row.partyAJson || '',
+        partyBJson: row.partyBJson || '',
        settlementType:
          row.settlementType || (row.contractCategory === '客户合同' ? 'receivable' : 'payable'),
      };
@@ -1646,7 +1673,7 @@ export default {
      this.handleContractChange(contract.id);
      this.contractDialog.visible = false;
      this.contractDialog.current = null;
-      this.$refs.formRef?.clearValidate('contractId');
+      this.$refs.formRef?.clearValidate(['contractId', 'payerName', 'payeeName']);
    },
    contractCategoryName(value) {
      return (
@@ -1711,6 +1738,8 @@ export default {
        this.form.deptName = '';
        this.form.payerName = '';
        this.form.payeeName = '';
+        this.payerOptions = [];
+        this.payeeOptions = [];
        this.summaryFees = [];
        this.projectAdvanceWriteOffs = [];
        return;
@@ -1723,9 +1752,8 @@ export default {
      this.form.deptId = contract.deptId;
      this.form.deptName = contract.deptName;
      this.form.settlementType = contract.settlementType || 'payable';
-      // 部分候选合同只带 id/名称，缺甲方乙方；此时保留已带出的收付方，不要清成 undefined
-      if (contract.partyA) this.form.payerName = contract.partyA;
-      if (contract.partyB) this.form.payeeName = contract.partyB;
+      this.syncPartyOptionsFromContract(contract);
+      this.applyPartySelection('', '');
      this.form.currency = contract.settlementCurrency || 'RMB';
      this.summaryFees = [];
      this.projectAdvanceWriteOffs = [];
@@ -1734,6 +1762,152 @@ export default {
        this.fetchBfiExchangeRate();
      }
    },
+    parsePartyNames(partyJson, fallbackName) {
+      try {
+        const parsed = partyJson ? JSON.parse(partyJson) : [];
+        if (Array.isArray(parsed) && parsed.length) {
+          const names = parsed
+            .map(item => String(item?.customerName || '').trim())
+            .filter(Boolean);
+          if (names.length) return [...new Set(names)];
+        }
+      } catch (error) {
+        // JSON 解析失败时回退到名称拆分
+      }
+      return [
+        ...new Set(
+          String(fallbackName || '')
+            .split(/[、,，]/)
+            .map(name => name.trim())
+            .filter(Boolean)
+        ),
+      ];
+    },
+    buildPartySelectOptions(names) {
+      return (names || []).map(name => ({ dictKey: name, dictValue: name }));
+    },
+    resolveContractPartyNames(contract) {
+      const settlementType = contract?.settlementType || this.form.settlementType || 'payable';
+      const partyANames = this.parsePartyNames(contract?.partyAJson, contract?.partyA);
+      const partyBNames = this.parsePartyNames(contract?.partyBJson, contract?.partyB);
+      if (settlementType === 'receivable') {
+        return { payerNames: partyBNames, payeeNames: partyANames };
+      }
+      return { payerNames: partyANames, payeeNames: partyBNames };
+    },
+    syncPartyOptionsFromContract(contract) {
+      const { payerNames, payeeNames } = this.resolveContractPartyNames(contract || {});
+      this.payerOptions = this.buildPartySelectOptions(payerNames);
+      this.payeeOptions = this.buildPartySelectOptions(payeeNames);
+    },
+    isJoinedPartyName(value) {
+      return /[、,，]/.test(String(value || ''));
+    },
+    pickPartyValue(names, currentValue) {
+      const options = Array.isArray(names) ? names : [];
+      const current = String(currentValue || '').trim();
+      if (!options.length) {
+        // 无线上选项时（如公开查看拉不到合同），保留已有单值，丢弃多方拼接脏值
+        return this.isJoinedPartyName(current) ? '' : current;
+      }
+      if (current && !this.isJoinedPartyName(current) && options.includes(current)) {
+        return current;
+      }
+      return options[0] || '';
+    },
+    applyPartySelection(payerName, payeeName) {
+      const payerNames = this.payerOptions.map(item => item.dictKey);
+      const payeeNames = this.payeeOptions.map(item => item.dictKey);
+      this.form.payerName = this.pickPartyValue(payerNames, payerName);
+      this.form.payeeName = this.pickPartyValue(payeeNames, payeeName);
+      // 编辑历史单值不在合同多方中时，仍保留展示，避免下拉空白
+      if (
+        this.form.payerName &&
+        !this.payerOptions.some(item => item.dictKey === this.form.payerName)
+      ) {
+        this.payerOptions = [
+          ...this.payerOptions,
+          { dictKey: this.form.payerName, dictValue: this.form.payerName },
+        ];
+      }
+      if (
+        this.form.payeeName &&
+        !this.payeeOptions.some(item => item.dictKey === this.form.payeeName)
+      ) {
+        this.payeeOptions = [
+          ...this.payeeOptions,
+          { dictKey: this.form.payeeName, dictValue: this.form.payeeName },
+        ];
+      }
+    },
+    async fetchContractPartyDetail(contractId) {
+      if (!contractId) return null;
+      const { data } = await getContractDetail(contractId);
+      return data?.data || null;
+    },
+    async ensureContractPartyOptions(contractId, fallback = {}) {
+      if (!contractId) {
+        this.payerOptions = [];
+        this.payeeOptions = [];
+        return null;
+      }
+      let contract = this.contractOptions.find(item => String(item.id) === String(contractId));
+      const needDetail =
+        !contract ||
+        !(contract.partyAJson || contract.partyBJson) ||
+        this.isJoinedPartyName(contract.partyA) ||
+        this.isJoinedPartyName(contract.partyB) ||
+        (!contract.partyA && !contract.partyB);
+      if (needDetail) {
+        try {
+          const detail = await this.fetchContractPartyDetail(contractId);
+          if (detail) {
+            contract = {
+              ...(contract || {}),
+              id: contractId,
+              contractNo: detail.contractNo || fallback.contractNo || contract?.contractNo,
+              contractName: detail.contractName || fallback.contractName || contract?.contractName,
+              projectId: detail.projectId || fallback.projectId || contract?.projectId,
+              projectName: detail.projectName || fallback.projectName || contract?.projectName,
+              deptId:
+                detail.organizationId ||
+                detail.deptId ||
+                fallback.deptId ||
+                contract?.deptId,
+              deptName:
+                detail.organizationName ||
+                detail.deptName ||
+                fallback.deptName ||
+                contract?.deptName,
+              partyA: detail.partyA || contract?.partyA || '',
+              partyB: detail.partyB || contract?.partyB || '',
+              partyAJson: detail.partyAJson || contract?.partyAJson || '',
+              partyBJson: detail.partyBJson || contract?.partyBJson || '',
+              settlementType:
+                fallback.settlementType ||
+                contract?.settlementType ||
+                (detail.contractCategory === '客户合同' ? 'receivable' : 'payable'),
+              settlementCurrency: detail.settlementCurrency || contract?.settlementCurrency,
+            };
+          }
+        } catch (error) {
+          // 合同详情失败时仍用现有快照拆分多方名称
+        }
+      }
+      if (!contract) {
+        contract = {
+          id: contractId,
+          ...fallback,
+          partyA: fallback.partyA || '',
+          partyB: fallback.partyB || '',
+        };
+      }
+      const index = this.contractOptions.findIndex(item => String(item.id) === String(contractId));
+      if (index >= 0) this.contractOptions.splice(index, 1, contract);
+      else this.contractOptions.push(contract);
+      this.syncPartyOptionsFromContract(contract);
+      return contract;
+    },
    async saveDraft(shouldSubmit) {
      await this.$refs.formRef?.validate();
      if (shouldSubmit && !this.details.length) {
@@ -1890,8 +2064,9 @@ export default {
          .map(row => [`${row.feeType}\u0000${row.feeItem}`, row])
      );
      const appendSummary = (feeItem, originalValue, settlementValue, fallbackFeeType = '') => {
-        const originalAmount = Number(originalValue || 0);
-        const settlementAmount = Number(settlementValue || 0);
+        // 明细费用按本位币归集，外币结算时再按汇率换算成结算原币金额
+        const originalAmount = this.convertLocalToSettlementAmount(originalValue);
+        const settlementAmount = this.convertLocalToSettlementAmount(settlementValue);
        if (!feeItem || !Number.isFinite(originalAmount) || !Number.isFinite(settlementAmount)) {
          return;
        }
@@ -1946,7 +2121,7 @@ export default {
      });
      nextFeeMap.forEach(row => orderedFees.push(row));
      this.summaryFees = orderedFees;
-      this.recalculateLocalAmount();
+      this.syncSettlementAmountsFromSummary();
    },
    // 每条明细对应的费用行：[调整前基准行, 调整后当前行]，缺少来源费用快照时退化为明细自身的汇总行。
    resolveDetailFeePairs(detail) {
@@ -2034,17 +2209,21 @@ export default {
    },
    handleExchangeRateDateChange() {
      this.fetchBfiExchangeRate();
-      this.recalculateLocalAmount();
    },
    async fetchBfiExchangeRate() {
-      if (!this.form.currency || this.form.currency === 'RMB') return;
+      if (!this.form.currency || this.form.currency === 'RMB') {
+        this.buildSummaryFeesFromDetails();
+        return;
+      }
      if (!this.form.exchangeRateDate) return;
      try {
        const { data } = await getBfiExchangeRate(this.form.currency, this.form.exchangeRateDate);
        const rateData = data?.data;
        if (rateData?.excval != null) {
+          this._skipExchangeRateRebuild = true;
          this.form.exchangeRate = Number(rateData.excval);
-          this.recalculateLocalAmount();
+          this._skipExchangeRateRebuild = false;
+          this.buildSummaryFeesFromDetails();
        } else {
          this.$message.warning(`未查询到 ${this.form.currency} 的BFI汇率数据`);
        }
@@ -2052,9 +2231,39 @@ export default {
        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
      }
    },
+    /**
+     * 明细金额按本位币理解；外币结算时结算合计原金额/结算金额 = 本位币金额 / 结算汇率。
+     */
+    convertLocalToSettlementAmount(localAmount) {
+      const amount = Number(localAmount || 0);
+      if (!Number.isFinite(amount)) return 0;
+      if (this.isLocalCurrencySettlement) {
+        return Number(amount.toFixed(2));
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      if (rate <= 0) return 0;
+      return Number((amount / rate).toFixed(2));
+    },
+    /**
+     * 结算金额取结算合计原币汇总值；本位币合计 = 结算金额 × 结算汇率。
+     */
+    syncSettlementAmountsFromSummary() {
+      const settlementTotal = this.summaryFees.reduce(
+        (total, row) => total + Number(row.settlementAmount || 0),
+        0
+      );
+      this.form.settlementAmount = Number(settlementTotal || 0).toFixed(2);
+      if (this.isLocalCurrencySettlement) {
+        this.form.localSettlementAmount = this.form.settlementAmount;
+        this.form.exchangeRate = 1;
+        return;
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      this.form.localSettlementAmount =
+        rate > 0 ? (Number(this.form.settlementAmount || 0) * rate).toFixed(2) : '0.00';
+    },
    recalculateLocalAmount() {
-      const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
-      this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);
+      this.buildSummaryFeesFromDetails();
    },
    openCandidateDialog() {
      if (!this.form.contractId) {
@@ -3023,6 +3232,42 @@ export default {
      });
    },
    parseFeeItems(value) {
+      const raw = this.parseRawFeeItems(value);
+      const metaKeys = new Set([
+        'currency',
+        'totalFreightAmount',
+        'otherFreightAmount',
+        'freightItems',
+        'freightTotal',
+        'totalFreight',
+        'totalAmount',
+        'freight',
+        'freightAmount',
+        'transportFee',
+        'otherFeeTotal',
+        'otherAmount',
+      ]);
+      const result = {};
+      let otherFeeAmount = 0;
+      Object.entries(raw).forEach(([key, amount]) => {
+        if (!key) return;
+        if (key === 'otherFreightAmount' || key === 'otherFeeTotal' || key === 'otherAmount') {
+          otherFeeAmount += Number(amount || 0);
+          return;
+        }
+        if (metaKeys.has(key)) return;
+        if (amount && typeof amount === 'object') return;
+        result[key] = amount;
+      });
+      const hasOtherFee = Object.keys(result).some(
+        name => String(name).includes('其它费') || String(name).includes('其他费')
+      );
+      if (otherFeeAmount && !hasOtherFee) {
+        result['其它费用'] = otherFeeAmount;
+      }
+      return result;
+    },
+    parseRawFeeItems(value) {
      if (!value) return {};
      if (typeof value === 'object') return { ...value };
      try {
@@ -380,7 +380,13 @@ export default {
    },
    async loadFormalSettlements(keyword = '') {
      const { data } = await api.getFormalSettlements(keyword);
-      this.candidates = data?.data || data || [];
+      const payload = data?.data ?? data;
+      // 兼容误返回分页对象的情况，只取正式结算单列表
+      this.candidates = Array.isArray(payload)
+        ? payload
+        : Array.isArray(payload?.records)
+          ? payload.records
+          : [];
    },
    async loadFeeOptions() {
      const { data } = await api.getFeeOptions();
@@ -89,26 +89,26 @@
          <el-col :span="8">
            <el-form-item label="承运商合同" prop="carrierContractId">
              <el-select
-                v-model="form.carrierContractId"
+                v-model="form.carrierOptionValue"
                filterable
                clearable
                :disabled="readonly || !form.projectId"
                style="width: 100%"
-                :placeholder="form.projectId ? '请选择承运商合同' : '请先选择项目'"
+                :placeholder="form.projectId ? '请选择承运商合同客商' : '请先选择项目'"
                @change="onCarrierContractChange"
              >
                <el-option
-                  v-for="item in filteredCarrierContracts"
-                  :key="item.id"
-                  :label="formatContractLabel(item)"
-                  :value="item.id"
+                  v-for="item in filteredCarrierContractOptions"
+                  :key="item.optionValue"
+                  :label="item.optionLabel"
+                  :value="item.optionValue"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="承运商">
-              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同后自动填充" />
+              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同客商后自动填充" />
            </el-form-item>
          </el-col>
          <el-col :span="24">
@@ -403,6 +403,9 @@ const createDefaultForm = () => ({
  customerName: '',
  carrierContractId: '',
  carrierContractName: '',
+  carrierOptionValue: '',
+  carrierPartyId: '',
+  carrierPartyRole: '',
  carrierName: '',
  waybillMode: 'new',
  remark: '',
@@ -442,6 +445,62 @@ const filteredCustomerContracts = computed(() => customerContracts.value);

 const filteredCarrierContracts = computed(() => carrierContracts.value);

+const parsePartyRows = (partyJson, fallbackName = '', partyRole = 'B') => {
+  let rows = [];
+  try {
+    const parsed = partyJson ? JSON.parse(partyJson) : [];
+    if (Array.isArray(parsed)) {
+      rows = parsed
+        .map(item => ({
+          id: item.id || '',
+          customerId: item.customerId || '',
+          customerName: String(item.customerName || '').trim(),
+          partyRole,
+        }))
+        .filter(item => item.customerName);
+    }
+  } catch (error) {
+    rows = [];
+  }
+  if (rows.length) return rows;
+  return String(fallbackName || '')
+    .split(/[、,，]/)
+    .map(name => name.trim())
+    .filter(Boolean)
+    .map(name => ({ id: '', customerId: '', customerName: name, partyRole }));
+};
+
+const filteredCarrierContractOptions = computed(() => {
+  const options = [];
+  filteredCarrierContracts.value.forEach(contract => {
+    const parties = [
+      ...parsePartyRows(contract.partyBJson, contract.partyB, 'B'),
+      ...parsePartyRows(contract.partyCJson, contract.partyC, 'C'),
+    ];
+    if (!parties.length && contract.carrierName) {
+      parties.push({
+        id: '',
+        customerId: '',
+        customerName: contract.carrierName,
+        partyRole: 'B',
+      });
+    }
+    parties.forEach(party => {
+      const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
+      const optionValue = [contract.id, party.id || '', party.customerName].join('__');
+      options.push({
+        ...contract,
+        optionValue,
+        optionLabel: `${party.customerName}（${roleLabel}） - ${formatContractLabel(contract)}`,
+        carrierPartyId: party.id || '',
+        carrierPartyRole: party.partyRole,
+        carrierName: party.customerName,
+      });
+    });
+  });
+  return options;
+});
+
 const extractRecords = response => {
  const data = response?.data || response;
  if (Array.isArray(data)) return data;
@@ -708,6 +767,10 @@ const normalizeContract = item => {
    projectId: normalized.projectId,
    partyA: normalized.partyA || '',
    partyB: normalized.partyB || '',
+    partyC: normalized.partyC || '',
+    partyAJson: normalized.partyAJson || '',
+    partyBJson: normalized.partyBJson || '',
+    partyCJson: normalized.partyCJson || '',
    customerName: normalized.customerName || normalized.partyA || '',
    carrierName: normalized.carrierName || normalized.partyB || '',
  };
@@ -926,14 +989,34 @@ const stripInternalRowFields = row => {
  };
 };

+/** 合并费用列名与各行 feeItems 键，避免保存/回显时丢动态费用列 */
+const collectFeeItemNames = (preferred = [], detailRows = []) => {
+  const names = [];
+  const seen = new Set();
+  const pushName = value => {
+    const name = String(value || '').trim();
+    if (!name || seen.has(name)) return;
+    seen.add(name);
+    names.push(name);
+  };
+  (preferred || []).forEach(pushName);
+  (detailRows || []).forEach(row => {
+    const feeItems = row?.feeItems;
+    if (!feeItems || typeof feeItems !== 'object' || Array.isArray(feeItems)) return;
+    Object.keys(feeItems).forEach(pushName);
+  });
+  return names;
+};
+
 const buildPayload = () => {
  const { file, ...batch } = form;
+  const payloadRows = rows.value.map(stripInternalRowFields);
  return {
    ...batch,
    settlementBillType: form.settlementType === 'payable' ? form.settlementBillType || 'formal' : 'formal',
    waybillMode: form.waybillMode === 'history' ? 'history' : 'new',
-    feeItemNames: [...feeItemNames.value],
-    rows: rows.value.map(stripInternalRowFields),
+    feeItemNames: collectFeeItemNames(feeItemNames.value, payloadRows),
+    rows: payloadRows,
  };
 };

@@ -952,10 +1035,9 @@ const autoSelectSingleContracts = () => {
    form.customerContractId = customers[0].id;
    onCustomerContractChange(customers[0].id);
  }
-  const carriers = filteredCarrierContracts.value;
+  const carriers = filteredCarrierContractOptions.value;
  if (carriers.length === 1 && !form.carrierContractId) {
-    form.carrierContractId = carriers[0].id;
-    onCarrierContractChange(carriers[0].id);
+    onCarrierContractChange(carriers[0].optionValue);
  }
 };

@@ -967,6 +1049,9 @@ const onProjectChange = async id => {
  form.customerName = '';
  form.carrierContractId = '';
  form.carrierContractName = '';
+  form.carrierOptionValue = '';
+  form.carrierPartyId = '';
+  form.carrierPartyRole = '';
  form.carrierName = '';
  customerContracts.value = [];
  carrierContracts.value = [];
@@ -985,9 +1070,15 @@ const onCustomerContractChange = id => {
  form.customerName = item?.customerName || item?.partyA || '';
 };

-const onCarrierContractChange = id => {
-  const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
+const onCarrierContractChange = optionValue => {
+  const item = filteredCarrierContractOptions.value.find(
+    row => String(row.optionValue) === String(optionValue)
+  );
+  form.carrierOptionValue = item?.optionValue || '';
+  form.carrierContractId = item?.id || '';
  form.carrierContractName = item?.contractName || '';
+  form.carrierPartyId = item?.carrierPartyId || '';
+  form.carrierPartyRole = item?.carrierPartyRole || '';
  form.carrierName = item?.carrierName || item?.partyB || '';
 };

@@ -1436,9 +1527,13 @@ const loadDetail = async id => {
  if (detail.projectId) {
    await loadContractsByProject(detail.projectId, detail.projectName || '');
  }
-  feeItemNames.value = Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [];
  parsedHeaders.value = [];
  const detailRows = Array.isArray(detail.rows) ? detail.rows : [];
+  // 先按库中列名与明细 feeItems 合并，再规范化行数据，保证草稿再打开仍展示全部费用列
+  feeItemNames.value = collectFeeItemNames(
+    Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [],
+    detailRows
+  );
  rows.value = detailRows.map((item, index) => normalizeParsedRow(item, index));
  refreshDuplicateFlags();
  // 查看模式始终只读；编辑时仅草稿可改，已完成/已作废强制只读
--- a/Show More
+++ b/Show More