Compare commits

...

20 Commits

Author SHA1 Message Date
weicw 799a87641e ✨ 合同管理搜索表单新增客商筛选,合同名称移到最后,生效类型改为合同状态 2026-11-03 21:16:00 +08:00
weicw 28baa69e8f 🐛 装货管理与运输计划货物信息列统一为仅一种货物时不显示等N种货物 2026-11-03 19:41:25 +08:00
weicw 4ed80268b4 🐛 运单管理货物信息列仅一种货物时不显示等N种货物 2026-11-03 19:37:23 +08:00
weicw 30c59c2acb 🔀 合并主干 master 到 dev 2026-11-03 19:30:03 +08:00
b2894lxlx 8388a55481 ✨ 新增业务部门配置页并简化项目/合同部门选择
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 21:10:47 +08:00
weicw 39560bde79 ✨ 过程配置新增装货端/卸货端节点与货量类型校验 2026-11-02 15:22:42 +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
b2894lxlx d95163663b ✨ immediate-enabled关闭时隐藏项目/合同推送合规入口
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-30 16:34:45 +08:00
b2894lxlx 5ce91ec5d5 🐛 总单选址弹窗固定label宽度,并兼容运输类型非字符串
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-30 11:47:51 +08:00
b2894lxlx 8d85311bb3 ✨ 司机身份证OCR支持正反面识别并回填有效期
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-30 11:47:21 +08:00
b2894lxlx fe4255c59b 🐛 修复正式结算旧路径空白,按单号跳转付款/收款列表
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-30 11:40:32 +08:00
b2894lxlx 083d954765 🐛 放开本账号运单复制,并避免总单选地址时提前校验
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-29 22:44:01 +08:00
b2894lxlx 185a0f9aec Merge remote-tracking branch 'websoft/dev' 2026-10-29 14:05:12 +08:00
b2894lxlx a528788409 🐛 修复总单地址回填、结算费用英文项与项目部门提示
常用地址级联回填不再误清空;预结算/正式结算过滤 freightJson 杂项;项目查看态业务部门/平台公司支持悬停完整信息。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-29 14:04:55 +08:00
weicw 72471f48de 🔧 类型检查改用 jsconfig 并锁定 TypeScript 5.9,恢复 vue-tsc 可用 2026-10-29 09:45:31 +08:00
weicw 415e1fd58d ✨ 维修记录列表展示关联运单与关联异常 2026-10-29 08:58:21 +08:00
weicw 114c2fd2af 🔀 合并主干 master 到 dev 2026-10-29 00:16:39 +08:00
weicw 9a603a3796 🔀 合并 master 回 dev,追平 HCS/BFI 与项目变更菜单 2026-10-27 17:44:08 +08:00
32 changed files with 1984 additions and 839 deletions
+2 -2
View File
@@ -8,7 +8,7 @@
"build:prod": "vite build --mode production && node scripts/zip-dist.mjs",
"zip:dist": "node scripts/zip-dist.mjs",
"serve": "vite preview --host",
"typecheck": "vue-tsc --noEmit"
"typecheck": "vue-tsc -p jsconfig.json --noEmit"
},
"dependencies": {
"@element-plus/icons-vue": "^2.3.1",
@@ -49,7 +49,7 @@
"prettier": "^2.8.7",
"sass": "^1.85.1",
"terser": "^5.31.1",
"typescript": "^7.0.2",
"typescript": "5.9.3",
"unplugin-auto-import": "^0.11.2",
"vite": "^5.4.19",
"vite-plugin-compression": "^0.5.1",
+94 -295
View File
@@ -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: {}
+3 -3
View File
@@ -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 },
});
+37
View File
@@ -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({
+42
View File
@@ -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 },
});
+1
View File
@@ -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({
+1 -2
View File
@@ -176,12 +176,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',
},
});
};
+41 -22
View File
@@ -65,10 +65,12 @@ export const config = {
['contractName', '合同名称'],
['projectName', '所属项目'],
['organizationName', '合同负责部门'],
['platformCompanyName', '平台公司'],
['contractCategory', '合同类别'],
['signType', '签约类型'],
['partyA', '甲方'],
['partyB', '乙方'],
['partyC', '丙方'],
['handlerUserName', '经办人'],
['signDate', '签订日期'],
['applyDate', '申请日期'],
@@ -247,11 +249,22 @@ export const option = createCrudOption([
hide: true,
labelWidth: 0,
},
{
label: '客商',
prop: 'partyName',
search: true,
searchOrder: 14,
searchPlaceholder: '请输入甲/乙方名称',
hide: true,
display: false,
addDisplay: false,
editDisplay: false,
},
{
label: '合同编号',
prop: 'contractNo',
search: true,
searchOrder: 6,
searchOrder: 8,
searchPlaceholder: '请输入',
order: 185,
maxlength: 100,
@@ -264,7 +277,7 @@ export const option = createCrudOption([
align: 'left',
headerAlign: 'left',
search: true,
searchOrder: 7,
searchOrder: 1,
searchPlaceholder: '请输入',
order: 180,
slot: true,
@@ -276,7 +289,7 @@ export const option = createCrudOption([
label: '所属项目',
prop: 'projectName',
search: true,
searchOrder: 8,
searchOrder: 11,
searchType: 'select',
searchPlaceholder: '请选择',
formslot: true,
@@ -311,12 +324,19 @@ export const option = createCrudOption([
minWidth: 150,
rules: selectRule('合同负责部门'),
},
{
label: '平台公司',
prop: 'platformCompanyName',
minWidth: 180,
order: 115,
display: false,
},
{
label: '合同类别',
prop: 'contractCategory',
type: 'select',
search: true,
searchOrder: 9,
searchOrder: 12,
searchPlaceholder: '请选择',
order: 170,
dicData: contractCategoryOptions,
@@ -328,7 +348,7 @@ export const option = createCrudOption([
prop: 'signType',
type: 'select',
search: true,
searchOrder: 10,
searchOrder: 13,
searchPlaceholder: '请选择',
span: 8,
order: 190,
@@ -337,11 +357,11 @@ export const option = createCrudOption([
rules: selectRule('签约类型'),
},
{
label: '生效类型',
label: '合同状态',
prop: 'effectiveType',
type: 'select',
search: true,
searchOrder: 5,
searchOrder: 6,
searchPlaceholder: '请选择',
dicData: effectiveTypeOptions,
hide: true,
@@ -350,24 +370,23 @@ export const option = createCrudOption([
{
label: '甲方',
prop: 'partyA',
type: 'select',
formslot: true,
disabled: true,
order: 160,
filterable: true,
minWidth: 160,
rules: selectRule('甲方'),
addDisplay: false,
editDisplay: false,
},
{
label: '乙方',
prop: 'partyB',
type: 'select',
formslot: true,
disabled: true,
order: 150,
filterable: true,
minWidth: 160,
rules: selectRule('乙方'),
addDisplay: false,
editDisplay: false,
},
{
label: '丙方',
prop: 'partyC',
minWidth: 160,
addDisplay: false,
editDisplay: false,
},
{
label: '合同期限',
@@ -613,7 +632,7 @@ export const option = createCrudOption([
prop: 'hcsSyncStatus',
type: 'select',
search: true,
searchOrder: 6,
searchOrder: 7,
searchPlaceholder: '请选择',
slot: true,
dicData: hcsSyncStatusOptions,
@@ -634,7 +653,7 @@ export const option = createCrudOption([
type: 'select',
search: true,
searchPlaceholder: '请选择',
searchOrder: 7,
searchOrder: 9,
dicData: yesNoOptions,
hide: true,
addDisplay: false,
@@ -646,7 +665,7 @@ export const option = createCrudOption([
type: 'select',
search: true,
searchPlaceholder: '请选择',
searchOrder: 8,
searchOrder: 10,
dicData: yesNoOptions,
hide: true,
addDisplay: false,
+2 -1
View File
@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
const text = Object.entries(groups)
.map(([unit, group]) => {
const quantity = formatGoodsQuantity(group.quantity);
return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
})
.join('; ');
+16
View File
@@ -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,
+8 -2
View File
@@ -154,6 +154,7 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
* @param {string} [options.subjectName] 标题后缀
* @param {string} [options.approvalStatus] 提交前的审批状态
* @param {boolean} [options.mkEnabled] 调用方已知开关时传入,false 时立即跳过
* @param {Object} [options.tempVarData] 传给 MK 的临时变量(如项目类型 projectType)
* @returns {Promise<boolean>} true=已发起/复用 MK 流程,false=未开启或已跳过
*/
export async function submitMkApprovalFlow({
@@ -162,6 +163,7 @@ export async function submitMkApprovalFlow({
subjectName = '',
approvalStatus = '',
mkEnabled,
tempVarData,
} = {}) {
const conf = MK_BIZ[bizType];
if (!conf) {
@@ -202,12 +204,16 @@ export async function submitMkApprovalFlow({
const subject = subjectName
? `${conf.subjectPrefix}:${subjectName}`
: `${conf.subjectPrefix}:${bizIdText}`;
await processSubmit({
const submitPayload = {
templateCode,
bizId: bizIdText,
subject,
bizType,
forceNewFormInstance,
});
};
if (tempVarData != null && typeof tempVarData === 'object') {
submitPayload.tempVarData = tempVarData;
}
await processSubmit(submitPayload);
return true;
}
+19 -1
View File
@@ -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) {
@@ -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 || ''}`;
@@ -3949,9 +3949,9 @@ export default {
return Object.values(groups)
.map(group => {
const quantity = this.formatDispatchQuantity(group.quantity);
return `${group.typeName}等${group.count}种货物 | ${quantity}${
group.unit ? ` ${group.unit}` : ''
}`;
const typeName =
group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
})
.join('; ');
},
@@ -7549,12 +7549,13 @@ export default {
}, {});
const cargoInfo = Object.values(groups)
.map(
group =>
`${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
group.quantity
)}${group.unit ? ` ${group.unit}` : ''}`
)
.map(group => {
const typeName =
group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
group.unit ? ` ${group.unit}` : ''
}`;
})
.join('; ');
return cargoInfo || plan.goodsInfo || '';
},
@@ -5013,9 +5013,9 @@ export default {
return Object.values(groups)
.map(group => {
const quantity = this.formatQuantity(group.quantity);
return `${group.typeName}等${group.count}种货物 | ${quantity}${
group.unit ? ` ${group.unit}` : ''
}`;
const typeName =
group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
})
.join('; ');
},
@@ -5116,11 +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) {
+587 -89
View File
@@ -33,6 +33,7 @@
批量导出
</el-button>
<el-button
v-if="hcsImmediateEnabled"
type="warning"
plain
:loading="hcsRepushingId === 'batch'"
@@ -112,7 +113,11 @@
>
{{ operation.label }}
</el-link>
<el-link v-if="canHcsRepush(row)" type="warning" @click="handleHcsRepush(row)">
<el-link
v-if="hcsImmediateEnabled && canHcsRepush(row)"
type="warning"
@click="handleHcsRepush(row)"
>
{{ hcsRepushingId === row.id ? '推送中…' : '推送合规' }}
</el-link>
<el-link v-if="canDelete(row)" type="danger" @click="removeRow(row)">删除</el-link>
@@ -150,10 +155,14 @@
}}</el-descriptions-item>
<el-descriptions-item label="甲方">{{ detailValue('partyA') }}</el-descriptions-item>
<el-descriptions-item label="乙方">{{ detailValue('partyB') }}</el-descriptions-item>
<el-descriptions-item label="丙方">{{ detailValue('partyC') || '-' }}</el-descriptions-item>
<el-descriptions-item label="合同期限">{{ detailContractPeriod }}</el-descriptions-item>
<el-descriptions-item label="合同负责部门">{{
detailValue('organizationName')
}}</el-descriptions-item>
<el-descriptions-item label="平台公司">{{
detailValue('platformCompanyName')
}}</el-descriptions-item>
<el-descriptions-item label="经办人">{{
detailValue('handlerUserName')
}}</el-descriptions-item>
@@ -419,7 +428,9 @@
maxlength="100"
clearable
:placeholder="
formMode === 'add' ? '不填写则按部门规则自动生成' : '请输入合同编号'
formMode === 'add'
? '不填写则按照部门规则自动生成'
: '请输入合同编号'
"
@input="handleContractNoInput"
/>
@@ -461,49 +472,37 @@
</el-select>
</el-form-item>
<el-form-item label="合同负责部门" prop="organizationName">
<el-cascader
v-model="organizationCascaderValue"
:options="organizationOptions"
:props="organizationCascaderProps"
placeholder="请选择"
clearable
filterable
@visible-change="visible => visible && loadOrganizationOptions()"
/>
</el-form-item>
<el-form-item label="甲方" prop="partyA">
<el-select
v-model="form.partyA"
placeholder="请选择甲方"
v-model="selectedOrganizationId"
placeholder="请选择"
filterable
clearable
:loading="contractPartyLoading"
@visible-change="visible => visible && loadContractPartyOptions()"
@change="queryPartyRisk('partyA')"
:loading="businessDeptLoading"
@visible-change="visible => visible && loadBusinessDeptOptions()"
@change="handleOrganizationChange"
>
<el-option
v-for="item in contractPartyAOptions"
:key="item.value"
v-for="item in businessDeptOptions"
:key="item.id"
:label="item.label"
:value="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="乙方" prop="partyB">
<el-form-item label="平台公司" prop="platformCompanyName">
<el-select
v-model="form.partyB"
placeholder="请选择乙方"
v-model="form.platformCompanyId"
placeholder="请选择平台公司"
filterable
clearable
:loading="contractPartyLoading"
@visible-change="visible => visible && loadContractPartyOptions()"
@change="queryPartyRisk('partyB')"
:disabled="!form.projectId"
@change="handlePlatformCompanyChange"
>
<el-option
v-for="item in contractPartyBOptions"
:key="item.value"
v-for="item in platformCompanyOptions"
:key="item.id"
:label="item.label"
:value="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
@@ -659,6 +658,81 @@
</div>
</section>
<section
v-for="party in partySections"
:key="party.role"
class="contract-manage-form__section contract-manage-form__section--panel"
>
<div class="contract-manage-form__party-head">
<div class="dialog-section-title">{{ party.label }}</div>
<el-button type="primary" @click="addPartyRow(party.role)">添加</el-button>
</div>
<el-table :data="party.rows" border>
<el-table-column type="index" label="序号" width="70" align="center" />
<el-table-column label="客商名称" min-width="200" align="center">
<template #default="{ row }">
<el-select
v-model="row.customerId"
filterable
clearable
placeholder="请选择客商"
:loading="contractPartyLoading"
@visible-change="visible => visible && loadContractPartyOptions()"
@change="value => handlePartyCustomerChange(party.role, row, value)"
>
<el-option
v-for="item in contractPartyOptions"
:key="item.id"
:label="item.label"
:value="item.id"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="统一信用代码" min-width="180" align="center">
<template #default="{ row }">
<el-input v-model="row.creditCode" disabled placeholder="选择客商后带出" />
</template>
</el-table-column>
<el-table-column label="联系人" min-width="160" align="center">
<template #default="{ row }">
<el-select
v-model="row.contactId"
filterable
clearable
placeholder="请选择联系人"
:loading="!!row.contactLoading"
@visible-change="visible => visible && ensurePartyContacts(row)"
@change="value => handlePartyContactChange(row, value)"
>
<el-option
v-for="item in row.contactOptions || []"
:key="item.id"
:label="item.label"
:value="item.id"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="联系电话" min-width="150" align="center">
<template #default="{ row }">
<el-input v-model="row.contactPhone" disabled placeholder="选择联系人后带出" />
</template>
</el-table-column>
<el-table-column label="操作" width="100" align="center" fixed="right">
<template #default="{ $index }">
<el-link
type="danger"
:disabled="!canRemovePartyRow(party.role)"
@click="removePartyRow(party.role, $index)"
>
删除
</el-link>
</template>
</el-table-column>
</el-table>
</section>
<contract-attachment-section
title="用印材料"
description
@@ -694,8 +768,13 @@
</div>
<el-table :data="billingPlanRows" border>
<el-table-column type="index" label="序号" width="80" align="center" />
<el-table-column prop="planName" label="方案名称" min-width="220" align="center" />
<el-table-column label="运输方式" min-width="180" align="center">
<el-table-column prop="planName" label="方案名称" min-width="180" align="center" />
<el-table-column label="适用客商" min-width="180" align="center">
<template #default="{ row }">{{
row.customerName || billingPlanCustomerLabel(row) || '-'
}}</template>
</el-table-column>
<el-table-column label="运输方式" min-width="160" align="center">
<template #default="{ row }">{{
row.transportModeLabel || row.transportMode || '-'
}}</template>
@@ -998,6 +1077,7 @@
:value="billingPlanForm"
:index="billingPlanIndex"
:settlement-currency="form.settlementCurrency"
:party-options="billingPartyOptions"
@save="saveBillingPlan"
/>
@@ -1090,12 +1170,20 @@ import 'nprogress/nprogress.css';
import { exportBlob } from '@/api/common';
import * as api from '@/api/business/contract-manage';
import { createFromContract } from '@/api/business/contract-change';
import { repush as hcsRepush, repushBatch as hcsRepushBatch, getRisk } 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 getProjectList } from '@/api/business/project-apply';
import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
import { getDeptTree } from '@/api/system/dept';
import {
getDetail as getCustomerArchiveDetail,
getList as getCustomerArchiveList,
} from '@/api/vehicle/customer-archive';
import { getBusinessDeptSelect, getDeptTree } from '@/api/system/dept';
import { getDictionary as getSystemDictionary } from '@/api/system/dict';
import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
import { config, option } from '@/option/business/contract-manage';
@@ -1185,10 +1273,16 @@ const defaultForm = () => ({
projectName: '',
organizationId: '',
organizationName: '',
platformCompanyId: '',
platformCompanyName: '',
signType: '',
settlementMode: '',
partyA: '',
partyB: '',
partyC: '',
partyAJson: '',
partyBJson: '',
partyCJson: '',
handlerUserName: '',
signDate: '',
applyDate: '',
@@ -1233,6 +1327,9 @@ const createCopiedDetail = (detail = {}) => {
contractFileJson: stripSpecAttachments(detail.contractFileJson),
attachmentsJson: stripSpecAttachments(detail.attachmentsJson),
billingPlanJson: detail.billingPlanJson || '',
partyAJson: detail.partyAJson || '',
partyBJson: detail.partyBJson || '',
partyCJson: detail.partyCJson || '',
paymentRatioJson: detail.paymentRatioJson || '',
settlementRuleJson: detail.settlementRuleJson || '',
preSettlementConfigJson: detail.preSettlementConfigJson || '',
@@ -1240,6 +1337,35 @@ const createCopiedDetail = (detail = {}) => {
changeRecordJson: '',
};
};
const createPartyRow = (row = {}) => ({
id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
customerId: row.customerId || '',
customerName: row.customerName || '',
creditCode: row.creditCode || row.unifiedCreditCode || '',
contactId: row.contactId || '',
contactName: row.contactName || '',
contactPhone: row.contactPhone || '',
contactOptions: row.contactOptions || [],
contactLoading: false,
});
const serializePartyRows = rows =>
JSON.stringify(
(rows || []).map(row => ({
id: row.id,
customerId: row.customerId || null,
customerName: row.customerName || '',
creditCode: row.creditCode || '',
contactId: row.contactId || null,
contactName: row.contactName || '',
contactPhone: row.contactPhone || '',
}))
);
const partyRoleLabel = role => {
if (role === 'A') return '甲方';
if (role === 'B') return '乙方';
if (role === 'C') return '丙方';
return role || '';
};
const parseArray = value => {
if (Array.isArray(value)) return value;
if (!value) return [];
@@ -1340,8 +1466,7 @@ export default {
settlementCurrency: [{ required: true, message: '请选择结算币种', trigger: 'change' }],
projectName: [{ required: true, message: '请选择所属项目', trigger: 'change' }],
organizationName: [{ required: true, message: '请选择合同负责部门', trigger: 'change' }],
partyA: [{ required: true, message: '请选择甲方', trigger: 'change' }],
partyB: [{ required: true, message: '请选择乙方', trigger: 'change' }],
platformCompanyName: [{ required: true, message: '请选择平台公司', trigger: 'change' }],
signDate: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
settlementMode: [{ required: true, message: '请选择结算方式', trigger: 'change' }],
contractFormat: [{ required: true, message: '请选择合同格式', trigger: 'change' }],
@@ -1384,9 +1509,11 @@ export default {
settlementModeDictOptions: [],
contractFormatDictOptions: [],
contractCategoryDictOptions: [],
contractPartyAOptions: [],
contractPartyBOptions: [],
// 合规客商风险(C101-1 展示用):甲方/乙方选择后即时查询
contractPartyOptions: [],
partyARows: [createPartyRow()],
partyBRows: [createPartyRow()],
partyCRows: [],
// 合规客商风险(C101-1 展示用):客商选择后即时查询
contractPartyCodeMap: {},
partyRisk: {},
contractPartyLoading: false,
@@ -1395,6 +1522,9 @@ export default {
organizationFlatOptions: [],
selectedOrganizationId: '',
organizationLoading: false,
businessDeptOptions: [],
businessDeptLoading: false,
platformCompanyOptions: [],
contractFileRows: [],
attachmentRows: [],
listUploadContractFileRows: [],
@@ -1427,8 +1557,9 @@ export default {
billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
detailLoading: false,
detailRow: {},
// 合规(HCS)推送/对账状态
// 合规(HCS)推送/对账状态;受 thirdParty.hcs.push.immediate-enabled 控制显隐
hcsRepushingId: null,
hcsImmediateEnabled: false,
detailContractFileRows: [],
detailAttachmentRows: [],
detailBillingPlanRows: [],
@@ -1547,6 +1678,29 @@ export default {
? this.contractFormatDictOptions
: this.columnOptions('contractFormat');
},
partySections() {
return [
{ role: 'A', label: '甲方', rows: this.partyARows },
{ role: 'B', label: '乙方', rows: this.partyBRows },
{ role: 'C', label: '丙方', rows: this.partyCRows },
];
},
billingPartyOptions() {
return [
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
]
.filter(row => row.customerName || row.customerId)
.map(row => ({
value: row.id,
label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
partyRole: row.partyRole,
partyRowId: row.id,
customerId: row.customerId,
customerName: row.customerName,
}));
},
organizationCascaderProps() {
return {
label: 'label',
@@ -1608,14 +1762,10 @@ export default {
// 高风险/黑名单客商签约提示(C101-1,签约前提示;强制拦截在后端提交校验与推送链路)
partyRiskText() {
const parts = [];
['partyA', 'partyB'].forEach(prop => {
const risk = this.partyRisk[prop];
Object.keys(this.partyRisk || {}).forEach(key => {
const risk = this.partyRisk[key];
if (!risk?.risky) return;
// riskTip 由后端按风险项拼装(【公司名称】:黑名单;涉诉;被执行人等),缺失时兜底通用提示
parts.push(
risk.riskTip ||
`${prop === 'partyA' ? '甲方' : '乙方'}[${this.form[prop] || ''}]为高风险/黑名单客商`
);
parts.push(risk.riskTip || `[${risk.customerName || key}]为高风险/黑名单客商`);
});
if (!parts.length) return '';
return `${parts.join(';')},按集团规定不可直接签约,提交前须上传「特批附件」类型附件,审批通过后将自动发起合同特批`;
@@ -1699,6 +1849,13 @@ export default {
.catch(() => {
this.mkEnabled = false;
});
loadHcsImmediateEnabled()
.then(enabled => {
this.hcsImmediateEnabled = !!enabled;
})
.catch(() => {
this.hcsImmediateEnabled = false;
});
}
if (this.isFormPage) this.initFormPage();
if (this.isDetailPage) this.initDetailPage();
@@ -1761,6 +1918,7 @@ export default {
},
canHcsRepush(row) {
return (
this.hcsImmediateEnabled &&
['approved', 'change_approved'].includes(row.approvalStatus) &&
row.hcsSyncStatus !== 'synced'
);
@@ -1950,6 +2108,8 @@ export default {
},
initFormPage() {
this.resetFormState();
this.loadBusinessDeptOptions();
this.loadProjectOptions();
if (this.formMode === 'add') {
const copyId = this.$route.query.copyId;
if (copyId) {
@@ -1972,8 +2132,12 @@ export default {
};
this.selectedProjectId = '';
this.selectedOrganizationId = '';
this.contractPartyAOptions = [];
this.contractPartyBOptions = [];
this.platformCompanyOptions = [];
this.contractPartyOptions = [];
this.partyARows = [createPartyRow()];
this.partyBRows = [createPartyRow()];
this.partyCRows = [];
this.partyRisk = {};
this.contractFileRows = [];
this.attachmentRows = [];
this.billingPlanRows = [];
@@ -2002,9 +2166,30 @@ export default {
detail.feeGenerationMode || (Number(detail.billingEnabled) === 0 ? 'manual' : 'system'),
};
this.selectedProjectId = projectId;
this.selectedOrganizationId = detail.organizationId || '';
this.selectedOrganizationId = detail.organizationId ? String(detail.organizationId) : '';
this.form.platformCompanyId = detail.platformCompanyId
? String(detail.platformCompanyId)
: '';
this.form.platformCompanyName = detail.platformCompanyName || '';
this.loadBusinessDeptOptions();
const syncPlatform = () => {
const project = this.projectOptions.find(item => String(item.id) === String(projectId));
if (project) {
this.applyProjectPlatformCompanies(project, false);
} else {
this.syncCurrentPlatformCompanyOption();
}
};
if (!this.projectOptions.length && projectId) {
this.loadProjectOptions().then(syncPlatform);
} else {
syncPlatform();
}
this.contractFileRows = normalizeContractFileRows(parseArray(detail.contractFileJson));
this.attachmentRows = parseArray(detail.attachmentsJson);
this.partyARows = this.normalizePartyRows(detail.partyAJson, detail.partyA, true);
this.partyBRows = this.normalizePartyRows(detail.partyBJson, detail.partyB, true);
this.partyCRows = this.normalizePartyRows(detail.partyCJson, detail.partyC, false);
this.billingPlanRows = parseArray(detail.billingPlanJson);
this.paymentRatioRows = parseArray(detail.paymentRatioJson);
this.changeRecordRows = parseArray(detail.changeRecordJson);
@@ -2061,8 +2246,7 @@ export default {
['contractCategory', '合同类型'],
['projectName', '所属项目'],
['organizationName', '合同负责部门'],
['partyA', '甲方'],
['partyB', '乙方'],
['platformCompanyName', '平台公司'],
['contractAmount', '合同金额'],
];
const empty = required.find(([prop]) => {
@@ -2081,6 +2265,8 @@ export default {
this.$message.warning('合同金额不能小于0');
return false;
}
if (!this.validatePartyRows(true)) return false;
if (!this.validateBillingPlanBindings()) return false;
return true;
}
if (!this.form.contractName?.trim()) {
@@ -2104,8 +2290,7 @@ export default {
const required = [
['projectName', '所属项目'],
['organizationName', '合同负责部门'],
['partyA', '甲方'],
['partyB', '乙方'],
['platformCompanyName', '平台公司'],
['startDate', '合同开始日期'],
['endDate', '合同结束日期'],
['signDate', '签订日期'],
@@ -2127,7 +2312,9 @@ export default {
this.$message.warning('合同金额不能小于0');
return false;
}
if (!this.validatePartyRows(true)) return false;
return (
this.validateBillingPlanBindings() &&
this.validateBillingPlanDefault() &&
this.validateSettlementRules() &&
this.validatePaymentRatios()
@@ -2137,11 +2324,29 @@ export default {
this.syncSettlementConfig();
const projectId = normalizeProjectValue(this.form.projectId);
const projectName = projectId ? normalizeProjectValue(this.form.projectName) : '';
const partyAJson = serializePartyRows(this.partyARows);
const partyBJson = serializePartyRows(this.partyBRows);
const partyCJson = this.partyCRows.length ? serializePartyRows(this.partyCRows) : '';
return {
...this.form,
contractNo: String(this.form.contractNo || '').trim(),
projectId,
projectName,
partyAJson,
partyBJson,
partyCJson,
partyA: this.partyARows
.map(row => row.customerName)
.filter(Boolean)
.join('、'),
partyB: this.partyBRows
.map(row => row.customerName)
.filter(Boolean)
.join('、'),
partyC: this.partyCRows
.map(row => row.customerName)
.filter(Boolean)
.join('、'),
copyCount: normalizeOptionalInteger(this.form.copyCount),
invoiceCycle: normalizeOptionalInteger(this.form.invoiceCycle),
paymentDays: normalizeOptionalInteger(this.form.paymentDays),
@@ -2327,12 +2532,15 @@ export default {
}
},
loadProjectOptions() {
if (this.projectLoading) return;
if (this.projectLoading) {
return Promise.resolve(this.projectOptions);
}
this.projectLoading = true;
getProjectList(1, 9999, this.config.projectQueryParams || {})
return getProjectList(1, 9999, this.config.projectQueryParams || {})
.then(res => {
this.projectOptions = extractRecords(res);
this.syncCurrentProjectOption();
return this.projectOptions;
})
.finally(() => {
this.projectLoading = false;
@@ -2394,7 +2602,15 @@ export default {
handleProjectChange(projectId) {
const project = this.projectOptions.find(item => String(item.id) === String(projectId));
if (!project) {
Object.assign(this.form, { projectId: '', projectName: '', settlementMode: '' });
Object.assign(this.form, {
projectId: '',
projectName: '',
settlementMode: '',
platformCompanyId: '',
platformCompanyName: '',
});
this.platformCompanyOptions = [];
if (this.formMode === 'add') this.refreshPreviewContractNo();
return;
}
Object.assign(this.form, {
@@ -2402,6 +2618,71 @@ export default {
projectName: project.projectName || '',
settlementMode: project.settlementMode || this.form.settlementMode || '',
});
this.applyProjectPlatformCompanies(project, true);
},
parseUndertakeDeptIds(value) {
if (Array.isArray(value)) {
return value.map(item => String(item || '').trim()).filter(Boolean);
}
return String(value || '')
.split(',')
.map(item => item.trim())
.filter(Boolean);
},
parseUndertakeDeptNames(value) {
if (Array.isArray(value)) {
return value.map(item => String(item || '').trim()).filter(Boolean);
}
return String(value || '')
.split(/[、,,]/)
.map(item => item.trim())
.filter(Boolean);
},
applyProjectPlatformCompanies(project, autoSelect = false) {
const ids = this.parseUndertakeDeptIds(project?.undertakeDeptId);
const names = this.parseUndertakeDeptNames(project?.undertakeDeptName);
this.platformCompanyOptions = ids.map((id, index) => ({
id: String(id),
label: names[index] || String(id),
}));
if (!autoSelect) {
this.syncCurrentPlatformCompanyOption();
return;
}
if (this.platformCompanyOptions.length === 1) {
this.form.platformCompanyId = this.platformCompanyOptions[0].id;
this.form.platformCompanyName = this.platformCompanyOptions[0].label;
} else if (
!this.platformCompanyOptions.some(
item => String(item.id) === String(this.form.platformCompanyId)
)
) {
this.form.platformCompanyId = '';
this.form.platformCompanyName = '';
} else {
this.handlePlatformCompanyChange(this.form.platformCompanyId);
}
if (this.formMode === 'add') this.refreshPreviewContractNo();
},
handlePlatformCompanyChange(value) {
const matched = this.platformCompanyOptions.find(item => String(item.id) === String(value));
this.form.platformCompanyId = matched ? matched.id : '';
this.form.platformCompanyName = matched ? matched.label : '';
if (this.formMode === 'add') this.refreshPreviewContractNo();
},
syncCurrentPlatformCompanyOption() {
if (!this.form.platformCompanyId || !this.form.platformCompanyName) return;
if (
this.platformCompanyOptions.some(
item => String(item.id) === String(this.form.platformCompanyId)
)
) {
return;
}
this.platformCompanyOptions.unshift({
id: String(this.form.platformCompanyId),
label: this.form.platformCompanyName,
});
},
loadContractPartyOptions() {
if (this.contractPartyLoading) return;
@@ -2415,42 +2696,170 @@ export default {
.then(responses => {
if (requestId !== this.contractPartyRequestId) return;
const records = responses.flatMap(extractRecords);
// 名称→客商编码映射,供 C101-1 风险查询使用(§9-U6 编码体系联调确认)
const codeMap = {};
const options = [];
const optionIds = new Set();
records.forEach(item => {
const id = item.id;
if (!id || optionIds.has(String(id))) return;
optionIds.add(String(id));
const label = String(
item.fullName || item.shortName || item.customerName || item.customerCode || ''
).trim();
if (!label) return;
const code = item.customerCode;
if (!code) return;
[item.fullName, item.shortName, item.customerName]
.map(name => String(name || '').trim())
.filter(Boolean)
.forEach(name => {
codeMap[name] = code;
});
if (code) {
[item.fullName, item.shortName, item.customerName, label]
.map(name => String(name || '').trim())
.filter(Boolean)
.forEach(name => {
codeMap[name] = code;
});
codeMap[String(id)] = code;
}
options.push({
id,
label,
value: id,
customerName: label,
creditCode: item.unifiedCreditCode || '',
customerCode: code || '',
});
});
this.contractPartyCodeMap = codeMap;
const names = records
.map(item => item.fullName || item.shortName || item.customerName || item.customerCode)
.map(name => String(name || '').trim())
.filter(Boolean);
[this.form.partyA, this.form.partyB].filter(Boolean).forEach(name => names.unshift(name));
const options = [...new Set(names)].map(name => ({ label: name, value: name }));
this.contractPartyAOptions = options;
this.contractPartyBOptions = options;
// 复制/编辑回填的甲乙方不会触发下拉 change,加载选项后主动查一次 C101-1 风险
['partyA', 'partyB'].forEach(prop => {
if (this.form[prop]) this.queryPartyRisk(prop);
this.contractPartyOptions = options;
this.syncPartyRowsWithOptions();
[...this.partyARows, ...this.partyBRows, ...this.partyCRows].forEach(row => {
if (row.customerId || row.customerName) this.queryPartyRiskByRow(row);
});
})
.finally(() => {
if (requestId === this.contractPartyRequestId) this.contractPartyLoading = false;
});
},
// C101-1 客商风险查询(展示用,强校验在后端提交/推送链路):失败静默不阻塞填写
queryPartyRisk(prop) {
const name = this.form[prop];
const code = name ? this.contractPartyCodeMap[name] : null;
syncPartyRowsWithOptions() {
const fill = rows => {
rows.forEach(row => {
if (row.customerId) {
const matched = this.contractPartyOptions.find(
item => String(item.id) === String(row.customerId)
);
if (matched) {
row.customerName = matched.customerName;
row.creditCode = matched.creditCode || row.creditCode || '';
return;
}
}
if (row.customerName) {
const matched = this.contractPartyOptions.find(
item => item.customerName === row.customerName
);
if (matched) {
row.customerId = matched.id;
row.creditCode = matched.creditCode || row.creditCode || '';
}
}
});
};
fill(this.partyARows);
fill(this.partyBRows);
fill(this.partyCRows);
},
normalizePartyRows(partyJson, fallbackName, requireOne) {
const rows = parseArray(partyJson).map(item => createPartyRow(item));
if (rows.length) return rows;
if (fallbackName) {
return String(fallbackName)
.split(/[、,]/)
.map(name => name.trim())
.filter(Boolean)
.map(name => createPartyRow({ customerName: name }));
}
return requireOne ? [createPartyRow()] : [];
},
partyRowsByRole(role) {
if (role === 'A') return this.partyARows;
if (role === 'B') return this.partyBRows;
return this.partyCRows;
},
setPartyRowsByRole(role, rows) {
if (role === 'A') this.partyARows = rows;
else if (role === 'B') this.partyBRows = rows;
else this.partyCRows = rows;
},
addPartyRow(role) {
const rows = [...this.partyRowsByRole(role), createPartyRow()];
this.setPartyRowsByRole(role, rows);
},
canRemovePartyRow(role) {
if (role === 'C') return true;
return this.partyRowsByRole(role).length > 1;
},
removePartyRow(role, index) {
if (!this.canRemovePartyRow(role)) return;
const rows = [...this.partyRowsByRole(role)];
rows.splice(index, 1);
this.setPartyRowsByRole(role, rows);
},
handlePartyCustomerChange(role, row, customerId) {
const matched = this.contractPartyOptions.find(item => String(item.id) === String(customerId));
row.customerId = matched?.id || '';
row.customerName = matched?.customerName || '';
row.creditCode = matched?.creditCode || '';
row.contactId = '';
row.contactName = '';
row.contactPhone = '';
row.contactOptions = [];
this.queryPartyRiskByRow(row);
if (row.customerId) this.ensurePartyContacts(row);
},
ensurePartyContacts(row) {
if (!row.customerId) return Promise.resolve();
if ((row.contactOptions || []).length) return Promise.resolve();
row.contactLoading = true;
return getCustomerArchiveDetail(row.customerId)
.then(res => {
const detail = res?.data?.data || res?.data || {};
const contacts = Array.isArray(detail.contacts) ? detail.contacts : [];
row.contactOptions = contacts
.map(item => ({
id: item.id,
label: item.contactName || item.name || '',
contactName: item.contactName || item.name || '',
contactPhone: item.contactPhone || item.phone || '',
}))
.filter(item => item.id && item.label);
if (row.contactId) {
const matched = row.contactOptions.find(
item => String(item.id) === String(row.contactId)
);
if (matched) {
row.contactName = matched.contactName;
row.contactPhone = matched.contactPhone;
}
}
if (!row.creditCode && detail.unifiedCreditCode) {
row.creditCode = detail.unifiedCreditCode;
}
})
.finally(() => {
row.contactLoading = false;
});
},
handlePartyContactChange(row, contactId) {
const matched = (row.contactOptions || []).find(item => String(item.id) === String(contactId));
row.contactId = matched?.id || '';
row.contactName = matched?.contactName || '';
row.contactPhone = matched?.contactPhone || '';
},
queryPartyRiskByRow(row) {
const key = String(row.customerId || row.customerName || '');
if (!key) return;
const code =
this.contractPartyCodeMap[String(row.customerId)] ||
this.contractPartyCodeMap[row.customerName];
if (!code) {
this.partyRisk = { ...this.partyRisk, [prop]: null };
this.partyRisk = { ...this.partyRisk, [key]: null };
return;
}
getRisk(code)
@@ -2458,18 +2867,65 @@ export default {
const risk = res?.data?.data ?? res?.data ?? {};
this.partyRisk = {
...this.partyRisk,
[prop]: {
[key]: {
customerName: row.customerName || '',
customerKind: risk.customerKind || '',
// risky 由后端统一判定:外部客商高风险(等级=2)或黑名单;内部组织客商默认无风险恒为 false
risky: risk.risky === true,
riskTip: risk.riskTip || '',
},
};
})
.catch(() => {
this.partyRisk = { ...this.partyRisk, [prop]: null };
this.partyRisk = { ...this.partyRisk, [key]: null };
});
},
validatePartyRows(requireCustomerId) {
const validate = (label, rows, required) => {
if (required && !rows.length) {
this.$message.warning(`请至少添加一个${label}客商`);
return false;
}
for (let index = 0; index < rows.length; index += 1) {
const row = rows[index];
if (!row.customerName) {
this.$message.warning(`${label}第${index + 1}行请选择客商`);
return false;
}
if (requireCustomerId && !row.customerId) {
this.$message.warning(`${label}第${index + 1}行请选择有效客商`);
return false;
}
if (row.contactName && !row.contactPhone) {
this.$message.warning(`${label}第${index + 1}行联系人需带出联系电话`);
return false;
}
}
return true;
};
return (
validate('甲方', this.partyARows, true) &&
validate('乙方', this.partyBRows, true) &&
validate('丙方', this.partyCRows, false)
);
},
validateBillingPlanBindings() {
if (!this.billingPlanRows.length) return true;
const partyIds = new Set(this.billingPartyOptions.map(item => String(item.partyRowId)));
for (let index = 0; index < this.billingPlanRows.length; index += 1) {
const plan = this.billingPlanRows[index];
if (!plan.partyRowId || !partyIds.has(String(plan.partyRowId))) {
this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
return false;
}
}
return true;
},
billingPlanCustomerLabel(row) {
const matched = this.billingPartyOptions.find(
item => String(item.partyRowId) === String(row.partyRowId)
);
return matched?.label || row.customerName || '';
},
loadOrganizationOptions() {
if (this.organizationLoading) return;
this.organizationLoading = true;
@@ -2539,7 +2995,10 @@ export default {
return null;
},
handleOrganizationChange(id) {
const organization = this.findOrganization(id);
const organizationId = Array.isArray(id) ? id.at(-1) : id;
const organization =
this.businessDeptOptions.find(item => String(item.id) === String(organizationId)) ||
this.findOrganization(organizationId);
Object.assign(
this.form,
organization
@@ -2549,6 +3008,9 @@ export default {
}
: { organizationId: '', organizationName: '' }
);
this.selectedOrganizationId = this.form.organizationId
? String(this.form.organizationId)
: '';
if (this.formMode === 'add') {
this.refreshPreviewContractNo();
}
@@ -2559,23 +3021,58 @@ export default {
refreshPreviewContractNo() {
if (this.formMode !== 'add') return;
const organizationId = this.form.organizationId;
if (!organizationId) {
const platformCompanyId = this.form.platformCompanyId;
if (!organizationId || !platformCompanyId) {
if (!this.contractNoManual) this.form.contractNo = '';
return;
}
const requestId = (this.contractNoPreviewRequestId =
(this.contractNoPreviewRequestId || 0) + 1);
api
.nextContractNo(organizationId)
.nextContractNo(organizationId, platformCompanyId)
.then(res => {
if (requestId !== this.contractNoPreviewRequestId || this.contractNoManual) return;
this.form.contractNo = res.data?.data || '';
})
.catch(() => {
.catch(error => {
if (requestId !== this.contractNoPreviewRequestId || this.contractNoManual) return;
this.form.contractNo = '';
const message =
error?.response?.data?.msg ||
error?.message ||
'部门合同前缀未配置,无法自动生成,请手动输入合同编号';
this.$message.warning(message);
});
},
loadBusinessDeptOptions() {
if (this.businessDeptLoading) return;
this.businessDeptLoading = true;
getBusinessDeptSelect()
.then(res => {
this.businessDeptOptions = (res.data?.data || []).map(item => ({
id: String(item.id),
label: item.deptName || item.fullName || String(item.id),
rawLabel: item.deptName || item.fullName || String(item.id),
}));
this.syncCurrentBusinessDeptOption();
})
.finally(() => {
this.businessDeptLoading = false;
});
},
syncCurrentBusinessDeptOption() {
if (!this.form.organizationId || !this.form.organizationName) return;
if (
this.businessDeptOptions.some(item => String(item.id) === String(this.form.organizationId))
) {
return;
}
this.businessDeptOptions.unshift({
id: String(this.form.organizationId),
label: this.form.organizationName,
rawLabel: this.form.organizationName,
});
},
syncCurrentOrganizationOption() {
if (!this.form.organizationId || !this.form.organizationName) return;
if (this.findOrganization(this.form.organizationId)) return;
@@ -3598,6 +4095,7 @@ export default {
}
&__billing-head,
&__party-head,
&__attachment-head {
display: flex;
align-items: center;
+5 -5
View File
@@ -2524,9 +2524,9 @@ export default {
Object.values(groups)
.map(group => {
const quantity = this.formatGoodsQuantity(group.quantity);
return `${group.typeName}等${group.count}种货物 | ${quantity}${
group.unit ? ` ${group.unit}` : ''
}`;
const typeName =
group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
})
.join('; ') || '-'
);
@@ -4023,7 +4023,7 @@ export default {
exists.add(key);
}
});
// 承运商类型:新增后须仍存在共同的承运商合同乙方(按客户合同甲方匹配后取交集)
// 承运商类型:新增后须仍存在共同的承运商合同乙方(按客户合同乙方=承运商合同甲方匹配后取交集)
if (
String(this.dialogForm.carrierType || '').trim() === '承运商' &&
nextRows.length > this.selectedWaybillRows.length
@@ -4744,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(
+24 -25
View File
@@ -489,6 +489,12 @@ const NODE_TEMPLATES = [
},
];
// 过程配置必须覆盖装货端与卸货端各一个节点;货量下限只看装货端——
// 到场没有货量开关,不能拿它顶替货量采集
const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
const CARGO_NODE_KEYS = ['load', 'dispatch'];
export default {
data() {
return {
@@ -535,7 +541,6 @@ export default {
created() {
this.resetNodeRows();
this.loadProjectOptions('');
this.applyDefaultDeptSearch();
this.initDeptOptions();
},
methods: {
@@ -566,27 +571,6 @@ export default {
}
});
},
defaultDeptId() {
const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
return (
String(raw)
.split(',')
.map(item => item.trim())
.filter(Boolean)[0] || ''
);
},
applyDefaultDeptSearch() {
const deptId = this.defaultDeptId();
const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
if (!deptId || !deptColumn) return;
deptColumn.searchValue = deptId;
this.query = { ...this.query, deptId };
this.$nextTick(() => {
if (this.$refs.crud?.searchForm) {
this.$refs.crud.searchForm.searchDeptId = deptId;
}
});
},
flattenDept(tree, level = 0) {
return tree.flatMap(item => {
const id =
@@ -938,8 +922,24 @@ export default {
this.$message.warning('备注不能超过500个字符');
return false;
}
if (!this.enabledNodes.length) {
this.$message.warning('请至少选择一个过程节点');
const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
this.$message.warning('发货、装货、到场至少选择一个');
return false;
}
if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
this.$message.warning('卸货、到货、签收、回单至少选择一个');
return false;
}
// 装货端没有节点采集货量时,整条配置在小程序侧等于不采集货量
const collectsCargo = CARGO_NODE_KEYS.some(key =>
this.nodeRows.some(
item =>
item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
)
);
if (!collectsCargo) {
this.$message.warning('发货或装货至少勾选一个货量类型');
return false;
}
const transit = this.nodeRows.find(item => item.key === 'transit');
@@ -1113,7 +1113,6 @@ export default {
},
searchReset() {
this.query = {};
this.applyDefaultDeptSearch();
this.page.currentPage = 1;
this.onLoad(this.page, this.query);
},
+152 -167
View File
@@ -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
@@ -962,14 +990,18 @@
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 {
loadHcsImmediateEnabled,
repush as hcsRepush,
repushBatch as hcsRepushBatch,
} from '@/api/business/hcs';
import { Position } from '@element-plus/icons-vue';
import { getMkPublicDetail } from '@/api/mk-process';
import {
getList as getCustomerArchiveList,
getDetail as getCustomerArchiveDetail,
} from '@/api/vehicle/customer-archive';
import { getBusinessDeptSelect, getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
import { getDictionary as getSystemDictionary } from '@/api/system/dict';
import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
import { getList as getUserList } from '@/api/system/user';
@@ -1174,8 +1206,9 @@ export default {
{ label: '高风险', value: 'high', statKey: 'high' },
{ label: '中风险', value: 'medium', statKey: 'medium' },
],
// 合规(HCS)推送状态
// 合规(HCS)推送状态;受 thirdParty.hcs.push.immediate-enabled 控制显隐
hcsRepushingId: null,
hcsImmediateEnabled: false,
page: {
pageSize: 10,
pageSizes: [10, 20, 50, 100],
@@ -1312,7 +1345,6 @@ export default {
],
},
deptOptions: [],
businessDeptTreeOptions: [],
platformCompanyOptions: [],
cargoTypeOptions: [],
selectedCustomerId: [],
@@ -1377,30 +1409,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 {
@@ -1507,6 +1536,13 @@ export default {
.catch(() => {
this.mkEnabled = false;
});
loadHcsImmediateEnabled()
.then(enabled => {
this.hcsImmediateEnabled = !!enabled;
})
.catch(() => {
this.hcsImmediateEnabled = false;
});
this.loadDeptOptions();
this.loadCargoTypeOptions();
this.loadTransportTypeOptions();
@@ -1612,9 +1648,10 @@ export default {
detail.settlementMode
);
if (detail.businessDeptId) {
const label = detail.businessDeptName || String(detail.businessDeptId);
this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
const id = String(detail.businessDeptId);
const label = detail.businessDeptName || id;
this.form.businessDeptId = id;
this.deptOptions = [{ label, rawLabel: label, value: id }];
}
const undertakeDeptIds = this.parseUndertakeDeptIds(detail.undertakeDeptId);
const undertakeDeptNames = this.parseUndertakeDeptNames(detail.undertakeDeptName);
@@ -1741,6 +1778,7 @@ export default {
},
canHcsRepush(row) {
return (
this.hcsImmediateEnabled &&
!this.readonlyScope &&
['approved', 'change_approved'].includes(row.approvalStatus) &&
row.hcsSyncStatus !== 'synced'
@@ -1950,15 +1988,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 =
@@ -2202,6 +2245,9 @@ export default {
subjectName: name,
approvalStatus: status,
mkEnabled: this.mkEnabled,
tempVarData: {
projectType: this.form.projectType || data.projectType || '',
},
}).then(() => {
this.$message.success('提交成功!');
this.closeProjectForm();
@@ -2322,6 +2368,7 @@ export default {
subjectName: this.form.projectName || '',
approvalStatus,
mkEnabled: this.mkEnabled,
tempVarData: { projectType: this.form.projectType || '' },
}).then(() => {
this.$message.success('提交成功!');
this.closeProjectForm();
@@ -2347,6 +2394,7 @@ export default {
subjectName: this.form.projectName || '',
approvalStatus: this.form.approvalStatus || 'change_rejected',
mkEnabled: this.mkEnabled,
tempVarData: { projectType: this.form.projectType || '' },
}).then(() => {
this.$message.success('提交成功!');
this.closeProjectForm();
@@ -2750,10 +2798,10 @@ export default {
return `${base}-BG${this.$dayjs().format('YYYYMMDD')}`;
},
handleBusinessDeptChange(value) {
// 兼容级联路径数组(取末级)与单个部门 id
const id = Array.isArray(value) ? value.at(-1) : value;
const dept = this.deptOptions.find(item => String(item.value) === String(id));
this.form.businessDeptName = dept ? dept.rawLabel : '';
const id = value == null || value === '' ? '' : String(value);
this.form.businessDeptId = id;
const dept = this.deptOptions.find(item => String(item.value) === id);
this.form.businessDeptName = dept ? dept.rawLabel || dept.label : '';
this.$refs.projectForm?.validateField('businessDeptId');
},
handleUndertakeDeptChange(value) {
@@ -2791,77 +2839,44 @@ export default {
firstUndertakeDeptId(value) {
return this.parseUndertakeDeptIds(value)[0] || '';
},
// 由部门 id 反查「根 → 该节点」的 id 路径,供级联回显(找不到返回 null)
findDeptPath(id, tree = [], parents = []) {
const target = Array.isArray(id) ? id.at(-1) : id;
if (target === undefined || target === null || target === '') return null;
for (const node of tree || []) {
const path = [...parents, node.value];
if (String(node.value) === String(target)) return path;
const matched = this.findDeptPath(target, node.children, path);
if (matched) return matched;
}
return null;
},
handleProjectTypeChange() {
this.normalizeAttachmentFileTypes();
this.$refs.projectForm?.validateField('projectType');
},
loadDeptOptions() {
Promise.all([getDeptTree(), getBusinessDeptSelect()])
.then(([treeRes, bizRes]) => {
const deptTree = this.excludeExternalOrganization(treeRes.data.data || []);
const bizList = bizRes.data.data || [];
const bizIds = new Set(
bizList
.map(item => (item.id == null || item.id === '' ? '' : String(item.id)))
.filter(Boolean)
);
// 仅保留「是否业务部门=是」的节点及其祖先,祖先不可选
const businessDeptTree = this.filterBusinessDeptTree(deptTree, bizIds);
this.deptOptions = this.flattenDept(businessDeptTree).filter(item =>
bizIds.has(String(item.value))
);
this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree, bizIds);
getBusinessDeptSelect()
.then(res => {
const bizList = res.data.data || [];
// 仅展示「是否业务部门=是」的本级部门,扁平下拉
this.deptOptions = bizList
.map(item => {
const value = item.id == null || item.id === '' ? '' : String(item.id);
const label = item.deptName || item.fullName || item.title || item.name || value;
return {
label,
rawLabel: label,
value,
};
})
.filter(item => item.value);
this.fillDefaultBusinessDept();
this.ensureCurrentBusinessDeptOption();
})
.catch(() => {
this.deptOptions = [];
this.businessDeptTreeOptions = [];
});
this.loadPlatformCompanyOptions();
},
/**
* 剪枝组织树:只保留业务部门节点及其祖先路径。
*/
filterBusinessDeptTree(list = [], bizIds = new Set()) {
return (list || []).reduce((result, item) => {
const children = item.children?.length
? this.filterBusinessDeptTree(item.children, bizIds)
: [];
const isBiz = bizIds.has(String(item.id));
if (!isBiz && !children.length) {
return result;
}
result.push({
...item,
children: children.length ? children : undefined,
});
return result;
}, []);
},
ensureCurrentBusinessDeptOption() {
const id = this.form.businessDeptId;
const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
? ''
: String(this.form.businessDeptId);
if (!id) return;
const exists = this.deptOptions.some(item => String(item.value) === String(id));
this.form.businessDeptId = id;
const exists = this.deptOptions.some(item => String(item.value) === id);
if (exists) return;
const label = this.form.businessDeptName || String(id);
const label = this.form.businessDeptName || id;
this.deptOptions.unshift({ label, rawLabel: label, value: id });
const pathExists = this.findDeptPath(id, this.businessDeptTreeOptions);
if (!pathExists) {
this.businessDeptTreeOptions.unshift({ label, value: id });
}
},
loadPlatformCompanyOptions() {
getPlatformCompanySelect().then(res => {
@@ -2893,50 +2908,6 @@ export default {
return matched ? matched.value : id;
});
},
excludeExternalOrganization(list = []) {
return list.reduce((result, item) => {
const deptName = item.title || item.deptName || item.name;
if (String(deptName || '').trim() === '外部组织') return result;
result.push({
...item,
children: item.children?.length
? this.excludeExternalOrganization(item.children)
: item.children,
});
return result;
}, []);
},
toDeptCascaderOptions(list = [], bizIds = null) {
return list.map(item => {
const value = item.id == null || item.id === '' ? item.value : item.id;
const option = {
label: item.title || item.deptName || item.name || item.label,
value: value == null || value === '' ? '' : String(value),
children: item.children?.length
? this.toDeptCascaderOptions(item.children, bizIds)
: undefined,
};
// 仅业务部门可选;祖先节点保留路径但禁用
if (bizIds && !bizIds.has(String(option.value))) {
option.disabled = true;
}
return option;
});
},
flattenDept(list = [], level = 0) {
return list.reduce((result, item) => {
const label = item.title || item.deptName || item.name;
result.push({
label: `${' '.repeat(level)}${label}`,
rawLabel: label,
value: item.id,
});
if (item.children && item.children.length) {
result.push(...this.flattenDept(item.children, level + 1));
}
return result;
}, []);
},
loadCargoTypeOptions() {
getSystemDictionary({ code: 'type_of_goods' }).then(res => {
this.cargoTypeOptions = (res.data.data || []).map(item => ({
@@ -3272,6 +3243,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;
}
+11 -7
View File
@@ -214,15 +214,19 @@ export default {
}
const run = () => {
const request = () => this.api[operation.action](row.id);
// 先本地提交再调 MK,避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
const afterMk =
operation.action === 'submitApproval'
? submitMkApprovalFlow({
bizType: 'project-change',
bizId: row.id,
subjectName: row.projectName || '',
approvalStatus: row.approvalStatus || '',
mkEnabled: this.mkEnabled,
}).then(() => request())
? request().then(() =>
submitMkApprovalFlow({
bizType: 'project-change',
bizId: row.id,
subjectName: row.projectName || '',
approvalStatus: row.approvalStatus || '',
mkEnabled: this.mkEnabled,
tempVarData: { projectType: row.projectType || '' },
})
)
: request();
const loading =
operation.action === 'approve'
+1 -1
View File
@@ -6,7 +6,7 @@
:config="config"
:crud-option="option"
:detail-id="detailId"
:menu-width="250"
:menu-width="320"
standalone-form-page
/>
</template>
@@ -3222,10 +3222,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 {};
}
@@ -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>
+24 -3
View File
@@ -152,6 +152,8 @@ export default {
form: { appliedAmount: 0, remark: '' },
},
mkEnabled: false,
// keep-alive 多标签下仅激活实例响应 detailNo,避免缓存页重复弹窗
isPageActive: true,
};
},
computed: {
@@ -222,11 +224,10 @@ export default {
},
},
created() {
// 标签机制按 fullPath 缓存同页多实例:仅当前路由实例应响应 detailNo 跳转,防止缓存旧实例也弹窗
this.ownFullPath = this.$route.fullPath;
this.loadOrganizationOptions();
},
mounted() {
this.isPageActive = true;
this.openRouteDetail();
loadMkEnabled()
.then(enabled => {
@@ -237,10 +238,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) {
@@ -320,7 +329,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 +337,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;
}
@@ -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);
@@ -185,6 +185,7 @@ import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSe
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 +286,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);
+407
View File
@@ -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>
+61 -123
View File
@@ -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);
+112 -18
View File
@@ -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),
+46 -11
View File
@@ -3938,7 +3938,7 @@ export default {
});
recognizeBusinessLicenseOcr(url)
.then(res => {
this.applyBusinessLicenseRecognition(res?.data?.data?.result || {});
this.applyBusinessLicenseRecognition(res?.data?.data || {});
this.$message.success('营业执照识别完成');
})
.catch(() => {
@@ -3946,8 +3946,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;
@@ -3959,23 +3982,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();
+25
View File
@@ -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',