⚡ 用户OA同步提示改为工号账号规则

Co-authored-by: Cursor <cursoragent@cursor.com>
✨ 合同变更页支持编辑负责部门与平台公司
2026-11-11 01:13:33 +08:00 · 2026-11-11 01:13:33 +08:00 · 2026-11-11 01:09:35 +08:00 · 2026-11-10 17:45:21 +08:00 · 2026-11-10 17:22:50 +08:00 · 2026-11-10 17:22:50 +08:00
101 changed files with 7806 additions and 2341 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,
  });

@@ -95,3 +95,5 @@ export const exportImportFailures = data =>
  });
 export const confirmImport = data =>
  request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });
+export const checkImportDuplicates = data =>
+  request({ url: `${baseUrl}/import-batch/duplicates`, method: 'post', data, timeout: 120000 });
@@ -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,22 @@ 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 });
+// 付款记录付款凭证下载（后端代理 A801-2 流式回源），耗时较普通接口长，放宽到 120s
+export const downloadRecordVoucher = recordId =>
+  request({
+    url: `${baseUrl}/record/download-voucher`,
+    method: 'get',
+    params: { recordId },
+    responseType: 'blob',
+    timeout: 120000,
+  });

 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',
    },
  });
 };
@@ -1,8 +1,8 @@
 <template>
-  <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
-    <el-form :model="query" inline label-width="130px" @submit.prevent>
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
+    <el-form class="kingdee-pool-dialog__form" :model="query" inline label-position="right" label-width="120px" @submit.prevent>
      <el-form-item label="发票号码">
-        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.invoiceNo" clearable placeholder="请输入" @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="开票日期">
        <el-date-picker
@@ -10,15 +10,16 @@
          type="daterange"
          value-format="YYYY-MM-DD"
          format="YYYY-MM-DD"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          range-separator="-"
+          start-placeholder="请选择"
+          end-placeholder="请选择"
        />
      </el-form-item>
      <el-form-item label="开票单位">
-        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="受票单位">
-        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="开票单位（销方）">
        <el-select
@@ -93,6 +94,9 @@
      <el-form-item>
        <el-button :disabled="loading" @click="resetQuery">重置</el-button>
        <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
+        <el-tooltip content="按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找" placement="top">
+          <el-icon class="kingdee-pool-dialog__query-tip"><QuestionFilled /></el-icon>
+        </el-tooltip>
      </el-form-item>
    </el-form>
    <el-table
@@ -101,7 +105,7 @@
      :data="rows"
      :row-key="rowKey"
      border
-      height="520"
+      max-height="50vh"
      :highlight-current-row="!multiple"
      @selection-change="selection => (selected = selection)"
      @row-dblclick="handleRowDblclick"
@@ -118,6 +122,7 @@
          </el-radio>
        </template>
      </el-table-column>
+      <el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
      <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
@@ -172,8 +177,8 @@
        </template>
      </el-table-column>
    </el-table>
-    <div class="kingdee-pool-dialog__pager">
-      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+    <div class="kingdee-pool-dialog__pagination">
+      <span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
      <el-pagination
        v-model:current-page="page.current"
        v-model:page-size="page.size"
@@ -323,6 +328,9 @@ export default {
      this.page.current = 1;
      this.load();
    },
+    indexMethod(index) {
+      return (this.page.current - 1) * this.page.size + index + 1;
+    },
    resetQuery() {
      this.query = this.emptyQuery();
      this.handleQuery();
@@ -420,15 +428,28 @@ export default {
 </script>

 <style lang="scss" scoped>
-.kingdee-pool-dialog__pager {
+.kingdee-pool-dialog__form {
+  margin-bottom: 16px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+.kingdee-pool-dialog__pagination {
  display: flex;
  align-items: center;
  justify-content: space-between;
-  margin-top: 12px;
+  padding: 16px 0;
  gap: 16px;
 }
-.kingdee-pool-dialog__pager-tip {
+.kingdee-pool-dialog__pagination-tip {
  color: #909399;
  font-size: 12px;
+  white-space: nowrap;
+}
+.kingdee-pool-dialog__query-tip {
+  margin-left: 8px;
+  color: #909399;
+  cursor: pointer;
 }
 </style>
@@ -1,4 +1,4 @@
-import { getDeptTree } from '@/api/system/dept';
+import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
 import { ElCascader } from 'element-plus';
 import { h } from 'vue';

@@ -14,6 +14,10 @@ import { h } from 'vue';
 *   3. 在 created / 初始化时调用 this.loadOrganizationOptions()
 *   4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
 *      该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
+ *   5. 表单「所属组织」只允许选平台公司的页面（运力管理）在 data 里置
+ *      restrictFormOrgToPlatformCompany: true，表单级联样式改用
+ *      buildFormOrganizationTree(...) 的结果，并在打开表单时把回显的组织名写进
+ *      formOrganizationLegacyName；只影响表单，搜索栏仍是全量组织
 *
 * 说明：
 *   - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
@@ -34,6 +38,11 @@ const ORG_PROPS = ['organizationName', 'deptName'];
 // 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
 const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';

+// 表单「所属组织」限定只能选平台公司时，存量记录里的旧组织名在组织树里已经找不到
+// （节点被删或改名），用这个 id 补一个只读节点，否则编辑老数据时所属组织显示为空、
+// 保存即把原值丢掉。
+const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__';
+
 export default {
  data() {
    return {
@@ -44,6 +53,14 @@ export default {
      organizationLoading: false,
      // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
      enableUnassignedOrgFilter: false,
+      // 表单「所属组织」是否只允许选平台公司；页面在 data 里覆盖为 true 才生效
+      restrictFormOrgToPlatformCompany: false,
+      // 平台公司部门 id（字符串），loadOrganizationOptions 时一并拉取
+      platformCompanyOrgIds: [],
+      // 表单当前回显的组织名，树里没有同名节点时用它补一个只读选项
+      formOrganizationLegacyName: '',
+      // 进行中的组织数据请求，并发调用共用（不是响应式状态，只做去重）
+      organizationOptionsPromise: null,
    };
  },
  computed: {
@@ -54,9 +71,12 @@ export default {
        ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
        : this.organizationTreeOptions;
    },
-    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
+    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级。
+    // 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点
+    // 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效，
+    // 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。
    organizationCascaderProps() {
-      return {
+      const props = {
        value: 'id',
        label: 'label',
        children: 'children',
@@ -64,15 +84,25 @@ export default {
        checkStrictly: true,
        expandTrigger: 'click',
      };
+      if (this.restrictFormOrgToPlatformCompany) {
+        props.disabled = data => this.platformCompanyOrgDisabled(data);
+      }
+      return props;
    },
  },
  methods: {
    loadOrganizationOptions() {
-      if (this.organizationLoading) return;
+      // 并发调用共用同一次请求，返回的 Promise 在数据就绪后才 resolve
+      if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
      this.organizationLoading = true;
      const tenantId = this.userInfo?.tenantId;
-      getDeptTree(tenantId)
-        .then(res => {
+      // 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围
+      const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
+        ? getPlatformCompanySelect().catch(() => null)
+        : Promise.resolve(null);
+      this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest])
+        .then(([res, platformRes]) => {
+          this.applyPlatformCompanyOptions(platformRes);
          const source = res.data?.data || res.data || [];
          const tree = this.excludeExternalOrganization
            ? this.excludeExternalOrganization(source)
@@ -90,7 +120,21 @@ export default {
        })
        .finally(() => {
          this.organizationLoading = false;
+          this.organizationOptionsPromise = null;
        });
+      return this.organizationOptionsPromise;
+    },
+    // 组织树与平台公司列表就绪后执行回调；已加载过则立即执行
+    whenOrganizationOptionsReady(callback) {
+      const pending = this.organizationTreeFlatOptions.length
+        ? Promise.resolve()
+        : this.loadOrganizationOptions();
+      return Promise.resolve(pending).then(callback, () => callback());
+    },
+    applyPlatformCompanyOptions(res) {
+      if (!res) return;
+      const list = res.data?.data || res.data || [];
+      this.platformCompanyOrgIds = (Array.isArray(list) ? list : []).map(item => String(item.id));
    },
    // 默认排除「外部组织」节点；页面可覆盖
    excludeExternalOrganization(tree = []) {
@@ -143,7 +187,9 @@ export default {
      for (const node of tree || []) {
        const path = [...parents, String(node.id)];
        if (String(node.id) === String(target)) return path;
-        const matched = this.findOrgPath(target, node.children, path);
+        // 必须显式传 node.children || []：叶节点的 children 是 undefined，
+        // 传 undefined 会触发默认参数重新拿到整棵树，逐层重复扫描直到爆栈
+        const matched = this.findOrgPath(target, node.children || [], path);
        if (matched) return matched;
      }
      return null;
@@ -152,6 +198,52 @@ export default {
    findOrgName(id) {
      return this.findOrgById(id)?.rawLabel || '';
    },
+    // 级联节点的 disabled 判定：只有平台公司可选。页面自建 props 时也复用它
+    platformCompanyOrgDisabled(data) {
+      return !this.platformCompanyOrgIds.includes(String(data?.id ?? ''));
+    },
+    // 组织名对应的节点是否为平台公司；名称在树里不存在时按「不是」处理
+    isPlatformCompanyOrgName(name) {
+      const value = String(name ?? '').trim();
+      if (!value) return false;
+      const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
+      return !!node && this.platformCompanyOrgIds.includes(String(node.id));
+    },
+    // 新增表单的默认组织：只有落在平台公司上才预填，否则留空（不能让用户从默认值
+    // 直接带出一个选不中的组织名）
+    defaultFormOrganizationName(name) {
+      return this.isPlatformCompanyOrgName(name) ? String(name).trim() : '';
+    },
+    // 表单级联的选项树：限定平台公司时，把回显的原组织名补成一个只读节点，
+    // 否则存量记录的组织在树里找不到，编辑时显示为空、保存即丢原值
+    buildFormOrganizationTree(tree = this.organizationTreeOptions) {
+      const source = tree || [];
+      if (!this.restrictFormOrgToPlatformCompany) return source;
+      const name = String(this.formOrganizationLegacyName || '').trim();
+      if (!name) return source;
+      if (this.organizationTreeFlatOptions.some(item => item.rawLabel === name)) return source;
+      return [...source, { id: FORM_LEGACY_ORG_ID, label: name, rawLabel: name }];
+    },
+    // 表单级联回显用的路径：树里有该组织就用真实路径，否则落到原组织兜底节点
+    resolveFormOrgPath(name) {
+      const path = this.resolveOrgPath(name);
+      if (path.length) return path;
+      const value = String(name ?? '').trim();
+      if (!value) return [];
+      return value === String(this.formOrganizationLegacyName || '').trim()
+        ? [FORM_LEGACY_ORG_ID]
+        : [];
+    },
+    // 记录表单当前回显的组织名：能匹配真实节点（或已清空）就不需要兜底节点，
+    // 否则记下来，由 buildFormOrganizationTree 补成只读选项
+    syncFormOrganizationLegacy(name) {
+      const value = String(name ?? '').trim();
+      if (!value || this.organizationTreeFlatOptions.some(item => item.rawLabel === value)) {
+        this.formOrganizationLegacyName = '';
+        return;
+      }
+      this.formOrganizationLegacyName = value;
+    },
    // 组织名称 → 级联路径（表单回显用；部门树异步加载完成后会自动重算）
    resolveOrgPath(name) {
      const value = String(name ?? '').trim();
@@ -164,7 +256,13 @@ export default {
      const value = Array.isArray(path)
        ? path.filter(item => item !== undefined && item !== null && item !== '')
        : [];
-      return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
+      if (!value.length) return '';
+      const node = this.findOrgById(value);
+      if (node) return node.rawLabel || '';
+      // 原组织兜底节点不在扁平表里，直接取它代表的历史名称
+      return String(value[value.length - 1]) === FORM_LEGACY_ORG_ID
+        ? String(this.formOrganizationLegacyName || '').trim()
+        : '';
    },
    // 搜索提交前把级联路径数组就地转成组织名称（后端按名称过滤）
    normalizeOrganizationSearch(params, prop = 'organizationName') {
@@ -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,11 +249,22 @@ export const option = createCrudOption([
    hide: true,
    labelWidth: 0,
  },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 14,
+    searchPlaceholder: '请输入甲/乙方名称',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+  },
  {
    label: '合同编号',
    prop: 'contractNo',
    search: true,
-    searchOrder: 6,
+    searchOrder: 8,
    searchPlaceholder: '请输入',
    order: 185,
    maxlength: 100,
@@ -264,7 +277,7 @@ export const option = createCrudOption([
    align: 'left',
    headerAlign: 'left',
    search: true,
-    searchOrder: 7,
+    searchOrder: 1,
    searchPlaceholder: '请输入',
    order: 180,
    slot: true,
@@ -276,7 +289,7 @@ export const option = createCrudOption([
    label: '所属项目',
    prop: 'projectName',
    search: true,
-    searchOrder: 8,
+    searchOrder: 11,
    searchType: 'select',
    searchPlaceholder: '请选择',
    formslot: true,
@@ -311,12 +324,19 @@ export const option = createCrudOption([
    minWidth: 150,
    rules: selectRule('合同负责部门'),
  },
+  {
+    label: '平台公司',
+    prop: 'platformCompanyName',
+    minWidth: 180,
+    order: 115,
+    display: false,
+  },
  {
    label: '合同类别',
    prop: 'contractCategory',
    type: 'select',
    search: true,
-    searchOrder: 9,
+    searchOrder: 12,
    searchPlaceholder: '请选择',
    order: 170,
    dicData: contractCategoryOptions,
@@ -328,7 +348,7 @@ export const option = createCrudOption([
    prop: 'signType',
    type: 'select',
    search: true,
-    searchOrder: 10,
+    searchOrder: 13,
    searchPlaceholder: '请选择',
    span: 8,
    order: 190,
@@ -337,11 +357,11 @@ export const option = createCrudOption([
    rules: selectRule('签约类型'),
  },
  {
-    label: '生效类型',
+    label: '合同状态',
    prop: 'effectiveType',
    type: 'select',
    search: true,
-    searchOrder: 5,
+    searchOrder: 6,
    searchPlaceholder: '请选择',
    dicData: effectiveTypeOptions,
    hide: true,
@@ -350,24 +370,23 @@ export const option = createCrudOption([
  {
    label: '甲方',
    prop: 'partyA',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 160,
-    filterable: true,
    minWidth: 160,
-    rules: selectRule('甲方'),
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '乙方',
    prop: 'partyB',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 150,
-    filterable: true,
    minWidth: 160,
-    rules: selectRule('乙方'),
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '丙方',
+    prop: 'partyC',
+    minWidth: 160,
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '合同期限',
@@ -613,7 +632,7 @@ export const option = createCrudOption([
    prop: 'hcsSyncStatus',
    type: 'select',
    search: true,
-    searchOrder: 6,
+    searchOrder: 7,
    searchPlaceholder: '请选择',
    slot: true,
    dicData: hcsSyncStatusOptions,
@@ -621,6 +640,15 @@ export const option = createCrudOption([
    addDisplay: false,
    editDisplay: false,
  },
+  {
+    label: '客商风险',
+    prop: 'customerRisk',
+    slot: true,
+    order: 189,
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
  {
    label: '金蝶合同ID',
    prop: 'kingdeeId',
@@ -634,7 +662,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 7,
+    searchOrder: 9,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -646,7 +674,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 8,
+    searchOrder: 10,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -7,7 +7,8 @@ import {

 export const changeTypeOptions = [
  { label: '项目变更', value: '项目变更' },
-  { label: '项目备案调整', value: '项目备案调整' },
+  { label: '项目备案流程（本部流程）', value: '项目备案流程（本部流程）' },
+  { label: '项目备案流程（运输部流程）', value: '项目备案流程（运输部流程）' },
 ];

 export const config = {
@@ -85,13 +85,6 @@ export const config = {
      status: ['draft', 'withdrawn', 'rejected'],
      permission: 'temporary_credit_limit_submit',
    },
-    {
-      action: 'flow',
-      label: '流程',
-      statusProp: 'approvalStatus',
-      status: ['reviewing'],
-      permission: 'temporary_credit_limit_view',
-    },
    {
      action: 'withdraw',
      label: '撤回',
@@ -99,6 +92,14 @@ export const config = {
      status: ['reviewing'],
      permission: 'temporary_credit_limit_withdraw',
    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'temporary_credit_limit_approve',
+      mkOnly: true,
+    },
    {
      action: 'approve',
      label: '审批通过',
@@ -106,6 +107,7 @@ export const config = {
      statusProp: 'approvalStatus',
      status: ['reviewing'],
      permission: 'temporary_credit_limit_approve',
+      localOnly: true,
    },
    {
      action: 'reject',
@@ -114,6 +116,7 @@ export const config = {
      statusProp: 'approvalStatus',
      status: ['reviewing'],
      permission: 'temporary_credit_limit_reject',
+      localOnly: true,
    },
  ],
 };
@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
  const text = Object.entries(groups)
    .map(([unit, group]) => {
      const quantity = formatGoodsQuantity(group.quantity);
-      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
+      const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+      return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
    })
    .join('； ');

@@ -207,6 +208,9 @@ export const config = {
  transportPlanImportTitle: '导入运输计划',
  transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
  attachmentTitle: '附件',
+  defaultForm: {
+    transportType: 'road',
+  },
  searchRangeMap: {
    planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
    createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
@@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [
  { prop: 'createUserName', label: '创建人', minWidth: 110 },
  { prop: 'createTime', label: '创建时间', minWidth: 170 },
  { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true },
  { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];
@@ -1,14 +1,11 @@
 /**
 * 付款申请列表（avue-crud）配置
 * ------------------------------------------------------------------
- * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
- * 表格卡片切换）由 avue-crud 自带，不做二次封装。
+ * 列表页与其它模块统一使用 avue-crud，头部按钮（刷新 / 列显隐 / 表格卡片切换）
+ * 由 avue-crud 自带，不做二次封装。
 *
- * 搜索项与表格列 label 不一致的（如表格列「收款方」/ 搜索项「客户名称」），
- * 单独定义一个 hide 的搜索列，并用 searchProp 映射到后端字段。
- *
- * ⚠️ avue 的 searchOrder 为降序排序，值越大越靠前（见 header-search2.js：
- * `list.sort((a, b) => (b.searchOrder || 0) - (a.searchOrder || 0))`）。
+ * 搜索栏与应收/应付明细等页面统一为页面级手写搜索区（见 payment-application.vue），
+ * 此处只保留表格列配置。
 */

 const textFormatter = (row, value) =>
@@ -16,46 +13,10 @@ const textFormatter = (row, value) =>

 const moneyFormatter = (row, value) => Number(value || 0).toFixed(2);

-// 仅用于搜索、不在表格中出现的列
-const searchOnlyColumn = ({ label, prop, searchOrder, searchProp, dicData }) => {
-  const column = {
-    label,
-    prop,
-    search: true,
-    searchOrder,
-    searchPlaceholder: '请输入',
-    hide: true,
-    showColumn: false,
-    addDisplay: false,
-    editDisplay: false,
-    viewDisplay: false,
-  };
-  if (searchProp) column.searchProp = searchProp;
-  if (dicData) {
-    column.type = 'select';
-    column.searchPlaceholder = '请选择';
-    column.dicData = dicData;
-  }
-  return column;
-};
-
-export const paymentApplicationOption = ({
-  paymentTypeOptions = [],
-  approvalStatusOptions = [],
-  kingdeeStatusOptions = [],
-} = {}) => ({
+export const paymentApplicationOption = () => ({
  height: 'auto',
  calcHeight: 32,
  tip: false,
-  searchBtnText: '查询',
-  emptyBtnText: '重置',
-  searchShow: true,
-  searchIcon: true,
-  searchLabelWidth: 88,
-  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
-  searchMenuSpan: 4,
-  searchIndex: 4,
-  searchMenuPosition: 'right',
  border: true,
  index: true,
  indexLabel: '序号',
@@ -73,84 +34,11 @@ export const paymentApplicationOption = ({
  menuFixed: 'right',
  dialogClickModal: false,
  column: [
-    // ---------- 搜索项（前 4 项默认展示，其余折叠；searchOrder 越大越靠前） ----------
-    {
-      label: '单据号',
-      prop: 'paymentNo',
-      slot: true,
-      search: true,
-      searchSpan: 5,
-      searchOrder: 9,
-      searchPlaceholder: '请输入',
-      minWidth: 150,
-    },
-    {
-      label: '日期',
-      prop: 'applyDateRange',
-      type: 'daterange',
-      searchType: 'daterange',
-      search: true,
-      searchSpan: 5,
-      searchOrder: 8,
-      hide: true,
-      showColumn: false,
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: false,
-    },
-    {
-      ...searchOnlyColumn({
-        label: '客户名称',
-        prop: 'payeeNameSearch',
-        searchOrder: 7,
-        searchProp: 'payeeName',
-      }),
-      searchSpan: 5,
-    },
-    {
-      ...searchOnlyColumn({
-        label: '项目名称',
-        prop: 'projectNameSearch',
-        searchOrder: 6,
-        searchProp: 'projectName',
-      }),
-      searchSpan: 5,
-    },
-    searchOnlyColumn({
-      label: '关联结算单',
-      prop: 'settlementNo',
-      searchOrder: 4,
-    }),
-    searchOnlyColumn({
-      label: '付款类型',
-      prop: 'paymentType',
-      searchOrder: 3,
-      dicData: paymentTypeOptions,
-    }),
-    searchOnlyColumn({
-      label: '审核状态',
-      prop: 'approvalStatus',
-      searchOrder: 2,
-      dicData: approvalStatusOptions,
-    }),
-    searchOnlyColumn({
-      label: '金蝶单据状态',
-      prop: 'kingdeeStatus',
-      searchOrder: 1,
-      dicData: kingdeeStatusOptions,
-    }),
    // ---------- 表格列 ----------
+    { label: '单据号', prop: 'paymentNo', slot: true, minWidth: 150 },
    { label: '付款类型', prop: 'paymentTypeName', minWidth: 110, formatter: textFormatter },
    { label: '所属项目', prop: 'projectName', minWidth: 140, formatter: textFormatter },
-    {
-      label: '所属组织',
-      prop: 'deptName',
-      search: true,
-      searchOrder: 5,
-      searchslot: true,
-      minWidth: 120,
-      formatter: textFormatter,
-    },
+    { label: '所属组织', prop: 'deptName', minWidth: 120, formatter: textFormatter },
    { label: '合同编号', prop: 'contractNo', minWidth: 130, formatter: textFormatter },
    { label: '合同名称', prop: 'contractName', minWidth: 140, formatter: textFormatter },
    { label: '付款方', prop: 'payerName', minWidth: 130, formatter: textFormatter },
@@ -170,6 +58,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 },
  ],
@@ -1,21 +1,20 @@
 /**
 * 正式结算单列表（avue-crud）配置
 * ------------------------------------------------------------------
- * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
- * 显示方式）由 avue-crud 自带，不做二次封装。
+ * 列表页与其它模块统一使用 avue-crud，头部按钮（刷新 / 列显隐 / 显示方式）
+ * 由 avue-crud 自带，不做二次封装。
+ *
+ * 搜索栏与应收/应付明细页统一为页面级手写搜索区（见 formal-settlement.vue），
+ * 此处只保留表格列配置。
 *
 * 表格列复用 formalSettlementTable.js 的 formalSettlementTableColumns（与弹窗内
- * 明细表共用同一份列定义），此处只补充 avue 需要的展示/搜索属性，避免两处维护。
- *
- * ⚠️ searchOrder 为降序排序，值越大越靠前。
- * ⚠️ 仅用于搜索的列必须 hide + showColumn: false，否则会混进「列显隐」抽屉。
- * ⚠️ column 数组顺序 = 表格列顺序，搜索专用列统一放在数组最前面。
+ * 明细表共用同一份列定义），此处只补充 avue 需要的展示属性，避免两处维护。
 */

+import { formatSealTypes } from '@/utils/settlement-seal';
 import {
-  approvalStatusOptions,
-  invoiceStatusOptions,
  kingdeeSyncStatusOptions,
+  kingdeeWriteOffStatusOptions,
  paymentStatusOptions,
 } from './formalSettlementSearch';
 import { formalSettlementTableColumns } from './formalSettlementTable';
@@ -23,6 +22,8 @@ import { formalSettlementTableColumns } from './formalSettlementTable';
 const textFormatter = (row, value) =>
  value === null || value === undefined || value === '' ? '-' : value;

+const sealTypesFormatter = (row, value) => formatSealTypes(value) || '-';
+
 /** 金额统一展示：两位小数 + 币种 */
 const moneyFormatter = (row, value) =>
  `${Number(value || 0).toFixed(2)} ${row?.currency || 'RMB'}`;
@@ -30,69 +31,37 @@ const moneyFormatter = (row, value) =>
 const pickLabel = (options, value) =>
  options.find(item => item.value === value)?.label || value || '-';

-const searchOnlyColumn = ({ label, prop, searchOrder, type = 'input', dicData }) => {
-  const column = {
-    label,
-    prop,
-    search: true,
-    searchOrder,
-    searchSpan: 5,
-    hide: true,
-    showColumn: false,
-    addDisplay: false,
-    editDisplay: false,
-    viewDisplay: false,
-  };
-  if (type === 'select') {
-    column.type = 'select';
-    column.searchPlaceholder = '请选择';
-    column.dicData = dicData || [];
-  } else if (type === 'daterange') {
-    column.type = 'daterange';
-    column.searchType = 'daterange';
-    column.searchPlaceholder = '请选择';
-  } else {
-    column.searchPlaceholder = '请输入';
-  }
-  return column;
-};
-
-/** 表格列的 avue 增量配置：搜索项、插槽、覆盖宽度等 */
+/** 表格列的 avue 增量配置：插槽、覆盖宽度等 */
 const COLUMN_EXTRA = {
-  formalSettlementNo: {
-    slot: true,
-    search: true,
-    searchSpan: 5,
-    searchOrder: 12,
-    searchPlaceholder: '请输入',
-  },
-  payerName: { search: true, searchSpan: 5, searchOrder: 7, searchPlaceholder: '请输入' },
-  payeeName: { search: true, searchSpan: 5, searchOrder: 6, searchPlaceholder: '请输入' },
-  projectName: { search: true, searchSpan: 5, searchOrder: 11, searchPlaceholder: '请输入' },
-  deptName: { search: true, searchslot: true, searchSpan: 5, searchOrder: 10 },
-  contractNo: { search: true, searchSpan: 5, searchOrder: 9, searchPlaceholder: '请输入' },
+  formalSettlementNo: { slot: true },
+  sealTypes: { formatter: sealTypesFormatter },
  invoiceStatusName: { slot: true },
  paymentStatusName: { slot: true },
  approvalStatusName: { slot: true },
  adjustFlag: {
    formatter: row => row.adjustStatusName || (row.originFormalSettlementNo ? '调整后单' : '-'),
  },
-  kingdeeSyncStatus: {
-    slot: true,
-    search: true,
-    type: 'select',
-    dicData: kingdeeSyncStatusOptions,
-    searchSpan: 5,
-    searchOrder: 2,
-    searchPlaceholder: '请选择',
-  },
+  kingdeeSyncStatus: { slot: true },
  kingdeeLockStatus: { slot: true },
+  kingdeeWriteOffStatus: { slot: true },
+  kingdeeAssignStatus: { slot: true },
  createTime: { width: 180 },
 };

-const buildTableColumns = () =>
-  formalSettlementTableColumns.map(column => {
+/** 收款/付款结算单按结算类型展示各自标签 */
+const PAYMENT_FIELD_LABELS = {
+  paidAmount: { payable: '已付合计（含预付）', receivable: '已收合计（含预付）' },
+  paymentStatusName: { payable: '付款状态', receivable: '收款状态' },
+};
+
+// 已指定应付仅付款结算单（先票后款 A302-6）有，收款结算单不展示
+const buildTableColumns = settlementType =>
+  formalSettlementTableColumns
+    .filter(column => !(settlementType === 'receivable' && column.prop === 'kingdeeAssignStatus'))
+    .map(column => {
      const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
+      const label = PAYMENT_FIELD_LABELS[column.prop]?.[settlementType];
+      if (label) extra.label = label;
      if (column.money) {
        extra.formatter = moneyFormatter;
        extra.align = 'right';
@@ -104,19 +73,10 @@ const buildTableColumns = () =>
      return { ...column, ...extra };
    });

-export const formalSettlementOption = () => ({
+export const formalSettlementOption = (settlementType = '') => ({
  height: 'auto',
  calcHeight: 32,
  tip: false,
-  searchBtnText: '查询',
-  emptyBtnText: '重置',
-  searchShow: true,
-  searchIcon: true,
-  searchLabelWidth: 88,
-  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
-  searchMenuSpan: 4,
-  searchIndex: 4,
-  searchMenuPosition: 'right',
  border: true,
  index: true,
  indexLabel: '序号',
@@ -131,44 +91,10 @@ export const formalSettlementOption = () => ({
  editBtn: false,
  menuWidth: 320,
  menuFixed: 'right',
-  column: [
-    // ---------- 仅搜索列 ----------
-    searchOnlyColumn({
-      label: '预付结算单号',
-      prop: 'preSettlementNo',
-      searchOrder: 8,
-    }),
-    searchOnlyColumn({
-      label: '发票状态',
-      prop: 'invoiceStatus',
-      searchOrder: 5,
-      type: 'select',
-      dicData: invoiceStatusOptions,
-    }),
-    searchOnlyColumn({
-      label: '收付款状态',
-      prop: 'paymentStatus',
-      searchOrder: 4,
-      type: 'select',
-      dicData: paymentStatusOptions,
-    }),
-    searchOnlyColumn({
-      label: '审核状态',
-      prop: 'approvalStatus',
-      searchOrder: 3,
-      type: 'select',
-      dicData: approvalStatusOptions,
-    }),
-    searchOnlyColumn({
-      label: '生成日期',
-      prop: 'createDateRange',
-      searchOrder: 1,
-      type: 'daterange',
-    }),
-    // ---------- 表格列（部分兼搜索项） ----------
-    ...buildTableColumns(),
-  ],
+  column: [...buildTableColumns(settlementType)],
 });

 export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
-export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);
+export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
+export const paymentStatusName = (value, settlementType) =>
+  pickLabel(paymentStatusOptions(settlementType), value);
@@ -10,6 +10,12 @@ export const formalSettlementFormFields = [
  { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
  { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
  { label: '运输方式', prop: 'transportType', type: 'select', optionsKey: 'transportTypeOptions' },
+  {
+    label: '用印类型',
+    prop: 'sealTypes',
+    type: 'multi-select',
+    optionsKey: 'sealTypeOptions',
+  },
  { label: '汇率日期', prop: 'exchangeRateDate', type: 'date', required: true },
  { label: '结算汇率', prop: 'exchangeRate', type: 'number', required: true },
  { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
@@ -29,6 +35,7 @@ export const createFormalSettlementForm = () => ({
  sourceDetailIds: [],
  businessModel: '',
  transportType: '',
+  sealTypes: [],
  exchangeRateDate: '',
  exchangeRate: 1,
  createUserName: '',
@@ -6,27 +6,28 @@ export const approvalStatusOptions = [
  { label: '已作废', value: 'voided' },
 ];

-export const invoiceStatusOptions = [
-  { label: '未开/收票', value: 'unreceived' },
-  { label: '部分开/收票', value: 'partial' },
-  { label: '已开/收票', value: 'completed' },
+/** 发票状态选项按结算类型区分：付款结算单=收票方向，收款结算单=开票方向 */
+export const invoiceStatusOptions = (settlementType = '') => {
+  const received = settlementType === 'payable';
+  return [
+    { label: received ? '未收票' : '未开票', value: 'unreceived' },
+    { label: received ? '部分收票' : '部分开票', value: 'partial' },
+    { label: received ? '已收票' : '已开票', value: 'completed' },
  ];
-
-export const invoiceStatusName = (value, settlementType) => {
-  const payable = settlementType === 'payable';
-  const labels = {
-    unreceived: payable ? '未收票' : '未开票',
-    partial: payable ? '部分收票' : '部分开票',
-    completed: payable ? '已收票' : '已开票',
-  };
-  return labels[value] || value || '-';
 };

-export const paymentStatusOptions = [
-  { label: '未收/付款', value: 'unpaid' },
-  { label: '部分收/付款', value: 'partial' },
-  { label: '已收/付款', value: 'paid' },
+export const invoiceStatusName = (value, settlementType) =>
+  invoiceStatusOptions(settlementType).find(item => item.value === value)?.label || value || '-';
+
+/** 收付款状态选项按结算类型区分：付款结算单=付款方向，收款结算单=收款方向 */
+export const paymentStatusOptions = (settlementType = '') => {
+  const suffix = settlementType === 'payable' ? '付款' : '收款';
+  return [
+    { label: `未${suffix}`, value: 'unpaid' },
+    { label: `部分${suffix}`, value: 'partial' },
+    { label: `已${suffix}`, value: 'paid' },
  ];
+};

 export const kingdeeSyncStatusOptions = [
  { label: '未同步', value: 'unsynced' },
@@ -34,22 +35,7 @@ export const kingdeeSyncStatusOptions = [
  { label: '同步失败', value: 'failed' },
 ];

-export const formalSettlementSearchFields = [
-  { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
-  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
-  { label: '项目', prop: 'projectName', type: 'input' },
-  { label: '所属组织', prop: 'deptName', type: 'cascader' },
-  { label: '合同编号', prop: 'contractNo', type: 'input' },
-  { label: '付款方', prop: 'payerName', type: 'input' },
-  { label: '收款方', prop: 'payeeName', type: 'input' },
-  { label: '发票状态', prop: 'invoiceStatus', type: 'select', options: invoiceStatusOptions },
-  { label: '收付款状态', prop: 'paymentStatus', type: 'select', options: paymentStatusOptions },
-  { label: '审核状态', prop: 'approvalStatus', type: 'select', options: approvalStatusOptions },
-  {
-    label: '金蝶单据状态',
-    prop: 'kingdeeSyncStatus',
-    type: 'select',
-    options: kingdeeSyncStatusOptions,
-  },
-  { label: '生成日期', prop: 'createDateRange', type: 'daterange' },
+export const kingdeeWriteOffStatusOptions = [
+  { label: '未冲销', value: 'unwrittenoff' },
+  { label: '已冲销', value: 'writtenoff' },
 ];
@@ -10,6 +10,7 @@ export const formalSettlementTableColumns = [
  { label: '原币结算金额', prop: 'settlementAmount', minWidth: 145, money: true },
  { label: '业务模式', prop: 'businessModelName', minWidth: 120 },
  { label: '运输方式', prop: 'transportTypeName', minWidth: 120 },
+  { label: '用印类型', prop: 'sealTypes', minWidth: 120 },
  { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 155, money: true },
  { label: '结算汇率', prop: 'exchangeRate', minWidth: 110 },
  { label: '申请付款金额（含预付）', prop: 'appliedPaymentAmount', minWidth: 185, money: true },
@@ -25,7 +26,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,12 +8,30 @@ 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' },
  { label: '运输方式', prop: 'transportType', type: 'select', optionsKey: 'transportTypeOptions' },
+  {
+    label: '用印类型',
+    prop: 'sealTypes',
+    type: 'multi-select',
+    optionsKey: 'sealTypeOptions',
+  },
  { label: '汇率日期', prop: 'exchangeRateDate', type: 'date' },
  { label: '结算汇率', prop: 'exchangeRate', type: 'number', class: 'exchange-rate-input' },
  { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
@@ -24,6 +42,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) => {
@@ -68,6 +88,7 @@ export const emptyPreSettlementForm = () => ({
  settlementAmount: 0,
  businessModel: '',
  transportType: '',
+  sealTypes: [],
  localCurrency: 'RMB',
  localSettlementAmount: 0,
  exchangeRateDate: '',
@@ -10,6 +10,7 @@ export const preSettlementTableColumns = [
  { label: '原币结算金额', prop: 'settlementAmount', minWidth: 140, money: true, precision: 2 },
  { label: '业务模式', prop: 'businessModelName', minWidth: 120 },
  { label: '运输方式', prop: 'transportTypeName', minWidth: 120 },
+  { label: '用印类型', prop: 'sealTypes', minWidth: 120 },
  { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 150, money: true, precision: 2 },
  { label: '结算汇率', prop: 'exchangeRate', minWidth: 110, precision: 2 },
  {
@@ -23,6 +23,7 @@ export const searchFields = [
  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
  { label: '正式结算单号', prop: 'formalSettlementNo', type: 'input' },
  { label: '批次号', prop: 'batchNo', type: 'input' },
+  { label: '运单号', prop: 'waybillNo', type: 'input' },
  { label: '车号', prop: 'vehicleNo', type: 'input' },
 ];

@@ -492,17 +492,35 @@ export const treeOption = {
  nodeKey: 'id',
  lazy: true,
  treeLoad: function (node, resolve) {
-    const parentId = node.level === 0 ? 0 : node.data.id;
-    getDeptLazyTree(parentId).then(res => {
-      resolve(
-        res.data.data.map(item => {
-          return {
+    const toTreeNode = item => ({
      ...item,
      leaf: !item.hasChildren,
-          };
-        })
-      );
    });
+    // 用户管理组织树从第二级开始展示：根层隐藏一级组织，直接展示其子节点
+    if (node.level === 0) {
+      getDeptLazyTree(0)
+        .then(res => {
+          const roots = res.data.data || [];
+          if (!roots.length) {
+            resolve([]);
+            return;
+          }
+          return Promise.all(roots.map(root => getDeptLazyTree(root.id))).then(childResults => {
+            const secondLevel = [];
+            childResults.forEach(childRes => {
+              (childRes.data.data || []).forEach(item => secondLevel.push(toTreeNode(item)));
+            });
+            resolve(secondLevel);
+          });
+        })
+        .catch(() => resolve([]));
+      return;
+    }
+    getDeptLazyTree(node.data.id)
+      .then(res => {
+        resolve((res.data.data || []).map(toTreeNode));
+      })
+      .catch(() => resolve([]));
  },
  addBtn: false,
  menu: false,
@@ -106,6 +106,17 @@ export default [
      bizType: 'project-change',
    },
  },
+  {
+    path: '/business/project-record-change/public-view',
+    name: '查看项目备案信息',
+    component: () => import('@/views/business/project-apply-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'project-record-change',
+    },
+  },
  {
    path: '/business/contract-manage/public-view',
    name: '查看合同信息',
@@ -194,6 +205,39 @@ export default [
      bizType: 'bill-payment',
    },
  },
+  {
+    path: '/business/temporary-credit-limit/public-view',
+    name: '查看临时额度申请信息',
+    component: () => import('@/views/business/temporary-credit-limit-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'temporary-credit-limit',
+    },
+  },
+  {
+    path: '/transportCapacity/cert-audit-driver/public-view',
+    name: '查看司机认证审核信息',
+    component: () => import('@/views/transportCapacity/cert-audit-driver-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'cert-audit-driver',
+    },
+  },
+  {
+    path: '/transportCapacity/cert-audit-vehicle/public-view',
+    name: '查看车辆认证审核信息',
+    component: () => import('@/views/transportCapacity/cert-audit-vehicle-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'cert-audit-vehicle',
+    },
+  },
  {
    path: '/',
    name: '主页',
@@ -104,6 +104,22 @@ export default [
      },
    ],
  },
+  {
+    // 兼容旧菜单路径：按 detailNo 解析应付/应收后跳转到拆分后的列表页
+    path: '/settlement/formal-settlement',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '正式结算单兼容跳转',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-redirect.vue')),
+      },
+    ],
+  },
  {
    path: '/settlement/formal-settlement/form',
    component: Layout,
@@ -113,7 +129,39 @@ export default [
        name: '新增编辑结算单',
        meta: {
          keepAlive: false,
-          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
+          // 付款结算单表单入口，高亮付款结算单菜单
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 收款结算单表单入口：与付款结算单共用表单组件，仅高亮菜单不同
+    path: '/settlement/receipt-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑收款结算单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/receipt-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 付款结算单表单入口：与 settlementListPath('payable') + '/form' 对应
+    path: '/settlement/payment-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑付款结算单',
+        meta: {
+          keepAlive: false,
          activeMenu: '/settlement/payment-settlement',
        },
        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
@@ -0,0 +1,39 @@
+/**
+ * 业务部门下拉规范化。
+ * rawLabel 保留原始部门名供落库；展示名优先追加所属公司，缺省时用上级组织。
+ *
+ * @param {Array} list 业务部门原始列表
+ * @param {{ alwaysShowCompany?: boolean }} [options]
+ *        alwaysShowCompany=true 时始终展示「部门（公司）」；默认仅同名时追加
+ */
+export function normalizeBusinessDeptOptions(list, options = {}) {
+  const alwaysShowCompany = !!options.alwaysShowCompany;
+  const source = Array.isArray(list) ? list : [];
+  const nameCount = {};
+  source.forEach(item => {
+    const name = String(item?.deptName || item?.fullName || '').trim();
+    if (!name) return;
+    nameCount[name] = (nameCount[name] || 0) + 1;
+  });
+  return source
+    .map(item => {
+      const id = item?.id == null || item?.id === '' ? '' : String(item.id);
+      if (!id) return null;
+      const rawLabel = item.deptName || item.fullName || id;
+      const companyName = String(item.belongCompanyName || item.parentName || '').trim();
+      const label =
+        companyName && (alwaysShowCompany || nameCount[rawLabel] > 1)
+          ? `${rawLabel}（${companyName}）`
+          : rawLabel;
+      return {
+        id,
+        value: id,
+        label,
+        rawLabel,
+        parentName: String(item.parentName || '').trim(),
+        belongCompanyName: String(item.belongCompanyName || '').trim(),
+        kingdeeDeptCode: item.kingdeeDeptCode || '',
+      };
+    })
+    .filter(Boolean);
+}
@@ -21,16 +21,17 @@ export const isKingdeePathAttachment = attachment => {
 };

 /**
- * 请求金蝶文件流：成功返回 Blob；业务失败为 HTTP 200 + R.fail JSON（响应通道未写流时后端即失败），
- * 按 Content-Type 识别并抛出带 msg 的错误；网络级失败拦截器已提示，标记 silent 避免重复提示。
+ * 请求金蝶文件流（公共核）：成功返回 Blob；业务失败为 HTTP 200 + R.fail JSON
+ * （响应通道未写流时后端即失败），按 Content-Type 识别并抛出带 msg 的错误；
+ * 网络级失败拦截器已提示，标记 silent 避免重复提示。
 * 供查看（弹窗内预览）/下载两类入口复用
- * @param {String} invoiceNo 发票号码
+ * @param {Function} fetcher 文件流请求函数（返回 axios blob 响应）
 * @returns {Promise<Blob>}
 */
-export const requestKingdeeFile = async invoiceNo => {
+const fetchKingdeeBlob = async fetcher => {
  let res;
  try {
-    res = await downloadInvoicePoolAttachment(invoiceNo);
+    res = await fetcher();
  } catch (error) {
    throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
  }
@@ -51,6 +52,45 @@ export const requestKingdeeFile = async invoiceNo => {
  return blob;
 };

+/**
+ * 请求金蝶文件流：票池发票按发票号回源（后端代理 A801-2）
+ * @param {String} invoiceNo 发票号码
+ * @returns {Promise<Blob>}
+ */
+export const requestKingdeeFile = invoiceNo => fetchKingdeeBlob(() => downloadInvoicePoolAttachment(invoiceNo));
+
+/**
+ * 下载金蝶侧附件（经 A801-2 后端代理，公共入口），失败统一 ElMessage 提示
+ * @param {Function} fetcher 文件流请求函数
+ * @param {String} fileName 下载文件名
+ */
+export const downloadKingdeeFile = async (fetcher, fileName) => {
+  try {
+    const blob = await fetchKingdeeBlob(fetcher);
+    downloadFile(blob, fileName);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
+  }
+};
+
+/**
+ * 新窗口预览金蝶侧附件（经 A801-2 后端代理，公共入口）：拉取 Blob 转 objectURL
+ * （PDF 可预览；OFD 等浏览器不可预览的格式由浏览器触发下载）
+ * @param {Function} fetcher 文件流请求函数
+ * @param {String} fileName 预览文件名
+ */
+export const viewKingdeeFile = async (fetcher, fileName) => {
+  try {
+    const blob = await fetchKingdeeBlob(fetcher);
+    const url = URL.createObjectURL(blob);
+    window.open(url, '_blank');
+    // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
+    setTimeout(() => URL.revokeObjectURL(url), 60000);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
+  }
+};
+
 /**
 * 下载金蝶侧发票附件（经 A801-2 后端代理），失败统一 ElMessage 提示
 * @param {String} invoiceNo 发票号码
@@ -61,12 +101,7 @@ export const downloadKingdeeInvoiceFile = async (invoiceNo, fileName) => {
    ElMessage.warning('当前发票缺少发票号码，无法下载金蝶侧附件');
    return;
  }
-  try {
-    const blob = await requestKingdeeFile(invoiceNo);
-    downloadFile(blob, fileName || `${invoiceNo}.pdf`);
-  } catch (error) {
-    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
-  }
+  await downloadKingdeeFile(() => downloadInvoicePoolAttachment(invoiceNo), fileName || `${invoiceNo}.pdf`);
 };

 /**
@@ -79,13 +114,5 @@ export const viewKingdeeInvoiceFile = async (invoiceNo, fileName) => {
    ElMessage.warning('当前发票缺少发票号码，无法预览金蝶侧附件');
    return;
  }
-  try {
-    const blob = await requestKingdeeFile(invoiceNo);
-    const url = URL.createObjectURL(blob);
-    window.open(url, '_blank');
-    // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
-    setTimeout(() => URL.revokeObjectURL(url), 60000);
-  } catch (error) {
-    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
-  }
+  await viewKingdeeFile(() => downloadInvoicePoolAttachment(invoiceNo), fileName || `${invoiceNo}.pdf`);
 };
@@ -13,3 +13,23 @@ export const KINGDEE_STATUS_TAG_TYPES = {

 /** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
 export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
+
+/** 收票登记推送状态 → el-tag 颜色类型（已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰） */
+export const KINGDEE_PUSH_STATUS_TAG_TYPES = {
+  unsynced: 'info',
+  pushed: 'warning',
+  assigned: 'success',
+  failed: 'danger',
+};
+
+/** 收票登记推送状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeePushStatusType = status => KINGDEE_PUSH_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';
@@ -21,6 +21,19 @@ export const MK_BIZ = {
    rejected: ['rejected', 'withdrawn'],
    approved: ['approved'],
  },
+  /** 项目备案流程（本部/运输部）共用 */
+  'project-record-change': {
+    dictName: '提交项目备案审核流',
+    subjectPrefix: '项目备案审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
+  'temporary-credit-limit': {
+    dictName: '提交临时额度审核流',
+    subjectPrefix: '临时额度审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
  'contract-manage': {
    dictName: '提交合同审核流',
    subjectPrefix: '合同审批',
@@ -69,10 +82,42 @@ export const MK_BIZ = {
    rejected: ['returned'],
    approved: ['approved'],
  },
+  'cert-audit-driver': {
+    dictName: '提交司机审核流',
+    subjectPrefix: '司机认证审批',
+    // 认证记录 status：0审核中 1已通过 2已驳回
+    rejected: ['2'],
+    approved: ['1'],
+  },
+  'cert-audit-vehicle': {
+    dictName: '提交车辆审核流',
+    subjectPrefix: '车辆认证审批',
+    rejected: ['2'],
+    approved: ['1'],
+  },
 };

+/** 按认证对象类型解析 MK 业务类型 */
+export function resolveCertAuditMkBizType(bizType) {
+  return String(bizType || '') === 'vehicle' ? 'cert-audit-vehicle' : 'cert-audit-driver';
+}
+
 const MK_SWITCH_NAME = '开启MK';

+/** 项目备案类变更类型（含历史「项目备案调整」） */
+export const PROJECT_RECORD_CHANGE_TYPES = [
+  '项目备案流程（本部流程）',
+  '项目备案流程（运输部流程）',
+  '项目备案调整',
+];
+
+/** 按变更类型选择项目变更 / 项目备案 MK 业务类型 */
+export function resolveProjectChangeMkBizType(changeType) {
+  return PROJECT_RECORD_CHANGE_TYPES.includes(String(changeType || '').trim())
+    ? 'project-record-change'
+    : 'project-change';
+}
+
 /** 进程内缓存，避免每次提交都打字典；登录后同一会话开关一般不变 */
 let mkEnabledCache = null;
 let mkEnabledPromise = null;
@@ -154,6 +199,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、用印类型 sealTypes）
 * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
 */
 export async function submitMkApprovalFlow({
@@ -162,6 +208,7 @@ export async function submitMkApprovalFlow({
  subjectName = '',
  approvalStatus = '',
  mkEnabled,
+  tempVarData,
 } = {}) {
  const conf = MK_BIZ[bizType];
  if (!conf) {
@@ -202,12 +249,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';
+}
@@ -0,0 +1,31 @@
+/** 结算单用印类型固定选项（展示顺序固定） */
+export const SETTLEMENT_SEAL_TYPE_OPTIONS = [
+  { dictKey: '公章', dictValue: '公章' },
+  { dictKey: '业务章', dictValue: '业务章' },
+];
+
+const SEAL_TYPE_ORDER = SETTLEMENT_SEAL_TYPE_OPTIONS.map(item => item.dictKey);
+
+/**
+ * 解析用印类型为数组（兼容顿号、逗号分隔）
+ */
+export const parseSealTypes = value => {
+  if (Array.isArray(value)) {
+    return value.map(item => String(item || '').trim()).filter(Boolean);
+  }
+  if (value === undefined || value === null || value === '') {
+    return [];
+  }
+  return String(value)
+    .split(/[、,，\s]+/)
+    .map(item => item.trim())
+    .filter(Boolean);
+};
+
+/**
+ * 用印类型按固定顺序顿号拼接，供保存与列表展示
+ */
+export const formatSealTypes = value => {
+  const selected = new Set(parseSealTypes(value));
+  return SEAL_TYPE_ORDER.filter(item => selected.has(item)).join('、');
+};
@@ -6,6 +6,7 @@
      :data="data"
      ref="crud"
      v-model="form"
+      v-model:page="page"
      :permission="permissionList"
      :before-open="beforeOpen"
      @row-del="rowDel"
@@ -91,6 +92,7 @@
            ref="treeMenu"
            :default-checked-keys="menuTreeObj"
            :props="props"
+            @check="handleMenuCheck"
          >
          </el-tree>
        </el-tab-pane>
@@ -101,7 +103,7 @@
            style="margin-bottom: 12px; background: #f5f7fa; padding: 6px 10px; border-radius: 4px"
          >
            <span style="color: #606266; font-size: 13px"
-              >勾选多个菜单后点击「设置」，可批量配置数据权限；设置后菜单旁展示当前范围</span
+              >菜单权限勾选/反选会自动同步到此页；仅展示已勾选菜单，已配置的数据权限会保留。可再调整勾选后点击「设置」批量配置</span
            >
            <el-button type="primary" size="small" @click="openDataScopeSetting">设置</el-button>
          </el-row>
@@ -190,20 +192,8 @@
            <el-radio :value="1">所在部门及下级</el-radio>
            <el-radio :value="2">全部组织</el-radio>
            <el-radio :value="3">本人创建</el-radio>
-            <el-radio :value="4">自定义组织</el-radio>
          </el-radio-group>
        </el-form-item>
-        <el-form-item v-if="Number(dataScopeSetting.scopeType) === 4" label="组织">
-          <el-tree
-            ref="treeCustomDept"
-            :data="deptTree"
-            show-checkbox
-            node-key="id"
-            default-expand-all
-            :props="{ label: 'title', children: 'children' }"
-            style="width: 100%; max-height: 320px; overflow: auto; border: 1px solid #ebeef5; padding: 8px"
-          />
-        </el-form-item>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
@@ -227,7 +217,6 @@ import {
  update,
 } from '@/api/system/role';
 import { getRoleMenuDataScopeTree, submitRoleMenuDataScope } from '@/api/system/roleDataScope';
-import { getDeptTree } from '@/api/system/dept';
 import { mapGetters } from 'vuex';
 import website from '@/config/website';

@@ -252,7 +241,6 @@ export default {
      currentRoleName: '',
      roleDataScopeMenuTree: [],
      roleDataScopeMap: {},
-      deptTree: [],
      dataScopeSetting: {
        roleName: '',
        scopeType: 2,
@@ -429,6 +417,11 @@ export default {
      if (!tree) return;
      const allKeys = this.getAllNodeKeys(dataList);
      tree.setCheckedKeys(allKeys);
+      if (treeRef === 'treeMenu') {
+        this.$nextTick(() => {
+          this.syncDataScopeTreeFromMenu();
+        });
+      }
    },
    handleInvertSelect(treeRef, dataList, isLinked) {
      const tree = this.$refs[treeRef];
@@ -443,6 +436,11 @@ export default {
        const invertedKeys = allKeys.filter(key => !checkedKeys.has(key));
        tree.setCheckedKeys(invertedKeys);
      }
+      if (treeRef === 'treeMenu') {
+        this.$nextTick(() => {
+          this.syncDataScopeTreeFromMenu();
+        });
+      }
    },
    handleLinkedChange(treeRef) {
      const tree = this.$refs[treeRef];
@@ -451,6 +449,9 @@ export default {
      const halfCheckedKeys = tree.getHalfCheckedKeys();
      this.$nextTick(() => {
        tree.setCheckedKeys([...checkedKeys, ...halfCheckedKeys]);
+        if (treeRef === 'treeMenu') {
+          this.syncDataScopeTreeFromMenu();
+        }
      });
    },
    // el-tree 会把 setCheckedKeys 的入参记录为默认勾选集并在树数据重载时回放，
@@ -460,6 +461,50 @@ export default {
      if (!tree) return;
      tree.setCheckedKeys(keys);
    },
+    handleMenuCheck() {
+      this.syncDataScopeTreeFromMenu();
+    },
+    /**
+     * 按当前菜单权限勾选结果过滤数据权限树，并同步勾选状态。
+     * 取消勾选的菜单从数据权限树移除；已配置的数据权限标签仍保留在 roleDataScopeMap。
+     */
+    syncDataScopeTreeFromMenu() {
+      const treeMenu = this.$refs.treeMenu;
+      if (!treeMenu) {
+        return;
+      }
+      const checkedKeys = treeMenu.getCheckedKeys() || [];
+      const checkedKeySet = new Set(checkedKeys);
+      this.roleDataScopeMenuTree = this.filterMenuTreeByChecked(this.menuGrantList, checkedKeySet);
+      this.$nextTick(() => {
+        const treeDataScope = this.$refs.treeRoleDataScope;
+        if (!treeDataScope) {
+          return;
+        }
+        const visibleKeys = new Set(this.getAllNodeKeys(this.roleDataScopeMenuTree));
+        const syncKeys = checkedKeys.filter(key => visibleKeys.has(key));
+        treeDataScope.setCheckedKeys(syncKeys);
+      });
+    },
+    /**
+     * 仅保留已勾选菜单及其祖先节点，保持树层级。
+     */
+    filterMenuTreeByChecked(nodes, checkedKeySet) {
+      if (!nodes || nodes.length === 0) {
+        return [];
+      }
+      const result = [];
+      nodes.forEach(node => {
+        const children = this.filterMenuTreeByChecked(node.children || [], checkedKeySet);
+        if (checkedKeySet.has(node.id) || children.length > 0) {
+          result.push({
+            ...node,
+            children,
+          });
+        }
+      });
+      return result;
+    },
    submit() {
      const menuList = this.$refs.treeMenu.getCheckedKeys();
      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
@@ -483,7 +528,7 @@ export default {
      return getRoleMenuDataScopeTree(roleId).then(res => {
        const data = res.data.data || {};
        this.currentRoleName = data.roleName || '';
-        this.roleDataScopeMenuTree = data.menuTree || [];
+        // 菜单树由菜单权限勾选实时联动生成；这里只加载已配置的数据权限标签
        const scopeMap = {};
        (data.scopes || []).forEach(item => {
          scopeMap[String(item.menuId)] = item;
@@ -506,20 +551,7 @@ export default {
        scopeType: 2,
        menuIds,
      };
-      const loadDept =
-        this.deptTree && this.deptTree.length
-          ? Promise.resolve()
-          : getDeptTree(this.userInfo.tenantId).then(res => {
-              this.deptTree = res.data.data || [];
-            });
-      loadDept.then(() => {
      this.dataScopeSettingBox = true;
-        this.$nextTick(() => {
-          if (this.$refs.treeCustomDept) {
-            this.$refs.treeCustomDept.setCheckedKeys([]);
-          }
-        });
-      });
    },
    submitDataScopeSetting() {
      const roleId = this.currentRoleIds && this.currentRoleIds[0];
@@ -528,27 +560,17 @@ export default {
        return;
      }
      const scopeType = Number(this.dataScopeSetting.scopeType || 2);
-      let deptIds = [];
-      if (scopeType === 4) {
-        deptIds = this.$refs.treeCustomDept ? this.$refs.treeCustomDept.getCheckedKeys() : [];
-        if (!deptIds.length) {
-          this.$message.warning('自定义组织时请勾选组织');
-          return;
-        }
-      }
      submitRoleMenuDataScope({
        roleId,
        menuIds: this.dataScopeSetting.menuIds,
        scopeType,
-        deptIds,
+        deptIds: [],
      }).then(() => {
        this.$message.success('数据权限设置成功');
        this.dataScopeSettingBox = false;
        this.loadRoleDataScopeTree(roleId).then(() => {
          this.$nextTick(() => {
-            if (this.$refs.treeRoleDataScope) {
-              this.$refs.treeRoleDataScope.setCheckedKeys([]);
-            }
+            this.syncDataScopeTreeFromMenu();
          });
        });
      });
@@ -662,6 +684,7 @@ export default {
        this.$nextTick(() => {
          this.applyCheckedKeys('treeMenu', this.menuTreeObj);
          this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
+          this.syncDataScopeTreeFromMenu();
        });
      });
    },
@@ -681,6 +704,7 @@ export default {
        this.$nextTick(() => {
          this.applyCheckedKeys('treeMenu', this.menuTreeObj);
          this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
+          this.syncDataScopeTreeFromMenu();
        });
      });
    },
@@ -729,7 +753,9 @@ export default {
    onLoad(page, params = {}) {
      this.loading = true;
      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data;
+        const data = res.data.data || {};
+        this.data = data.records || [];
+        this.page.total = data.total || 0;
        this.loading = false;
        this.selectionClear();
      });
@@ -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);
+      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 || ''}`;
@@ -1861,7 +1861,7 @@
                />
              </el-select>
            </el-form-item>
-            <el-form-item label="司机" required>
+            <el-form-item label="司机">
              <el-autocomplete
                v-model="dispatchItemForm.driverName"
                placeholder="请输入"
@@ -1878,7 +1878,6 @@
            </el-form-item>
            <el-form-item
              :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
-              required
            >
              <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
            </el-form-item>
@@ -2104,7 +2103,7 @@
              />
            </el-select>
          </el-form-item>
-          <el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
+          <el-form-item v-if="dispatchIsRoadTransport" label="司机">
            <el-autocomplete
              v-model="dispatchItemForm.driverName"
              placeholder="请输入"
@@ -2115,7 +2114,7 @@
              @select="item => handleTaskDriverSelect('dispatch', item)"
            />
          </el-form-item>
-          <el-form-item v-if="dispatchIsRoadTransport" label="手机号" required>
+          <el-form-item v-if="dispatchIsRoadTransport" label="手机号">
            <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
          </el-form-item>
          <el-form-item
@@ -3949,9 +3948,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatDispatchQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
+          const typeName =
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
        })
        .join('； ');
    },
@@ -7549,12 +7548,13 @@ export default {
      }, {});

      const cargoInfo = Object.values(groups)
-        .map(
-          group =>
-            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
-              group.quantity
-            )}${group.unit ? ` ${group.unit}` : ''}`
-        )
+        .map(group => {
+          const typeName =
+            group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
+          return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
+        })
        .join('； ');
      return cargoInfo || plan.goodsInfo || '';
    },
@@ -8364,19 +8364,7 @@ export default {
      }
      const fullEntry = row.taskEntryMode === 'full';
      const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
-      if (fullEntry) {
-        // 公路运输时司机/手机号一律必填（含承运类型为承运商）
-        if (roadTransport && row.carrierType) {
-          requiredFields.push(['driverName', '司机']);
-          requiredFields.push(['driverPhone', '手机号']);
-        }
-      } else if (row.carrierType) {
-        requiredFields.push(['driverName', '司机']);
-        requiredFields.push([
-          'driverPhone',
-          row.carrierType === '承运商' ? '手机号' : '司机手机号',
-        ]);
-      }
+      // 司机与手机号对全部承运类型（承运商 / 自运 / 平台）都是选填，填了才校验格式与长度
      const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
      if (emptyField) return requiredMessage(emptyField[1]);

@@ -484,20 +484,24 @@
      </div>
      <el-tabs v-model="previewTab"
        ><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane
-          :label="`疑似重复（${duplicateRows.length}）`"
-          name="duplicate" /></el-tabs
+          :label="`Excel内重复（${duplicateRows.length}）`"
+          name="duplicate" /><el-tab-pane
+          :label="`与已有运单重复（${historyDuplicateRows.length}）`"
+          name="history" /></el-tabs
      ><el-table
        :data="previewRows"
        border
        max-height="440"
-        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
+        :row-class-name="
+          ({ row }) => (row._duplicate || row._historyWaybillNo ? 'is-duplicate-row' : '')
+        "
        @selection-change="rowSelection = $event"
        ><el-table-column type="selection" width="55" /><el-table-column
          type="index"
          label="序号"
          width="65"
        /><el-table-column
-          v-for="column in detailColumns"
+          v-for="column in previewColumns"
          :key="column.prop"
          :prop="column.prop"
          :label="column.label"
@@ -583,8 +587,6 @@
                ><el-link type="primary" @click="saveRow(row)">保存</el-link
                ><el-link type="primary" @click="cancelRow(row)">取消</el-link></template
              ><template v-else
-                ><el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)"
-                  >确认</el-link
                ><el-link type="primary" @click="editRow(row)">编辑</el-link
                ><el-link type="danger" @click="deleteRow(row)">删除</el-link></template
              ></div
@@ -716,9 +718,12 @@ const transportTypeOptions = ref([]),
 const rowSelection = ref([]),
  previewTab = ref('all');
 const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
-const previewRows = computed(() =>
-  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
-);
+const historyDuplicateRows = computed(() => rows.value.filter(row => row._historyWaybillNo));
+const previewRows = computed(() => {
+  if (previewTab.value === 'duplicate') return duplicateRows.value;
+  if (previewTab.value === 'history') return historyDuplicateRows.value;
+  return rows.value;
+});
 const carrierContractsLoaded = ref(false),
  hasCarrierContracts = ref(null);
 const carrierTypes = ['承运商', '自运'];
@@ -795,6 +800,16 @@ const detailColumns = [
  { prop: 'remark', label: '备注', editor: 'textarea', minWidth: 200 },
  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
 ];
+// 与已有运单重复页签的列与明细一致，只在运单批次号后多一列已有运单号。
+const previewColumns = computed(() =>
+  previewTab.value === 'history'
+    ? [
+        detailColumns[0],
+        { prop: '_historyWaybillNo', label: '已有运单号', minWidth: 220 },
+        ...detailColumns.slice(1),
+      ]
+    : detailColumns
+);
 const requiredDetailFields = [
  { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
  { prop: 'transportType', label: '运输方式' },
@@ -1187,6 +1202,7 @@ const loadBatchRows = async batchId => {
    batchNo: item.batchNo || form.batchNo,
  }));
  refreshDuplicateFlags();
+  await refreshHistoryDuplicates();
  rowSelection.value = [];
  previewTab.value = 'all';
 };
@@ -1509,6 +1525,8 @@ const fileChange = async (file, list) => {
  if (isValid) {
    // 校验通过，填充表格数据
    rows.value = parsedRows;
+    // 传 rows.value（响应式代理），否则后续写入不触发重新渲染
+    await refreshHistoryDuplicates(rows.value);
  } else {
    // 校验失败，清空数据
    rows.value = [];
@@ -1526,16 +1544,12 @@ const IMPORT_BATCH_SIZE = 100;

 const importFieldText = value => String(value ?? '').trim();

-/** 同一运单批次号下，全部导入字段一致时标记为疑似重复。已在线确认的行不再标为重复。 */
+/** 同一运单批次号下，全部导入字段一致时标记为 Excel 内重复。 */
 const refreshDuplicateFlags = (list = rows.value) => {
  const groups = new Map();
  list.forEach(row => {
    const signature = detailColumns.map(column => importFieldText(row[column.prop])).join('\u0001');
    const batchNo = importFieldText(row.batchNo || form.batchNo);
-    if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
-      row._duplicateConfirmed = false;
-    }
-    row._duplicateSignature = signature;
    const groupKey = `${batchNo}\u0002${signature}`;
    const group = groups.get(groupKey) || [];
    group.push(row);
@@ -1544,19 +1558,39 @@ const refreshDuplicateFlags = (list = rows.value) => {
  groups.forEach(group => {
    const duplicated = group.length > 1;
    group.forEach(row => {
-      row._duplicate = duplicated && !row._duplicateConfirmed;
+      row._duplicate = duplicated;
    });
  });
 };

-const confirmDuplicateRow = row => {
-  row._duplicateConfirmed = true;
-  refreshDuplicateFlags();
-  ElMessage.success('已确认，该行将按正常数据导入');
+/** 逐行提交给后端与项目下已有运单比对，命中的行带上已有运单号。比对失败不影响导入。 */
+const refreshHistoryDuplicates = async (list = rows.value) => {
+  if (!list.length || !form.projectId) {
+    list.forEach(row => {
+      row._historyWaybillNo = '';
+    });
+    return;
+  }
+  let duplicates = [];
+  try {
+    const res = await api.checkImportDuplicates(buildImportPayload(form.status, list));
+    const data = res?.data?.data ?? res?.data ?? res;
+    duplicates = Array.isArray(data) ? data : [];
+  } catch (error) {
+    console.error('与已有运单重复校验失败:', error);
+    duplicates = [];
+  }
+  const numbersByRow = new Map(
+    duplicates.map(item => [item.rowIndex, (item.waybillNos || []).filter(Boolean)])
+  );
+  list.forEach((row, index) => {
+    row._historyWaybillNo = (numbersByRow.get(index) || []).join('、');
+  });
 };

 const stripInternalRowFields = row => {
-  const { _key, _duplicate, _duplicateKey, _duplicateConfirmed, _duplicateSignature, _editing, _editSnapshot, ...data } = row;
+  const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, _historyWaybillNo, ...data } =
+    row;
  return data;
 };

@@ -1771,6 +1805,7 @@ const saveRow = row => {
  row._editing = false;
  delete row._editSnapshot;
  refreshDuplicateFlags();
+  refreshHistoryDuplicates();
 };
 const cancelRow = row => {
  if (row._editSnapshot) Object.assign(row, row._editSnapshot);
@@ -1780,12 +1815,14 @@ const cancelRow = row => {
 const deleteRow = row => {
  rows.value = rows.value.filter(item => item !== row);
  refreshDuplicateFlags();
+  refreshHistoryDuplicates();
 };
 const removeSelectedRows = () => {
  const keys = new Set(rowSelection.value.map(row => row._key));
  rows.value = rows.value.filter(row => !keys.has(row._key));
  rowSelection.value = [];
  refreshDuplicateFlags();
+  refreshHistoryDuplicates();
 };
 const normalizeOptionalPlanId = value => {
  if (value === undefined || value === null || value === '') return null;
@@ -1849,7 +1886,11 @@ const confirmImport = async () => {
  await formRef.value?.validate();
  if (!validateImportRows()) return;
  const count = rows.value.filter(row => row._duplicate).length;
-  if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
+  if (count)
+    await ElMessageBox.confirm(`当前导入有${count}条Excel内重复数据，是否确认导入？`, '提示');
+  const historyCount = rows.value.filter(row => row._historyWaybillNo).length;
+  if (historyCount)
+    await ElMessageBox.confirm(`当前导入有${historyCount}条与已有运单重复，是否确认导入？`, '提示');
  if (form.importType === 'settlement' && form.status === 'completed')
    await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');

@@ -1337,7 +1337,7 @@
              <el-form-item label="规格">
                <el-input
                  v-model="form.specification"
-                  placeholder="选择货物自动回填"
+                  placeholder="请填写规格"
                  clearable
                  :disabled="dialogReadonly"
                />
@@ -1345,7 +1345,7 @@
              <el-form-item label="型号">
                <el-input
                  v-model="form.model"
-                  placeholder="选择货物自动回填"
+                  placeholder="请填写型号"
                  clearable
                  :disabled="dialogReadonly"
                />
@@ -1599,14 +1599,7 @@
          <el-link type="primary" v-if="canCancel(row)" @click="handleAction('cancel', row)">
            取消
          </el-link>
-          <el-link type="primary" v-if="canComplete(row)" @click="handleAction('complete', row)">
-            {{ completeActionLabel }}
-          </el-link>
-          <el-link
-            type="primary"
-            v-if="canConfirmReturn(row)"
-            @click="handleAction('confirmReturn', row)"
-          >
+          <el-link type="primary" v-if="canComplete(row)" @click="handleComplete(row)">
            {{ completeActionLabel }}
          </el-link>
          <el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
@@ -4650,9 +4643,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);
@@ -5013,9 +5011,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
+          const typeName =
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
        })
        .join('； ');
    },
@@ -5116,11 +5114,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) {
@@ -5168,12 +5171,9 @@ export default {
        return false;
      }
      const status = this.statusValue(row);
-      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
-      // 只有确认回单不可用时才退回这里的普通完成
-      if (status === 'pending_return_confirm') {
-        return !this.canConfirmReturn(row);
-      }
-      return status === 'processing' || status === 'running';
+      // 同一枚「完成」按钮覆盖两种状态：待回单确认走确认回单（后端校验司机打卡节点齐全且无未了结异常），
+      // 进行中/处理中二次确认后直接置完成
+      return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
    },
    canConfirmReturn(row) {
      return (
@@ -7285,6 +7285,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 +7301,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 +7759,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 +7815,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,9 +7855,39 @@ 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(
+      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 ||
@@ -7858,44 +7896,35 @@ export default {
              contract.secondPartyName ||
              ''
          ).trim();
-        if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
-        return counts;
-      }, {});
-      return contracts
-        .map(contract => {
-          const carrierName = String(
-            contract.partyB ||
-            contract.partyBName ||
-            contract.contractPartyB ||
-            contract.customerContractPartyB ||
-            contract.secondParty ||
-            contract.secondPartyName ||
-            ''
-          ).trim();
-          if (!carrierName || !contract.id) return null;
+          if (fallbackName) {
+            parties.push({
+              id: '',
+              customerId: '',
+              customerName: fallbackName,
+              creditCode: '',
+              partyRole: 'B',
+            });
+          }
+        }
        const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
-          return {
+        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 +7954,8 @@ export default {
            this.form.carrierName = '';
            this.form.carrierId = '';
            this.form.carrierContractId = '';
+            this.form.carrierPartyId = '';
+            this.form.carrierPartyRole = '';
          }
          return options;
        })
@@ -8015,10 +8046,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 || '';
      }
      // 承运商变更后清空司机/车辆，避免跨组织脏数据
@@ -8408,7 +8443,6 @@ export default {
      }
      if (!this.isTaskFullMode) {
        requiredFields.push(['cargoName', '货物名称']);
-        requiredFields.push(['model', '型号']);
        requiredFields.push(['quantity', '数量']);
      }
      const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
@@ -10208,6 +10242,14 @@ export default {
      this.mileageForm = { id: '', mileage: '', mileageRemark: '' };
      this.$refs.mileageFormRef?.clearValidate();
    },
+    // 行操作「完成」的唯一入口：待回单确认的运单走确认回单（后端校验司机打卡节点齐全且无未了结异常，
+    // 配置里没有确认回单动作时退回普通完成）；进行中/处理中的运单二次确认后直接置完成。
+    handleComplete(row) {
+      if (this.canConfirmReturn(row)) {
+        return this.handleAction('confirmReturn', row);
+      }
+      return this.handleAction('complete', row);
+    },
    handleAction(action, row) {
      if (action === 'reassign') {
        this.openReassignDrawer(row);
@@ -10221,11 +10263,13 @@ export default {
        reassign: '重新派单',
        confirmReturn: '完成',
      }[action];
-      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
-      const confirmText =
-        action === 'confirmReturn'
-          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
-          : `确定${actionName}该${this.config.title}?`;
+      // 回单确认与「完成」都是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      let confirmText = `确定${actionName}该${this.config.title}?`;
+      if (action === 'confirmReturn') {
+        confirmText = '回单确认后该运单将置为已完成，且不可撤销。是否继续?';
+      } else if (action === 'complete') {
+        confirmText = `确定完成该${this.config.title}?完成后将置为已完成，且不可撤销。`;
+      }
      this.$confirm(confirmText, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -13,8 +13,18 @@ export default {
  components: { MkPublicShell, ContractManageChange },
  methods: {
    getForm() {
-      const row = this.$refs.page?.form || {};
-      return { ...row, subject: row.contractName || row.contractNo || '' };
+      const page = this.$refs.page;
+      const row = page?.form || {};
+      return {
+        ...row,
+        partyAJson: row.partyAJson || '',
+        partyBJson: row.partyBJson || '',
+        partyCJson: row.partyCJson || '',
+        partyARows: page?.partyARows || [],
+        partyBRows: page?.partyBRows || [],
+        partyCRows: page?.partyCRows || [],
+        subject: row.contractName || row.contractNo || '',
+      };
    },
  },
 };
@@ -66,14 +66,41 @@
          <el-form-item label="项目">
            <el-input v-model="form.projectName" disabled />
          </el-form-item>
-          <el-form-item label="合同负责部门">
-            <el-input v-model="form.organizationName" disabled />
+          <el-form-item label="合同负责部门" prop="organizationName">
+            <el-select
+              v-model="selectedOrganizationId"
+              placeholder="请选择"
+              filterable
+              clearable
+              :loading="businessDeptLoading"
+              :disabled="isSettlementRuleChange"
+              @visible-change="visible => visible && loadBusinessDeptOptions()"
+              @change="handleOrganizationChange"
+            >
+              <el-option
+                v-for="item in businessDeptOptions"
+                :key="item.id"
+                :label="item.label"
+                :value="item.id"
+              />
+            </el-select>
          </el-form-item>
-          <el-form-item label="甲方">
-            <el-input v-model="form.partyA" disabled />
-          </el-form-item>
-          <el-form-item label="乙方">
-            <el-input v-model="form.partyB" disabled />
+          <el-form-item label="平台公司" prop="platformCompanyName">
+            <el-select
+              v-model="form.platformCompanyId"
+              placeholder="请选择平台公司"
+              filterable
+              clearable
+              :disabled="isSettlementRuleChange || !form.projectId"
+              @change="handlePlatformCompanyChange"
+            >
+              <el-option
+                v-for="item in platformCompanyOptions"
+                :key="item.id"
+                :label="item.label"
+                :value="item.id"
+              />
+            </el-select>
          </el-form-item>
          <el-form-item label="签订日期">
            <el-date-picker
@@ -272,6 +299,29 @@
        </div>
      </section>

+      <section
+        v-for="party in partySections"
+        :key="party.role"
+        class="change-section contract-party-section"
+      >
+        <div class="dialog-section-title">{{ party.label }}</div>
+        <el-table :data="party.rows" border empty-text="暂无数据" class="change-table">
+          <el-table-column type="index" label="序号" width="70" align="center" />
+          <el-table-column prop="customerName" label="客商名称" min-width="200" align="center">
+            <template #default="{ row }">{{ row.customerName || '-' }}</template>
+          </el-table-column>
+          <el-table-column prop="creditCode" label="统一信用代码" min-width="180" align="center">
+            <template #default="{ row }">{{ row.creditCode || '-' }}</template>
+          </el-table-column>
+          <el-table-column prop="contactName" label="联系人" min-width="160" align="center">
+            <template #default="{ row }">{{ row.contactName || '-' }}</template>
+          </el-table-column>
+          <el-table-column prop="contactPhone" label="联系电话" min-width="150" align="center">
+            <template #default="{ row }">{{ row.contactPhone || '-' }}</template>
+          </el-table-column>
+        </el-table>
+      </section>
+
      <contract-attachment-section
        title="用印材料"
        description
@@ -299,25 +349,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 +543,9 @@
        v-model="planDialogVisible"
        :value="planEditor"
        :index="planEditorIndex"
+        :readonly="pageReadonly"
        :settlement-currency="form.settlementCurrency"
+        :party-options="billingPartyOptions"
        @save="savePlan"
      />

@@ -551,8 +605,11 @@
 <script>
 import * as contractApi from '@/api/business/contract-manage';
 import * as changeApi from '@/api/business/contract-change';
+import { getDetail as getProjectDetail } from '@/api/business/project-apply';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { normalizeBusinessDeptOptions } from '@/utils/dept';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
  isContractSealMaterialLocation,
@@ -630,6 +687,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 +733,9 @@ export default {
      form: {},
      period: [],
      plans: [],
+      partyARows: [],
+      partyBRows: [],
+      partyCRows: [],
      attachments: [],
      contractFiles: [],
      contractFileRows: [],
@@ -674,8 +773,12 @@ export default {
      settlementCurrencyOptions: [],
      settlementModeDictOptions: [],
      contractFormatDictOptions: [],
+      selectedOrganizationId: '',
+      businessDeptOptions: [],
+      businessDeptLoading: false,
+      platformCompanyOptions: [],
      planDialogVisible: false,
-      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
+      planEditor: { planName: '', remark: '', rules: [] },
      planEditorIndex: -1,
      billingElements: [
        '按重量',
@@ -706,6 +809,34 @@ export default {
          },
        ],
        contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
+        organizationName: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.isSettlementRuleChange) {
+                return callback();
+              }
+              if (!String(value || '').trim()) {
+                return callback(new Error('请选择合同负责部门'));
+              }
+              callback();
+            },
+            trigger: 'change',
+          },
+        ],
+        platformCompanyName: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.isSettlementRuleChange) {
+                return callback();
+              }
+              if (!String(value || '').trim()) {
+                return callback(new Error('请选择平台公司'));
+              }
+              callback();
+            },
+            trigger: 'change',
+          },
+        ],
        contractAmount: [
          { required: true, message: '请输入合同金额', trigger: 'blur' },
          {
@@ -745,7 +876,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())
@@ -753,9 +884,39 @@ export default {
        .join('、');
      return `【${parties || '相对方'}】：被列入外部黑名单；涉贪污受贿裁判相关提及方（3年以上及其他）；被执行人信息；买卖合同纠纷；劳动纠纷；重大纠纷。提交变更前须上传「特批附件」类型附件`;
    },
+    partySections() {
+      return [
+        { role: 'A', label: '甲方', rows: this.partyARows },
+        { role: 'B', label: '乙方', rows: this.partyBRows },
+        { role: 'C', label: '丙方', rows: this.partyCRows },
+      ];
+    },
    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 ['变更材料'];
@@ -828,6 +989,136 @@ export default {
    formatContractAmountField() {
      this.form.contractAmount = formatContractAmountInput(this.form.contractAmount);
    },
+    handleOrganizationChange(id) {
+      const organizationId = Array.isArray(id) ? id.at(-1) : id;
+      const organization = this.businessDeptOptions.find(
+        item => String(item.id) === String(organizationId)
+      );
+      Object.assign(
+        this.form,
+        organization
+          ? {
+              organizationId: organization.id,
+              organizationName: organization.rawLabel || organization.label,
+            }
+          : { organizationId: '', organizationName: '' }
+      );
+      this.selectedOrganizationId = this.form.organizationId
+        ? String(this.form.organizationId)
+        : '';
+    },
+    handlePlatformCompanyChange(value) {
+      const matched = this.platformCompanyOptions.find(item => String(item.id) === String(value));
+      this.form.platformCompanyId = matched ? matched.id : '';
+      this.form.platformCompanyName = matched ? matched.label : '';
+    },
+    loadBusinessDeptOptions() {
+      if (this.businessDeptLoading) return;
+      this.businessDeptLoading = true;
+      getBusinessDeptSelect()
+        .then(res => {
+          this.businessDeptOptions = normalizeBusinessDeptOptions(res.data?.data || []);
+          this.syncCurrentBusinessDeptOption();
+        })
+        .finally(() => {
+          this.businessDeptLoading = false;
+        });
+    },
+    syncCurrentBusinessDeptOption() {
+      if (!this.form.organizationId || !this.form.organizationName) return;
+      if (
+        this.businessDeptOptions.some(item => String(item.id) === String(this.form.organizationId))
+      ) {
+        return;
+      }
+      this.businessDeptOptions.unshift({
+        id: String(this.form.organizationId),
+        value: String(this.form.organizationId),
+        label: this.form.organizationName,
+        rawLabel: this.form.organizationName,
+      });
+    },
+    parseUndertakeDeptIds(value) {
+      if (Array.isArray(value)) {
+        return value.map(item => String(item || '').trim()).filter(Boolean);
+      }
+      return String(value || '')
+        .split(',')
+        .map(item => item.trim())
+        .filter(Boolean);
+    },
+    parseUndertakeDeptNames(value) {
+      if (Array.isArray(value)) {
+        return value.map(item => String(item || '').trim()).filter(Boolean);
+      }
+      return String(value || '')
+        .split(/[、,，]/)
+        .map(item => item.trim())
+        .filter(Boolean);
+    },
+    loadProjectPlatformCompanies() {
+      const projectId = this.form.projectId;
+      if (!projectId || String(projectId) === '-1') {
+        this.syncCurrentPlatformCompanyOption();
+        return Promise.resolve([]);
+      }
+      return getProjectDetail(projectId)
+        .then(res => {
+          const project = res.data?.data || res.data || {};
+          const ids = this.parseUndertakeDeptIds(project.undertakeDeptId);
+          const names = this.parseUndertakeDeptNames(project.undertakeDeptName);
+          return this.resolveProjectPlatformCompanyOptions(ids, names);
+        })
+        .then(options => {
+          this.platformCompanyOptions = options;
+          this.syncCurrentPlatformCompanyOption();
+          return options;
+        })
+        .catch(() => {
+          this.syncCurrentPlatformCompanyOption();
+          return this.platformCompanyOptions;
+        });
+    },
+    resolveProjectPlatformCompanyOptions(ids, names) {
+      const fallback = ids.map((id, index) => ({
+        id: String(id),
+        label: names[index] || String(id),
+      }));
+      if (!ids.length) return Promise.resolve([]);
+      return getPlatformCompanySelect()
+        .then(res => {
+          const liveList = (res.data?.data || []).map(item => ({
+            id: String(item.id),
+            label: item.deptName || item.fullName || String(item.id),
+          }));
+          return ids.map((id, index) => {
+            const name = String(names[index] || '').trim();
+            const byId = liveList.find(item => String(item.id) === String(id));
+            if (byId) return byId;
+            const byName = name ? liveList.find(item => item.label === name) : null;
+            if (byName) return byName;
+            return {
+              id: String(id),
+              label: name || String(id),
+            };
+          });
+        })
+        .catch(() => fallback);
+    },
+    syncCurrentPlatformCompanyOption() {
+      if (!this.form.platformCompanyId || !this.form.platformCompanyName) return;
+      if (
+        this.platformCompanyOptions.some(
+          item => String(item.id) === String(this.form.platformCompanyId)
+        )
+      ) {
+        return;
+      }
+      this.platformCompanyOptions.unshift({
+        id: String(this.form.platformCompanyId),
+        label: this.form.platformCompanyName,
+      });
+    },
    loadDictionaries() {
      Promise.all([
        getSystemDictionary({ code: 'currency_type' }),
@@ -876,6 +1167,10 @@ export default {
        ...data,
        // 独立变更单保留 contractId；旧路由以合同 id 作为主键
        contractId: data.contractId || (isChangeRecord ? data.contractId : data.id),
+        organizationId: data.organizationId ? String(data.organizationId) : '',
+        organizationName: data.organizationName || '',
+        platformCompanyId: data.platformCompanyId ? String(data.platformCompanyId) : '',
+        platformCompanyName: data.platformCompanyName || '',
        changeContent: isChangeRecord ? data.changeContent || '' : '',
        changeReason: isChangeRecord ? data.changeReason || '' : '',
        changeAttachmentsJson: data.changeAttachmentsJson || '',
@@ -888,8 +1183,12 @@ export default {
        archiveStatus: data.archiveStatus || '未归档',
        changeType: data.changeType || '合同信息变更',
      };
+      this.selectedOrganizationId = this.form.organizationId ? String(this.form.organizationId) : '';
      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),
@@ -934,6 +1233,8 @@ export default {
      this.feeGenerationMode =
        data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
      this.paymentRatioRows = this.parse(data.paymentRatioJson);
+      this.loadBusinessDeptOptions();
+      this.loadProjectPlatformCompanies();
    },
    goBack() {
      if (this.isContractChangeModule) {
@@ -1048,10 +1349,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 || ''; },
@@ -1110,6 +1433,14 @@ export default {
          return;
        }
        this.form.contractNo = contractNo;
+        if (!String(this.form.organizationName || '').trim()) {
+          this.$message.warning('请选择合同负责部门');
+          return;
+        }
+        if (!String(this.form.platformCompanyName || '').trim()) {
+          this.$message.warning('请选择平台公司');
+          return;
+        }
        const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0);
        if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) {
          this.$message.warning('付款比例上限合计必须等于100%');
@@ -1159,6 +1490,16 @@ export default {
 .contract-change-page :deep(.basic-container__card) { border: 0; background: transparent; box-shadow: none; }
 .contract-change-form { background: #f5f6fa; }
 .change-section { padding: 20px 24px; background: #fff; border-bottom: 1px solid #eff1f7; margin-top: 12px; }
+.contract-party-section {
+  margin-bottom: 12px;
+  padding: 14px 16px 16px;
+  overflow: hidden;
+  background: #fff;
+  border-bottom: 0;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+.contract-party-section > .dialog-section-title { margin-bottom: 16px; color: #303133; }
 .contract-basic-section { margin-bottom: 12px; padding: 14px 16px 16px; overflow: hidden; background: #fff; border-bottom: 0; border-radius: 6px; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); }
 .contract-basic-section > .dialog-section-title { margin-bottom: 20px; color: #303133; }
 .contract-basic-section__grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); column-gap: 48px; }
@@ -13,8 +13,18 @@ export default {
  components: { MkPublicShell, ContractManage },
  methods: {
    getForm() {
-      const row = this.$refs.page?.detailRow || {};
-      return { ...row, subject: row.contractName || row.contractNo || '' };
+      const page = this.$refs.page;
+      const row = page?.detailRow || {};
+      return {
+        ...row,
+        partyAJson: row.partyAJson || '',
+        partyBJson: row.partyBJson || '',
+        partyCJson: row.partyCJson || '',
+        partyARows: page?.detailPartyARows || [],
+        partyBRows: page?.detailPartyBRows || [],
+        partyCRows: page?.detailPartyCRows || [],
+        subject: row.contractName || row.contractNo || '',
+      };
    },
  },
 };
@@ -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;
@@ -2524,9 +2545,9 @@ export default {
        Object.values(groups)
          .map(group => {
            const quantity = this.formatGoodsQuantity(group.quantity);
-            return `${group.typeName}等${group.count}种货物 | ${quantity}${
-              group.unit ? ` ${group.unit}` : ''
-            }`;
+            const typeName =
+              group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+            return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
          })
          .join('； ') || '-'
      );
@@ -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 =>
+    handleTaskCarrierChange(selectedValue) {
+      const contract = this.taskCarrierOptions.find(
+        item =>
+          this.carrierOptionValue(item) === String(selectedValue || '') ||
          [item.id, item.carrierName, item.partyB].some(
-          value => String(value || '') === String(contractId || '')
+            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(
@@ -489,6 +489,12 @@ const NODE_TEMPLATES = [
  },
 ];

+// 过程配置必须覆盖装货端与卸货端各一个节点；货量下限只看装货端——
+// 到场没有货量开关，不能拿它顶替货量采集
+const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
+const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
+const CARGO_NODE_KEYS = ['load', 'dispatch'];
+
 export default {
  data() {
    return {
@@ -535,7 +541,6 @@ export default {
  created() {
    this.resetNodeRows();
    this.loadProjectOptions('');
-    this.applyDefaultDeptSearch();
    this.initDeptOptions();
  },
  methods: {
@@ -566,27 +571,6 @@ export default {
        }
      });
    },
-    defaultDeptId() {
-      const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
-      return (
-        String(raw)
-          .split(',')
-          .map(item => item.trim())
-          .filter(Boolean)[0] || ''
-      );
-    },
-    applyDefaultDeptSearch() {
-      const deptId = this.defaultDeptId();
-      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
-      if (!deptId || !deptColumn) return;
-      deptColumn.searchValue = deptId;
-      this.query = { ...this.query, deptId };
-      this.$nextTick(() => {
-        if (this.$refs.crud?.searchForm) {
-          this.$refs.crud.searchForm.searchDeptId = deptId;
-        }
-      });
-    },
    flattenDept(tree, level = 0) {
      return tree.flatMap(item => {
        const id =
@@ -938,8 +922,24 @@ export default {
        this.$message.warning('备注不能超过500个字符');
        return false;
      }
-      if (!this.enabledNodes.length) {
-        this.$message.warning('请至少选择一个过程节点');
+      const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
+      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('发货、装货、到场至少选择一个');
+        return false;
+      }
+      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('卸货、到货、签收、回单至少选择一个');
+        return false;
+      }
+      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
+      const collectsCargo = CARGO_NODE_KEYS.some(key =>
+        this.nodeRows.some(
+          item =>
+            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
+        )
+      );
+      if (!collectsCargo) {
+        this.$message.warning('发货或装货至少勾选一个货量类型');
        return false;
      }
      const transit = this.nodeRows.find(item => item.key === 'transit');
@@ -1113,7 +1113,6 @@ export default {
    },
    searchReset() {
      this.query = {};
-      this.applyDefaultDeptSearch();
      this.page.currentPage = 1;
      this.onLoad(this.page, this.query);
    },
@@ -75,7 +75,11 @@ import * as api from '@/api/business/project-change';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { config, option } from '@/option/business/project-change';
 import { approvalStatusOptions } from '@/option/business/common';
-import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import {
+  loadMkEnabled,
+  resolveProjectChangeMkBizType,
+  submitMkApprovalFlow,
+} from '@/utils/mk-approval';
 import { isAdministrator } from '@/utils/auth';
 import { mapGetters } from 'vuex';

@@ -214,15 +218,24 @@ 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',
+            ? request().then(() => {
+                const changeType = row.changeType || '项目变更';
+                return submitMkApprovalFlow({
+                  bizType: resolveProjectChangeMkBizType(changeType),
                  bizId: row.id,
                  subjectName: row.projectName || '',
                  approvalStatus: row.approvalStatus || '',
                  mkEnabled: this.mkEnabled,
-              }).then(() => request())
+                  tempVarData: {
+                    projectType: row.projectType || '',
+                    changeType,
+                    变更类型: changeType,
+                  },
+                });
+              })
            : request();
        const loading =
          operation.action === 'approve'
@@ -0,0 +1,113 @@
+<template>
+  <mk-public-shell biz-type="temporary-credit-limit" :get-form="getForm">
+    <div class="temporary-credit-limit-public-view">
+      <div class="temporary-credit-limit-public-view__title">查看临时额度申请</div>
+      <template v-if="detail">
+        <div class="temporary-credit-limit-public-view__section-title">项目额度信息</div>
+        <el-descriptions :column="2" border>
+          <el-descriptions-item label="项目名称">{{ detail.projectName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="项目编号">{{ detail.projectCode || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="承办部门">{{ detail.undertakeDeptName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="项目资金使用额度（万元）">
+            {{ formatAmount(detail.projectFundLimit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="已使用项目资金使用额度（万元）">
+            {{ formatAmount(detail.usedFundLimit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="剩余项目资金使用额度（万元）">
+            {{ formatAmount(detail.remainingFundLimit) }}
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <div class="temporary-credit-limit-public-view__section-title">临时额度信息</div>
+        <el-descriptions :column="2" border>
+          <el-descriptions-item label="申请单号">{{ detail.applicationNo || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="申请临时额度（万元）">
+            {{ formatAmount(detail.applyLimit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="申请有效期至">{{ detail.validUntil || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="审批状态">
+            {{ detail.approvalStatusName || detail.approvalStatus || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="申请人">{{ detail.applicantName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="申请部门">{{ detail.applyDeptName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">{{ detail.remark || '-' }}</el-descriptions-item>
+        </el-descriptions>
+      </template>
+      <el-empty v-else description="暂无数据" />
+    </div>
+  </mk-public-shell>
+</template>
+
+<script>
+import { getMkPublicDetail } from '@/api/mk-process';
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+
+export default {
+  name: 'TemporaryCreditLimitPublicView',
+  components: { MkPublicShell },
+  data() {
+    return {
+      detail: null,
+    };
+  },
+  mounted() {
+    this.loadDetail();
+  },
+  methods: {
+    loadDetail() {
+      const id = this.$route.query.id;
+      if (!id) return;
+      getMkPublicDetail('temporary-credit-limit', id).then(res => {
+        this.detail = res.data?.data || null;
+      });
+    },
+    formatAmount(value) {
+      if (value === undefined || value === null || value === '' || Number(value) === -1) {
+        return '-';
+      }
+      return value;
+    },
+    getForm() {
+      const detail = this.detail || {};
+      return {
+        ...detail,
+        subject: detail.projectName || detail.applicationNo || '',
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.temporary-credit-limit-public-view {
+  padding: 16px 20px 24px;
+
+  &__title {
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  &__section-title {
+    position: relative;
+    margin: 16px 0 12px;
+    padding-left: 12px;
+    font-size: 15px;
+    font-weight: 600;
+    color: #303133;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 0;
+      top: 50%;
+      width: 4px;
+      height: 14px;
+      margin-top: -7px;
+      background: #409eff;
+    }
+  }
+}
+</style>
@@ -329,8 +329,10 @@ import {
  getDetail as getProjectDetail,
  getList as getProjectList,
 } from '@/api/business/project-apply';
+import { getMKApprovalUrl } from '@/api/system/business-process';
 import { config, option } from '@/option/business/temporary-credit-limit';
 import { getToken, isAdministrator } from '@/utils/auth';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
@@ -426,6 +428,7 @@ export default {
      flowBox: false,
      flowUrl: '',
      processInstanceId: '',
+      mkEnabled: false,
    };
  },
  computed: {
@@ -455,6 +458,13 @@ export default {
  },
  created() {
    this.loadProjectOptions();
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
  },
  methods: {
    buildTableOption() {
@@ -543,11 +553,19 @@ export default {
    },
    customOperations(row) {
      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
        const permission = operation.permission || `${this.config.permission}_${operation.action}`;
        const statusProp = operation.statusProp || this.config.statusProp || 'status';
+        // MK「流程」入口允许只读行查看审核页；本地审批/提交/撤回仍禁止只读
+        if (
+          row.readonly &&
+          ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)
+        ) {
+          return false;
+        }
        return (
          this.hasPermission(permission) &&
-          !row.readonly &&
          (!operation.status?.length || operation.status.includes(row[statusProp]))
        );
      });
@@ -736,6 +754,10 @@ export default {
        });
    },
    handleOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
      if (operation.action === 'flow') {
        this.openFlow(row);
        return;
@@ -744,12 +766,49 @@ export default {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
+      }).then(() => {
+        const previousApprovalStatus = row.approvalStatus || '';
+        const request = () => this.api[operation.action](row.id);
+        // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'temporary-credit-limit',
+                  bizId: row.id,
+                  subjectName: row.projectName || row.applicationNo || '',
+                  approvalStatus: previousApprovalStatus,
+                  mkEnabled: this.mkEnabled,
                })
-        .then(() => this.api[operation.action](row.id))
-        .then(() => {
+              )
+            : request();
+        return afterMk.then(res => {
+          if (res?.data?.success === false) {
+            this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
+            return;
+          }
          this.$message.success(`${operation.label}成功`);
          this.onLoad(this.page, this.query);
        });
+      });
+    },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('临时额度申请ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
    },
    openFlow(row, loaded = false) {
      const processInstanceId = row.processInstanceId || row.processInstanceID || row.procInstId;
@@ -577,7 +577,7 @@ export default {
          this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
          return;
        }
-        // 司机是否必填由调度明细弹窗按承运类型判定（承运商承运时司机选填），此处不再重复校验
+        // 司机与手机号对全部承运类型都是选填，由调度明细弹窗校验已填部分的格式，此处不重复校验
        if (!row.vehicleNo) {
          this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
          return;
@@ -389,6 +389,18 @@
              v-model="batchQuery.batchNo"
              clearable
              placeholder="请输入" /></el-form-item></el-col
+        ><el-col :span="12"
+          ><el-form-item label="项目"
+            ><el-select
+              v-model="batchQuery.projectId"
+              filterable
+              clearable
+              placeholder="请选择"
+              ><el-option
+                v-for="item in projectOptions"
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id" /></el-select></el-form-item></el-col
        ><el-col :span="12"
          ><el-form-item label="创建日期"
            ><el-date-picker
@@ -428,6 +440,10 @@
        prop="batchNo"
        label="运单批次号"
        min-width="240" /><el-table-column
+        prop="projectName"
+        label="项目"
+        min-width="180"
+        show-overflow-tooltip /><el-table-column
        prop="createTime"
        label="创建时间"
        min-width="180" /><el-table-column label="运单数" width="120"
@@ -694,7 +710,12 @@ const selectedBatches = ref([]),
  batchRows = ref([]),
  batchSelection = ref([]),
  batchCreateRange = ref([]);
-const batchQuery = reactive({ batchNo: '', createUser: '', waybillCount: undefined });
+const batchQuery = reactive({
+  batchNo: '',
+  projectId: '',
+  createUser: '',
+  waybillCount: undefined,
+});
 const batchPage = reactive({ current: 1, size: 10, total: 0 });
 const progressQuery = reactive({ businessId: '', attachmentName: '', status: '' });
 const progressPage = reactive({ current: 1, size: 10, total: 0 });
@@ -1023,7 +1044,12 @@ const openBatchDialog = async row => {
  batchDialogMode.value = voucher?.id ? 'change' : 'upload';
  batchTarget.value = voucher?.id ? voucher : undefined;
  batchSelection.value = [];
+  // 弹窗内的搜索条件是模块级状态，不重置就会带着上一次的筛选条件打开。
+  resetBatchSearch();
+  batchRows.value = [];
+  batchPage.total = 0;
  batchVisible.value = true;
+  if (!projectOptions.value.length) await loadProjects();
  await loadBatches();
  if (voucher?.waybillBatchNo) {
    const currentBatch = batchRows.value.find(item => item.batchNo === voucher.waybillBatchNo);
@@ -1033,6 +1059,7 @@ const openBatchDialog = async row => {
 const loadBatches = async () => {
  const res = await api.getWaybillBatches(batchPage.current, batchPage.size, {
    batchNo: batchQuery.batchNo,
+    projectId: batchQuery.projectId,
    createUser: batchQuery.createUser,
    waybillCount: batchQuery.waybillCount,
    createTimeStart: batchCreateRange.value?.[0] ? `${batchCreateRange.value[0]} 00:00:00` : '',
@@ -1053,10 +1080,18 @@ const handleWaybillCountInput = value => {
    batchQuery.waybillCount = filtered.replace(/^0+/, '');
  }
 };
-const resetBatchQuery = () => {
-  Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
+const resetBatchSearch = () => {
+  Object.assign(batchQuery, {
+    batchNo: '',
+    projectId: '',
+    createUser: '',
+    waybillCount: undefined,
+  });
  batchCreateRange.value = [];
  batchPage.current = 1;
+};
+const resetBatchQuery = () => {
+  resetBatchSearch();
  loadBatches();
 };
 const updateWaybillBatch = async (target, selected) => {
@@ -6,7 +6,7 @@
    :config="config"
    :crud-option="option"
    :detail-id="detailId"
-    :menu-width="250"
+    :menu-width="320"
    standalone-form-page
  />
 </template>
@@ -2,16 +2,40 @@
  <div ref="page" class="mk-public-biz-view">
    <basic-container>
      <div class="mk-public-biz-view__title">{{ pageTitle }}</div>
-      <el-descriptions v-if="detail" :column="2" border>
+      <template v-if="detail">
+        <el-descriptions :column="2" border>
          <el-descriptions-item
            v-for="item in visibleFields"
            :key="item.prop"
            :label="item.label"
            :span="item.span || 1"
          >
-          {{ displayValue(detail[item.prop]) }}
+            {{ fieldDisplayValue(item.prop, detail[item.prop]) }}
          </el-descriptions-item>
        </el-descriptions>
+        <section
+          v-for="party in partySections"
+          :key="party.role"
+          class="mk-public-biz-view__party"
+        >
+          <div class="mk-public-biz-view__party-title">{{ party.label }}</div>
+          <el-table :data="party.rows" border empty-text="暂无数据">
+            <el-table-column type="index" label="序号" width="70" align="center" />
+            <el-table-column prop="customerName" label="客商名称" min-width="180" align="center">
+              <template #default="{ row }">{{ row.customerName || '-' }}</template>
+            </el-table-column>
+            <el-table-column prop="creditCode" label="统一信用代码" min-width="160" align="center">
+              <template #default="{ row }">{{ row.creditCode || '-' }}</template>
+            </el-table-column>
+            <el-table-column prop="contactName" label="联系人" min-width="140" align="center">
+              <template #default="{ row }">{{ row.contactName || '-' }}</template>
+            </el-table-column>
+            <el-table-column prop="contactPhone" label="联系电话" min-width="140" align="center">
+              <template #default="{ row }">{{ row.contactPhone || '-' }}</template>
+            </el-table-column>
+          </el-table>
+        </section>
+      </template>
      <el-empty v-else description="暂无数据" />
    </basic-container>
  </div>
@@ -19,6 +43,36 @@

 <script>
 import { getMkPublicDetail, postMkPublicProcessMessage } from '@/api/mk-process';
+import { formatSealTypes } from '@/utils/settlement-seal';
+
+const createPartyRow = (row = {}) => ({
+  customerId: row.customerId || '',
+  customerName: row.customerName || '',
+  creditCode: row.creditCode || row.unifiedCreditCode || '',
+  contactId: row.contactId || '',
+  contactName: row.contactName || '',
+  contactPhone: row.contactPhone || '',
+});
+
+const parsePartyRows = (partyJson, fallbackName) => {
+  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 [];
+  return String(fallbackName)
+    .split(/[、,]/)
+    .map(name => name.trim())
+    .filter(Boolean)
+    .map(name => createPartyRow({ customerName: name }));
+};

 const FIELD_MAP = {
  'project-apply': [
@@ -38,8 +92,6 @@ const FIELD_MAP = {
    { label: '审核状态', prop: 'approvalStatusName' },
    { label: '当前节点', prop: 'currentNode' },
    { label: '当前处理人', prop: 'currentProcessor' },
-    { label: '甲方', prop: 'partyA' },
-    { label: '乙方', prop: 'partyB' },
    { label: '项目名称', prop: 'projectName', span: 2 },
  ],
  'pre-settlement': [
@@ -47,6 +99,7 @@ const FIELD_MAP = {
    { label: '合同名称', prop: 'contractName' },
    { label: '项目名称', prop: 'projectName' },
    { label: '结算金额', prop: 'settlementAmount' },
+    { label: '用印类型', prop: 'sealTypes' },
    { label: '审核状态', prop: 'approvalStatusName' },
    { label: '当前节点', prop: 'currentNode' },
    { label: '当前处理人', prop: 'currentProcessor' },
@@ -58,6 +111,7 @@ const FIELD_MAP = {
    { label: '项目名称', prop: 'projectName' },
    { label: '合同名称', prop: 'contractName' },
    { label: '结算金额', prop: 'settlementAmount' },
+    { label: '用印类型', prop: 'sealTypes' },
    { label: '审核状态', prop: 'approvalStatusName' },
    { label: '当前节点', prop: 'currentNode' },
    { label: '当前处理人', prop: 'currentProcessor' },
@@ -99,6 +153,26 @@ export default {
    visibleFields() {
      return FIELD_MAP[this.bizType] || [];
    },
+    partySections() {
+      if (!this.detail || this.bizType !== 'contract-manage') return [];
+      return [
+        {
+          role: 'A',
+          label: '甲方',
+          rows: parsePartyRows(this.detail.partyAJson, this.detail.partyA),
+        },
+        {
+          role: 'B',
+          label: '乙方',
+          rows: parsePartyRows(this.detail.partyBJson, this.detail.partyB),
+        },
+        {
+          role: 'C',
+          label: '丙方',
+          rows: parsePartyRows(this.detail.partyCJson, this.detail.partyC),
+        },
+      ];
+    },
  },
  created() {
    this.handleIframeHeight = () => this.sendIframeHeight();
@@ -192,6 +266,7 @@ export default {
        id: this.getFormId() || detail.id,
        subject: this.pageTitle,
        formInstanceId: this.getFormId(),
+        sealTypes: formatSealTypes(detail.sealTypes) || detail.sealTypes || '',
      };
    },
    getFormId() {
@@ -205,6 +280,12 @@ export default {
        ''
      );
    },
+    fieldDisplayValue(prop, value) {
+      if (prop === 'sealTypes') {
+        return formatSealTypes(value) || '-';
+      }
+      return this.displayValue(value);
+    },
    displayValue(value) {
      if (value === null || value === undefined || value === '') return '-';
      if (Array.isArray(value)) return value.join('、') || '-';
@@ -255,5 +336,33 @@ html.mk-iframe-page #app.mk-iframe-page {
      background: #409eff;
    }
  }
+
+  &__party {
+    margin-top: 16px;
+    padding: 14px 16px 16px;
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
+
+  &__party-title {
+    position: relative;
+    padding-left: 12px;
+    margin-bottom: 12px;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 22px;
+    color: #303133;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 0;
+      top: 2px;
+      width: 4px;
+      height: 18px;
+      background: #409eff;
+    }
+  }
 }
 </style>
@@ -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-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="settlementDialog.keyword"
+            v-model="contractDialog.query.contractNo"
            clearable
-          placeholder="结算单号、项目或合同"
-          @keyup.enter="loadSettlementCandidates"
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
          />
-        <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-form-item>
+        <el-form-item label="合同名称">
+          <el-input
+            v-model="contractDialog.query.contractName"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
          />
-        <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-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);
+    // 发票明细区块：按票号带出金蝶发票明细行（A801-1 镜像，推送 A303-2 分录同源）
+    async loadInvoiceDetail() {
+      if (!this.form.invoiceNo) {
+        this.invoiceItems = [];
+        return;
      }
-      });
-    },
-    async loadSettlementCandidates() {
-      this.settlementDialog.loading = true;
      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;
 }
@@ -119,6 +119,9 @@
            <el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
              {{ displayValue(row[column.prop]) }}
            </el-tag>
+            <el-tag v-else-if="column.kingdeeStatus" :type="kingdeePushStatusType(row.kingdeePushStatus)">
+              {{ displayValue(row[column.prop]) }}
+            </el-tag>
            <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
            <span v-else>{{ displayValue(row[column.prop]) }}</span>
          </template>
@@ -222,6 +225,11 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeePushStatusType } from '@/utils/kingdee';
+
+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
+const invoiceReceiptListRoute = '/payment/invoice-receipt';

 const emptyQuery = () => ({
  invoiceNo: '',
@@ -281,7 +289,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;
    },
@@ -455,6 +484,7 @@ export default {
        ''
      );
    },
+    kingdeePushStatusType,
    displayValue(value) {
      return value === null || value === undefined || value === '' ? '-' : value;
    },
@@ -97,7 +97,7 @@
                <el-option
                  v-for="item in contractOptions"
                  :key="item.id"
-                  :label="formatContractOptionLabel(item)"
+                  :label="item.contractName || item.contractNo"
                  :value="item.id"
                />
              </el-select>
@@ -354,11 +354,23 @@
          ><el-table-column prop="paidDate" label="付款日期" min-width="150" /><el-table-column
            prop="paymentNo"
            label="付款单号"
-            min-width="160" /><el-table-column
-            prop="kingdeeBillNo"
-            label="付款凭证"
-            min-width="160"
-        /></el-table>
+            min-width="160" /><el-table-column label="付款凭证" min-width="160"
+            ><template #default="{ row }"
+              ><div v-if="row.voucherFileName" class="payment-form-page__invoice-actions"
+                ><el-link
+                  type="primary"
+                  :disabled="kingdeeAttachmentBusy"
+                  @click="viewRecordVoucher(row)"
+                  >查看</el-link
+                ><el-link
+                  type="primary"
+                  :disabled="kingdeeAttachmentBusy"
+                  @click="downloadRecordVoucher(row)"
+                  >下载</el-link
+                ></div
+              ><span v-else>-</span></template
+            ></el-table-column
+          ></el-table>
      </section-card>
      <section-card>
        <template #title>
@@ -415,7 +427,8 @@
              ><el-input
                v-model="row.description"
                :disabled="readonly"
-                maxlength="200" /></template></el-table-column
+                maxlength="200"
+                placeholder="请输入" /></template></el-table-column
          ><el-table-column label="文件大小" width="120"
            ><template #default="{ row }">{{
              formatAttachmentSize(row)
@@ -732,13 +745,12 @@ import {
  getList as getCustomerArchiveList,
 } from '@/api/vehicle/customer-archive';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
-import { formatContractOptionLabel } from '@/utils/contract';
-import { downloadFileByUrl } from '@/utils/util';
+import { downloadFile, downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import {
-  downloadKingdeeInvoiceFile,
-  isKingdeePathAttachment,
-  viewKingdeeInvoiceFile,
+  downloadKingdeeFile,
+  requestKingdeeFile,
+  viewKingdeeFile,
 } from '@/utils/kingdee-attachment';
 import PdfPreview from '@/components/pdf-preview/main.vue';

@@ -883,8 +895,6 @@ export default {
      // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
      payeeRisky: false,
      payeeRiskTip: '',
-      payeeRiskLevel: '',
-      payeeBlackStatus: '',
      attachmentRuleLoading: false,
      // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
      linkedSettlementAttachmentUrls: [],
@@ -1065,14 +1075,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') {
@@ -1107,6 +1115,8 @@ export default {
      );
      this.$nextTick(() => {
        this.amountSyncing = false;
+        // 程序化赋值不触发校验，需手动重校验以清除/刷新残留错误
+        this.$refs.formRef?.validateField?.('appliedAmount').catch(() => {});
      });
    },
    'form.appliedAmount'(value) {
@@ -1136,6 +1146,7 @@ export default {
      );
      this.$nextTick(() => {
        this.amountSyncing = false;
+        this.$refs.formRef?.validateField?.('appliedAmount').catch(() => {});
      });
    },
  },
@@ -1144,7 +1155,6 @@ export default {
    this.initialize();
  },
  methods: {
-    formatContractOptionLabel,
    hasPermission(code) {
      return this.permission?.[code] !== false;
    },
@@ -1300,9 +1310,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 +1360,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 +1607,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 +1633,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 +1670,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'
      );
@@ -1888,55 +1913,80 @@ export default {
        return {};
      }
    },
-    invoiceAttachmentUrl(row) {
-      return this.attachmentFileUrl(this.invoiceAttachment(row));
-    },
    invoiceAttachmentName(row) {
      return (
        this.attachmentFileName(this.invoiceAttachment(row)) || `${row.invoiceNo || '发票'}.pdf`
      );
    },
-    async viewInvoiceAttachment(row) {
-      const attachment = this.invoiceAttachment(row);
-      // 金蝶侧附件（path 型）经后端代理 A801-2 预览，OSS 直链维持本地预览组件
-      if (isKingdeePathAttachment(attachment)) {
+    /** 金蝶附件查看/下载互斥闸门（A801-2 拉流较慢，进行中忽略重复点击，结束自动释放） */
+    async withKingdeeAttachmentBusy(action) {
      if (this.kingdeeAttachmentBusy) return;
      this.kingdeeAttachmentBusy = true;
      try {
-          await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        await action();
      } finally {
        this.kingdeeAttachmentBusy = false;
      }
+    },
+    async viewInvoiceAttachment(row) {
+      await this.withKingdeeAttachmentBusy(async () => {
+        // 发票版式文件按票号走金蝶票池（A801-2 镜像优先/实时回源），登记扫描件仅在票池无此票时兜底
+        try {
+          const blob = await requestKingdeeFile(row.invoiceNo);
+          const url = URL.createObjectURL(blob);
+          window.open(url, '_blank');
+          // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
+          setTimeout(() => URL.revokeObjectURL(url), 60000);
          return;
+        } catch (error) {
+          // 网络级失败（silent，拦截器已提示）不再回退；票池无此票回退登记附件
+          if (error?.silent) return;
        }
+        const attachment = this.invoiceAttachment(row);
        if (!this.attachmentFileUrl(attachment)) {
-        this.$message.warning('当前发票暂无可查看附件');
+          this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
          return;
        }
        this.previewAttachment(
          { ...attachment, name: this.invoiceAttachmentName(row) },
          [attachment]
        );
+      });
    },
    async downloadInvoiceAttachment(row) {
-      const attachment = this.invoiceAttachment(row);
-      // 金蝶侧附件（path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
-      if (isKingdeePathAttachment(attachment)) {
-        if (this.kingdeeAttachmentBusy) return;
-        this.kingdeeAttachmentBusy = true;
+      await this.withKingdeeAttachmentBusy(async () => {
        try {
-          await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
-        } finally {
-          this.kingdeeAttachmentBusy = false;
-        }
+          const blob = await requestKingdeeFile(row.invoiceNo);
+          downloadFile(blob, this.invoiceAttachmentName(row));
          return;
+        } catch (error) {
+          if (error?.silent) return;
        }
+        const attachment = this.invoiceAttachment(row);
        const url = this.attachmentFileUrl(attachment);
        if (!url) {
-        this.$message.warning('当前发票暂无可下载附件');
+          this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
          return;
        }
        downloadFileByUrl(url, this.invoiceAttachmentName(row));
+      });
+    },
+    /** 付款记录付款凭证（金蝶电子回单，A801-2 代理）：查看=新窗口预览，下载=保存文件 */
+    viewRecordVoucher(row) {
+      return this.withKingdeeAttachmentBusy(() =>
+        viewKingdeeFile(
+          () => api.downloadRecordVoucher(row.id),
+          `${row.paymentNo || '付款记录'}-付款凭证.pdf`
+        )
+      );
+    },
+    downloadRecordVoucher(row) {
+      return this.withKingdeeAttachmentBusy(() =>
+        downloadKingdeeFile(
+          () => api.downloadRecordVoucher(row.id),
+          `${row.paymentNo || '付款记录'}-付款凭证.pdf`
+        )
+      );
    },
    attachmentFileName(file) {
      return String(file?.originalName || file?.name || file?.fileName || '').trim();
@@ -2075,10 +2125,10 @@ export default {
    mergeAutomaticAttachments(
      files,
      materials,
-      sourceName,
      defaultMaterial = null,
      sourceKey = '',
-      keepUnmatched = false
+      keepUnmatched = false,
+      insertIndex = -1
    ) {
      const existingUrls = new Set(
        (this.form.attachments || []).map(file => this.attachmentFileUrl(file)).filter(Boolean)
@@ -2102,35 +2152,39 @@ export default {
            url,
            link: file.link || url,
            attachmentType: material ? MATERIAL_TYPE_MAP[material.key] : 'other',
-            description: file.description || `自动取自${sourceName}`,
+            description: file.description || '',
            sourceImported: true,
            sourceKey: sourceKey || undefined,
          };
        });
-      if (imported.length) this.form.attachments = [...this.form.attachments, ...imported];
+      if (imported.length) {
+        // 回填到被替换附件的原起始位置，避免回显/切换时把用户新传附件顶到前面
+        const attachments = [...this.form.attachments];
+        const insertAt =
+          insertIndex >= 0 ? Math.min(insertIndex, attachments.length) : attachments.length;
+        attachments.splice(insertAt, 0, ...imported);
+        this.form.attachments = attachments;
+      }
      return imported;
    },
-    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换） */
-    removeAutomaticAttachments(sourceKey, sourceName = '') {
+    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换），返回首个被移除的位置 */
+    removeAutomaticAttachments(sourceKey) {
      const previousUrls = new Set(
        sourceKey === 'settlement' ? this.linkedSettlementAttachmentUrls || [] : []
      );
-      this.form.attachments = (this.form.attachments || []).filter(file => {
+      let firstRemovedIndex = -1;
+      this.form.attachments = (this.form.attachments || []).filter((file, index) => {
        const url = this.attachmentFileUrl(file);
-        if (sourceKey && file.sourceKey === sourceKey) return false;
-        if (
-          sourceName &&
-          file.sourceImported &&
-          String(file.description || '').includes(`自动取自${sourceName}`)
-        ) {
-          return false;
-        }
-        if (previousUrls.size && url && previousUrls.has(url)) return false;
-        return true;
+        const keep =
+          !(sourceKey && file.sourceKey === sourceKey) &&
+          !(previousUrls.size && url && previousUrls.has(url));
+        if (!keep && firstRemovedIndex === -1) firstRemovedIndex = index;
+        return keep;
      });
      if (sourceKey === 'settlement') {
        this.linkedSettlementAttachmentUrls = [];
      }
+      return firstRemovedIndex;
    },
    /** 按当前结算单附件整批同步：先清旧关联，再写入新结算单上传的附件 */
    syncSettlementAttachments(settlementRows = []) {
@@ -2145,14 +2199,14 @@ export default {
          .map(file => this.attachmentFileUrl(file))
          .filter(url => url && nextUrlSet.has(url));
      }
-      this.removeAutomaticAttachments('settlement', '结算单');
+      const removedAt = this.removeAutomaticAttachments('settlement');
      const imported = this.mergeAutomaticAttachments(
        settlementFiles,
        settlementMaterials,
-        '结算单',
        null,
        'settlement',
-        true
+        true,
+        removedAt
      );
      this.linkedSettlementAttachmentUrls = imported
        .map(file => this.attachmentFileUrl(file))
@@ -2203,7 +2257,7 @@ export default {
        this.syncSettlementAttachments(settlementRows);
        if (!this.form.contractId) {
          this.firstContractPayment = false;
-          this.removeAutomaticAttachments('contract', '合同');
+          this.removeAutomaticAttachments('contract');
          return;
        }
        const contractResponse = await getContractDetail(this.form.contractId);
@@ -2215,13 +2269,14 @@ export default {
          this.contractSignatureFileAvailable = contractFiles.some(file =>
            Boolean(this.attachmentFileUrl(file))
          );
-          this.removeAutomaticAttachments('contract', '合同');
+          const contractRemovedAt = this.removeAutomaticAttachments('contract');
          this.mergeAutomaticAttachments(
            contractFiles,
            [ATTACHMENT_MATERIALS.contract],
-            '合同',
            ATTACHMENT_MATERIALS.contract,
-            'contract'
+            'contract',
+            false,
+            contractRemovedAt
          );
          return;
        }
@@ -2235,14 +2290,15 @@ export default {
            String(item.id || '') !== String(this.form.id || '') &&
            item.approvalStatus !== 'voided'
        );
-        this.removeAutomaticAttachments('contract', '合同');
+        const contractRemovedAt = this.removeAutomaticAttachments('contract');
        if (this.firstContractPayment) {
          this.mergeAutomaticAttachments(
            this.parse(contract.contractFileJson),
            [ATTACHMENT_MATERIALS.contract],
-            '合同',
            ATTACHMENT_MATERIALS.contract,
-            'contract'
+            'contract',
+            false,
+            contractRemovedAt
          );
        }
      } catch (error) {
@@ -2341,8 +2397,6 @@ export default {
      this.payeeCustomerLevel = '';
      this.payeeRisky = false;
      this.payeeRiskTip = '';
-      this.payeeRiskLevel = '';
-      this.payeeBlackStatus = '';
      if (!partyBName) {
        if (!preserveCurrentValue) this.clearReceiptAccount();
        return;
@@ -2381,8 +2435,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 +2830,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;
@@ -1,13 +1,61 @@
 <template>
  <basic-container class="payment-page">
+    <section class="payment-search">
+      <el-form :model="searchForm" label-position="right" label-width="88px" @submit.prevent>
+        <div class="payment-search__grid">
+          <template v-for="field in visibleSearchFields" :key="field.prop">
+            <el-form-item :label="field.label">
+              <el-date-picker
+                v-if="field.type === 'daterange'"
+                v-model="searchForm[field.prop]"
+                type="daterange"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                range-separator="~"
+                start-placeholder="年/月/日"
+                end-placeholder="年/月/日"
+              />
+              <el-select
+                v-else-if="field.type === 'select'"
+                v-model="searchForm[field.prop]"
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in field.options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+              <el-cascader
+                v-else-if="field.type === 'cascader'"
+                v-model="searchForm[field.prop]"
+                :options="organizationSearchTreeOptions"
+                :props="organizationCascaderProps"
+                filterable
+                clearable
+                placeholder="请选择 所属组织"
+              />
+              <el-input v-else v-model="searchForm[field.prop]" clearable placeholder="请输入" />
+            </el-form-item>
+          </template>
+          <div class="payment-search__actions">
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button @click="handleReset">重置</el-button>
+            <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
+              {{ searchExpanded ? '收起' : '展开' }}
+            </el-button>
+          </div>
+        </div>
+      </el-form>
+    </section>
    <avue-crud
      ref="crud"
      :option="option"
      :table-loading="loading"
      :data="rows"
      v-model:page="page"
-      @search-change="searchChange"
-      @search-reset="searchReset"
      @selection-change="selectionChange"
      @current-change="currentChange"
      @size-change="sizeChange"
@@ -80,6 +128,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')"
@@ -157,6 +222,7 @@
 </template>

 <script>
+import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/paymentApplication';
 import { paymentApplicationOption } from '@/option/payment/paymentApplication';
@@ -173,6 +239,8 @@ export default {
  mixins: [organizationSearch],
  data() {
    return {
+      ArrowDown,
+      ArrowUp,
      rows: [],
      selection: [],
      loading: false,
@@ -180,6 +248,9 @@ export default {
      syncLoading: false,
      resultSyncing: false,
      query: {},
+      // 手写搜索区（与应收/应付明细同款）：模型与展开状态
+      searchForm: {},
+      searchExpanded: false,
      option: {},
      page: {
        currentPage: 1,
@@ -192,13 +263,37 @@ export default {
  },
  computed: {
    ...mapGetters(['permission']),
+    // 搜索字段与应收/应付明细同结构；下拉选项沿用 api 常量
+    searchFields() {
+      return [
+        { label: '单据号', prop: 'paymentNo', type: 'input' },
+        { label: '日期', prop: 'applyDateRange', type: 'daterange' },
+        { label: '客户名称', prop: 'payeeName', type: 'input' },
+        { label: '项目名称', prop: 'projectName', type: 'input' },
+        { label: '所属组织', prop: 'deptName', type: 'cascader' },
+        { label: '关联结算单', prop: 'settlementNo', type: 'input' },
+        { label: '付款类型', prop: 'paymentType', type: 'select', options: api.paymentTypeOptions },
+        {
+          label: '审核状态',
+          prop: 'approvalStatus',
+          type: 'select',
+          options: api.approvalStatusOptions,
+        },
+        {
+          label: '金蝶单据状态',
+          prop: 'kingdeeStatus',
+          type: 'select',
+          options: api.kingdeeStatusOptions,
+        },
+      ];
+    },
+    // 默认折叠只展示一行 4 个条件
+    visibleSearchFields() {
+      return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
+    },
  },
  created() {
-    this.option = paymentApplicationOption({
-      paymentTypeOptions: api.paymentTypeOptions,
-      approvalStatusOptions: api.approvalStatusOptions,
-      kingdeeStatusOptions: api.kingdeeStatusOptions,
-    });
+    this.option = paymentApplicationOption();
    this.loadOrganizationOptions();
  },
  mounted() {
@@ -254,26 +349,30 @@ export default {
          this.$refs.crud?.toggleSelection?.();
        });
    },
-    searchChange(params, done) {
-      // 所属组织级联返回 id 路径数组，转成部门名称给后端
+    // 搜索提交：组织级联路径转名称、日期区间拆成起止参数（与原 avue searchChange 同规则）
+    buildSearchParams() {
+      const params = { ...this.searchForm };
      this.normalizeOrganizationSearch(params, 'deptName');
-      // 日期区间拆成后端需要的起止字段
      const range = params.applyDateRange || [];
      delete params.applyDateRange;
-      this.query = {
-        ...params,
-        applyStartDate: range[0] || '',
-        applyEndDate: range[1] || '',
-      };
+      return { ...params, applyStartDate: range[0] || '', applyEndDate: range[1] || '' };
+    },
+    handleSearch() {
+      this.query = this.buildSearchParams();
      this.page.currentPage = 1;
      this.onLoad(this.page);
-      done();
    },
-    searchReset() {
+    handleReset() {
+      this.searchForm = {};
      this.query = {};
      this.page.currentPage = 1;
      this.onLoad(this.page);
    },
+    toggleSearch() {
+      this.searchExpanded = !this.searchExpanded;
+      // 搜索区在 avue 外部，高度变化 avue 感知不到，手动触发表格高度重算，保证分页在一屏内
+      this.$nextTick(() => this.$refs.crud?.getTableHeight?.());
+    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
    },
@@ -409,6 +508,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 +530,7 @@ export default {
        this.warnAttachmentNotUploaded(rows.map(row => row.id));
      } finally {
        this.syncLoading = false;
+        loading.close();
      }
    },
    // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
@@ -520,6 +626,56 @@ export default {
 </script>

 <style scoped lang="scss">
+// 搜索区与应收/应付明细页（settlement-detail-page__search）同款样式
+.payment-search {
+  margin-bottom: 8px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+
+  :deep(.el-form-item__label) {
+    white-space: nowrap;
+  }
+}
+
+.payment-search__grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(220px, 1fr));
+  gap: 8px 24px;
+  align-items: start;
+
+  :deep(.el-form-item) {
+    margin-bottom: 8px;
+  }
+
+  :deep(.el-input),
+  :deep(.el-select),
+  :deep(.el-cascader),
+  :deep(.el-date-editor) {
+    width: 100%;
+  }
+}
+
+.payment-search__actions {
+  grid-column: 1 / -1;
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-bottom: 8px;
+}
+
+@media screen and (max-width: 1200px) {
+  .payment-search__grid {
+    grid-template-columns: repeat(2, minmax(220px, 1fr));
+  }
+}
+
+@media screen and (max-width: 760px) {
+  .payment-search__grid {
+    grid-template-columns: 1fr;
+  }
+}
+
 .payment-page :deep(.el-table) {
  --el-table-border-color: #eff1f7;
 }
@@ -78,14 +78,35 @@
                    :value="item.dictKey"
                  />
                </el-select>
+                <el-select
+                  v-else-if="field.type === 'multi-select' && editable"
+                  v-model="form[field.prop]"
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in formSelectOptions(field)"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
                <span
                  v-else-if="field.prop === 'formalSettlementNo'"
                  :class="{ 'form-readonly--code': form.formalSettlementNo }"
                >
                  {{ form.formalSettlementNo || (form.id ? '-' : '系统自动生成') }}
                </span>
-                <span v-else-if="field.money">{{ formatMoney(form[field.prop]) }}</span>
-                <span v-else-if="field.type === 'select'">{{
+                <span v-else-if="field.money">{{
+                  formatMoney(
+                    form[field.prop],
+                    field.prop === 'settlementAmount' ? settlementCurrencyCode : 'RMB'
+                  )
+                }}</span>
+                <span v-else-if="field.type === 'select' || field.type === 'multi-select'">{{
                  formSelectLabel(field, form[field.prop])
                }}</span>
                <span v-else-if="field.type === 'contract'">{{
@@ -180,7 +201,7 @@
                  'formal-editor__negative-amount': isNegativeAdjustedAmount(row, column.prop),
                }"
              >
-                {{ formatMoney(row[column.prop]) }}
+                {{ formatMoney(row[column.prop], settlementCurrencyCode) }}
              </span>
              <span v-else-if="column.prop === 'feeType'">{{ feeCategoryName(row.feeType) }}</span>
              <span v-else>{{ displayValue(row[column.prop]) }}</span>
@@ -201,7 +222,7 @@
          class="formal-editor__settle-summary"
        >
          <el-descriptions-item label="结算合计（原金额）">
-            {{ formatMoney(form.settlementAmount) }}
+            {{ formatMoney(form.settlementAmount, settlementCurrencyCode) }}
          </el-descriptions-item>
          <el-descriptions-item label="已付金额（含预付、核销）">
            {{ formatMoney(settlePaidTotal) }}
@@ -306,7 +327,7 @@
              </el-link>
              <span v-else-if="item.column.money">{{ formatMoney(row[item.column.prop]) }}</span>
              <span v-else-if="item.column.prop === 'transportQuantity'">
-                {{ formatDetailTransportQuantity(row[item.column.prop]) }}
+                {{ formatDetailTransportQuantity(row) }}
              </span>
              <span v-else-if="item.column.prop === 'mileage'">
                {{ formatDetailMileage(row[item.column.prop]) }}
@@ -362,7 +383,6 @@
                v-model="row.type"
                filterable
                placeholder="请选择类型"
-                @change="sortAttachments"
              >
                <el-option
                  v-for="item in attachmentTypeOptions"
@@ -440,8 +460,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 +479,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 +502,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 +555,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 +603,11 @@
        @confirm="handleInvoiceClaimConfirm"
      />

+      <invoice-receipt-candidates-dialog
+        v-model="invoiceReceiptDialog.visible"
+        @confirm="handleInvoiceReceiptConfirm"
+      />
+
      <section-card
        v-if="readonly"
        :title="form.settlementType === 'receivable' ? '收款信息' : '付款信息'"
@@ -708,7 +770,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 +788,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 +1115,10 @@ import {
  getNextNo,
  getReceiptClaims,
  claimInvoices as claimInvoicesApi,
+  repushClaimedInvoice,
  queryInvoicePool,
  save,
+  syncKingdee,
 } from '@/api/settlement/formalSettlement';
 import {
  getDetail as getPreSettlementDetail,
@@ -1063,6 +1131,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,
@@ -1084,17 +1153,18 @@ import {
  settlementRecordTypeName,
  settlementStatusName,
 } from '@/utils/settlementStatus';
-import { downloadFileByUrl } from '@/utils/util';
-import {
-  downloadKingdeeInvoiceFile,
-  isKingdeePathAttachment,
-  viewKingdeeInvoiceFile,
-} from '@/utils/kingdee-attachment';
+import { downloadFile, downloadFileByUrl } from '@/utils/util';
+import { requestKingdeeFile } from '@/utils/kingdee-attachment';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
+import {
+  formatSealTypes,
+  parseSealTypes,
+  SETTLEMENT_SEAL_TYPE_OPTIONS,
+} from '@/utils/settlement-seal';
 import * as settlementAdjustmentApi from '@/api/settlement/settlementAdjustment';

 // 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
@@ -1105,6 +1175,7 @@ export default {
  components: {
    InfoFilled,
    KingdeeInvoicePoolDialog,
+    InvoiceReceiptCandidatesDialog,
    ChangeRecordDetailDialog,
    ProjectAdvanceWriteOff,
  },
@@ -1128,6 +1199,7 @@ export default {
      loading: false,
      draftSaving: false,
      saving: false,
+      syncLoading: false,
      form: createFormalSettlementForm(),
      sources: [],
      details: [],
@@ -1143,6 +1215,8 @@ export default {
      attachments: [],
      selectedAttachmentRows: [],
      invoices: [],
+      // 查看页认领收票单重推进行中（行级操作守卫）
+      repushing: false,
      // 开票申请经金蝶回写的发票结果（只读展示，含板式文件/数电PDF下载地址）
      issuedInvoices: [],
      // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
@@ -1152,6 +1226,10 @@ export default {
        selected: [],
        confirming: false,
      },
+      // 先票后款：付款结算单选收票单（审批通过+未认领）弹窗
+      invoiceReceiptDialog: {
+        visible: false,
+      },
      attachmentUploadFiles: [],
      attachmentTypeOptions: [],
      attachmentFileTypes: [
@@ -1178,6 +1256,7 @@ export default {
      feeCategoryOptions: [],
      businessModelOptions: [],
      transportTypeOptions: [],
+      sealTypeOptions: SETTLEMENT_SEAL_TYPE_OPTIONS,
      fields: formalSettlementFormFields,
      sourceTableColumns: sourceColumns,
      summaryTableColumns: summaryColumns,
@@ -1271,6 +1350,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);
    },
@@ -1307,6 +1396,10 @@ export default {
    isLocalCurrencySettlement() {
      return normalizeCurrencyCode(this.form.currency) === 'RMB';
    },
+    // 结算单据币种：本位币结算固定 RMB，外币结算取归一化后的合同结算币种
+    settlementCurrencyCode() {
+      return this.isLocalCurrencySettlement ? 'RMB' : normalizeCurrencyCode(this.form.currency);
+    },
    visibleFields() {
      if (!this.isLocalCurrencySettlement) return this.fields;
      return this.fields.filter(field => !LOCAL_CURRENCY_HIDDEN_FIELDS.includes(field.prop));
@@ -1431,6 +1524,7 @@ export default {
      this.form = {
        ...createFormalSettlementForm(),
        ...data,
+        sealTypes: parseSealTypes(data.sealTypes),
        sourcePreSettlementIds: (data.sources || []).map(item => item.preSettlementId),
        sourceDetailIds: (data.details || [])
          .filter(item => !item.sourcePreSettlementId)
@@ -1463,7 +1557,6 @@ export default {
      this.selectedAttachmentRows = [];
      this.invoices = data.invoices || [];
      this.issuedInvoices = data.issuedInvoices || [];
-      this.sortAttachments();
      this.contracts = this.filterContracts(this.allContracts, this.form.projectId);
    },
    async initialize() {
@@ -1635,6 +1728,7 @@ export default {
        contractId,
        settlementType,
        settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
+        sealTypes: parseSealTypes(first.sealTypes),
        sourcePreSettlementIds: this.form.sourcePreSettlementIds,
      });
      const responses = await Promise.all(
@@ -1877,15 +1971,17 @@ export default {
        Object.assign(this.form, this.sources[0], {
          contractId: this.sources[0].contractId,
          formalSettlementNo: this.form.formalSettlementNo,
+          sealTypes: parseSealTypes(this.sources[0].sealTypes),
        });
        this.refreshFormalSettlementNo();
      }
-      this.form.settlementAmount = this.sources.reduce(
+      // 来源预结算金额为本位币；外币结算时结算金额按汇率反算，本位币合计保留本位币汇总
+      const sourceTotal = this.sources.reduce(
        (sum, item) => sum + Number(item.settlementAmount || 0),
        0
      );
-      this.form.localSettlementAmount =
-        this.form.settlementAmount * Number(this.form.exchangeRate || 1);
+      this.form.settlementAmount = this.convertLocalToSettlementAmount(sourceTotal);
+      this.form.localSettlementAmount = Number(sourceTotal).toFixed(2);
      this.candidate.visible = false;
      // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行，额度单份占用）
      const newIds = this.sources
@@ -2035,7 +2131,7 @@ export default {
        if (index === 0) return '合计';
        if (!sumProps.includes(column.property)) return '';
        const total = data.reduce((sum, row) => sum + Number(row[column.property] || 0), 0);
-        const totalText = this.formatMoney(total);
+        const totalText = this.formatMoney(total, this.settlementCurrencyCode);
        if (column.property === 'settlementAmount' && hasNegativeAdjustment) {
          return h('span', { style: { color: 'var(--el-color-danger)' } }, totalText);
        }
@@ -2635,6 +2731,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 +2920,7 @@ export default {
        }
        matchedTotal += matchedAmount;
      }
-      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
-        this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
-        return false;
-      }
+      // 先票后款全额认领：匹配金额=发票全额，可超过结算金额，不再校验合计上限（收票状态按覆盖判定）
      return true;
    },
    removeInvoice(index) {
@@ -2779,38 +2947,45 @@ export default {
      return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
    },
    async viewInvoiceAttachment(row) {
-      const attachment = this.invoiceAttachment(row);
-      // 金蝶侧附件（path 型）经后端代理 A801-2 预览，OSS 直链维持 window.open
-      if (isKingdeePathAttachment(attachment)) {
      if (this.kingdeeAttachmentBusy) return;
      this.kingdeeAttachmentBusy = true;
      try {
-          await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        // 发票版式文件按票号走金蝶票池（A801-2 镜像优先/实时回源），登记扫描件仅在票池无此票时兜底
+        try {
+          const blob = await requestKingdeeFile(row.invoiceNo);
+          const url = URL.createObjectURL(blob);
+          window.open(url, '_blank');
+          // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
+          setTimeout(() => URL.revokeObjectURL(url), 60000);
+          return;
+        } catch (error) {
+          // 网络级失败（silent，拦截器已提示）不再回退；票池无此票回退登记附件
+          if (error?.silent) return;
+        }
+        const url = this.invoiceAttachmentUrl(row);
+        if (!url) return this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
+        window.open(url, '_blank');
      } finally {
        this.kingdeeAttachmentBusy = false;
      }
-        return;
-      }
-      const url = this.invoiceAttachmentUrl(row);
-      if (!url) return this.$message.warning('当前发票暂无可查看附件');
-      window.open(url, '_blank');
    },
    async downloadInvoiceAttachment(row) {
-      const attachment = this.invoiceAttachment(row);
-      // 金蝶侧附件（path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
-      if (isKingdeePathAttachment(attachment)) {
      if (this.kingdeeAttachmentBusy) return;
      this.kingdeeAttachmentBusy = true;
      try {
-          await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        try {
+          const blob = await requestKingdeeFile(row.invoiceNo);
+          downloadFile(blob, this.invoiceAttachmentName(row));
+          return;
+        } catch (error) {
+          if (error?.silent) return;
+        }
+        const url = this.invoiceAttachmentUrl(row);
+        if (!url) return this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
+        downloadFileByUrl(url, this.invoiceAttachmentName(row));
      } finally {
        this.kingdeeAttachmentBusy = false;
      }
-        return;
-      }
-      const url = this.invoiceAttachmentUrl(row);
-      if (!url) return this.$message.warning('当前发票暂无可下载附件');
-      downloadFileByUrl(url, this.invoiceAttachmentName(row));
    },
    // 开票发票预览地址：数电PDF优先（OFD浏览器无法预览），退预览图、板式文件
    issuedInvoicePreviewUrl(row) {
@@ -2854,6 +3029,7 @@ export default {
          })),
        businessModel: this.form.businessModel || undefined,
        transportType: this.form.transportType || undefined,
+        sealTypes: formatSealTypes(this.form.sealTypes) || undefined,
        exchangeRateDate: this.form.exchangeRateDate,
        exchangeRate: this.form.exchangeRate,
        summaryFees: this.summaryFees
@@ -2887,8 +3063,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() {
      // 保存草稿：不做表单校验，直接落草稿并返回列表刷新
@@ -3008,16 +3206,16 @@ export default {
      const body = response?.data || response || {};
      return body?.data || body;
    },
-    formatMoney(value) {
-      return `${Number(value || 0).toFixed(2)} RMB`;
+    formatMoney(value, currency = 'RMB') {
+      return `${Number(value || 0).toFixed(2)} ${currency}`;
    },
-    formatQuantity(value) {
-      if (value === undefined || value === null || value === '') return '-';
+    formatDetailTransportQuantity(row) {
+      const value = row.transportQuantity;
+      if (this.readonly && Number(value) === -1) return '-';
      const quantity = Number(value);
-      return Number.isFinite(quantity) ? quantity.toFixed(2) : '-';
-    },
-    formatDetailTransportQuantity(value) {
-      return this.readonly && Number(value) === -1 ? '-' : this.formatQuantity(value);
+      if (!Number.isFinite(quantity)) return '-';
+      // 与预结算编辑器 formatQuantity 保持一致，拼接计量单位
+      return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
    },
    formatDetailMileage(value) {
      return this.readonly && Number(value) === -1 ? '-' : this.displayValue(value);
@@ -3044,6 +3242,9 @@ export default {
      return Array.isArray(options) ? options : [];
    },
    formSelectLabel(field, value) {
+      if (field?.type === 'multi-select') {
+        return formatSealTypes(value) || '-';
+      }
      if (value === undefined || value === null || value === '') return '-';
      const normalized = String(value).trim();
      const option = this.formSelectOptions(field).find(
@@ -3074,7 +3275,6 @@ export default {
        label: item.dictValue,
        value: item.dictValue,
      }));
-      this.sortAttachments();
    },
    resolveAttachmentType(fileName) {
      const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3098,25 +3298,6 @@ export default {
      const typeText = String(item?.label || item?.value || '').trim();
      return typeText === '其他' || typeText === '其他附件';
    },
-    getAttachmentTypeOrder(type) {
-      const normalizedType = String(type || '').trim();
-      const index = this.attachmentTypeOptions.findIndex(
-        item =>
-          String(item.value || '').trim() === normalizedType ||
-          String(item.label || '').trim() === normalizedType
-      );
-      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
-    },
-    sortAttachments() {
-      this.attachments = (this.attachments || [])
-        .map((file, index) => ({ file, index }))
-        .sort((a, b) => {
-          const orderDifference =
-            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
-          return orderDifference || a.index - b.index;
-        })
-        .map(item => item.file);
-    },
    getMissingAttachmentTypes(files = this.attachments) {
      const uploadedTypes = new Set(
        (files || [])
@@ -3146,7 +3327,6 @@ export default {
        size: this.formatAttachmentSize(file.size),
        url: file.url || file.link || '',
      });
-      this.sortAttachments();
    },
    handleAttachmentSelectionChange(rows) {
      this.selectedAttachmentRows = rows || [];
@@ -3222,10 +3402,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 {};
      }
@@ -5,8 +5,6 @@
    :table-loading="loading"
    :data="rows"
    v-model:page="crudPage"
-    @search-change="(params, done) => $emit('search-change', params, done)"
-    @search-reset="$emit('search-reset')"
    @selection-change="handleSelectionChange"
    @refresh-change="$emit('refresh')"
    @on-load="page => $emit('load', page)"
@@ -23,6 +21,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"
@@ -52,7 +59,9 @@
      }}</span>
    </template>

-    <template #paymentStatusName="{ row }">{{ paymentName(row.paymentStatus) }}</template>
+    <template #paymentStatusName="{ row }">{{
+      paymentName(row.paymentStatus, row.settlementType)
+    }}</template>

    <template #approvalStatusName="{ row }">
      <el-tag :type="statusType(row.approvalStatus)" class="status-text">{{
@@ -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',
@@ -119,8 +154,6 @@ export default {
    'load',
    'action',
    'update:selection',
-    'search-change',
-    'search-reset',
  ],
  data() {
    return {
@@ -146,6 +179,10 @@ export default {
    },
  },
  methods: {
+    /** 搜索区展开/收起后由父级调用：avue 表格是固定像素高度，需手动触发了重新计算，否则分页会被推出视口 */
+    recalcTableHeight() {
+      this.$nextTick(() => this.$refs.crud?.getTableHeight?.());
+    },
    handleSelectionChange(selection) {
      this.selection = selection;
      this.$emit('update:selection', selection);
@@ -201,12 +238,16 @@ export default {
    invoiceName(value, settlementType) {
      return invoiceStatusName(value, settlementType);
    },
-    paymentName(value) {
-      return paymentStatusName(value);
+    paymentName(value, settlementType) {
+      return paymentStatusName(value, settlementType);
    },
    kingdeeSyncName(value) {
      return kingdeeSyncName(value);
    },
+    kingdeeWriteOffName(value) {
+      return kingdeeWriteOffName(value);
+    },
+    kingdeeWriteOffTagType,
    lockTag(row) {
      if (row.kingdeeLockStatus === 'locked') {
        return {
@@ -0,0 +1,187 @@
+<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';
+import { kingdeePushStatusType } from '@/utils/kingdee';
+
+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 kingdeePushStatusType(value);
+    },
+    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>
@@ -67,7 +67,26 @@
                    :value="item.dictKey"
                  />
                </el-select>
-                <span v-else-if="field.type === 'select'" class="form-readonly">
+                <el-select
+                  v-else-if="field.type === 'multi-select' && editable"
+                  v-model="form[field.prop]"
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in formSelectOptions(field)"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
+                <span
+                  v-else-if="field.type === 'select' || field.type === 'multi-select'"
+                  class="form-readonly"
+                >
                  {{ formSelectLabel(field, form[field.prop]) }}
                </span>
                <el-input
@@ -371,7 +390,6 @@
                  v-model="row.type"
                  filterable
                  placeholder="请选择"
-                  @change="sortAttachments"
                >
                  <el-option
                    v-for="item in attachmentTypeOptions"
@@ -989,6 +1007,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,
@@ -1024,6 +1043,11 @@ import { downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
+import {
+  formatSealTypes,
+  parseSealTypes,
+  SETTLEMENT_SEAL_TYPE_OPTIONS,
+} from '@/utils/settlement-seal';

 // 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
 const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount'];
@@ -1072,6 +1096,8 @@ export default {
      changeTableColumns: changeRecordColumns,
      candidateColumns: candidateDetailColumns,
      contractOptions: [],
+      payerOptions: [],
+      payeeOptions: [],
      contractCategoryOptions,
      signTypeOptions,
      effectiveTypeOptions,
@@ -1114,6 +1140,7 @@ export default {
      feeCategoryOptions: [],
      businessModelOptions: [],
      transportTypeOptions: [],
+      sealTypeOptions: SETTLEMENT_SEAL_TYPE_OPTIONS,
      summaryFees: [],
      details: [],
      detailCollapsed: false,
@@ -1391,18 +1418,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 +1459,8 @@ export default {
          settlementType,
          partyA: contractPartyA,
          partyB: contractPartyB,
+          partyAJson: contractPartyAJson,
+          partyBJson: contractPartyBJson,
        });
      }
      this.handleContractChange(contractId);
@@ -1427,12 +1472,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 +1561,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 = [];
@@ -1530,7 +1577,11 @@ export default {
          ? await getMkPublicDetail('pre-settlement', this.form.id || this.recordId)
          : await getDetail(this.form.id || this.recordId);
        const detail = response.data?.data || {};
-        this.form = { ...emptyPreSettlementForm(), ...detail };
+        this.form = {
+          ...emptyPreSettlementForm(),
+          ...detail,
+          sealTypes: parseSealTypes(detail.sealTypes),
+        };
        this.summaryFees = (detail.summaryFees || []).map(row => ({ ...row }));
        this.details = (detail.details || []).map(row => this.normalizeSourceDetail(row));
        this.detailPage.current = 1;
@@ -1550,23 +1601,21 @@ export default {
          row => !isApprovalSettlementChange(row.changeContent)
        );
        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 +1689,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 +1700,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 (
@@ -1693,6 +1744,9 @@ export default {
      return Array.isArray(options) ? options : [];
    },
    formSelectLabel(field, value) {
+      if (field?.type === 'multi-select') {
+        return formatSealTypes(value) || '-';
+      }
      if (value === undefined || value === null || value === '') return '-';
      const normalized = String(value).trim();
      const option = this.formSelectOptions(field).find(
@@ -1714,6 +1768,8 @@ export default {
        this.form.deptName = '';
        this.form.payerName = '';
        this.form.payeeName = '';
+        this.payerOptions = [];
+        this.payeeOptions = [];
        this.summaryFees = [];
        this.projectAdvanceWriteOffs = [];
        return;
@@ -1726,9 +1782,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 +1792,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) {
@@ -1771,6 +1972,9 @@ export default {
            subjectName: this.form.preSettlementNo || this.form.contractName || '',
            approvalStatus: previousApprovalStatus,
            mkEnabled: await loadMkEnabled().catch(() => false),
+            tempVarData: {
+              sealTypes: formatSealTypes(this.form.sealTypes) || '',
+            },
          });
          this.$message.success(mkStarted ? '审批流程已发起' : '提交成功');
          this.visible = false;
@@ -1790,6 +1994,7 @@ export default {
        contractId: this.form.contractId,
        businessModel: this.form.businessModel || undefined,
        transportType: this.form.transportType || undefined,
+        sealTypes: formatSealTypes(this.form.sealTypes) || undefined,
        exchangeRateDate: this.form.exchangeRateDate || undefined,
        exchangeRate: this.form.exchangeRate,
        attachmentsJson: JSON.stringify(this.attachments || []),
@@ -2928,7 +3133,6 @@ export default {
          uploadTime: existing?.uploadTime || file.uploadTime || uploadTime,
        };
      });
-      this.sortAttachments();
      this.selectedAttachmentRows = [];
    },
    async loadAttachmentTypeOptions() {
@@ -2944,7 +3148,6 @@ export default {
      } catch (error) {
        this.attachmentTypeOptions = [];
      }
-      this.sortAttachments();
    },
    resolveAttachmentType(fileName) {
      const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -2972,25 +3175,6 @@ export default {
        typeText === '其它附件'
      );
    },
-    getAttachmentTypeOrder(type) {
-      const normalizedType = String(type || '').trim();
-      const index = this.attachmentTypeOptions.findIndex(
-        item =>
-          String(item.value || '').trim() === normalizedType ||
-          String(item.label || '').trim() === normalizedType
-      );
-      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
-    },
-    sortAttachments() {
-      this.attachments = (this.attachments || [])
-        .map((file, index) => ({ file, index }))
-        .sort((a, b) => {
-          const orderDifference =
-            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
-          return orderDifference || a.index - b.index;
-        })
-        .map(item => item.file);
-    },
    attachmentTypeName(type) {
      const option = this.attachmentTypeOptions.find(
        item => String(item.value) === String(type) || String(item.label) === String(type)
@@ -3061,6 +3245,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 || '';
 };

@@ -17,6 +17,7 @@
 <script>
 import MkPublicShell from '@/views/mk/mk-public-shell.vue';
 import FormalSettlementEditor from '@/views/settlement/components/formal-settlement-editor.vue';
+import { formatSealTypes } from '@/utils/settlement-seal';

 export default {
  name: 'FormalSettlementPublicView',
@@ -29,7 +30,11 @@ export default {
  methods: {
    getForm() {
      const form = this.$refs.page?.form || {};
-      return { ...form, subject: form.formalSettlementNo || form.contractName || '' };
+      return {
+        ...form,
+        sealTypes: formatSealTypes(form.sealTypes) || '',
+        subject: form.formalSettlementNo || form.contractName || '',
+      };
    },
  },
 };
@@ -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>
@@ -1,5 +1,55 @@
 <template>
  <basic-container class="formal-page">
+    <section class="formal-search">
+      <el-form :model="searchForm" label-position="right" label-width="88px" @submit.prevent>
+        <div class="formal-search__grid">
+          <template v-for="field in visibleSearchFields" :key="field.prop">
+            <el-form-item :label="field.label">
+              <el-date-picker
+                v-if="field.type === 'daterange'"
+                v-model="searchForm[field.prop]"
+                type="daterange"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                range-separator="~"
+                start-placeholder="年/月/日"
+                end-placeholder="年/月/日"
+              />
+              <el-select
+                v-else-if="field.type === 'select'"
+                v-model="searchForm[field.prop]"
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in field.options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+              <el-cascader
+                v-else-if="field.type === 'cascader'"
+                v-model="searchForm[field.prop]"
+                :options="organizationSearchTreeOptions"
+                :props="organizationCascaderProps"
+                filterable
+                clearable
+                placeholder="请选择 所属组织"
+              />
+              <el-input v-else v-model="searchForm[field.prop]" clearable placeholder="请输入" />
+            </el-form-item>
+          </template>
+          <div class="formal-search__actions">
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button @click="handleReset">重置</el-button>
+            <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
+              {{ searchExpanded ? '收起' : '展开' }}
+            </el-button>
+          </div>
+        </div>
+      </el-form>
+    </section>
    <el-tabs
      v-if="!lockedSettlementType"
      type="border-card"
@@ -10,6 +60,7 @@
        <formal-settlement-table-panel
          v-if="activeSettlementType === 'payable'"
          key="payable"
+          ref="panel"
          v-bind="tablePanelProps"
          v-on="tablePanelListeners"
        />
@@ -18,6 +69,7 @@
        <formal-settlement-table-panel
          v-if="activeSettlementType === 'receivable'"
          key="receivable"
+          ref="panel"
          v-bind="tablePanelProps"
          v-on="tablePanelListeners"
        />
@@ -26,6 +78,7 @@
    <formal-settlement-table-panel
      v-else
      key="locked"
+      ref="panel"
      v-bind="tablePanelProps"
      v-on="tablePanelListeners"
    />
@@ -98,11 +151,131 @@
        ></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="金蝶同步状态">
+            {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注">
+            {{ 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>

 <script>
 import { mapGetters } from 'vuex';
+import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
 import {
  hasSettlementPermission,
@@ -113,16 +286,26 @@ 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 {
+  approvalStatusOptions,
+  invoiceStatusOptions,
+  kingdeeSyncStatusOptions,
+  paymentStatusOptions,
+} from '@/option/settlement/formalSettlementSearch';
+import { getDictionary } from '@/api/system/dictbiz';
 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';
+import { formatSealTypes } from '@/utils/settlement-seal';

 export default {
  name: 'FormalSettlement',
-  components: { FormalSettlementEditor, FormalSettlementTablePanel },
+  components: { FormalSettlementEditor, FormalSettlementTablePanel, InvoiceReceiptCandidatesDialog },
  mixins: [organizationSearch],
  props: {
    /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */
@@ -134,8 +317,16 @@ export default {
  },
  data() {
    return {
-      option: formalSettlementOption(),
+      ArrowDown,
+      ArrowUp,
      query: {},
+      // 手写搜索区（与应收/应付明细同款）：模型与展开状态
+      searchForm: {},
+      searchExpanded: false,
+      // 发票状态/收付款状态下拉选项：来自数据字典（按结算类型区分收/付方向），
+      // 字典未配置时回退前端默认文案（见 loadStatusDicts）
+      invoiceStatusDict: [],
+      paymentStatusDict: [],
      activeSettlementType: 'payable',
      rows: [],
      selection: [],
@@ -151,11 +342,68 @@ 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']),
+    // 搜索字段与应收/应付明细同结构；收付款/发票状态选项随结算类型区分
+    searchFields() {
+      return [
+        { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
+        { label: '项目名称', prop: 'projectName', type: 'input' },
+        { label: '所属组织', prop: 'deptName', type: 'cascader' },
+        { label: '合同编号', prop: 'contractNo', type: 'input' },
+        { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
+        { label: '付款方', prop: 'payerName', type: 'input' },
+        { label: '收款方', prop: 'payeeName', type: 'input' },
+        {
+          label: '发票状态',
+          prop: 'invoiceStatus',
+          type: 'select',
+          options: this.invoiceStatusDict,
+        },
+        {
+          label: this.activeSettlementType === 'payable' ? '付款状态' : '收款状态',
+          prop: 'paymentStatus',
+          type: 'select',
+          options: this.paymentStatusDict,
+        },
+        {
+          label: '审核状态',
+          prop: 'approvalStatus',
+          type: 'select',
+          options: approvalStatusOptions,
+        },
+        {
+          label: '金蝶单据状态',
+          prop: 'kingdeeSyncStatus',
+          type: 'select',
+          options: kingdeeSyncStatusOptions,
+        },
+        { label: '生成日期', prop: 'createDateRange', type: 'daterange' },
+      ];
+    },
+    // 默认折叠只展示一行 4 个条件
+    visibleSearchFields() {
+      return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
+    },
+    // 列随结算类型切换重建：收款结算单不展示「已指定应付」
+    option() {
+      return formalSettlementOption(this.activeSettlementType);
+    },
    isAdmin() {
      return isAdministrator(this.userInfo);
    },
@@ -193,8 +441,6 @@ export default {
        refresh: () => this.onLoad(this.page),
        load: this.onLoad,
        action: this.onAction,
-        'search-change': this.searchChange,
-        'search-reset': this.searchReset,
        'update:selection': selection => {
          this.selection = selection;
        },
@@ -216,17 +462,19 @@ export default {
    activeSettlementType() {
      // 切换结算类型后由新挂载的 avue-crud 触发 on-load，此处只重置分页，避免重复请求
      this.page.currentPage = 1;
+      // 收/付方向的字典文案不同，切 tab 后重拉
+      this.loadStatusDicts();
    },
    '$route.query.detailNo'(detailNo) {
      if (detailNo) this.openRouteDetail(detailNo);
    },
  },
  created() {
-    // 标签机制按 fullPath 缓存同页多实例：仅当前路由实例应响应 detailNo 跳转，防止缓存旧实例也弹窗
-    this.ownFullPath = this.$route.fullPath;
    this.loadOrganizationOptions();
+    this.loadStatusDicts();
  },
  mounted() {
+    this.isPageActive = true;
    this.openRouteDetail();
    loadMkEnabled()
      .then(enabled => {
@@ -237,10 +485,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) {
@@ -258,25 +514,57 @@ export default {
        this.loading = false;
      }
    },
-    searchChange(params, done) {
-      // 所属组织级联返回 id 路径，转成组织名称传给后端
+    /**
+     * 发票状态/收付款状态下拉选项从字典加载（dictKey=后端状态值，dictValue=文案）。
+     * 收/付两个方向文案不同，按结算类型区分字典编码：
+     *   invoice_status_payable / invoice_status_receivable
+     *   payment_status_payable / payment_status_receivable
+     * 字典未配置或为空时回退前端默认文案，保证页面可用。
+     */
+    loadStatusDicts() {
+      const type = this.activeSettlementType;
+      const fallback = {
+        invoice: invoiceStatusOptions(type),
+        payment: paymentStatusOptions(type),
+      };
+      const pick = res =>
+        (res?.data?.data || [])
+          .map(item => ({ label: item.dictValue, value: String(item.dictKey) }))
+          .filter(item => item.label && item.value);
+      Promise.all([
+        getDictionary({ code: `invoice_status_${type}` }).catch(() => null),
+        getDictionary({ code: `payment_status_${type}` }).catch(() => null),
+      ]).then(([invoiceRes, paymentRes]) => {
+        const invoice = pick(invoiceRes);
+        const payment = pick(paymentRes);
+        this.invoiceStatusDict = invoice.length ? invoice : fallback.invoice;
+        this.paymentStatusDict = payment.length ? payment : fallback.payment;
+      });
+    },
+    // 搜索提交：组织级联路径转名称、日期区间拆成起止参数（与原 avue searchChange 同规则）
+    buildSearchParams() {
+      const params = { ...this.searchForm };
      this.normalizeOrganizationSearch(params, 'deptName');
      const range = params.createDateRange || [];
      delete params.createDateRange;
-      this.query = {
-        ...params,
-        createStartDate: range[0] || '',
-        createEndDate: range[1] || '',
-      };
+      return { ...params, createStartDate: range[0] || '', createEndDate: range[1] || '' };
+    },
+    handleSearch() {
+      this.query = this.buildSearchParams();
      this.page.currentPage = 1;
      this.onLoad(this.page);
-      done();
    },
-    searchReset() {
+    handleReset() {
+      this.searchForm = {};
      this.query = {};
      this.page.currentPage = 1;
      this.onLoad(this.page);
    },
+    toggleSearch() {
+      this.searchExpanded = !this.searchExpanded;
+      // 搜索区在 avue 外部，高度变化 avue 感知不到，需手动触发表格高度重算，保证分页在一屏内
+      this.$refs.panel?.recalcTableHeight();
+    },
    onAction({ type, row }) {
      const handlers = {
        view: () => this.openView(row),
@@ -288,12 +576,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 +594,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 +611,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 +619,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;
      }
@@ -349,6 +652,9 @@ export default {
        subjectName: row.formalSettlementNo || '',
        approvalStatus: previousApprovalStatus,
        mkEnabled: this.mkEnabled,
+        tempVarData: {
+          sealTypes: formatSealTypes(row.sealTypes) || '',
+        },
      });
      this.$message.success('提交成功');
      this.onLoad(this.page);
@@ -575,6 +881,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 +992,13 @@ export default {
      params.settlementType = this.lockedSettlementType || this.activeSettlementType;
      return params;
    },
+    settlementTypeName(value) {
+      return { payable: '付款', receivable: '收款' }[value] || '-';
+    },
+    // 模板无法直接访问 script 顶部 import，包装成实例方法（与 formal-settlement-table-panel 同模式）
+    kingdeeSyncName(value) {
+      return kingdeeSyncName(value);
+    },
    unwrapData(response) {
      const body = response?.data || response || {};
      return body?.data || body;
@@ -650,6 +1025,56 @@ export default {
 </script>

 <style scoped lang="scss">
+// 搜索区与应收/应付明细页（settlement-detail-page__search）同款样式
+.formal-search {
+  margin-bottom: 8px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+
+  :deep(.el-form-item__label) {
+    white-space: nowrap;
+  }
+}
+
+.formal-search__grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(220px, 1fr));
+  gap: 8px 24px;
+  align-items: start;
+
+  :deep(.el-form-item) {
+    margin-bottom: 8px;
+  }
+
+  :deep(.el-input),
+  :deep(.el-select),
+  :deep(.el-cascader),
+  :deep(.el-date-editor) {
+    width: 100%;
+  }
+}
+
+.formal-search__actions {
+  grid-column: 1 / -1;
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-bottom: 8px;
+}
+
+@media screen and (max-width: 1200px) {
+  .formal-search__grid {
+    grid-template-columns: repeat(2, minmax(220px, 1fr));
+  }
+}
+
+@media screen and (max-width: 760px) {
+  .formal-search__grid {
+    grid-template-columns: 1fr;
+  }
+}
+
 .formal-page {
  :deep(.el-table) {
    --el-table-border-color: #eff1f7;
@@ -664,6 +1089,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;
 }
@@ -17,6 +17,7 @@
 <script>
 import MkPublicShell from '@/views/mk/mk-public-shell.vue';
 import PreSettlementEditor from '@/views/settlement/components/pre-settlement-editor.vue';
+import { formatSealTypes } from '@/utils/settlement-seal';

 export default {
  name: 'PreSettlementPublicView',
@@ -29,7 +30,11 @@ export default {
  methods: {
    getForm() {
      const form = this.$refs.page?.form || {};
-      return { ...form, subject: form.preSettlementNo || form.contractName || '' };
+      return {
+        ...form,
+        sealTypes: formatSealTypes(form.sealTypes) || '',
+        subject: form.preSettlementNo || form.contractName || '',
+      };
    },
  },
 };
@@ -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"
      >
@@ -147,6 +148,9 @@
            <span v-else-if="column.prop === 'sourceType'">
              {{ row[column.prop] === '应收应付' ? '应付' : displayValue(row[column.prop]) }}
            </span>
+            <span v-else-if="column.prop === 'sealTypes'">
+              {{ formatSealTypes(row[column.prop]) || '-' }}
+            </span>
            <span v-else>{{ displayValue(row[column.prop]) }}</span>
          </template>
        </el-table-column>
@@ -305,6 +309,7 @@ import { preSettlementSearchFields } from '@/option/settlement/preSettlementSear
 import organizationSearch from '@/mixins/organization-search';
 import { preSettlementTableColumns } from '@/option/settlement/preSettlementTable';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import { formatSealTypes } from '@/utils/settlement-seal';
 import { downloadFile } from '@/utils/util';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
@@ -400,6 +405,7 @@ export default {
      });
  },
  methods: {
+    formatSealTypes,
    hasPermission(code) {
      return this.isAdmin || this.validData(this.permission?.[code], false);
    },
@@ -669,6 +675,9 @@ export default {
        subjectName: row.preSettlementNo || '',
        approvalStatus: previousApprovalStatus,
        mkEnabled: this.mkEnabled,
+        tempVarData: {
+          sealTypes: formatSealTypes(row.sealTypes) || '',
+        },
      });
      this.$message.success('提交成功');
      this.loadTable();
@@ -768,8 +777,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 +829,10 @@ export default {
  }

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

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

+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
+
  &__pagination {
    display: flex;
+    flex-shrink: 0;
    justify-content: flex-end;
    padding: 12px;
  }
@@ -136,7 +136,7 @@
        <div class="settlement-detail-page__detail-panel-body">
          <el-tabs v-model="detailDialog.activeTab" @tab-change="handleDetailTabChange">
            <el-tab-pane label="费用明细" name="fee">
-              <el-table v-loading="detailDialog.loading" :data="feeRows" border>
+              <el-table v-loading="detailDialog.loading" :data="feeRows" :max-height="detailTableMaxHeight" border>
                <el-table-column type="index" label="序号" width="64" align="center" />
                <el-table-column
                  v-for="column in feeDetailColumns"
@@ -168,7 +168,7 @@
              </el-table>
            </el-tab-pane>
            <el-tab-pane label="变更记录" name="change">
-              <el-table v-loading="latestChangeLoading" :data="latestChangeRows" border>
+              <el-table v-loading="latestChangeLoading" :data="latestChangeRows" :max-height="detailTableMaxHeight" border>
                <el-table-column type="index" label="序号" width="64" align="center" />
                <el-table-column
                  v-for="column in changeRecordColumns"
@@ -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="序号"
@@ -1056,10 +1063,11 @@ import { getContractOptions as getSettlementContractOptions } from '@/api/settle
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
 import { getDictionary } from '@/api/system/dictbiz';
-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 { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
+import { getList as getFormalSettlementList } from '@/api/settlement/formalSettlement';
 import {
  contractApprovalStatusOptions,
  contractCategoryOptions,
@@ -1136,8 +1144,6 @@ export default {
        rule: null,
      },
      adjustDialog: { visible: false, loading: false, submitting: false, row: null },
-      // 表头 + 最多 3 行费用 + 横向滚动条，超出后表体上下滚动
-      adjustTableMaxHeight: 40 + 49 * 3 + 16,
      adjustRows: [],
      adjustDynamicFeeColumns: [],
      adjustTextProps: ['specification', 'model', 'billingFactor', 'billingType'],
@@ -1215,18 +1221,28 @@ export default {
    };
  },
  computed: {
+    adjustTableMaxHeight() {
+      // 面板满高 min(60vh,560) 减去头部(49)、底部(58)、内边距(32)；费用行多时表体内部滚动，表头固定
+      if (!this.adjustDialog.visible) return 40 + 49 * 3 + 16;
+      return Math.round(Math.min(window.innerHeight * 0.6, 560)) - 138;
+    },
+    detailTableMaxHeight() {
+      // 同上，另减 body 下内边距(16) 和 tabs 头(55)
+      if (!this.detailDialog.visible) return 40 + 49 * 3 + 16;
+      return Math.round(Math.min(window.innerHeight * 0.6, 560)) - 178;
+    },
    generateContractName() {
      const contract = this.contractOptions.find(
        item => String(item.id) === String(this.generateQuery.contractId)
      );
-      return formatContractOptionLabel(contract);
+      return contract?.contractName || '';
    },
    updateContractName() {
      const contractId = this.updateFeeForm.contractId;
      const contract = [...this.updateContractOptions, ...this.contractOptions].find(
        item => String(item.id) === String(contractId)
      );
-      return formatContractOptionLabel(contract);
+      return contract?.contractName || '';
    },
    updateBillingPlanName() {
      const billingPlanId = this.updateFeeForm.billingPlanId;
@@ -1913,8 +1929,9 @@ export default {
        this.openSettlementDetail('/settlement/pre-settlement', row.preSettlementNo);
        return;
      }
-      if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
-        this.openSettlementDetail('/settlement/formal-settlement', row.formalSettlementNo);
+      // 正式结算单号：跳转付款/收款结算单表单页并打开详情（与开票申请等入口一致）
+      if (column.prop === 'formalSettlementNo') {
+        this.openFormalSettlementDetail(row.formalSettlementNo);
        return;
      }
      this.openDetailDialog(row);
@@ -1926,6 +1943,42 @@ export default {
      }
      this.$router.push({ path, query: { detailNo } });
    },
+    async openFormalSettlementDetail(formalSettlementNo) {
+      const normalizedNo = String(formalSettlementNo || '')
+        .split(/[、,，]/)
+        .map(item => item.trim())
+        .find(Boolean);
+      if (!normalizedNo) {
+        this.$message.info('当前记录未关联结算单详情');
+        return;
+      }
+      try {
+        const data = this.unwrapPage(
+          await getFormalSettlementList(1, 10, { formalSettlementNo: normalizedNo })
+        );
+        const row = (data.records || []).find(
+          item => String(item.formalSettlementNo || '').trim() === normalizedNo
+        );
+        if (!row?.id) {
+          this.$message.warning('未找到对应的正式结算单');
+          return;
+        }
+        const settlementType = row.settlementType || this.settlementType || 'payable';
+        const listPath = settlementListPath(settlementType);
+        await this.$router.push({
+          path: `${listPath}/form`,
+          query: {
+            mode: 'view',
+            id: row.id,
+            settlementType,
+            listPath,
+            name: `查看${settlementBillLabel(settlementType)}`,
+          },
+        });
+      } catch (error) {
+        this.$message.error('正式结算单详情加载失败');
+      }
+    },
    async openRouteDetail(detailId = this.$route.query.detailId) {
      // 结算明细点「单据号」会带 detailId 跳到本页；只有当前停在应收/应付明细页时才自动展开详情
      const routePath =
@@ -2659,10 +2712,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 +2958,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 +2993,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,474 @@
+<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 { normalizeBusinessDeptOptions } from '@/utils/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: 260,
+            display: false,
+            formatter: row => this.formatBusinessDeptLabel(row),
+          },
+          {
+            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 = normalizeBusinessDeptOptions(businessRes?.data?.data, {
+            alwaysShowCompany: true,
+          });
+          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;
+          // 下拉选项就绪后刷新列表展示名（避免列表先于选项返回时只显示裸部门名）
+          this.refreshBusinessDeptLabels();
+        }
+      );
+    },
+    normalizeDeptOptions(list) {
+      return (list || []).map(item => ({
+        label: item.deptName || item.fullName || String(item.id),
+        value: String(item.id),
+        kingdeeDeptCode: item.kingdeeDeptCode || '',
+      }));
+    },
+    /** 列表业务部门列：部门名（所属公司） */
+    formatBusinessDeptLabel(row) {
+      if (!row) return '-';
+      const matched = this.businessDeptOptions.find(
+        item => String(item.value) === String(row.businessDeptId)
+      );
+      if (matched?.label) return matched.label;
+      return row.businessDeptName || '-';
+    },
+    refreshBusinessDeptLabels() {
+      if (!this.data?.length) return;
+      this.data = this.data.map(row => ({ ...row }));
+    },
+    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.rawLabel || matched.label : '';
+    },
+    beforeOpen(done, type) {
+      const loadOptions = Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = normalizeBusinessDeptOptions(businessRes?.data?.data, {
+            alwaysShowCompany: true,
+          });
+          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, {
+        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 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.clearEmptyContractInitialSerial(this.form);
+            this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
            this.loadParentDeptCode(this.form.parentId);
-          if (this.form.hasOwnProperty('leaderId')) {
+            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();
          });
+        return;
      }
      done();
    },
@@ -66,17 +66,21 @@
        />
      </template>
      <template #dataScopeDeptIds-form>
-        <el-tree
+        <!-- 与用户管理「数据管理权限」一致：组织多选级联，数据源同左侧组织树 -->
+        <el-cascader
          v-if="Number(form.dataScopeRange) === 3"
-          ref="dataScopeTree"
-          :data="permissionDeptTree"
-          show-checkbox
-          node-key="id"
-          :default-checked-keys="form.dataScopeDeptIds || []"
-          :props="{ label: 'title', children: 'children' }"
-          @check="handleDataScopeCheck"
+          v-model="dataScopeCascaderValue"
+          :options="permissionDeptTree"
+          :props="deptCascaderProps"
+          :disabled="isViewMode"
+          clearable
+          filterable
+          collapse-tags
+          collapse-tags-tooltip
+          placeholder="请选择数据权限组织（可多选）"
+          style="width: 100%"
        />
-        <span v-else class="form-tip">选择「自定义」后可勾选数据权限组织</span>
+        <span v-else class="form-tip">选择「自定义」后可选择数据权限组织</span>
      </template>
      <template #menu="{ row, index }">
        <el-link
@@ -193,6 +197,26 @@ export default {
            : [];
      },
    },
+    // 自定义数据权限组织：与用户管理数据管理权限相同的多选级联
+    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]
+            : [];
+      },
+    },
  },
  created() {
    this.sensitiveManager = sensitive.create({
@@ -228,12 +252,6 @@ export default {
        this.permissionDeptTree = res.data.data || [];
      });
    },
-    handleDataScopeCheck(_, checked) {
-      if (this.isViewMode) {
-        return;
-      }
-      this.form.dataScopeDeptIds = checked.checkedKeys || [];
-    },
    normalizeSubmitRow(row = {}, isUpdate = false) {
      let payload = { ...row };
      // 编辑时剔除未改动的脱敏字段，避免把 138****8000 写回库
@@ -278,17 +296,19 @@ export default {
            detail.identities = detail.identities.split(',').filter(Boolean);
          }
          const deptIds = func.split(detail.deptId || '');
+          const dataScopeDeptIds = Array.isArray(detail.dataScopeDeptIds)
+            ? detail.dataScopeDeptIds.map(item => String(item))
+            : detail.dataScopeDeptIds
+              ? String(detail.dataScopeDeptIds).split(',').filter(Boolean)
+              : [];
          this.form = {
            ...detail,
            deptId: Array.isArray(deptIds) ? deptIds : [],
            dataScopeRange: detail.dataScopeRange || 1,
            dataLevelRange: detail.dataLevelRange || 1,
-            dataScopeDeptIds: detail.dataScopeDeptIds || [],
+            dataScopeDeptIds,
          };
          this.sensitiveManager?.saveInitialData(this.form);
-          this.$nextTick(() => {
-            this.$refs.dataScopeTree?.setCheckedKeys?.(this.form.dataScopeDeptIds || []);
-          });
          done();
        });
        return;
@@ -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';
    },
@@ -678,6 +713,12 @@ export default {
      }
      this.selectDeptOnTree(deptId);
    },
+    startDeptTreeFromSecondLevel(tree) {
+      if (!Array.isArray(tree) || !tree.length) {
+        return [];
+      }
+      return tree.flatMap(node => (Array.isArray(node.children) ? node.children : []));
+    },
    findDeptIdByName(name, tree = this.permissionDeptTree) {
      if (!name) return null;
      for (const node of tree || []) {
@@ -698,7 +739,7 @@ export default {
        const tenantId = this.userInfo.tenantId || this.website.tenantId;
        try {
          const res = await getDeptTree(tenantId);
-          this.permissionDeptTree = res.data.data || [];
+          this.permissionDeptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
        } catch (error) {
          this.$message.error('组织树加载失败');
          return;
@@ -786,7 +827,7 @@ export default {
    },
    handleOaPersonFullSync() {
      this.$confirm(
-        '全量同步将按 OA 对齐人员：有登录名的按登录名更新且不修改密码，没有登录名但有工号的也会入库且不回填登录名，部门按 OA 当前部门重绑，OA 中已不存在或已离职的删除。是否继续？',
+        '全量同步将按 OA 对齐人员：账号名统一用工号（无工号不同步），已有账号不修改密码，部门按 OA 当前部门重绑，OA 中已不存在或已离职的删除。是否继续？',
        '全量同步',
        {
          confirmButtonText: '确定',
@@ -799,7 +840,7 @@ export default {
    },
    handleOaPersonIncrementalSync() {
      this.$confirm(
-        '增量同步仅拉取本地最大 OA 更新时间之后有变更的人员：已有的更新且不修改密码，没有的新增，部门按 OA 当前部门重绑，离职人员直接删除。是否继续？',
+        '增量同步仅拉取本地最大 OA 更新时间之后有变更的人员：账号名统一用工号（无工号不同步），已有的更新且不修改密码，没有的新增，部门按 OA 当前部门重绑，离职人员直接删除。是否继续？',
        '增量同步',
        {
          confirmButtonText: '确定',
@@ -928,9 +969,11 @@ export default {
        column.dicData = res.data.data;
      });
      getDeptTree(tenantId).then(res => {
-        this.permissionDeptTree = res.data.data;
+        // 用户管理组织从第二级开始展示：去掉一级根节点，保留其子节点
+        const deptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
+        this.permissionDeptTree = deptTree;
        const column = this.findColumn(this.userOption.group, 'deptId');
-        column.dicData = res.data.data;
+        column.dicData = deptTree;
      });
      getPostList(tenantId).then(res => {
        this.postList = res.data.data;
@@ -1034,6 +1077,7 @@ export default {
          sex: undefined,
          postId: '',
          deptId: [],
+          dataScopeDeptIds: [],
          code: '',
          personCategory: 1,
          remark: '',
@@ -1046,9 +1090,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 +1112,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),
@@ -0,0 +1,20 @@
+<template>
+  <mk-public-shell biz-type="cert-audit-driver" :get-form="getForm">
+    <cert-audit-public-content ref="page" biz-type="driver" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import CertAuditPublicContent from './components/cert-audit-public-content/main.vue';
+
+export default {
+  name: 'CertAuditDriverPublicView',
+  components: { MkPublicShell, CertAuditPublicContent },
+  methods: {
+    getForm() {
+      return this.$refs.page?.getForm?.() || {};
+    },
+  },
+};
+</script>
@@ -0,0 +1,20 @@
+<template>
+  <mk-public-shell biz-type="cert-audit-vehicle" :get-form="getForm">
+    <cert-audit-public-content ref="page" biz-type="vehicle" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import CertAuditPublicContent from './components/cert-audit-public-content/main.vue';
+
+export default {
+  name: 'CertAuditVehiclePublicView',
+  components: { MkPublicShell, CertAuditPublicContent },
+  methods: {
+    getForm() {
+      return this.$refs.page?.getForm?.() || {};
+    },
+  },
+};
+</script>
@@ -61,6 +61,14 @@
      </section-card>

      <section-card title="审核意见">
+        <el-alert
+          v-if="mkEnabled && auditable"
+          type="info"
+          :closable="false"
+          show-icon
+          title="已开启 MK 审核流：请在列表点击「提交 / 流程」完成审批，此处仅可查看"
+          class="cert-audit-detail__notice"
+        />
        <el-form label-position="right" label-width="90px" class="cert-audit-detail__form">
          <el-form-item label="驳回原因">
            <el-input
@@ -69,7 +77,7 @@
              :rows="3"
              maxlength="200"
              show-word-limit
-              :disabled="!auditable"
+              :disabled="!localAuditable"
              placeholder="驳回时必填，不超过 200 字；通过时无需填写"
            />
          </el-form-item>
@@ -78,18 +86,20 @@
    </div>

    <template #footer>
-      <el-button @click="visible = false">取消</el-button>
+      <el-button @click="visible = false">{{ mkEnabled ? '关闭' : '取消' }}</el-button>
      <el-button
+        v-if="!mkEnabled"
        type="danger"
-        :disabled="!auditable || loadFailed"
+        :disabled="!localAuditable || loadFailed"
        :loading="rejectLoading"
        @click="handleReject"
      >
        驳回
      </el-button>
      <el-button
+        v-if="!mkEnabled"
        type="primary"
-        :disabled="!auditable || loadFailed"
+        :disabled="!localAuditable || loadFailed"
        :loading="approveLoading"
        @click="handleApprove"
      >
@@ -124,6 +134,11 @@ export default {
      type: String,
      default: 'driver',
    },
+    // 开启 MK 后详情页仅查看，本地通过/驳回隐藏
+    mkEnabled: {
+      type: Boolean,
+      default: false,
+    },
  },
  emits: ['update:modelValue', 'success'],
  data() {
@@ -166,6 +181,9 @@ export default {
    auditable() {
      return String(this.detail.status) === String(CERT_RECORD_STATUS.PENDING);
    },
+    localAuditable() {
+      return this.auditable && !this.mkEnabled;
+    },
    diffKey() {
      return `${this.detail.id || this.recordId || ''}-${this.detail.submitTime || ''}`;
    },
@@ -39,7 +39,21 @@
      <template #menu="{ row }">
        <!-- 只有审核中的记录能审；已通过/已驳回只能查看，弹窗内也会禁用审核按钮 -->
        <el-link type="primary" v-if="canAudit" @click="openDetail(row)">
-          {{ isPending(row) ? '审核' : '查看' }}
+          {{ isPending(row) ? (mkEnabled ? '查看' : '审核') : '查看' }}
+        </el-link>
+        <el-link
+          v-if="canAudit && mkEnabled && isPending(row)"
+          type="primary"
+          @click="handleMkSubmit(row)"
+        >
+          提交
+        </el-link>
+        <el-link
+          v-if="canAudit && mkEnabled && isPending(row)"
+          type="primary"
+          @click="handleMkAudit(row)"
+        >
+          流程
        </el-link>
      </template>
    </avue-crud>
@@ -48,6 +62,7 @@
      v-model="detailVisible"
      :record-id="detailRecordId"
      :biz-type="bizType"
+      :mk-enabled="mkEnabled"
      @success="handleAuditSuccess"
    />
  </basic-container>
@@ -56,8 +71,14 @@
 <script>
 import { mapGetters } from 'vuex';
 import { getPendingPage } from '@/api/transportCapacity/certification-audit';
+import { getMKApprovalUrl } from '@/api/system/business-process';
 import { CERT_RECORD_STATUS, certStatusTag, formatCertDateTime } from '@/utils/cert-audit';
 import { isAdministrator } from '@/utils/auth';
+import {
+  loadMkEnabled,
+  resolveCertAuditMkBizType,
+  submitMkApprovalFlow,
+} from '@/utils/mk-approval';
 import CertAuditDetail from '../cert-audit-detail/main.vue';

 /**
@@ -111,6 +132,7 @@ export default {
      ],
      detailVisible: false,
      detailRecordId: '',
+      mkEnabled: false,
    };
  },
  computed: {
@@ -122,12 +144,65 @@ export default {
      return this.isAdmin || this.permission?.[this.auditPermissionCode] === true;
    },
  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
  methods: {
    certStatusTag,
    formatCertDateTime,
    isPending(row) {
      return String(row.status) === String(CERT_RECORD_STATUS.PENDING);
    },
+    handleMkSubmit(row) {
+      if (!row?.id) {
+        this.$message.warning('认证记录ID为空，无法提交审核流');
+        return;
+      }
+      this.$confirm('确定提交该认证记录到 MK 审核流？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() =>
+        submitMkApprovalFlow({
+          bizType: resolveCertAuditMkBizType(this.bizType),
+          bizId: row.id,
+          subjectName: row.bizKey || row.driverName || '',
+          approvalStatus: String(row.status ?? ''),
+          mkEnabled: this.mkEnabled,
+          tempVarData: {
+            bizType: this.bizType,
+            bizKey: row.bizKey || '',
+          },
+        }).then(() => {
+          this.$message.success('提交成功');
+          this.onLoad(this.page, this.query);
+        })
+      );
+    },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('认证记录ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败，请先提交审核流');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
    onLoad(page, params = {}) {
      this.loading = true;
      getPendingPage(this.bizType, page.currentPage, page.pageSize, {
@@ -0,0 +1,124 @@
+<template>
+  <div class="cert-audit-public-content">
+    <div class="cert-audit-public-content__title">{{ pageTitle }}</div>
+    <template v-if="detail">
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="认证对象">{{ detail.bizKey || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="审核状态">
+          {{ detail.statusText || certStatusTag(detail.status).label }}
+        </el-descriptions-item>
+        <el-descriptions-item label="提交人">{{ detail.submitUserName || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="提交时间">
+          {{ formatCertDateTime(detail.submitTime) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="认证类型">{{ bizTypeLabel }}</el-descriptions-item>
+        <el-descriptions-item label="是否已认证">
+          {{ detail.certified ? '已认证' : '未认证' }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="detail.rejectReason" label="驳回原因" :span="2">
+          {{ detail.rejectReason }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <div class="cert-audit-public-content__section-title">待审内容 vs 当前生效值</div>
+      <cert-audit-diff
+        :key="diffKey"
+        :biz-type="bizType"
+        :pending-json="detail.pendingSnapshotJson"
+        :effective-json="detail.effectiveSnapshotJson"
+      />
+    </template>
+    <el-empty v-else description="暂无数据" />
+  </div>
+</template>
+
+<script>
+import { getMkPublicDetail } from '@/api/mk-process';
+import { certStatusTag, formatCertDateTime } from '@/utils/cert-audit';
+import CertAuditDiff from '../cert-audit-diff/main.vue';
+
+export default {
+  name: 'CertAuditPublicContent',
+  components: { CertAuditDiff },
+  props: {
+    bizType: {
+      type: String,
+      default: 'driver',
+    },
+  },
+  data() {
+    return {
+      detail: null,
+    };
+  },
+  computed: {
+    bizTypeLabel() {
+      return this.bizType === 'vehicle' ? '车辆认证' : '司机认证';
+    },
+    pageTitle() {
+      const key = this.detail?.bizKey ? `：${this.detail.bizKey}` : '';
+      return `${this.bizTypeLabel}审核${key}`;
+    },
+    mkBizType() {
+      return this.bizType === 'vehicle' ? 'cert-audit-vehicle' : 'cert-audit-driver';
+    },
+    diffKey() {
+      return `${this.detail?.id || ''}-${this.detail?.submitTime || ''}`;
+    },
+  },
+  mounted() {
+    this.loadDetail();
+  },
+  methods: {
+    certStatusTag,
+    formatCertDateTime,
+    loadDetail() {
+      const id = this.$route.query.id;
+      if (!id) return;
+      getMkPublicDetail(this.mkBizType, id).then(res => {
+        this.detail = res.data?.data || null;
+      });
+    },
+    getForm() {
+      const detail = this.detail || {};
+      return {
+        ...detail,
+        subject: detail.bizKey || '',
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.cert-audit-public-content {
+  padding: 16px 20px 24px;
+
+  &__title {
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  &__section-title {
+    position: relative;
+    margin: 16px 0 12px;
+    padding-left: 12px;
+    font-size: 15px;
+    font-weight: 600;
+    color: #303133;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 0;
+      top: 50%;
+      width: 4px;
+      height: 14px;
+      margin-top: -7px;
+      background: #409eff;
+    }
+  }
+}
+</style>
@@ -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="驾驶证信息">
@@ -553,7 +589,7 @@
              <el-form-item label="所属组织" prop="organizationName">
                <el-cascader
                  v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
+                  :options="formOrganizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -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: '',
@@ -757,6 +797,8 @@ export default {
      driverBox: false,
      // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
      enableUnassignedOrgFilter: true,
+      // 表单「所属组织」只允许选平台公司；搜索栏不受影响
+      restrictFormOrgToPlatformCompany: true,
      vehicleSelectorVisible: false,
      vehicleSelectorLoading: false,
      vehicleSelectorOption,
@@ -881,13 +923,19 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
+    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
+    formOrganizationTreeOptions() {
+      return this.buildFormOrganizationTree();
+    },
    // 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
    organizationCascaderValue: {
      get() {
-        return this.resolveOrgPath(this.driverForm.organizationName);
+        return this.resolveFormOrgPath(this.driverForm.organizationName);
      },
      set(path) {
-        this.driverForm.organizationName = this.resolveOrgName(path);
+        const name = this.resolveOrgName(path);
+        this.driverForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
      },
    },
    isAdmin() {
@@ -925,8 +973,8 @@ export default {
    },
  },
  created() {
+    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
-    this.loadOrganizationOptions();
    this.initRegionOptions();
    this.initQualificationTypeOptions();
  },
@@ -944,9 +992,7 @@ export default {
          'organizationName'
        );
        vehicleColumn.dicData = this.organizationOptions;
-        if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) {
-          this.driverForm.organizationName = this.getCurrentOrganizationName();
-        }
+        return this.loadOrganizationOptions();
      });
    },
    initQualificationTypeOptions() {
@@ -976,6 +1022,11 @@ export default {
      });
      return result;
    },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空，
+    // 不能让默认值带出一个在表单里选不中的组织名
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
    getCurrentOrganizationName() {
      const currentDeptId = this.userInfo.deptId || this.userInfo.dept_id;
      const currentDept = this.organizationOptions.find(
@@ -1163,8 +1214,16 @@ export default {
      this.submitAttempted = false;
      if (!row?.id) {
        this.driverForm = emptyForm();
-        this.driverForm.organizationName = this.getCurrentOrganizationName();
+        // 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空
+        this.driverForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
        this.driverBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.driverBox || this.driverForm.id || this.driverForm.organizationName) return;
+          const name = this.getDefaultOrganizationName();
+          this.driverForm.organizationName = name;
+          this.syncFormOrganizationLegacy(name);
+        });
        return;
      }
      getDetail(row.id).then(res => {
@@ -1178,11 +1237,13 @@ export default {
          postList: detail.posts ? detail.posts.split(',').filter(Boolean) : [],
        };
        this.syncAddressRegionPath();
+        this.syncFormOrganizationLegacy(this.driverForm.organizationName);
        this.driverBox = true;
      });
    },
    resetDriver() {
      this.driverForm = emptyForm();
+      this.formOrganizationLegacyName = '';
      this.drivingLicenseUploads = {};
      this.readonly = false;
      this.submitAttempted = false;
@@ -1260,12 +1321,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,8 +1344,28 @@ 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) {
@@ -1308,7 +1390,7 @@ export default {
          loading.close();
        });
    },
-    recognizeIdCard(url = '') {
+    recognizeIdCard(url = '', prop = 'idCardFront') {
      if (!url) {
        this.$message.warning('身份证图片上传成功，未获取到图片地址，无法自动识别');
        return;
@@ -1321,7 +1403,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 +1526,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 +1591,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,48 +1656,69 @@ 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]);
+      } else {
+        const endDate = this.normalizeBirthday(validUntil);
+        if (endDate) {
+          this.driverForm.qualificationEndDate = endDate;
          this.driverForm.qualificationLongTerm = 0;
        }
+      }
      this.$nextTick(() => {
        ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
          this.$refs.driverForm?.validateField(prop);
        });
      });
    },
-    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;
+    normalizeQualificationOcrFields(result = {}) {
+      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
+        return result.fields;
      }
-        values.push(word);
-      }
-      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 +1736,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 +1809,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),
@@ -147,7 +147,7 @@
              <el-form-item label="船舶所属组织" prop="organizationName">
                <el-cascader
                  v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
+                  :options="formOrganizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -664,6 +664,8 @@ export default {
      shipForm: emptyForm(),
      uploadHeaders: getUploadHeaders(),
      organizationOptions: [],
+      // 表单「船舶所属组织」只允许选平台公司；搜索栏不受影响
+      restrictFormOrgToPlatformCompany: true,
      formRules: {
        organizationName: [{ required: true, message: '请选择船舶所属组织', trigger: 'change' }],
        shipName: [
@@ -710,13 +712,19 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
+    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
+    formOrganizationTreeOptions() {
+      return this.buildFormOrganizationTree();
+    },
    // 船舶所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
    organizationCascaderValue: {
      get() {
-        return this.resolveOrgPath(this.shipForm.organizationName);
+        return this.resolveFormOrgPath(this.shipForm.organizationName);
      },
      set(path) {
-        this.shipForm.organizationName = this.resolveOrgName(path);
+        const name = this.resolveOrgName(path);
+        this.shipForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
      },
    },
    isAdmin() {
@@ -744,8 +752,8 @@ export default {
    },
  },
  created() {
+    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
-    this.loadOrganizationOptions();
  },
  methods: {
    hasPermission(code) {
@@ -756,9 +764,7 @@ export default {
        this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
        const column = this.findColumn(this.option.column, 'organizationName');
        column.dicData = this.organizationOptions;
-        if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
-          this.shipForm.organizationName = this.getCurrentOrganizationName();
-        }
+        return this.loadOrganizationOptions();
      });
    },
    flattenDeptOptions(tree = [], level = 0) {
@@ -784,6 +790,10 @@ export default {
      );
      return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
    },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
    validateField(prop) {
      this.$refs.shipForm?.validateField(prop);
    },
@@ -875,12 +885,19 @@ export default {
      this.readonly = readonly;
      if (!row?.id) {
        this.shipForm = emptyForm();
-        this.shipForm.organizationName = this.getCurrentOrganizationName();
+        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
+        this.shipForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
        this.shipBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.shipBox || this.shipForm.id || this.shipForm.organizationName) return;
+          this.shipForm.organizationName = this.getDefaultOrganizationName();
+        });
        return;
      }
      getDetail(row.id).then(res => {
        this.shipForm = { ...emptyForm(), ...(res.data.data || {}) };
+        this.syncFormOrganizationLegacy(this.shipForm.organizationName);
        this.shipBox = true;
      });
    },
@@ -890,6 +907,7 @@ export default {
    },
    resetShip() {
      this.shipForm = emptyForm();
+      this.formOrganizationLegacyName = '';
      this.readonly = false;
      this.submitLoading = false;
      this.$refs.shipForm?.clearValidate();
@@ -347,7 +347,7 @@
                    <el-cascader
                      v-model="organizationCascaderValue"
                      :options="organizationFormTreeOptions"
-                      :props="formOrgCascaderProps"
+                      :props="organizationFormCascaderProps"
                      filterable
                      clearable
                      placeholder="请选择"
@@ -702,6 +702,8 @@ export default {
      // 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
      organizationCascaderPath: [],
      useDepartmentCascaderPath: [],
+      // 表单「所属组织」只允许选平台公司，「使用部门」仍是全量组织
+      restrictFormOrgToPlatformCompany: true,
      formOrgCascaderProps: {
        value: 'id',
        label: 'label',
@@ -757,11 +759,17 @@ export default {
    },
    // 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
    organizationFormTreeOptions() {
-      return this.cloneOrgTree(this.organizationTreeOptions);
+      return this.cloneOrgTree(this.buildFormOrganizationTree());
    },
    useDepartmentFormTreeOptions() {
      return this.cloneOrgTree(this.organizationTreeOptions);
    },
+    // 所属组织级联的可选范围：只放开平台公司；使用部门仍用 formOrgCascaderProps 全量可选
+    organizationFormCascaderProps() {
+      return this.restrictFormOrgToPlatformCompany
+        ? { ...this.formOrgCascaderProps, disabled: data => this.platformCompanyOrgDisabled(data) }
+        : this.formOrgCascaderProps;
+    },
    // 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用
    organizationCascaderValue: {
      get() {
@@ -769,7 +777,9 @@ export default {
      },
      set(path) {
        this.organizationCascaderPath = Array.isArray(path) ? [...path] : [];
-        this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
+        const name = this.resolveOrgName(this.organizationCascaderPath);
+        this.vehicleForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
      },
    },
    // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
@@ -810,7 +820,6 @@ export default {
  },
  created() {
    this.initDeptTree();
-    this.loadOrganizationOptions();
  },
  watch: {
    organizationTreeOptions() {
@@ -852,17 +861,15 @@ export default {
      }));
    },
    syncOrgCascaderPaths() {
-      this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName);
+      this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName);
      this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment);
    },
    initDeptTree() {
+      this.loadOrganizationOptions();
      getDeptTree(this.userInfo.tenantId).then(res => {
        this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
        const column = this.findColumn(this.option.column, 'organizationName');
        column.dicData = this.organizationOptions;
-        if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
-          this.vehicleForm.organizationName = this.getCurrentOrganizationName();
-        }
        if (this.vehicleBox && !this.vehicleForm.useDepartment) {
          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        }
@@ -894,6 +901,10 @@ export default {
      );
      return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
    },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
    digitsOnly(value = '') {
      return String(value).replace(/\D/g, '');
    },
@@ -961,11 +972,18 @@ export default {
      this.readonly = readonly;
      if (!row?.id) {
        this.vehicleForm = emptyForm();
-        this.vehicleForm.organizationName = this.getCurrentOrganizationName();
+        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
+        this.vehicleForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
        this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        this.syncOrgCascaderPaths();
        this.syncPlateNo(false);
        this.vehicleBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.vehicleBox || this.vehicleForm.id || this.vehicleForm.organizationName) return;
+          this.vehicleForm.organizationName = this.getDefaultOrganizationName();
+          this.syncOrgCascaderPaths();
+        });
        return;
      }
      getDetail(row.id).then(res => {
@@ -977,6 +995,7 @@ export default {
        if (!this.vehicleForm.useDepartment) {
          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        }
+        this.syncFormOrganizationLegacy(this.vehicleForm.organizationName);
        this.syncOrgCascaderPaths();
        this.splitPlateNo();
        this.syncPlateNo(false);
@@ -989,6 +1008,7 @@ export default {
    },
    resetVehicle() {
      this.vehicleForm = emptyForm();
+      this.formOrganizationLegacyName = '';
      this.organizationCascaderPath = [];
      this.useDepartmentCascaderPath = [];
      this.vehicleCertificateUploads = {};
@@ -1610,6 +1630,16 @@ export default {
  }
 }

+// 列表组织列超长时单行省略
+.org-cell-text {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+}
+
 // 编辑弹窗：灰底 + section-card 白卡分组
 .vehicle-form {
  :deep(.el-form-item__label) {
@@ -1641,18 +1671,7 @@ export default {
    flex: 0 0 calc(4em + 24px) !important;
    width: calc(4em + 24px) !important;
  }
-}

-.org-cell-text {
-  display: inline-block;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  vertical-align: bottom;
-}
-
-.vehicle-form {
  .org-cascader-tooltip {
    width: 100%;
  }
@@ -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;
      }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
b2894lxlxandCursor	d9c761fe33	⚡ 用户OA同步提示改为工号账号规则 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-11 01:13:33 +08:00
b2894lxlxandCursor	f82b04caff	✨ 合同变更页支持编辑负责部门与平台公司 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-11 01:13:33 +08:00
b2894lxlxandCursor	0da0c6f493	✨ 角色权限联动与临时额度/项目备案/司机车辆审核MK Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-11 01:09:35 +08:00
b2894lxlx	f081ccd3f0	Merge pull request '补提 dev 上未进主干的 10 个改动（运力组织/运单导入/凭证批次/运输计划）' (#17 ) from feature/20261110-补开dev未合并改动-web into master Reviewed-on: #17	2026-11-10 17:45:21 +08:00
weicw	09f77467b1	⚡ 运单管理行操作「完成」合并为单一入口待回单确认仍走确认回单（校验打卡节点与未了结异常），进行中/处理中二次确认后置完成。	2026-11-10 17:22:50 +08:00
weicw	85dc96e126	🐛 运输计划调度确认生成不再强制司机与手机号司机与手机号对全部承运类型（承运商/自运/平台）均为选填，仅校验已填内容的格式与长度。	2026-11-10 17:22:50 +08:00
weicw	49d5c304ac	✨ 更新规格和型号输入框的占位符文本	2026-11-10 17:22:50 +08:00
weicw	efa53b2422	✨ 新建运输计划默认运输方式为公路运输	2026-11-10 17:22:50 +08:00
weicw	6b6c9ed6ed	🐛 修复关联运单批次弹窗重新打开时残留上次筛选条件 - 打开弹窗时重置搜索条件与分页，并清空上一次的列表数据 - 重置按钮与打开时的重置共用 resetBatchSearch	2026-11-10 17:22:49 +08:00
weicw	f87c0eea27	✨ 凭证管理关联运单批次弹窗增加项目筛选与项目列 - 搜索表单新增项目下拉筛选，查询参数透传 projectId - 运单批次表格在运单批次号后新增项目列，同一批次跨项目时显示「多个项目」	2026-11-10 17:22:49 +08:00
weicw	c18da72156	✨ 运单导入新增与已有运单重复页签	2026-11-10 17:22:49 +08:00
weicw	d3e5ff73a5	✨ 运力管理司机、车辆、船舶的所属组织只允许选择平台公司	2026-11-10 17:22:49 +08:00
weicw	7842e3f78d	✨ 新增司机时预填所属组织为广西桂物物流服务集团有限公司	2026-11-10 17:22:48 +08:00
weicw	cc22b23d88	🐛 修复组织级联回显时递归取整棵树导致栈溢出	2026-11-10 17:22:48 +08:00
b2894lxlxandCursor	238f229401	🔀 合并 feature/20261106-fix禅道-web，解决付款申请与正式结算单冲突 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-10 16:54:33 +08:00
b2894lxlx	2fec3edaf3	Merge pull request '修复付款申请 + 收款/付款结算单搜索栏' (#16 ) from fix/20261110-修复结算单页面-web into master Reviewed-on: #16	2026-11-10 16:16:04 +08:00
b2894lxlx	c38e273538	Merge pull request 'fix: 金蝶票据池弹框样式与批量转结算保持一致' (#14 ) from feature/20261104-bfi-project-web into master Reviewed-on: #14	2026-11-10 16:15:46 +08:00
刘泉佳	32cd42da92	💄 付款管理搜索栏改造为手写搜索区 - 与应收/应付明细等页面搜索样式统一（4列网格、查询/重置独占一行靠右、默认折叠一行4条件） - 移除 avue 内置搜索配置与搜索专用列，搜索字段与后端参数保持不变 - 展开搜索后触发表格高度重算，分页保持在一屏内	2026-11-10 00:51:35 +08:00
刘泉佳	69782cecfc	💄 收款/付款结算单搜索栏改造为手写搜索区，状态文案按结算类型区分 - 搜索栏与应收/应付明细页统一为页面级手写搜索区（4列网格、查询/重置独占一行靠右、默认折叠一行4条件） - 发票状态/收付款状态的搜索标签、表格列标签与下拉选项按结算类型区分（收款=开票/收款方向，付款=收票/付款方向） - 下拉选项优先取数据字典（invoice_status_/payment_status_），未配置时回退前端默认文案 - 搜索区展开/收起后触发 avue 表格高度重算，避免分页被推出视口出现多个滚动条	2026-11-10 00:51:29 +08:00
刘泉佳	5f26ba24c6	🐛 修复付款申请比例联动后申请付款金额校验红字残留	2026-11-10 00:16:13 +08:00
b2894lxlxandCursor	d2f756bc21	⚡ 优化用户组织树展示与客商档案编辑锁定 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-09 22:55:12 +08:00
b2894lxlxandCursor	1663b2d910	✨ 结算单用印类型、合同甲乙丙列表与项目调整材料 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-09 22:53:55 +08:00
b2894lxlxandCursor	748214a4b6	🐛 业务部门下拉展示所属公司，并映射项目旧平台公司ID Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-09 12:44:44 +08:00
刘泉佳	44cec23147	fix: 发票信息查看下载优先走金蝶票池版式文件	2026-11-08 14:01:21 +08:00
刘泉佳	b218fc2345	feat: 付款记录付款凭证查看下载	2026-11-06 17:39:34 +08:00
刘泉佳	eb74466c30	refactor: 抽取金蝶附件查看下载公共方法	2026-11-06 17:39:30 +08:00
刘泉佳	486d438d49	fix: 正式结算单金额按结算币种显示，追加预结算来源结算金额按汇率反算 - 结算合计原金额/结算金额/合计行与表头结算金额按合同结算币种显示币种代码（人民币 RMB、外币如 USD），本位币合计固定 RMB - confirmCandidates 追加预结算来源时结算金额由来源本位币汇总按结算汇率反算，本位币合计保留本位币汇总，修复外币结算未换算	2026-11-06 17:29:54 +08:00
刘泉佳	53aa1f66ef	fix: 附件同步不再自动填充描述，调整附件类型不再重排，回显保持原位置	2026-11-06 14:06:01 +08:00
刘泉佳	7def9869ff	fix: 修复正式结算单结算明细运输总量未显示计量单位	2026-11-06 12:22:47 +08:00
刘泉佳	f767296e4d	feat: 应收应付明细新增运单号查询条件	2026-11-06 12:22:46 +08:00
刘泉佳	b879fd3011	fix: 单据详情面板费用明细与变更记录表体内部滚动，表头固定	2026-11-06 11:26:24 +08:00
刘泉佳	db55c3ef00	fix: 修复应收应付调整费用面板表格行被裁切，费用行多时表体内部滚动	2026-11-06 11:15:29 +08:00
刘泉佳	af4a9b6d60	fix: 应收应付明细与付款申请合同名称仅显示名称，不再拼接合同编号	2026-11-06 11:07:38 +08:00
b2894lxlx	d3ba0ce38b	Merge remote-tracking branch 'websoft/dev'	2026-11-06 09:36:51 +08:00
b2894lxlxandCursor	f5be5245d6	✨ 角色管理列表接入分页 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-06 09:32:50 +08:00
b2894lxlxandCursor	baf54efb7b	🐛 修复评分-1空值、结算单号跳转与小程序用户数据权限组织选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-06 09:32:36 +08:00
刘泉佳	79e903bcd8	fix: 修复发票登记弹窗金蝶同步状态不显示	2026-11-05 18:05:58 +08:00
刘泉佳	119d71b4f5	fix: 收票管理列表金蝶状态增加颜色标签与其他页面一致	2026-11-05 16:49:01 +08:00
刘泉佳	d57d3f86da	fix: 金蝶票据池弹框样式与批量转结算保持一致	2026-11-05 16:34:04 +08:00
b2894lxlxandCursor	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
b2894lxlxandCursor	8f3da0e386	✨ 预结算收款方与付款方改为下拉选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 23:47:00 +08:00
b2894lxlxandCursor	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
b2894lxlxandCursor	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
weicw	32065b9c54	🔀 合并主干 master 到 dev	2026-11-04 18:24:39 +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
b2894lxlxandCursor	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
b2894lxlxandCursor	014ee537a0	✨ 组织编码/平台公司、合同计费客商角色与基础模块查看按钮 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 03:15:44 +08:00
b2894lxlxandCursor	5bde60d844	✨ 编辑用户增加数据管理权限多选组织 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 03:14:45 +08:00
weicw	799a87641e	✨ 合同管理搜索表单新增客商筛选，合同名称移到最后，生效类型改为合同状态	2026-11-03 21:16:00 +08:00
weicw	28baa69e8f	🐛 装货管理与运输计划货物信息列统一为仅一种货物时不显示等N种货物	2026-11-03 19:41:25 +08:00
weicw	4ed80268b4	🐛 运单管理货物信息列仅一种货物时不显示等N种货物	2026-11-03 19:37:23 +08:00
weicw	30c59c2acb	🔀 合并主干 master 到 dev	2026-11-03 19:30:03 +08:00
刘泉佳	68904b02a5	fix: 审核按钮统一超时设置60s	2026-11-03 09:54:14 +08:00
b2894lxlxandCursor	c0ba9ba39b	✨ 计费/调度/结算支持多方客商与承运商区分 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 21:12:56 +08:00
b2894lxlxandCursor	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
weicw	39560bde79	✨ 过程配置新增装货端/卸货端节点与货量类型校验	2026-11-02 15:22:42 +08:00
b2894lxlxandCursor	8e1430491b	✨ 项目提交MK传projectType，并修复已撤回再提交 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 14:28:07 +08:00
b2894lxlxandCursor	9fed3785d9	⚡ 流程配置取消默认按当前用户部门筛选 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 13:32:06 +08:00
b2894lxlxandCursor	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
b2894lxlxandCursor	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
b2894lxlxandCursor	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
b2894lxlxandCursor	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
b2894lxlxandCursor	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
b2894lxlxandCursor	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
b2894lxlxandCursor	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