✨ 司机从业资格证改为调用专用识别接口

Co-authored-by: Cursor <cursoragent@cursor.com>
Merge pull request '收票登记新增所属合同带出承办部门替代手选结算组织' (#13 ) from feature/20261104-bfi-project-web into master
2026-11-05 15:09:16 +08:00 · 2026-11-05 15:04:42 +08:00 · 2026-11-05 15:01:28 +08:00 · 2026-11-05 14:47:06 +08:00 · 2026-11-05 13:30:36 +08:00 · 2026-11-05 13:30:36 +08:00
66 changed files with 4866 additions and 1549 deletions
@@ -8,7 +8,7 @@
    "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",
@@ -49,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: {}

@@ -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,
  });

@@ -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' },
@@ -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({
@@ -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',
    },
  });
 };
@@ -38,6 +38,7 @@ export const createOption = () => ({
  delBtn: false,
  selection: true,
  dialogClickModal: false,
+  menuWidth: 320,
  menuFixed: 'right',
  column: [
    {
@@ -65,10 +65,12 @@ export const config = {
        ['contractName', '合同名称'],
        ['projectName', '所属项目'],
        ['organizationName', '合同负责部门'],
+        ['platformCompanyName', '平台公司'],
        ['contractCategory', '合同类别'],
        ['signType', '签约类型'],
        ['partyA', '甲方'],
        ['partyB', '乙方'],
+        ['partyC', '丙方'],
        ['handlerUserName', '经办人'],
        ['signDate', '签订日期'],
        ['applyDate', '申请日期'],
@@ -247,6 +249,15 @@ export const option = createCrudOption([
    hide: true,
    labelWidth: 0,
  },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 11,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+  },
  {
    label: '合同编号',
    prop: 'contractNo',
@@ -264,7 +275,7 @@ export const option = createCrudOption([
    align: 'left',
    headerAlign: 'left',
    search: true,
-    searchOrder: 7,
+    searchOrder: 1,
    searchPlaceholder: '请输入',
    order: 180,
    slot: true,
@@ -311,6 +322,13 @@ export const option = createCrudOption([
    minWidth: 150,
    rules: selectRule('合同负责部门'),
  },
+  {
+    label: '平台公司',
+    prop: 'platformCompanyName',
+    minWidth: 180,
+    order: 115,
+    display: false,
+  },
  {
    label: '合同类别',
    prop: 'contractCategory',
@@ -337,7 +355,7 @@ export const option = createCrudOption([
    rules: selectRule('签约类型'),
  },
  {
-    label: '生效类型',
+    label: '合同状态',
    prop: 'effectiveType',
    type: 'select',
    search: true,
@@ -350,24 +368,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: '合同期限',
@@ -621,6 +638,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',
@@ -170,6 +170,7 @@ export const paymentApplicationOption = ({
    { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
    { label: '金蝶单据号', prop: 'kingdeeBillNo', 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 },
  ],
@@ -16,6 +16,7 @@ import {
  approvalStatusOptions,
  invoiceStatusOptions,
  kingdeeSyncStatusOptions,
+  kingdeeWriteOffStatusOptions,
  paymentStatusOptions,
 } from './formalSettlementSearch';
 import { formalSettlementTableColumns } from './formalSettlementTable';
@@ -87,24 +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;
-    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
-    if (!extra.slot && !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,
@@ -112,7 +118,7 @@ export const formalSettlementOption = () => ({
  emptyBtnText: '重置',
  searchShow: true,
  searchIcon: true,
-  searchLabelWidth: 88,
+  searchLabelWidth: 100,
  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
  searchMenuSpan: 4,
  searchIndex: 4,
@@ -166,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) => {
@@ -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')),
@@ -13,3 +13,12 @@ export const KINGDEE_STATUS_TAG_TYPES = {

 /** 金蝶单据状态 → 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';
@@ -154,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({
@@ -162,6 +163,7 @@ export async function submitMkApprovalFlow({
  subjectName = '',
  approvalStatus = '',
  mkEnabled,
+  tempVarData,
 } = {}) {
  const conf = MK_BIZ[bizType];
  if (!conf) {
@@ -202,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';
+}
@@ -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 || '';
@@ -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
@@ -255,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>
@@ -920,6 +920,8 @@ export default {
      route.carrierName = '';
      route.carrierId = '';
      route.carrierContractId = '';
+      route.carrierPartyId = '';
+      route.carrierPartyRole = '';
      this.clearRouteDriverVehicleFields(route);
      if (value === '承运商') {
        route.trailerVehicleNo = '';
@@ -930,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);
    },
@@ -954,15 +959,23 @@ export default {
      this.driverOptions = [];
    },
    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; },
@@ -983,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 {
@@ -1137,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,
@@ -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,
@@ -889,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 = [];
@@ -947,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) || '';
@@ -959,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);
@@ -1145,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';
@@ -1168,25 +1241,11 @@ export default {
      // 展示模式由已选数据决定：有站点编码则显示站点名，否则省市区；暂不按运输方式强制站点限制。
      return Boolean(siteCode && siteCode !== '/');
    },
-    hasAddressValue(target) {
-      const field = this.addressModel(target);
-      if (!field) return false;
-      return Boolean(
-        String(field.model[field.address] || '').trim() || String(field.model[field.name] || '').trim()
-      );
-    },
-    tipEmptyAddressDetail(target) {
-      // 替代原「请先选择运输方式」placeholder：空地址点击时 toast，已有值不再提示。
-      if (!this.hasAddressValue(target)) {
-        this.$message.warning('请输入详细地址');
-      }
-    },
    resolveAddressRegionCode(row = {}) {
      return row.regionCode || row.districtCode || row.areaCode || row.adcode || '';
    },
    openCommonAddress(target) {
      if (this.isBasicRouteReadonly) return;
-      this.tipEmptyAddressDetail(target);
      this.addressTarget = target;
      // 暂不按运输方式限制站点：统一走常用地址选择。
      this.addressQuery = {};
@@ -1233,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;
@@ -1245,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;
@@ -1271,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 || '';
@@ -1284,11 +1347,13 @@ 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;
-      this.tipEmptyAddressDetail(target);
      this.openAddressMap(target);
    },
    openAddressMap(target) {
@@ -1803,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 || ''}`;
@@ -4650,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);
@@ -5116,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) {
@@ -7285,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;
@@ -7299,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) {
@@ -7755,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 = '';
@@ -7809,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 ||
@@ -7847,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;
@@ -7925,6 +7964,8 @@ export default {
            this.form.carrierName = '';
            this.form.carrierId = '';
            this.form.carrierContractId = '';
+            this.form.carrierPartyId = '';
+            this.form.carrierPartyRole = '';
          }
          return options;
        })
@@ -8015,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 || '';
      }
      // 承运商变更后清空司机/车辆，避免跨组织脏数据
@@ -299,25 +299,27 @@
          ><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
-            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
-        >
+        <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">
@@ -491,7 +493,9 @@
        v-model="planDialogVisible"
        :value="planEditor"
        :index="planEditorIndex"
+        :readonly="pageReadonly"
        :settlement-currency="form.settlementCurrency"
+        :party-options="billingPartyOptions"
        @save="savePlan"
      />

@@ -630,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() {
@@ -637,6 +680,9 @@ export default {
      form: {},
      period: [],
      plans: [],
+      partyARows: [],
+      partyBRows: [],
+      partyCRows: [],
      attachments: [],
      contractFiles: [],
      contractFileRows: [],
@@ -675,7 +721,7 @@ export default {
      settlementModeDictOptions: [],
      contractFormatDictOptions: [],
      planDialogVisible: false,
-      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
+      planEditor: { planName: '', remark: '', rules: [] },
      planEditorIndex: -1,
      billingElements: [
        '按重量',
@@ -745,7 +791,7 @@ export default {
    // 高风险/黑名单客商提示：按合同推送合规留痕 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())
@@ -756,6 +802,29 @@ export default {
    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 ['变更材料'];
@@ -890,6 +959,9 @@ export default {
      };
      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),
@@ -1048,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 || ''; },
@@ -1448,7 +1448,7 @@
                  <el-select
                    :model-value="
                      dialogForm.carrierType === '承运商'
-                        ? dialogForm.carrierContractId
+                        ? taskCarrierSelectedValue
                        : dialogForm.carrierName
                    "
                    clearable
@@ -1465,7 +1465,7 @@
                  >
                    <el-option
                      v-for="item in taskCarrierOptions"
-                      :key="item.id || item.carrierName"
+                      :key="carrierOptionValue(item)"
                      :label="
                        dialogForm.carrierType === '承运商'
                          ? formatTaskCarrierContractLabel(item)
@@ -1473,7 +1473,7 @@
                      "
                      :value="
                        dialogForm.carrierType === '承运商'
-                          ? item.id
+                          ? carrierOptionValue(item)
                          : item.carrierName || item.partyB
                      "
                    />
@@ -1953,6 +1953,8 @@ const createDialogForm = () => ({
  carrierType: '承运商',
  carrierName: '',
  carrierContractId: '',
+  carrierPartyId: '',
+  carrierPartyRole: '',
  escortName: '',
  escortPhone: '',
  departureAddress: '',
@@ -2256,6 +2258,13 @@ export default {
      if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
      return '请选择';
    },
+    taskCarrierSelectedValue() {
+      return this.carrierOptionValue({
+        id: this.dialogForm.carrierContractId,
+        carrierPartyId: this.dialogForm.carrierPartyId,
+        carrierName: this.dialogForm.carrierName,
+      });
+    },
    detailStatusType() {
      const typeMap = {
        pending: 'success',
@@ -2391,11 +2400,23 @@ export default {
    driverOptionText,
    formatTaskCarrierContractLabel(item = {}) {
      const carrierName = item.carrierName || item.partyB || '';
+      const roleLabel =
+        item.carrierPartyRole === 'C' || item.carrierPartyRole === '丙'
+          ? '丙方'
+          : item.carrierPartyRole === 'B' || item.carrierPartyRole === '乙'
+            ? '乙方'
+            : '';
      const contractLabel = formatContractOptionLabel(item);
-      if (carrierName && contractLabel) {
-        return `${carrierName}（${contractLabel}）`;
+      const nameWithRole = roleLabel && carrierName ? `${carrierName}（${roleLabel}）` : carrierName;
+      if (nameWithRole && contractLabel) {
+        return `${nameWithRole} - ${contractLabel}`;
      }
-      return carrierName || contractLabel;
+      return nameWithRole || contractLabel;
+    },
+    carrierOptionValue(item = {}) {
+      return [item.id || '', item.carrierPartyId || '', item.carrierName || item.partyB || ''].join(
+        '__'
+      );
    },
    syncStandaloneTagTitle() {
      if (!this.isStandalonePage) return;
@@ -4023,7 +4044,7 @@ export default {
            exists.add(key);
          }
        });
-        // 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同甲方匹配后取交集）
+        // 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同乙方=承运商合同甲方匹配后取交集）
        if (
          String(this.dialogForm.carrierType || '').trim() === '承运商' &&
          nextRows.length > this.selectedWaybillRows.length
@@ -4555,6 +4576,8 @@ export default {
    },
    handleCarrierTypeChange() {
      this.dialogForm.carrierContractId = '';
+      this.dialogForm.carrierPartyId = '';
+      this.dialogForm.carrierPartyRole = '';
      this.dialogForm.carrierName = '';
      this.dialogForm.carrierId = '';
      this.clearDialogDriverVehicleFields();
@@ -4565,17 +4588,25 @@ export default {
      }
      if (this.dialogForm.carrierType === '自运') {
        this.dialogForm.carrierContractId = '';
+        this.dialogForm.carrierPartyId = '';
+        this.dialogForm.carrierPartyRole = '';
      }
      this.loadTaskCarrierOptions();
    },
-    handleTaskCarrierChange(contractId) {
-      const contract = this.taskCarrierOptions.find(item =>
-        [item.id, item.carrierName, item.partyB].some(
-          value => String(value || '') === String(contractId || '')
-        )
+    handleTaskCarrierChange(selectedValue) {
+      const contract = this.taskCarrierOptions.find(
+        item =>
+          this.carrierOptionValue(item) === String(selectedValue || '') ||
+          [item.id, item.carrierName, item.partyB].some(
+            value => String(value || '') === String(selectedValue || '')
+          )
      );
      this.dialogForm.carrierContractId =
        this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
+      this.dialogForm.carrierPartyId =
+        this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyId || '' : '';
+      this.dialogForm.carrierPartyRole =
+        this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyRole || '' : '';
      this.dialogForm.carrierName = contract?.carrierName || '';
      this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
      this.clearDialogDriverVehicleFields();
@@ -4744,7 +4775,7 @@ export default {
      }
      this.taskCarrierLoading = true;
      try {
-        // 配载单只有一个项目；传入子运单后按客户合同甲方匹配并取承运商合同乙方交集
+        // 配载单只有一个项目；传入子运单后按客户合同乙方=承运商合同甲方匹配并取承运商合同乙方交集
        const projectId = this.selectedWaybillRows.map(row => row.projectId).find(Boolean);
        const waybillIds = this.selectedWaybillRows.map(row => row.id).filter(Boolean);
        const response = await loadingApi.getCarrierContracts(
@@ -4758,30 +4789,45 @@ export default {
            .map(item => ({
              ...item,
              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);
          const current =
-            contracts.find(item => String(item.id) === String(this.dialogForm.carrierContractId)) ||
+            this.taskCarrierOptions.find(
+              item =>
+                this.carrierOptionValue(item) === this.taskCarrierSelectedValue ||
+                (String(item.id) === String(this.dialogForm.carrierContractId) &&
+                  (!this.dialogForm.carrierPartyId ||
+                    String(item.carrierPartyId) === String(this.dialogForm.carrierPartyId)) &&
+                  (!this.dialogForm.carrierName ||
+                    item.carrierName === this.dialogForm.carrierName))
+            ) ||
            this.taskCarrierOptions.find(item => item.carrierName === this.dialogForm.carrierName);
          if (current) {
            this.dialogForm.carrierContractId = current.id;
+            this.dialogForm.carrierPartyId = current.carrierPartyId || '';
+            this.dialogForm.carrierPartyRole = current.carrierPartyRole || '';
            this.dialogForm.carrierName = current.carrierName;
            this.dialogForm.carrierId = current.carrierId || '';
          } else {
            this.dialogForm.carrierContractId = '';
+            this.dialogForm.carrierPartyId = '';
+            this.dialogForm.carrierPartyRole = '';
            this.dialogForm.carrierName = '';
            this.dialogForm.carrierId = '';
          }
@@ -4792,19 +4838,22 @@ export default {
            .map(item => ({
              ...item,
              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);
          const current = this.taskCarrierOptions.find(
@@ -535,7 +535,6 @@ export default {
  created() {
    this.resetNodeRows();
    this.loadProjectOptions('');
-    this.applyDefaultDeptSearch();
    this.initDeptOptions();
  },
  methods: {
@@ -566,27 +565,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 =
@@ -1113,7 +1091,6 @@ export default {
    },
    searchReset() {
      this.query = {};
-      this.applyDefaultDeptSearch();
      this.page.currentPage = 1;
      this.onLoad(this.page, this.query);
    },
@@ -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"
@@ -962,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 { getBusinessDeptSelect, 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';
@@ -1174,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],
@@ -1312,7 +1437,6 @@ export default {
        ],
      },
      deptOptions: [],
-      businessDeptTreeOptions: [],
      platformCompanyOptions: [],
      cargoTypeOptions: [],
      selectedCustomerId: [],
@@ -1355,6 +1479,8 @@ export default {
        'zip',
      ],
      changeRows: [],
+      projectContractRows: [],
+      projectContractLoading: false,
      changeRecordDetailVisible: false,
      changeRecordDetail: null,
      changeRecordDetailRows: [],
@@ -1377,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 {
@@ -1434,6 +1557,9 @@ export default {
    isNewProjectDialog() {
      return ['add', 'majorSupplement'].includes(this.dialogType);
    },
+    showProjectContractSection() {
+      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
+    },
    isProjectFormPage() {
      return this.isFormPageInstance;
    },
@@ -1507,6 +1633,13 @@ export default {
      .catch(() => {
        this.mkEnabled = false;
      });
+    loadHcsImmediateEnabled()
+      .then(enabled => {
+        this.hcsImmediateEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.hcsImmediateEnabled = false;
+      });
    this.loadDeptOptions();
    this.loadCargoTypeOptions();
    this.loadTransportTypeOptions();
@@ -1612,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);
@@ -1741,6 +1875,7 @@ export default {
    },
    canHcsRepush(row) {
      return (
+        this.hcsImmediateEnabled &&
        !this.readonlyScope &&
        ['approved', 'change_approved'].includes(row.approvalStatus) &&
        row.hcsSyncStatus !== 'synced'
@@ -1950,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 =
@@ -2068,6 +2208,8 @@ export default {
      this.attachmentRows = [];
      this.selectedAttachmentRows = [];
      this.changeRows = [];
+      this.projectContractRows = [];
+      this.projectContractLoading = false;
      this.selectedCustomerId = [];
      this.selectedCarrierIds = [];
    },
@@ -2116,6 +2258,40 @@ export default {
      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 || '';
@@ -2202,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();
@@ -2322,6 +2501,7 @@ export default {
                subjectName: this.form.projectName || '',
                approvalStatus,
                mkEnabled: this.mkEnabled,
+                tempVarData: { projectType: this.form.projectType || '' },
              }).then(() => {
                this.$message.success('提交成功!');
                this.closeProjectForm();
@@ -2347,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();
@@ -2750,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) {
@@ -2791,77 +2972,44 @@ 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() {
-      Promise.all([getDeptTree(), getBusinessDeptSelect()])
-        .then(([treeRes, bizRes]) => {
-          const deptTree = this.excludeExternalOrganization(treeRes.data.data || []);
-          const bizList = bizRes.data.data || [];
-          const bizIds = new Set(
-            bizList
-              .map(item => (item.id == null || item.id === '' ? '' : String(item.id)))
-              .filter(Boolean)
-          );
-          // 仅保留「是否业务部门=是」的节点及其祖先，祖先不可选
-          const businessDeptTree = this.filterBusinessDeptTree(deptTree, bizIds);
-          this.deptOptions = this.flattenDept(businessDeptTree).filter(item =>
-            bizIds.has(String(item.value))
-          );
-          this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree, bizIds);
+      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.businessDeptTreeOptions = [];
        });
      this.loadPlatformCompanyOptions();
    },
-    /**
-     * 剪枝组织树：只保留业务部门节点及其祖先路径。
-     */
-    filterBusinessDeptTree(list = [], bizIds = new Set()) {
-      return (list || []).reduce((result, item) => {
-        const children = item.children?.length
-          ? this.filterBusinessDeptTree(item.children, bizIds)
-          : [];
-        const isBiz = bizIds.has(String(item.id));
-        if (!isBiz && !children.length) {
-          return result;
-        }
-        result.push({
-          ...item,
-          children: children.length ? children : undefined,
-        });
-        return result;
-      }, []);
-    },
    ensureCurrentBusinessDeptOption() {
-      const id = this.form.businessDeptId;
+      const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
+        ? ''
+        : String(this.form.businessDeptId);
      if (!id) return;
-      const exists = this.deptOptions.some(item => String(item.value) === String(id));
+      this.form.businessDeptId = id;
+      const exists = this.deptOptions.some(item => String(item.value) === id);
      if (exists) return;
-      const label = this.form.businessDeptName || String(id);
+      const label = this.form.businessDeptName || id;
      this.deptOptions.unshift({ label, rawLabel: label, value: id });
-      const pathExists = this.findDeptPath(id, this.businessDeptTreeOptions);
-      if (!pathExists) {
-        this.businessDeptTreeOptions.unshift({ label, value: id });
-      }
    },
    loadPlatformCompanyOptions() {
      getPlatformCompanySelect().then(res => {
@@ -2893,50 +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 = [], bizIds = null) {
-      return list.map(item => {
-        const value = item.id == null || item.id === '' ? item.value : item.id;
-        const option = {
-          label: item.title || item.deptName || item.name || item.label,
-          value: value == null || value === '' ? '' : String(value),
-          children: item.children?.length
-            ? this.toDeptCascaderOptions(item.children, bizIds)
-            : undefined,
-        };
-        // 仅业务部门可选；祖先节点保留路径但禁用
-        if (bizIds && !bizIds.has(String(option.value))) {
-          option.disabled = true;
-        }
-        return option;
-      });
-    },
-    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 => ({
@@ -3272,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;
  }
@@ -214,15 +214,19 @@ export default {
      }
      const run = () => {
        const request = () => this.api[operation.action](row.id);
+        // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
        const afterMk =
          operation.action === 'submitApproval'
-            ? submitMkApprovalFlow({
-                bizType: 'project-change',
-                bizId: row.id,
-                subjectName: row.projectName || '',
-                approvalStatus: row.approvalStatus || '',
-                mkEnabled: this.mkEnabled,
-              }).then(() => request())
+            ? 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'
@@ -6,7 +6,7 @@
    :config="config"
    :crud-option="option"
    :detail-id="detailId"
-    :menu-width="250"
+    :menu-width="320"
    standalone-form-page
  />
 </template>
@@ -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,
@@ -1227,6 +1230,7 @@ export default {
        mkEnabled: await loadMkEnabled().catch(() => false),
      });
      this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceApplicationListRefreshKey, '1');
      this.goBack();
    },
    async syncReferenceData() {
@@ -250,6 +250,11 @@ 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: '',
@@ -308,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;
    },
@@ -372,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('正式结算单详情加载失败');
@@ -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;
    },
@@ -883,8 +883,6 @@ export default {
      // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
      payeeRisky: false,
      payeeRiskTip: '',
-      payeeRiskLevel: '',
-      payeeBlackStatus: '',
      attachmentRuleLoading: false,
      // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
      linkedSettlementAttachmentUrls: [],
@@ -1065,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') {
@@ -1300,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),
@@ -1348,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),
@@ -1591,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];
        }
@@ -1612,13 +1619,16 @@ 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)),
@@ -1646,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'
      );
@@ -2341,8 +2352,6 @@ export default {
      this.payeeCustomerLevel = '';
      this.payeeRisky = false;
      this.payeeRiskTip = '';
-      this.payeeRiskLevel = '';
-      this.payeeBlackStatus = '';
      if (!partyBName) {
        if (!preserveCurrentValue) this.clearReceiptAccount();
        return;
@@ -2381,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 强校验兜底
          }
@@ -2778,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;
@@ -80,6 +80,23 @@
        </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')"
@@ -409,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('同步失败'));
@@ -425,6 +448,7 @@ export default {
        this.warnAttachmentNotUploaded(rows.map(row => row.id));
      } finally {
        this.syncLoading = false;
+        loading.close();
      }
    },
    // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
@@ -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' ? '收款信息' : '付款信息'"
@@ -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);
    },
@@ -2635,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);
    },
@@ -2749,10 +2891,7 @@ export default {
        }
        matchedTotal += matchedAmount;
      }
-      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
-        this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
-        return false;
-      }
+      // 先票后款全额认领：匹配金额=发票全额，可超过结算金额，不再校验合计上限（收票状态按覆盖判定）
      return true;
    },
    removeInvoice(index) {
@@ -2887,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() {
      // 保存草稿：不做表单校验，直接落草稿并返回列表刷新
@@ -3222,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"
@@ -72,6 +81,15 @@
      </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">
        <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -79,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)"
@@ -93,8 +128,8 @@

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

 export default {
  name: 'FormalSettlementTablePanel',
@@ -207,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,
@@ -1391,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({
@@ -1416,6 +1435,8 @@ export default {
          settlementType,
          partyA: contractPartyA,
          partyB: contractPartyB,
+          partyAJson: contractPartyAJson,
+          partyBJson: contractPartyBJson,
        });
      }
      this.handleContractChange(contractId);
@@ -1427,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;
@@ -1516,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 = [];
@@ -1552,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]) => {
@@ -1640,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'),
      };
@@ -1649,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 (
@@ -1714,6 +1738,8 @@ export default {
        this.form.deptName = '';
        this.form.payerName = '';
        this.form.payeeName = '';
+        this.payerOptions = [];
+        this.payeeOptions = [];
        this.summaryFees = [];
        this.projectAdvanceWriteOffs = [];
        return;
@@ -1726,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 = [];
@@ -1737,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) {
@@ -3061,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 {
@@ -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 || '',
  };
@@ -972,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);
  }
 };

@@ -987,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 = [];
@@ -1005,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 || '';
 };

@@ -0,0 +1,42 @@
+<template>
+  <div v-loading="true" class="formal-settlement-redirect" />
+</template>
+
+<script>
+import * as api from '@/api/settlement/formalSettlement';
+import { settlementListPath } from '@/utils/settlement-menu';
+
+/**
+ * 菜单拆分为付款/收款结算单后，旧路径 /settlement/formal-settlement 已无菜单路由。
+ * 本页按结算单号解析类型后 replace 到对应列表页，并保留 query（含 detailNo）。
+ */
+export default {
+  name: 'FormalSettlementRedirect',
+  async created() {
+    const detailNo = String(this.$route.query.detailNo || '').trim();
+    let settlementType = '';
+    if (detailNo) {
+      try {
+        const response = await api.getList(1, 10, { formalSettlementNo: detailNo });
+        const body = response?.data || response || {};
+        const data = body?.data || body;
+        const row = (data.records || []).find(item => item.formalSettlementNo === detailNo);
+        settlementType = row?.settlementType || '';
+      } catch (error) {
+        settlementType = '';
+      }
+    }
+    const path = settlementListPath(settlementType);
+    await this.$router.replace({
+      path,
+      query: { ...this.$route.query },
+    });
+  },
+};
+</script>
+
+<style scoped>
+.formal-settlement-redirect {
+  min-height: 240px;
+}
+</style>
@@ -98,6 +98,125 @@
        ></template
      >
    </el-dialog>
+
+    <!-- 先票后款路径B：结算单审批后发票登记（关联收票单 → 确认推送指定应付） -->
+    <el-dialog
+      v-model="invoiceRegisterDialog.visible"
+      title="发票登记"
+      width="86%"
+      append-to-body
+      class="invoice-register-dialog"
+    >
+      <section-card title="结算基本信息">
+        <el-descriptions :column="4" border size="small">
+          <el-descriptions-item label="结算单号">
+            {{ invoiceRegisterDialog.row.formalSettlementNo || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="项目名称">
+            {{ invoiceRegisterDialog.row.projectName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="所属组织">
+            {{ invoiceRegisterDialog.row.deptName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同编号">
+            {{ invoiceRegisterDialog.row.contractNo || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="付款方">
+            {{ invoiceRegisterDialog.row.payerName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="收款方">
+            {{ invoiceRegisterDialog.row.payeeName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算类型">
+            {{ settlementTypeName(invoiceRegisterDialog.row.settlementType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="业务模式">
+            {{ invoiceRegisterDialog.row.businessModelName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算总金额">
+            {{ formatMoney(invoiceRegisterDialog.row.settlementAmount, invoiceRegisterDialog.row.currency) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="已匹配发票金额">
+            {{ formatMoney(invoiceRegisterDialog.row.invoiceAmount, invoiceRegisterDialog.row.currency) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建人">
+            {{ invoiceRegisterDialog.row.createUserName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建时间">
+            {{ invoiceRegisterDialog.row.createTime || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="金蝶同步状态" :span="2">
+            {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ invoiceRegisterDialog.row.remark || '-' }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </section-card>
+      <section-card title="认领收票单">
+        <div class="invoice-register-dialog__actions">
+          <el-button
+            type="primary"
+            plain
+            :disabled="invoiceRegisterDialog.saving"
+            @click="candidatesDialog.visible = true"
+            >选择收票单</el-button
+          >
+        </div>
+        <el-table :data="invoiceRegisterDialog.candidates" border class="invoice-register-dialog__table">
+          <el-table-column type="index" label="序号" width="64" align="center" />
+          <el-table-column prop="invoiceNo" label="发票号" min-width="160" align="center" />
+          <el-table-column prop="invoiceDate" label="开票日期" min-width="120" align="center" />
+          <el-table-column prop="invoiceType" label="发票类型" min-width="140" align="center" />
+          <el-table-column prop="issuerName" label="开票单位（销方）" min-width="170" 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="160" align="right">
+            <template #default="{ row }">
+              <!-- 匹配金额支持手动修改（默认=发票金额全额），已认领回显行只读 -->
+              <el-input-number
+                v-if="!row.claimed"
+                v-model="row.matchedAmount"
+                :min="0"
+                :max="Number(row.invoiceAmount || 0)"
+                :precision="2"
+                :controls="false"
+              />
+              <span v-else>{{ formatMoney(row.matchedAmount || row.invoiceAmount) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="90" fixed="right" align="center">
+            <template #default="{ row, $index }">
+              <!-- 已认领票回显：认领保存为增量逻辑不支持移除，仅新增票可移除 -->
+              <el-tag v-if="row.claimed" size="small">已认领</el-tag>
+              <el-link
+                v-else
+                type="danger"
+                :disabled="invoiceRegisterDialog.saving"
+                @click="invoiceRegisterDialog.candidates.splice($index, 1)"
+                >移除</el-link
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </section-card>
+      <template #footer>
+        <el-button @click="invoiceRegisterDialog.visible = false">取消</el-button>
+        <el-button
+          type="primary"
+          :loading="invoiceRegisterDialog.saving"
+          :disabled="!invoiceRegisterDialog.candidates.length"
+          @click="submitInvoiceRegister"
+          >保存认领</el-button
+        >
+      </template>
+    </el-dialog>
+
+    <invoice-receipt-candidates-dialog
+      v-model="candidatesDialog.visible"
+      @confirm="addInvoiceRegisterCandidates"
+    />
  </basic-container>
 </template>

@@ -113,16 +232,18 @@ import { isAdministrator } from '@/utils/auth';
 import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
-import { formalSettlementOption } from '@/option/settlement/formalSettlement';
+import * as invoiceReceiptApi from '@/api/payment/invoiceReceipt';
+import { formalSettlementOption, kingdeeSyncName } from '@/option/settlement/formalSettlement';
 import organizationSearch from '@/mixins/organization-search';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
+import InvoiceReceiptCandidatesDialog from './components/invoice-receipt-candidates-dialog.vue';
 import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval';
 import { getMKApprovalUrl } from '@/api/system/business-process';

 export default {
  name: 'FormalSettlement',
-  components: { FormalSettlementEditor, FormalSettlementTablePanel },
+  components: { FormalSettlementEditor, FormalSettlementTablePanel, InvoiceReceiptCandidatesDialog },
  mixins: [organizationSearch],
  props: {
    /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */
@@ -134,7 +255,6 @@ export default {
  },
  data() {
    return {
-      option: formalSettlementOption(),
      query: {},
      activeSettlementType: 'payable',
      rows: [],
@@ -151,11 +271,27 @@ export default {
        rows: [],
        form: { appliedAmount: 0, remark: '' },
      },
+      // 先票后款路径B：发票登记（关联收票单 + 确认推送指定应付）
+      invoiceRegisterDialog: {
+        visible: false,
+        saving: false,
+        row: {},
+        candidates: [],
+      },
+      candidatesDialog: {
+        visible: false,
+      },
      mkEnabled: false,
+      // keep-alive 多标签下仅激活实例响应 detailNo，避免缓存页重复弹窗
+      isPageActive: true,
    };
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
+    // 列随结算类型切换重建：收款结算单不展示「已指定应付」
+    option() {
+      return formalSettlementOption(this.activeSettlementType);
+    },
    isAdmin() {
      return isAdministrator(this.userInfo);
    },
@@ -222,11 +358,10 @@ export default {
    },
  },
  created() {
-    // 标签机制按 fullPath 缓存同页多实例：仅当前路由实例应响应 detailNo 跳转，防止缓存旧实例也弹窗
-    this.ownFullPath = this.$route.fullPath;
    this.loadOrganizationOptions();
  },
  mounted() {
+    this.isPageActive = true;
    this.openRouteDetail();
    loadMkEnabled()
      .then(enabled => {
@@ -237,10 +372,18 @@ export default {
      });
  },
  activated() {
+    this.isPageActive = true;
    if (sessionStorage.getItem('formal-settlement-list-refresh') === '1') {
      sessionStorage.removeItem('formal-settlement-list-refresh');
      this.onLoad(this.page);
    }
+    // 从其他页带 detailNo 跳回时，激活态补开详情
+    if (this.$route.query.detailNo) {
+      this.openRouteDetail();
+    }
+  },
+  deactivated() {
+    this.isPageActive = false;
  },
  methods: {
    hasPermission(actionOrCode) {
@@ -288,12 +431,14 @@ export default {
        return: () => this.handleReturn(row),
        void: () => this.handleVoid(row),
        print: () => this.handlePrint(row),
+        invoiceRegister: () => this.openInvoiceRegisterDialog(row),
      };
      (handlers[type] || (() => {}))();
    },
    openCreate() {
+      // 按列表锁定的结算类型路由到对应表单入口，保证菜单高亮与关闭回落列表正确
      this.$router.push({
-        path: '/settlement/formal-settlement/form',
+        path: settlementListPath(this.activeSettlementType) + '/form',
        query: {
          mode: 'add',
          name: `新增${this.billLabel}`,
@@ -304,8 +449,9 @@ export default {
    },
    openEdit(row) {
      const settlementType = row.settlementType || this.activeSettlementType;
+      // 行类型可能与列表锁定类型不同，按行类型路由
      this.$router.push({
-        path: '/settlement/formal-settlement/form',
+        path: settlementListPath(settlementType) + '/form',
        query: {
          mode: 'edit',
          id: row.id,
@@ -320,7 +466,7 @@ export default {
    },
    async openRouteDetail(detailNo = this.$route.query.detailNo) {
      const formalSettlementNo = String(detailNo || '').trim();
-      if (!formalSettlementNo || this.ownFullPath !== this.$route.fullPath) return;
+      if (!formalSettlementNo || !this.isPageActive) return;
      const response = await api.getList(1, 10, { formalSettlementNo });
      const data = this.unwrapData(response);
      const row = (data.records || []).find(item => item.formalSettlementNo === formalSettlementNo);
@@ -328,6 +474,18 @@ export default {
        this.$message.warning(`未找到对应的${this.billLabel}`);
        return;
      }
+      // 锁定菜单（付款/收款）下若单号属于另一类型，跳到对应列表页再打开
+      if (
+        this.lockedSettlementType &&
+        row.settlementType &&
+        row.settlementType !== this.lockedSettlementType
+      ) {
+        await this.$router.replace({
+          path: settlementListPath(row.settlementType),
+          query: { detailNo: formalSettlementNo },
+        });
+        return;
+      }
      if (!this.lockedSettlementType) {
        this.activeSettlementType = row.settlementType || this.activeSettlementType;
      }
@@ -575,6 +733,68 @@ export default {
        this.paymentDialog.loading = false;
      }
    },
+    // 先票后款路径B：发票登记——认领收票单（claim-invoices 走增量认领并同步收票侧关系）
+    // 打开时回显本单已认领收票单（claimed 标记禁止移除），已认领过票的可直接保存推送补指定应付
+    async openInvoiceRegisterDialog(row) {
+      if ((row?.approvalStatus || '') !== 'approved') {
+        this.$message.warning('仅审批通过的付款结算单允许发票登记');
+        return;
+      }
+      this.invoiceRegisterDialog.row = row || {};
+      this.invoiceRegisterDialog.candidates = [];
+      this.invoiceRegisterDialog.visible = true;
+      try {
+        const claimed = this.unwrapData(await invoiceReceiptApi.claimedReceipts(row.id)) || [];
+        this.invoiceRegisterDialog.candidates = claimed.map(item => ({ ...item, claimed: true }));
+      } catch (error) {
+        this.invoiceRegisterDialog.candidates = [];
+      }
+    },
+    addInvoiceRegisterCandidates(rows) {
+      const existing = new Set(
+        this.invoiceRegisterDialog.candidates.map(item => String(item.invoiceNo))
+      );
+      const added = rows.filter(row => !existing.has(String(row.invoiceNo)));
+      if (!added.length) {
+        this.$message.warning('所选收票单均已登记');
+        return;
+      }
+      // 全额认领：匹配金额固定=发票金额（仅暂存展示，点保存认领确认后才落库）
+      this.invoiceRegisterDialog.candidates.push(
+        ...added.map(row => ({ ...row, matchedAmount: Number(row.invoiceAmount || 0) }))
+      );
+    },
+    async submitInvoiceRegister() {
+      const settlement = this.invoiceRegisterDialog.row;
+      const invoices = this.invoiceRegisterDialog.candidates.map(row => ({
+        ...row,
+        attachmentJson: row.attachmentJson || row.attachmentsJson,
+        invoiceType: row.invoiceType || '',
+        taxRate: row.taxRate ?? null,
+        availableInvoiceAmount: Number(row.invoiceAmount || 0),
+        matchedAmount: Number(row.matchedAmount || row.invoiceAmount || 0),
+      }));
+      try {
+        // 先确认后保存：确定才认领并推送指定应付，取消不保存任何数据
+        await this.$confirm('确认认领并推送金蝶指定应付?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        });
+      } catch {
+        return;
+      }
+      this.invoiceRegisterDialog.saving = true;
+      try {
+        await api.claimInvoices({ formalSettlementId: settlement.id, invoices });
+        const data = this.unwrapData(await api.invoiceAssignKingdee(settlement.id));
+        this.$message.success(data || '发票登记推送金蝶成功');
+        this.invoiceRegisterDialog.visible = false;
+        this.onLoad(this.page);
+      } finally {
+        this.invoiceRegisterDialog.saving = false;
+      }
+    },
    handlePrint(row) {
      if (!row) {
        row = this.selectedOne('打印');
@@ -624,6 +844,9 @@ export default {
      params.settlementType = this.lockedSettlementType || this.activeSettlementType;
      return params;
    },
+    settlementTypeName(value) {
+      return { payable: '付款', receivable: '收款' }[value] || '-';
+    },
    unwrapData(response) {
      const body = response?.data || response || {};
      return body?.data || body;
@@ -664,6 +887,11 @@ export default {
  margin-bottom: 12px;
  color: #606266;
 }
+.invoice-register-dialog__actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 8px;
+}
 :deep(.formal-page.basic-container .basic-container__card > .el-card__body) {
  padding: 0;
 }
@@ -1,7 +1,7 @@
 <template>
  <basic-container class="pre-settlement-page">
    <section v-show="searchVisible" class="pre-settlement-page__search">
-      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+      <el-form :model="query" label-position="right" label-width="100px" @submit.prevent>
        <div class="pre-settlement-page__search-grid">
          <template v-for="field in visibleSearchFields" :key="field.prop">
            <el-form-item :label="field.label">
@@ -108,6 +108,7 @@
        :data="rows"
        :size="tableSize"
        border
+        height="100%"
        class="pre-settlement-page__table"
        @selection-change="handleSelectionChange"
      >
@@ -768,8 +769,27 @@ export default {
 </script>

 <style lang="scss" scoped>
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单 avue 高度自适应对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$pre_page_height: calc(100vh - 114px);
+
 .pre-settlement-page {
+  height: $pre_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
  &__search {
+    flex-shrink: 0;
    padding: 12px 12px 4px;
    background: #fff;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -801,6 +821,10 @@ export default {
  }

  &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
    margin-top: 8px;
  }

@@ -823,8 +847,14 @@ export default {
    justify-content: center;
  }

+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
+
  &__pagination {
    display: flex;
+    flex-shrink: 0;
    justify-content: flex-end;
    padding: 12px;
  }
@@ -507,7 +507,13 @@
      </template>
    </el-dialog>

-    <el-dialog v-model="transferDialog.visible" title="批量转结算" width="86%" append-to-body>
+    <el-dialog
+      v-model="transferDialog.visible"
+      title="批量转结算"
+      width="72%"
+      append-to-body
+      align-center
+    >
      <div class="settlement-detail-page__transfer-form">
        <el-form :model="transferQuery" inline label-position="right" label-width="120px">
          <el-form-item label="转结算类型">
@@ -548,9 +554,10 @@
        :data="transferRows"
        row-key="id"
        border
+        max-height="50vh"
        @selection-change="transferSelectionChange"
      >
-        <el-table-column type="selection" width="52" align="center" reserve-selection />
+        <el-table-column type="selection" width="52" align="center" reserve-selection fixed />
        <el-table-column
          type="index"
          label="序号"
@@ -1060,6 +1067,7 @@ import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import { settlementListPath } from '@/utils/settlement-menu';
 import {
  contractApprovalStatusOptions,
  contractCategoryOptions,
@@ -1914,7 +1922,7 @@ export default {
        return;
      }
      if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
-        this.openSettlementDetail('/settlement/formal-settlement', row.formalSettlementNo);
+        this.openSettlementDetail('/settlement/payment-settlement', row.formalSettlementNo);
        return;
      }
      this.openDetailDialog(row);
@@ -2659,10 +2667,11 @@ export default {
        });
        const isPreSettlement = settlementBillType === 'pre';
        this.transferDialog.visible = false;
+        // 按结算类型路由到对应表单入口，保证收款/付款菜单各自高亮正确
        await this.$router.push({
          path: isPreSettlement
            ? '/settlement/pre-settlement/form'
-            : '/settlement/formal-settlement/form',
+            : settlementListPath(this.settlementType) + '/form',
          query: {
            mode: 'add',
            transferToken,
@@ -2904,10 +2913,33 @@ export default {
    buildRequestParams(params = {}) {
      return this.settlementType ? { ...params, settlementType: this.settlementType } : params;
    },
-    syncBillingPlanOptions(contractId) {
+    syncBillingPlanOptions(contractId, counterpartyName = '') {
      const contracts = [...this.updateContractOptions, ...this.contractOptions];
      const contract = contracts.find(item => String(item.id) === String(contractId));
-      const plans = this.parseJson(contract?.billingPlanJson);
+      let plans = this.parseJson(contract?.billingPlanJson);
+      const targetName = String(
+        counterpartyName ||
+          this.updateFeeForm?.counterpartyName ||
+          this.generateQuery?.counterpartyName ||
+          this.currentDetail?.counterpartyName ||
+          this.currentDetail?.carrierName ||
+          this.currentDetail?.customerName ||
+          ''
+      ).trim();
+      if (targetName) {
+        const matched = plans.filter(
+          item =>
+            String(item.customerName || '').trim() === targetName ||
+            String(item.partyRowId || '') ===
+              String(this.updateFeeForm?.carrierPartyId || this.generateQuery?.carrierPartyId || '')
+        );
+        const hasBinding = plans.some(
+          item => item.customerName || item.customerId || item.partyRowId
+        );
+        if (matched.length || hasBinding) {
+          plans = matched;
+        }
+      }
      this.billingPlanOptions = plans.map((item, index) => ({
        id:
          item.id ||
@@ -2916,11 +2948,16 @@ export default {
          item.planName ||
          item.billingPlanName ||
          `plan-${index}`,
-        name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
+        name: [
+          item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
+          item.customerName ? `（${item.customerName}）` : '',
+        ].join(''),
        defaultPlan:
          item.defaultPlan === true ||
          item.defaultPlan === 1 ||
          ['true', '1'].includes(String(item.defaultPlan).toLowerCase()),
+        customerName: item.customerName || '',
+        partyRowId: item.partyRowId || '',
      }));
      return this.billingPlanOptions;
    },
@@ -69,6 +69,8 @@
        :data="rows"
        :size="tableSize"
        border
+        height="100%"
+        class="settlement-adjustment-page__table"
        @selection-change="selection = $event"
      >
        <el-table-column type="selection" width="52" fixed="left" align="center" /><el-table-column
@@ -190,6 +192,7 @@ import { kingdeeStatusType } from '@/utils/kingdee';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
+import { settlementListPath } from '@/utils/settlement-menu';

 const emptyQuery = () => ({
  adjustmentNo: '',
@@ -290,20 +293,23 @@ export default {
    openView(row) {
      this.editor = { visible: true, id: row.id, readonly: true };
    },
-    // 单据号→本单查看弹窗；结算单号→跳正式结算列表页并自动打开该单详情（页面支持 ?detailNo=）
+    // 单据号→本单查看弹窗；结算单号→跳付款/收款结算列表页并自动打开该单详情（页面支持 ?detailNo=）
    handleTableLink(row, column) {
      if (column.prop === 'formalSettlementNo') {
-        this.openSettlementDetail(row.formalSettlementNo);
+        this.openSettlementDetail(row.formalSettlementNo, row.settlementType);
        return;
      }
      this.openView(row);
    },
-    openSettlementDetail(detailNo) {
+    openSettlementDetail(detailNo, settlementType) {
      if (!detailNo) {
        this.$message.info('当前记录未关联结算单详情');
        return;
      }
-      this.$router.push({ path: '/settlement/formal-settlement', query: { detailNo } });
+      this.$router.push({
+        path: settlementListPath(settlementType),
+        query: { detailNo },
+      });
    },
    isEditable(row) {
      return ['draft', 'returned'].includes(row.approvalStatus);
@@ -385,8 +391,27 @@ export default {
 </script>

 <style scoped lang="scss">
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$adjustment_page_height: calc(100vh - 114px);
+
 .settlement-adjustment-page {
+  height: $adjustment_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
  &__search {
+    flex-shrink: 0;
    padding: 12px 12px 4px;
    background: #fff;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -413,6 +438,10 @@ export default {
    margin-bottom: 8px;
  }
  &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
    margin-top: 8px;
  }
  &__toolbar {
@@ -427,8 +456,13 @@ export default {
    justify-content: center;
    gap: 8px;
  }
+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
  &__pagination {
    display: flex;
+    flex-shrink: 0;
    justify-content: flex-end;
    padding: 12px;
  }
@@ -0,0 +1,452 @@
+<template>
+  <basic-container class="business-dept-config-page">
+    <avue-crud
+      ref="crud"
+      v-model="form"
+      v-model:page="page"
+      :option="option"
+      :data="data"
+      :table-loading="loading"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu="{ row, index }">
+        <el-link
+          v-if="permission.business_dept_config_view"
+          type="primary"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
+        <el-link
+          v-if="permission.business_dept_config_edit"
+          type="primary"
+          @click="$refs.crud.rowEdit(row, index)"
+        >
+          编辑
+        </el-link>
+        <el-link
+          v-if="permission.business_dept_config_delete"
+          type="danger"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+      </template>
+      <template #initialSerial="{ row }">
+        {{ formatSerial(row.initialSerial) }}
+      </template>
+      <template #platformCompanyId-form>
+        <el-select
+          v-model="form.platformCompanyId"
+          filterable
+          clearable
+          placeholder="请选择平台公司"
+          style="width: 100%"
+          @change="handlePlatformCompanyChange"
+        >
+          <el-option
+            v-for="item in platformCompanyOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+      <template #businessDeptId-form>
+        <el-select
+          v-model="form.businessDeptId"
+          filterable
+          clearable
+          placeholder="请选择业务部门"
+          style="width: 100%"
+          @change="handleBusinessDeptChange"
+        >
+          <el-option
+            v-for="item in businessDeptOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+      <template #kingdeeCompanyCode-form>
+        <el-input
+          v-model="form.kingdeeCompanyCode"
+          disabled
+          placeholder="关联组织中配置的平台公司金蝶代码"
+        />
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, submit, remove } from '@/api/system/business-dept-config';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
+import { mapGetters } from 'vuex';
+
+export default {
+  data() {
+    return {
+      form: {},
+      data: [],
+      loading: true,
+      query: {},
+      page: {
+        pageSize: 10,
+        pageSizes: [10, 30, 50, 100, 200],
+        currentPage: 1,
+        total: 0,
+      },
+      platformCompanyOptions: [],
+      businessDeptOptions: [],
+      option: {
+        height: 'auto',
+        calcHeight: 32,
+        tip: false,
+        border: true,
+        stripe: true,
+        index: true,
+        indexLabel: '序号',
+        indexWidth: 70,
+        selection: false,
+        addBtn: true,
+        editBtn: false,
+        delBtn: false,
+        viewBtn: false,
+        menuWidth: 220,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        labelPosition: 'right',
+        labelWidth: 'auto',
+        searchShow: true,
+        searchIcon: true,
+        searchIndex: 4,
+        searchMenuSpan: 24,
+        searchMenuPosition: 'right',
+        column: [
+          {
+            label: '业务部门',
+            prop: 'businessDeptId',
+            type: 'select',
+            filterable: true,
+            search: true,
+            searchOrder: 2,
+            searchFilterable: true,
+            minWidth: 160,
+            span: 12,
+            formslot: true,
+            hide: true,
+            props: { label: 'label', value: 'value' },
+            dicData: [],
+            rules: [{ required: true, message: '请选择业务部门', trigger: 'change' }],
+          },
+          {
+            label: '业务部门',
+            prop: 'businessDeptName',
+            minWidth: 160,
+            display: false,
+          },
+          {
+            label: '平台公司',
+            prop: 'platformCompanyId',
+            type: 'select',
+            filterable: true,
+            search: true,
+            searchOrder: 1,
+            searchFilterable: true,
+            minWidth: 220,
+            span: 12,
+            formslot: true,
+            hide: true,
+            props: { label: 'label', value: 'value' },
+            dicData: [],
+            rules: [{ required: true, message: '请选择平台公司', trigger: 'change' }],
+          },
+          {
+            label: '平台公司',
+            prop: 'platformCompanyName',
+            minWidth: 220,
+            display: false,
+          },
+          {
+            label: '合同编码前缀',
+            prop: 'contractCodePrefix',
+            minWidth: 140,
+            span: 12,
+            maxlength: 64,
+            rules: [{ required: true, message: '请输入合同编码前缀', trigger: 'blur' }],
+          },
+          {
+            label: '金蝶公司代码',
+            prop: 'kingdeeCompanyCode',
+            minWidth: 140,
+            span: 12,
+            formslot: true,
+            addDisplay: true,
+            editDisplay: true,
+            // 列表展示，维护入口在组织管理的平台公司
+            hide: false,
+          },
+          {
+            label: '初始流水号',
+            prop: 'initialSerial',
+            type: 'number',
+            minWidth: 120,
+            span: 12,
+            minRows: 1,
+            maxRows: 999,
+            controls: false,
+            clearable: true,
+            slot: true,
+            placeholder: '如果系统已有相同流水号，则跳过这个流水号',
+          },
+          {
+            label: '金蝶部门代码',
+            prop: 'kingdeeDeptCode',
+            minWidth: 140,
+            span: 12,
+            maxlength: 64,
+          },
+          {
+            label: '备注',
+            prop: 'remark',
+            type: 'textarea',
+            minWidth: 160,
+            span: 24,
+            maxlength: 200,
+            showWordLimit: true,
+            hide: true,
+            overHidden: true,
+          },
+          {
+            label: '创建时间',
+            prop: 'createTime',
+            type: 'datetime',
+            format: 'YYYY-MM-DD HH:mm:ss',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '更新人',
+            prop: 'updateUserName',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.business_dept_config_add, false),
+        editBtn: false,
+        delBtn: false,
+      };
+    },
+  },
+  watch: {
+    // Avue number 清空后可能回写成 -1，统一清成空，避免未填却落库 -1
+    'form.initialSerial'(value) {
+      if (value === -1 || value === '-1') {
+        this.form.initialSerial = undefined;
+      }
+    },
+  },
+  created() {
+    this.loadSelectOptions();
+  },
+  methods: {
+    loadSelectOptions() {
+      Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
+          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
+          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
+          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
+          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
+        }
+      );
+    },
+    normalizeDeptOptions(list) {
+      return (list || []).map(item => ({
+        label: item.deptName || item.fullName || String(item.id),
+        value: String(item.id),
+        kingdeeDeptCode: item.kingdeeDeptCode || '',
+      }));
+    },
+    formatSerial(value) {
+      // Avue number 空值常落成 -1，历史脏数据也按空展示
+      if (value === null || value === undefined || value === '' || value === -1 || value === '-1') {
+        return '';
+      }
+      const number = Number(value);
+      if (!Number.isInteger(number) || number < 1) return '';
+      return String(number).padStart(3, '0');
+    },
+    /** 初始流水号空值归一：未填 / -1 都按空处理，禁止自动落库 -1 */
+    normalizeInitialSerial(value) {
+      if (value === '' || value === undefined || value === null || value === -1 || value === '-1') {
+        return null;
+      }
+      const number = Number(value);
+      return Number.isFinite(number) ? number : null;
+    },
+    handlePlatformCompanyChange(value) {
+      const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
+      this.form.platformCompanyName = matched ? matched.label : '';
+      // 只读回填组织中平台公司的金蝶公司代码
+      this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
+    },
+    handleBusinessDeptChange(value) {
+      const matched = this.businessDeptOptions.find(item => String(item.value) === String(value));
+      this.form.businessDeptName = matched ? matched.label : '';
+    },
+    beforeOpen(done, type) {
+      const loadOptions = Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
+          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
+          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
+          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
+          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
+        }
+      );
+      if (['edit', 'view'].includes(type) && this.form.id) {
+        Promise.all([loadOptions, getDetail(this.form.id)]).then(([, detailRes]) => {
+          const detail = detailRes.data?.data || {};
+          const platformCompanyId = detail.platformCompanyId ? String(detail.platformCompanyId) : '';
+          const platformMatched = this.platformCompanyOptions.find(
+            item => String(item.value) === platformCompanyId
+          );
+          this.form = {
+            ...detail,
+            platformCompanyId,
+            businessDeptId: detail.businessDeptId ? String(detail.businessDeptId) : '',
+            // 展示以组织当前配置为准，避免配置表镜像滞后
+            kingdeeCompanyCode: platformMatched?.kingdeeDeptCode || detail.kingdeeCompanyCode || '',
+            // 历史 -1 / 无效值在表单中显示为空，避免 Avue number 回显 -1
+            initialSerial: this.normalizeInitialSerial(detail.initialSerial) ?? undefined,
+          };
+          done();
+        });
+        return;
+      }
+      loadOptions.finally(() => {
+        if (type === 'add') {
+          this.form = {
+            platformCompanyId: '',
+            platformCompanyName: '',
+            businessDeptId: '',
+            businessDeptName: '',
+            contractCodePrefix: '',
+            initialSerial: undefined,
+            kingdeeCompanyCode: '',
+            kingdeeDeptCode: '',
+            remark: '',
+          };
+        }
+        done();
+      });
+    },
+    normalizeSubmitRow(row) {
+      return {
+        ...row,
+        platformCompanyId: row.platformCompanyId || null,
+        businessDeptId: row.businessDeptId || null,
+        contractCodePrefix: String(row.contractCodePrefix || '').trim(),
+        // 金蝶公司代码由后端按平台公司组织配置覆盖，前端仅展示
+        kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
+        remark: String(row.remark || '').trim(),
+        initialSerial: this.normalizeInitialSerial(row.initialSerial),
+      };
+    },
+    rowSave(row, done, loading) {
+      submit(this.normalizeSubmitRow(row)).then(
+        () => {
+          this.$message.success('新增成功');
+          done();
+          this.onLoad(this.page);
+        },
+        () => loading()
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      submit(this.normalizeSubmitRow(row)).then(
+        () => {
+          this.$message.success('修改成功');
+          done();
+          this.onLoad(this.page);
+        },
+        () => loading()
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定删除该业务部门配置？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(row.id))
+        .then(() => {
+          this.$message.success('删除成功');
+          this.onLoad(this.page);
+        })
+        .catch(() => {});
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const query = {
+        ...this.query,
+        ...params,
+      };
+      getList(page.currentPage, page.pageSize, query)
+        .then(res => {
+          const result = res.data?.data || {};
+          this.page.total = result.total || 0;
+          this.data = result.records || [];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
@@ -203,7 +203,6 @@ import { mapGetters } from 'vuex';
 import website from '@/config/website';
 import func from '@/utils/func';

-const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
 /**
 * 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
@@ -303,7 +302,7 @@ export default {
            headerAlign: 'left',
            order: 80,
            search: true,
-            searchOrder: 2,
+            searchOrder: 3,
            rules: [
              {
                required: true,
@@ -323,7 +322,7 @@ export default {
              {
                validator: (rule, value, callback) => {
                  const deptCode = String(value || '').trim();
-                  // 组织编码非必填，为空直接通过
+                  // 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
                  if (!deptCode) {
                    callback();
                    return;
@@ -332,126 +331,6 @@ export default {
                    callback(new Error('组织编码不能超过30个字符'));
                    return;
                  }
-                  const parentId = this.normalizeParentId(this.form?.parentId);
-                  // 顶级组织不选择上级时，编码不依赖上级编码
-                  if (!parentId) {
-                    callback();
-                    return;
-                  }
-                  if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
-                    this.loadParentDeptCode(parentId);
-                    callback(new Error('正在加载上级组织编码，请稍后重试'));
-                    return;
-                  }
-                  if (!this.parentDeptCode) {
-                    callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
-                    return;
-                  }
-                  // 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字（中间不加-）
-                  let expectedPrefix = this.parentDeptCode;
-                  const category = Number(this.form?.deptCategory);
-                  if (category === 2) {
-                    expectedPrefix = 'GWWL';
-                  } else if (category === 3 && this.form?.belongCompanyCode) {
-                    expectedPrefix = String(this.form.belongCompanyCode).trim();
-                  }
-                  const pattern = new RegExp(`^${escapeRegExp(expectedPrefix)}\\d{3}$`);
-                  if (!pattern.test(deptCode)) {
-                    callback(new Error(`组织编码格式应为：${expectedPrefix}三位数字（不足补零，中间不加-）`));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '金蝶部门代码',
-            prop: 'kingdeeDeptCode',
-            minWidth: 140,
-            order: 65,
-            maxlength: 64,
-            showWordLimit: true,
-            rules: [
-              {
-                validator: (rule, value, callback) => {
-                  const code = String(value || '').trim();
-                  if (!code) {
-                    callback();
-                    return;
-                  }
-                  if (code.length > 64) {
-                    callback(new Error('金蝶部门代码不能超过64个字符'));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '合同编码前缀',
-            prop: 'contractCodePrefix',
-            minWidth: 160,
-            order: 62,
-            maxlength: 64,
-            showWordLimit: true,
-            placeholder: '如 GWZH成都',
-            tip: '合同编号规则：前缀（年份）三位流水号，流水按本部门独立编号',
-            rules: [
-              {
-                validator: (rule, value, callback) => {
-                  const prefix = String(value || '').trim();
-                  if (!prefix) {
-                    callback();
-                    return;
-                  }
-                  if (prefix.length > 64) {
-                    callback(new Error('合同编码前缀不能超过64个字符'));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '合同初始流水号',
-            prop: 'contractInitialSerial',
-            type: 'input',
-            minWidth: 140,
-            order: 61,
-            placeholder: '如 1',
-            // -1 为空占位，列表展示为空
-            formatter: row =>
-              Number(row.contractInitialSerial) === -1 ? '' : row.contractInitialSerial,
-            tip: '该部门当年首个合同时从此流水号起编，后续递增；范围1-999，不填默认从1开始',
-            rules: [
-              {
-                validator: (rule, value, callback) => {
-                  // -1 为空占位，不填时按空处理
-                  if (
-                    value === undefined ||
-                    value === null ||
-                    value === '' ||
-                    Number(value) === -1
-                  ) {
-                    callback();
-                    return;
-                  }
-                  const text = String(value).trim();
-                  if (!/^\d+$/.test(text)) {
-                    callback(new Error('合同初始流水号只能输入正整数'));
-                    return;
-                  }
-                  const serial = Number(text);
-                  if (serial < 1 || serial > 999) {
-                    callback(new Error('合同初始流水号范围为1到999'));
-                    return;
-                  }
                  callback();
                },
                trigger: 'blur',
@@ -464,7 +343,7 @@ export default {
            minWidth: 140,
            order: 60,
            search: true,
-            searchOrder: 1,
+            searchOrder: 4,
          },
          {
            label: '助记码',
@@ -523,18 +402,57 @@ export default {
              { label: '是', value: 1 },
            ],
            dataType: 'number',
-            value: 0,
            width: 120,
-            order: 35,
+            order: 36,
+            search: true,
+            searchOrder: 2,
+            searchPlaceholder: '请选择是否平台公司',
            formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
+            change: ({ value }) => this.handlePlatformCompanyChange(value),
            rules: [
              {
-                required: true,
-                message: '请选择是否平台公司',
+                validator: (rule, value, callback) => {
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否平台公司'));
+                    return;
+                  }
+                  callback();
+                },
                trigger: 'change',
              },
            ],
          },
+          {
+            label: '金蝶公司代码',
+            prop: 'kingdeeDeptCode',
+            minWidth: 140,
+            order: 35,
+            maxlength: 64,
+            showWordLimit: true,
+            // 仅平台公司维护/展示金蝶公司代码；非平台公司列表留空
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            formatter: row =>
+              Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '',
+            rules: [
+              {
+                validator: (rule, value, callback) => {
+                  const code = String(value || '').trim();
+                  if (!code) {
+                    callback();
+                    return;
+                  }
+                  if (code.length > 64) {
+                    callback(new Error('金蝶公司代码不能超过64个字符'));
+                    return;
+                  }
+                  callback();
+                },
+                trigger: 'blur',
+              },
+            ],
+          },
          {
            label: '是否业务部门',
            prop: 'isBusinessDept',
@@ -544,14 +462,22 @@ export default {
              { label: '是', value: 1 },
            ],
            dataType: 'number',
-            value: 0,
            width: 120,
            order: 34,
+            search: true,
+            searchOrder: 1,
+            searchPlaceholder: '请选择是否业务部门',
            formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
            rules: [
              {
-                required: true,
-                message: '请选择是否业务部门',
+                validator: (rule, value, callback) => {
+                  // 不能用 required:true：值为 0（否）时会被当成空
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否业务部门'));
+                    return;
+                  }
+                  callback();
+                },
                trigger: 'change',
              },
            ],
@@ -1042,6 +968,7 @@ export default {
    /**
     * 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
     * 排序为空时由后端默认填充 1。
+     * 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
     */
    prepareDeptSubmitRow(row) {
      const category = this.resolveDeptCategoryValue(row.deptCategory);
@@ -1049,6 +976,8 @@ export default {
        return false;
      }
      row.deptCategory = category;
+      row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
+      row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
      if (row.status === '' || row.status === null || row.status === undefined) {
        delete row.status;
      } else {
@@ -1061,6 +990,24 @@ export default {
      }
      return true;
    },
+    normalizeYesNoFlag(value) {
+      return Number(value) === 1 ? 1 : 0;
+    },
+    handlePlatformCompanyChange(value) {
+      const isPlatform = Number(value) === 1;
+      this.syncKingdeeCompanyCodeDisplay(isPlatform);
+      if (!isPlatform && this.form) {
+        this.form.kingdeeDeptCode = '';
+      }
+    },
+    syncKingdeeCompanyCodeDisplay(isPlatformCompany) {
+      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
+      if (!column) return;
+      const visible = Number(isPlatformCompany) === 1;
+      column.addDisplay = visible;
+      column.editDisplay = visible;
+      column.viewDisplay = visible;
+    },
    resolveDeptCategoryValue(value) {
      if (value === null || value === undefined || value === '') {
        this.$message.warning('请选择组织类型');
@@ -1217,29 +1164,6 @@ export default {
        row.parentId = 0;
      }
    },
-    normalizeContractInitialSerial(value) {
-      // -1 为空占位，不填时不落库、不回显
-      if (
-        value === undefined ||
-        value === null ||
-        value === '' ||
-        Number(value) === -1
-      ) {
-        return null;
-      }
-      const text = String(value).trim();
-      if (!text) {
-        return null;
-      }
-      const serial = Number(text);
-      return Number.isInteger(serial) ? serial : value;
-    },
-    clearEmptyContractInitialSerial(form = this.form) {
-      if (!form) return;
-      if (Number(form.contractInitialSerial) === -1) {
-        form.contractInitialSerial = '';
-      }
-    },
    isRootDept(row) {
      return row && (row.parentId === 0 || String(row.parentId) === '0');
    },
@@ -1384,9 +1308,9 @@ export default {
    rowSave(row, done, loading) {
      row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
      row.deptCode = String(row.deptCode || '').trim();
-      row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
-      row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
-      row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
+      // 金蝶公司代码仅平台公司维护
+      row.kingdeeDeptCode =
+        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
      row.leaderId = func.join(row.leaderId);
      this.normalizeTopParent(row);
      if (!this.prepareDeptSubmitRow(row)) {
@@ -1432,9 +1356,9 @@ export default {
    rowUpdate(row, index, done, loading) {
      row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
      row.deptCode = String(row.deptCode || '').trim();
-      row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
-      row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
-      row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
+      // 金蝶公司代码仅平台公司维护
+      row.kingdeeDeptCode =
+        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
      row.leaderId = func.join(row.leaderId);
      this.normalizeTopParent(row);
      if (!this.prepareDeptSubmitRow(row)) {
@@ -1541,34 +1465,42 @@ export default {
    beforeOpen(done, type) {
      if (type === 'add') {
        this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
-        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
-          this.form.isPlatformCompany = 0;
-        }
-        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
-          this.form.isBusinessDept = 0;
-        }
-        this.clearEmptyContractInitialSerial(this.form);
+        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
+        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
+        this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
        this.initData(this.form.tenantId);
        this.loadParentDeptCode(this.form.parentId);
+        done();
+        return;
      }
      if (type === 'edit') {
        this.initData(this.form.tenantId || this.userInfo.tenantId || website.tenantId);
      }
      if (['edit', 'view'].includes(type)) {
-        getDept(this.form.id).then(res => {
-          this.form = Object.assign(res.data.data, {
-            hasChildren: this.form.hasChildren,
+        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 Avue 表单引用
+        getDept(this.form.id)
+          .then(res => {
+            const detail = res.data.data || {};
+            Object.assign(this.form, detail, {
+              hasChildren: this.form.hasChildren,
+              isPlatformCompany: this.normalizeYesNoFlag(detail.isPlatformCompany),
+              isBusinessDept: this.normalizeYesNoFlag(detail.isBusinessDept),
+            });
+            if (this.form.parentId === '0') {
+              this.form.parentId = '';
+            }
+            this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
+            this.loadParentDeptCode(this.form.parentId);
+            if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
+              const splitResult = func.split(this.form.leaderId);
+              this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
+            }
+            done();
+          })
+          .catch(() => {
+            done();
          });
-          if (this.form.parentId === '0') {
-            this.form.parentId = '';
-          }
-          this.clearEmptyContractInitialSerial(this.form);
-          this.loadParentDeptCode(this.form.parentId);
-          if (this.form.hasOwnProperty('leaderId')) {
-            const splitResult = func.split(this.form.leaderId);
-            this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
-          }
-        });
+        return;
      }
      done();
    },
@@ -172,6 +172,21 @@
                    />
                  </el-form-item>
                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="数据管理权限" prop="dataScopeDeptIds">
+                    <el-cascader
+                      v-model="dataScopeCascaderValue"
+                      :options="permissionDeptTree"
+                      :props="deptCascaderProps"
+                      :disabled="isUserViewMode"
+                      clearable
+                      filterable
+                      collapse-tags
+                      collapse-tags-tooltip
+                      placeholder="请选择数据管理组织（可多选）"
+                    />
+                  </el-form-item>
+                </el-col>
                <el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
                <el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
                <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
@@ -592,6 +607,26 @@ export default {
        this.$refs.userFormRef?.validateField('deptId');
      },
    },
+    // 数据管理权限多选级联：form.dataScopeDeptIds 为 id 数组
+    dataScopeCascaderValue: {
+      get() {
+        const ids = Array.isArray(this.form.dataScopeDeptIds)
+          ? this.form.dataScopeDeptIds
+          : this.form.dataScopeDeptIds
+            ? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
+            : [];
+        return ids
+          .filter(item => item !== undefined && item !== null && item !== '')
+          .map(item => (typeof item === 'number' ? item : String(item)));
+      },
+      set(value) {
+        this.form.dataScopeDeptIds = Array.isArray(value)
+          ? value.filter(item => item !== undefined && item !== null && item !== '')
+          : value
+            ? [value]
+            : [];
+      },
+    },
    isUserViewMode() {
      return this.userDialogMode === 'view';
    },
@@ -1034,6 +1069,7 @@ export default {
          sex: undefined,
          postId: '',
          deptId: [],
+          dataScopeDeptIds: [],
          code: '',
          personCategory: 1,
          remark: '',
@@ -1046,9 +1082,13 @@ export default {
      getUser(row.id).then(res => {
        const user = res.data.data;
        const deptIds = func.split(user.deptId || '');
+        const dataScopeDeptIds = Array.isArray(user.dataScopeDeptIds)
+          ? user.dataScopeDeptIds.map(item => String(item))
+          : [];
        this.form = {
          ...user,
          deptId: Array.isArray(deptIds) ? deptIds : [],
+          dataScopeDeptIds,
          postId: func.split(user.postId || '')[0] || '',
          roleId: func.join(user.roleId || ''),
          personCategory: user.personCategory || 1,
@@ -1064,9 +1104,13 @@ export default {
    submitUserForm() {
      this.$refs.userFormRef.validate(valid => {
        if (!valid) return;
+        const dataScopeDeptIds = Array.isArray(this.form.dataScopeDeptIds)
+          ? this.form.dataScopeDeptIds.filter(item => item !== undefined && item !== null && item !== '')
+          : [];
        const row = {
          ...this.form,
          deptId: func.join(this.form.deptId),
+          dataScopeDeptIds,
          postId: func.join(this.form.postId),
          roleId: func.join(this.form.roleId),
          leaderId: func.join(this.form.leaderId),
@@ -303,6 +303,42 @@
              />
            </el-col>
          </el-row>
+          <el-row :gutter="18">
+            <el-col :span="6">
+              <el-form-item label="身份证有效期" prop="idCardValidEnd">
+                <div class="date-range">
+                  <el-date-picker
+                    v-model="driverForm.idCardValidStart"
+                    type="date"
+                    value-format="YYYY-MM-DD"
+                    placeholder="起"
+                    :disabled="driverForm.idCardLongTerm === 1"
+                    @change="validateFormField('idCardValidEnd')"
+                  />
+                  <el-date-picker
+                    v-model="driverForm.idCardValidEnd"
+                    type="date"
+                    value-format="YYYY-MM-DD"
+                    placeholder="止"
+                    :disabled="driverForm.idCardLongTerm === 1"
+                    @change="validateFormField('idCardValidEnd')"
+                  />
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="长期有效" prop="idCardLongTerm">
+                <el-checkbox
+                  v-model="driverForm.idCardLongTerm"
+                  :true-label="1"
+                  :false-label="0"
+                  @change="handleIdCardLongTermChange"
+                >
+                  是
+                </el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
        </section-card>

        <section-card title="驾驶证信息">
@@ -653,6 +689,7 @@ import {
  recognitionIDCard,
  recognitionTransportCertificates,
  recognizeBaiduOcr,
+  recognizeQualificationCertificateOcr,
 } from '@/api/transportCapacity/driver';
 import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
 import { getDeptTree } from '@/api/system/dept';
@@ -701,6 +738,9 @@ const emptyForm = () => ({
  posts: '',
  idCardFront: '',
  idCardBack: '',
+  idCardValidStart: '',
+  idCardValidEnd: '',
+  idCardLongTerm: 0,
  headPhoto: '',
  drivingType: '',
  drivingLicenseNo: '',
@@ -1260,12 +1300,13 @@ export default {
    },
    handleIdCardUploadSuccess(prop, url) {
      this.setImage(prop, url);
-      if (prop !== 'idCardFront') {
-        return;
+      this.recognizeIdCard(url, prop);
+    },
+    handleIdCardLongTermChange() {
+      if (this.driverForm.idCardLongTerm === 1) {
+        this.driverForm.idCardValidEnd = '';
      }
-      this.recognizeBaiduOcr(url, 'id_card', 'front', '身份证', data => {
-        this.applyIdCardRecognition(data);
-      });
+      this.validateFormField('idCardValidEnd');
    },
    handleDrivingLicenseUploadSuccess(prop, url) {
      this.setImage(prop, url);
@@ -1282,9 +1323,29 @@ export default {
    },
    handleQualificationUploadSuccess(prop, url) {
      this.setImage(prop, url);
-      this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
-        this.applyQualificationRecognition(data);
+      this.recognizeQualificationCertificate(url);
+    },
+    recognizeQualificationCertificate(url) {
+      if (!url) {
+        this.$message.warning('从业资格证图片上传成功，未获取到图片地址，无法自动识别');
+        return;
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        text: '从业资格证识别中',
+        background: 'rgba(255, 255, 255, 0.7)',
      });
+      recognizeQualificationCertificateOcr(url)
+        .then(res => {
+          this.applyQualificationRecognition(res?.data?.data || {});
+          this.$message.success('从业资格证识别完成');
+        })
+        .catch(() => {
+          this.$message.warning('从业资格证图片上传成功，自动识别失败，请手动填写相关信息');
+        })
+        .finally(() => {
+          loading.close();
+        });
    },
    recognizeBaiduOcr(url, type, side, documentName, applyRecognition) {
      if (!url) {
@@ -1308,7 +1369,7 @@ export default {
          loading.close();
        });
    },
-    recognizeIdCard(url = '') {
+    recognizeIdCard(url = '', prop = 'idCardFront') {
      if (!url) {
        this.$message.warning('身份证图片上传成功，未获取到图片地址，无法自动识别');
        return;
@@ -1321,7 +1382,7 @@ export default {
      recognitionIDCard(url)
        .then(res => {
          const data = res.data.data || {};
-          this.applyIdCardRecognition(data);
+          this.applyIdCardRecognition(data, prop);
          this.$message.success('身份证识别完成');
        })
        .catch(() => {
@@ -1444,45 +1505,62 @@ export default {
        this.driverForm.drivingLicenseLongTerm = 0;
      }
    },
-    applyIdCardRecognition(data = {}) {
+    applyIdCardRecognition(data = {}, prop = 'idCardFront') {
+      // 正反面都走同一 ShenFenZheng 接口；反面结果可能也带姓名/民族等字段，
+      // 反面只补空、不覆盖正面已填值，避免国徽页误识别冲掉正面信息。
+      const fromBack = prop === 'idCardBack';
+      const canWrite = (current, next) => !!next && (!fromBack || !current);
      const driverName = data.name || data.driverName || this.getOcrValue(data, ['name', '姓名']);
      const idCardNo = String(
        data.idNo ||
          data.idCardNo ||
          data.idCard ||
-          this.getOcrValue(data, ['idNo', 'idCardNo', 'number', '公民身份号码', '身份证号'])
-      ).toUpperCase();
+          this.getOcrValue(data, ['idNo', 'idCardNo', 'number', '公民身份号码', '身份证号']) ||
+          ''
+      )
+        .trim()
+        .toUpperCase();
      const ocrGender = data.gender || this.getOcrValue(data, ['gender', '性别']);
      const ocrNation =
        data.nation ||
        data.ethnicGroup ||
        this.getOcrValue(data, ['ethnic_group', 'nation', '民族']);
      const ocrAddress = data.address || this.getOcrValue(data, ['address', '住址', '地址']);
-      if (driverName) {
+      const ocrBirthday =
+        data.birthday || this.getOcrValue(data, ['birthday', '出生', '出生年月', '出生日期']);
+      if (canWrite(this.driverForm.driverName, driverName)) {
        this.driverForm.driverName = driverName;
      }
-      if (ocrGender) {
+      if (canWrite(this.driverForm.gender, ocrGender)) {
        this.driverForm.gender = ocrGender;
      }
-      if (ocrNation) {
+      if (canWrite(this.driverForm.nation, ocrNation)) {
        this.driverForm.nation = this.normalizeNation(ocrNation);
      }
-      if (ocrAddress) {
+      if (canWrite(this.driverForm.address, ocrAddress)) {
        this.driverForm.address = String(ocrAddress).trim();
      }
-      if (idCardNo) {
+      if (ocrBirthday) {
+        const birthday = this.normalizeBirthday(ocrBirthday);
+        if (canWrite(this.driverForm.birthday, birthday)) {
+          this.driverForm.birthday = birthday;
+        }
+      }
+      if (idCardNo && canWrite(this.driverForm.idCardNo, idCardNo)) {
        this.driverForm.idCardNo = idCardNo;
        if (!this.driverForm.qualificationNo) {
          this.driverForm.qualificationNo = idCardNo;
        }
        const idCardInfo = this.parseIdCardInfo(idCardNo);
-        if (idCardInfo.birthday) {
+        if (!this.driverForm.birthday && idCardInfo.birthday) {
          this.driverForm.birthday = idCardInfo.birthday;
        }
        if (!this.driverForm.gender && idCardInfo.gender) {
          this.driverForm.gender = idCardInfo.gender;
        }
      }
+      // 有效期：正反面都可回填；反面通常才有，识别到就覆盖
+      this.applyIdCardValidity(data);
      this.$nextTick(() => {
        [
          'driverName',
@@ -1492,11 +1570,46 @@ export default {
          'nation',
          'qualificationNo',
          'address',
-        ].forEach(prop => {
-          this.$refs.driverForm?.validateField(prop);
+          'idCardValidEnd',
+        ].forEach(field => {
+          this.$refs.driverForm?.validateField(field);
        });
      });
    },
+    applyIdCardValidity(data = {}) {
+      const validStart =
+        data.validDateStart ||
+        data.idCardValidStart ||
+        this.getOcrValue(data, ['签发日期', '有效起始日期', '有效期限起', '身份证_签发日期']);
+      const validEndRaw =
+        data.validDateEnd ||
+        data.idCardValidEnd ||
+        this.getOcrValue(data, [
+          '失效日期',
+          '有效期限',
+          '有效期限止',
+          '身份证_有效期限',
+          '身份证_失效日期',
+        ]);
+      const longTerm = data.longTerm ?? data.idCardLongTerm;
+      const validEndText = String(validEndRaw || '').trim();
+      if (longTerm === 1 || longTerm === '1' || /长期|永久/.test(validEndText)) {
+        this.driverForm.idCardLongTerm = 1;
+        this.driverForm.idCardValidEnd = '';
+      } else if (validEndText) {
+        const endDate = this.normalizeBirthday(validEndText);
+        if (endDate) {
+          this.driverForm.idCardValidEnd = endDate;
+          this.driverForm.idCardLongTerm = 0;
+        }
+      }
+      if (validStart) {
+        const startDate = this.normalizeBirthday(validStart);
+        if (startDate) {
+          this.driverForm.idCardValidStart = startDate;
+        }
+      }
+    },
    getOcrValue(data = {}, keys = []) {
      const keyInfos = data.keyInfos || data.keyInfo || data.ocrKeyInfos || [];
      const list = Array.isArray(keyInfos) ? keyInfos : [];
@@ -1522,25 +1635,43 @@ export default {
      return typeof value === 'object' ? value.words || value.value || '' : value || '';
    },
    applyQualificationRecognition(data = {}) {
-      const qualificationType = this.getQualificationType(data);
-      const qualificationNo = this.getQualificationNo(data);
+      const fields = this.normalizeQualificationOcrFields(data);
+      const qualificationType = this.getQualificationOcrValue(fields, [
+        'qualification_category',
+        '从业资格类别',
+        '从业资格类型',
+      ]).replace(/[，,；;]+$/, '');
+      const qualificationNo = this.getQualificationOcrValue(fields, [
+        'certificate_no',
+        '证号',
+        '从业资格证号',
+        '资格证号',
+        '证书编号',
+      ]);
+      const validFrom = this.getQualificationOcrValue(fields, ['valid_from', '有效起始日期']);
+      const validUntil = this.getQualificationOcrValue(fields, ['valid_until', '有效期限', '有效期']);
      const matchedType = this.matchQualificationType(qualificationType);
      if (matchedType) {
        this.driverForm.qualificationType = matchedType;
      } else if (qualificationType && !this.qualificationTypeOptions.length) {
        this.driverForm.qualificationType = qualificationType;
      }
-      if (qualificationNo && !this.driverForm.qualificationNo) {
+      if (qualificationNo) {
        this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
      }
-      const words = this.getBaiduOcrWords(data).join(' ');
-      const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
-      if (/(长期|永久有效)/.test(words)) {
+      const startDate = this.normalizeBirthday(validFrom);
+      if (startDate) {
+        this.driverForm.qualificationStartDate = startDate;
+      }
+      if (/(长期|永久)/.test(validUntil)) {
        this.driverForm.qualificationLongTerm = 1;
        this.driverForm.qualificationEndDate = '';
-      } else if (dateList.length) {
-        this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
-        this.driverForm.qualificationLongTerm = 0;
+      } else {
+        const endDate = this.normalizeBirthday(validUntil);
+        if (endDate) {
+          this.driverForm.qualificationEndDate = endDate;
+          this.driverForm.qualificationLongTerm = 0;
+        }
      }
      this.$nextTick(() => {
        ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
@@ -1548,22 +1679,25 @@ export default {
        });
      });
    },
-    getQualificationType(data = {}) {
-      const fieldValue = this.getOcrValue(data, ['从业资格类别', '从业资格类型']);
-      if (fieldValue) return String(fieldValue).trim();
-      const words = this.getBaiduOcrWords(data);
-      const labelIndex = words.findIndex(word => /从业资格类别|从业资格类型/.test(word));
-      if (labelIndex < 0) return '';
-      const firstValue = words[labelIndex].replace(/^.*?(?:从业资格类别|从业资格类型)\s*[:：]?/, '').trim();
-      const values = firstValue ? [firstValue] : [];
-      for (let index = labelIndex + 1; index < words.length; index += 1) {
-        const word = String(words[index] || '').trim();
-        if (!word || /^(有效起始日期|有效期限|核发机关|继续教育信息|诚信考核信息)/.test(word)) {
-          break;
-        }
-        values.push(word);
+    normalizeQualificationOcrFields(result = {}) {
+      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
+        return result.fields;
      }
-      return values.join('').replace(/[，,；;]+$/, '').trim();
+      const keyInfos = result.key_info || result.keyInfo || result.keyInfos || [];
+      if (!Array.isArray(keyInfos)) return {};
+      return Object.fromEntries(
+        keyInfos
+          .filter(item => item && item.key)
+          .map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
+          .filter(([, value]) => value)
+      );
+    },
+    getQualificationOcrValue(fields = {}, keys = []) {
+      const normalizedKeys = keys.map(key => String(key).toLowerCase());
+      const entry = Object.entries(fields).find(([key]) =>
+        normalizedKeys.includes(String(key).toLowerCase())
+      );
+      return entry ? String(entry[1] || '').trim() : '';
    },
    matchQualificationType(value = '') {
      const text = String(value || '').replace(/\s/g, '');
@@ -1581,27 +1715,6 @@ export default {
      );
      return matched?.value || '';
    },
-    getQualificationNo(data = {}) {
-      const fieldValue = this.getOcrValue(data, ['从业资格证号', '资格证号', '证书编号']);
-      if (fieldValue) return fieldValue;
-      const words = this.getBaiduOcrWords(data);
-      const labelIndex = words.findIndex(word => /^(?:(?:从业)?资格证号?|证书编号)[:：]?$/.test(word));
-      if (labelIndex >= 0 && words[labelIndex + 1]) {
-        return words[labelIndex + 1];
-      }
-      const certificateLine = words.find(word => /(?:从业)?资格证号?|证书编号/.test(word));
-      const match = certificateLine?.match(/(?:(?:从业)?资格证号?|证书编号)\s*[:：]?\s*([A-Z0-9-]{6,})/i);
-      return match?.[1] || '';
-    },
-    getBaiduOcrWords(data = {}) {
-      const wordsResult = data.words_result || data.wordsResult || {};
-      if (Array.isArray(wordsResult)) {
-        return wordsResult.map(item => item.words || item.value || '').filter(Boolean);
-      }
-      return Object.values(wordsResult)
-        .map(item => (typeof item === 'object' ? item.words || item.value || '' : item || ''))
-        .filter(Boolean);
-    },
    normalizeNation(value = '') {
      const nation = String(value || '').trim();
      if (!nation) return '';
@@ -1675,6 +1788,8 @@ export default {
        const row = {
          ...this.driverForm,
          birthday: this.normalizeBirthday(this.driverForm.birthday),
+          idCardValidStart: this.normalizeBirthday(this.driverForm.idCardValidStart),
+          idCardValidEnd: this.normalizeBirthday(this.driverForm.idCardValidEnd),
          drivingLicenseStartDate: this.normalizeBirthday(this.driverForm.drivingLicenseStartDate),
          drivingLicenseEndDate: this.normalizeBirthday(this.driverForm.drivingLicenseEndDate),
          qualificationStartDate: this.normalizeBirthday(this.driverForm.qualificationStartDate),
@@ -1012,7 +1012,9 @@ export default {
        this.$message.warning('得分率下限必须小于上限');
        return;
      }
+      // F 级无授信允许额度上下限均为 0；其余等级仍要求下限严格小于上限
      if (
+        !this.isZeroCreditLimitRange(this.standardForm) &&
        Number(this.standardForm.creditLimitLower) >= Number(this.standardForm.creditLimitUpper)
      ) {
        this.$message.warning('授信额度下限必须小于上限');
@@ -1033,7 +1035,7 @@ export default {
        this.$message.warning('评估标准中的得分率区间不能重叠');
        return;
      }
-      if (this.hasRangeOverlap(nextStandards, 'creditLimitLower', 'creditLimitUpper')) {
+      if (this.hasCreditLimitOverlap(nextStandards)) {
        this.$message.warning('评估标准中的授信额度区间不能重叠');
        return;
      }
@@ -1083,6 +1085,17 @@ export default {
        return next && range.upper > next.lower;
      });
    },
+    /** F 级无授信：额度上下限均为 0 */
+    isZeroCreditLimitRange(standard = {}) {
+      return (
+        Number(standard.creditLimitLower) === 0 && Number(standard.creditLimitUpper) === 0
+      );
+    },
+    /** 授信额度区间重叠校验：跳过 0~0 无授信区间，避免与 E 级 0~500 冲突 */
+    hasCreditLimitOverlap(list = []) {
+      const ranges = list.filter(item => !this.isZeroCreditLimitRange(item));
+      return this.hasRangeOverlap(ranges, 'creditLimitLower', 'creditLimitUpper');
+    },
    validateConfig() {
      if (!this.configForm.name || !this.configForm.name.trim()) {
        this.$message.warning('请输入评定表名称');
@@ -1219,7 +1232,10 @@ export default {
          this.$message.warning(`${standard.creditLevel}信用等级得分率下限必须小于上限`);
          return false;
        }
-        if (Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)) {
+        if (
+          !this.isZeroCreditLimitRange(standard) &&
+          Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)
+        ) {
          this.$message.warning(`${standard.creditLevel}信用等级授信额度下限必须小于上限`);
          return false;
        }
@@ -1234,7 +1250,7 @@ export default {
        this.$message.warning('评估标准中的得分率区间不能重叠');
        return false;
      }
-      if (this.hasRangeOverlap(standards, 'creditLimitLower', 'creditLimitUpper')) {
+      if (this.hasCreditLimitOverlap(standards)) {
        this.$message.warning('评估标准中的授信额度区间不能重叠');
        return false;
      }
@@ -179,6 +179,14 @@ const createTimeRangeMap = {
  createTimeRange: ['createTimeStart', 'createTimeEnd'],
 };

+/** 关联异常列：一级 / 二级（如「车辆异常 / 车辆故障维修」），无关联显示 — */
+function formatExceptionSource(row) {
+  const parts = [row?.exceptionType, row?.exceptionReason].filter(
+    item => item !== undefined && item !== null && String(item).trim() !== ''
+  );
+  return parts.length ? parts.join(' / ') : '—';
+}
+
 const exportColumns = [
  { prop: 'vehicleType', label: '车船类型' },
  { prop: 'vehicleNo', label: '车牌号/船号' },
@@ -284,6 +292,23 @@ export default {
              { max: 30, message: '最多 30 个字符', trigger: 'change' },
            ],
          },
+          // 关联信息只读展示：由异常处置录入的记录带出运单与异常类型，PC 新增/编辑不产生关联
+          {
+            label: '关联运单',
+            prop: 'waybillNo',
+            minWidth: 150,
+            addDisplay: false,
+            editDisplay: false,
+            formatter: row => row.waybillNo || '—',
+          },
+          {
+            label: '关联异常',
+            prop: 'exceptionReason',
+            minWidth: 180,
+            addDisplay: false,
+            editDisplay: false,
+            formatter: formatExceptionSource,
+          },
          {
            label: '维修人',
            prop: 'maintainer',
Author	SHA1	Message	Date
b2894lxlx	7ff2b3fe28	✨ 司机从业资格证改为调用专用识别接口 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 15:09:16 +08:00
b2894lxlx	17d2766f82	Merge pull request '收票登记新增所属合同带出承办部门替代手选结算组织' (#13 ) from feature/20261104-bfi-project-web into master Reviewed-on: #13	2026-11-05 15:04:42 +08:00
刘泉佳	2fd927a90c	fix: 预付结算单与结算调整单分页固定底部，搜索label不再换行	2026-11-05 15:01:28 +08:00
刘泉佳	8057e860de	fix: 批量转结算弹窗居中限高并固定勾选列	2026-11-05 14:47:06 +08:00
刘泉佳	ffc2942d2b	fix: 付款申请结算单号误跳预付结算单过滤-1占位id	2026-11-05 13:30:36 +08:00
刘泉佳	22bbcbb7aa	fix: 应收转结算与开票申请点击结算单号跳转收款结算单	2026-11-05 13:30:36 +08:00
刘泉佳	4dd63fc5fa	feat: 收票登记新增所属合同带出承办部门替代手选结算组织	2026-11-05 12:05:56 +08:00
刘泉佳	c525bffeca	fix: 修复开票申请提交返回列表页未刷新	2026-11-05 11:44:19 +08:00
b2894lxlx	8f3da0e386	✨ 预结算收款方与付款方改为下拉选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 23:47:00 +08:00
b2894lxlx	d4ae6d521a	✨ 客商评分双模式与金蝶公司代码改回组织维护 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 23:46:20 +08:00
刘泉佳	b36fa18db5	Merge remote-tracking branch 'origin/master'	2026-11-04 22:19:13 +08:00
刘泉佳	f648285406	fix: 修复客商档案供应商编码查询无结果时显示[object Object]	2026-11-04 22:17:52 +08:00
b2894lxlx	fff0a29947	✨ 业务部门配置支持维护金蝶公司代码 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 22:15:48 +08:00
b2894lxlx	64b61c9c29	Merge pull request '付款结算 / 收票登记 / 发票认领模块' (#12 ) from feature/20261103-bfi-warehouse-web into master Reviewed-on: #12	2026-11-04 21:22:51 +08:00
刘泉佳	5d56706eed	Merge branch 'master' into feature/20261103-bfi-warehouse-web # Conflicts: # src/option/settlement/formalSettlement.js	2026-11-04 17:18:51 +08:00
b2894lxlx	9efae11811	✨ 合并远程收款流水列表改造	2026-11-04 16:56:30 +08:00
b2894lxlx	9a04757a9e	✨ 合并正式结算单金蝶冲销状态列 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 16:55:57 +08:00
b2894lxlx	e88a27d01f	Merge pull request '收款流水列表改造' (#10 ) from feature/20261027-hcs-bif-all-web-recBillSync into master Reviewed-on: #10	2026-11-04 16:45:48 +08:00
b2894lxlx	b9c367e028	Merge pull request '金蝶单据状态着色并悬浮展示失败原因+认领流水认领记录的改造' (#9 ) from feature/20261027-hcs-bif-all-web into master Reviewed-on: #9	2026-11-04 16:33:35 +08:00
刘泉佳	7f694bad55	fix: 收款结算单不展示已指定应付列	2026-11-04 11:02:45 +08:00
b2894lxlx	014ee537a0	✨ 组织编码/平台公司、合同计费客商角色与基础模块查看按钮 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 03:15:44 +08:00
b2894lxlx	5bde60d844	✨ 编辑用户增加数据管理权限多选组织 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 03:14:45 +08:00
刘泉佳	68904b02a5	fix: 审核按钮统一超时设置60s	2026-11-03 09:54:14 +08:00
b2894lxlx	c0ba9ba39b	✨ 计费/调度/结算支持多方客商与承运商区分 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 21:12:56 +08:00
b2894lxlx	8388a55481	✨ 新增业务部门配置页并简化项目/合同部门选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 21:10:47 +08:00
刘泉佳	b492dd35ea	fix: 结算单列表已指定应付列定义补充	2026-11-02 19:58:01 +08:00
刘泉佳	acb74cbc9a	fix: 结算单列表指定失败标签补悬浮原因	2026-11-02 19:56:54 +08:00
刘泉佳	9a51bd2cfd	feat: 结算单/付款申请单列表指定失败悬浮展示原因	2026-11-02 19:54:15 +08:00
刘泉佳	4dd54f7e4c	feat: 付款申请单列表增加已指定应付列	2026-11-02 19:36:04 +08:00
刘泉佳	6705763951	feat: 查看页指定失败行支持编辑匹配金额随重推生效	2026-11-02 19:16:41 +08:00
刘泉佳	4ba18acd25	feat: 查看页重推认领收票单并放开付款匹配金额编辑	2026-11-02 18:38:18 +08:00
刘泉佳	c07371450f	feat: 发票登记弹窗匹配结算单金额支持手动修改	2026-11-02 18:38:18 +08:00
刘泉佳	5fbbb5f88f	feat: 结算单发票信息增加是否已指定应付列	2026-11-02 18:10:53 +08:00
刘泉佳	1ed7955764	feat: 发票登记选票暂存展示且确认后才保存推送	2026-11-02 18:10:53 +08:00
刘泉佳	daab1001db	fix: 付款管理批量同步增加遮罩并统一金蝶接口30s超时常量	2026-11-02 17:15:50 +08:00
刘泉佳	f5735e6bad	fix: 收票登记提交返回列表后刷新列表数据	2026-11-02 16:36:00 +08:00
刘泉佳	bd9da83175	feat: 发票登记弹窗回显已认领收票单并补齐结算基本信息	2026-11-02 16:13:00 +08:00
刘泉佳	b59e43c9b7	feat: 认领收票单候选弹窗改为分页并悬浮展示推送失败原因	2026-11-02 16:12:52 +08:00
刘泉佳	eae50ab909	feat: 发票登记移至工具栏并回显已认领收票单	2026-11-02 15:39:26 +08:00
b2894lxlx	8e1430491b	✨ 项目提交MK传projectType，并修复已撤回再提交 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 14:28:07 +08:00
b2894lxlx	9fed3785d9	⚡ 流程配置取消默认按当前用户部门筛选 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 13:32:06 +08:00
b2894lxlx	eaf431819e	✨ 客商档案营业执照OCR改接新接口并回填字段 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 13:31:33 +08:00
刘泉佳	c7bd4461e2	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/20261030-kingdee-writeoff-status-web # Conflicts: # src/views/business/contract-manage.vue	2026-11-02 09:54:00 +08:00
刘泉佳	ab7491e6d6	feat: 收票登记表单去税率展示字段	2026-11-02 09:36:41 +08:00
刘泉佳	d78d100824	feat: 全额认领不再校验匹配金额合计上限	2026-10-31 16:52:22 +08:00
刘泉佳	9908b543ea	fix: 项目立项补充getRisk导入修复风险查询未定义	2026-10-31 16:37:01 +08:00
刘泉佳	46e7952e49	feat: 付款结算单选收票单全额认领并新增发票登记推送指定应付	2026-10-31 16:07:12 +08:00
刘泉佳	441d62a874	feat: 收票登记先票后款表单改造（手选结算组织/发票明细区块/去关联结算单）	2026-10-31 16:07:04 +08:00
刘泉佳	1a143aa05b	fix: 合同管理删除hcsRepush重复导入修复构建	2026-10-31 16:07:04 +08:00
刘泉佳	f3d69d7df0	fix: 代码合并报错	2026-10-31 15:38:27 +08:00
刘泉佳	cd58e8ebc7	Merge branch 'feature/20261027-hcs-bif-all-web-recBillSync' into feature/20261031-bfi-收票收款改造-web	2026-10-31 14:18:38 +08:00
刘泉佳	11d33df46a	Merge branch 'master' into feature/20261027-hcs-bif-all-web # Conflicts: # src/views/business/contract-manage.vue	2026-10-31 14:12:05 +08:00
刘泉佳	06de9477e5	feat: 客商收款信息开户行失焦匹配金蝶带出联行号并保存前校验 - 开户行 label 加问号提示，失焦调 A905-3 按行名精确匹配自动回填联行号，未命中提示检查 - 保存前按联行号校验金蝶档案，查不到拦截保存，接口异常提示稍后重试 - 回填后清除联行号字段残留校验提示	2026-10-31 10:16:38 +08:00
刘泉佳	f7ee9273c6	feat: 合同与客商列表客商风险标签统一悬浮显示明细提示	2026-10-30 21:40:04 +08:00
刘泉佳	e0a420ad08	feat: 正式结算单列表新增金蝶冲销状态列 - 列表新增「金蝶冲销状态」单元格插槽：已同步显示已冲销/未冲销/未校验标签，未同步显示 - - 新增 kingdeeWriteOffStatusOptions 选项与 kingdeeWriteOffTagType 颜色映射	2026-10-30 21:23:53 +08:00
刘泉佳	8388904916	fix: 合同列表客商风险列排序调整至签约类型之后	2026-10-30 21:02:27 +08:00
刘泉佳	24fec3c7d7	fix: 客商风险按编号查询透传客商名称	2026-10-30 20:53:41 +08:00
刘泉佳	b76ada9d6c	fix: 修改信用代码时同步清空客商名称下风险提示	2026-10-30 20:53:22 +08:00
刘泉佳	2083754b16	feat: 新增客商填写信用代码后即时回显金蝶供应商编码	2026-10-30 20:41:26 +08:00
刘泉佳	3df09d7d45	feat: 客商页面新增供应商编码展示	2026-10-30 20:34:25 +08:00
刘泉佳	b878bc356e	fix: 付款页风险客商提示改用后端明细去除重复等级黑名单前缀	2026-10-30 20:20:23 +08:00
刘泉佳	d76977c07c	fix: 新增客商档案风险提示按等级与黑名单细分并优先按编号查询	2026-10-30 20:09:57 +08:00
b2894lxlx	d95163663b	✨ immediate-enabled关闭时隐藏项目/合同推送合规入口 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 16:34:45 +08:00
刘泉佳	e95151ad51	feat: 合同列表新增客商风险列并抽取风险标签公共展示方法（客商页复用）	2026-10-30 14:41:49 +08:00
刘泉佳	5351911d50	refactor: 合同侧黑名单状态字段改kingdeeBlackStatus（与后端列名统一）	2026-10-30 14:10:30 +08:00
刘泉佳	e602eecee8	fix: 客商列表黑名单标签判定改为仅金蝶黑名单命中（与后端口径一致）	2026-10-30 13:42:20 +08:00
刘泉佳	70801096dd	feat: 付款/收款结算单查看页面新增同步金蝶按钮，单张推送并提示结果与异常原因	2026-10-30 12:21:16 +08:00
刘泉佳	025cba317d	fix: 修复客商档案清空客商风险后仍按上次条件查询 Avue 搜索事件只回传非空筛选项，被清空的字段不会出现在参数里，与上一次查询条件合并会保留旧值，改为点击查询时整体重建查询条件。	2026-10-30 12:12:57 +08:00
b2894lxlx	5ce91ec5d5	🐛 总单选址弹窗固定label宽度，并兼容运输类型非字符串 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 11:47:51 +08:00
刘泉佳	26140aecb9	refactor: 客商列表风险筛选项改为纯字典加载（customer_risk）去除硬编码兜底	2026-10-30 11:47:37 +08:00
b2894lxlx	8d85311bb3	✨ 司机身份证OCR支持正反面识别并回填有效期 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 11:47:21 +08:00
刘泉佳	8b2fa09cb9	fix: 客商列表风险列加宽至150适配组合文案	2026-10-30 11:46:07 +08:00
刘泉佳	4d78466824	fix: 客商列表风险列黑名单与任意等级组合展示（如低风险、黑名单）	2026-10-30 11:44:55 +08:00
b2894lxlx	fe4255c59b	🐛 修复正式结算旧路径空白，按单号跳转付款/收款列表 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 11:40:32 +08:00
刘泉佳	c6c7c80d97	feat: 客商列表风险列内部组织客商默认无风险并组合展示高风险与黑名单	2026-10-30 11:35:46 +08:00
刘泉佳	3397bd6a7b	feat: 客商列表风险列改读落库字段并支持字典筛选与后台明细悬浮展示	2026-10-30 11:33:38 +08:00
b2894lxlx	083d954765	🐛 放开本账号运单复制，并避免总单选地址时提前校验 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 22:44:01 +08:00
刘泉佳	4b060fc045	feat: 开票申请查看展示每张发票金蝶开票状态与结果备注	2026-10-29 18:31:35 +08:00
b2894lxlx	185a0f9aec	Merge remote-tracking branch 'websoft/dev'	2026-10-29 14:05:12 +08:00
b2894lxlx	a528788409	🐛 修复总单地址回填、结算费用英文项与项目部门提示常用地址级联回填不再误清空；预结算/正式结算过滤 freightJson 杂项；项目查看态业务部门/平台公司支持悬停完整信息。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 14:04:55 +08:00
weicw	72471f48de	🔧 类型检查改用 jsconfig 并锁定 TypeScript 5.9，恢复 vue-tsc 可用	2026-10-29 09:45:31 +08:00
weicw	415e1fd58d	✨ 维修记录列表展示关联运单与关联异常	2026-10-29 08:58:21 +08:00
weicw	114c2fd2af	🔀 合并主干 master 到 dev	2026-10-29 00:16:39 +08:00
weicw	9a603a3796	🔀 合并 master 回 dev，追平 HCS/BFI 与项目变更菜单	2026-10-27 17:44:08 +08:00