Merge remote-tracking branch 'origin/master' into feature/20261104-汇总文档-web

Merge remote-tracking branch 'origin/feature/20261030-kingdee-writeoff-status-web' into feature/20261104-汇总文档-web
# Conflicts: # src/option/settlement/formalSettlement.js
2026-11-04 00:09:18 +08:00 · 2026-11-04 00:08:49 +08:00 · 2026-11-04 00:08:14 +08:00 · 2026-11-03 09:54:14 +08:00 · 2026-11-02 21:10:47 +08:00 · 2026-11-02 19:58:01 +08:00
72 changed files with 4954 additions and 1495 deletions
@@ -2,6 +2,7 @@
 node_modules
 pnpm-lock.yaml
 /dist
+/dist.zip

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

 packages:

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

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

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

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

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

  '@ctrl/tinycolor@4.2.0': {}

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

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

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

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

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

@@ -2820,16 +2700,16 @@ snapshots:
      countup.js: 2.10.0
      signature_pad: 5.1.3

-  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))':
+  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))':
    dependencies:
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
      axios: 0.21.4(debug@4.4.3(supports-color@7.2.0))
      countup.js: 1.9.3
      dayjs: 1.11.20
-      element-plus: 2.14.2(vue@3.5.34(typescript@7.0.2))
+      element-plus: 2.14.2(vue@3.5.34(typescript@5.9.3))
      lodash: 4.18.1
      lodash-es: 4.18.1
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)
    transitivePeerDependencies:
      - debug

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

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

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

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

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

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

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

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

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

  '@vue/shared@3.5.34': {}

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

  '@vueuse/metadata@14.3.0': {}

-  '@vueuse/shared@14.3.0(vue@3.5.34(typescript@7.0.2))':
+  '@vueuse/shared@14.3.0(vue@3.5.34(typescript@5.9.3))':
    dependencies:
-      vue: 3.5.34(typescript@7.0.2)
+      vue: 3.5.34(typescript@5.9.3)

-  '@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      dom7: 3.0.0
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      dom7: 4.0.6
      is-url: 1.2.4
      lodash.throttle: 4.1.1
      nanoid: 5.1.11
      slate: 0.123.0
      snabbdom: 3.6.3

-  '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
      dom7: 4.0.6
      prismjs: 1.30.0
      slate: 0.123.0
      snabbdom: 3.6.3

-  '@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
      '@types/event-emitter': 0.3.5
      '@uppy/core': 2.3.4
      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      dom7: 3.0.0
+      dom7: 4.0.6
      event-emitter: 0.3.5
      html-void-elements: 3.0.0
      i18next: 23.16.8
@@ -3087,13 +2907,13 @@ snapshots:
    dependencies:
      '@uppy/core': 2.3.4
      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
      dom7: 4.0.6
      is-hotkey: 0.2.0
      lodash.camelcase: 4.3.0
@@ -3106,16 +2926,16 @@ snapshots:
      slate: 0.123.0
      snabbdom: 3.6.3

-  '@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
      dom7: 4.0.6
      slate: 0.123.0
      snabbdom: 3.6.3

-  '@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
      dom7: 4.0.6
      lodash.debounce: 4.0.8
      lodash.throttle: 4.1.1
@@ -3123,22 +2943,22 @@ snapshots:
      slate: 0.123.0
      snabbdom: 3.6.3

-  '@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
      '@uppy/core': 2.3.4
      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
      dom7: 4.0.6
      lodash.foreach: 4.5.0
      slate: 0.123.0
      snabbdom: 3.6.3

-  '@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
    dependencies:
      '@uppy/core': 2.3.4
      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
      dom7: 4.0.6
      nanoid: 5.1.11
      slate: 0.123.0
@@ -3185,10 +3005,10 @@ snapshots:
      slate-history: 0.66.0(slate@0.72.8)
      snabbdom: 3.6.3

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

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

  asynckit@0.4.0: {}

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

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

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

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

  typedarray@0.0.6: {}

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

  ufo@1.6.4: {}

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

  universalify@2.0.1: {}

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

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

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

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

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

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

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

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

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

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

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

  webpack-virtual-modules@0.6.2: {}

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

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

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

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

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

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

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

@@ -0,0 +1,54 @@
+import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/project-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromProject = (projectId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-project`,
+    method: 'post',
+    params: { projectId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+    timeout: APPROVE_TIMEOUT,
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });
@@ -2,7 +2,7 @@ import request from '@/axios';
 import { ElLoading, ElMessage } from 'element-plus';

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

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

 export const approvalStatusOptions = [
  { label: '草稿', value: 'draft' },
@@ -27,13 +27,13 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 // 同步金蝶涉及多次金蝶远程接口调用（A103-2 预检 + A103-1/A103-3 推送），单笔可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: APPROVE_TIMEOUT, params: { id } });
 // 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: APPROVE_TIMEOUT, data: ids });
 // 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
 export const syncKingdeeResult = () =>
-  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });

 export const paymentTypeOptions = [
  { label: '项目预付', value: 'project_advance' },
@@ -8,20 +8,12 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 export const updateAttachments = data =>
  request({ url: `${baseUrl}/attachments`, method: 'post', data });
 export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
-export const queryKingdeeResult = () =>
-  request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });

 export const claimStatusOptions = [
  { label: '已认领', value: 'claimed' },
  { label: '已作废', value: 'voided' },
 ];

-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
  { label: '未生成', value: 'none' },
  { label: '已推送', value: 'pushed' },
@@ -2,6 +2,9 @@ import request from '@/axios';

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

+/** 收款流水同步需远程拉取金蝶收款单并逐条落库，覆盖全局 10s 超时 */
+export const SYNC_TIMEOUT = 30000;
+
 export const getList = (current, size, params) =>
  request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
@@ -12,9 +15,7 @@ export const getSettlementCandidates = (keyword, flowId) =>
    params: { keyword, flowId },
  });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
-export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
-export const pushKingdee = flowId =>
-  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
+export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });

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

-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
  { label: '已推送', value: 'pushed' },
  { label: '审核通过', value: 'approved' },
@@ -58,5 +58,21 @@ export const applyPayments = data =>
  request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
 export const claimInvoices = data =>
  request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
+// 先票后款：发票登记确认推送（认领收票单逐单 A302-6 指定应付），涉及多次金蝶远程调用，覆盖全局超时
+export const invoiceAssignKingdee = id =>
+  request({
+    url: `${baseUrl}/invoice-assign-kingdee`,
+    method: 'post',
+    timeout: 30000,
+    params: { id },
+  });
+// 先票后款：查看页重推认领收票单（收票单A303-2+指定应付A302-6 一步式），涉及多次金蝶远程调用，覆盖全局超时
+export const repushClaimedInvoice = (id, invoiceNo, matchedAmount) =>
+  request({
+    url: `${baseUrl}/repush-claimed-invoice`,
+    method: 'post',
+    timeout: 30000,
+    params: { id, invoiceNo, matchedAmount },
+  });
 export const queryInvoicePool = params =>
  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
@@ -0,0 +1,42 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-system/business-dept-config';
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+
+export const getDetail = id =>
+  request({
+    url: `${baseUrl}/detail`,
+    method: 'get',
+    params: { id },
+  });
+
+export const submit = row =>
+  request({
+    url: `${baseUrl}/submit`,
+    method: 'post',
+    data: row,
+  });
+
+export const remove = ids =>
+  request({
+    url: `${baseUrl}/remove`,
+    method: 'post',
+    params: { ids },
+  });
+
+export const getByPlatformDept = (platformCompanyId, businessDeptId) =>
+  request({
+    url: `${baseUrl}/by-platform-dept`,
+    method: 'get',
+    params: { platformCompanyId, businessDeptId },
+  });
@@ -12,6 +12,7 @@ export const MK_SUBMIT_TIMEOUT = 30000;
 * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
 * @param {string} [data.subject] 流程标题
 * @param {string} [data.bizType] 业务类型
+ * @param {Object} [data.tempVarData] MK 临时变量（如 { projectType }）
 */
 export const processSubmit = data => {
  return request({
@@ -163,6 +163,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 +212,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',
    },
  });
 };
@@ -0,0 +1,221 @@
+import {
+  approvalStatusOptions,
+  contractCategoryOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  signTypeOptions,
+} from './common';
+
+const listDicFormatter = res => {
+  const data = res?.data || res;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
+const projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
+export const changeTypeOptions = [
+  { label: '合同信息变更', value: '合同信息变更' },
+  { label: '结算规则变更', value: '结算规则变更' },
+];
+
+export const config = {
+  title: '合同变更',
+  permission: 'contract_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'contract_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing', 'rejected', 'approved'],
+      permission: 'contract_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '合同编号',
+    prop: 'contractNo',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 20,
+    minWidth: 160,
+  },
+  {
+    label: '合同名称',
+    prop: 'contractName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 30,
+    minWidth: 180,
+  },
+  {
+    label: '所属项目',
+    prop: 'projectName',
+    search: true,
+    searchType: 'select',
+    searchPlaceholder: '请选择',
+    searchOrder: 60,
+    dicUrl: '/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
+    dicFormatter: projectNameDicFormatter,
+    props: {
+      label: 'projectName',
+      value: 'projectName',
+    },
+    filterable: true,
+    minWidth: 160,
+  },
+  {
+    label: '所属组织',
+    prop: 'organizationName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 10,
+    minWidth: 150,
+  },
+  {
+    label: '合同类别',
+    prop: 'contractCategory',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 70,
+    dicData: contractCategoryOptions,
+    minWidth: 130,
+  },
+  {
+    label: '签约类型',
+    prop: 'signType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 50,
+    dicData: signTypeOptions,
+    minWidth: 120,
+  },
+  {
+    label: '甲方',
+    prop: 'partyA',
+    minWidth: 160,
+  },
+  {
+    label: '乙方',
+    prop: 'partyB',
+    minWidth: 160,
+  },
+  {
+    label: '开始日期',
+    prop: 'startDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '结束日期',
+    prop: 'endDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力起',
+    prop: 'temporaryStartDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力止',
+    prop: 'temporaryEndDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '经办人',
+    prop: 'handlerUserName',
+    minWidth: 120,
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '审核状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 40,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);
@@ -65,10 +65,12 @@ export const config = {
        ['contractName', '合同名称'],
        ['projectName', '所属项目'],
        ['organizationName', '合同负责部门'],
+        ['platformCompanyName', '平台公司'],
        ['contractCategory', '合同类别'],
        ['signType', '签约类型'],
        ['partyA', '甲方'],
        ['partyB', '乙方'],
+        ['partyC', '丙方'],
        ['handlerUserName', '经办人'],
        ['signDate', '签订日期'],
        ['applyDate', '申请日期'],
@@ -311,6 +313,13 @@ export const option = createCrudOption([
    minWidth: 150,
    rules: selectRule('合同负责部门'),
  },
+  {
+    label: '平台公司',
+    prop: 'platformCompanyName',
+    minWidth: 180,
+    order: 115,
+    display: false,
+  },
  {
    label: '合同类别',
    prop: 'contractCategory',
@@ -350,24 +359,23 @@ export const option = createCrudOption([
  {
    label: '甲方',
    prop: 'partyA',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 160,
-    filterable: true,
    minWidth: 160,
-    rules: selectRule('甲方'),
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '乙方',
    prop: 'partyB',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 150,
-    filterable: true,
    minWidth: 160,
-    rules: selectRule('乙方'),
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '丙方',
+    prop: 'partyC',
+    minWidth: 160,
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '合同期限',
@@ -621,6 +629,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',
@@ -0,0 +1,161 @@
+import {
+  approvalStatusOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  projectTypeOptions,
+} from './common';
+
+export const changeTypeOptions = [
+  { label: '项目变更', value: '项目变更' },
+  { label: '项目备案调整', value: '项目备案调整' },
+];
+
+export const config = {
+  title: '项目变更',
+  permission: 'project_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved', 'rejected', 'withdrawn'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'project_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '项目编号',
+    prop: 'projectCode',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 70,
+    minWidth: 160,
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 60,
+    minWidth: 180,
+  },
+  {
+    label: '变更类型',
+    prop: 'changeType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 10,
+    dicData: changeTypeOptions,
+    minWidth: 130,
+  },
+  {
+    label: '项目类型',
+    prop: 'projectType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 20,
+    dicData: projectTypeOptions,
+    minWidth: 110,
+  },
+  {
+    label: '客户名称',
+    prop: 'customerNames',
+    minWidth: 160,
+  },
+  {
+    label: '下游承运商',
+    prop: 'carrierNames',
+    minWidth: 160,
+  },
+  {
+    label: '承办部门',
+    prop: 'undertakeDeptName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 50,
+    minWidth: 140,
+  },
+  {
+    label: '项目负责人',
+    prop: 'principalUserName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 40,
+    minWidth: 120,
+  },
+  {
+    label: '审批状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 30,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '审核通过时间',
+    prop: 'approvedTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);
@@ -169,7 +169,8 @@ export const paymentApplicationOption = ({
    { label: '当前节点', prop: 'currentNode', minWidth: 120, formatter: textFormatter },
    { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
    { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
-    { label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
+    { label: '金蝶单据状态', prop: 'kingdeeStatusName', slot: true, minWidth: 130 },
+    { label: '已指定应付', prop: 'kingdeeAssignStatus', slot: true, minWidth: 120 },
    { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
    { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
  ],
@@ -1,7 +1,7 @@
 export const receiptClaimRecordTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
  { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
  { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
  { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
  { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
@@ -1,18 +1,23 @@
 export const receiptFlowTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
  { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
  { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
  { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
  { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
+  { prop: 'payeeName', label: '收款人（公司）', minWidth: 150 },
+  //{ prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
+  //{ prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
  { prop: 'summary', label: '摘要', minWidth: 160 },
  { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
  { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
-  { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
  { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
-  { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
-  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
-  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
-  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  { prop: 'remainingAmount', label: '剩余可认领金额', minWidth: 140, money: true },
+  { prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
+  //{ prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
  { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];
@@ -16,6 +16,7 @@ import {
  approvalStatusOptions,
  invoiceStatusOptions,
  kingdeeSyncStatusOptions,
+  kingdeeWriteOffStatusOptions,
  paymentStatusOptions,
 } from './formalSettlementSearch';
 import { formalSettlementTableColumns } from './formalSettlementTable';
@@ -87,6 +88,8 @@ const COLUMN_EXTRA = {
    searchPlaceholder: '请选择',
  },
  kingdeeLockStatus: { slot: true },
+  kingdeeWriteOffStatus: { slot: true },
+  kingdeeAssignStatus: { slot: true },
  createTime: { width: 180 },
 };

@@ -99,7 +102,8 @@ const buildTableColumns = () =>
    }
    // link / status 标记的列统一走单元格插槽
    if (column.link || column.status) extra.slot = true;
-    if (!extra.formatter) extra.formatter = textFormatter;
+    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
    return { ...column, ...extra };
  });

@@ -170,4 +174,5 @@ export const formalSettlementOption = () => ({
 });

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

+export const kingdeeWriteOffStatusOptions = [
+  { label: '未冲销', value: 'unwrittenoff' },
+  { label: '已冲销', value: 'writtenoff' },
+];
+
 export const formalSettlementSearchFields = [
  { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
@@ -25,7 +25,9 @@ export const formalSettlementTableColumns = [
  { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
  { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
  { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
+  { label: '金蝶冲销状态', prop: 'kingdeeWriteOffStatus', minWidth: 135 },
  { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
+  { label: '已指定应付', prop: 'kingdeeAssignStatus', minWidth: 120 },
  { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
  { label: '创建人', prop: 'createUserName', minWidth: 110 },
  { label: '创建时间', prop: 'createTime', minWidth: 170 },
@@ -203,10 +203,9 @@ export default {
      overHidden: true,
      hide: true,
      addDisplay: false,
-      editDisplay: true,
+      editDisplay: false,
      viewDisplay: true,
      order: 40,
-      placeholder: '可清空以解绑微信',
    },
    {
      label: '状态',
@@ -95,6 +95,17 @@ export default [
      bizType: 'project-apply',
    },
  },
+  {
+    path: '/business/project-change/public-view',
+    name: '查看项目变更信息',
+    component: () => import('@/views/business/project-apply-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'project-change',
+    },
+  },
  {
    path: '/business/contract-manage/public-view',
    name: '查看合同信息',
@@ -106,6 +117,17 @@ export default [
      bizType: 'contract-manage',
    },
  },
+  {
+    path: '/business/contract-change/public-view',
+    name: '查看合同变更信息',
+    component: () => import('@/views/business/contract-change-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'contract-change',
+    },
+  },
  {
    path: '/settlement/pre-settlement/public-view',
    name: '查看预付结算单信息',
@@ -104,6 +104,22 @@ export default [
      },
    ],
  },
+  {
+    // 兼容旧菜单路径：按 detailNo 解析应付/应收后跳转到拆分后的列表页
+    path: '/settlement/formal-settlement',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '正式结算单兼容跳转',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-redirect.vue')),
+      },
+    ],
+  },
  {
    path: '/settlement/formal-settlement/form',
    component: Layout,
@@ -198,6 +214,18 @@ export default [
      },
    ],
  },
+  {
+    path: '/business/project-change/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '项目变更表单',
+        meta: { keepAlive: false, activeMenu: '/business/project-change' },
+        component: loadView(() => import('@/views/business/project-apply.vue')),
+      },
+    ],
+  },
  {
    path: '/business/waybill-manage/form',
    component: Layout,
@@ -342,6 +370,18 @@ export default [
      },
    ],
  },
+  {
+    path: '/business/contract-change/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '合同变更表单',
+        meta: { keepAlive: false, activeMenu: '/business/contract-change' },
+        component: loadView(() => import('@/views/business/contract-manage-change.vue')),
+      },
+    ],
+  },
  {
    path: '/wel',
    component: () =>
@@ -0,0 +1,24 @@
+/**
+ * 金蝶单据状态公共映射
+ */
+
+/** 金蝶单据状态 → el-tag 颜色类型（failed 状态列表页悬浮展示失败原因） */
+export const KINGDEE_STATUS_TAG_TYPES = {
+  synced: 'success',
+  paid: 'success',
+  invoiced: 'success',
+  paying: 'warning',
+  failed: 'danger',
+};
+
+/** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
+
+/** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */
+export const KINGDEE_WRITEOFF_TAG_TYPES = {
+  writtenoff: 'success',
+  unwrittenoff: 'warning',
+};
+
+/** 金蝶冲销状态 → el-tag 颜色类型，未映射状态（null=未校验）返回 info */
+export const kingdeeWriteOffTagType = status => KINGDEE_WRITEOFF_TAG_TYPES[status] || 'info';
@@ -15,12 +15,24 @@ export const MK_BIZ = {
    rejected: ['rejected', 'change_rejected', 'withdrawn'],
    approved: ['approved', 'change_approved'],
  },
+  'project-change': {
+    dictName: '提交项目变更审核流',
+    subjectPrefix: '项目变更审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
  'contract-manage': {
    dictName: '提交合同审核流',
    subjectPrefix: '合同审批',
    rejected: ['rejected', 'change_rejected', 'withdrawn'],
    approved: ['approved', 'change_approved'],
  },
+  'contract-change': {
+    dictName: '提交合同变更审核流',
+    subjectPrefix: '合同变更审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
  'pre-settlement': {
    dictName: '提交预结算审核流',
    subjectPrefix: '预付结算审批',
@@ -142,6 +154,7 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
 * @param {string} [options.subjectName] 标题后缀
 * @param {string} [options.approvalStatus] 提交前的审批状态
 * @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
+ * @param {Object} [options.tempVarData] 传给 MK 的临时变量（如项目类型 projectType）
 * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
 */
 export async function submitMkApprovalFlow({
@@ -150,6 +163,7 @@ export async function submitMkApprovalFlow({
  subjectName = '',
  approvalStatus = '',
  mkEnabled,
+  tempVarData,
 } = {}) {
  const conf = MK_BIZ[bizType];
  if (!conf) {
@@ -190,12 +204,16 @@ export async function submitMkApprovalFlow({
  const subject = subjectName
    ? `${conf.subjectPrefix}：${subjectName}`
    : `${conf.subjectPrefix}：${bizIdText}`;
-  await processSubmit({
+  const submitPayload = {
    templateCode,
    bizId: bizIdText,
    subject,
    bizType,
    forceNewFormInstance,
-  });
+  };
+  if (tempVarData != null && typeof tempVarData === 'object') {
+    submitPayload.tempVarData = tempVarData;
+  }
+  await processSubmit(submitPayload);
  return true;
 }
@@ -0,0 +1,28 @@
+/**
+ * 客商/合同风险标签公共展示逻辑（黑名单=金蝶黑名单 A801-5 命中，与后端 HcsCreditCheckSupport 口径一致）：
+ * 等级与黑名单组合展示、等级在前；内部组织客商默认无风险
+ */
+
+/** 金蝶黑名单命中判定（客商档案行：失信类别/列入事由任一非空） */
+export function isKingdeeBlack(category, reason) {
+  return !!(category || reason);
+}
+
+/** 合同行黑名单判定（推送链路按金蝶命中口径落库 kingdeeBlackStatus=yes） */
+export function isContractBlack(blackStatus) {
+  return String(blackStatus || '').toLowerCase() === 'yes';
+}
+
+/** 风险标签文案：riskLevel=C101-1 等级（0/1/2）；isBlack=金蝶黑名单命中；customerKind=internal 显示"无风险" */
+export function resolveRiskTagName(riskLevel, isBlack, customerKind) {
+  const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[riskLevel] || '';
+  if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
+  if (levelName) return levelName;
+  if (customerKind === 'internal') return '无风险';
+  return '';
+}
+
+/** 是否红色风险标签（黑名单命中或高风险） */
+export function isRiskyTag(riskLevel, isBlack) {
+  return isBlack || riskLevel === '2';
+}
@@ -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) {
@@ -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 || '';
@@ -352,7 +352,12 @@
      @opened="loadAddressList"
    >
      <div class="route-dialog__search common-address-dialog__search">
-        <el-form :model="addressQuery" label-position="right" label-width="auto">
+        <el-form
+          class="dialog-form-label-fixed"
+          :model="addressQuery"
+          label-position="right"
+          label-width="96px"
+        >
          <el-row :gutter="16">
            <el-col :span="6">
              <el-form-item label="地址名称">
@@ -446,7 +451,12 @@
      @opened="loadStationList"
    >
      <div class="route-dialog__search">
-        <el-form :model="stationQuery" label-position="right" label-width="auto">
+        <el-form
+          class="dialog-form-label-fixed"
+          :model="stationQuery"
+          label-position="right"
+          label-width="96px"
+        >
          <el-row :gutter="16">
            <el-col :span="8"><el-form-item label="站点名称"><el-input v-model="stationQuery.name" clearable placeholder="请输入" /></el-form-item></el-col>
            <el-col :span="8"><el-form-item label="详细地址"><el-input v-model="stationQuery.detailAddress" clearable placeholder="请输入" /></el-form-item></el-col>
@@ -652,6 +662,8 @@ export default {
      addressQuery: {},
      addressPage: { current: 1, size: 10, total: 0 },
      addressRegionPaths: { departure: [], arrival: [] },
+      // 程序回填省市区时抑制 cascader @change，避免空值回调把已填地址清空
+      suppressAddressRegionChange: false,
      regionOptions: [],
      regionLoading: false,
      regionRequest: null,
@@ -889,26 +901,63 @@ export default {
    findRegionPathByName(options = [], regionName = '', parents = []) {
      const target = String(regionName || '').replace(/\s+/g, '');
      if (!target) return [];
+      let suffixMatch = [];
      for (const item of options) {
        const nextParents = [...parents, item];
        const name = nextParents.map(region => region.title || region.name || '').join('');
        if (name === target) return nextParents.map(region => region.id);
+        // 常用地址可能缺省名，允许「市+区」后缀命中完整省市区路径
+        if (!suffixMatch.length && name.endsWith(target) && target.length >= 2) {
+          suffixMatch = nextParents.map(region => region.id);
+        }
        const path = this.findRegionPathByName(item.children, target, nextParents);
        if (path.length) return path;
      }
-      return [];
+      return suffixMatch;
    },
    findRegionPathByCode(options = [], regionCode = '', parents = []) {
      const target = String(regionCode || '').trim();
      if (!target) return [];
      for (const item of options) {
        const nextParents = [...parents, item];
-        if (String(item.id) === target) return nextParents.map(region => region.id);
+        if (String(item.id) === target || String(item.value || '') === target) {
+          return nextParents.map(region => region.id);
+        }
        const path = this.findRegionPathByCode(item.children, target, nextParents);
        if (path.length) return path;
      }
      return [];
    },
+    resolveRegionPath(field) {
+      if (!field) return [];
+      const codePath = this.findRegionPathByCode(
+        this.regionOptions,
+        field.model[field.regionCode]
+      );
+      if (codePath.length) return codePath;
+      const namePath = this.findRegionPathByName(this.regionOptions, field.model[field.name]);
+      if (namePath.length) return namePath;
+      const composed = [field.model[field.provinceName], field.model[field.cityName], field.model[field.districtName]]
+        .filter(Boolean)
+        .join('');
+      return this.findRegionPathByName(this.regionOptions, composed);
+    },
+    setAddressRegionPath(target, path = []) {
+      const nextPath = Array.isArray(path) ? path.map(item => String(item)) : [];
+      const current = this.addressRegionPaths[target] || [];
+      if (
+        current.length === nextPath.length &&
+        current.every((item, index) => String(item) === String(nextPath[index]))
+      ) {
+        return;
+      }
+      this.suppressAddressRegionChange = true;
+      // Vue3 直接写动态 key，避免整体替换对象导致其它 cascader 重建并触发空 @change
+      this.addressRegionPaths[target] = nextPath;
+      this.$nextTick(() => {
+        this.suppressAddressRegionChange = false;
+      });
+    },
    regionLabels(path = []) {
      let options = this.regionOptions;
      const labels = [];
@@ -947,10 +996,22 @@ export default {
      this.setAddressRegionNames(field, [provinceMatch?.[0], cityMatch?.[0], districtMatch?.[0]]);
    },
    handleAddressRegionChange(target, value) {
+      if (this.suppressAddressRegionChange) return;
      const field = this.addressModel(target);
      const path = Array.isArray(value) ? value.map(item => String(item)) : [];
-      this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
+      this.setAddressRegionPath(target, path);
      if (!field) return;
+      // 程序回填/重建过程中 cascader 可能短暂抛出空值，不能据此清空已选常用地址
+      if (!path.length) {
+        const hasExisting =
+          String(field.model[field.name] || '').trim() ||
+          String(field.model[field.address] || '').trim() ||
+          String(field.model[field.regionCode] || '').trim();
+        if (hasExisting) {
+          this.$nextTick(() => this.syncAddressRegionPath(target));
+          return;
+        }
+      }
      const labels = this.regionLabels(path);
      field.model[field.name] = labels.join('');
      field.model[field.regionCode] = path.at(-1) || '';
@@ -959,19 +1020,29 @@ export default {
    },
    syncAddressRegionPath(target) {
      const field = this.addressModel(target);
-      if (!field) return;
-      const codePath = this.findRegionPathByCode(this.regionOptions, field.model[field.regionCode]);
-      const path = codePath.length
-        ? codePath
-        : this.findRegionPathByName(this.regionOptions, field.model[field.name]);
-      this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
+      if (!field || !this.regionOptions.length) return;
+      const path = this.resolveRegionPath(field);
+      this.setAddressRegionPath(target, path);
      if (path.length) this.setAddressRegionNames(field, this.regionLabels(path));
    },
    syncAddressRegionPaths() {
      if (!this.regionOptions.length) return;
-      ['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(target => {
-        this.syncAddressRegionPath(target);
-      });
+      this.suppressAddressRegionChange = true;
+      try {
+        ['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(
+          target => {
+            const field = this.addressModel(target);
+            if (!field) return;
+            const path = this.resolveRegionPath(field);
+            this.addressRegionPaths[target] = path;
+            if (path.length) this.setAddressRegionNames(field, this.regionLabels(path));
+          }
+        );
+      } finally {
+        this.$nextTick(() => {
+          this.suppressAddressRegionChange = false;
+        });
+      }
    },
    async loadDetail(id) {
      const res = await api.getDetail(id);
@@ -1145,13 +1216,15 @@ export default {
      };
    },
    addressTransportType(target) {
-      if (target.startsWith('route-')) {
-        return this.form.routes[Number(target.slice(6))]?.transportType || '';
+      const key = String(target || '');
+      if (key.startsWith('route-')) {
+        return String(this.form.routes[Number(key.slice(6))]?.transportType || '');
      }
-      return target === 'arrival' ? this.form.finalTransportType : this.form.routes[0]?.transportType || '';
+      if (key === 'arrival') return String(this.form.finalTransportType || '');
+      return String(this.form.routes[0]?.transportType || '');
    },
    addressTransportMode(target) {
-      const type = this.addressTransportType(target);
+      const type = String(this.addressTransportType(target) || '');
      if (type.includes('铁路')) return 'rail';
      if (type.includes('水路') || type.includes('水运') || type.includes('海运')) return 'water';
      if (type.includes('航空') || type.includes('空运')) return 'air';
@@ -1168,25 +1241,11 @@ export default {
      // 展示模式由已选数据决定：有站点编码则显示站点名，否则省市区；暂不按运输方式强制站点限制。
      return Boolean(siteCode && siteCode !== '/');
    },
-    hasAddressValue(target) {
-      const field = this.addressModel(target);
-      if (!field) return false;
-      return Boolean(
-        String(field.model[field.address] || '').trim() || String(field.model[field.name] || '').trim()
-      );
-    },
-    tipEmptyAddressDetail(target) {
-      // 替代原「请先选择运输方式」placeholder：空地址点击时 toast，已有值不再提示。
-      if (!this.hasAddressValue(target)) {
-        this.$message.warning('请输入详细地址');
-      }
-    },
    resolveAddressRegionCode(row = {}) {
      return row.regionCode || row.districtCode || row.areaCode || row.adcode || '';
    },
    openCommonAddress(target) {
      if (this.isBasicRouteReadonly) return;
-      this.tipEmptyAddressDetail(target);
      this.addressTarget = target;
      // 暂不按运输方式限制站点：统一走常用地址选择。
      this.addressQuery = {};
@@ -1233,8 +1292,9 @@ export default {
      this.stationPage.current = 1;
      this.loadStationList();
    },
-    selectStation(row) {
-      const target = this.addressModel(this.addressTarget);
+    async selectStation(row) {
+      const targetKey = this.addressTarget;
+      const target = this.addressModel(targetKey);
      if (!target) return;
      const station = this.normalizeStation(row);
      target.model[target.name] = station.stationName || station.regionName;
@@ -1245,7 +1305,9 @@ export default {
      target.model[target.siteCode] = station.stationCode;
      this.setAddressRegionNamesFromRow(target, station);
      this.stationDialogVisible = false;
-      this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
+      await this.loadRegionOptions();
+      await this.$nextTick();
+      this.syncAddressRegionPath(targetKey);
    },
    async loadAddressList() {
      this.addressLoading = true;
@@ -1271,8 +1333,9 @@ export default {
      this.addressPage.current = 1;
      this.loadAddressList();
    },
-    selectAddress(row) {
-      const target = this.addressModel(this.addressTarget);
+    async selectAddress(row) {
+      const targetKey = this.addressTarget;
+      const target = this.addressModel(targetKey);
      if (!target) return;
      target.model[target.name] = row.regionName || row.addressName || '';
      target.model[target.address] = row.detailAddress || row.address || '';
@@ -1284,11 +1347,13 @@ export default {
      target.model[target.siteCode] = '';
      this.setAddressRegionNamesFromRow(target, row);
      this.addressDialogVisible = false;
-      this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
+      await this.loadRegionOptions();
+      // nextTick 确保途经点动态 key 已挂载 cascader 后再回填路径
+      await this.$nextTick();
+      this.syncAddressRegionPath(targetKey);
    },
    handleAddressDetailClick(target) {
      if (this.isBasicRouteReadonly) return;
-      this.tipEmptyAddressDetail(target);
      this.openAddressMap(target);
    },
    openAddressMap(target) {
@@ -1803,12 +1868,23 @@ export default {
    },
    addRoute() {
      if (this.isBasicRouteReadonly) return;
-      this.form.routes.push(this.createRoute());
+      const index = this.form.routes.length;
+      this.form.routes.push(this.createRoute(index));
+      this.addressRegionPaths[`route-${index}`] = [];
    },
    removeRoute(index) {
      if (this.isBasicRouteReadonly) return;
      this.form.routes.splice(index, 1);
-      this.syncAddressRegionPaths();
+      const nextPaths = { departure: this.addressRegionPaths.departure || [], arrival: this.addressRegionPaths.arrival || [] };
+      this.form.routes.forEach((route, routeIndex) => {
+        nextPaths[`route-${routeIndex}`] = this.addressRegionPaths[`route-${routeIndex >= index ? routeIndex + 1 : routeIndex}`] || [];
+      });
+      this.suppressAddressRegionChange = true;
+      this.addressRegionPaths = nextPaths;
+      this.$nextTick(() => {
+        this.suppressAddressRegionChange = false;
+        this.syncAddressRegionPaths();
+      });
    },
    goodsKey(row = {}) {
      return `${row.cargoName || ''}\u0000${row.cargoType || ''}`;
@@ -1607,7 +1607,7 @@
            v-if="canConfirmReturn(row)"
            @click="handleAction('confirmReturn', row)"
          >
-            确认回单
+            {{ completeActionLabel }}
          </el-link>
          <el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
            维护里程
@@ -5116,11 +5116,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,8 +5173,12 @@ export default {
        return false;
      }
      const status = this.statusValue(row);
-      // 待回单确认也可直接完成，不经确认回单
-      return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
+      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
+      // 只有确认回单不可用时才退回这里的普通完成
+      if (status === 'pending_return_confirm') {
+        return !this.canConfirmReturn(row);
+      }
+      return status === 'processing' || status === 'running';
    },
    canConfirmReturn(row) {
      return (
@@ -10215,12 +10224,12 @@ export default {
        cancel: '取消',
        complete: this.completeActionLabel,
        reassign: '重新派单',
-        confirmReturn: '确认回单',
+        confirmReturn: '完成',
      }[action];
-      // 确认回单是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
      const confirmText =
        action === 'confirmReturn'
-          ? '确认回单后该运单将置为已完成，且不可撤销。是否继续?'
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
          : `确定${actionName}该${this.config.title}?`;
      this.$confirm(confirmText, '提示', {
        confirmButtonText: '确定',
@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="contract-change" :get-form="getForm">
+    <contract-manage-change ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import ContractManageChange from '@/views/business/contract-manage-change.vue';
+
+export default {
+  name: 'ContractChangePublicView',
+  components: { MkPublicShell, ContractManageChange },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.form || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
+    },
+  },
+};
+</script>
@@ -0,0 +1,407 @@
+<template>
+  <basic-container class="contract-change-page">
+    <avue-crud
+      :option="tableOption"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="tableForm"
+      ref="crud"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="primary" plain :loading="hcsRepushingId === 'batch'" @click="handleHcsBatchRepush">
+          批量同步
+        </el-button>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="hasPermission(`${config.permission}_delete`)"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+
+      <template #approvalStatus="{ row }">
+        {{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
+      </template>
+
+      <template #syncStatus="{ row }">
+        <el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
+          {{ syncLabel(row.syncStatus) }}
+        </el-tag>
+        <span v-else>-</span>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link type="primary" v-if="canView(row)" @click="openForm('view', row)"> 查看 </el-link>
+        <el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)"> 编辑 </el-link>
+        <el-link type="danger" v-if="canDelete(row)" @click="rowDel(row)"> 删除 </el-link>
+        <el-link
+          v-for="operation in customOperations(row)"
+          :key="operation.action"
+          :type="
+            operation.type === 'warning'
+              ? 'warning'
+              : operation.type === 'success'
+                ? 'success'
+                : 'primary'
+          "
+          @click="handleCustomOperation(operation, row)"
+        >
+          {{ operation.label }}
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import * as api from '@/api/business/contract-change';
+import { repushBatch as hcsRepushBatch } from '@/api/business/hcs';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { config, option } from '@/option/business/contract-change';
+import { approvalStatusOptions } from '@/option/business/common';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { isAdministrator } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+
+const contractChangeFormRoute = '/business/contract-change/form';
+const contractChangeListRefreshKey = 'contract-change-list-refresh';
+
+export default {
+  name: 'ContractChange',
+  data() {
+    return {
+      api,
+      config,
+      tableForm: {},
+      tableOption: this.buildTableOption(),
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      selectionList: [],
+      mkEnabled: false,
+      hcsRepushingId: null,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo', 'website']),
+    permissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+      };
+    },
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
+  activated() {
+    if (sessionStorage.getItem(contractChangeListRefreshKey)) {
+      sessionStorage.removeItem(contractChangeListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
+  methods: {
+    buildTableOption() {
+      return {
+        ...option,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 320,
+        column: (option.column || []).map(column => ({
+          ...column,
+          display: false,
+          align: 'center',
+          headerAlign: 'center',
+        })),
+      };
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission && this.permission[code], false);
+    },
+    statusLabel(status) {
+      return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+    },
+    syncLabel(value) {
+      return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
+    },
+    syncTagType(value) {
+      return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
+    },
+    canHcsRepush(row) {
+      return row.approvalStatus === 'approved' && row.contractId && row.syncStatus !== 'synced';
+    },
+    handleHcsBatchRepush() {
+      if (this.hcsRepushingId) return;
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      const rows = this.selectionList.filter(item => this.canHcsRepush(item));
+      if (!rows.length) {
+        this.$message.warning('请选择审批通过且未同步成功的变更单');
+        return;
+      }
+      this.$confirm(`确定同步选中的${rows.length}条合同变更到合规系统?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在推送合规，请稍候…',
+          background: 'rgba(255, 255, 255, 0.6)',
+        });
+        this.hcsRepushingId = 'batch';
+        const contractIds = [...new Set(rows.map(item => item.contractId))];
+        const changeIds = rows.map(item => item.id).join(',');
+        hcsRepushBatch('contract', contractIds)
+          .then(res => {
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || '批量同步失败');
+              return api.markSyncStatus(changeIds, 'failed');
+            }
+            return api.markSyncStatus(changeIds, 'synced').then(() => {
+              this.$message.success(res.data?.data || '批量同步成功');
+              this.onLoad(this.page, this.query);
+            });
+          })
+          .catch(() => api.markSyncStatus(changeIds, 'failed'))
+          .finally(() => {
+            this.hcsRepushingId = null;
+            loading.close();
+          });
+      });
+    },
+    inStatus(row, statusList) {
+      if (!statusList || !statusList.length) return true;
+      return statusList.includes(row.approvalStatus);
+    },
+    canEdit(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.editStatus)
+      );
+    },
+    canDelete(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_delete`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.deleteStatus)
+      );
+    },
+    canView(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_view`) &&
+        this.inStatus(row, this.config.viewStatus)
+      );
+    },
+    canOperation(operation, row) {
+      if (operation.permission && !this.hasPermission(operation.permission)) return false;
+      if (
+        row.readonly &&
+        ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)
+      ) {
+        return false;
+      }
+      return this.inStatus(row, operation.status);
+    },
+    customOperations(row) {
+      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
+        return this.canOperation(operation, row);
+      });
+    },
+    openForm(mode, row = {}) {
+      const query = { mode, id: row.id };
+      if (mode === 'edit') query.name = '编辑合同变更';
+      else if (mode === 'view') query.name = '查看合同变更';
+      this.$router.push({ path: contractChangeFormRoute, query });
+    },
+    handleCustomOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
+      const run = () => {
+        const request = () => this.api[operation.action](row.id);
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? submitMkApprovalFlow({
+                bizType: 'contract-change',
+                bizId: row.id,
+                subjectName: row.contractName || '',
+                approvalStatus: row.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
+              }).then(() => request())
+            : request();
+        const loading =
+          operation.action === 'approve'
+            ? this.$loading({
+                lock: true,
+                text: '正在推送合规，请稍候…',
+                background: 'rgba(255, 255, 255, 0.6)',
+              })
+            : null;
+        afterMk
+          .then(res => {
+            if (operation.action === 'approve' && res.data?.data === false) {
+              this.$message.warning(res.data?.msg);
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
+              return;
+            }
+            this.$message.success(`${operation.label}成功`);
+            this.onLoad(this.page, this.query);
+          })
+          .finally(() => loading && loading.close());
+      };
+      this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => run());
+    },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('变更单ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud?.toggleSelection?.();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(row.id).then(() => {
+          this.$message.success('删除成功!');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    handleDelete() {
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(this.ids).then(() => {
+          this.$message.success('删除成功!');
+          this.selectionClear();
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const values = {
+        ...this.query,
+        ...params,
+      };
+      this.api
+        .getList(page.currentPage, page.pageSize, values)
+        .then(res => {
+          const data = res.data.data || {};
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.contract-change-page {
+  :deep(.avue-crud__menu) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>
@@ -1,12 +1,20 @@
 <template>
  <basic-container class="contract-change-page">
    <div class="archive-page-form__title">{{ pageTitle }}</div>
-    <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto" class="contract-change-form">
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :disabled="pageReadonly"
+      label-position="right"
+      label-width="auto"
+      class="contract-change-form"
+    >
      <section class="change-section contract-basic-section">
        <div class="dialog-section-title">基本信息</div>
        <div class="contract-basic-section__grid">
          <el-form-item label="变更类型" class="contract-basic-section__change-type">
-            <el-radio-group v-model="form.changeType">
+            <el-radio-group v-model="form.changeType" :disabled="pageReadonly">
              <el-radio label="合同信息变更" />
              <el-radio label="结算规则变更" />
              <el-radio label="终止合同" />
@@ -280,7 +288,7 @@
        <div class="section-head">
          <div class="dialog-section-title">计费信息</div>
          <el-button
-            v-if="feeGenerationMode !== 'manual'"
+            v-if="!pageReadonly && feeGenerationMode !== 'manual'"
            type="primary"
            plain
            @click="addPlan"
@@ -301,6 +309,7 @@
              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 }"
@@ -416,7 +425,7 @@
                  :value="item.value"
              /></el-select></template
          ></el-table-column>
-          <el-table-column label="操作" width="100"
+          <el-table-column v-if="!pageReadonly" label="操作" width="100"
            ><template #default="{ $index }"
              ><el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link
              ><el-link v-else type="danger" @click="removeCustomPeriodRow($index)"
@@ -425,7 +434,7 @@
            ></el-table-column
          >
          <template #empty
-            ><el-link type="primary" @click="addCustomPeriodRow">添加</el-link></template
+            ><el-link v-if="!pageReadonly" type="primary" @click="addCustomPeriodRow">添加</el-link></template
          >
        </el-table>
      </section>
@@ -461,7 +470,7 @@
                :disabled="isSettlementRuleChange"
            /></template
          ></el-table-column>
-          <el-table-column v-if="!isSettlementRuleChange" label="操作" width="100"
+          <el-table-column v-if="!pageReadonly && !isSettlementRuleChange" label="操作" width="100"
            ><template #default="{ $index }"
              ><el-link type="danger" @click="paymentRatioRows.splice($index, 1)"
                >删除</el-link
@@ -470,7 +479,7 @@
          >
        </el-table>
        <el-button
-          v-if="!isSettlementRuleChange"
+          v-if="!pageReadonly && !isSettlementRuleChange"
          type="primary"
          plain
          @click="addPaymentRatioRow"
@@ -525,8 +534,9 @@
        @update:rows="changeMaterials = $event"
        @upload-to-location="handleAttachmentUploadToLocation"
      />
-      <div class="page-footer">
-        <el-button @click="$router.back()">取消</el-button>
+      <div v-if="!pageReadonly" class="page-footer">
+        <el-button @click="goBack">取消</el-button>
+        <el-button v-if="isContractChangeModule" @click="saveDraft">保存草稿</el-button>
        <el-button type="primary" @click="submit">提交</el-button>
      </div>
    </el-form>
@@ -539,7 +549,9 @@
 </template>

 <script>
-import * as api from '@/api/business/contract-manage';
+import * as contractApi from '@/api/business/contract-manage';
+import * as changeApi from '@/api/business/contract-change';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
@@ -577,6 +589,8 @@ const defaultContractFormatOptions = [
  { label: '电子合同', value: '电子合同' },
  { label: '纸质合同', value: '纸质合同' },
 ];
+const contractChangeListRoute = '/business/contract-change';
+const contractChangeListRefreshKey = 'contract-change-list-refresh';
 const normalizeOptionalPositiveInteger = value => {
  if (value === undefined || value === null || value === '') return null;
  const number = Number(value);
@@ -713,12 +727,25 @@ export default {
  },
  computed: {
    pageTitle() {
+      if (this.pageReadonly) return this.$route.query.name || '查看合同变更';
      return this.$route.query.name || '合同变更';
    },
+    isContractChangeModule() {
+      return (
+        this.$route.path === '/business/contract-change/form' ||
+        this.$route.path === '/business/contract-change/public-view'
+      );
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/business/contract-change/public-view';
+    },
+    pageReadonly() {
+      return this.isPublicViewPage || this.$route.query.mode === 'view';
+    },
    // 高风险/黑名单客商提示：按合同推送合规留痕 hcs_risk_level/hcs_black_status 判定（与合同详情口径一致）
    riskTipText() {
      const riskLevel = String(this.form.hcsRiskLevel || '').trim();
-      const blacklist = String(this.form.hcsBlackStatus || '').toLowerCase() === 'yes';
+      const blacklist = String(this.form.kingdeeBlackStatus || '').toLowerCase() === 'yes';
      if (riskLevel !== '2' && !blacklist) return '';
      const parties = [this.form.partyA, this.form.partyB]
        .map(name => String(name || '').trim())
@@ -833,13 +860,25 @@ export default {
    async load() {
      const id = this.$route.query.id;
      if (!id) return;
-      const res = await api.getDetail(id);
-      const data = res.data?.data || res.data || {};
+      let data = {};
+      if (this.isPublicViewPage) {
+        const res = await getMkPublicDetail('contract-change', id);
+        data = res.data?.data || res.data || {};
+      } else if (this.isContractChangeModule) {
+        const res = await changeApi.getDetail(id);
+        data = res.data?.data || res.data || {};
+      } else {
+        const res = await contractApi.getDetail(id);
+        data = res.data?.data || res.data || {};
+      }
+      const isChangeRecord = this.isContractChangeModule || this.isPublicViewPage;
      this.form = {
        ...data,
-        changeContent: '',
-        changeReason: '',
-        changeAttachmentsJson: '',
+        // 独立变更单保留 contractId；旧路由以合同 id 作为主键
+        contractId: data.contractId || (isChangeRecord ? data.contractId : data.id),
+        changeContent: isChangeRecord ? data.changeContent || '' : '',
+        changeReason: isChangeRecord ? data.changeReason || '' : '',
+        changeAttachmentsJson: data.changeAttachmentsJson || '',
        copyCount: normalizeOptionalPositiveInteger(data.copyCount),
        invoiceCycle: normalizeOptionalPositiveInteger(data.invoiceCycle),
        paymentDays: normalizeOptionalPositiveInteger(data.paymentDays),
@@ -847,14 +886,14 @@ export default {
        templateFlag: data.templateFlag ?? 0,
        electronicSealFlag: data.electronicSealFlag ?? 0,
        archiveStatus: data.archiveStatus || '未归档',
-        changeType: '合同信息变更',
+        changeType: data.changeType || '合同信息变更',
      };
-      this.changeMaterials = [];
+      this.changeMaterials = this.parse(data.changeAttachmentsJson);
      this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
      this.plans = this.parse(data.billingPlanJson);
      this.attachments = this.mergeChangeAttachments(
        this.parse(data.attachmentsJson),
-        this.parse(data.changeAttachmentsJson)
+        isChangeRecord ? [] : this.parse(data.changeAttachmentsJson)
      );
      this.contractFileRows = normalizeContractFileRows(this.parse(data.contractFileJson));
      const rules = this.parseObject(data.settlementRuleJson);
@@ -896,6 +935,70 @@ export default {
        data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
      this.paymentRatioRows = this.parse(data.paymentRatioJson);
    },
+    goBack() {
+      if (this.isContractChangeModule) {
+        this.$router.push(contractChangeListRoute);
+        return;
+      }
+      this.$router.back();
+    },
+    buildChangePayload() {
+      if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule };
+      else this.formalSettlementConfig = { ...this.settlementRule };
+      const settlementRule = {
+        preSettlementConfig: this.preSettlementConfig,
+        formalSettlementConfig: this.formalSettlementConfig,
+      };
+      if (this.isSettlementRuleChange) {
+        return {
+          id: this.form.id,
+          contractId: this.form.contractId,
+          changeType: this.form.changeType,
+          changeContent: this.form.changeContent,
+          changeReason: this.form.changeReason,
+          feeGenerationMode: this.feeGenerationMode,
+          billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
+          billingPlanJson: JSON.stringify(this.plans),
+          settlementRuleJson: JSON.stringify(settlementRule),
+          preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
+          formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
+          changeAttachmentsJson: JSON.stringify(this.changeMaterials),
+        };
+      }
+      return {
+        ...this.form,
+        contractId: this.form.contractId,
+        changeType: this.form.changeType || '合同信息变更',
+        settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB',
+        copyCount: normalizeOptionalPositiveInteger(this.form.copyCount),
+        invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle),
+        paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays),
+        contractAmount: normalizeOptionalAmount(this.form.contractAmount),
+        startDate: this.period[0],
+        endDate: this.period[1],
+        feeGenerationMode: this.feeGenerationMode,
+        billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
+        billingPlanJson: JSON.stringify(this.plans),
+        settlementRuleJson: JSON.stringify(settlementRule),
+        preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
+        formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
+        paymentRatioJson: JSON.stringify(this.paymentRatioRows),
+        contractFileJson: JSON.stringify(this.contractFileRows),
+        attachmentsJson: JSON.stringify(this.attachments),
+        changeContent: this.form.changeContent,
+        changeReason: this.form.changeReason,
+        changeAttachmentsJson: JSON.stringify(this.changeMaterials),
+      };
+    },
+    async saveDraft() {
+      if (this.form.changeType === '终止合同') {
+        this.$message.warning('终止合同无需保存草稿，请直接提交');
+        return;
+      }
+      const payload = this.buildChangePayload();
+      await changeApi.saveDraft(payload);
+      this.$message.success('草稿已保存');
+    },
    parse(value) {
      try {
        const result = JSON.parse(value || '[]');
@@ -989,9 +1092,10 @@ export default {
    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
    async submit() {
      if (this.form.changeType === '终止合同') {
-        await api.terminate(this.form.id, this.form.changeReason);
+        const contractId = this.form.contractId || this.form.id;
+        await contractApi.terminate(contractId, this.form.changeReason);
        this.$message.success('合同已终止');
-        this.$router.back();
+        this.goBack();
        return;
      }
      await this.$refs.formRef.validate();
@@ -1020,48 +1124,22 @@ export default {
      ) {
        return;
      }
-      const settlementRule = {
-        preSettlementConfig: this.preSettlementConfig,
-        formalSettlementConfig: this.formalSettlementConfig,
-      };
-      const payload = this.isSettlementRuleChange
-        ? {
-            id: this.form.id,
-            changeType: this.form.changeType,
-            changeContent: this.form.changeContent,
-            changeReason: this.form.changeReason,
-            feeGenerationMode: this.feeGenerationMode,
-            billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
-            billingPlanJson: JSON.stringify(this.plans),
-            settlementRuleJson: JSON.stringify(settlementRule),
-            preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
-            formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
-            changeAttachmentsJson: JSON.stringify(this.changeMaterials),
-          }
-        : {
-            ...this.form,
-            changeType: this.form.changeType || '合同信息变更',
-            settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB',
-            copyCount: normalizeOptionalPositiveInteger(this.form.copyCount),
-            invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle),
-            paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays),
-            contractAmount: normalizeOptionalAmount(this.form.contractAmount),
-            startDate: this.period[0],
-            endDate: this.period[1],
-            feeGenerationMode: this.feeGenerationMode,
-            billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
-            billingPlanJson: JSON.stringify(this.plans),
-            settlementRuleJson: JSON.stringify(settlementRule),
-            preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
-            formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
-            paymentRatioJson: JSON.stringify(this.paymentRatioRows),
-            contractFileJson: JSON.stringify(this.contractFileRows),
-            attachmentsJson: JSON.stringify(this.attachments),
-            changeContent: this.form.changeContent,
-            changeReason: this.form.changeReason,
-            changeAttachmentsJson: JSON.stringify(this.changeMaterials),
-          };
-      await api.submitChange(payload);
+      const payload = this.buildChangePayload();
+      if (this.isContractChangeModule) {
+        await changeApi.submit(payload);
+        await submitMkApprovalFlow({
+          bizType: 'contract-change',
+          bizId: this.form.id,
+          subjectName: this.form.contractName || '',
+          approvalStatus: this.form.approvalStatus || '',
+          mkEnabled: await loadMkEnabled().catch(() => false),
+        });
+        sessionStorage.setItem(contractChangeListRefreshKey, '1');
+        this.$message.success('变更已提交');
+        this.$router.push(contractChangeListRoute);
+        return;
+      }
+      await contractApi.submitChange(payload);
      await submitMkApprovalFlow({
        bizType: 'contract-manage',
        bizId: this.form.id,
@@ -898,16 +898,6 @@
        >
          <div title="配载信息" class="loading-manage-dialog__load-info-card">
            <section-card>
-              <div class="loading-manage-dialog__admission-tip">
-                <div class="loading-manage-dialog__admission-title">可配载条件</div>
-                <div class="loading-manage-dialog__admission-text">
-                  同时满足以下条件的运单可被配载：运输方式为「公路」；运单状态为「待执行」或「进行中」；未关联其他有效配载单；同一配载单的子运单须属同一项目，且承运商合同乙方须存在共同可选值（按各子单客户合同甲方匹配后取交集）。
-                </div>
-                <div class="loading-manage-dialog__admission-title">配载后状态说明</div>
-                <div class="loading-manage-dialog__admission-text">
-                  子运单：按项目过程配置是否需司机接单，无需接单则为进行中，需接单则为待执行。配载单：按所选运单所属项目的过程配置，需接单则为待执行，无需接单则为进行中。
-                </div>
-              </div>
              <div class="loading-manage-dialog__candidate-search">
                <el-row :gutter="16">
                  <el-col :span="6">
@@ -4033,7 +4023,7 @@ export default {
            exists.add(key);
          }
        });
-        // 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同甲方匹配后取交集）
+        // 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同乙方=承运商合同甲方匹配后取交集）
        if (
          String(this.dialogForm.carrierType || '').trim() === '承运商' &&
          nextRows.length > this.selectedWaybillRows.length
@@ -4754,7 +4744,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(
@@ -5030,30 +5020,6 @@ export default {
    justify-content: space-between;
  }

-  .loading-manage-dialog__admission-tip {
-    margin-bottom: 12px;
-    padding: 12px 14px;
-    background: #f5f9ff;
-    border: 1px solid #d9ecff;
-    border-radius: 4px;
-    line-height: 1.6;
-    color: #606266;
-  }
-
-  .loading-manage-dialog__admission-title {
-    margin-bottom: 4px;
-    color: #303133;
-    font-weight: 600;
-  }
-
-  .loading-manage-dialog__admission-title + .loading-manage-dialog__admission-text + .loading-manage-dialog__admission-title {
-    margin-top: 8px;
-  }
-
-  .loading-manage-dialog__admission-text {
-    font-size: 13px;
-  }
-
  .loading-manage-dialog__candidate-search {
    padding: 0;
    margin-bottom: 0;
@@ -535,7 +535,6 @@ export default {
  created() {
    this.resetNodeRows();
    this.loadProjectOptions('');
-    this.applyDefaultDeptSearch();
    this.initDeptOptions();
  },
  methods: {
@@ -566,27 +565,6 @@ export default {
        }
      });
    },
-    defaultDeptId() {
-      const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
-      return (
-        String(raw)
-          .split(',')
-          .map(item => item.trim())
-          .filter(Boolean)[0] || ''
-      );
-    },
-    applyDefaultDeptSearch() {
-      const deptId = this.defaultDeptId();
-      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
-      if (!deptId || !deptColumn) return;
-      deptColumn.searchValue = deptId;
-      this.query = { ...this.query, deptId };
-      this.$nextTick(() => {
-        if (this.$refs.crud?.searchForm) {
-          this.$refs.crud.searchForm.searchDeptId = deptId;
-        }
-      });
-    },
    flattenDept(tree, level = 0) {
      return tree.flatMap(item => {
        const id =
@@ -1113,7 +1091,6 @@ export default {
    },
    searchReset() {
      this.query = {};
-      this.applyDefaultDeptSearch();
      this.page.currentPage = 1;
      this.onLoad(this.page, this.query);
    },
@@ -84,7 +84,8 @@ export default {
      this.postFormData('save', lbpmFormValues, this.buildFormData());
    },
    postFormData(status, formValues, formData) {
-      postMkPublicProcessMessage('project-apply', {
+      const bizType = this.$route.meta?.bizType || 'project-apply';
+      postMkPublicProcessMessage(bizType, {
        status,
        formValues: formValues || {},
        formData,
@@ -55,7 +55,7 @@
        <el-button
          type="warning"
          plain
-          v-if="!readonlyScope"
+          v-if="!readonlyScope && hcsImmediateEnabled"
          :loading="hcsRepushingId === 'batch'"
          @click="handleHcsBatchRepush"
        >
@@ -154,7 +154,7 @@
          {{ operation.label }}
        </el-link>
        <el-link
-          v-if="canHcsRepush(row)"
+          v-if="hcsImmediateEnabled && canHcsRepush(row)"
          type="warning"
          @click="handleHcsRepush(row)"
        >
@@ -249,35 +249,63 @@
            />
          </el-form-item>
          <el-form-item label="业务部门" prop="businessDeptId">
-            <el-cascader
-              v-model="businessDeptCascaderValue"
-              :options="businessDeptTreeOptions"
-              :props="deptCascaderProps"
-              placeholder="请选择"
-              filterable
-              clearable
-              :disabled="dialogReadonly"
-            />
+            <el-tooltip
+              placement="top"
+              :disabled="!shouldShowBusinessDeptTooltip"
+              :show-after="200"
+            >
+              <template #content>
+                <div class="project-apply-form__field-tooltip">{{ businessDeptTooltipText }}</div>
+              </template>
+              <span class="project-apply-form__field-tooltip-trigger">
+                <el-select
+                  v-model="form.businessDeptId"
+                  placeholder="请选择"
+                  filterable
+                  clearable
+                  :disabled="dialogReadonly"
+                  @change="handleBusinessDeptChange"
+                >
+                  <el-option
+                    v-for="item in deptOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </span>
+            </el-tooltip>
          </el-form-item>
          <el-form-item label="平台公司" prop="undertakeDeptId">
-            <el-select
-              v-model="form.undertakeDeptId"
-              placeholder="请选择"
-              multiple
-              collapse-tags
-              collapse-tags-tooltip
-              clearable
-              filterable
-              :disabled="dialogReadonly"
-              @change="handleUndertakeDeptChange"
+            <el-tooltip
+              placement="top"
+              :disabled="!shouldShowUndertakeDeptTooltip"
+              :show-after="200"
            >
-              <el-option
-                v-for="item in platformCompanyOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+              <template #content>
+                <div class="project-apply-form__field-tooltip">{{ undertakeDeptTooltipText }}</div>
+              </template>
+              <span class="project-apply-form__field-tooltip-trigger">
+                <el-select
+                  v-model="form.undertakeDeptId"
+                  placeholder="请选择"
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                  clearable
+                  filterable
+                  :disabled="dialogReadonly"
+                  @change="handleUndertakeDeptChange"
+                >
+                  <el-option
+                    v-for="item in platformCompanyOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </span>
+            </el-tooltip>
          </el-form-item>
          <el-form-item label="项目由来" prop="projectSource">
            <el-select
@@ -810,7 +838,21 @@
          <template v-if="isChangeDialog">
            <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
+            <el-button
+              v-if="isProjectChangeModule && !dialogReadonly"
+              type="primary"
+              plain
+              :loading="submitLoading"
+              @click="saveProjectChangeDraft"
+            >
+              保存
+            </el-button>
+            <el-button
+              v-if="!dialogReadonly"
+              type="primary"
+              :loading="submitLoading"
+              @click="submitChangeProject"
+            >
              提交
            </el-button>
          </template>
@@ -948,14 +990,19 @@
 import { exportBlob } from '@/api/common';
 import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
-import { repush as hcsRepush, repushBatch as hcsRepushBatch } from '@/api/business/hcs';
+import {
+  getRisk,
+  loadHcsImmediateEnabled,
+  repush as hcsRepush,
+  repushBatch as hcsRepushBatch,
+} from '@/api/business/hcs';
 import { Position } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
  getList as getCustomerArchiveList,
  getDetail as getCustomerArchiveDetail,
 } from '@/api/vehicle/customer-archive';
-import { getBusinessDeptSelect, getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { getList as getUserList } from '@/api/system/user';
@@ -985,6 +1032,7 @@ import {
  projectTypeOptions,
 } from '@/option/business/common';
 import { config, option } from '@/option/business/project-apply';
+import * as projectChangeApi from '@/api/business/project-change';

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

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

@@ -1156,8 +1207,9 @@ export default {
        { label: '高风险', value: 'high', statKey: 'high' },
        { label: '中风险', value: 'medium', statKey: 'medium' },
      ],
-      // 合规（HCS）推送状态
+      // 合规（HCS）推送状态；受 thirdParty.hcs.push.immediate-enabled 控制显隐
      hcsRepushingId: null,
+      hcsImmediateEnabled: false,
      page: {
        pageSize: 10,
        pageSizes: [10, 20, 50, 100],
@@ -1245,7 +1297,40 @@ export default {
          },
        ],
        changeReason: [
-          { max: 2000, message: '变更原因不能超过2000个字符', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (!this.isChangeDialog) {
+                callback();
+                return;
+              }
+              if (!value || !String(value).trim()) {
+                callback(new Error('请输入变更原因'));
+                return;
+              }
+              if (String(value).length > 2000) {
+                callback(new Error('变更原因不能超过2000个字符'));
+                return;
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
+        changeType: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.isChangeDialog) {
+                callback();
+                return;
+              }
+              if (!value) {
+                callback(new Error('请选择变更类型'));
+                return;
+              }
+              callback();
+            },
+            trigger: 'change',
+          },
        ],
        projectIntro: [
          { max: 1000, message: '项目简介不能超过1000个字符', trigger: 'blur' },
@@ -1261,7 +1346,6 @@ export default {
        ],
      },
      deptOptions: [],
-      businessDeptTreeOptions: [],
      platformCompanyOptions: [],
      cargoTypeOptions: [],
      selectedCustomerId: [],
@@ -1326,30 +1410,27 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
-    // 部门级联配置：checkStrictly 允许选中任意层级，不必选到末级
-    deptCascaderProps() {
-      return {
-        label: 'label',
-        value: 'value',
-        children: 'children',
-        emitPath: true,
-        checkStrictly: true,
-        expandTrigger: 'click',
-      };
+    // 查看态禁用控件无 hover，用业务部门名称做 tooltip
+    businessDeptTooltipText() {
+      const id = this.form.businessDeptId;
+      if (id) {
+        const matched = this.deptOptions.find(item => String(item.value) === String(id));
+        if (matched?.rawLabel || matched?.label) {
+          return matched.rawLabel || matched.label;
+        }
+      }
+      return String(this.form.businessDeptName || '').trim();
    },
-    // 业务部门：form 存部门 id，级联控件用根到节点的 id 路径，两者在此双向转换
-    businessDeptCascaderValue: {
-      get() {
-        const id = this.form.businessDeptId;
-        return id ? this.findDeptPath(id, this.businessDeptTreeOptions) || [id] : [];
-      },
-      set(path) {
-        const value = Array.isArray(path)
-          ? path.filter(item => item !== undefined && item !== null && item !== '')
-          : [];
-        this.form.businessDeptId = value.length ? value.at(-1) : '';
-        this.handleBusinessDeptChange(this.form.businessDeptId);
-      },
+    undertakeDeptTooltipText() {
+      const name = String(this.form.undertakeDeptName || '').trim();
+      if (name) return name;
+      return this.resolveUndertakeDeptNames(this.parseUndertakeDeptIds(this.form.undertakeDeptId));
+    },
+    shouldShowBusinessDeptTooltip() {
+      return this.dialogReadonly && !!this.businessDeptTooltipText;
+    },
+    shouldShowUndertakeDeptTooltip() {
+      return this.dialogReadonly && !!this.undertakeDeptTooltipText;
    },
    permissionList() {
      return {
@@ -1374,8 +1455,11 @@ export default {
    isMajorProjectSupplementDialog() {
      return this.dialogType === 'majorSupplement';
    },
+    isProjectChangeModule() {
+      return this.$route.path === projectChangeFormRoute;
+    },
    isChangeDialog() {
-      return this.dialogType === 'change';
+      return this.dialogType === 'change' || this.isProjectChangeModule;
    },
    isNewProjectDialog() {
      return ['add', 'majorSupplement'].includes(this.dialogType);
@@ -1384,7 +1468,13 @@ export default {
      return this.isFormPageInstance;
    },
    isPublicViewPage() {
-      return this.$route.path === '/business/project-apply/public-view';
+      return (
+        this.$route.path === '/business/project-apply/public-view' ||
+        this.$route.path === '/business/project-change/public-view'
+      );
+    },
+    publicBizType() {
+      return this.$route.meta?.bizType || 'project-apply';
    },
    projectFormContainer() {
      // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
@@ -1447,11 +1537,18 @@ export default {
      .catch(() => {
        this.mkEnabled = false;
      });
+    loadHcsImmediateEnabled()
+      .then(enabled => {
+        this.hcsImmediateEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.hcsImmediateEnabled = false;
+      });
    this.loadDeptOptions();
    this.loadCargoTypeOptions();
    this.loadTransportTypeOptions();
    this.loadSettlementModeOptions();
-    if (this.$route.path === projectApplyFormRoute) {
+    if (this.$route.path === projectApplyFormRoute || this.$route.path === projectChangeFormRoute) {
      this.isFormPageInstance = true;
      this.openProjectFormPage();
    }
@@ -1517,14 +1614,14 @@ export default {
    },
    openPublicProjectForm() {
      const id = this.$route.query.id;
-      this.dialogType = 'view';
+      this.dialogType = this.publicBizType === 'project-change' ? 'change' : 'view';
      this.dialogReadonly = true;
      this.projectBox = true;
      if (!id) {
        this.$message.error('缺少项目ID');
        return;
      }
-      getMkPublicDetail('project-apply', id)
+      getMkPublicDetail(this.publicBizType, id)
        .then(res => {
          const detail = res.data?.data || {};
          this.applyPublicDictOptions(detail);
@@ -1552,9 +1649,10 @@ export default {
        detail.settlementMode
      );
      if (detail.businessDeptId) {
-        const label = detail.businessDeptName || String(detail.businessDeptId);
-        this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
-        this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
+        const id = String(detail.businessDeptId);
+        const label = detail.businessDeptName || id;
+        this.form.businessDeptId = id;
+        this.deptOptions = [{ label, rawLabel: label, value: id }];
      }
      const undertakeDeptIds = this.parseUndertakeDeptIds(detail.undertakeDeptId);
      const undertakeDeptNames = this.parseUndertakeDeptNames(detail.undertakeDeptName);
@@ -1587,9 +1685,25 @@ export default {
    openProjectFormPage() {
      const type = this.$route.query.mode || 'add';
      const id = this.$route.query.id;
-      this.dialogType = type;
+      this.dialogType = this.isProjectChangeModule ? (type === 'view' ? 'view' : 'change') : type;
      this.dialogReadonly = type === 'view';
      this.projectBox = true;
+      if (this.isProjectChangeModule) {
+        if (!id) {
+          this.$message.error('缺少项目变更ID');
+          return;
+        }
+        projectChangeApi.getDetail(id).then(res => {
+          const detail = res.data.data || {};
+          this.applyProjectDetail({
+            ...detail,
+            changeType: detail.changeType || '项目变更',
+            changeNo: detail.changeNo || '',
+            changeDate: detail.changeDate || this.$dayjs().format('YYYY-MM-DD'),
+          });
+        });
+        return;
+      }
      if (['add', 'majorSupplement'].includes(type)) {
        this.applyProjectDetail({
          ...emptyForm(),
@@ -1613,6 +1727,12 @@ export default {
    },
    closeProjectForm() {
      if (this.isProjectFormPage) {
+        if (this.isProjectChangeModule) {
+          sessionStorage.setItem(projectChangeListRefreshKey, '1');
+          this.$router.$avueRouter?.closeTag?.();
+          this.$router.push(projectChangeListRoute);
+          return;
+        }
        this.markProjectApplyListNeedRefresh();
        this.$router.$avueRouter?.closeTag?.();
        this.$router.push(projectApplyListRoute);
@@ -1659,6 +1779,7 @@ export default {
    },
    canHcsRepush(row) {
      return (
+        this.hcsImmediateEnabled &&
        !this.readonlyScope &&
        ['approved', 'change_approved'].includes(row.approvalStatus) &&
        row.hcsSyncStatus !== 'synced'
@@ -1858,7 +1979,7 @@ export default {
    },
    handleCustomOperation(operation, row) {
      if (operation.action === 'startChange') {
-        this.openProjectDialog('change', row);
+        this.startIndependentProjectChange(row);
        return;
      }
      if (operation.action === 'mkAudit') {
@@ -1868,15 +1989,20 @@ export default {
      const run = value => {
        const args = operation.prompt ? [row.id, value] : [row.id];
        const request = () => this.api[operation.action](...args);
+        // 先本地提交再调 MK：MK 成功后会把状态同步成 reviewing，
+        // 若先 MK 再本地，已撤回/已驳回单据会被「当前状态不允许编辑」拦住。
        const afterMk =
          operation.action === 'submitApproval'
-            ? submitMkApprovalFlow({
-                bizType: 'project-apply',
-                bizId: row.id,
-                subjectName: row.projectName || '',
-                approvalStatus: row.approvalStatus || '',
-                mkEnabled: this.mkEnabled,
-              }).then(() => request())
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'project-apply',
+                  bizId: row.id,
+                  subjectName: row.projectName || '',
+                  approvalStatus: row.approvalStatus || '',
+                  mkEnabled: this.mkEnabled,
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
            : request();
        // 项目通过会同步等待合规推送，加遮罩防重复点击
        const loading =
@@ -2120,6 +2246,9 @@ export default {
                subjectName: name,
                approvalStatus: status,
                mkEnabled: this.mkEnabled,
+                tempVarData: {
+                  projectType: this.form.projectType || data.projectType || '',
+                },
              }).then(() => {
                this.$message.success('提交成功!');
                this.closeProjectForm();
@@ -2169,6 +2298,52 @@ export default {
        this.closeProjectForm();
      });
    },
+    startIndependentProjectChange(row) {
+      if (!row?.id) {
+        this.$message.warning('项目ID为空，无法发起变更');
+        return;
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '正在创建项目变更单…',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
+      projectChangeApi
+        .createFromProject(row.id)
+        .then(res => {
+          if (res.data?.success === false) {
+            this.$message.error(res.data?.msg || '创建项目变更失败');
+            return;
+          }
+          const detail = res.data?.data || {};
+          if (!detail.id) {
+            this.$message.error('创建项目变更失败：未返回变更单ID');
+            return;
+          }
+          this.$router.push({
+            path: projectChangeFormRoute,
+            query: { mode: 'edit', id: detail.id, name: '项目变更' },
+          });
+        })
+        .finally(() => loading.close());
+    },
+    saveProjectChangeDraft() {
+      if (!this.isProjectChangeModule) return;
+      this.submitLoading = true;
+      projectChangeApi
+        .saveDraft(this.normalizeSubmitForm({ includeChangeType: true }))
+        .then(res => {
+          if (res.data?.success === false || res.data?.data === false) {
+            this.$message.error(res.data?.msg || '保存失败，请联系管理员');
+            return;
+          }
+          this.$message.success('保存成功!');
+          this.closeProjectForm();
+        })
+        .finally(() => {
+          this.submitLoading = false;
+        });
+    },
    submitChangeProject() {
      this.$refs.projectForm.validate(valid => {
        if (!valid) {
@@ -2177,7 +2352,35 @@ export default {
        }
        if (!this.validateAttachmentFileTypes()) return;
        this.submitLoading = true;
-        // 变更记录仅在提交时生成，保存草稿不落记录
+        if (this.isProjectChangeModule) {
+          const payload = this.normalizeSubmitForm({ includeChangeType: true });
+          const approvalStatus = this.form.approvalStatus || '';
+          projectChangeApi
+            .submit(payload)
+            .then(res => {
+              if (res.data?.success === false || res.data?.data === false) {
+                this.$message.error(res.data?.msg || '提交失败，请联系管理员');
+                return;
+              }
+              const id = this.form.id;
+              return submitMkApprovalFlow({
+                bizType: 'project-change',
+                bizId: id,
+                subjectName: this.form.projectName || '',
+                approvalStatus,
+                mkEnabled: this.mkEnabled,
+                tempVarData: { projectType: this.form.projectType || '' },
+              }).then(() => {
+                this.$message.success('提交成功!');
+                this.closeProjectForm();
+              });
+            })
+            .finally(() => {
+              this.submitLoading = false;
+            });
+          return;
+        }
+        // 兼容旧入口：变更记录仅在提交时生成，保存草稿不落记录
        this.api
          .submitChange(this.normalizeSubmitForm({ includeChangeType: true }))
          .then(res => {
@@ -2192,6 +2395,7 @@ export default {
              subjectName: this.form.projectName || '',
              approvalStatus: this.form.approvalStatus || 'change_rejected',
              mkEnabled: this.mkEnabled,
+              tempVarData: { projectType: this.form.projectType || '' },
            }).then(() => {
              this.$message.success('提交成功!');
              this.closeProjectForm();
@@ -2595,10 +2799,10 @@ export default {
      return `${base}-BG${this.$dayjs().format('YYYYMMDD')}`;
    },
    handleBusinessDeptChange(value) {
-      // 兼容级联路径数组（取末级）与单个部门 id
-      const id = Array.isArray(value) ? value.at(-1) : value;
-      const dept = this.deptOptions.find(item => String(item.value) === String(id));
-      this.form.businessDeptName = dept ? dept.rawLabel : '';
+      const id = value == null || value === '' ? '' : String(value);
+      this.form.businessDeptId = id;
+      const dept = this.deptOptions.find(item => String(item.value) === id);
+      this.form.businessDeptName = dept ? dept.rawLabel || dept.label : '';
      this.$refs.projectForm?.validateField('businessDeptId');
    },
    handleUndertakeDeptChange(value) {
@@ -2636,77 +2840,44 @@ export default {
    firstUndertakeDeptId(value) {
      return this.parseUndertakeDeptIds(value)[0] || '';
    },
-    // 由部门 id 反查「根 → 该节点」的 id 路径，供级联回显（找不到返回 null）
-    findDeptPath(id, tree = [], parents = []) {
-      const target = Array.isArray(id) ? id.at(-1) : id;
-      if (target === undefined || target === null || target === '') return null;
-      for (const node of tree || []) {
-        const path = [...parents, node.value];
-        if (String(node.value) === String(target)) return path;
-        const matched = this.findDeptPath(target, node.children, path);
-        if (matched) return matched;
-      }
-      return null;
-    },
    handleProjectTypeChange() {
      this.normalizeAttachmentFileTypes();
      this.$refs.projectForm?.validateField('projectType');
    },
    loadDeptOptions() {
-      Promise.all([getDeptTree(), getBusinessDeptSelect()])
-        .then(([treeRes, bizRes]) => {
-          const deptTree = this.excludeExternalOrganization(treeRes.data.data || []);
-          const bizList = bizRes.data.data || [];
-          const bizIds = new Set(
-            bizList
-              .map(item => (item.id == null || item.id === '' ? '' : String(item.id)))
-              .filter(Boolean)
-          );
-          // 仅保留「是否业务部门=是」的节点及其祖先，祖先不可选
-          const businessDeptTree = this.filterBusinessDeptTree(deptTree, bizIds);
-          this.deptOptions = this.flattenDept(businessDeptTree).filter(item =>
-            bizIds.has(String(item.value))
-          );
-          this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree, bizIds);
+      getBusinessDeptSelect()
+        .then(res => {
+          const bizList = res.data.data || [];
+          // 仅展示「是否业务部门=是」的本级部门，扁平下拉
+          this.deptOptions = bizList
+            .map(item => {
+              const value = item.id == null || item.id === '' ? '' : String(item.id);
+              const label = item.deptName || item.fullName || item.title || item.name || value;
+              return {
+                label,
+                rawLabel: label,
+                value,
+              };
+            })
+            .filter(item => item.value);
          this.fillDefaultBusinessDept();
          this.ensureCurrentBusinessDeptOption();
        })
        .catch(() => {
          this.deptOptions = [];
-          this.businessDeptTreeOptions = [];
        });
      this.loadPlatformCompanyOptions();
    },
-    /**
-     * 剪枝组织树：只保留业务部门节点及其祖先路径。
-     */
-    filterBusinessDeptTree(list = [], bizIds = new Set()) {
-      return (list || []).reduce((result, item) => {
-        const children = item.children?.length
-          ? this.filterBusinessDeptTree(item.children, bizIds)
-          : [];
-        const isBiz = bizIds.has(String(item.id));
-        if (!isBiz && !children.length) {
-          return result;
-        }
-        result.push({
-          ...item,
-          children: children.length ? children : undefined,
-        });
-        return result;
-      }, []);
-    },
    ensureCurrentBusinessDeptOption() {
-      const id = this.form.businessDeptId;
+      const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
+        ? ''
+        : String(this.form.businessDeptId);
      if (!id) return;
-      const exists = this.deptOptions.some(item => String(item.value) === String(id));
+      this.form.businessDeptId = id;
+      const exists = this.deptOptions.some(item => String(item.value) === id);
      if (exists) return;
-      const label = this.form.businessDeptName || String(id);
+      const label = this.form.businessDeptName || id;
      this.deptOptions.unshift({ label, rawLabel: label, value: id });
-      const pathExists = this.findDeptPath(id, this.businessDeptTreeOptions);
-      if (!pathExists) {
-        this.businessDeptTreeOptions.unshift({ label, value: id });
-      }
    },
    loadPlatformCompanyOptions() {
      getPlatformCompanySelect().then(res => {
@@ -2738,50 +2909,6 @@ export default {
        return matched ? matched.value : id;
      });
    },
-    excludeExternalOrganization(list = []) {
-      return list.reduce((result, item) => {
-        const deptName = item.title || item.deptName || item.name;
-        if (String(deptName || '').trim() === '外部组织') return result;
-        result.push({
-          ...item,
-          children: item.children?.length
-            ? this.excludeExternalOrganization(item.children)
-            : item.children,
-        });
-        return result;
-      }, []);
-    },
-    toDeptCascaderOptions(list = [], bizIds = null) {
-      return list.map(item => {
-        const value = item.id == null || item.id === '' ? item.value : item.id;
-        const option = {
-          label: item.title || item.deptName || item.name || item.label,
-          value: value == null || value === '' ? '' : String(value),
-          children: item.children?.length
-            ? this.toDeptCascaderOptions(item.children, bizIds)
-            : undefined,
-        };
-        // 仅业务部门可选；祖先节点保留路径但禁用
-        if (bizIds && !bizIds.has(String(option.value))) {
-          option.disabled = true;
-        }
-        return option;
-      });
-    },
-    flattenDept(list = [], level = 0) {
-      return list.reduce((result, item) => {
-        const label = item.title || item.deptName || item.name;
-        result.push({
-          label: `${'　'.repeat(level)}${label}`,
-          rawLabel: label,
-          value: item.id,
-        });
-        if (item.children && item.children.length) {
-          result.push(...this.flattenDept(item.children, level + 1));
-        }
-        return result;
-      }, []);
-    },
    loadCargoTypeOptions() {
      getSystemDictionary({ code: 'type_of_goods' }).then(res => {
        this.cargoTypeOptions = (res.data.data || []).map(item => ({
@@ -3117,6 +3244,20 @@ export default {
    width: 100%;
  }

+  &__field-tooltip-trigger {
+    display: block;
+    width: 100%;
+  }
+
+  &__field-tooltip {
+    max-width: 480px;
+    max-height: 240px;
+    overflow: auto;
+    white-space: pre-wrap;
+    word-break: break-word;
+    line-height: 1.5;
+  }
+
  :deep(.el-form-item) {
    //margin-bottom: 24px;
  }
@@ -0,0 +1,366 @@
+<template>
+  <basic-container class="project-change-page">
+    <avue-crud
+      :option="tableOption"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="tableForm"
+      ref="crud"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="hasPermission(`${config.permission}_delete`)"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+
+      <template #approvalStatus="{ row }">
+        {{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
+      </template>
+
+      <template #syncStatus="{ row }">
+        <el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
+          {{ syncLabel(row.syncStatus) }}
+        </el-tag>
+        <span v-else>-</span>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link
+          type="primary"
+          v-if="canView(row)"
+          @click="openForm('view', row)"
+        >
+          查看
+        </el-link>
+        <el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)">
+          编辑
+        </el-link>
+        <el-link
+          type="danger"
+          v-if="canDelete(row)"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+        <el-link
+          v-for="operation in customOperations(row)"
+          :key="operation.action"
+          :type="operation.type === 'warning' ? 'warning' : operation.type === 'success' ? 'success' : 'primary'"
+          @click="handleCustomOperation(operation, row)"
+        >
+          {{ operation.label }}
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import * as api from '@/api/business/project-change';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { config, option } from '@/option/business/project-change';
+import { approvalStatusOptions } from '@/option/business/common';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { isAdministrator } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+
+const projectChangeFormRoute = '/business/project-change/form';
+const projectChangeListRefreshKey = 'project-change-list-refresh';
+
+export default {
+  name: 'ProjectChange',
+  data() {
+    return {
+      api,
+      config,
+      tableForm: {},
+      tableOption: this.buildTableOption(),
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      selectionList: [],
+      mkEnabled: false,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo', 'website']),
+    permissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+      };
+    },
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
+  activated() {
+    if (sessionStorage.getItem(projectChangeListRefreshKey)) {
+      sessionStorage.removeItem(projectChangeListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
+  methods: {
+    buildTableOption() {
+      return {
+        ...option,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 320,
+        column: (option.column || []).map(column => ({
+          ...column,
+          display: false,
+          align: 'center',
+          headerAlign: 'center',
+        })),
+      };
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission && this.permission[code], false);
+    },
+    statusLabel(status) {
+      return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+    },
+    syncLabel(value) {
+      return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
+    },
+    syncTagType(value) {
+      return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
+    },
+    inStatus(row, statusList) {
+      if (!statusList || !statusList.length) return true;
+      return statusList.includes(row.approvalStatus);
+    },
+    canEdit(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.editStatus)
+      );
+    },
+    canDelete(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_delete`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.deleteStatus)
+      );
+    },
+    canView(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_view`) &&
+        this.inStatus(row, this.config.viewStatus)
+      );
+    },
+    canOperation(operation, row) {
+      if (operation.permission && !this.hasPermission(operation.permission)) return false;
+      if (row.readonly && ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)) {
+        return false;
+      }
+      return this.inStatus(row, operation.status);
+    },
+    customOperations(row) {
+      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
+        return this.canOperation(operation, row);
+      });
+    },
+    openForm(mode, row = {}) {
+      const query = { mode, id: row.id };
+      if (mode === 'edit') query.name = '编辑项目变更';
+      else if (mode === 'view') query.name = '查看项目变更';
+      this.$router.push({ path: projectChangeFormRoute, query });
+    },
+    handleCustomOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
+      const run = () => {
+        const request = () => this.api[operation.action](row.id);
+        // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'project-change',
+                  bizId: row.id,
+                  subjectName: row.projectName || '',
+                  approvalStatus: row.approvalStatus || '',
+                  mkEnabled: this.mkEnabled,
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
+            : request();
+        const loading =
+          operation.action === 'approve'
+            ? this.$loading({
+                lock: true,
+                text: '正在推送合规，请稍候…',
+                background: 'rgba(255, 255, 255, 0.6)',
+              })
+            : null;
+        afterMk
+          .then(res => {
+            if (operation.action === 'approve' && res.data?.data === false) {
+              this.$message.warning(res.data?.msg);
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
+              return;
+            }
+            this.$message.success(`${operation.label}成功`);
+            this.onLoad(this.page, this.query);
+          })
+          .finally(() => loading && loading.close());
+      };
+      this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => run());
+    },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('变更单ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud?.toggleSelection?.();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(row.id).then(() => {
+          this.$message.success('删除成功!');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    handleDelete() {
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(this.ids).then(() => {
+          this.$message.success('删除成功!');
+          this.selectionClear();
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const values = {
+        ...this.query,
+        ...params,
+      };
+      this.api
+        .getList(page.currentPage, page.pageSize, values)
+        .then(res => {
+          const data = res.data.data || {};
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.project-change-page {
+  :deep(.avue-crud__menu) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>
@@ -6,7 +6,7 @@
    :config="config"
    :crud-option="option"
    :detail-id="detailId"
-    :menu-width="250"
+    :menu-width="320"
    standalone-form-page
  />
 </template>
@@ -156,9 +156,17 @@ export default {
        });
    },
    async handleApprove(row) {
-      await api.approve({ id: row.id });
-      this.$message.success('审批通过');
-      this.loadTable();
+      await this.$confirm('确认审批通过该汇票付款？', '提示', { type: 'warning' });
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        await api.approve({ id: row.id });
+        this.$message.success('审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
    },
    async handleReturn(row) {
      const { value } = await this.$prompt('请输入驳回原因', '审批驳回');
@@ -293,6 +293,12 @@
                <el-input v-model="row.remark" :disabled="readonly" maxlength="200" />
              </template>
            </el-table-column>
+            <el-table-column v-if="readonly" label="开票状态" min-width="90" align="center">
+              <template #default="{ row }">{{ sheet.invoiceStatusName || '未开票' }}</template>
+            </el-table-column>
+            <el-table-column v-if="readonly" label="金蝶开票结果备注" min-width="200">
+              <template #default="{ row }">{{ sheet.kingdeeResultRemark }}</template>
+            </el-table-column>
            <el-table-column v-if="!readonly" label="操作" width="110" fixed="right" align="center">
              <template #default="{ $index }">
                <div class="invoice-form-page__links">
@@ -323,17 +329,8 @@
          <el-table-column label="可开票金额" min-width="140" align="right">
            <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
          </el-table-column>
-          <el-table-column label="分摊发票金额" min-width="160">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.allocatedInvoiceAmount"
-                :disabled="readonly"
-                :min="0"
-                :max="Number(row.availableInvoiceAmount || 0)"
-                :precision="2"
-                :controls="false"
-              />
-            </template>
+          <el-table-column label="分摊发票金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
          </el-table-column>
        </el-table>
      </section-card>
@@ -454,6 +451,9 @@
        <el-table-column label="结算金额" min-width="130" align="right">
          <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
        </el-table-column>
+        <el-table-column label="已申请开票金额" min-width="140" align="right">
+          <template #default="{ row }">{{ formatMoney(row.invoicedAmount) }}</template>
+        </el-table-column>
        <el-table-column label="可开票金额" min-width="140" align="right">
          <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
        </el-table-column>
@@ -861,7 +861,6 @@ export default {
              keyword: this.settlementDialog.keyword,
              contractCategory: '客户合同',
              settlementType: 'receivable',
-              invoiceStatus: 'unreceived',
            }
          )
        );
@@ -913,7 +912,7 @@ export default {
        ...item,
        formalSettlementId: item.id,
        settlementId: item.id,
-        allocatedInvoiceAmount: rows.length === 1 ? Number(item.availableInvoiceAmount || 0) : 0,
+        allocatedInvoiceAmount: 0,
      }));
      this.form.projectName = first.projectName;
      this.form.deptName = first.deptName;
@@ -125,6 +125,17 @@
              {{ displayValue(row[column.prop]) }}
            </el-tag>
            <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
+            <template v-else-if="column.prop === 'kingdeeStatusName'">
+              <el-tooltip
+                :disabled="row.kingdeeStatus !== 'failed'"
+                :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+                placement="top"
+              >
+                <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
+                  row.kingdeeStatusName || '-'
+                }}</el-tag>
+              </el-tooltip>
+            </template>
            <template v-else-if="column.prop === 'kingdeeLockStatus'">
              <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
                <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -238,6 +249,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';

 const emptyQuery = () => ({
  applicationNo: '',
@@ -500,6 +512,7 @@ export default {
        ''
      );
    },
+    kingdeeStatusType,
    lockTag(row) {
      if (row.kingdeeLockStatus === 'locked') {
        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
@@ -53,15 +53,6 @@
              </el-tooltip>
            </el-form-item>
          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税率">
-              <el-input
-                :model-value="formatRate(form.taxRate)"
-                disabled
-                placeholder="从金蝶票据池带出"
-              />
-            </el-form-item>
-          </el-col>
          <el-col :span="6">
            <el-form-item label="开票金额">
              <el-input
@@ -109,34 +100,50 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="关联结算单" prop="settlementIds">
-              <el-tooltip
-                :content="settlementLabel"
-                :disabled="!settlementLabel"
-                placement="top"
-                :show-after="200"
-              >
-                <div class="receipt-form-page__overflow-trigger">
-                  <el-input
-                    :model-value="settlementLabel"
-                    readonly
-                    placeholder="请选择应付正式结算单"
-                  >
-                    <template v-if="!readonly" #append>
-                      <el-tooltip content="选择付款结算单" placement="top">
-                        <el-button :icon="Search" @click="openSettlementDialog" />
-                      </el-tooltip>
-                    </template>
-                  </el-input>
-                </div>
-              </el-tooltip>
+            <el-form-item label="结算组织" prop="deptId">
+              <el-cascader
+                v-if="!readonly"
+                :model-value="deptCascaderValue"
+                :options="deptTreeOptions"
+                :props="deptCascaderProps"
+                placeholder="请选择结算组织（合同承办部门）"
+                filterable
+                clearable
+                @change="handleDeptChange"
+              />
+              <el-input v-else :model-value="form.deptName" disabled />
            </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 +163,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>
@@ -216,71 +214,6 @@
      :query-api="apiQueryInvoicePool"
      @confirm="handleInvoicePicked"
    />
-
-    <el-dialog
-      v-model="settlementDialog.visible"
-      title="选择应付正式结算单"
-      width="86%"
-      append-to-body
-    >
-      <div class="receipt-form-page__dialog-search">
-        <el-input
-          v-model="settlementDialog.keyword"
-          clearable
-          placeholder="结算单号、项目或合同"
-          @keyup.enter="loadSettlementCandidates"
-        />
-        <el-button type="primary" @click="loadSettlementCandidates">查询</el-button>
-      </div>
-      <el-table
-        ref="settlementTable"
-        v-loading="settlementDialog.loading"
-        :data="settlementDialog.rows"
-        row-key="id"
-        border
-        @selection-change="settlementDialog.selection = $event"
-      >
-        <el-table-column type="selection" width="52" align="center" reserve-selection />
-        <el-table-column
-          prop="formalSettlementNo"
-          label="结算单号"
-          min-width="170"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="projectName"
-          label="所属项目"
-          min-width="150"
-          show-overflow-tooltip
-        />
-        <el-table-column prop="deptName" label="所属组织" min-width="150" show-overflow-tooltip />
-        <el-table-column
-          prop="contractNo"
-          label="合同编号"
-          min-width="150"
-          show-overflow-tooltip
-        />
-        <el-table-column prop="payerName" label="付款方" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="payeeName" label="收款方" min-width="150" show-overflow-tooltip />
-        <el-table-column label="结算总金额" min-width="140" align="right">
-          <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
-        </el-table-column>
-        <el-table-column label="已收票金额" min-width="140" align="right">
-          <template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
-        </el-table-column>
-        <el-table-column label="操作" width="100" fixed="right" align="center">
-          <template #default="{ row }">
-            <el-link type="primary" @click.stop="selectSettlement(row)">选择</el-link>
-          </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-dialog>
  </basic-container>
 </template>

@@ -288,11 +221,15 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
+import { getDeptTree } from '@/api/system/dept';
 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 +247,7 @@ const emptyForm = () => ({
  customerEmails: [],
  departmentEmails: [],
  projectName: '',
+  deptId: null,
  deptName: '',
  payerName: '',
  payeeName: '',
@@ -330,26 +268,24 @@ export default {
      form: emptyForm(),
      customerEmailOptions: [],
      departmentEmailOptions: [],
+      invoiceItems: [],
+      deptTreeOptions: [],
+      deptMap: new Map(),
+      // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织
+      deptCascaderProps: { checkStrictly: true, emitPath: true },
      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' }],
+        deptId: [{ required: true, validator: this.validateDept, 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,14 +299,11 @@ 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);
+    deptCascaderValue() {
+      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
+        return [];
+      }
+      return [String(this.form.deptId)];
    },
  },
  created() {
@@ -406,6 +339,7 @@ export default {
        .filter(Boolean);
    },
    async initialize() {
+      this.loadDepartments();
      if (this.isPublicViewPage) {
        await this.loadPublicDetail();
        return;
@@ -419,14 +353,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 +371,7 @@ export default {
        })),
        attachments: this.parse(data.attachmentsJson),
      };
+      await this.loadInvoiceDetail();
    },
    validateInvoice(rule, value, callback) {
      if (!value) {
@@ -446,9 +380,9 @@ export default {
      }
      callback();
    },
-    validateSettlements(rule, value, callback) {
-      if (!this.form.settlements.length) {
-        callback(new Error('请选择应付正式结算单'));
+    validateDept(rule, value, callback) {
+      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
+        callback(new Error('请选择结算组织'));
        return;
      }
      callback();
@@ -469,7 +403,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 +438,63 @@ export default {
        ...new Set([...this.departmentEmailOptions, ...this.form.departmentEmails]),
      ];
      this.invoiceDialog.visible = false;
+      await this.loadInvoiceDetail();
      this.$refs.formRef?.validateField('invoiceNo').catch(() => {});
      return true;
    },
-    async openSettlementDialog() {
-      this.settlementDialog.visible = true;
-      this.settlementDialog.selection = [];
-      await this.loadSettlementCandidates();
-      await this.$nextTick();
-      const selectedIds = new Set(this.settlementIds.map(id => String(id)));
-      this.settlementDialog.rows.forEach(row => {
-        if (selectedIds.has(String(row.id))) {
-          this.$refs.settlementTable?.toggleRowSelection(row, true);
-        }
-      });
-    },
-    async loadSettlementCandidates() {
-      this.settlementDialog.loading = true;
+    // 发票明细区块：按票号带出金蝶发票明细行（A801-1 镜像，推送 A303-2 分录同源）
+    async loadInvoiceDetail() {
+      if (!this.form.invoiceNo) {
+        this.invoiceItems = [];
+        return;
+      }
      try {
-        this.settlementDialog.rows =
-          this.unwrapData(
-            await api.getSettlementCandidates(this.settlementDialog.keyword, this.form.id)
-          ) || [];
-      } finally {
-        this.settlementDialog.loading = false;
+        this.invoiceItems = this.unwrapData(await api.invoiceDetailQuery(this.form.invoiceNo)) || [];
+      } catch {
+        this.invoiceItems = [];
      }
    },
-    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,
+    loadDepartments() {
+      // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id
+      getDeptTree(this.userInfo?.tenantId)
+        .then(response => {
+          const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
+          this.deptTreeOptions = this.toDeptCascaderOptions(rows);
+          this.deptMap = new Map();
+          this.flattenDepartments(rows).forEach(item =>
+            this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
+          );
+        })
+        .catch(() => {});
+    },
+    excludeExternalOrganization(list = []) {
+      return list.reduce((result, item) => {
+        const deptName = item.title || item.deptName || item.name;
+        if (String(deptName || '').trim() === '外部组织') return result;
+        result.push({
+          ...item,
+          children: item.children?.length
+            ? this.excludeExternalOrganization(item.children)
+            : item.children,
+        });
+        return result;
+      }, []);
+    },
+    toDeptCascaderOptions(list = []) {
+      return list.map(item => ({
+        label: item.title || item.deptName || item.name,
+        value: item.id == null || item.id === '' ? '' : String(item.id),
+        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
      }));
-      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);
+    flattenDepartments(rows) {
+      return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
    },
-    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
-      );
+    handleDeptChange(value) {
+      const deptId = Array.isArray(value) ? value.at(-1) : value;
+      this.form.deptId = deptId || null;
+      this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
+      this.$refs.formRef?.validateField('deptId').catch(() => {});
    },
    openSettlementDetail(row) {
      const id = row.formalSettlementId || row.settlementId || row.id;
@@ -602,15 +507,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 +527,9 @@ 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,
-        })),
+        // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements）
+        deptId: this.form.deptId,
+        deptName: this.form.deptName,
      };
    },
    async saveDraft() {
@@ -663,6 +558,7 @@ export default {
        mkEnabled: await loadMkEnabled().catch(() => false),
      });
      this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceReceiptListRefreshKey, '1');
      this.goBack();
    },
    async syncReferenceData() {
@@ -678,8 +574,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 +583,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 +638,6 @@ export default {
 :global(.avue-layout--horizontal .receipt-form-page__actions) {
  left: 0;
 }
-.receipt-form-page__dialog-search {
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-  margin-bottom: 12px;
-}
-.receipt-form-page__dialog-search .el-input {
-  width: 360px;
-}
 .receipt-form-page :deep(.el-table) {
  --el-table-border-color: #eff1f7;
 }
@@ -223,6 +223,10 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';

+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
+const invoiceReceiptListRoute = '/payment/invoice-receipt';
+
 const emptyQuery = () => ({
  invoiceNo: '',
  invoiceDate: '',
@@ -281,7 +285,28 @@ export default {
        this.mkEnabled = false;
      });
  },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === invoiceReceiptListRoute &&
+        from?.path?.includes('/invoice-receipt/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
  methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(invoiceReceiptListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(invoiceReceiptListRefreshKey);
+      this.loadTable();
+    },
    hasPermission(code) {
      return this.permission?.[code] !== false;
    },
@@ -883,8 +883,6 @@ export default {
      // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
      payeeRisky: false,
      payeeRiskTip: '',
-      payeeRiskLevel: '',
-      payeeBlackStatus: '',
      attachmentRuleLoading: false,
      // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
      linkedSettlementAttachmentUrls: [],
@@ -1065,14 +1063,12 @@ export default {
        .toUpperCase();
      return ['D', 'D级', 'E', 'E级', 'F', 'F级'].includes(level) || level.includes('高风险');
    },
-    // 高风险/黑名单收款方提示（C101-1，同合同新增页风险客商提示口径；强制拦截在后端提交校验与金蝶推送门禁）
+    // 高风险/黑名单收款方提示（C101-1，强制拦截在后端提交校验与金蝶推送门禁）：
+    // 等级/黑名单明细以后端 riskTip 为准（黑名单=金蝶命中、等级=C101-1，统一口径），前端不再重复拼接
    payeeRiskText() {
      if (!this.payeeRisky) return '';
-      const levelMap = { 0: '低风险', 1: '中风险', 2: '高风险' };
-      const level = levelMap[this.payeeRiskLevel] || '未知';
-      const blacklist = String(this.payeeBlackStatus || '').trim().toLowerCase() === 'yes' ? '是' : '否';
      const tip = this.payeeRiskTip || `收款方[${this.form.payeeName || ''}]为高风险/黑名单客商`;
-      return `风险等级：${level}｜黑名单：${blacklist}。${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
+      return `${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
    },
    requiredAttachmentMaterials() {
      if (this.form.paymentType === 'project_advance') {
@@ -2341,8 +2337,6 @@ export default {
      this.payeeCustomerLevel = '';
      this.payeeRisky = false;
      this.payeeRiskTip = '';
-      this.payeeRiskLevel = '';
-      this.payeeBlackStatus = '';
      if (!partyBName) {
        if (!preserveCurrentValue) this.clearReceiptAccount();
        return;
@@ -2381,8 +2375,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 强校验兜底
          }
@@ -2702,7 +2694,8 @@ export default {
          this.referenceParams('formal')
        );
        const data = this.unwrapData(response) || {};
-        const records = data.records || [];
+        // 已调整的结算单为调整重推后的归档原单，金额已作废，不可再发起付款
+        const records = (data.records || []).filter(row => row.adjustStatus !== 'adjusted');
        this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
        this.formalPage.total = Number(data.total || 0);
      } finally {
@@ -3124,18 +3117,21 @@ export default {
      if (!target) return;
      target.paymentRatio = value;
      this.syncRowPayment(target, 'ratio');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
    },
    handleRowAppliedAmountChange(row, value) {
      const target = this.findReferenceRow(row);
      if (!target) return;
      target.appliedAmount = value;
      this.syncRowPayment(target, 'amount');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
    },
-    /** 多结算单时仅同步结算金额/可付款金额合计，申请付款金额与比例由上方独立维护 */
-    syncHeaderSettlementTotalsFromRows() {
-      if (this.referenceRows.length <= 1) return;
+    /**
+     * 结算信息行合计回填付款基本信息。
+     * @param {boolean} syncApplied 行内编辑时同步申请付款金额与比例；回显加载时保持原值，避免改写历史单据
+     */
+    syncHeaderSettlementTotalsFromRows(syncApplied = false) {
+      if (!this.referenceRows.length) return;
      const settlementAmount = this.referenceRows.reduce(
        (total, item) => total + Number(item.settlementAmount || 0),
        0
@@ -3144,9 +3140,21 @@ export default {
        (total, item) => total + Number(item.payableAmount || 0),
        0
      );
+      const appliedAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
      this.amountSyncing = true;
      this.form.settlementAmount = Number(settlementAmount.toFixed(2));
      this.form.payableAmount = Number(payableAmount.toFixed(2));
+      if (syncApplied) {
+        this.form.appliedAmount = Number(appliedAmount.toFixed(2));
+        if (this.paymentAmountBase) {
+          this.form.paymentRatio = Number(
+            ((appliedAmount / this.paymentAmountBase) * 100).toFixed(2)
+          );
+        }
+      }
      this.$nextTick(() => {
        this.amountSyncing = false;
        this.$refs.formRef?.validateField?.(['settlementAmount', 'appliedAmount']);
@@ -3320,6 +3328,18 @@ export default {
          ElMessage.warning(`${exceededRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
          return false;
        }
+        const rowAppliedTotal = this.referenceRows.reduce(
+          (total, item) => total + Number(item.appliedAmount || 0),
+          0
+        );
+        // 金蝶按付款基本信息申请金额推单，行合计不等时预付建档分摊会与金蝶金额不一致
+        if (Math.abs(rowAppliedTotal - appliedAmount) > 0.005) {
+          this.clearMessages();
+          ElMessage.warning(
+            `结算行付款金额合计${rowAppliedTotal.toFixed(2)}与申请付款金额${appliedAmount.toFixed(2)}不一致，请调整`
+          );
+          return false;
+        }
      }
      if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
        this.clearMessages();
@@ -68,6 +68,35 @@
        <span v-else>-</span>
      </template>

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

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

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

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

      <section-card title="发票信息">
-        <div class="formal-editor__invoice-claim">
-          <el-button type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
+        <div v-if="editable" class="formal-editor__invoice-claim">
+          <!-- 先票后款：付款结算单选审批通过的收票单（全额认领）；收款结算单维持原票池认领 -->
+          <el-button
+            v-if="form.settlementType !== 'receivable'"
+            type="primary"
+            @click="openInvoiceReceiptDialog"
+            >选择收票单</el-button
+          >
+          <el-button v-else type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
        </div>
        <el-table :data="invoices" border>
          <el-table-column type="index" label="序号" width="64" align="center" />
@@ -452,11 +459,6 @@
          <el-table-column prop="invoiceType" label="发票类型" min-width="150" align="center">
            <template #default="{ row }">{{ displayValue(row.invoiceType) }}</template>
          </el-table-column>
-          <el-table-column prop="taxRate" label="税率" min-width="100" align="center">
-            <template #default="{ row }">
-              {{ row.taxRate === null || row.taxRate === undefined ? '-' : `${row.taxRate}%` }}
-            </template>
-          </el-table-column>
          <el-table-column
            prop="invoiceAmount"
            label="发票金额（含税）"
@@ -480,17 +482,39 @@
            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 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 +530,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 +578,11 @@
        @confirm="handleInvoiceClaimConfirm"
      />

+      <invoice-receipt-candidates-dialog
+        v-model="invoiceReceiptDialog.visible"
+        @confirm="handleInvoiceReceiptConfirm"
+      />
+
      <section-card
        v-if="readonly"
        :title="form.settlementType === 'receivable' ? '收款信息' : '付款信息'"
@@ -559,7 +596,7 @@
          <el-table-column type="index" label="序号" width="64" align="center" />
          <el-table-column
            prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
            min-width="160"
            align="center"
          />
@@ -708,7 +745,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 +763,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 +1090,10 @@ import {
  getNextNo,
  getReceiptClaims,
  claimInvoices as claimInvoicesApi,
+  repushClaimedInvoice,
  queryInvoicePool,
  save,
+  syncKingdee,
 } from '@/api/settlement/formalSettlement';
 import {
  getDetail as getPreSettlementDetail,
@@ -1063,6 +1106,7 @@ import {
  settlementDetailPath,
 } from '@/utils/settlement-detail-link';
 import { getBfiExchangeRate } from '@/api/base/currency';
+import InvoiceReceiptCandidatesDialog from './invoice-receipt-candidates-dialog.vue';
 import {
  createFormalSettlementForm,
  formalSettlementFormFields,
@@ -1105,6 +1149,7 @@ export default {
  components: {
    InfoFilled,
    KingdeeInvoicePoolDialog,
+    InvoiceReceiptCandidatesDialog,
    ChangeRecordDetailDialog,
    ProjectAdvanceWriteOff,
  },
@@ -1128,6 +1173,7 @@ export default {
      loading: false,
      draftSaving: false,
      saving: false,
+      syncLoading: false,
      form: createFormalSettlementForm(),
      sources: [],
      details: [],
@@ -1143,6 +1189,8 @@ export default {
      attachments: [],
      selectedAttachmentRows: [],
      invoices: [],
+      // 查看页认领收票单重推进行中（行级操作守卫）
+      repushing: false,
      // 开票申请经金蝶回写的发票结果（只读展示，含板式文件/数电PDF下载地址）
      issuedInvoices: [],
      // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
@@ -1152,6 +1200,10 @@ export default {
        selected: [],
        confirming: false,
      },
+      // 先票后款：付款结算单选收票单（审批通过+未认领）弹窗
+      invoiceReceiptDialog: {
+        visible: false,
+      },
      attachmentUploadFiles: [],
      attachmentTypeOptions: [],
      attachmentFileTypes: [
@@ -1271,6 +1323,16 @@ export default {
    editable() {
      return !this.readonly;
    },
+    // 查看页面「同步」按钮：仅已审批且未同步金蝶（含推送失败）的单据显示，口径与后端推送闸门一致
+    canSync() {
+      return (
+        this.readonly &&
+        !this.publicMode &&
+        this.hasPermission('sync') &&
+        this.form.approvalStatus === 'approved' &&
+        this.form.kingdeeSyncStatus !== 'synced'
+      );
+    },
    isAdmin() {
      return isAdministrator(this.userInfo);
    },
@@ -2635,6 +2697,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 +2886,7 @@ export default {
        }
        matchedTotal += matchedAmount;
      }
-      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
-        this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
-        return false;
-      }
+      // 先票后款全额认领：匹配金额=发票全额，可超过结算金额，不再校验合计上限（收票状态按覆盖判定）
      return true;
    },
    removeInvoice(index) {
@@ -2887,8 +3021,30 @@ export default {
        remark: this.form.remark,
      };
    },
-    handleSyncPlaceholder() {
-      this.$message.info('开发中');
+    // 查看页面单张推送金蝶（A102-2/A302-2）：结果与异常原因弹框展示，成败后均刷新详情与列表
+    async handleSync() {
+      if (this.syncLoading) return;
+      this.syncLoading = true;
+      try {
+        const res = await syncKingdee(this.form.id, { meta: { suppressErrorMessage: true } });
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        let message = `同步成功：${this.unwrapData(res) || '-'}`;
+        if (['pending', 'partial'].includes(this.form.attachmentSyncStatus)) {
+          message += '\n该单附件未全部上传，可重推补传';
+        }
+        await this.$alert(message, '同步结果', { type: 'success', confirmButtonText: '知道了' });
+      } catch (error) {
+        const reason = String(error?.message || error || '未知错误').trim() || '未知错误';
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        await this.$alert(`同步失败，${reason}`, '同步结果', {
+          type: 'error',
+          confirmButtonText: '知道了',
+        });
+      } finally {
+        this.syncLoading = false;
+      }
    },
    async handleDraftSave() {
      // 保存草稿：不做表单校验，直接落草稿并返回列表刷新
@@ -3222,10 +3378,47 @@ export default {
      return files.length ? JSON.stringify(files) : '';
    },
    parseFeeItems(value) {
+      const raw = this.parseRawFeeItems(value);
+      const metaKeys = new Set([
+        'currency',
+        'totalFreightAmount',
+        'otherFreightAmount',
+        'freightItems',
+        'freightTotal',
+        'totalFreight',
+        'totalAmount',
+        'freight',
+        'freightAmount',
+        'transportFee',
+        'otherFeeTotal',
+        'otherAmount',
+      ]);
+      const result = {};
+      let otherFeeAmount = 0;
+      Object.entries(raw).forEach(([key, amount]) => {
+        if (!key) return;
+        if (key === 'otherFreightAmount' || key === 'otherFeeTotal' || key === 'otherAmount') {
+          otherFeeAmount += Number(amount || 0);
+          return;
+        }
+        if (metaKeys.has(key)) return;
+        if (amount && typeof amount === 'object') return;
+        result[key] = amount;
+      });
+      const hasOtherFee = Object.keys(result).some(
+        name => String(name).includes('其它费') || String(name).includes('其他费')
+      );
+      if (otherFeeAmount && !hasOtherFee) {
+        result['其它费用'] = otherFeeAmount;
+      }
+      return result;
+    },
+    parseRawFeeItems(value) {
      if (!value) return {};
-      if (typeof value === 'object') return value;
+      if (typeof value === 'object') return { ...value };
      try {
-        return JSON.parse(value);
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === 'object' ? parsed : {};
      } catch {
        return {};
      }
@@ -23,6 +23,15 @@
        @click="$emit('payment')"
        >付款申请</el-button
      >
+      <!-- 先票后款：付款结算单审批通过后可发票登记（关联收票单并推送指定应付），选中一条付款结算单操作 -->
+      <el-button
+        v-if="showPaymentAction && hasPermission('invoice_register')"
+        type="primary"
+        plain
+        :disabled="!selection.length"
+        @click="emitSingle('invoiceRegister')"
+        >发票登记</el-button
+      >
      <el-button
        v-if="hasPermission('sync')"
        type="primary"
@@ -60,7 +69,26 @@
      }}</el-tag>
    </template>

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

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

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

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

 export default {
  name: 'FormalSettlementTablePanel',
@@ -186,6 +232,7 @@ export default {
        ''
      );
    },
+    kingdeeStatusType,
    invoiceName(value, settlementType) {
      return invoiceStatusName(value, settlementType);
    },
@@ -195,6 +242,10 @@ export default {
    kingdeeSyncName(value) {
      return kingdeeSyncName(value);
    },
+    kingdeeWriteOffName(value) {
+      return kingdeeWriteOffName(value);
+    },
+    kingdeeWriteOffTagType,
    lockTag(row) {
      if (row.kingdeeLockStatus === 'locked') {
        return {
@@ -0,0 +1,186 @@
+<template>
+  <el-dialog
+    v-model="visible"
+    title="选择收票单"
+    width="86%"
+    append-to-body
+    destroy-on-close
+    @open="handleOpen"
+  >
+    <div class="invoice-candidates-dialog__search">
+      <el-input
+        v-model="keyword"
+        clearable
+        placeholder="发票号 / 销方（开票单位） / 购方（受票单位）"
+        @keyup.enter="handleQuery"
+      />
+      <el-button type="primary" :loading="loading" @click="handleQuery">查询</el-button>
+    </div>
+    <el-table
+      ref="candidatesTable"
+      v-loading="loading"
+      :data="rows"
+      row-key="id"
+      border
+      height="460"
+      @selection-change="selection = $event"
+    >
+      <el-table-column type="selection" width="52" fixed="left" align="center" reserve-selection />
+      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
+      <el-table-column prop="invoiceDate" label="开票日期" min-width="110" align="center">
+        <template #default="{ row }">{{ row.invoiceDate || '-' }}</template>
+      </el-table-column>
+      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
+      <el-table-column prop="issuerName" label="开票单位（销方）" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="receiverName" label="受票单位（购方）" min-width="180" show-overflow-tooltip />
+      <el-table-column label="发票金额（含税）" min-width="140" align="right">
+        <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="推送状态" min-width="120" align="center">
+        <template #default="{ row }">
+          <el-tooltip
+            :disabled="row.kingdeePushStatus !== 'failed'"
+            :content="row.kingdeePushMsg || '推送金蝶失败，可在收票登记列表重推'"
+            placement="top"
+          >
+            <el-tag :type="pushStatusType(row.kingdeePushStatus)" size="small">
+              {{ pushStatusName(row.kingdeePushStatus) }}
+            </el-tag>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="invoice-candidates-dialog__pagination">
+      <el-pagination
+        v-model:current-page="page.current"
+        v-model:page-size="page.size"
+        :total="page.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @current-change="load"
+        @size-change="handleSizeChange"
+      />
+    </div>
+    <div class="invoice-candidates-dialog__tip">
+      仅列出审批通过且未被其他付款结算单认领的收票单
+    </div>
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">
+        确定{{ selection.length ? `（${selection.length}）` : '' }}
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { claimCandidates } from '@/api/payment/invoiceReceipt';
+
+export default {
+  name: 'InvoiceReceiptCandidatesDialog',
+  props: {
+    modelValue: { type: Boolean, required: true },
+  },
+  emits: ['update:modelValue', 'confirm'],
+  data() {
+    return {
+      loading: false,
+      keyword: '',
+      rows: [],
+      selection: [],
+      page: { current: 1, size: 10, total: 0 },
+    };
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    unwrap(response) {
+      const body = response?.data || response || {};
+      return body?.data || body;
+    },
+    handleOpen() {
+      this.keyword = '';
+      this.page = { current: 1, size: 10, total: 0 };
+      this.selection = [];
+      this.$refs.candidatesTable?.clearSelection?.();
+      this.load();
+    },
+    handleQuery() {
+      this.page.current = 1;
+      this.load();
+    },
+    handleSizeChange() {
+      this.page.current = 1;
+      this.load();
+    },
+    async load() {
+      this.loading = true;
+      try {
+        const data = this.unwrap(
+          await claimCandidates({
+            current: this.page.current,
+            size: this.page.size,
+            keyword: this.keyword,
+          })
+        );
+        this.rows = data?.records || [];
+        this.page.total = Number(data?.total || 0);
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleConfirm() {
+      if (!this.selection.length) {
+        this.$message.warning('请至少选择一条收票单');
+        return;
+      }
+      this.$emit('confirm', this.selection.map(row => ({ ...row })));
+      this.visible = false;
+    },
+    pushStatusName(value) {
+      return (
+        { pushed: '已保存收票单', assigned: '已指定应付', failed: '推送失败', unsynced: '未推送' }[
+          value
+        ] || '未推送'
+      );
+    },
+    pushStatusType(value) {
+      return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
+    },
+    formatMoney(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : '-';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.invoice-candidates-dialog__search {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-bottom: 12px;
+
+  .el-input {
+    width: 360px;
+  }
+}
+.invoice-candidates-dialog__pagination {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+.invoice-candidates-dialog__tip {
+  margin-top: 8px;
+  color: #909399;
+  font-size: 12px;
+}
+</style>
@@ -3061,6 +3061,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 {
@@ -0,0 +1,42 @@
+<template>
+  <div v-loading="true" class="formal-settlement-redirect" />
+</template>
+
+<script>
+import * as api from '@/api/settlement/formalSettlement';
+import { settlementListPath } from '@/utils/settlement-menu';
+
+/**
+ * 菜单拆分为付款/收款结算单后，旧路径 /settlement/formal-settlement 已无菜单路由。
+ * 本页按结算单号解析类型后 replace 到对应列表页，并保留 query（含 detailNo）。
+ */
+export default {
+  name: 'FormalSettlementRedirect',
+  async created() {
+    const detailNo = String(this.$route.query.detailNo || '').trim();
+    let settlementType = '';
+    if (detailNo) {
+      try {
+        const response = await api.getList(1, 10, { formalSettlementNo: detailNo });
+        const body = response?.data || response || {};
+        const data = body?.data || body;
+        const row = (data.records || []).find(item => item.formalSettlementNo === detailNo);
+        settlementType = row?.settlementType || '';
+      } catch (error) {
+        settlementType = '';
+      }
+    }
+    const path = settlementListPath(settlementType);
+    await this.$router.replace({
+      path,
+      query: { ...this.$route.query },
+    });
+  },
+};
+</script>
+
+<style scoped>
+.formal-settlement-redirect {
+  min-height: 240px;
+}
+</style>
@@ -98,6 +98,125 @@
        ></template
      >
    </el-dialog>
+
+    <!-- 先票后款路径B：结算单审批后发票登记（关联收票单 → 确认推送指定应付） -->
+    <el-dialog
+      v-model="invoiceRegisterDialog.visible"
+      title="发票登记"
+      width="86%"
+      append-to-body
+      class="invoice-register-dialog"
+    >
+      <section-card title="结算基本信息">
+        <el-descriptions :column="4" border size="small">
+          <el-descriptions-item label="结算单号">
+            {{ invoiceRegisterDialog.row.formalSettlementNo || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="项目名称">
+            {{ invoiceRegisterDialog.row.projectName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="所属组织">
+            {{ invoiceRegisterDialog.row.deptName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同编号">
+            {{ invoiceRegisterDialog.row.contractNo || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="付款方">
+            {{ invoiceRegisterDialog.row.payerName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="收款方">
+            {{ invoiceRegisterDialog.row.payeeName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算类型">
+            {{ settlementTypeName(invoiceRegisterDialog.row.settlementType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="业务模式">
+            {{ invoiceRegisterDialog.row.businessModelName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算总金额">
+            {{ formatMoney(invoiceRegisterDialog.row.settlementAmount, invoiceRegisterDialog.row.currency) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="已匹配发票金额">
+            {{ formatMoney(invoiceRegisterDialog.row.invoiceAmount, invoiceRegisterDialog.row.currency) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建人">
+            {{ invoiceRegisterDialog.row.createUserName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建时间">
+            {{ invoiceRegisterDialog.row.createTime || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="金蝶同步状态" :span="2">
+            {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ invoiceRegisterDialog.row.remark || '-' }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </section-card>
+      <section-card title="认领收票单">
+        <div class="invoice-register-dialog__actions">
+          <el-button
+            type="primary"
+            plain
+            :disabled="invoiceRegisterDialog.saving"
+            @click="candidatesDialog.visible = true"
+            >选择收票单</el-button
+          >
+        </div>
+        <el-table :data="invoiceRegisterDialog.candidates" border class="invoice-register-dialog__table">
+          <el-table-column type="index" label="序号" width="64" align="center" />
+          <el-table-column prop="invoiceNo" label="发票号" min-width="160" align="center" />
+          <el-table-column prop="invoiceDate" label="开票日期" min-width="120" align="center" />
+          <el-table-column prop="invoiceType" label="发票类型" min-width="140" align="center" />
+          <el-table-column prop="issuerName" label="开票单位（销方）" min-width="170" show-overflow-tooltip />
+          <el-table-column label="发票金额（含税）" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="匹配结算单金额" min-width="160" align="right">
+            <template #default="{ row }">
+              <!-- 匹配金额支持手动修改（默认=发票金额全额），已认领回显行只读 -->
+              <el-input-number
+                v-if="!row.claimed"
+                v-model="row.matchedAmount"
+                :min="0"
+                :max="Number(row.invoiceAmount || 0)"
+                :precision="2"
+                :controls="false"
+              />
+              <span v-else>{{ formatMoney(row.matchedAmount || row.invoiceAmount) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="90" fixed="right" align="center">
+            <template #default="{ row, $index }">
+              <!-- 已认领票回显：认领保存为增量逻辑不支持移除，仅新增票可移除 -->
+              <el-tag v-if="row.claimed" size="small">已认领</el-tag>
+              <el-link
+                v-else
+                type="danger"
+                :disabled="invoiceRegisterDialog.saving"
+                @click="invoiceRegisterDialog.candidates.splice($index, 1)"
+                >移除</el-link
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </section-card>
+      <template #footer>
+        <el-button @click="invoiceRegisterDialog.visible = false">取消</el-button>
+        <el-button
+          type="primary"
+          :loading="invoiceRegisterDialog.saving"
+          :disabled="!invoiceRegisterDialog.candidates.length"
+          @click="submitInvoiceRegister"
+          >保存认领</el-button
+        >
+      </template>
+    </el-dialog>
+
+    <invoice-receipt-candidates-dialog
+      v-model="candidatesDialog.visible"
+      @confirm="addInvoiceRegisterCandidates"
+    />
  </basic-container>
 </template>

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

 export default {
  name: 'FormalSettlement',
-  components: { FormalSettlementEditor, FormalSettlementTablePanel },
+  components: { FormalSettlementEditor, FormalSettlementTablePanel, InvoiceReceiptCandidatesDialog },
  mixins: [organizationSearch],
  props: {
    /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */
@@ -151,7 +272,19 @@ 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: {
@@ -222,11 +355,10 @@ export default {
    },
  },
  created() {
-    // 标签机制按 fullPath 缓存同页多实例：仅当前路由实例应响应 detailNo 跳转，防止缓存旧实例也弹窗
-    this.ownFullPath = this.$route.fullPath;
    this.loadOrganizationOptions();
  },
  mounted() {
+    this.isPageActive = true;
    this.openRouteDetail();
    loadMkEnabled()
      .then(enabled => {
@@ -237,10 +369,18 @@ export default {
      });
  },
  activated() {
+    this.isPageActive = true;
    if (sessionStorage.getItem('formal-settlement-list-refresh') === '1') {
      sessionStorage.removeItem('formal-settlement-list-refresh');
      this.onLoad(this.page);
    }
+    // 从其他页带 detailNo 跳回时，激活态补开详情
+    if (this.$route.query.detailNo) {
+      this.openRouteDetail();
+    }
+  },
+  deactivated() {
+    this.isPageActive = false;
  },
  methods: {
    hasPermission(actionOrCode) {
@@ -288,6 +428,7 @@ export default {
        return: () => this.handleReturn(row),
        void: () => this.handleVoid(row),
        print: () => this.handlePrint(row),
+        invoiceRegister: () => this.openInvoiceRegisterDialog(row),
      };
      (handlers[type] || (() => {}))();
    },
@@ -320,7 +461,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 +469,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;
      }
@@ -486,6 +639,8 @@ export default {
      const rows = this.selection;
      if (rows.some(row => row.approvalStatus !== 'approved' || row.settlementType !== 'payable'))
        return this.$message.warning('仅审批通过的付款结算单允许发起付款申请');
+      if (rows.some(row => row.adjustStatus === 'adjusted'))
+        return this.$message.warning('已调整的结算单不可再发起付款，请使用调整后的新单');
      const contractIds = new Set(rows.map(row => String(row.contractId || '')));
      if (contractIds.size !== 1 || contractIds.has(''))
        return this.$message.warning('付款申请必须选择同一个合同的付款结算单');
@@ -573,6 +728,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('打印');
@@ -622,6 +839,9 @@ export default {
      params.settlementType = this.lockedSettlementType || this.activeSettlementType;
      return params;
    },
+    settlementTypeName(value) {
+      return { payable: '付款', receivable: '收款' }[value] || '-';
+    },
    unwrapData(response) {
      const body = response?.data || response || {};
      return body?.data || body;
@@ -662,6 +882,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;
 }
@@ -1914,7 +1914,7 @@ export default {
        return;
      }
      if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
-        this.openSettlementDetail('/settlement/formal-settlement', row.formalSettlementNo);
+        this.openSettlementDetail('/settlement/payment-settlement', row.formalSettlementNo);
        return;
      }
      this.openDetailDialog(row);
@@ -93,11 +93,15 @@
            ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
              row[column.prop] || '-'
            }}</el-tag
-            ><el-tag
+            ><el-tooltip
              v-else-if="column.kingdee"
+              :disabled="row.kingdeeSyncStatus !== 'failed'"
+              :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+              placement="top"
+            ><el-tag
              :type="kingdeeStatusType(row.kingdeeSyncStatus)"
-              class="status-text"
              >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
+            ></el-tooltip
            ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
            ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
          ></el-table-column
@@ -182,9 +186,11 @@ import { settlementAdjustmentSearchFields } from '@/option/settlement/settlement
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
 import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
+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: '',
@@ -285,20 +291,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);
@@ -317,11 +326,18 @@ export default {
    },
    async handleApprove(row) {
      await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
-      const res = await api.approve(row.id);
-      // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
-      if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
-      else this.$message.success(res.data.msg || '审批通过');
-      this.loadTable();
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        const res = await api.approve(row.id);
+        // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
+        if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
+        else this.$message.success(res.data.msg || '审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
    },
    async handleReturn(row) {
      const { value } = await this.$prompt('请输入驳回原因', '驳回', {
@@ -358,9 +374,7 @@ export default {
        'info'
      );
    },
-    kingdeeStatusType(status) {
-      return { synced: 'success', failed: 'danger' }[status] || 'info';
-    },
+    kingdeeStatusType,
    kingdeeSyncName(value) {
      return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
    },
@@ -0,0 +1,407 @@
+<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_edit"
+          type="primary"
+          @click="$refs.crud.rowEdit(row, index)"
+        >
+          编辑
+        </el-link>
+        <el-link
+          v-if="permission.business_dept_config_delete"
+          type="danger"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+      </template>
+      <template #initialSerial="{ row }">
+        {{ formatSerial(row.initialSerial) }}
+      </template>
+      <template #platformCompanyId-form>
+        <el-select
+          v-model="form.platformCompanyId"
+          filterable
+          clearable
+          placeholder="请选择平台公司"
+          style="width: 100%"
+          @change="handlePlatformCompanyChange"
+        >
+          <el-option
+            v-for="item in platformCompanyOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+      <template #businessDeptId-form>
+        <el-select
+          v-model="form.businessDeptId"
+          filterable
+          clearable
+          placeholder="请选择业务部门"
+          style="width: 100%"
+          @change="handleBusinessDeptChange"
+        >
+          <el-option
+            v-for="item in businessDeptOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+      <template #kingdeeCompanyCode-form>
+        <el-input
+          v-model="form.kingdeeCompanyCode"
+          disabled
+          placeholder="关联组织中配置的平台公司金蝶代码"
+        />
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, submit, remove } from '@/api/system/business-dept-config';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
+import { mapGetters } from 'vuex';
+
+export default {
+  data() {
+    return {
+      form: {},
+      data: [],
+      loading: true,
+      query: {},
+      page: {
+        pageSize: 10,
+        pageSizes: [10, 30, 50, 100, 200],
+        currentPage: 1,
+        total: 0,
+      },
+      platformCompanyOptions: [],
+      businessDeptOptions: [],
+      option: {
+        height: 'auto',
+        calcHeight: 32,
+        tip: false,
+        border: true,
+        stripe: true,
+        index: true,
+        indexLabel: '序号',
+        indexWidth: 70,
+        selection: false,
+        addBtn: true,
+        editBtn: false,
+        delBtn: false,
+        viewBtn: false,
+        menuWidth: 140,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        labelPosition: 'right',
+        labelWidth: 'auto',
+        searchShow: true,
+        searchIcon: true,
+        searchIndex: 4,
+        searchMenuSpan: 24,
+        searchMenuPosition: 'right',
+        column: [
+          {
+            label: '业务部门',
+            prop: 'businessDeptId',
+            type: 'select',
+            filterable: true,
+            search: true,
+            searchOrder: 2,
+            searchFilterable: true,
+            minWidth: 160,
+            span: 12,
+            formslot: true,
+            hide: true,
+            props: { label: 'label', value: 'value' },
+            dicData: [],
+            rules: [{ required: true, message: '请选择业务部门', trigger: 'change' }],
+          },
+          {
+            label: '业务部门',
+            prop: 'businessDeptName',
+            minWidth: 160,
+            display: false,
+          },
+          {
+            label: '平台公司',
+            prop: 'platformCompanyId',
+            type: 'select',
+            filterable: true,
+            search: true,
+            searchOrder: 1,
+            searchFilterable: true,
+            minWidth: 220,
+            span: 12,
+            formslot: true,
+            hide: true,
+            props: { label: 'label', value: 'value' },
+            dicData: [],
+            rules: [{ required: true, message: '请选择平台公司', trigger: 'change' }],
+          },
+          {
+            label: '平台公司',
+            prop: 'platformCompanyName',
+            minWidth: 220,
+            display: false,
+          },
+          {
+            label: '合同编码前缀',
+            prop: 'contractCodePrefix',
+            minWidth: 140,
+            span: 12,
+            maxlength: 64,
+            rules: [{ required: true, message: '请输入合同编码前缀', trigger: 'blur' }],
+          },
+          {
+            label: '金蝶公司代码',
+            prop: 'kingdeeCompanyCode',
+            minWidth: 140,
+            span: 12,
+            formslot: true,
+            addDisplay: true,
+            editDisplay: true,
+            hide: true,
+          },
+          {
+            label: '初始流水号',
+            prop: 'initialSerial',
+            type: 'number',
+            minWidth: 120,
+            span: 12,
+            minRows: 1,
+            maxRows: 999,
+            controls: false,
+            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,
+      };
+    },
+  },
+  created() {
+    this.loadSelectOptions();
+  },
+  methods: {
+    loadSelectOptions() {
+      Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
+          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
+          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
+          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
+          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
+        }
+      );
+    },
+    normalizeDeptOptions(list) {
+      return (list || []).map(item => ({
+        label: item.deptName || item.fullName || String(item.id),
+        value: String(item.id),
+        kingdeeDeptCode: item.kingdeeDeptCode || '',
+      }));
+    },
+    formatSerial(value) {
+      if (value === null || value === undefined || value === '') return '-';
+      const number = Number(value);
+      if (!Number.isInteger(number) || number < 1) return String(value);
+      return String(number).padStart(3, '0');
+    },
+    handlePlatformCompanyChange(value) {
+      const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
+      this.form.platformCompanyName = matched ? matched.label : '';
+      this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
+    },
+    handleBusinessDeptChange(value) {
+      const matched = this.businessDeptOptions.find(item => String(item.value) === String(value));
+      this.form.businessDeptName = matched ? matched.label : '';
+    },
+    beforeOpen(done, type) {
+      this.loadSelectOptions();
+      if (['edit', 'view'].includes(type) && this.form.id) {
+        getDetail(this.form.id).then(res => {
+          const detail = res.data?.data || {};
+          this.form = {
+            ...detail,
+            platformCompanyId: detail.platformCompanyId ? String(detail.platformCompanyId) : '',
+            businessDeptId: detail.businessDeptId ? String(detail.businessDeptId) : '',
+          };
+          done();
+        });
+        return;
+      }
+      if (type === 'add') {
+        this.form = {
+          platformCompanyId: '',
+          platformCompanyName: '',
+          businessDeptId: '',
+          businessDeptName: '',
+          contractCodePrefix: '',
+          initialSerial: undefined,
+          kingdeeCompanyCode: '',
+          kingdeeDeptCode: '',
+          remark: '',
+        };
+      }
+      done();
+    },
+    normalizeSubmitRow(row) {
+      const initialSerial =
+        row.initialSerial === '' || row.initialSerial === undefined || row.initialSerial === null
+          ? null
+          : Number(row.initialSerial);
+      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: Number.isFinite(initialSerial) ? initialSerial : null,
+      };
+    },
+    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>
@@ -303,7 +303,7 @@ export default {
            headerAlign: 'left',
            order: 80,
            search: true,
-            searchOrder: 2,
+            searchOrder: 3,
            rules: [
              {
                required: true,
@@ -366,105 +366,13 @@ export default {
              },
            ],
          },
-          {
-            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',
-              },
-            ],
-          },
          {
            label: '组织简称',
            prop: 'shortName',
            minWidth: 140,
            order: 60,
            search: true,
-            searchOrder: 1,
+            searchOrder: 4,
          },
          {
            label: '助记码',
@@ -525,8 +433,12 @@ export default {
            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,
@@ -535,6 +447,37 @@ export default {
              },
            ],
          },
+          {
+            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',
@@ -547,6 +490,9 @@ export default {
            value: 0,
            width: 120,
            order: 34,
+            search: true,
+            searchOrder: 1,
+            searchPlaceholder: '请选择是否业务部门',
            formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
            rules: [
              {
@@ -1217,28 +1163,20 @@ export default {
        row.parentId = 0;
      }
    },
-    normalizeContractInitialSerial(value) {
-      // -1 为空占位，不填时不落库、不回显
-      if (
-        value === undefined ||
-        value === null ||
-        value === '' ||
-        Number(value) === -1
-      ) {
-        return null;
+    handlePlatformCompanyChange(value) {
+      const isPlatform = Number(value) === 1;
+      this.syncKingdeeDeptCodeDisplay(isPlatform);
+      if (!isPlatform && this.form) {
+        this.form.kingdeeDeptCode = '';
      }
-      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 = '';
-      }
+    syncKingdeeDeptCodeDisplay(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;
    },
    isRootDept(row) {
      return row && (row.parentId === 0 || String(row.parentId) === '0');
@@ -1384,9 +1322,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 +1370,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)) {
@@ -1547,7 +1485,7 @@ export default {
        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
          this.form.isBusinessDept = 0;
        }
-        this.clearEmptyContractInitialSerial(this.form);
+        this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
        this.initData(this.form.tenantId);
        this.loadParentDeptCode(this.form.parentId);
      }
@@ -1562,7 +1500,7 @@ export default {
          if (this.form.parentId === '0') {
            this.form.parentId = '';
          }
-          this.clearEmptyContractInitialSerial(this.form);
+          this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
          this.loadParentDeptCode(this.form.parentId);
          if (this.form.hasOwnProperty('leaderId')) {
            const splitResult = func.split(this.form.leaderId);
@@ -26,9 +26,6 @@
        <el-button type="primary" plain v-if="permission.mp_user_reset" @click="handleReset">
          密码重置
        </el-button>
-        <el-button type="danger" plain v-if="permission.mp_user_delete" @click="handleDelete">
-          批量删除
-        </el-button>
      </template>
      <template #identities="{ row }">
        {{ row.identitiesName || formatIdentities(row.identities) }}
@@ -102,9 +99,6 @@
        <el-link type="primary" v-if="permission.mp_user_reset" @click="handleResetForRow(row)">
          重置密码
        </el-link>
-        <el-link type="danger" v-if="permission.mp_user_delete" @click="rowDel(row)">
-          删除
-        </el-link>
      </template>
      <template #menu-form="{ size }">
        <el-button
@@ -121,7 +115,7 @@

 <script>
 import { h } from 'vue';
-import { getList, getDetail, submit, remove, changeStatus, resetPassword } from '@/api/system/mpUser';
+import { getList, getDetail, submit, changeStatus, resetPassword } from '@/api/system/mpUser';
 import { getDeptTree } from '@/api/system/dept';
 import option from '@/option/system/mpUser';
 import { mapGetters } from 'vuex';
@@ -159,7 +153,6 @@ export default {
      return {
        addBtn: this.validData(this.permission.mp_user_add, false),
        viewBtn: this.validData(this.permission.mp_user_view, false),
-        delBtn: this.validData(this.permission.mp_user_delete, false),
        editBtn: this.validData(this.permission.mp_user_edit, false),
      };
    },
@@ -345,35 +338,6 @@ export default {
        () => loading()
      );
    },
-    rowDel(row) {
-      this.$confirm('确定删除该小程序用户?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => remove(row.id))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message.success('操作成功');
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定删除选中的小程序用户?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => remove(this.ids))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message.success('操作成功');
-          this.$refs.crud.toggleSelection();
-        });
-    },
    handleStatus(row) {
      const status = row.status === 1 ? 0 : 1;
      const text = status === 1 ? '启用' : '停用';
@@ -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="驾驶证信息">
@@ -701,6 +737,9 @@ const emptyForm = () => ({
  posts: '',
  idCardFront: '',
  idCardBack: '',
+  idCardValidStart: '',
+  idCardValidEnd: '',
+  idCardLongTerm: 0,
  headPhoto: '',
  drivingType: '',
  drivingLicenseNo: '',
@@ -1260,12 +1299,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);
@@ -1308,7 +1348,7 @@ export default {
          loading.close();
        });
    },
-    recognizeIdCard(url = '') {
+    recognizeIdCard(url = '', prop = 'idCardFront') {
      if (!url) {
        this.$message.warning('身份证图片上传成功，未获取到图片地址，无法自动识别');
        return;
@@ -1321,7 +1361,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 +1484,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 +1549,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 : [];
@@ -1675,6 +1767,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),
@@ -49,24 +49,27 @@
      </template>
      <template #customerRisk="{ row }">
        <el-tooltip
-          v-if="customerRiskMap[row.customerCode] && customerRiskMap[row.customerCode].risky"
+          v-if="customerRowRiskName(row) && customerRowRiskName(row) !== '无风险'"
          placement="top"
          effect="dark"
          popper-class="customer-risk-popper"
        >
          <template #content>
-            <div>{{ customerRiskMap[row.customerCode].riskTip || '该客商为高风险/黑名单客商' }}</div>
+            <div>{{ row.hcsRiskDetail || customerRowRiskName(row) }}</div>
          </template>
-          <el-tag type="danger" class="status-text">
-            {{ customerRiskLabel(customerRiskMap[row.customerCode]) }}
+          <el-tag
+            :type="customerRowRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+            class="status-text"
+          >
+            {{ customerRowRiskName(row) }}
          </el-tag>
        </el-tooltip>
        <el-tag
-          v-else-if="customerRiskMap[row.customerCode]"
-          :type="customerRiskMap[row.customerCode].fdRiskLevel === '1' ? 'warning' : 'success'"
+          v-else-if="customerRowRiskName(row)"
+          type="success"
          class="status-text"
        >
-          {{ customerRiskLabel(customerRiskMap[row.customerCode]) }}
+          {{ customerRowRiskName(row) }}
        </el-tag>
        <span v-else>-</span>
      </template>
@@ -135,7 +138,13 @@
      <template #kingdeeStatus="{ row }">
        <el-tag v-if="row.kingdeeStatus === 'synced'" type="success">已推送</el-tag>
        <el-tag v-else-if="row.kingdeeStatus === 'exist'" type="primary">金蝶已有</el-tag>
-        <el-tag v-else-if="row.kingdeeStatus === 'failed'" type="danger">推送失败</el-tag>
+        <el-tooltip
+          v-else-if="row.kingdeeStatus === 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+          placement="top"
+        >
+          <el-tag type="danger">推送失败</el-tag>
+        </el-tooltip>
        <el-tag v-else type="info">未推送</el-tag>
      </template>
      <template #menu="{ row }">
@@ -285,6 +294,17 @@
                />
              </el-form-item>
            </el-col>
+            <el-col :span="6">
+              <el-form-item label="供应商编码" prop="supplierCode">
+                <el-input
+                  v-model="archiveForm.supplierCode"
+                  maxlength="64"
+                  show-word-limit
+                  disabled
+                  placeholder="金蝶供应商编码，系统自动获取"
+                />
+              </el-form-item>
+            </el-col>
            <el-col :span="6">
              <el-form-item label="客商类型" prop="customerKind">
                <el-select
@@ -366,7 +386,7 @@
                  <template #content>
                    <div>{{ archiveNameRiskTip || '该客商为高风险/黑名单客商' }}</div>
                  </template>
-                  <div class="archive-name-risk">高风险/黑名单客商</div>
+                  <div class="archive-name-risk">{{ archiveNameRiskLabel }}</div>
                </el-tooltip>
              </el-form-item>
            </el-col>
@@ -1080,8 +1100,18 @@
          <el-form-item label="开户人姓名" prop="accountHolderName">
            <el-input v-model="receiptForm.accountHolderName" maxlength="50" />
          </el-form-item>
-          <el-form-item label="开户行" prop="bankName">
-            <el-input v-model="receiptForm.bankName" maxlength="100" />
+          <el-form-item prop="bankName">
+            <template #label>
+              <span class="receipt-bank-label">
+                开户行
+                <el-tooltip placement="top" effect="dark" content="请填写银行全称，系统将自动匹配金蝶档案带出联行号">
+                  <el-icon class="receipt-bank-help">
+                    <el-icon-question-filled />
+                  </el-icon>
+                </el-tooltip>
+              </span>
+            </template>
+            <el-input v-model="receiptForm.bankName" maxlength="100" @blur="fetchReceiptCnapsCode" />
          </el-form-item>
          <el-form-item label="联行号" prop="cnapsCode">
            <el-input v-model="receiptForm.cnapsCode" maxlength="32" />
@@ -1588,10 +1618,14 @@ import {
  remove,
  getScoreTemplate,
  recognizeBusinessLicenseOcr,
+  queryKingdeeBank,
+  queryKingdeeBankByNumber,
  queryKingdeeCustomer,
+  querySupplierCode,
  syncKingdee,
 } from '@/api/vehicle/customer-archive';
-import { getRiskBatch, getRiskByName } from '@/api/business/hcs';
+import { getRisk, getRiskByName } from '@/api/business/hcs';
+import { isKingdeeBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
 import {
  getList as getCreditScoreQuantificationList,
  getDetail as getCreditScoreQuantificationDetail,
@@ -1693,9 +1727,9 @@ export default {
      deptSearchInitialized: false,
      loading: true,
      data: [],
-      customerRiskMap: {},
      archiveNameRisky: false,
      archiveNameRiskTip: '',
+      archiveNameRiskLabel: '',
      page: {
        pageSize: 10,
        pageSizes: [10, 20, 50, 100],
@@ -1915,6 +1949,11 @@ export default {
            searchPlaceholder: '请输入',
            minWidth: 140,
          },
+          {
+            label: '供应商编码',
+            prop: 'supplierCode',
+            minWidth: 140,
+          },
          {
            label: '客商简称',
            prop: 'shortName',
@@ -1957,7 +1996,13 @@ export default {
            label: '客商风险',
            prop: 'customerRisk',
            slot: true,
-            minWidth: 100,
+            search: true,
+            searchType: 'select',
+            searchOrder: 4,
+            searchPlaceholder: '请选择',
+            minWidth: 150,
+            // 选项走业务字典 customer_risk（initBusinessDictionaries 加载：dictKey=筛选值，dictValue=名称），未配置时下拉为空
+            dicData: [],
          },
          {
            label: '客户性质',
@@ -2462,6 +2507,8 @@ export default {
    resetKingdeeBackfill() {
      const form = this.archiveForm;
      form.kingdeeStatus = 'none';
+      form.customerCode = '';
+      form.supplierCode = '';
      form.fullName = '';
      form.legalPerson = '';
      form.registeredCapital = '';
@@ -2477,6 +2524,7 @@ export default {
    handleKingdeeCreditCodeChange(val) {
      this.kingdeeBlocked = false;
      if (this.readonly || this.archiveForm.id) return;
+      this.clearArchiveNameRisk();
      if (this.archiveForm.kingdeeStatus === 'exist') {
        this.resetKingdeeBackfill();
      }
@@ -2485,7 +2533,21 @@ export default {
        .toUpperCase();
      if (code.length !== 18 || this.unifiedCreditCodeError(code)) return;
      clearTimeout(this.kingdeeQueryTimer);
-      this.kingdeeQueryTimer = setTimeout(() => this.fetchKingdeeCustomer(code), 500);
+      this.kingdeeQueryTimer = setTimeout(() => {
+        this.fetchKingdeeCustomer(code);
+        this.fetchSupplierCode(code);
+      }, 500);
+    },
+    // 新增态下信用代码录入后即时查询金蝶供应商编码（A901-1）回显，查询失败静默留空，保存/同步时后端兜底落库
+    async fetchSupplierCode(code) {
+      try {
+        const res = await querySupplierCode(code);
+        // 防止响应返回时用户已修改代码
+        if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
+        this.archiveForm.supplierCode = res?.data?.data || '';
+      } catch (error) {
+        // 忽略查询异常，编码留空
+      }
    },
    async fetchKingdeeCustomer(code) {
      let customer = null;
@@ -2517,6 +2579,8 @@ export default {
    applyKingdeeCustomer(customer) {
      const form = this.archiveForm;
      form.kingdeeStatus = 'exist';
+      // 客商编号回显金蝶客商编码，与后端同步金蝶时的采纳口径保持一致
+      if (customer.number) form.customerCode = customer.number;
      // 工商信息以金蝶为准，直接覆盖（后续字段锁定）
      if (customer.name) form.fullName = customer.name;
      if (customer.name) this.checkArchiveNameRisk();
@@ -2691,6 +2755,7 @@ export default {
        currentNode: '当前节点',
        currentProcessor: '当前处理人',
        customerCode: '客商编号',
+        supplierCode: '供应商编码',
        shortName: '客商简称',
        fullName: '客商名称',
        customerType: '客商分类',
@@ -3148,6 +3213,15 @@ export default {
      });
    },
    initBusinessDictionaries() {
+      // 客商风险筛选项走业务字典 customer_risk（dictKey=筛选值 blacklist/high/middle/low，dictValue=名称），字典缺失保留固定兜底项
+      getDictionary({ code: 'customer_risk' }).then(res => {
+        const options = (res.data.data || [])
+          .filter(item => item.dictKey !== '-1')
+          .map(item => ({ label: item.dictValue, value: item.dictKey }));
+        if (options.length) {
+          this.findColumn(this.option.column, 'customerRisk').dicData = options;
+        }
+      });
      this.loadDictOptions('nature_of_client', 'customerNatureOptions', [], options => {
        const customerNatureColumn = this.findColumn(this.option.column, 'customerNature');
        customerNatureColumn.dicData = [{ label: '全部', value: '' }, ...options];
@@ -3595,18 +3669,50 @@ export default {
      this.receiptForm = this.emptyReceiptAccount();
      this.$refs.receiptForm?.clearValidate();
    },
-    saveReceipt() {
-      this.$refs.receiptForm.validate(valid => {
-        if (!valid) return;
-        const receipt = this.normalizeReceipt(this.receiptForm);
-        if (this.receiptIndex > -1) {
-          this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
+    // 开户行失焦后按行名精确匹配金蝶行名行号档案（A905-3），命中自动带出联行号，未命中提示检查
+    async fetchReceiptCnapsCode() {
+      const bankName = String(this.receiptForm.bankName || '').trim();
+      if (!bankName) return;
+      try {
+        const res = await queryKingdeeBank(bankName);
+        // 防止响应返回时用户已修改开户行
+        if (String(this.receiptForm.bankName || '').trim() !== bankName) return;
+        const bank = res?.data?.data || null;
+        if (bank && bank.unionNumber) {
+          this.receiptForm.cnapsCode = bank.unionNumber;
+          this.$refs.receiptForm?.clearValidate('cnapsCode');
        } else {
-          this.archiveForm.receiptAccounts.push(receipt);
-          this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
+          this.$message.warning('未查询到金蝶开户行信息，请检查开户行名称');
        }
-        this.receiptBox = false;
-      });
+      } catch (error) {
+        // 忽略查询异常，联行号留空由用户手填
+      }
+    },
+    async saveReceipt() {
+      const valid = await this.$refs.receiptForm.validate().catch(() => false);
+      if (!valid) return;
+      // 保存前按联行号精确校验金蝶行名行号档案（A905-3），查不到不允许保存
+      const cnapsCode = String(this.receiptForm.cnapsCode || '').trim();
+      let bank = null;
+      try {
+        const res = await queryKingdeeBankByNumber(cnapsCode);
+        bank = res?.data?.data || null;
+      } catch (error) {
+        this.$message.warning('金蝶联行号校验失败，请稍后重试');
+        return;
+      }
+      if (!bank || !bank.unionNumber) {
+        this.$message.warning('未查询到金蝶联行号信息，不能保存，请检查联行号');
+        return;
+      }
+      const receipt = this.normalizeReceipt(this.receiptForm);
+      if (this.receiptIndex > -1) {
+        this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
+      } else {
+        this.archiveForm.receiptAccounts.push(receipt);
+        this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
+      }
+      this.receiptBox = false;
    },
    deleteReceipt(index) {
      this.$confirm('确定删除该收款信息?', '提示', {
@@ -3935,7 +4041,7 @@ export default {
      });
      recognizeBusinessLicenseOcr(url)
        .then(res => {
-          this.applyBusinessLicenseRecognition(res?.data?.data?.result || {});
+          this.applyBusinessLicenseRecognition(res?.data?.data || {});
          this.$message.success('营业执照识别完成');
        })
        .catch(() => {
@@ -3943,8 +4049,31 @@ export default {
        })
        .finally(() => loading.close());
    },
+    normalizeBusinessLicenseOcrFields(result = {}) {
+      if (Array.isArray(result)) {
+        return Object.fromEntries(
+          result
+            .filter(item => item && item.key)
+            .map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
+            .filter(([, value]) => value)
+        );
+      }
+      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
+        return result.fields;
+      }
+      if (Array.isArray(result.data)) {
+        return this.normalizeBusinessLicenseOcrFields(result.data);
+      }
+      return result;
+    },
    getBusinessLicenseOcrValue(result, labels) {
-      const words = result?.words_result || result?.wordsResult || result || {};
+      const fields = this.normalizeBusinessLicenseOcrFields(result);
+      for (const label of labels) {
+        const value = fields[label];
+        const text = value && typeof value === 'object' ? value.words : value;
+        if (text !== undefined && text !== null && String(text).trim()) return String(text).trim();
+      }
+      const words = result?.words_result || result?.wordsResult || {};
      for (const label of labels) {
        const value = words[label];
        const text = value && typeof value === 'object' ? value.words : value;
@@ -3956,23 +4085,35 @@ export default {
      return String(value || '').replace(/\s/g, '') === '无';
    },
    applyBusinessLicenseRecognition(result = {}) {
-      const code = this.getBusinessLicenseOcrValue(result, [
+      const fields = this.normalizeBusinessLicenseOcrFields(result);
+      const code = this.getBusinessLicenseOcrValue(fields, [
+        'uscc',
        '统一社会信用代码',
        '社会信用代码',
        '注册号',
      ]);
-      const name = this.getBusinessLicenseOcrValue(result, ['单位名称', '企业名称', '名称']);
-      const legalPerson = this.getBusinessLicenseOcrValue(result, ['法定代表人', '法人']);
-      const address = this.getBusinessLicenseOcrValue(result, ['地址', '住所']);
-      const capital = this.getBusinessLicenseOcrValue(result, ['注册资本']);
-      const paidInCapital = this.getBusinessLicenseOcrValue(result, ['实缴资本', '实收资本']);
-      const term = this.getBusinessLicenseOcrValue(result, ['营业期限', '有效期']);
-      const termStartDate = this.getBusinessLicenseOcrValue(result, [
+      const name = this.getBusinessLicenseOcrValue(fields, [
+        'company_name',
+        '单位名称',
+        '企业名称',
+        '名称',
+      ]);
+      const legalPerson = this.getBusinessLicenseOcrValue(fields, [
+        'legal_name',
+        '法定代表人',
+        '法人',
+      ]);
+      const address = this.getBusinessLicenseOcrValue(fields, ['add', '地址', '住所']);
+      const capital = this.getBusinessLicenseOcrValue(fields, ['capital', '注册资本']);
+      const paidInCapital = this.getBusinessLicenseOcrValue(fields, ['实缴资本', '实收资本']);
+      const term = this.getBusinessLicenseOcrValue(fields, ['period', '营业期限', '有效期']);
+      const termStartDate = this.getBusinessLicenseOcrValue(fields, [
+        'establishment_date',
        '有效期起始日期',
        '成立日期',
        '核准日期',
      ]);
-      const scope = this.getBusinessLicenseOcrValue(result, ['经营范围']);
+      const scope = this.getBusinessLicenseOcrValue(fields, ['经营范围']);
      if (code) this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
      if (name) this.archiveForm.fullName = name;
      if (name) this.checkArchiveNameRisk();
@@ -5496,7 +5637,9 @@ export default {
      this.onLoad(this.page);
    },
    searchChange(params, done) {
-      this.query = this.buildQuery(params);
+      // Avue 只回传非空筛选项，被清空的字段不会出现在 params 里，
+      // 因此查询条件必须整体重建，不能与上一次的 this.query 合并，否则清空后仍会带上次的值
+      this.query = this.buildQuery(params, true);
      this.page.currentPage = 1;
      this.onLoad(this.page, this.query);
      done();
@@ -5525,52 +5668,56 @@ export default {
          const pageData = res.data.data;
          this.page.total = pageData.total;
          this.data = pageData.records;
-          this.loadCustomerRisk(this.data);
          this.selectionClear();
        })
        .finally(() => {
          this.loading = false;
        });
    },
-    // 客商风险标签文案：后端 riskLevelName 转义（黑名单/高风险/中风险/低风险），缺失时兜底
-    customerRiskLabel(risk) {
-      if (!risk) return '';
-      return risk.riskLevelName || (risk.risky ? '风险客商' : '正常');
+    // 黑名单判定：仅以金蝶黑名单（A801-5）命中为准（失信类别/列入事由任一非空）；C101-1 的 hcsBlackStatus 不作为黑名单依据
+    customerRowIsBlack(row) {
+      return isKingdeeBlack(row.kingdeeBlackCategory, row.kingdeeBlackReason);
+    },
+    // 客商风险名称（每日定时刷新落库字段）：等级与黑名单组合展示（如"低风险、黑名单"）；内部组织默认无风险；未查询显示"-"
+    customerRowRiskName(row) {
+      return resolveRiskTagName(row.hcsRiskLevel, this.customerRowIsBlack(row), row.customerKind);
+    },
+    // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
+    customerRowRisky(row) {
+      return isRiskyTag(row.hcsRiskLevel, this.customerRowIsBlack(row));
    },
    // 客商名称风险校验（C101-1，仅展示不作为安全边界）：名称失焦/回显时查询，
    // risky 在名称框下展示红色提示，悬浮见风险项明细；查询失败静默不阻断填写，提交链路由后端强校验兜底
-    checkArchiveNameRisk() {
+    // 清空客商名称下风险提示（信用代码变化后原按旧编号+信用代码查询的结果失效）
+    clearArchiveNameRisk() {
      this.archiveNameRisky = false;
      this.archiveNameRiskTip = '';
+      this.archiveNameRiskLabel = '';
+    },
+    checkArchiveNameRisk() {
+      this.clearArchiveNameRisk();
      const customerName = String(this.archiveForm.fullName || '').trim();
      if (!customerName) return;
-      getRiskByName(customerName)
+      // 新增客商档案本地反查不到编号：金蝶带出后表单已有客商编号，优先按编号查 C101-1，
+      // 并传信用代码供金蝶黑名单（A801-5）兜底；无编号时按名称反查档案
+      const customerCode = String(this.archiveForm.customerCode || '').trim();
+      const request = customerCode
+        ? getRisk(customerCode, String(this.archiveForm.unifiedCreditCode || '').trim(), customerName)
+        : getRiskByName(customerName);
+      request
        .then(res => {
          const risk = (res.data && res.data.data) || {};
          this.archiveNameRisky = risk.risky === true;
          this.archiveNameRiskTip = risk.riskTip || '';
+          // 红字与列表标签同口径（risk-display）：等级按合同系统返回值翻译，黑名单按金蝶命中标记独立展示，组合不分家
+          this.archiveNameRiskLabel = this.archiveNameRisky
+            ? (resolveRiskTagName(risk.fdRiskLevel, risk.kingdeeBlackHit === true) || '高风险/黑名单') + '客商'
+            : '';
        })
        .catch(() => {
          // 忽略风险查询异常，表单正常填写
        });
    },
-    // 客商列表风险批量查询（C101-1，仅展示不作为安全边界）：失败静默，行内显示"-"，提交链路由后端强校验兜底
-    loadCustomerRisk(rows) {
-      this.customerRiskMap = {};
-      const customerCodes = [...new Set(rows.map(row => row.customerCode).filter(Boolean))];
-      if (!customerCodes.length) return;
-      getRiskBatch(customerCodes)
-        .then(res => {
-          const riskMap = {};
-          ((res.data && res.data.data) || []).forEach(risk => {
-            if (risk && risk.customerCode) riskMap[risk.customerCode] = risk;
-          });
-          this.customerRiskMap = riskMap;
-        })
-        .catch(() => {
-          // 忽略风险查询异常，列表正常展示
-        });
-    },
    handleExport() {
      this.$confirm('是否导出客商档案数据?', '提示', {
        confirmButtonText: '确定',
@@ -5598,9 +5745,10 @@ export default {
        [this.website.tokenHeader]: getToken(),
      };
    },
-    buildQuery(params = {}) {
-      // 新条件覆盖旧条件；本次显式清空的字段必须从查询里去掉，避免第二次搜索仍带着上一次的客商名称。
-      const merged = { ...this.query, ...params };
+    // replace=true 表示以本次搜索条件为准整体重建（清空字段不会回传，需丢弃旧条件）；
+    // 翻页、刷新等场景传 false，沿用上一次的查询条件
+    buildQuery(params = {}, replace = false) {
+      const merged = replace ? { ...params } : { ...this.query, ...params };
      Object.keys(params).forEach(key => {
        const value = params[key];
        if (
@@ -6058,6 +6206,19 @@ export default {
  :deep(.el-select) {
    width: 60%;
  }
+
+  .receipt-bank-label {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+  }
+
+  .receipt-bank-help {
+    color: #a8abb2;
+    cursor: help;
+    font-size: 14px;
+    flex: none;
+  }
 }

 .receipt-dialog__footer-actions {
@@ -179,6 +179,14 @@ const createTimeRangeMap = {
  createTimeRange: ['createTimeStart', 'createTimeEnd'],
 };

+/** 关联异常列：一级 / 二级（如「车辆异常 / 车辆故障维修」），无关联显示 — */
+function formatExceptionSource(row) {
+  const parts = [row?.exceptionType, row?.exceptionReason].filter(
+    item => item !== undefined && item !== null && String(item).trim() !== ''
+  );
+  return parts.length ? parts.join(' / ') : '—';
+}
+
 const exportColumns = [
  { prop: 'vehicleType', label: '车船类型' },
  { prop: 'vehicleNo', label: '车牌号/船号' },
@@ -284,6 +292,23 @@ export default {
              { max: 30, message: '最多 30 个字符', trigger: 'change' },
            ],
          },
+          // 关联信息只读展示：由异常处置录入的记录带出运单与异常类型，PC 新增/编辑不产生关联
+          {
+            label: '关联运单',
+            prop: 'waybillNo',
+            minWidth: 150,
+            addDisplay: false,
+            editDisplay: false,
+            formatter: row => row.waybillNo || '—',
+          },
+          {
+            label: '关联异常',
+            prop: 'exceptionReason',
+            minWidth: 180,
+            addDisplay: false,
+            editDisplay: false,
+            formatter: formatExceptionSource,
+          },
          {
            label: '维修人',
            prop: 'maintainer',
Author	SHA1	Message	Date
刘泉佳	f6c597d40b	Merge remote-tracking branch 'origin/master' into feature/20261104-汇总文档-web	2026-11-04 00:09:18 +08:00
刘泉佳	71f0cc66f8	Merge remote-tracking branch 'origin/feature/20261030-kingdee-writeoff-status-web' into feature/20261104-汇总文档-web # Conflicts: # src/option/settlement/formalSettlement.js	2026-11-04 00:08:49 +08:00
刘泉佳	4dac863d61	Merge remote-tracking branch 'origin/feature/20261027-hcs-bif-all-web' into feature/20261104-汇总文档-web	2026-11-04 00:08:14 +08:00
刘泉佳	68904b02a5	fix: 审核按钮统一超时设置60s	2026-11-03 09:54:14 +08:00
b2894lxlx	8388a55481	✨ 新增业务部门配置页并简化项目/合同部门选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 21:10:47 +08:00
刘泉佳	b492dd35ea	fix: 结算单列表已指定应付列定义补充	2026-11-02 19:58:01 +08:00
刘泉佳	acb74cbc9a	fix: 结算单列表指定失败标签补悬浮原因	2026-11-02 19:56:54 +08:00
刘泉佳	9a51bd2cfd	feat: 结算单/付款申请单列表指定失败悬浮展示原因	2026-11-02 19:54:15 +08:00
刘泉佳	4dd54f7e4c	feat: 付款申请单列表增加已指定应付列	2026-11-02 19:36:04 +08:00
刘泉佳	6705763951	feat: 查看页指定失败行支持编辑匹配金额随重推生效	2026-11-02 19:16:41 +08:00
刘泉佳	4ba18acd25	feat: 查看页重推认领收票单并放开付款匹配金额编辑	2026-11-02 18:38:18 +08:00
刘泉佳	c07371450f	feat: 发票登记弹窗匹配结算单金额支持手动修改	2026-11-02 18:38:18 +08:00
刘泉佳	5fbbb5f88f	feat: 结算单发票信息增加是否已指定应付列	2026-11-02 18:10:53 +08:00
刘泉佳	1ed7955764	feat: 发票登记选票暂存展示且确认后才保存推送	2026-11-02 18:10:53 +08:00
刘泉佳	daab1001db	fix: 付款管理批量同步增加遮罩并统一金蝶接口30s超时常量	2026-11-02 17:15:50 +08:00
刘泉佳	f5735e6bad	fix: 收票登记提交返回列表后刷新列表数据	2026-11-02 16:36:00 +08:00
刘泉佳	bd9da83175	feat: 发票登记弹窗回显已认领收票单并补齐结算基本信息	2026-11-02 16:13:00 +08:00
刘泉佳	b59e43c9b7	feat: 认领收票单候选弹窗改为分页并悬浮展示推送失败原因	2026-11-02 16:12:52 +08:00
刘泉佳	eae50ab909	feat: 发票登记移至工具栏并回显已认领收票单	2026-11-02 15:39:26 +08:00
b2894lxlx	8e1430491b	✨ 项目提交MK传projectType，并修复已撤回再提交 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 14:28:07 +08:00
b2894lxlx	9fed3785d9	⚡ 流程配置取消默认按当前用户部门筛选 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 13:32:06 +08:00
b2894lxlx	eaf431819e	✨ 客商档案营业执照OCR改接新接口并回填字段 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 13:31:33 +08:00
刘泉佳	c7bd4461e2	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/20261030-kingdee-writeoff-status-web # Conflicts: # src/views/business/contract-manage.vue	2026-11-02 09:54:00 +08:00
刘泉佳	ab7491e6d6	feat: 收票登记表单去税率展示字段	2026-11-02 09:36:41 +08:00
刘泉佳	d78d100824	feat: 全额认领不再校验匹配金额合计上限	2026-10-31 16:52:22 +08:00
刘泉佳	9908b543ea	fix: 项目立项补充getRisk导入修复风险查询未定义	2026-10-31 16:37:01 +08:00
刘泉佳	46e7952e49	feat: 付款结算单选收票单全额认领并新增发票登记推送指定应付	2026-10-31 16:07:12 +08:00
刘泉佳	441d62a874	feat: 收票登记先票后款表单改造（手选结算组织/发票明细区块/去关联结算单）	2026-10-31 16:07:04 +08:00
刘泉佳	1a143aa05b	fix: 合同管理删除hcsRepush重复导入修复构建	2026-10-31 16:07:04 +08:00
刘泉佳	f3d69d7df0	fix: 代码合并报错	2026-10-31 15:38:27 +08:00
刘泉佳	cd58e8ebc7	Merge branch 'feature/20261027-hcs-bif-all-web-recBillSync' into feature/20261031-bfi-收票收款改造-web	2026-10-31 14:18:38 +08:00
刘泉佳	11d33df46a	Merge branch 'master' into feature/20261027-hcs-bif-all-web # Conflicts: # src/views/business/contract-manage.vue	2026-10-31 14:12:05 +08:00
刘泉佳	06de9477e5	feat: 客商收款信息开户行失焦匹配金蝶带出联行号并保存前校验 - 开户行 label 加问号提示，失焦调 A905-3 按行名精确匹配自动回填联行号，未命中提示检查 - 保存前按联行号校验金蝶档案，查不到拦截保存，接口异常提示稍后重试 - 回填后清除联行号字段残留校验提示	2026-10-31 10:16:38 +08:00
刘泉佳	f7ee9273c6	feat: 合同与客商列表客商风险标签统一悬浮显示明细提示	2026-10-30 21:40:04 +08:00
刘泉佳	e0a420ad08	feat: 正式结算单列表新增金蝶冲销状态列 - 列表新增「金蝶冲销状态」单元格插槽：已同步显示已冲销/未冲销/未校验标签，未同步显示 - - 新增 kingdeeWriteOffStatusOptions 选项与 kingdeeWriteOffTagType 颜色映射	2026-10-30 21:23:53 +08:00
刘泉佳	8388904916	fix: 合同列表客商风险列排序调整至签约类型之后	2026-10-30 21:02:27 +08:00
刘泉佳	24fec3c7d7	fix: 客商风险按编号查询透传客商名称	2026-10-30 20:53:41 +08:00
刘泉佳	b76ada9d6c	fix: 修改信用代码时同步清空客商名称下风险提示	2026-10-30 20:53:22 +08:00
刘泉佳	2083754b16	feat: 新增客商填写信用代码后即时回显金蝶供应商编码	2026-10-30 20:41:26 +08:00
刘泉佳	3df09d7d45	feat: 客商页面新增供应商编码展示	2026-10-30 20:34:25 +08:00
刘泉佳	b878bc356e	fix: 付款页风险客商提示改用后端明细去除重复等级黑名单前缀	2026-10-30 20:20:23 +08:00
刘泉佳	d76977c07c	fix: 新增客商档案风险提示按等级与黑名单细分并优先按编号查询	2026-10-30 20:09:57 +08:00
b2894lxlx	d95163663b	✨ immediate-enabled关闭时隐藏项目/合同推送合规入口 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 16:34:45 +08:00
刘泉佳	e95151ad51	feat: 合同列表新增客商风险列并抽取风险标签公共展示方法（客商页复用）	2026-10-30 14:41:49 +08:00
刘泉佳	5351911d50	refactor: 合同侧黑名单状态字段改kingdeeBlackStatus（与后端列名统一）	2026-10-30 14:10:30 +08:00
刘泉佳	e602eecee8	fix: 客商列表黑名单标签判定改为仅金蝶黑名单命中（与后端口径一致）	2026-10-30 13:42:20 +08:00
刘泉佳	70801096dd	feat: 付款/收款结算单查看页面新增同步金蝶按钮，单张推送并提示结果与异常原因	2026-10-30 12:21:16 +08:00
刘泉佳	025cba317d	fix: 修复客商档案清空客商风险后仍按上次条件查询 Avue 搜索事件只回传非空筛选项，被清空的字段不会出现在参数里，与上一次查询条件合并会保留旧值，改为点击查询时整体重建查询条件。	2026-10-30 12:12:57 +08:00
b2894lxlx	5ce91ec5d5	🐛 总单选址弹窗固定label宽度，并兼容运输类型非字符串 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 11:47:51 +08:00
刘泉佳	26140aecb9	refactor: 客商列表风险筛选项改为纯字典加载（customer_risk）去除硬编码兜底	2026-10-30 11:47:37 +08:00
b2894lxlx	8d85311bb3	✨ 司机身份证OCR支持正反面识别并回填有效期 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 11:47:21 +08:00
刘泉佳	8b2fa09cb9	fix: 客商列表风险列加宽至150适配组合文案	2026-10-30 11:46:07 +08:00
刘泉佳	4d78466824	fix: 客商列表风险列黑名单与任意等级组合展示（如低风险、黑名单）	2026-10-30 11:44:55 +08:00
b2894lxlx	fe4255c59b	🐛 修复正式结算旧路径空白，按单号跳转付款/收款列表 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-30 11:40:32 +08:00
刘泉佳	c6c7c80d97	feat: 客商列表风险列内部组织客商默认无风险并组合展示高风险与黑名单	2026-10-30 11:35:46 +08:00
刘泉佳	3397bd6a7b	feat: 客商列表风险列改读落库字段并支持字典筛选与后台明细悬浮展示	2026-10-30 11:33:38 +08:00
b2894lxlx	083d954765	🐛 放开本账号运单复制，并避免总单选地址时提前校验 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 22:44:01 +08:00
刘泉佳	78bb38e955	🐛 收款流水认领额度改用收款金额并新增剩余可认领金额列认领只登记本地，额度由本地累计认领控制，金蝶未匹配金额不再作为上限；批量认领校验复用剩余可认领金额口径。	2026-10-29 20:07:53 +08:00
刘泉佳	4b060fc045	feat: 开票申请查看展示每张发票金蝶开票状态与结果备注	2026-10-29 18:31:35 +08:00
刘泉佳	2cf966d6e3	feat: 开票申请查看展示每张发票金蝶开票状态与结果备注	2026-10-29 18:17:42 +08:00
刘泉佳	d23a9b00de	refactor: 收款流水未匹配金额字段名统一为unmatchAmountRec	2026-10-29 16:13:23 +08:00
刘泉佳	d89fd9db97	feat: 收款流水列表展示匹配与结算金额字段	2026-10-29 16:06:03 +08:00
刘泉佳	94ee14b683	feat: 收款流水列表展示收款人公司与核算组织编码	2026-10-29 15:05:28 +08:00
刘泉佳	a725d3078f	fix: 收款流水详情收款金额显示名称修正	2026-10-29 14:12:55 +08:00
b2894lxlx	185a0f9aec	Merge remote-tracking branch 'websoft/dev'	2026-10-29 14:05:12 +08:00
b2894lxlx	a528788409	🐛 修复总单地址回填、结算费用英文项与项目部门提示常用地址级联回填不再误清空；预结算/正式结算过滤 freightJson 杂项；项目查看态业务部门/平台公司支持悬停完整信息。 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 14:04:55 +08:00
刘泉佳	1957a78c00	fix: 收款流水同步接口超时时间延长到30秒	2026-10-29 12:55:03 +08:00
刘泉佳	acfe9bdd74	feat: 收款流水页面适配A301-1数据源并下线推送金蝶相关交互	2026-10-29 11:20:18 +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
刘泉佳	698f808f0b	fix: 结算行付款金额联动回填申请付款金额并校验合计一致结算信息行改动付款比例或付款金额时，自动把行金额合计回填到上方申请付款金额并重算比例；保存/提交前校验行金额合计与申请付款金额一致，避免推送金蝶金额与预付建档分摊不一致。回显加载走默认不同步，避免改写历史单据。	2026-10-29 02:19:23 +08:00
刘泉佳	ea6ec13ea4	fix: 付款申请拦截已调整结算单并过滤候选列表	2026-10-29 02:15:57 +08:00
weicw	114c2fd2af	🔀 合并主干 master 到 dev	2026-10-29 00:16:39 +08:00
刘泉佳	6119c44394	fix: 金蝶单据状态标签移除 status-text 类恢复颜色展示	2026-10-28 19:04:09 +08:00
刘泉佳	9dab7f7495	fix: 结算列表插槽列被兜底 formatter 覆盖导致状态无颜色与悬浮	2026-10-28 17:27:10 +08:00
刘泉佳	f5697e111a	feat: 结算单与客商档案金蝶状态着色并悬浮展示失败原因	2026-10-28 17:00:34 +08:00
刘泉佳	775307f5c0	feat: 付款与开票申请金蝶单据状态着色并悬浮展示失败原因	2026-10-28 17:00:34 +08:00
刘泉佳	4502881063	feat: 付款申请审批通过前增加确认弹框	2026-10-28 16:11:29 +08:00
刘泉佳	358add743e	fix: 合同变更审批接口超时统一使用APPROVE_TIMEOUT	2026-10-28 14:36:03 +08:00
刘泉佳	f67a4036ed	fix: 项目变更与合同管理审批接口超时统一使用APPROVE_TIMEOUT	2026-10-28 14:16:42 +08:00
b2894lxlx	7ba6620f06	Merge remote-tracking branch 'websoft/dev'	2026-10-27 18:38:25 +08:00
b2894lxlx	9a3652d767	🔧 构建完成后自动打包 dist.zip Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 18:34:11 +08:00
b2894lxlx	450505715a	✨ 新增合同变更菜单列表与MK审批对接 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 18:34:11 +08:00
weicw	9a603a3796	🔀 合并 master 回 dev，追平 HCS/BFI 与项目变更菜单	2026-10-27 17:44:08 +08:00
b2894lxlx	2b51619728	✨ 新增项目变更菜单列表与MK审批对接 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 16:45:38 +08:00
b2894lxlx	5f167aae50	Merge pull request '收票管理/开票管理/正式结算单/预结算单/结算调整通过按钮增加表格遮罩防重复点击' (#7 ) from feature/20261019-bfi-all-web into master Reviewed-on: #7	2026-10-27 15:29:12 +08:00
刘泉佳	0d8eb25253	Merge branch 'master' into feature/20261019-bfi-all-web # Conflicts: # src/views/payment/invoice-application.vue # src/views/payment/invoice-receipt.vue # src/views/payment/payment-application.vue # src/views/settlement/formal-settlement.vue # src/views/settlement/pre-settlement.vue	2026-10-27 15:03:17 +08:00
weicw	e53852b05f	⚡ 后台小程序用户列表不再提供删除入口 - 移除工具条「批量删除」与行内「删除」两个入口 - 一并删除 handleDelete / rowDel 与 permissionList.delBtn，不留无入口的死方法 - 删除是逻辑删除，且手机号唯一键不排除已删行，删过的手机号既登录不了也注册不了；终止访问改用「停用」 - 保留 api/system/mpUser.js 的 remove 封装与后端 /mp-user/remove 接口，本次只隐藏入口 - 保留表格多选列，批量「密码重置」仍依赖勾选	2026-10-27 11:12:21 +08:00
weicw	8d3e87d710	⚡ 移除新增配载管理页面的配载条件说明文案	2026-10-27 10:56:22 +08:00
weicw	c7b07f0c95	💄 运单管理待回单确认的操作文案改为完成	2026-10-27 08:17:52 +08:00
weicw	59199397e0	🔀 合并票 03 前端：后台 openid 改为只读	2026-10-26 14:53:42 +08:00
weicw	70d49d022b	💄 后台小程序用户 openid 改为只读展示	2026-10-26 14:53:11 +08:00
weicw	7d16660bfc	🔀 合并主干 master 到 dev	2026-10-26 14:18:43 +08:00
刘泉佳	eb32a275f3	Merge remote-tracking branch 'origin/master' into feature/20261019-bfi-all-web # Conflicts: # src/views/settlement/formal-settlement.vue	2026-10-21 16:15:04 +08:00
刘泉佳	9150213b0f	feat: 新增客商查询金蝶后回显客商编码	2026-10-21 15:49:44 +08:00
刘泉佳	4e8163dd18	feat: 开票申请选单放开未收票过滤并展示已申请/可开票金额 - 选单弹窗新增已申请开票金额列，分摊发票金额改为只读展示后端自动分摊结果 - 选单后分摊金额默认归零，由后端保存时按本次开票金额自动分摊	2026-10-19 23:30:18 +08:00
刘泉佳	89bbc43f12	feat: 汇票付款审批通过增加确认弹窗与表格遮罩防重复点击	2026-10-19 20:08:51 +08:00
刘泉佳	4199318aa9	fix: 收票管理/开票管理/正式结算单/预结算单/结算调整通过按钮增加表格遮罩防重复点击	2026-10-19 20:08:37 +08:00
刘泉佳	555189177c	fix: 付款管理审批通过改为表格遮罩防重复点击	2026-10-19 19:55:24 +08:00