Compare commits
36 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 b2894lxlx
|
014ee537a0 | ||
|
b2894lxlx
|
5bde60d844 | ||
|
b2894lxlx
|
c0ba9ba39b | ||
|
b2894lxlx
|
8388a55481 | ||
|
b2894lxlx
|
8e1430491b | ||
|
b2894lxlx
|
9fed3785d9 | ||
|
b2894lxlx
|
eaf431819e | ||
|
b2894lxlx
|
d95163663b | ||
|
b2894lxlx
|
5ce91ec5d5 | ||
|
b2894lxlx
|
8d85311bb3 | ||
|
b2894lxlx
|
fe4255c59b | ||
|
b2894lxlx
|
083d954765 | ||
|
b2894lxlx
|
185a0f9aec | ||
|
b2894lxlx
|
a528788409 | ||
 weicw
|
72471f48de | ||
|
weicw
|
415e1fd58d | ||
|
weicw
|
114c2fd2af | ||
|
b2894lxlx
|
7ba6620f06 | ||
|
b2894lxlx
|
9a3652d767 | ||
|
b2894lxlx
|
450505715a | ||
|
weicw
|
9a603a3796 | ||
|
b2894lxlx
|
2b51619728 | ||
|
b2894lxlx
|
5f167aae50 | ||
 刘泉佳
|
0d8eb25253 | ||
|
weicw
|
e53852b05f | ||
|
weicw
|
8d3e87d710 | ||
|
weicw
|
c7b07f0c95 | ||
|
weicw
|
59199397e0 | ||
|
weicw
|
70d49d022b | ||
|
weicw
|
7d16660bfc | ||
|
刘泉佳
|
eb32a275f3 | ||
|
刘泉佳
|
9150213b0f | ||
|
刘泉佳
|
4e8163dd18 | ||
|
刘泉佳
|
89bbc43f12 | ||
|
刘泉佳
|
4199318aa9 | ||
|
刘泉佳
|
555189177c |
@@ -2,6 +2,7 @@
|
||||
node_modules
|
||||
pnpm-lock.yaml
|
||||
/dist
|
||||
/dist.zip
|
||||
|
||||
/tests/e2e/videos/
|
||||
/tests/e2e/screenshots/
|
||||
|
||||
+5
-4
@@ -4,10 +4,11 @@
|
||||
"scripts": {
|
||||
"dev": "vite --host",
|
||||
"prod": "vite --mode production",
|
||||
"build": "vite build",
|
||||
"build:prod": "vite build --mode production",
|
||||
"build": "vite build && node scripts/zip-dist.mjs",
|
||||
"build:prod": "vite build --mode production && node scripts/zip-dist.mjs",
|
||||
"zip:dist": "node scripts/zip-dist.mjs",
|
||||
"serve": "vite preview --host",
|
||||
"typecheck": "vue-tsc --noEmit"
|
||||
"typecheck": "vue-tsc -p jsconfig.json --noEmit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.1",
|
||||
@@ -48,7 +49,7 @@
|
||||
"prettier": "^2.8.7",
|
||||
"sass": "^1.85.1",
|
||||
"terser": "^5.31.1",
|
||||
"typescript": "^7.0.2",
|
||||
"typescript": "5.9.3",
|
||||
"unplugin-auto-import": "^0.11.2",
|
||||
"vite": "^5.4.19",
|
||||
"vite-plugin-compression": "^0.5.1",
|
||||
|
||||
Generated
+94
-295
@@ -13,31 +13,31 @@ importers:
|
||||
dependencies:
|
||||
'@element-plus/icons-vue':
|
||||
specifier: ^2.3.1
|
||||
version: 2.3.2(vue@3.5.34(typescript@7.0.2))
|
||||
version: 2.3.2(vue@3.5.34(typescript@5.9.3))
|
||||
'@open-file-viewer/core':
|
||||
specifier: ^0.1.27
|
||||
version: 0.1.27(pdfjs-dist@6.1.200)
|
||||
'@open-file-viewer/vue':
|
||||
specifier: ^0.1.27
|
||||
version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@7.0.2))
|
||||
version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@5.9.3))
|
||||
'@saber/nf-design-base-elp':
|
||||
specifier: ^1.3.0
|
||||
version: 1.3.0
|
||||
'@saber/nf-form-design-elp':
|
||||
specifier: ^1.6.1
|
||||
version: 1.6.1(vue@3.5.34(typescript@7.0.2))
|
||||
version: 1.6.1(vue@3.5.34(typescript@5.9.3))
|
||||
'@saber/nf-form-elp':
|
||||
specifier: ^1.6.3
|
||||
version: 1.7.0
|
||||
'@smallwei/avue':
|
||||
specifier: ~3.9.2
|
||||
version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))
|
||||
version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))
|
||||
animate.css:
|
||||
specifier: ^4.1.1
|
||||
version: 4.1.1
|
||||
avue-plugin-ueditor:
|
||||
specifier: ^1.0.4
|
||||
version: 1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@7.0.2))
|
||||
version: 1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@5.9.3))
|
||||
axios:
|
||||
specifier: ^1.13.5
|
||||
version: 1.16.0(debug@4.4.3(supports-color@7.2.0))
|
||||
@@ -58,7 +58,7 @@ importers:
|
||||
version: 6.1.0
|
||||
element-plus:
|
||||
specifier: ^2.14.2
|
||||
version: 2.14.2(vue@3.5.34(typescript@7.0.2))
|
||||
version: 2.14.2(vue@3.5.34(typescript@5.9.3))
|
||||
exceljs:
|
||||
specifier: ^4.4.0
|
||||
version: 4.4.0
|
||||
@@ -85,29 +85,29 @@ importers:
|
||||
version: 0.4.0
|
||||
vue:
|
||||
specifier: ^3.5.13
|
||||
version: 3.5.34(typescript@7.0.2)
|
||||
version: 3.5.34(typescript@5.9.3)
|
||||
vue-i18n:
|
||||
specifier: ^11.4.2
|
||||
version: 11.4.2(vue@3.5.34(typescript@7.0.2))
|
||||
version: 11.4.2(vue@3.5.34(typescript@5.9.3))
|
||||
vue-pdf-embed:
|
||||
specifier: ^2.1.6
|
||||
version: 2.1.6(vue@3.5.34(typescript@7.0.2))
|
||||
version: 2.1.6(vue@3.5.34(typescript@5.9.3))
|
||||
vue-router:
|
||||
specifier: ^4.3.2
|
||||
version: 4.6.4(vue@3.5.34(typescript@7.0.2))
|
||||
version: 4.6.4(vue@3.5.34(typescript@5.9.3))
|
||||
vue3-clipboard:
|
||||
specifier: ^1.0.0
|
||||
version: 1.0.0(vue@3.5.34(typescript@7.0.2))
|
||||
version: 1.0.0(vue@3.5.34(typescript@5.9.3))
|
||||
vuex:
|
||||
specifier: ^4.1.0
|
||||
version: 4.1.0(vue@3.5.34(typescript@7.0.2))
|
||||
version: 4.1.0(vue@3.5.34(typescript@5.9.3))
|
||||
xlsx:
|
||||
specifier: 0.18.5
|
||||
version: 0.18.5
|
||||
devDependencies:
|
||||
'@vitejs/plugin-vue':
|
||||
specifier: ^5.2.4
|
||||
version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@7.0.2))
|
||||
version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@5.9.3))
|
||||
'@vue/compiler-sfc':
|
||||
specifier: ^3.4.27
|
||||
version: 3.5.34
|
||||
@@ -121,11 +121,11 @@ importers:
|
||||
specifier: ^5.31.1
|
||||
version: 5.46.2
|
||||
typescript:
|
||||
specifier: ^7.0.2
|
||||
version: 7.0.2
|
||||
specifier: 5.9.3
|
||||
version: 5.9.3
|
||||
unplugin-auto-import:
|
||||
specifier: ^0.11.2
|
||||
version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2)))(rollup@4.60.3)
|
||||
version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3)))(rollup@4.60.3)
|
||||
vite:
|
||||
specifier: ^5.4.19
|
||||
version: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
||||
@@ -137,7 +137,7 @@ importers:
|
||||
version: 0.4.0(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
|
||||
vue-tsc:
|
||||
specifier: ^3.3.11
|
||||
version: 3.3.13(typescript@7.0.2)
|
||||
version: 3.3.13(typescript@5.9.3)
|
||||
|
||||
packages:
|
||||
|
||||
@@ -771,126 +771,6 @@ packages:
|
||||
'@types/web-bluetooth@0.0.21':
|
||||
resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}
|
||||
|
||||
'@typescript/typescript-aix-ppc64@7.0.2':
|
||||
resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [ppc64]
|
||||
os: [aix]
|
||||
|
||||
'@typescript/typescript-darwin-arm64@7.0.2':
|
||||
resolution: {integrity: sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm64]
|
||||
os: [darwin]
|
||||
|
||||
'@typescript/typescript-darwin-x64@7.0.2':
|
||||
resolution: {integrity: sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [darwin]
|
||||
|
||||
'@typescript/typescript-freebsd-arm64@7.0.2':
|
||||
resolution: {integrity: sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm64]
|
||||
os: [freebsd]
|
||||
|
||||
'@typescript/typescript-freebsd-x64@7.0.2':
|
||||
resolution: {integrity: sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [freebsd]
|
||||
|
||||
'@typescript/typescript-linux-arm64@7.0.2':
|
||||
resolution: {integrity: sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-arm@7.0.2':
|
||||
resolution: {integrity: sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-loong64@7.0.2':
|
||||
resolution: {integrity: sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [loong64]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-mips64el@7.0.2':
|
||||
resolution: {integrity: sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [mips64el]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-ppc64@7.0.2':
|
||||
resolution: {integrity: sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [ppc64]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-riscv64@7.0.2':
|
||||
resolution: {integrity: sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [riscv64]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-s390x@7.0.2':
|
||||
resolution: {integrity: sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [s390x]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-linux-x64@7.0.2':
|
||||
resolution: {integrity: sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
|
||||
'@typescript/typescript-netbsd-arm64@7.0.2':
|
||||
resolution: {integrity: sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm64]
|
||||
os: [netbsd]
|
||||
|
||||
'@typescript/typescript-netbsd-x64@7.0.2':
|
||||
resolution: {integrity: sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [netbsd]
|
||||
|
||||
'@typescript/typescript-openbsd-arm64@7.0.2':
|
||||
resolution: {integrity: sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm64]
|
||||
os: [openbsd]
|
||||
|
||||
'@typescript/typescript-openbsd-x64@7.0.2':
|
||||
resolution: {integrity: sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [openbsd]
|
||||
|
||||
'@typescript/typescript-sunos-x64@7.0.2':
|
||||
resolution: {integrity: sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [sunos]
|
||||
|
||||
'@typescript/typescript-win32-arm64@7.0.2':
|
||||
resolution: {integrity: sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [arm64]
|
||||
os: [win32]
|
||||
|
||||
'@typescript/typescript-win32-x64@7.0.2':
|
||||
resolution: {integrity: sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
cpu: [x64]
|
||||
os: [win32]
|
||||
|
||||
'@uppy/companion-client@2.2.2':
|
||||
resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
|
||||
|
||||
@@ -2194,9 +2074,9 @@ packages:
|
||||
typedarray@0.0.6:
|
||||
resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
|
||||
|
||||
typescript@7.0.2:
|
||||
resolution: {integrity: sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==}
|
||||
engines: {node: '>=16.20.0'}
|
||||
typescript@5.9.3:
|
||||
resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
|
||||
engines: {node: '>=14.17'}
|
||||
hasBin: true
|
||||
|
||||
ufo@1.6.4:
|
||||
@@ -2408,9 +2288,9 @@ snapshots:
|
||||
|
||||
'@ctrl/tinycolor@4.2.0': {}
|
||||
|
||||
'@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2))':
|
||||
'@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@esbuild/aix-ppc64@0.21.5':
|
||||
optional: true
|
||||
@@ -2651,10 +2531,10 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- geotiff
|
||||
|
||||
'@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@7.0.2))':
|
||||
'@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
'@open-file-viewer/core': 0.1.27(pdfjs-dist@6.1.200)
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@parcel/watcher-android-arm64@2.5.6':
|
||||
optional: true
|
||||
@@ -2806,9 +2686,9 @@ snapshots:
|
||||
codemirror: 5.65.21
|
||||
randomcolor: 0.6.2
|
||||
|
||||
'@saber/nf-form-design-elp@1.6.1(vue@3.5.34(typescript@7.0.2))':
|
||||
'@saber/nf-form-design-elp@1.6.1(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
vuedraggable: 4.1.0(vue@3.5.34(typescript@7.0.2))
|
||||
vuedraggable: 4.1.0(vue@3.5.34(typescript@5.9.3))
|
||||
transitivePeerDependencies:
|
||||
- vue
|
||||
|
||||
@@ -2820,16 +2700,16 @@ snapshots:
|
||||
countup.js: 2.10.0
|
||||
signature_pad: 5.1.3
|
||||
|
||||
'@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))':
|
||||
'@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
|
||||
axios: 0.21.4(debug@4.4.3(supports-color@7.2.0))
|
||||
countup.js: 1.9.3
|
||||
dayjs: 1.11.20
|
||||
element-plus: 2.14.2(vue@3.5.34(typescript@7.0.2))
|
||||
element-plus: 2.14.2(vue@3.5.34(typescript@5.9.3))
|
||||
lodash: 4.18.1
|
||||
lodash-es: 4.18.1
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
transitivePeerDependencies:
|
||||
- debug
|
||||
|
||||
@@ -2856,66 +2736,6 @@ snapshots:
|
||||
|
||||
'@types/web-bluetooth@0.0.21': {}
|
||||
|
||||
'@typescript/typescript-aix-ppc64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-darwin-arm64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-darwin-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-freebsd-arm64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-freebsd-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-arm64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-arm@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-loong64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-mips64el@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-ppc64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-riscv64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-s390x@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-linux-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-netbsd-arm64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-netbsd-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-openbsd-arm64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-openbsd-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-sunos-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-win32-arm64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@typescript/typescript-win32-x64@7.0.2':
|
||||
optional: true
|
||||
|
||||
'@uppy/companion-client@2.2.2':
|
||||
dependencies:
|
||||
'@uppy/utils': 4.1.3
|
||||
@@ -2945,10 +2765,10 @@ snapshots:
|
||||
'@uppy/utils': 4.1.3
|
||||
nanoid: 3.3.12
|
||||
|
||||
'@vitejs/plugin-vue@5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@7.0.2))':
|
||||
'@vitejs/plugin-vue@5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@volar/language-core@2.4.28':
|
||||
dependencies:
|
||||
@@ -2956,13 +2776,13 @@ snapshots:
|
||||
|
||||
'@volar/source-map@2.4.28': {}
|
||||
|
||||
'@volar/typescript@2.4.28(typescript@7.0.2)':
|
||||
'@volar/typescript@2.4.28(typescript@5.9.3)':
|
||||
dependencies:
|
||||
'@volar/language-core': 2.4.28
|
||||
path-browserify: 1.0.1
|
||||
vscode-uri: 3.2.0
|
||||
optionalDependencies:
|
||||
typescript: 7.0.2
|
||||
typescript: 5.9.3
|
||||
|
||||
'@vue/compiler-core@3.5.34':
|
||||
dependencies:
|
||||
@@ -3022,51 +2842,51 @@ snapshots:
|
||||
'@vue/shared': 3.5.34
|
||||
csstype: 3.2.3
|
||||
|
||||
'@vue/server-renderer@3.5.34(vue@3.5.34(typescript@7.0.2))':
|
||||
'@vue/server-renderer@3.5.34(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
'@vue/compiler-ssr': 3.5.34
|
||||
'@vue/shared': 3.5.34
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@vue/shared@3.5.34': {}
|
||||
|
||||
'@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2))':
|
||||
'@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
'@types/web-bluetooth': 0.0.21
|
||||
'@vueuse/metadata': 14.3.0
|
||||
'@vueuse/shared': 14.3.0(vue@3.5.34(typescript@7.0.2))
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
'@vueuse/shared': 14.3.0(vue@3.5.34(typescript@5.9.3))
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@vueuse/metadata@14.3.0': {}
|
||||
|
||||
'@vueuse/shared@14.3.0(vue@3.5.34(typescript@7.0.2))':
|
||||
'@vueuse/shared@14.3.0(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 3.0.0
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
is-url: 1.2.4
|
||||
lodash.throttle: 4.1.1
|
||||
nanoid: 5.1.11
|
||||
slate: 0.123.0
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
prismjs: 1.30.0
|
||||
slate: 0.123.0
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@types/event-emitter': 0.3.5
|
||||
'@uppy/core': 2.3.4
|
||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||
dom7: 3.0.0
|
||||
dom7: 4.0.6
|
||||
event-emitter: 0.3.5
|
||||
html-void-elements: 3.0.0
|
||||
i18next: 23.16.8
|
||||
@@ -3087,13 +2907,13 @@ snapshots:
|
||||
dependencies:
|
||||
'@uppy/core': 2.3.4
|
||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
is-hotkey: 0.2.0
|
||||
lodash.camelcase: 4.3.0
|
||||
@@ -3106,16 +2926,16 @@ snapshots:
|
||||
slate: 0.123.0
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
slate: 0.123.0
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
lodash.debounce: 4.0.8
|
||||
lodash.throttle: 4.1.1
|
||||
@@ -3123,22 +2943,22 @@ snapshots:
|
||||
slate: 0.123.0
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@uppy/core': 2.3.4
|
||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
lodash.foreach: 4.5.0
|
||||
slate: 0.123.0
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
'@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
|
||||
dependencies:
|
||||
'@uppy/core': 2.3.4
|
||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
'@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
|
||||
dom7: 4.0.6
|
||||
nanoid: 5.1.11
|
||||
slate: 0.123.0
|
||||
@@ -3185,10 +3005,10 @@ snapshots:
|
||||
slate-history: 0.66.0(slate@0.72.8)
|
||||
snabbdom: 3.6.3
|
||||
|
||||
'@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@7.0.2))':
|
||||
'@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@5.9.3))':
|
||||
dependencies:
|
||||
'@wangeditor/editor': 5.1.23
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
'@wangeditor/editor@5.1.23':
|
||||
dependencies:
|
||||
@@ -3317,12 +3137,12 @@ snapshots:
|
||||
|
||||
asynckit@0.4.0: {}
|
||||
|
||||
avue-plugin-ueditor@1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@7.0.2)):
|
||||
avue-plugin-ueditor@1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
'@wangeditor/editor': 5.1.23
|
||||
'@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@7.0.2))
|
||||
'@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@5.9.3))
|
||||
axios: 1.16.0(debug@4.4.3(supports-color@7.2.0))
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
axios@0.21.4(debug@4.4.3(supports-color@7.2.0)):
|
||||
dependencies:
|
||||
@@ -3575,15 +3395,15 @@ snapshots:
|
||||
tslib: 2.3.0
|
||||
zrender: 6.1.0
|
||||
|
||||
element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)):
|
||||
element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
'@ctrl/tinycolor': 4.2.0
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
|
||||
'@floating-ui/dom': 1.7.6
|
||||
'@popperjs/core': '@sxzz/popperjs-es@2.11.8'
|
||||
'@types/lodash': 4.17.24
|
||||
'@types/lodash-es': 4.17.12
|
||||
'@vueuse/core': 14.3.0(vue@3.5.34(typescript@7.0.2))
|
||||
'@vueuse/core': 14.3.0(vue@3.5.34(typescript@5.9.3))
|
||||
async-validator: 4.2.5
|
||||
dayjs: 1.11.20
|
||||
lodash: 4.18.1
|
||||
@@ -3591,7 +3411,7 @@ snapshots:
|
||||
lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.18.1)(lodash@4.18.1)
|
||||
memoize-one: 6.0.0
|
||||
normalize-wheel-es: 1.2.0
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
vue-component-type-helpers: 3.3.6
|
||||
|
||||
end-of-stream@1.4.5:
|
||||
@@ -4352,28 +4172,7 @@ snapshots:
|
||||
|
||||
typedarray@0.0.6: {}
|
||||
|
||||
typescript@7.0.2:
|
||||
optionalDependencies:
|
||||
'@typescript/typescript-aix-ppc64': 7.0.2
|
||||
'@typescript/typescript-darwin-arm64': 7.0.2
|
||||
'@typescript/typescript-darwin-x64': 7.0.2
|
||||
'@typescript/typescript-freebsd-arm64': 7.0.2
|
||||
'@typescript/typescript-freebsd-x64': 7.0.2
|
||||
'@typescript/typescript-linux-arm': 7.0.2
|
||||
'@typescript/typescript-linux-arm64': 7.0.2
|
||||
'@typescript/typescript-linux-loong64': 7.0.2
|
||||
'@typescript/typescript-linux-mips64el': 7.0.2
|
||||
'@typescript/typescript-linux-ppc64': 7.0.2
|
||||
'@typescript/typescript-linux-riscv64': 7.0.2
|
||||
'@typescript/typescript-linux-s390x': 7.0.2
|
||||
'@typescript/typescript-linux-x64': 7.0.2
|
||||
'@typescript/typescript-netbsd-arm64': 7.0.2
|
||||
'@typescript/typescript-netbsd-x64': 7.0.2
|
||||
'@typescript/typescript-openbsd-arm64': 7.0.2
|
||||
'@typescript/typescript-openbsd-x64': 7.0.2
|
||||
'@typescript/typescript-sunos-x64': 7.0.2
|
||||
'@typescript/typescript-win32-arm64': 7.0.2
|
||||
'@typescript/typescript-win32-x64': 7.0.2
|
||||
typescript@5.9.3: {}
|
||||
|
||||
ufo@1.6.4: {}
|
||||
|
||||
@@ -4397,7 +4196,7 @@ snapshots:
|
||||
|
||||
universalify@2.0.1: {}
|
||||
|
||||
unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2)))(rollup@4.60.3):
|
||||
unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3)))(rollup@4.60.3):
|
||||
dependencies:
|
||||
'@antfu/utils': 0.7.10
|
||||
'@rollup/pluginutils': 5.3.0(rollup@4.60.3)
|
||||
@@ -4406,7 +4205,7 @@ snapshots:
|
||||
unimport: 1.3.0(rollup@4.60.3)
|
||||
unplugin: 1.16.1
|
||||
optionalDependencies:
|
||||
'@vueuse/core': 14.3.0(vue@3.5.34(typescript@7.0.2))
|
||||
'@vueuse/core': 14.3.0(vue@3.5.34(typescript@5.9.3))
|
||||
transitivePeerDependencies:
|
||||
- rollup
|
||||
|
||||
@@ -4465,54 +4264,54 @@ snapshots:
|
||||
|
||||
vue-component-type-helpers@3.3.6: {}
|
||||
|
||||
vue-i18n@11.4.2(vue@3.5.34(typescript@7.0.2)):
|
||||
vue-i18n@11.4.2(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
'@intlify/core-base': 11.4.2
|
||||
'@intlify/devtools-types': 11.4.2
|
||||
'@intlify/shared': 11.4.2
|
||||
'@vue/devtools-api': 6.6.4
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
vue-pdf-embed@2.1.6(vue@3.5.34(typescript@7.0.2)):
|
||||
vue-pdf-embed@2.1.6(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
pdfjs-dist: 6.2.108
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
vue-router@4.6.4(vue@3.5.34(typescript@7.0.2)):
|
||||
vue-router@4.6.4(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
'@vue/devtools-api': 6.6.4
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
vue-tsc@3.3.13(typescript@7.0.2):
|
||||
vue-tsc@3.3.13(typescript@5.9.3):
|
||||
dependencies:
|
||||
'@volar/typescript': 2.4.28(typescript@7.0.2)
|
||||
'@volar/typescript': 2.4.28(typescript@5.9.3)
|
||||
'@vue/language-core': 3.3.13
|
||||
typescript: 7.0.2
|
||||
typescript: 5.9.3
|
||||
|
||||
vue3-clipboard@1.0.0(vue@3.5.34(typescript@7.0.2)):
|
||||
vue3-clipboard@1.0.0(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
clipboard: 2.0.11
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
vue@3.5.34(typescript@7.0.2):
|
||||
vue@3.5.34(typescript@5.9.3):
|
||||
dependencies:
|
||||
'@vue/compiler-dom': 3.5.34
|
||||
'@vue/compiler-sfc': 3.5.34
|
||||
'@vue/runtime-dom': 3.5.34
|
||||
'@vue/server-renderer': 3.5.34(vue@3.5.34(typescript@7.0.2))
|
||||
'@vue/server-renderer': 3.5.34(vue@3.5.34(typescript@5.9.3))
|
||||
'@vue/shared': 3.5.34
|
||||
optionalDependencies:
|
||||
typescript: 7.0.2
|
||||
typescript: 5.9.3
|
||||
|
||||
vuedraggable@4.1.0(vue@3.5.34(typescript@7.0.2)):
|
||||
vuedraggable@4.1.0(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
sortablejs: 1.14.0
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
vuex@4.1.0(vue@3.5.34(typescript@7.0.2)):
|
||||
vuex@4.1.0(vue@3.5.34(typescript@5.9.3)):
|
||||
dependencies:
|
||||
'@vue/devtools-api': 6.6.4
|
||||
vue: 3.5.34(typescript@7.0.2)
|
||||
vue: 3.5.34(typescript@5.9.3)
|
||||
|
||||
webpack-virtual-modules@0.6.2: {}
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { existsSync, rmSync, statSync } from 'node:fs';
|
||||
import { resolve } from 'node:path';
|
||||
|
||||
const root = process.cwd();
|
||||
const distDir = resolve(root, 'dist');
|
||||
const zipPath = resolve(root, 'dist.zip');
|
||||
|
||||
if (!existsSync(distDir) || !statSync(distDir).isDirectory()) {
|
||||
console.error('[zip-dist] dist 目录不存在，请先完成构建');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (existsSync(zipPath)) {
|
||||
rmSync(zipPath);
|
||||
}
|
||||
|
||||
// 压缩 dist 内文件到根级（解压即 index.html / assets，便于直接上传部署）
|
||||
execFileSync('zip', ['-qr', zipPath, '.', '-x', '*.DS_Store', '-x', '__MACOSX/*'], {
|
||||
cwd: distDir,
|
||||
stdio: 'inherit',
|
||||
});
|
||||
|
||||
const sizeMb = (statSync(zipPath).size / (1024 * 1024)).toFixed(2);
|
||||
console.log(`[zip-dist] 已生成 ${zipPath}（${sizeMb} MB）`);
|
||||
@@ -0,0 +1,61 @@
|
||||
import { createCrudApi } from './common';
|
||||
import request from '@/axios';
|
||||
|
||||
const baseUrl = '/blade-transport/contract-change';
|
||||
const api = createCrudApi(baseUrl);
|
||||
|
||||
export const getList = api.getList;
|
||||
export const getDetail = api.getDetail;
|
||||
export const submit = api.submit;
|
||||
export const remove = api.remove;
|
||||
|
||||
export const createFromContract = (contractId, changeType) =>
|
||||
request({
|
||||
url: `${baseUrl}/create-from-contract`,
|
||||
method: 'post',
|
||||
params: { contractId, changeType },
|
||||
});
|
||||
|
||||
export const saveDraft = row =>
|
||||
request({
|
||||
url: `${baseUrl}/save-draft`,
|
||||
method: 'post',
|
||||
data: row,
|
||||
});
|
||||
|
||||
export const submitApproval = id =>
|
||||
request({
|
||||
url: `${baseUrl}/submit-approval`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const approve = id =>
|
||||
request({
|
||||
url: `${baseUrl}/approve`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
// 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
|
||||
timeout: 120000,
|
||||
});
|
||||
|
||||
export const reject = id =>
|
||||
request({
|
||||
url: `${baseUrl}/reject`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const withdraw = id =>
|
||||
request({
|
||||
url: `${baseUrl}/withdraw`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const markSyncStatus = (ids, syncStatus) =>
|
||||
request({
|
||||
url: `${baseUrl}/mark-sync-status`,
|
||||
method: 'post',
|
||||
params: { ids, syncStatus },
|
||||
});
|
||||
@@ -93,10 +93,10 @@ export const expireStats = params =>
|
||||
params,
|
||||
});
|
||||
|
||||
/** 按合同负责部门预览下一合同编号 */
|
||||
export const nextContractNo = organizationId =>
|
||||
/** 按平台公司 + 业务部门预览下一合同编号 */
|
||||
export const nextContractNo = (organizationId, platformCompanyId) =>
|
||||
request({
|
||||
url: `${baseUrl}/next-contract-no`,
|
||||
method: 'get',
|
||||
params: { organizationId },
|
||||
params: { organizationId, platformCompanyId },
|
||||
});
|
||||
|
||||
@@ -2,6 +2,43 @@ import request from '@/axios';
|
||||
|
||||
const baseUrl = '/blade-transport/hcs';
|
||||
|
||||
/** 进程内缓存，避免列表页重复请求推送开关 */
|
||||
let immediateEnabledCache = null;
|
||||
let immediateEnabledPromise = null;
|
||||
|
||||
/**
|
||||
* 查询 HCS 即时推送开关（thirdParty.hcs.push.immediate-enabled）。
|
||||
* 关闭时项目管理/合同管理隐藏「推送合规」「批量推送合规」。
|
||||
*/
|
||||
export const getPushConfig = () =>
|
||||
request({
|
||||
url: `${baseUrl}/push-config`,
|
||||
method: 'get',
|
||||
});
|
||||
|
||||
export const loadHcsImmediateEnabled = () => {
|
||||
if (immediateEnabledCache !== null) {
|
||||
return Promise.resolve(immediateEnabledCache);
|
||||
}
|
||||
if (immediateEnabledPromise) {
|
||||
return immediateEnabledPromise;
|
||||
}
|
||||
immediateEnabledPromise = getPushConfig()
|
||||
.then(res => {
|
||||
const data = res?.data?.data ?? res?.data ?? {};
|
||||
immediateEnabledCache = data.immediateEnabled === true || data.immediateEnabled === 'true';
|
||||
return immediateEnabledCache;
|
||||
})
|
||||
.catch(() => {
|
||||
immediateEnabledCache = false;
|
||||
return false;
|
||||
})
|
||||
.finally(() => {
|
||||
immediateEnabledPromise = null;
|
||||
});
|
||||
return immediateEnabledPromise;
|
||||
};
|
||||
|
||||
// 合规推送涉及 HCS 远程多次调用（风险校验+附件转传+起草），可达 20s+，覆盖全局 10s 超时
|
||||
export const repush = (bizType, id) =>
|
||||
request({
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
import { createCrudApi } from './common';
|
||||
import request from '@/axios';
|
||||
|
||||
const baseUrl = '/blade-transport/project-change';
|
||||
const api = createCrudApi(baseUrl);
|
||||
|
||||
export const getList = api.getList;
|
||||
export const getDetail = api.getDetail;
|
||||
export const submit = api.submit;
|
||||
export const remove = api.remove;
|
||||
|
||||
export const createFromProject = (projectId, changeType) =>
|
||||
request({
|
||||
url: `${baseUrl}/create-from-project`,
|
||||
method: 'post',
|
||||
params: { projectId, changeType },
|
||||
});
|
||||
|
||||
export const saveDraft = row =>
|
||||
request({
|
||||
url: `${baseUrl}/save-draft`,
|
||||
method: 'post',
|
||||
data: row,
|
||||
});
|
||||
|
||||
export const submitApproval = id =>
|
||||
request({
|
||||
url: `${baseUrl}/submit-approval`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const approve = id =>
|
||||
request({
|
||||
url: `${baseUrl}/approve`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const reject = id =>
|
||||
request({
|
||||
url: `${baseUrl}/reject`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const withdraw = id =>
|
||||
request({
|
||||
url: `${baseUrl}/withdraw`,
|
||||
method: 'post',
|
||||
params: { id },
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import request from '@/axios';
|
||||
|
||||
const baseUrl = '/blade-system/business-dept-config';
|
||||
|
||||
export const getList = (current, size, params) =>
|
||||
request({
|
||||
url: `${baseUrl}/list`,
|
||||
method: 'get',
|
||||
params: {
|
||||
...params,
|
||||
current,
|
||||
size,
|
||||
},
|
||||
});
|
||||
|
||||
export const getDetail = id =>
|
||||
request({
|
||||
url: `${baseUrl}/detail`,
|
||||
method: 'get',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
export const submit = row =>
|
||||
request({
|
||||
url: `${baseUrl}/submit`,
|
||||
method: 'post',
|
||||
data: row,
|
||||
});
|
||||
|
||||
export const remove = ids =>
|
||||
request({
|
||||
url: `${baseUrl}/remove`,
|
||||
method: 'post',
|
||||
params: { ids },
|
||||
});
|
||||
|
||||
export const getByPlatformDept = (platformCompanyId, businessDeptId) =>
|
||||
request({
|
||||
url: `${baseUrl}/by-platform-dept`,
|
||||
method: 'get',
|
||||
params: { platformCompanyId, businessDeptId },
|
||||
});
|
||||
@@ -12,6 +12,7 @@ export const MK_SUBMIT_TIMEOUT = 30000;
|
||||
* @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
|
||||
* @param {string} [data.subject] 流程标题
|
||||
* @param {string} [data.bizType] 业务类型
|
||||
* @param {Object} [data.tempVarData] MK 临时变量（如 { projectType }）
|
||||
*/
|
||||
export const processSubmit = data => {
|
||||
return request({
|
||||
|
||||
@@ -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',
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
@@ -38,6 +38,7 @@ export const createOption = () => ({
|
||||
delBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 320,
|
||||
menuFixed: 'right',
|
||||
column: [
|
||||
{
|
||||
|
||||
@@ -0,0 +1,221 @@
|
||||
import {
|
||||
approvalStatusOptions,
|
||||
contractCategoryOptions,
|
||||
createCrudOption,
|
||||
hcsSyncStatusOptions,
|
||||
signTypeOptions,
|
||||
} from './common';
|
||||
|
||||
const listDicFormatter = res => {
|
||||
const data = res?.data || res;
|
||||
if (Array.isArray(data)) return data;
|
||||
if (Array.isArray(data?.records)) return data.records;
|
||||
if (Array.isArray(data?.data)) return data.data;
|
||||
if (Array.isArray(data?.data?.records)) return data.data.records;
|
||||
return [];
|
||||
};
|
||||
|
||||
const projectNameDicFormatter = res => {
|
||||
const list = listDicFormatter(res);
|
||||
return list.filter(item => item && item.projectName && String(item.projectName).trim());
|
||||
};
|
||||
|
||||
export const changeTypeOptions = [
|
||||
{ label: '合同信息变更', value: '合同信息变更' },
|
||||
{ label: '结算规则变更', value: '结算规则变更' },
|
||||
];
|
||||
|
||||
export const config = {
|
||||
title: '合同变更',
|
||||
permission: 'contract_change',
|
||||
statusProp: 'approvalStatus',
|
||||
statusTextProp: 'approvalStatusName',
|
||||
deleteStatus: ['draft', 'withdrawn', 'rejected'],
|
||||
editStatus: ['draft', 'withdrawn', 'rejected'],
|
||||
viewStatus: ['approved'],
|
||||
operations: [
|
||||
{
|
||||
action: 'submitApproval',
|
||||
label: '提交',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['draft'],
|
||||
permission: 'contract_change_submit',
|
||||
},
|
||||
{
|
||||
action: 'withdraw',
|
||||
label: '撤回',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'contract_change_withdraw',
|
||||
},
|
||||
{
|
||||
action: 'mkAudit',
|
||||
label: '流程',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing', 'rejected', 'approved'],
|
||||
permission: 'contract_change_approve',
|
||||
mkOnly: true,
|
||||
},
|
||||
{
|
||||
action: 'approve',
|
||||
label: '通过',
|
||||
type: 'success',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'contract_change_approve',
|
||||
localOnly: true,
|
||||
},
|
||||
{
|
||||
action: 'reject',
|
||||
label: '驳回',
|
||||
type: 'warning',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'contract_change_reject',
|
||||
localOnly: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const option = createCrudOption([
|
||||
{
|
||||
label: '合同编号',
|
||||
prop: 'contractNo',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 20,
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '合同名称',
|
||||
prop: 'contractName',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 30,
|
||||
minWidth: 180,
|
||||
},
|
||||
{
|
||||
label: '所属项目',
|
||||
prop: 'projectName',
|
||||
search: true,
|
||||
searchType: 'select',
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 60,
|
||||
dicUrl: '/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
|
||||
dicFormatter: projectNameDicFormatter,
|
||||
props: {
|
||||
label: 'projectName',
|
||||
value: 'projectName',
|
||||
},
|
||||
filterable: true,
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '所属组织',
|
||||
prop: 'organizationName',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 10,
|
||||
minWidth: 150,
|
||||
},
|
||||
{
|
||||
label: '合同类别',
|
||||
prop: 'contractCategory',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 70,
|
||||
dicData: contractCategoryOptions,
|
||||
minWidth: 130,
|
||||
},
|
||||
{
|
||||
label: '签约类型',
|
||||
prop: 'signType',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 50,
|
||||
dicData: signTypeOptions,
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '甲方',
|
||||
prop: 'partyA',
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '乙方',
|
||||
prop: 'partyB',
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '开始日期',
|
||||
prop: 'startDate',
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
minWidth: 130,
|
||||
},
|
||||
{
|
||||
label: '结束日期',
|
||||
prop: 'endDate',
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
minWidth: 130,
|
||||
},
|
||||
{
|
||||
label: '临时效力起',
|
||||
prop: 'temporaryStartDate',
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
minWidth: 130,
|
||||
},
|
||||
{
|
||||
label: '临时效力止',
|
||||
prop: 'temporaryEndDate',
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
minWidth: 130,
|
||||
},
|
||||
{
|
||||
label: '经办人',
|
||||
prop: 'handlerUserName',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
type: 'datetime',
|
||||
minWidth: 170,
|
||||
},
|
||||
{
|
||||
label: '审核状态',
|
||||
prop: 'approvalStatus',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 40,
|
||||
dicData: approvalStatusOptions,
|
||||
minWidth: 110,
|
||||
},
|
||||
{
|
||||
label: '当前节点',
|
||||
prop: 'currentNode',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '当前处理人',
|
||||
prop: 'currentProcessor',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '同步状态',
|
||||
prop: 'syncStatus',
|
||||
type: 'select',
|
||||
dicData: hcsSyncStatusOptions,
|
||||
minWidth: 110,
|
||||
},
|
||||
]);
|
||||
@@ -65,10 +65,12 @@ export const config = {
|
||||
['contractName', '合同名称'],
|
||||
['projectName', '所属项目'],
|
||||
['organizationName', '合同负责部门'],
|
||||
['platformCompanyName', '平台公司'],
|
||||
['contractCategory', '合同类别'],
|
||||
['signType', '签约类型'],
|
||||
['partyA', '甲方'],
|
||||
['partyB', '乙方'],
|
||||
['partyC', '丙方'],
|
||||
['handlerUserName', '经办人'],
|
||||
['signDate', '签订日期'],
|
||||
['applyDate', '申请日期'],
|
||||
@@ -247,6 +249,15 @@ export const option = createCrudOption([
|
||||
hide: true,
|
||||
labelWidth: 0,
|
||||
},
|
||||
{
|
||||
label: '客商',
|
||||
prop: 'partyName',
|
||||
search: true,
|
||||
searchOrder: 11,
|
||||
searchPlaceholder: '请输入',
|
||||
hide: true,
|
||||
display: false,
|
||||
},
|
||||
{
|
||||
label: '合同编号',
|
||||
prop: 'contractNo',
|
||||
@@ -264,7 +275,7 @@ export const option = createCrudOption([
|
||||
align: 'left',
|
||||
headerAlign: 'left',
|
||||
search: true,
|
||||
searchOrder: 7,
|
||||
searchOrder: 1,
|
||||
searchPlaceholder: '请输入',
|
||||
order: 180,
|
||||
slot: true,
|
||||
@@ -311,6 +322,13 @@ export const option = createCrudOption([
|
||||
minWidth: 150,
|
||||
rules: selectRule('合同负责部门'),
|
||||
},
|
||||
{
|
||||
label: '平台公司',
|
||||
prop: 'platformCompanyName',
|
||||
minWidth: 180,
|
||||
order: 115,
|
||||
display: false,
|
||||
},
|
||||
{
|
||||
label: '合同类别',
|
||||
prop: 'contractCategory',
|
||||
@@ -337,7 +355,7 @@ export const option = createCrudOption([
|
||||
rules: selectRule('签约类型'),
|
||||
},
|
||||
{
|
||||
label: '生效类型',
|
||||
label: '合同状态',
|
||||
prop: 'effectiveType',
|
||||
type: 'select',
|
||||
search: true,
|
||||
@@ -350,24 +368,23 @@ export const option = createCrudOption([
|
||||
{
|
||||
label: '甲方',
|
||||
prop: 'partyA',
|
||||
type: 'select',
|
||||
formslot: true,
|
||||
disabled: true,
|
||||
order: 160,
|
||||
filterable: true,
|
||||
minWidth: 160,
|
||||
rules: selectRule('甲方'),
|
||||
addDisplay: false,
|
||||
editDisplay: false,
|
||||
},
|
||||
{
|
||||
label: '乙方',
|
||||
prop: 'partyB',
|
||||
type: 'select',
|
||||
formslot: true,
|
||||
disabled: true,
|
||||
order: 150,
|
||||
filterable: true,
|
||||
minWidth: 160,
|
||||
rules: selectRule('乙方'),
|
||||
addDisplay: false,
|
||||
editDisplay: false,
|
||||
},
|
||||
{
|
||||
label: '丙方',
|
||||
prop: 'partyC',
|
||||
minWidth: 160,
|
||||
addDisplay: false,
|
||||
editDisplay: false,
|
||||
},
|
||||
{
|
||||
label: '合同期限',
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
import {
|
||||
approvalStatusOptions,
|
||||
createCrudOption,
|
||||
hcsSyncStatusOptions,
|
||||
projectTypeOptions,
|
||||
} from './common';
|
||||
|
||||
export const changeTypeOptions = [
|
||||
{ label: '项目变更', value: '项目变更' },
|
||||
{ label: '项目备案调整', value: '项目备案调整' },
|
||||
];
|
||||
|
||||
export const config = {
|
||||
title: '项目变更',
|
||||
permission: 'project_change',
|
||||
statusProp: 'approvalStatus',
|
||||
statusTextProp: 'approvalStatusName',
|
||||
deleteStatus: ['draft', 'withdrawn', 'rejected'],
|
||||
editStatus: ['draft', 'withdrawn', 'rejected'],
|
||||
viewStatus: ['approved', 'rejected', 'withdrawn'],
|
||||
operations: [
|
||||
{
|
||||
action: 'submitApproval',
|
||||
label: '提交',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['draft'],
|
||||
permission: 'project_change_submit',
|
||||
},
|
||||
{
|
||||
action: 'withdraw',
|
||||
label: '撤回',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'project_change_withdraw',
|
||||
},
|
||||
{
|
||||
action: 'mkAudit',
|
||||
label: '流程',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'project_change_approve',
|
||||
mkOnly: true,
|
||||
},
|
||||
{
|
||||
action: 'approve',
|
||||
label: '通过',
|
||||
type: 'success',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'project_change_approve',
|
||||
localOnly: true,
|
||||
},
|
||||
{
|
||||
action: 'reject',
|
||||
label: '驳回',
|
||||
type: 'warning',
|
||||
statusProp: 'approvalStatus',
|
||||
status: ['reviewing'],
|
||||
permission: 'project_change_reject',
|
||||
localOnly: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const option = createCrudOption([
|
||||
{
|
||||
label: '项目编号',
|
||||
prop: 'projectCode',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 70,
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '项目名称',
|
||||
prop: 'projectName',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 60,
|
||||
minWidth: 180,
|
||||
},
|
||||
{
|
||||
label: '变更类型',
|
||||
prop: 'changeType',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 10,
|
||||
dicData: changeTypeOptions,
|
||||
minWidth: 130,
|
||||
},
|
||||
{
|
||||
label: '项目类型',
|
||||
prop: 'projectType',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 20,
|
||||
dicData: projectTypeOptions,
|
||||
minWidth: 110,
|
||||
},
|
||||
{
|
||||
label: '客户名称',
|
||||
prop: 'customerNames',
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '下游承运商',
|
||||
prop: 'carrierNames',
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
label: '承办部门',
|
||||
prop: 'undertakeDeptName',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 50,
|
||||
minWidth: 140,
|
||||
},
|
||||
{
|
||||
label: '项目负责人',
|
||||
prop: 'principalUserName',
|
||||
search: true,
|
||||
searchPlaceholder: '请输入',
|
||||
searchOrder: 40,
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '审批状态',
|
||||
prop: 'approvalStatus',
|
||||
type: 'select',
|
||||
search: true,
|
||||
searchPlaceholder: '请选择',
|
||||
searchOrder: 30,
|
||||
dicData: approvalStatusOptions,
|
||||
minWidth: 110,
|
||||
},
|
||||
{
|
||||
label: '当前节点',
|
||||
prop: 'currentNode',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '当前处理人',
|
||||
prop: 'currentProcessor',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
label: '审核通过时间',
|
||||
prop: 'approvedTime',
|
||||
type: 'datetime',
|
||||
minWidth: 170,
|
||||
},
|
||||
{
|
||||
label: '同步状态',
|
||||
prop: 'syncStatus',
|
||||
type: 'select',
|
||||
dicData: hcsSyncStatusOptions,
|
||||
minWidth: 110,
|
||||
},
|
||||
]);
|
||||
@@ -203,10 +203,9 @@ export default {
|
||||
overHidden: true,
|
||||
hide: true,
|
||||
addDisplay: false,
|
||||
editDisplay: true,
|
||||
editDisplay: false,
|
||||
viewDisplay: true,
|
||||
order: 40,
|
||||
placeholder: '可清空以解绑微信',
|
||||
},
|
||||
{
|
||||
label: '状态',
|
||||
|
||||
@@ -95,6 +95,17 @@ export default [
|
||||
bizType: 'project-apply',
|
||||
},
|
||||
},
|
||||
{
|
||||
path: '/business/project-change/public-view',
|
||||
name: '查看项目变更信息',
|
||||
component: () => import('@/views/business/project-apply-public-view.vue'),
|
||||
meta: {
|
||||
keepAlive: false,
|
||||
isTab: false,
|
||||
isAuth: false,
|
||||
bizType: 'project-change',
|
||||
},
|
||||
},
|
||||
{
|
||||
path: '/business/contract-manage/public-view',
|
||||
name: '查看合同信息',
|
||||
@@ -106,6 +117,17 @@ export default [
|
||||
bizType: 'contract-manage',
|
||||
},
|
||||
},
|
||||
{
|
||||
path: '/business/contract-change/public-view',
|
||||
name: '查看合同变更信息',
|
||||
component: () => import('@/views/business/contract-change-public-view.vue'),
|
||||
meta: {
|
||||
keepAlive: false,
|
||||
isTab: false,
|
||||
isAuth: false,
|
||||
bizType: 'contract-change',
|
||||
},
|
||||
},
|
||||
{
|
||||
path: '/settlement/pre-settlement/public-view',
|
||||
name: '查看预付结算单信息',
|
||||
|
||||
@@ -104,6 +104,22 @@ export default [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
// 兼容旧菜单路径：按 detailNo 解析应付/应收后跳转到拆分后的列表页
|
||||
path: '/settlement/formal-settlement',
|
||||
component: Layout,
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
name: '正式结算单兼容跳转',
|
||||
meta: {
|
||||
keepAlive: false,
|
||||
activeMenu: '/settlement/payment-settlement',
|
||||
},
|
||||
component: loadView(() => import('@/views/settlement/formal-settlement-redirect.vue')),
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/settlement/formal-settlement/form',
|
||||
component: Layout,
|
||||
@@ -198,6 +214,18 @@ export default [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/business/project-change/form',
|
||||
component: Layout,
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
name: '项目变更表单',
|
||||
meta: { keepAlive: false, activeMenu: '/business/project-change' },
|
||||
component: loadView(() => import('@/views/business/project-apply.vue')),
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/business/waybill-manage/form',
|
||||
component: Layout,
|
||||
@@ -342,6 +370,18 @@ export default [
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/business/contract-change/form',
|
||||
component: Layout,
|
||||
children: [
|
||||
{
|
||||
path: '',
|
||||
name: '合同变更表单',
|
||||
meta: { keepAlive: false, activeMenu: '/business/contract-change' },
|
||||
component: loadView(() => import('@/views/business/contract-manage-change.vue')),
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/wel',
|
||||
component: () =>
|
||||
|
||||
@@ -15,12 +15,24 @@ export const MK_BIZ = {
|
||||
rejected: ['rejected', 'change_rejected', 'withdrawn'],
|
||||
approved: ['approved', 'change_approved'],
|
||||
},
|
||||
'project-change': {
|
||||
dictName: '提交项目变更审核流',
|
||||
subjectPrefix: '项目变更审批',
|
||||
rejected: ['rejected', 'withdrawn'],
|
||||
approved: ['approved'],
|
||||
},
|
||||
'contract-manage': {
|
||||
dictName: '提交合同审核流',
|
||||
subjectPrefix: '合同审批',
|
||||
rejected: ['rejected', 'change_rejected', 'withdrawn'],
|
||||
approved: ['approved', 'change_approved'],
|
||||
},
|
||||
'contract-change': {
|
||||
dictName: '提交合同变更审核流',
|
||||
subjectPrefix: '合同变更审批',
|
||||
rejected: ['rejected', 'withdrawn'],
|
||||
approved: ['approved'],
|
||||
},
|
||||
'pre-settlement': {
|
||||
dictName: '提交预结算审核流',
|
||||
subjectPrefix: '预付结算审批',
|
||||
@@ -142,6 +154,7 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
|
||||
* @param {string} [options.subjectName] 标题后缀
|
||||
* @param {string} [options.approvalStatus] 提交前的审批状态
|
||||
* @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
|
||||
* @param {Object} [options.tempVarData] 传给 MK 的临时变量（如项目类型 projectType）
|
||||
* @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
|
||||
*/
|
||||
export async function submitMkApprovalFlow({
|
||||
@@ -150,6 +163,7 @@ export async function submitMkApprovalFlow({
|
||||
subjectName = '',
|
||||
approvalStatus = '',
|
||||
mkEnabled,
|
||||
tempVarData,
|
||||
} = {}) {
|
||||
const conf = MK_BIZ[bizType];
|
||||
if (!conf) {
|
||||
@@ -190,12 +204,16 @@ export async function submitMkApprovalFlow({
|
||||
const subject = subjectName
|
||||
? `${conf.subjectPrefix}：${subjectName}`
|
||||
: `${conf.subjectPrefix}：${bizIdText}`;
|
||||
await processSubmit({
|
||||
const submitPayload = {
|
||||
templateCode,
|
||||
bizId: bizIdText,
|
||||
subject,
|
||||
bizType,
|
||||
forceNewFormInstance,
|
||||
});
|
||||
};
|
||||
if (tempVarData != null && typeof tempVarData === 'object') {
|
||||
submitPayload.tempVarData = tempVarData;
|
||||
}
|
||||
await processSubmit(submitPayload);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -60,6 +60,13 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="hasPermission('airport_master_view')"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="hasPermission('airport_master_edit')"
|
||||
@@ -279,7 +286,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 180,
|
||||
menuWidth: 220,
|
||||
column: [
|
||||
{
|
||||
label: '编码',
|
||||
|
||||
@@ -68,6 +68,13 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="permission.currency_view"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="permission.currency_edit"
|
||||
@@ -171,7 +178,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 180,
|
||||
menuWidth: 220,
|
||||
menuFixed: 'right',
|
||||
column: [
|
||||
{
|
||||
|
||||
@@ -36,6 +36,13 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="permission.customer_type_view"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="permission.customer_type_edit"
|
||||
@@ -102,7 +109,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 180,
|
||||
menuWidth: 220,
|
||||
column: [
|
||||
{
|
||||
label: '中文名称',
|
||||
|
||||
@@ -76,6 +76,13 @@
|
||||
</el-input>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="permission.fee_item_view"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="permission.fee_item_edit"
|
||||
@@ -141,7 +148,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 180,
|
||||
menuWidth: 220,
|
||||
column: [
|
||||
{
|
||||
label: '费用类型',
|
||||
|
||||
@@ -46,6 +46,13 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
v-if="hasPermission('measurement_unit_view')"
|
||||
type="primary"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="hasPermission('measurement_unit_edit')"
|
||||
type="primary"
|
||||
|
||||
@@ -134,6 +134,13 @@
|
||||
</div>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="hasPermission('port_terminal_view')"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="hasPermission('port_terminal_edit')"
|
||||
@@ -370,7 +377,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 180,
|
||||
menuWidth: 220,
|
||||
column: [
|
||||
{
|
||||
label: '编码',
|
||||
|
||||
@@ -60,6 +60,13 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="hasPermission('railway_station_view')"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="hasPermission('railway_station_edit')"
|
||||
@@ -250,7 +257,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 180,
|
||||
menuWidth: 220,
|
||||
column: [
|
||||
{
|
||||
label: '编码',
|
||||
|
||||
@@ -280,6 +280,23 @@ export default {
|
||||
.filter(Boolean)[0] || '';
|
||||
},
|
||||
applyDefaultDeptSearch() {
|
||||
// 超管默认不限组织，避免预填当前组织后看不到其他组织/无组织数据。
|
||||
if (this.isAdmin) {
|
||||
const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
|
||||
if (deptColumn) {
|
||||
deptColumn.searchValue = undefined;
|
||||
}
|
||||
const nextQuery = { ...this.query };
|
||||
delete nextQuery.deptId;
|
||||
delete nextQuery.searchDeptId;
|
||||
this.query = nextQuery;
|
||||
this.$nextTick(() => {
|
||||
if (this.$refs.crud?.searchForm) {
|
||||
this.$refs.crud.searchForm.searchDeptId = undefined;
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
const deptId = this.defaultDeptId();
|
||||
const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
|
||||
if (!deptId || !deptColumn) return;
|
||||
@@ -298,7 +315,8 @@ export default {
|
||||
if (deptColumn) {
|
||||
deptColumn.dicData = this.deptOptions;
|
||||
}
|
||||
// dicData 异步到位后再回填，避免下拉选项为空时清空已选组织，导致请求丢失 deptId。
|
||||
// 超管不回填默认组织；普通用户在 dicData 到位后再回填，避免下拉清空已选组织。
|
||||
if (this.isAdmin) return;
|
||||
const deptId = String(this.query.deptId || this.defaultDeptId() || '');
|
||||
if (!deptId) return;
|
||||
if (deptColumn) {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
<el-descriptions-item label="方案名称">{{
|
||||
displayValue(draft.planName)
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="适用客商">{{
|
||||
displayValue(draft.customerName || partyOptionLabel(draft.partyRowId))
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="运输方式">{{
|
||||
transportModeLabel(draft.transportMode)
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="默认方案">{{
|
||||
isDefaultPlan(draft) ? '是' : '否'
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="备注">{{ displayValue(draft.remark) }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-form
|
||||
@@ -37,6 +37,20 @@
|
||||
:disabled="readonly" /></el-form-item
|
||||
></el-col>
|
||||
<el-col :span="8"
|
||||
><el-form-item label="适用客商" prop="partyRowId"
|
||||
><el-select
|
||||
v-model="draft.partyRowId"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="请选择适用客商"
|
||||
@change="handlePartyChange"
|
||||
><el-option
|
||||
v-for="item in partyOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value" /></el-select></el-form-item
|
||||
></el-col>
|
||||
<el-col :span="8"
|
||||
><el-form-item label="运输方式" prop="transportMode"
|
||||
><el-select
|
||||
v-model="draft.transportMode"
|
||||
@@ -51,16 +65,6 @@
|
||||
:label="item.label"
|
||||
:value="item.value" /></el-select></el-form-item
|
||||
></el-col>
|
||||
<el-col :span="8"
|
||||
><el-form-item
|
||||
><el-checkbox v-model="draft.defaultPlan" :disabled="readonly">默认方案</el-checkbox
|
||||
><el-tooltip content="同一运输方式仅支持配置一个默认计费方案" placement="top">
|
||||
<el-icon class="billing-plan-editor__default-tip"
|
||||
><InfoFilled
|
||||
/></el-icon> </el-tooltip
|
||||
></el-form-item
|
||||
></el-col
|
||||
>
|
||||
<el-col :span="24"
|
||||
><el-form-item label="备注"
|
||||
><el-input
|
||||
@@ -380,6 +384,7 @@ import { InfoFilled } from '@element-plus/icons-vue';
|
||||
import { getDictionary } from '@/api/system/dictbiz';
|
||||
import SectionCard from '@/components/section-card/main.vue';
|
||||
import { currencyUnit } from '@/utils/currency';
|
||||
// InfoFilled 仅用于保底计费重量列头提示
|
||||
|
||||
const clone = value => JSON.parse(JSON.stringify(value));
|
||||
/** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
|
||||
@@ -433,6 +438,7 @@ export default {
|
||||
index: { type: Number, default: -1 },
|
||||
readonly: Boolean,
|
||||
settlementCurrency: { type: String, default: 'RMB' },
|
||||
partyOptions: { type: Array, default: () => [] },
|
||||
},
|
||||
emits: ['update:modelValue', 'save'],
|
||||
data() {
|
||||
@@ -476,6 +482,7 @@ export default {
|
||||
cargoRequest: null,
|
||||
formRules: {
|
||||
planName: [{ required: true, message: '请输入方案名称', trigger: 'blur' }],
|
||||
partyRowId: [{ required: true, message: '请选择适用客商', trigger: 'change' }],
|
||||
transportMode: [{ required: true, message: '请选择运输方式', trigger: 'change' }],
|
||||
},
|
||||
};
|
||||
@@ -516,10 +523,24 @@ export default {
|
||||
handler(value) {
|
||||
if (this.modelValue) {
|
||||
this.draft = this.normalizePlan(value);
|
||||
this.applyDefaultPartySelection();
|
||||
this.loadRuleItems();
|
||||
}
|
||||
},
|
||||
},
|
||||
modelValue(visible) {
|
||||
if (visible) {
|
||||
this.$nextTick(() => this.applyDefaultPartySelection());
|
||||
}
|
||||
},
|
||||
partyOptions: {
|
||||
deep: true,
|
||||
handler() {
|
||||
if (this.modelValue) {
|
||||
this.applyDefaultPartySelection();
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
displayValue(value) {
|
||||
@@ -539,27 +560,62 @@ export default {
|
||||
);
|
||||
return this.displayValue(option?.label || this.draft.transportModeLabel || value);
|
||||
},
|
||||
isDefaultPlan(plan) {
|
||||
return (
|
||||
plan?.defaultPlan === true ||
|
||||
plan?.defaultPlan === 1 ||
|
||||
['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
|
||||
);
|
||||
},
|
||||
normalizePlan(value = {}) {
|
||||
const plan = {
|
||||
planName: '',
|
||||
partyRowId: '',
|
||||
partyRole: '',
|
||||
customerId: '',
|
||||
customerName: '',
|
||||
transportMode: '',
|
||||
transportModeLabel: '',
|
||||
defaultPlan: false,
|
||||
remark: '',
|
||||
...clone(value || {}),
|
||||
};
|
||||
// 一个客商对应一个方案，不再维护默认方案字段
|
||||
delete plan.defaultPlan;
|
||||
plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule =>
|
||||
this.normalizeRule(rule)
|
||||
);
|
||||
return plan;
|
||||
},
|
||||
partyOptionLabel(partyRowId) {
|
||||
const matched = (this.partyOptions || []).find(
|
||||
item => String(item.value) === String(partyRowId)
|
||||
);
|
||||
return matched?.label || '';
|
||||
},
|
||||
/**
|
||||
* 仅一个可选客商时默认选中（客户合同仅一个甲方的常见场景）
|
||||
*/
|
||||
applyDefaultPartySelection() {
|
||||
if (this.readonly) {
|
||||
return;
|
||||
}
|
||||
const options = this.partyOptions || [];
|
||||
if (options.length !== 1) {
|
||||
return;
|
||||
}
|
||||
const current = String(this.draft.partyRowId || '');
|
||||
const only = options[0];
|
||||
const onlyValue = String(only?.value || only?.partyRowId || '');
|
||||
if (!onlyValue) {
|
||||
return;
|
||||
}
|
||||
if (current && current === onlyValue) {
|
||||
return;
|
||||
}
|
||||
this.handlePartyChange(only.value || only.partyRowId);
|
||||
},
|
||||
handlePartyChange(partyRowId) {
|
||||
const matched = (this.partyOptions || []).find(
|
||||
item => String(item.value) === String(partyRowId)
|
||||
);
|
||||
this.draft.partyRowId = matched?.partyRowId || matched?.value || '';
|
||||
this.draft.partyRole = matched?.partyRole || '';
|
||||
this.draft.customerId = matched?.customerId || '';
|
||||
this.draft.customerName = matched?.customerName || '';
|
||||
},
|
||||
normalizeRule(rule = {}) {
|
||||
const next = { ...defaultRule(), ...clone(rule) };
|
||||
if (next.billingType === '阶梯单价' && next.minimumBillingWeight === '') {
|
||||
@@ -1032,6 +1088,11 @@ export default {
|
||||
this.$refs.formRef.validate(valid => {
|
||||
if (!valid || !this.validateRules()) return;
|
||||
const plan = clone(this.draft);
|
||||
this.handlePartyChange(plan.partyRowId);
|
||||
plan.partyRowId = this.draft.partyRowId;
|
||||
plan.partyRole = this.draft.partyRole;
|
||||
plan.customerId = this.draft.customerId;
|
||||
plan.customerName = this.draft.customerName;
|
||||
const transportMode = this.transportModeOptions.find(
|
||||
item => String(item.value) === String(plan.transportMode)
|
||||
);
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
<el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-form">
|
||||
<el-row :gutter="16">
|
||||
<template v-if="isRoad(route)">
|
||||
<el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
|
||||
<el-col :span="6"
|
||||
><el-form-item label="司机" :required="route.carrierType !== '承运商'"
|
||||
><el-autocomplete
|
||||
@@ -255,7 +255,7 @@
|
||||
></el-col>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="船班号/船次号/班次号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="船长"><el-input v-model="route.captainName" placeholder="请输入" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="联系电话"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
|
||||
@@ -920,6 +920,8 @@ export default {
|
||||
route.carrierName = '';
|
||||
route.carrierId = '';
|
||||
route.carrierContractId = '';
|
||||
route.carrierPartyId = '';
|
||||
route.carrierPartyRole = '';
|
||||
this.clearRouteDriverVehicleFields(route);
|
||||
if (value === '承运商') {
|
||||
route.trailerVehicleNo = '';
|
||||
@@ -930,15 +932,18 @@ export default {
|
||||
if (value === '自运') this.applySelfOperatedCarrierDefaults(route);
|
||||
});
|
||||
},
|
||||
handleCarrierContractChange(route, contractId) {
|
||||
handleCarrierContractChange(route, selectedValue) {
|
||||
const contract = this.carrierOptions.find(
|
||||
item =>
|
||||
this.carrierOptionValue(item) === String(selectedValue || '') ||
|
||||
[item.contractId, item.carrierName, item.id].some(
|
||||
value => String(value || '') === String(contractId || '')
|
||||
value => String(value || '') === String(selectedValue || '')
|
||||
)
|
||||
);
|
||||
route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
|
||||
route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
|
||||
route.carrierPartyId = route.carrierType !== '自运' ? contract?.carrierPartyId || '' : '';
|
||||
route.carrierPartyRole = route.carrierType !== '自运' ? contract?.carrierPartyRole || '' : '';
|
||||
route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || contract?.customerId || '' : '';
|
||||
route.carrierName = contract?.carrierName || '';
|
||||
this.clearRouteDriverVehicleFields(route);
|
||||
},
|
||||
@@ -954,15 +959,23 @@ export default {
|
||||
this.driverOptions = [];
|
||||
},
|
||||
carrierOptionValue(item = {}) {
|
||||
return item.contractId || item.id || item.value || item.carrierName || '';
|
||||
return [item.contractId || item.id || '', item.carrierPartyId || '', item.carrierName || ''].join(
|
||||
'__'
|
||||
);
|
||||
},
|
||||
carrierSelectedValue(route = {}) {
|
||||
return this.carrierOptionValue({
|
||||
contractId: route.carrierContractId,
|
||||
carrierPartyId: route.carrierPartyId,
|
||||
carrierName: route.carrierName,
|
||||
});
|
||||
},
|
||||
carrierOptionLabel(item) {
|
||||
const duplicateCount = this.carrierOptions.filter(option => option.carrierName === item.carrierName).length;
|
||||
if (duplicateCount <= 1) {
|
||||
return item.carrierName;
|
||||
}
|
||||
const roleLabel = item.carrierPartyRole === 'C' ? '丙方' : item.carrierPartyRole === 'B' ? '乙方' : '';
|
||||
const nameWithRole =
|
||||
roleLabel && item.carrierName ? `${item.carrierName}（${roleLabel}）` : item.carrierName;
|
||||
const contractLabel = formatContractOptionLabel(item);
|
||||
return contractLabel ? `${item.carrierName}（${contractLabel}）` : item.carrierName;
|
||||
return contractLabel ? `${nameWithRole} - ${contractLabel}` : nameWithRole;
|
||||
},
|
||||
driverOptionLabel(item) { return item.driverName || item.name || ''; },
|
||||
driverOptionKey(item) { return item.id || item.driverId || this.driverOptionLabel(item) || item.mobile; },
|
||||
@@ -983,19 +996,22 @@ export default {
|
||||
...item,
|
||||
contractId: item.contractId || item.carrierContractId || item.id || '',
|
||||
carrierName:
|
||||
item.carrierName ||
|
||||
item.partyB ||
|
||||
item.partyBName ||
|
||||
item.contractPartyB ||
|
||||
item.customerContractPartyB ||
|
||||
item.carrierName ||
|
||||
'',
|
||||
carrierId:
|
||||
item.customerId ||
|
||||
item.partyBId ||
|
||||
item.partyBUserId ||
|
||||
item.contractPartyBId ||
|
||||
item.customerContractPartyBId ||
|
||||
item.carrierId ||
|
||||
'',
|
||||
carrierPartyId: item.carrierPartyId || '',
|
||||
carrierPartyRole: item.carrierPartyRole || '',
|
||||
}))
|
||||
.filter(item => item.carrierName);
|
||||
} finally {
|
||||
@@ -1137,7 +1153,7 @@ export default {
|
||||
id: `${route.segmentNo}-${item.cargoName}-${Date.now()}-${Math.random()}`,
|
||||
batchNo,
|
||||
segmentNo: route.segmentNo, relationNo: route.segmentNo, documentType: route.documentType, transportType: route.transportType, carrierType: route.carrierType,
|
||||
carrierContractId: route.carrierContractId, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
|
||||
carrierContractId: route.carrierContractId, carrierPartyId: route.carrierPartyId, carrierPartyRole: route.carrierPartyRole, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
|
||||
departureName: route.departureName, departureAddress: route.departureAddress, departureContact: route.departureContact, departurePhone: route.departurePhone,
|
||||
arrivalName: route.arrivalName, arrivalAddress: route.arrivalAddress, arrivalContact: route.arrivalContact, arrivalPhone: route.arrivalPhone,
|
||||
estimatedStartTime: route.estimatedStartTime, estimatedEndTime: route.estimatedEndTime,
|
||||
|
||||
@@ -352,7 +352,12 @@
|
||||
@opened="loadAddressList"
|
||||
>
|
||||
<div class="route-dialog__search common-address-dialog__search">
|
||||
<el-form :model="addressQuery" label-position="right" label-width="auto">
|
||||
<el-form
|
||||
class="dialog-form-label-fixed"
|
||||
:model="addressQuery"
|
||||
label-position="right"
|
||||
label-width="96px"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="地址名称">
|
||||
@@ -446,7 +451,12 @@
|
||||
@opened="loadStationList"
|
||||
>
|
||||
<div class="route-dialog__search">
|
||||
<el-form :model="stationQuery" label-position="right" label-width="auto">
|
||||
<el-form
|
||||
class="dialog-form-label-fixed"
|
||||
:model="stationQuery"
|
||||
label-position="right"
|
||||
label-width="96px"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="8"><el-form-item label="站点名称"><el-input v-model="stationQuery.name" clearable placeholder="请输入" /></el-form-item></el-col>
|
||||
<el-col :span="8"><el-form-item label="详细地址"><el-input v-model="stationQuery.detailAddress" clearable placeholder="请输入" /></el-form-item></el-col>
|
||||
@@ -652,6 +662,8 @@ export default {
|
||||
addressQuery: {},
|
||||
addressPage: { current: 1, size: 10, total: 0 },
|
||||
addressRegionPaths: { departure: [], arrival: [] },
|
||||
// 程序回填省市区时抑制 cascader @change，避免空值回调把已填地址清空
|
||||
suppressAddressRegionChange: false,
|
||||
regionOptions: [],
|
||||
regionLoading: false,
|
||||
regionRequest: null,
|
||||
@@ -889,26 +901,63 @@ export default {
|
||||
findRegionPathByName(options = [], regionName = '', parents = []) {
|
||||
const target = String(regionName || '').replace(/\s+/g, '');
|
||||
if (!target) return [];
|
||||
let suffixMatch = [];
|
||||
for (const item of options) {
|
||||
const nextParents = [...parents, item];
|
||||
const name = nextParents.map(region => region.title || region.name || '').join('');
|
||||
if (name === target) return nextParents.map(region => region.id);
|
||||
// 常用地址可能缺省名，允许「市+区」后缀命中完整省市区路径
|
||||
if (!suffixMatch.length && name.endsWith(target) && target.length >= 2) {
|
||||
suffixMatch = nextParents.map(region => region.id);
|
||||
}
|
||||
const path = this.findRegionPathByName(item.children, target, nextParents);
|
||||
if (path.length) return path;
|
||||
}
|
||||
return [];
|
||||
return suffixMatch;
|
||||
},
|
||||
findRegionPathByCode(options = [], regionCode = '', parents = []) {
|
||||
const target = String(regionCode || '').trim();
|
||||
if (!target) return [];
|
||||
for (const item of options) {
|
||||
const nextParents = [...parents, item];
|
||||
if (String(item.id) === target) return nextParents.map(region => region.id);
|
||||
if (String(item.id) === target || String(item.value || '') === target) {
|
||||
return nextParents.map(region => region.id);
|
||||
}
|
||||
const path = this.findRegionPathByCode(item.children, target, nextParents);
|
||||
if (path.length) return path;
|
||||
}
|
||||
return [];
|
||||
},
|
||||
resolveRegionPath(field) {
|
||||
if (!field) return [];
|
||||
const codePath = this.findRegionPathByCode(
|
||||
this.regionOptions,
|
||||
field.model[field.regionCode]
|
||||
);
|
||||
if (codePath.length) return codePath;
|
||||
const namePath = this.findRegionPathByName(this.regionOptions, field.model[field.name]);
|
||||
if (namePath.length) return namePath;
|
||||
const composed = [field.model[field.provinceName], field.model[field.cityName], field.model[field.districtName]]
|
||||
.filter(Boolean)
|
||||
.join('');
|
||||
return this.findRegionPathByName(this.regionOptions, composed);
|
||||
},
|
||||
setAddressRegionPath(target, path = []) {
|
||||
const nextPath = Array.isArray(path) ? path.map(item => String(item)) : [];
|
||||
const current = this.addressRegionPaths[target] || [];
|
||||
if (
|
||||
current.length === nextPath.length &&
|
||||
current.every((item, index) => String(item) === String(nextPath[index]))
|
||||
) {
|
||||
return;
|
||||
}
|
||||
this.suppressAddressRegionChange = true;
|
||||
// Vue3 直接写动态 key，避免整体替换对象导致其它 cascader 重建并触发空 @change
|
||||
this.addressRegionPaths[target] = nextPath;
|
||||
this.$nextTick(() => {
|
||||
this.suppressAddressRegionChange = false;
|
||||
});
|
||||
},
|
||||
regionLabels(path = []) {
|
||||
let options = this.regionOptions;
|
||||
const labels = [];
|
||||
@@ -947,10 +996,22 @@ export default {
|
||||
this.setAddressRegionNames(field, [provinceMatch?.[0], cityMatch?.[0], districtMatch?.[0]]);
|
||||
},
|
||||
handleAddressRegionChange(target, value) {
|
||||
if (this.suppressAddressRegionChange) return;
|
||||
const field = this.addressModel(target);
|
||||
const path = Array.isArray(value) ? value.map(item => String(item)) : [];
|
||||
this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
|
||||
this.setAddressRegionPath(target, path);
|
||||
if (!field) return;
|
||||
// 程序回填/重建过程中 cascader 可能短暂抛出空值，不能据此清空已选常用地址
|
||||
if (!path.length) {
|
||||
const hasExisting =
|
||||
String(field.model[field.name] || '').trim() ||
|
||||
String(field.model[field.address] || '').trim() ||
|
||||
String(field.model[field.regionCode] || '').trim();
|
||||
if (hasExisting) {
|
||||
this.$nextTick(() => this.syncAddressRegionPath(target));
|
||||
return;
|
||||
}
|
||||
}
|
||||
const labels = this.regionLabels(path);
|
||||
field.model[field.name] = labels.join('');
|
||||
field.model[field.regionCode] = path.at(-1) || '';
|
||||
@@ -959,19 +1020,29 @@ export default {
|
||||
},
|
||||
syncAddressRegionPath(target) {
|
||||
const field = this.addressModel(target);
|
||||
if (!field) return;
|
||||
const codePath = this.findRegionPathByCode(this.regionOptions, field.model[field.regionCode]);
|
||||
const path = codePath.length
|
||||
? codePath
|
||||
: this.findRegionPathByName(this.regionOptions, field.model[field.name]);
|
||||
this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
|
||||
if (!field || !this.regionOptions.length) return;
|
||||
const path = this.resolveRegionPath(field);
|
||||
this.setAddressRegionPath(target, path);
|
||||
if (path.length) this.setAddressRegionNames(field, this.regionLabels(path));
|
||||
},
|
||||
syncAddressRegionPaths() {
|
||||
if (!this.regionOptions.length) return;
|
||||
['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(target => {
|
||||
this.syncAddressRegionPath(target);
|
||||
});
|
||||
this.suppressAddressRegionChange = true;
|
||||
try {
|
||||
['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(
|
||||
target => {
|
||||
const field = this.addressModel(target);
|
||||
if (!field) return;
|
||||
const path = this.resolveRegionPath(field);
|
||||
this.addressRegionPaths[target] = path;
|
||||
if (path.length) this.setAddressRegionNames(field, this.regionLabels(path));
|
||||
}
|
||||
);
|
||||
} finally {
|
||||
this.$nextTick(() => {
|
||||
this.suppressAddressRegionChange = false;
|
||||
});
|
||||
}
|
||||
},
|
||||
async loadDetail(id) {
|
||||
const res = await api.getDetail(id);
|
||||
@@ -1145,13 +1216,15 @@ export default {
|
||||
};
|
||||
},
|
||||
addressTransportType(target) {
|
||||
if (target.startsWith('route-')) {
|
||||
return this.form.routes[Number(target.slice(6))]?.transportType || '';
|
||||
const key = String(target || '');
|
||||
if (key.startsWith('route-')) {
|
||||
return String(this.form.routes[Number(key.slice(6))]?.transportType || '');
|
||||
}
|
||||
return target === 'arrival' ? this.form.finalTransportType : this.form.routes[0]?.transportType || '';
|
||||
if (key === 'arrival') return String(this.form.finalTransportType || '');
|
||||
return String(this.form.routes[0]?.transportType || '');
|
||||
},
|
||||
addressTransportMode(target) {
|
||||
const type = this.addressTransportType(target);
|
||||
const type = String(this.addressTransportType(target) || '');
|
||||
if (type.includes('铁路')) return 'rail';
|
||||
if (type.includes('水路') || type.includes('水运') || type.includes('海运')) return 'water';
|
||||
if (type.includes('航空') || type.includes('空运')) return 'air';
|
||||
@@ -1168,25 +1241,11 @@ export default {
|
||||
// 展示模式由已选数据决定：有站点编码则显示站点名，否则省市区；暂不按运输方式强制站点限制。
|
||||
return Boolean(siteCode && siteCode !== '/');
|
||||
},
|
||||
hasAddressValue(target) {
|
||||
const field = this.addressModel(target);
|
||||
if (!field) return false;
|
||||
return Boolean(
|
||||
String(field.model[field.address] || '').trim() || String(field.model[field.name] || '').trim()
|
||||
);
|
||||
},
|
||||
tipEmptyAddressDetail(target) {
|
||||
// 替代原「请先选择运输方式」placeholder：空地址点击时 toast，已有值不再提示。
|
||||
if (!this.hasAddressValue(target)) {
|
||||
this.$message.warning('请输入详细地址');
|
||||
}
|
||||
},
|
||||
resolveAddressRegionCode(row = {}) {
|
||||
return row.regionCode || row.districtCode || row.areaCode || row.adcode || '';
|
||||
},
|
||||
openCommonAddress(target) {
|
||||
if (this.isBasicRouteReadonly) return;
|
||||
this.tipEmptyAddressDetail(target);
|
||||
this.addressTarget = target;
|
||||
// 暂不按运输方式限制站点：统一走常用地址选择。
|
||||
this.addressQuery = {};
|
||||
@@ -1233,8 +1292,9 @@ export default {
|
||||
this.stationPage.current = 1;
|
||||
this.loadStationList();
|
||||
},
|
||||
selectStation(row) {
|
||||
const target = this.addressModel(this.addressTarget);
|
||||
async selectStation(row) {
|
||||
const targetKey = this.addressTarget;
|
||||
const target = this.addressModel(targetKey);
|
||||
if (!target) return;
|
||||
const station = this.normalizeStation(row);
|
||||
target.model[target.name] = station.stationName || station.regionName;
|
||||
@@ -1245,7 +1305,9 @@ export default {
|
||||
target.model[target.siteCode] = station.stationCode;
|
||||
this.setAddressRegionNamesFromRow(target, station);
|
||||
this.stationDialogVisible = false;
|
||||
this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
|
||||
await this.loadRegionOptions();
|
||||
await this.$nextTick();
|
||||
this.syncAddressRegionPath(targetKey);
|
||||
},
|
||||
async loadAddressList() {
|
||||
this.addressLoading = true;
|
||||
@@ -1271,8 +1333,9 @@ export default {
|
||||
this.addressPage.current = 1;
|
||||
this.loadAddressList();
|
||||
},
|
||||
selectAddress(row) {
|
||||
const target = this.addressModel(this.addressTarget);
|
||||
async selectAddress(row) {
|
||||
const targetKey = this.addressTarget;
|
||||
const target = this.addressModel(targetKey);
|
||||
if (!target) return;
|
||||
target.model[target.name] = row.regionName || row.addressName || '';
|
||||
target.model[target.address] = row.detailAddress || row.address || '';
|
||||
@@ -1284,11 +1347,13 @@ export default {
|
||||
target.model[target.siteCode] = '';
|
||||
this.setAddressRegionNamesFromRow(target, row);
|
||||
this.addressDialogVisible = false;
|
||||
this.loadRegionOptions().then(() => this.syncAddressRegionPath(this.addressTarget));
|
||||
await this.loadRegionOptions();
|
||||
// nextTick 确保途经点动态 key 已挂载 cascader 后再回填路径
|
||||
await this.$nextTick();
|
||||
this.syncAddressRegionPath(targetKey);
|
||||
},
|
||||
handleAddressDetailClick(target) {
|
||||
if (this.isBasicRouteReadonly) return;
|
||||
this.tipEmptyAddressDetail(target);
|
||||
this.openAddressMap(target);
|
||||
},
|
||||
openAddressMap(target) {
|
||||
@@ -1803,12 +1868,23 @@ export default {
|
||||
},
|
||||
addRoute() {
|
||||
if (this.isBasicRouteReadonly) return;
|
||||
this.form.routes.push(this.createRoute());
|
||||
const index = this.form.routes.length;
|
||||
this.form.routes.push(this.createRoute(index));
|
||||
this.addressRegionPaths[`route-${index}`] = [];
|
||||
},
|
||||
removeRoute(index) {
|
||||
if (this.isBasicRouteReadonly) return;
|
||||
this.form.routes.splice(index, 1);
|
||||
this.syncAddressRegionPaths();
|
||||
const nextPaths = { departure: this.addressRegionPaths.departure || [], arrival: this.addressRegionPaths.arrival || [] };
|
||||
this.form.routes.forEach((route, routeIndex) => {
|
||||
nextPaths[`route-${routeIndex}`] = this.addressRegionPaths[`route-${routeIndex >= index ? routeIndex + 1 : routeIndex}`] || [];
|
||||
});
|
||||
this.suppressAddressRegionChange = true;
|
||||
this.addressRegionPaths = nextPaths;
|
||||
this.$nextTick(() => {
|
||||
this.suppressAddressRegionChange = false;
|
||||
this.syncAddressRegionPaths();
|
||||
});
|
||||
},
|
||||
goodsKey(row = {}) {
|
||||
return `${row.cargoName || ''}\u0000${row.cargoType || ''}`;
|
||||
|
||||
@@ -1607,7 +1607,7 @@
|
||||
v-if="canConfirmReturn(row)"
|
||||
@click="handleAction('confirmReturn', row)"
|
||||
>
|
||||
确认回单
|
||||
{{ completeActionLabel }}
|
||||
</el-link>
|
||||
<el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
|
||||
维护里程
|
||||
@@ -4650,9 +4650,14 @@ export default {
|
||||
},
|
||||
taskCarrierValue: {
|
||||
get() {
|
||||
return this.form.carrierType === '自运'
|
||||
? this.form.carrierName || ''
|
||||
: this.form.carrierContractId || this.form.carrierName || '';
|
||||
if (this.form.carrierType === '自运') {
|
||||
return this.form.carrierName || '';
|
||||
}
|
||||
return this.taskCarrierOptionValue({
|
||||
carrierContractId: this.form.carrierContractId,
|
||||
carrierPartyId: this.form.carrierPartyId,
|
||||
carrierName: this.form.carrierName,
|
||||
});
|
||||
},
|
||||
set(value) {
|
||||
this.handleTaskCarrierChange(value);
|
||||
@@ -5116,11 +5121,16 @@ export default {
|
||||
);
|
||||
},
|
||||
canCopy(row) {
|
||||
if (!row) return false;
|
||||
// 归属本账号可见范围的运单允许复制。跨组织但项目归属本账号的记录会被标成只读，
|
||||
// 只读仅拦截编辑/删除，不拦截复制。具备查看、新增、编辑或复制权限即可使用。
|
||||
return (
|
||||
this.hasAction('copy') &&
|
||||
this.hasPermission(`${this.config.permission}_copy`) &&
|
||||
!this.readonlyScope &&
|
||||
!row.readonly
|
||||
(this.hasPermission(`${this.config.permission}_copy`) ||
|
||||
this.hasPermission(`${this.config.permission}_add`) ||
|
||||
this.hasPermission(`${this.config.permission}_edit`) ||
|
||||
this.hasPermission(`${this.config.permission}_view`))
|
||||
);
|
||||
},
|
||||
canEnable(row) {
|
||||
@@ -5168,8 +5178,12 @@ export default {
|
||||
return false;
|
||||
}
|
||||
const status = this.statusValue(row);
|
||||
// 待回单确认也可直接完成，不经确认回单
|
||||
return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
|
||||
// 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
|
||||
// 只有确认回单不可用时才退回这里的普通完成
|
||||
if (status === 'pending_return_confirm') {
|
||||
return !this.canConfirmReturn(row);
|
||||
}
|
||||
return status === 'processing' || status === 'running';
|
||||
},
|
||||
canConfirmReturn(row) {
|
||||
return (
|
||||
@@ -7281,6 +7295,8 @@ export default {
|
||||
this.form.carrierName = '';
|
||||
this.form.carrierId = '';
|
||||
this.form.carrierContractId = '';
|
||||
this.form.carrierPartyId = '';
|
||||
this.form.carrierPartyRole = '';
|
||||
this.hasProjectProcessConfig = false;
|
||||
this.waybillProcessConfigRows = [];
|
||||
return;
|
||||
@@ -7295,6 +7311,8 @@ export default {
|
||||
this.form.carrierName = '';
|
||||
this.form.carrierId = '';
|
||||
this.form.carrierContractId = '';
|
||||
this.form.carrierPartyId = '';
|
||||
this.form.carrierPartyRole = '';
|
||||
this.loadProjectProcessConfigState();
|
||||
this.loadTaskCarrierOptions(project);
|
||||
if (this.contractSelectEnabled) {
|
||||
@@ -7751,6 +7769,8 @@ export default {
|
||||
this.form.carrierName = '';
|
||||
this.form.carrierId = '';
|
||||
this.form.carrierContractId = '';
|
||||
this.form.carrierPartyId = '';
|
||||
this.form.carrierPartyRole = '';
|
||||
this.form.driverId = '';
|
||||
this.form.driverName = '';
|
||||
this.form.driverPhone = '';
|
||||
@@ -7805,7 +7825,9 @@ export default {
|
||||
},
|
||||
taskCarrierOptionValue(item = {}) {
|
||||
if (this.form.carrierType !== '自运') {
|
||||
return item.carrierContractId || item.value || item.id || '';
|
||||
if (item.value) return item.value;
|
||||
return [item.carrierContractId || item.id || '', item.carrierPartyId || '', item.carrierName || '']
|
||||
.join('__');
|
||||
}
|
||||
return (
|
||||
item.carrierName ||
|
||||
@@ -7843,55 +7865,76 @@ export default {
|
||||
names.forEach(append);
|
||||
return options;
|
||||
},
|
||||
parseContractPartyRows(partyJson, fallbackName = '', partyRole = 'B') {
|
||||
const rows = this.parseJsonArray(partyJson)
|
||||
.map(item => ({
|
||||
id: item.id || '',
|
||||
customerId: item.customerId || '',
|
||||
customerName: String(item.customerName || '').trim(),
|
||||
creditCode: item.creditCode || '',
|
||||
partyRole,
|
||||
}))
|
||||
.filter(item => item.customerName);
|
||||
if (rows.length) return rows;
|
||||
return String(fallbackName || '')
|
||||
.split(/[、,，]/)
|
||||
.map(name => name.trim())
|
||||
.filter(Boolean)
|
||||
.map(name => ({
|
||||
id: '',
|
||||
customerId: '',
|
||||
customerName: name,
|
||||
creditCode: '',
|
||||
partyRole,
|
||||
}));
|
||||
},
|
||||
getWaybillCarrierContractOptions(contracts = []) {
|
||||
const carrierNameCounts = contracts.reduce((counts, contract) => {
|
||||
const carrierName = String(
|
||||
contract.partyB ||
|
||||
contract.partyBName ||
|
||||
contract.contractPartyB ||
|
||||
contract.customerContractPartyB ||
|
||||
contract.secondParty ||
|
||||
contract.secondPartyName ||
|
||||
''
|
||||
).trim();
|
||||
if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
|
||||
return counts;
|
||||
}, {});
|
||||
return contracts
|
||||
.map(contract => {
|
||||
const carrierName = String(
|
||||
const options = [];
|
||||
contracts.forEach(contract => {
|
||||
if (!contract?.id) return;
|
||||
const parties = [
|
||||
...this.parseContractPartyRows(contract.partyBJson, contract.partyB, 'B'),
|
||||
...this.parseContractPartyRows(contract.partyCJson, contract.partyC, 'C'),
|
||||
];
|
||||
if (!parties.length) {
|
||||
const fallbackName = String(
|
||||
contract.partyB ||
|
||||
contract.partyBName ||
|
||||
contract.contractPartyB ||
|
||||
contract.customerContractPartyB ||
|
||||
contract.secondParty ||
|
||||
contract.secondPartyName ||
|
||||
''
|
||||
contract.partyBName ||
|
||||
contract.contractPartyB ||
|
||||
contract.customerContractPartyB ||
|
||||
contract.secondParty ||
|
||||
contract.secondPartyName ||
|
||||
''
|
||||
).trim();
|
||||
if (!carrierName || !contract.id) return null;
|
||||
const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
|
||||
return {
|
||||
if (fallbackName) {
|
||||
parties.push({
|
||||
id: '',
|
||||
customerId: '',
|
||||
customerName: fallbackName,
|
||||
creditCode: '',
|
||||
partyRole: 'B',
|
||||
});
|
||||
}
|
||||
}
|
||||
const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
|
||||
parties.forEach(party => {
|
||||
const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
|
||||
const optionValue = [contract.id, party.id || '', party.customerName].join('__');
|
||||
options.push({
|
||||
id: contract.id,
|
||||
carrierId:
|
||||
contract.partyBId ||
|
||||
contract.partyBUserId ||
|
||||
contract.contractPartyBId ||
|
||||
contract.customerContractPartyBId ||
|
||||
contract.secondPartyId ||
|
||||
contract.secondPartyUserId ||
|
||||
contract.carrierId ||
|
||||
'',
|
||||
value: contract.id,
|
||||
label:
|
||||
carrierNameCounts[carrierName] > 1
|
||||
? `${carrierName}（${contractIdentifier}）`
|
||||
: carrierName,
|
||||
carrierName,
|
||||
fullName: carrierName,
|
||||
carrierId: party.customerId || '',
|
||||
value: optionValue,
|
||||
label: `${party.customerName}（${roleLabel}） - ${contractIdentifier}`,
|
||||
carrierName: party.customerName,
|
||||
fullName: party.customerName,
|
||||
carrierContractId: contract.id,
|
||||
};
|
||||
})
|
||||
.filter(Boolean);
|
||||
carrierPartyId: party.id || '',
|
||||
carrierPartyRole: party.partyRole,
|
||||
creditCode: party.creditCode || '',
|
||||
});
|
||||
});
|
||||
});
|
||||
return options;
|
||||
},
|
||||
resetWaybillCarrierContractState() {
|
||||
this.waybillCarrierContractRequestId += 1;
|
||||
@@ -7921,6 +7964,8 @@ export default {
|
||||
this.form.carrierName = '';
|
||||
this.form.carrierId = '';
|
||||
this.form.carrierContractId = '';
|
||||
this.form.carrierPartyId = '';
|
||||
this.form.carrierPartyRole = '';
|
||||
}
|
||||
return options;
|
||||
})
|
||||
@@ -8011,10 +8056,14 @@ export default {
|
||||
);
|
||||
if (this.form.carrierType !== '自运') {
|
||||
this.form.carrierContractId = carrier?.carrierContractId || '';
|
||||
this.form.carrierPartyId = carrier?.carrierPartyId || '';
|
||||
this.form.carrierPartyRole = carrier?.carrierPartyRole || '';
|
||||
this.form.carrierId = carrier?.carrierId || '';
|
||||
this.form.carrierName = carrier?.carrierName || '';
|
||||
} else {
|
||||
this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
|
||||
this.form.carrierPartyId = '';
|
||||
this.form.carrierPartyRole = '';
|
||||
this.form.carrierName = value || '';
|
||||
}
|
||||
// 承运商变更后清空司机/车辆，避免跨组织脏数据
|
||||
@@ -10215,12 +10264,12 @@ export default {
|
||||
cancel: '取消',
|
||||
complete: this.completeActionLabel,
|
||||
reassign: '重新派单',
|
||||
confirmReturn: '确认回单',
|
||||
confirmReturn: '完成',
|
||||
}[action];
|
||||
// 确认回单是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
|
||||
// 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
|
||||
const confirmText =
|
||||
action === 'confirmReturn'
|
||||
? '确认回单后该运单将置为已完成，且不可撤销。是否继续?'
|
||||
? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
|
||||
: `确定${actionName}该${this.config.title}?`;
|
||||
this.$confirm(confirmText, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
<template>
|
||||
<mk-public-shell biz-type="contract-change" :get-form="getForm">
|
||||
<contract-manage-change ref="page" />
|
||||
</mk-public-shell>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import MkPublicShell from '@/views/mk/mk-public-shell.vue';
|
||||
import ContractManageChange from '@/views/business/contract-manage-change.vue';
|
||||
|
||||
export default {
|
||||
name: 'ContractChangePublicView',
|
||||
components: { MkPublicShell, ContractManageChange },
|
||||
methods: {
|
||||
getForm() {
|
||||
const row = this.$refs.page?.form || {};
|
||||
return { ...row, subject: row.contractName || row.contractNo || '' };
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@@ -0,0 +1,407 @@
|
||||
<template>
|
||||
<basic-container class="contract-change-page">
|
||||
<avue-crud
|
||||
:option="tableOption"
|
||||
:table-loading="loading"
|
||||
:data="data"
|
||||
v-model:page="page"
|
||||
v-model="tableForm"
|
||||
ref="crud"
|
||||
:permission="permissionList"
|
||||
@search-change="searchChange"
|
||||
@search-reset="searchReset"
|
||||
@selection-change="selectionChange"
|
||||
@current-change="currentChange"
|
||||
@size-change="sizeChange"
|
||||
@refresh-change="refreshChange"
|
||||
@on-load="onLoad"
|
||||
>
|
||||
<template #menu-left>
|
||||
<el-button type="primary" plain :loading="hcsRepushingId === 'batch'" @click="handleHcsBatchRepush">
|
||||
批量同步
|
||||
</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
plain
|
||||
v-if="hasPermission(`${config.permission}_delete`)"
|
||||
@click="handleDelete"
|
||||
>
|
||||
批量删除
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
<template #approvalStatus="{ row }">
|
||||
{{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
|
||||
</template>
|
||||
|
||||
<template #syncStatus="{ row }">
|
||||
<el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
|
||||
{{ syncLabel(row.syncStatus) }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
|
||||
<template #menu="{ row }">
|
||||
<el-link type="primary" v-if="canView(row)" @click="openForm('view', row)"> 查看 </el-link>
|
||||
<el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)"> 编辑 </el-link>
|
||||
<el-link type="danger" v-if="canDelete(row)" @click="rowDel(row)"> 删除 </el-link>
|
||||
<el-link
|
||||
v-for="operation in customOperations(row)"
|
||||
:key="operation.action"
|
||||
:type="
|
||||
operation.type === 'warning'
|
||||
? 'warning'
|
||||
: operation.type === 'success'
|
||||
? 'success'
|
||||
: 'primary'
|
||||
"
|
||||
@click="handleCustomOperation(operation, row)"
|
||||
>
|
||||
{{ operation.label }}
|
||||
</el-link>
|
||||
</template>
|
||||
</avue-crud>
|
||||
</basic-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as api from '@/api/business/contract-change';
|
||||
import { repushBatch as hcsRepushBatch } from '@/api/business/hcs';
|
||||
import { getMKApprovalUrl } from '@/api/system/business-process';
|
||||
import { config, option } from '@/option/business/contract-change';
|
||||
import { approvalStatusOptions } from '@/option/business/common';
|
||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||
import { isAdministrator } from '@/utils/auth';
|
||||
import { mapGetters } from 'vuex';
|
||||
|
||||
const contractChangeFormRoute = '/business/contract-change/form';
|
||||
const contractChangeListRefreshKey = 'contract-change-list-refresh';
|
||||
|
||||
export default {
|
||||
name: 'ContractChange',
|
||||
data() {
|
||||
return {
|
||||
api,
|
||||
config,
|
||||
tableForm: {},
|
||||
tableOption: this.buildTableOption(),
|
||||
loading: true,
|
||||
data: [],
|
||||
page: {
|
||||
pageSize: 10,
|
||||
currentPage: 1,
|
||||
total: 0,
|
||||
},
|
||||
query: {},
|
||||
selectionList: [],
|
||||
mkEnabled: false,
|
||||
hcsRepushingId: null,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo', 'website']),
|
||||
permissionList() {
|
||||
return {
|
||||
addBtn: false,
|
||||
viewBtn: false,
|
||||
delBtn: false,
|
||||
editBtn: false,
|
||||
};
|
||||
},
|
||||
isAdmin() {
|
||||
return isAdministrator(this.userInfo);
|
||||
},
|
||||
ids() {
|
||||
return this.selectionList.map(item => item.id).join(',');
|
||||
},
|
||||
},
|
||||
created() {
|
||||
loadMkEnabled()
|
||||
.then(enabled => {
|
||||
this.mkEnabled = enabled;
|
||||
})
|
||||
.catch(() => {
|
||||
this.mkEnabled = false;
|
||||
});
|
||||
},
|
||||
activated() {
|
||||
if (sessionStorage.getItem(contractChangeListRefreshKey)) {
|
||||
sessionStorage.removeItem(contractChangeListRefreshKey);
|
||||
this.onLoad(this.page, this.query);
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
buildTableOption() {
|
||||
return {
|
||||
...option,
|
||||
addBtn: false,
|
||||
viewBtn: false,
|
||||
editBtn: false,
|
||||
delBtn: false,
|
||||
menuWidth: 320,
|
||||
column: (option.column || []).map(column => ({
|
||||
...column,
|
||||
display: false,
|
||||
align: 'center',
|
||||
headerAlign: 'center',
|
||||
})),
|
||||
};
|
||||
},
|
||||
hasPermission(code) {
|
||||
return this.isAdmin || this.validData(this.permission && this.permission[code], false);
|
||||
},
|
||||
statusLabel(status) {
|
||||
return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
|
||||
},
|
||||
syncLabel(value) {
|
||||
return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
|
||||
},
|
||||
syncTagType(value) {
|
||||
return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
|
||||
},
|
||||
canHcsRepush(row) {
|
||||
return row.approvalStatus === 'approved' && row.contractId && row.syncStatus !== 'synced';
|
||||
},
|
||||
handleHcsBatchRepush() {
|
||||
if (this.hcsRepushingId) return;
|
||||
if (!this.selectionList.length) {
|
||||
this.$message.warning('请选择至少一条数据');
|
||||
return;
|
||||
}
|
||||
const rows = this.selectionList.filter(item => this.canHcsRepush(item));
|
||||
if (!rows.length) {
|
||||
this.$message.warning('请选择审批通过且未同步成功的变更单');
|
||||
return;
|
||||
}
|
||||
this.$confirm(`确定同步选中的${rows.length}条合同变更到合规系统?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: '正在推送合规，请稍候…',
|
||||
background: 'rgba(255, 255, 255, 0.6)',
|
||||
});
|
||||
this.hcsRepushingId = 'batch';
|
||||
const contractIds = [...new Set(rows.map(item => item.contractId))];
|
||||
const changeIds = rows.map(item => item.id).join(',');
|
||||
hcsRepushBatch('contract', contractIds)
|
||||
.then(res => {
|
||||
if (res.data?.success === false) {
|
||||
this.$message.error(res.data?.msg || '批量同步失败');
|
||||
return api.markSyncStatus(changeIds, 'failed');
|
||||
}
|
||||
return api.markSyncStatus(changeIds, 'synced').then(() => {
|
||||
this.$message.success(res.data?.data || '批量同步成功');
|
||||
this.onLoad(this.page, this.query);
|
||||
});
|
||||
})
|
||||
.catch(() => api.markSyncStatus(changeIds, 'failed'))
|
||||
.finally(() => {
|
||||
this.hcsRepushingId = null;
|
||||
loading.close();
|
||||
});
|
||||
});
|
||||
},
|
||||
inStatus(row, statusList) {
|
||||
if (!statusList || !statusList.length) return true;
|
||||
return statusList.includes(row.approvalStatus);
|
||||
},
|
||||
canEdit(row) {
|
||||
return (
|
||||
this.hasPermission(`${this.config.permission}_edit`) &&
|
||||
!row.readonly &&
|
||||
this.inStatus(row, this.config.editStatus)
|
||||
);
|
||||
},
|
||||
canDelete(row) {
|
||||
return (
|
||||
this.hasPermission(`${this.config.permission}_delete`) &&
|
||||
!row.readonly &&
|
||||
this.inStatus(row, this.config.deleteStatus)
|
||||
);
|
||||
},
|
||||
canView(row) {
|
||||
return (
|
||||
this.hasPermission(`${this.config.permission}_view`) &&
|
||||
this.inStatus(row, this.config.viewStatus)
|
||||
);
|
||||
},
|
||||
canOperation(operation, row) {
|
||||
if (operation.permission && !this.hasPermission(operation.permission)) return false;
|
||||
if (
|
||||
row.readonly &&
|
||||
['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return this.inStatus(row, operation.status);
|
||||
},
|
||||
customOperations(row) {
|
||||
return (this.config.operations || []).filter(operation => {
|
||||
if (operation.mkOnly && !this.mkEnabled) return false;
|
||||
if (operation.localOnly && this.mkEnabled) return false;
|
||||
return this.canOperation(operation, row);
|
||||
});
|
||||
},
|
||||
openForm(mode, row = {}) {
|
||||
const query = { mode, id: row.id };
|
||||
if (mode === 'edit') query.name = '编辑合同变更';
|
||||
else if (mode === 'view') query.name = '查看合同变更';
|
||||
this.$router.push({ path: contractChangeFormRoute, query });
|
||||
},
|
||||
handleCustomOperation(operation, row) {
|
||||
if (operation.action === 'mkAudit') {
|
||||
this.handleMkAudit(row);
|
||||
return;
|
||||
}
|
||||
const run = () => {
|
||||
const request = () => this.api[operation.action](row.id);
|
||||
const afterMk =
|
||||
operation.action === 'submitApproval'
|
||||
? submitMkApprovalFlow({
|
||||
bizType: 'contract-change',
|
||||
bizId: row.id,
|
||||
subjectName: row.contractName || '',
|
||||
approvalStatus: row.approvalStatus || '',
|
||||
mkEnabled: this.mkEnabled,
|
||||
}).then(() => request())
|
||||
: request();
|
||||
const loading =
|
||||
operation.action === 'approve'
|
||||
? this.$loading({
|
||||
lock: true,
|
||||
text: '正在推送合规，请稍候…',
|
||||
background: 'rgba(255, 255, 255, 0.6)',
|
||||
})
|
||||
: null;
|
||||
afterMk
|
||||
.then(res => {
|
||||
if (operation.action === 'approve' && res.data?.data === false) {
|
||||
this.$message.warning(res.data?.msg);
|
||||
this.onLoad(this.page, this.query);
|
||||
return;
|
||||
}
|
||||
if (res.data?.success === false) {
|
||||
this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
|
||||
return;
|
||||
}
|
||||
this.$message.success(`${operation.label}成功`);
|
||||
this.onLoad(this.page, this.query);
|
||||
})
|
||||
.finally(() => loading && loading.close());
|
||||
};
|
||||
this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => run());
|
||||
},
|
||||
handleMkAudit(row) {
|
||||
if (!row?.id) {
|
||||
this.$message.warning('变更单ID为空，无法打开审核页');
|
||||
return;
|
||||
}
|
||||
getMKApprovalUrl({ bizId: String(row.id) })
|
||||
.then(res => {
|
||||
const url = res?.data?.data;
|
||||
if (!url) {
|
||||
this.$message.error('获取审核跳转地址失败');
|
||||
return;
|
||||
}
|
||||
window.open(url, '_blank');
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message.error('获取审核跳转地址失败');
|
||||
});
|
||||
},
|
||||
searchReset() {
|
||||
this.query = {};
|
||||
this.onLoad(this.page);
|
||||
},
|
||||
searchChange(params, done) {
|
||||
this.query = params;
|
||||
this.page.currentPage = 1;
|
||||
this.onLoad(this.page, params);
|
||||
done();
|
||||
},
|
||||
selectionChange(list) {
|
||||
this.selectionList = list;
|
||||
},
|
||||
selectionClear() {
|
||||
this.selectionList = [];
|
||||
this.$refs.crud?.toggleSelection?.();
|
||||
},
|
||||
currentChange(currentPage) {
|
||||
this.page.currentPage = currentPage;
|
||||
},
|
||||
sizeChange(pageSize) {
|
||||
this.page.pageSize = pageSize;
|
||||
},
|
||||
refreshChange() {
|
||||
this.onLoad(this.page, this.query);
|
||||
},
|
||||
rowDel(row) {
|
||||
this.$confirm('确定将选择数据删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
this.api.remove(row.id).then(() => {
|
||||
this.$message.success('删除成功!');
|
||||
this.onLoad(this.page, this.query);
|
||||
});
|
||||
});
|
||||
},
|
||||
handleDelete() {
|
||||
if (!this.selectionList.length) {
|
||||
this.$message.warning('请选择至少一条数据');
|
||||
return;
|
||||
}
|
||||
this.$confirm('确定将选择数据删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
this.api.remove(this.ids).then(() => {
|
||||
this.$message.success('删除成功!');
|
||||
this.selectionClear();
|
||||
this.onLoad(this.page, this.query);
|
||||
});
|
||||
});
|
||||
},
|
||||
onLoad(page, params = {}) {
|
||||
this.loading = true;
|
||||
const values = {
|
||||
...this.query,
|
||||
...params,
|
||||
};
|
||||
this.api
|
||||
.getList(page.currentPage, page.pageSize, values)
|
||||
.then(res => {
|
||||
const data = res.data.data || {};
|
||||
this.page.total = data.total || 0;
|
||||
this.data = data.records || [];
|
||||
this.loading = false;
|
||||
this.selectionClear();
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.contract-change-page {
|
||||
:deep(.avue-crud__menu) {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,12 +1,20 @@
|
||||
<template>
|
||||
<basic-container class="contract-change-page">
|
||||
<div class="archive-page-form__title">{{ pageTitle }}</div>
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto" class="contract-change-form">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
:disabled="pageReadonly"
|
||||
label-position="right"
|
||||
label-width="auto"
|
||||
class="contract-change-form"
|
||||
>
|
||||
<section class="change-section contract-basic-section">
|
||||
<div class="dialog-section-title">基本信息</div>
|
||||
<div class="contract-basic-section__grid">
|
||||
<el-form-item label="变更类型" class="contract-basic-section__change-type">
|
||||
<el-radio-group v-model="form.changeType">
|
||||
<el-radio-group v-model="form.changeType" :disabled="pageReadonly">
|
||||
<el-radio label="合同信息变更" />
|
||||
<el-radio label="结算规则变更" />
|
||||
<el-radio label="终止合同" />
|
||||
@@ -280,7 +288,7 @@
|
||||
<div class="section-head">
|
||||
<div class="dialog-section-title">计费信息</div>
|
||||
<el-button
|
||||
v-if="feeGenerationMode !== 'manual'"
|
||||
v-if="!pageReadonly && feeGenerationMode !== 'manual'"
|
||||
type="primary"
|
||||
plain
|
||||
@click="addPlan"
|
||||
@@ -291,24 +299,27 @@
|
||||
><el-radio label="system">系统生成</el-radio
|
||||
><el-radio label="manual">账单导入生成</el-radio></el-radio-group
|
||||
>
|
||||
<el-table :data="plans" border class="change-table"
|
||||
><el-table-column type="index" label="序号" width="70" /><el-table-column
|
||||
prop="planName"
|
||||
label="方案名称"
|
||||
min-width="220"
|
||||
/><el-table-column label="默认方案" min-width="120"
|
||||
><template #default="{ row }">{{
|
||||
row.defaultPlan ? '是' : '否'
|
||||
}}</template></el-table-column
|
||||
><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
|
||||
label="操作"
|
||||
width="180"
|
||||
><template #default="{ row, $index }"
|
||||
><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
|
||||
><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
|
||||
></el-table-column
|
||||
></el-table
|
||||
>
|
||||
<el-table :data="plans" border class="change-table">
|
||||
<el-table-column type="index" label="序号" width="70" />
|
||||
<el-table-column prop="planName" label="方案名称" min-width="180" />
|
||||
<el-table-column label="适用客商" min-width="180">
|
||||
<template #default="{ row }">
|
||||
{{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" min-width="200" />
|
||||
<el-table-column v-if="!pageReadonly" label="操作" width="180">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
|
||||
<el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-else label="操作" width="100">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section>
|
||||
|
||||
<section class="change-section">
|
||||
@@ -416,7 +427,7 @@
|
||||
:value="item.value"
|
||||
/></el-select></template
|
||||
></el-table-column>
|
||||
<el-table-column label="操作" width="100"
|
||||
<el-table-column v-if="!pageReadonly" label="操作" width="100"
|
||||
><template #default="{ $index }"
|
||||
><el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link
|
||||
><el-link v-else type="danger" @click="removeCustomPeriodRow($index)"
|
||||
@@ -425,7 +436,7 @@
|
||||
></el-table-column
|
||||
>
|
||||
<template #empty
|
||||
><el-link type="primary" @click="addCustomPeriodRow">添加</el-link></template
|
||||
><el-link v-if="!pageReadonly" type="primary" @click="addCustomPeriodRow">添加</el-link></template
|
||||
>
|
||||
</el-table>
|
||||
</section>
|
||||
@@ -461,7 +472,7 @@
|
||||
:disabled="isSettlementRuleChange"
|
||||
/></template
|
||||
></el-table-column>
|
||||
<el-table-column v-if="!isSettlementRuleChange" label="操作" width="100"
|
||||
<el-table-column v-if="!pageReadonly && !isSettlementRuleChange" label="操作" width="100"
|
||||
><template #default="{ $index }"
|
||||
><el-link type="danger" @click="paymentRatioRows.splice($index, 1)"
|
||||
>删除</el-link
|
||||
@@ -470,7 +481,7 @@
|
||||
>
|
||||
</el-table>
|
||||
<el-button
|
||||
v-if="!isSettlementRuleChange"
|
||||
v-if="!pageReadonly && !isSettlementRuleChange"
|
||||
type="primary"
|
||||
plain
|
||||
@click="addPaymentRatioRow"
|
||||
@@ -482,7 +493,9 @@
|
||||
v-model="planDialogVisible"
|
||||
:value="planEditor"
|
||||
:index="planEditorIndex"
|
||||
:readonly="pageReadonly"
|
||||
:settlement-currency="form.settlementCurrency"
|
||||
:party-options="billingPartyOptions"
|
||||
@save="savePlan"
|
||||
/>
|
||||
|
||||
@@ -525,8 +538,9 @@
|
||||
@update:rows="changeMaterials = $event"
|
||||
@upload-to-location="handleAttachmentUploadToLocation"
|
||||
/>
|
||||
<div class="page-footer">
|
||||
<el-button @click="$router.back()">取消</el-button>
|
||||
<div v-if="!pageReadonly" class="page-footer">
|
||||
<el-button @click="goBack">取消</el-button>
|
||||
<el-button v-if="isContractChangeModule" @click="saveDraft">保存草稿</el-button>
|
||||
<el-button type="primary" @click="submit">提交</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
@@ -539,7 +553,9 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as api from '@/api/business/contract-manage';
|
||||
import * as contractApi from '@/api/business/contract-manage';
|
||||
import * as changeApi from '@/api/business/contract-change';
|
||||
import { getMkPublicDetail } from '@/api/mk-process';
|
||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||
import BillingPlanEditor from './components/billing-plan-editor.vue';
|
||||
import ContractAttachmentSection, {
|
||||
@@ -577,6 +593,8 @@ const defaultContractFormatOptions = [
|
||||
{ label: '电子合同', value: '电子合同' },
|
||||
{ label: '纸质合同', value: '纸质合同' },
|
||||
];
|
||||
const contractChangeListRoute = '/business/contract-change';
|
||||
const contractChangeListRefreshKey = 'contract-change-list-refresh';
|
||||
const normalizeOptionalPositiveInteger = value => {
|
||||
if (value === undefined || value === null || value === '') return null;
|
||||
const number = Number(value);
|
||||
@@ -616,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
|
||||
endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
|
||||
}));
|
||||
|
||||
const createPartyRow = (row = {}) => ({
|
||||
id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
|
||||
customerId: row.customerId || '',
|
||||
customerName: row.customerName || '',
|
||||
creditCode: row.creditCode || row.unifiedCreditCode || '',
|
||||
contactId: row.contactId || '',
|
||||
contactName: row.contactName || '',
|
||||
contactPhone: row.contactPhone || '',
|
||||
});
|
||||
|
||||
const partyRoleLabel = role => {
|
||||
if (role === 'A') return '甲方';
|
||||
if (role === 'B') return '乙方';
|
||||
if (role === 'C') return '丙方';
|
||||
return role || '';
|
||||
};
|
||||
|
||||
const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
|
||||
const rows = (() => {
|
||||
if (Array.isArray(partyJson)) return partyJson;
|
||||
if (!partyJson) return [];
|
||||
try {
|
||||
const data = JSON.parse(partyJson);
|
||||
return Array.isArray(data) ? data : [];
|
||||
} catch (error) {
|
||||
return [];
|
||||
}
|
||||
})().map(item => createPartyRow(item));
|
||||
if (rows.length) return rows;
|
||||
if (fallbackName) {
|
||||
return String(fallbackName)
|
||||
.split(/[、,]/)
|
||||
.map(name => name.trim())
|
||||
.filter(Boolean)
|
||||
.map(name => createPartyRow({ customerName: name }));
|
||||
}
|
||||
return requireOne ? [createPartyRow()] : [];
|
||||
};
|
||||
|
||||
export default {
|
||||
components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
|
||||
data() {
|
||||
@@ -623,6 +680,9 @@ export default {
|
||||
form: {},
|
||||
period: [],
|
||||
plans: [],
|
||||
partyARows: [],
|
||||
partyBRows: [],
|
||||
partyCRows: [],
|
||||
attachments: [],
|
||||
contractFiles: [],
|
||||
contractFileRows: [],
|
||||
@@ -661,7 +721,7 @@ export default {
|
||||
settlementModeDictOptions: [],
|
||||
contractFormatDictOptions: [],
|
||||
planDialogVisible: false,
|
||||
planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
|
||||
planEditor: { planName: '', remark: '', rules: [] },
|
||||
planEditorIndex: -1,
|
||||
billingElements: [
|
||||
'按重量',
|
||||
@@ -713,8 +773,21 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
pageTitle() {
|
||||
if (this.pageReadonly) return this.$route.query.name || '查看合同变更';
|
||||
return this.$route.query.name || '合同变更';
|
||||
},
|
||||
isContractChangeModule() {
|
||||
return (
|
||||
this.$route.path === '/business/contract-change/form' ||
|
||||
this.$route.path === '/business/contract-change/public-view'
|
||||
);
|
||||
},
|
||||
isPublicViewPage() {
|
||||
return this.$route.path === '/business/contract-change/public-view';
|
||||
},
|
||||
pageReadonly() {
|
||||
return this.isPublicViewPage || this.$route.query.mode === 'view';
|
||||
},
|
||||
// 高风险/黑名单客商提示：按合同推送合规留痕 hcs_risk_level/hcs_black_status 判定（与合同详情口径一致）
|
||||
riskTipText() {
|
||||
const riskLevel = String(this.form.hcsRiskLevel || '').trim();
|
||||
@@ -729,6 +802,29 @@ export default {
|
||||
isSettlementRuleChange() {
|
||||
return this.form.changeType === '结算规则变更';
|
||||
},
|
||||
/**
|
||||
* 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
|
||||
*/
|
||||
billingPartyOptions() {
|
||||
const category = String(this.form.contractCategory || '').trim();
|
||||
const allowedRoles =
|
||||
category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
|
||||
return [
|
||||
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
|
||||
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
|
||||
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
|
||||
]
|
||||
.filter(row => allowedRoles.includes(row.partyRole))
|
||||
.filter(row => row.customerName || row.customerId)
|
||||
.map(row => ({
|
||||
value: row.id,
|
||||
label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
|
||||
partyRole: row.partyRole,
|
||||
partyRowId: row.id,
|
||||
customerId: row.customerId,
|
||||
customerName: row.customerName,
|
||||
}));
|
||||
},
|
||||
changeAttachmentLocationOptions() {
|
||||
if (this.isSettlementRuleChange) {
|
||||
return ['变更材料'];
|
||||
@@ -833,13 +929,25 @@ export default {
|
||||
async load() {
|
||||
const id = this.$route.query.id;
|
||||
if (!id) return;
|
||||
const res = await api.getDetail(id);
|
||||
const data = res.data?.data || res.data || {};
|
||||
let data = {};
|
||||
if (this.isPublicViewPage) {
|
||||
const res = await getMkPublicDetail('contract-change', id);
|
||||
data = res.data?.data || res.data || {};
|
||||
} else if (this.isContractChangeModule) {
|
||||
const res = await changeApi.getDetail(id);
|
||||
data = res.data?.data || res.data || {};
|
||||
} else {
|
||||
const res = await contractApi.getDetail(id);
|
||||
data = res.data?.data || res.data || {};
|
||||
}
|
||||
const isChangeRecord = this.isContractChangeModule || this.isPublicViewPage;
|
||||
this.form = {
|
||||
...data,
|
||||
changeContent: '',
|
||||
changeReason: '',
|
||||
changeAttachmentsJson: '',
|
||||
// 独立变更单保留 contractId；旧路由以合同 id 作为主键
|
||||
contractId: data.contractId || (isChangeRecord ? data.contractId : data.id),
|
||||
changeContent: isChangeRecord ? data.changeContent || '' : '',
|
||||
changeReason: isChangeRecord ? data.changeReason || '' : '',
|
||||
changeAttachmentsJson: data.changeAttachmentsJson || '',
|
||||
copyCount: normalizeOptionalPositiveInteger(data.copyCount),
|
||||
invoiceCycle: normalizeOptionalPositiveInteger(data.invoiceCycle),
|
||||
paymentDays: normalizeOptionalPositiveInteger(data.paymentDays),
|
||||
@@ -847,14 +955,17 @@ export default {
|
||||
templateFlag: data.templateFlag ?? 0,
|
||||
electronicSealFlag: data.electronicSealFlag ?? 0,
|
||||
archiveStatus: data.archiveStatus || '未归档',
|
||||
changeType: '合同信息变更',
|
||||
changeType: data.changeType || '合同信息变更',
|
||||
};
|
||||
this.changeMaterials = [];
|
||||
this.changeMaterials = this.parse(data.changeAttachmentsJson);
|
||||
this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
|
||||
this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
|
||||
this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
|
||||
this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
|
||||
this.plans = this.parse(data.billingPlanJson);
|
||||
this.attachments = this.mergeChangeAttachments(
|
||||
this.parse(data.attachmentsJson),
|
||||
this.parse(data.changeAttachmentsJson)
|
||||
isChangeRecord ? [] : this.parse(data.changeAttachmentsJson)
|
||||
);
|
||||
this.contractFileRows = normalizeContractFileRows(this.parse(data.contractFileJson));
|
||||
const rules = this.parseObject(data.settlementRuleJson);
|
||||
@@ -896,6 +1007,70 @@ export default {
|
||||
data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
|
||||
this.paymentRatioRows = this.parse(data.paymentRatioJson);
|
||||
},
|
||||
goBack() {
|
||||
if (this.isContractChangeModule) {
|
||||
this.$router.push(contractChangeListRoute);
|
||||
return;
|
||||
}
|
||||
this.$router.back();
|
||||
},
|
||||
buildChangePayload() {
|
||||
if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule };
|
||||
else this.formalSettlementConfig = { ...this.settlementRule };
|
||||
const settlementRule = {
|
||||
preSettlementConfig: this.preSettlementConfig,
|
||||
formalSettlementConfig: this.formalSettlementConfig,
|
||||
};
|
||||
if (this.isSettlementRuleChange) {
|
||||
return {
|
||||
id: this.form.id,
|
||||
contractId: this.form.contractId,
|
||||
changeType: this.form.changeType,
|
||||
changeContent: this.form.changeContent,
|
||||
changeReason: this.form.changeReason,
|
||||
feeGenerationMode: this.feeGenerationMode,
|
||||
billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
|
||||
billingPlanJson: JSON.stringify(this.plans),
|
||||
settlementRuleJson: JSON.stringify(settlementRule),
|
||||
preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
|
||||
formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
|
||||
changeAttachmentsJson: JSON.stringify(this.changeMaterials),
|
||||
};
|
||||
}
|
||||
return {
|
||||
...this.form,
|
||||
contractId: this.form.contractId,
|
||||
changeType: this.form.changeType || '合同信息变更',
|
||||
settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB',
|
||||
copyCount: normalizeOptionalPositiveInteger(this.form.copyCount),
|
||||
invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle),
|
||||
paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays),
|
||||
contractAmount: normalizeOptionalAmount(this.form.contractAmount),
|
||||
startDate: this.period[0],
|
||||
endDate: this.period[1],
|
||||
feeGenerationMode: this.feeGenerationMode,
|
||||
billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
|
||||
billingPlanJson: JSON.stringify(this.plans),
|
||||
settlementRuleJson: JSON.stringify(settlementRule),
|
||||
preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
|
||||
formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
|
||||
paymentRatioJson: JSON.stringify(this.paymentRatioRows),
|
||||
contractFileJson: JSON.stringify(this.contractFileRows),
|
||||
attachmentsJson: JSON.stringify(this.attachments),
|
||||
changeContent: this.form.changeContent,
|
||||
changeReason: this.form.changeReason,
|
||||
changeAttachmentsJson: JSON.stringify(this.changeMaterials),
|
||||
};
|
||||
},
|
||||
async saveDraft() {
|
||||
if (this.form.changeType === '终止合同') {
|
||||
this.$message.warning('终止合同无需保存草稿，请直接提交');
|
||||
return;
|
||||
}
|
||||
const payload = this.buildChangePayload();
|
||||
await changeApi.saveDraft(payload);
|
||||
this.$message.success('草稿已保存');
|
||||
},
|
||||
parse(value) {
|
||||
try {
|
||||
const result = JSON.parse(value || '[]');
|
||||
@@ -945,10 +1120,32 @@ export default {
|
||||
.replace(/\D/g, '')
|
||||
.replace(/^0+/, '');
|
||||
},
|
||||
addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
|
||||
editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
|
||||
toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
|
||||
savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
|
||||
addPlan() {
|
||||
this.planEditorIndex = -1;
|
||||
this.planEditor = {
|
||||
planName: `计费方案${this.plans.length + 1}`,
|
||||
remark: '',
|
||||
rules: [{}],
|
||||
};
|
||||
this.planDialogVisible = true;
|
||||
},
|
||||
editPlan(row, index) {
|
||||
this.planEditorIndex = index;
|
||||
this.planEditor = JSON.parse(JSON.stringify(row));
|
||||
this.planDialogVisible = true;
|
||||
},
|
||||
billingPlanCustomerLabel(row) {
|
||||
const matched = this.billingPartyOptions.find(
|
||||
item => String(item.partyRowId) === String(row.partyRowId)
|
||||
);
|
||||
return matched?.label || row.customerName || '';
|
||||
},
|
||||
savePlan(value, index) {
|
||||
const nextPlan = { ...value };
|
||||
delete nextPlan.defaultPlan;
|
||||
if (index < 0) this.plans.push(nextPlan);
|
||||
else this.plans.splice(index, 1, nextPlan);
|
||||
},
|
||||
handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
|
||||
handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
|
||||
attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
|
||||
@@ -989,9 +1186,10 @@ export default {
|
||||
validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
|
||||
async submit() {
|
||||
if (this.form.changeType === '终止合同') {
|
||||
await api.terminate(this.form.id, this.form.changeReason);
|
||||
const contractId = this.form.contractId || this.form.id;
|
||||
await contractApi.terminate(contractId, this.form.changeReason);
|
||||
this.$message.success('合同已终止');
|
||||
this.$router.back();
|
||||
this.goBack();
|
||||
return;
|
||||
}
|
||||
await this.$refs.formRef.validate();
|
||||
@@ -1020,48 +1218,22 @@ export default {
|
||||
) {
|
||||
return;
|
||||
}
|
||||
const settlementRule = {
|
||||
preSettlementConfig: this.preSettlementConfig,
|
||||
formalSettlementConfig: this.formalSettlementConfig,
|
||||
};
|
||||
const payload = this.isSettlementRuleChange
|
||||
? {
|
||||
id: this.form.id,
|
||||
changeType: this.form.changeType,
|
||||
changeContent: this.form.changeContent,
|
||||
changeReason: this.form.changeReason,
|
||||
feeGenerationMode: this.feeGenerationMode,
|
||||
billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
|
||||
billingPlanJson: JSON.stringify(this.plans),
|
||||
settlementRuleJson: JSON.stringify(settlementRule),
|
||||
preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
|
||||
formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
|
||||
changeAttachmentsJson: JSON.stringify(this.changeMaterials),
|
||||
}
|
||||
: {
|
||||
...this.form,
|
||||
changeType: this.form.changeType || '合同信息变更',
|
||||
settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB',
|
||||
copyCount: normalizeOptionalPositiveInteger(this.form.copyCount),
|
||||
invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle),
|
||||
paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays),
|
||||
contractAmount: normalizeOptionalAmount(this.form.contractAmount),
|
||||
startDate: this.period[0],
|
||||
endDate: this.period[1],
|
||||
feeGenerationMode: this.feeGenerationMode,
|
||||
billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
|
||||
billingPlanJson: JSON.stringify(this.plans),
|
||||
settlementRuleJson: JSON.stringify(settlementRule),
|
||||
preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
|
||||
formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
|
||||
paymentRatioJson: JSON.stringify(this.paymentRatioRows),
|
||||
contractFileJson: JSON.stringify(this.contractFileRows),
|
||||
attachmentsJson: JSON.stringify(this.attachments),
|
||||
changeContent: this.form.changeContent,
|
||||
changeReason: this.form.changeReason,
|
||||
changeAttachmentsJson: JSON.stringify(this.changeMaterials),
|
||||
};
|
||||
await api.submitChange(payload);
|
||||
const payload = this.buildChangePayload();
|
||||
if (this.isContractChangeModule) {
|
||||
await changeApi.submit(payload);
|
||||
await submitMkApprovalFlow({
|
||||
bizType: 'contract-change',
|
||||
bizId: this.form.id,
|
||||
subjectName: this.form.contractName || '',
|
||||
approvalStatus: this.form.approvalStatus || '',
|
||||
mkEnabled: await loadMkEnabled().catch(() => false),
|
||||
});
|
||||
sessionStorage.setItem(contractChangeListRefreshKey, '1');
|
||||
this.$message.success('变更已提交');
|
||||
this.$router.push(contractChangeListRoute);
|
||||
return;
|
||||
}
|
||||
await contractApi.submitChange(payload);
|
||||
await submitMkApprovalFlow({
|
||||
bizType: 'contract-manage',
|
||||
bizId: this.form.id,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -898,16 +898,6 @@
|
||||
>
|
||||
<div title="配载信息" class="loading-manage-dialog__load-info-card">
|
||||
<section-card>
|
||||
<div class="loading-manage-dialog__admission-tip">
|
||||
<div class="loading-manage-dialog__admission-title">可配载条件</div>
|
||||
<div class="loading-manage-dialog__admission-text">
|
||||
同时满足以下条件的运单可被配载：运输方式为「公路」；运单状态为「待执行」或「进行中」；未关联其他有效配载单；同一配载单的子运单须属同一项目，且承运商合同乙方须存在共同可选值（按各子单客户合同甲方匹配后取交集）。
|
||||
</div>
|
||||
<div class="loading-manage-dialog__admission-title">配载后状态说明</div>
|
||||
<div class="loading-manage-dialog__admission-text">
|
||||
子运单：按项目过程配置是否需司机接单，无需接单则为进行中，需接单则为待执行。配载单：按所选运单所属项目的过程配置，需接单则为待执行，无需接单则为进行中。
|
||||
</div>
|
||||
</div>
|
||||
<div class="loading-manage-dialog__candidate-search">
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="6">
|
||||
@@ -1458,7 +1448,7 @@
|
||||
<el-select
|
||||
:model-value="
|
||||
dialogForm.carrierType === '承运商'
|
||||
? dialogForm.carrierContractId
|
||||
? taskCarrierSelectedValue
|
||||
: dialogForm.carrierName
|
||||
"
|
||||
clearable
|
||||
@@ -1475,7 +1465,7 @@
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskCarrierOptions"
|
||||
:key="item.id || item.carrierName"
|
||||
:key="carrierOptionValue(item)"
|
||||
:label="
|
||||
dialogForm.carrierType === '承运商'
|
||||
? formatTaskCarrierContractLabel(item)
|
||||
@@ -1483,7 +1473,7 @@
|
||||
"
|
||||
:value="
|
||||
dialogForm.carrierType === '承运商'
|
||||
? item.id
|
||||
? carrierOptionValue(item)
|
||||
: item.carrierName || item.partyB
|
||||
"
|
||||
/>
|
||||
@@ -1963,6 +1953,8 @@ const createDialogForm = () => ({
|
||||
carrierType: '承运商',
|
||||
carrierName: '',
|
||||
carrierContractId: '',
|
||||
carrierPartyId: '',
|
||||
carrierPartyRole: '',
|
||||
escortName: '',
|
||||
escortPhone: '',
|
||||
departureAddress: '',
|
||||
@@ -2266,6 +2258,13 @@ export default {
|
||||
if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
|
||||
return '请选择';
|
||||
},
|
||||
taskCarrierSelectedValue() {
|
||||
return this.carrierOptionValue({
|
||||
id: this.dialogForm.carrierContractId,
|
||||
carrierPartyId: this.dialogForm.carrierPartyId,
|
||||
carrierName: this.dialogForm.carrierName,
|
||||
});
|
||||
},
|
||||
detailStatusType() {
|
||||
const typeMap = {
|
||||
pending: 'success',
|
||||
@@ -2401,11 +2400,23 @@ export default {
|
||||
driverOptionText,
|
||||
formatTaskCarrierContractLabel(item = {}) {
|
||||
const carrierName = item.carrierName || item.partyB || '';
|
||||
const roleLabel =
|
||||
item.carrierPartyRole === 'C' || item.carrierPartyRole === '丙'
|
||||
? '丙方'
|
||||
: item.carrierPartyRole === 'B' || item.carrierPartyRole === '乙'
|
||||
? '乙方'
|
||||
: '';
|
||||
const contractLabel = formatContractOptionLabel(item);
|
||||
if (carrierName && contractLabel) {
|
||||
return `${carrierName}（${contractLabel}）`;
|
||||
const nameWithRole = roleLabel && carrierName ? `${carrierName}（${roleLabel}）` : carrierName;
|
||||
if (nameWithRole && contractLabel) {
|
||||
return `${nameWithRole} - ${contractLabel}`;
|
||||
}
|
||||
return carrierName || contractLabel;
|
||||
return nameWithRole || contractLabel;
|
||||
},
|
||||
carrierOptionValue(item = {}) {
|
||||
return [item.id || '', item.carrierPartyId || '', item.carrierName || item.partyB || ''].join(
|
||||
'__'
|
||||
);
|
||||
},
|
||||
syncStandaloneTagTitle() {
|
||||
if (!this.isStandalonePage) return;
|
||||
@@ -4033,7 +4044,7 @@ export default {
|
||||
exists.add(key);
|
||||
}
|
||||
});
|
||||
// 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同甲方匹配后取交集）
|
||||
// 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同乙方=承运商合同甲方匹配后取交集）
|
||||
if (
|
||||
String(this.dialogForm.carrierType || '').trim() === '承运商' &&
|
||||
nextRows.length > this.selectedWaybillRows.length
|
||||
@@ -4565,6 +4576,8 @@ export default {
|
||||
},
|
||||
handleCarrierTypeChange() {
|
||||
this.dialogForm.carrierContractId = '';
|
||||
this.dialogForm.carrierPartyId = '';
|
||||
this.dialogForm.carrierPartyRole = '';
|
||||
this.dialogForm.carrierName = '';
|
||||
this.dialogForm.carrierId = '';
|
||||
this.clearDialogDriverVehicleFields();
|
||||
@@ -4575,17 +4588,25 @@ export default {
|
||||
}
|
||||
if (this.dialogForm.carrierType === '自运') {
|
||||
this.dialogForm.carrierContractId = '';
|
||||
this.dialogForm.carrierPartyId = '';
|
||||
this.dialogForm.carrierPartyRole = '';
|
||||
}
|
||||
this.loadTaskCarrierOptions();
|
||||
},
|
||||
handleTaskCarrierChange(contractId) {
|
||||
const contract = this.taskCarrierOptions.find(item =>
|
||||
[item.id, item.carrierName, item.partyB].some(
|
||||
value => String(value || '') === String(contractId || '')
|
||||
)
|
||||
handleTaskCarrierChange(selectedValue) {
|
||||
const contract = this.taskCarrierOptions.find(
|
||||
item =>
|
||||
this.carrierOptionValue(item) === String(selectedValue || '') ||
|
||||
[item.id, item.carrierName, item.partyB].some(
|
||||
value => String(value || '') === String(selectedValue || '')
|
||||
)
|
||||
);
|
||||
this.dialogForm.carrierContractId =
|
||||
this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
|
||||
this.dialogForm.carrierPartyId =
|
||||
this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyId || '' : '';
|
||||
this.dialogForm.carrierPartyRole =
|
||||
this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyRole || '' : '';
|
||||
this.dialogForm.carrierName = contract?.carrierName || '';
|
||||
this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
|
||||
this.clearDialogDriverVehicleFields();
|
||||
@@ -4754,7 +4775,7 @@ export default {
|
||||
}
|
||||
this.taskCarrierLoading = true;
|
||||
try {
|
||||
// 配载单只有一个项目；传入子运单后按客户合同甲方匹配并取承运商合同乙方交集
|
||||
// 配载单只有一个项目；传入子运单后按客户合同乙方=承运商合同甲方匹配并取承运商合同乙方交集
|
||||
const projectId = this.selectedWaybillRows.map(row => row.projectId).find(Boolean);
|
||||
const waybillIds = this.selectedWaybillRows.map(row => row.id).filter(Boolean);
|
||||
const response = await loadingApi.getCarrierContracts(
|
||||
@@ -4768,30 +4789,45 @@ export default {
|
||||
.map(item => ({
|
||||
...item,
|
||||
carrierName:
|
||||
item.carrierName ||
|
||||
item.partyB ||
|
||||
item.partyBName ||
|
||||
item.contractPartyB ||
|
||||
item.customerContractPartyB ||
|
||||
item.carrierName ||
|
||||
'',
|
||||
carrierId:
|
||||
item.customerId ||
|
||||
item.partyBId ||
|
||||
item.partyBUserId ||
|
||||
item.contractPartyBId ||
|
||||
item.customerContractPartyBId ||
|
||||
item.carrierId ||
|
||||
'',
|
||||
carrierPartyId: item.carrierPartyId || '',
|
||||
carrierPartyRole: item.carrierPartyRole || '',
|
||||
}))
|
||||
.filter(item => item.carrierName);
|
||||
const current =
|
||||
contracts.find(item => String(item.id) === String(this.dialogForm.carrierContractId)) ||
|
||||
this.taskCarrierOptions.find(
|
||||
item =>
|
||||
this.carrierOptionValue(item) === this.taskCarrierSelectedValue ||
|
||||
(String(item.id) === String(this.dialogForm.carrierContractId) &&
|
||||
(!this.dialogForm.carrierPartyId ||
|
||||
String(item.carrierPartyId) === String(this.dialogForm.carrierPartyId)) &&
|
||||
(!this.dialogForm.carrierName ||
|
||||
item.carrierName === this.dialogForm.carrierName))
|
||||
) ||
|
||||
this.taskCarrierOptions.find(item => item.carrierName === this.dialogForm.carrierName);
|
||||
if (current) {
|
||||
this.dialogForm.carrierContractId = current.id;
|
||||
this.dialogForm.carrierPartyId = current.carrierPartyId || '';
|
||||
this.dialogForm.carrierPartyRole = current.carrierPartyRole || '';
|
||||
this.dialogForm.carrierName = current.carrierName;
|
||||
this.dialogForm.carrierId = current.carrierId || '';
|
||||
} else {
|
||||
this.dialogForm.carrierContractId = '';
|
||||
this.dialogForm.carrierPartyId = '';
|
||||
this.dialogForm.carrierPartyRole = '';
|
||||
this.dialogForm.carrierName = '';
|
||||
this.dialogForm.carrierId = '';
|
||||
}
|
||||
@@ -4802,19 +4838,22 @@ export default {
|
||||
.map(item => ({
|
||||
...item,
|
||||
carrierName:
|
||||
item.carrierName ||
|
||||
item.partyB ||
|
||||
item.partyBName ||
|
||||
item.contractPartyB ||
|
||||
item.customerContractPartyB ||
|
||||
item.carrierName ||
|
||||
'',
|
||||
carrierId:
|
||||
item.customerId ||
|
||||
item.partyBId ||
|
||||
item.partyBUserId ||
|
||||
item.contractPartyBId ||
|
||||
item.customerContractPartyBId ||
|
||||
item.carrierId ||
|
||||
'',
|
||||
carrierPartyId: item.carrierPartyId || '',
|
||||
carrierPartyRole: item.carrierPartyRole || '',
|
||||
}))
|
||||
.filter(item => item.carrierName);
|
||||
const current = this.taskCarrierOptions.find(
|
||||
@@ -5030,30 +5069,6 @@ export default {
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.loading-manage-dialog__admission-tip {
|
||||
margin-bottom: 12px;
|
||||
padding: 12px 14px;
|
||||
background: #f5f9ff;
|
||||
border: 1px solid #d9ecff;
|
||||
border-radius: 4px;
|
||||
line-height: 1.6;
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.loading-manage-dialog__admission-title {
|
||||
margin-bottom: 4px;
|
||||
color: #303133;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.loading-manage-dialog__admission-title + .loading-manage-dialog__admission-text + .loading-manage-dialog__admission-title {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.loading-manage-dialog__admission-text {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.loading-manage-dialog__candidate-search {
|
||||
padding: 0;
|
||||
margin-bottom: 0;
|
||||
|
||||
@@ -535,7 +535,6 @@ export default {
|
||||
created() {
|
||||
this.resetNodeRows();
|
||||
this.loadProjectOptions('');
|
||||
this.applyDefaultDeptSearch();
|
||||
this.initDeptOptions();
|
||||
},
|
||||
methods: {
|
||||
@@ -566,27 +565,6 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
defaultDeptId() {
|
||||
const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
|
||||
return (
|
||||
String(raw)
|
||||
.split(',')
|
||||
.map(item => item.trim())
|
||||
.filter(Boolean)[0] || ''
|
||||
);
|
||||
},
|
||||
applyDefaultDeptSearch() {
|
||||
const deptId = this.defaultDeptId();
|
||||
const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
|
||||
if (!deptId || !deptColumn) return;
|
||||
deptColumn.searchValue = deptId;
|
||||
this.query = { ...this.query, deptId };
|
||||
this.$nextTick(() => {
|
||||
if (this.$refs.crud?.searchForm) {
|
||||
this.$refs.crud.searchForm.searchDeptId = deptId;
|
||||
}
|
||||
});
|
||||
},
|
||||
flattenDept(tree, level = 0) {
|
||||
return tree.flatMap(item => {
|
||||
const id =
|
||||
@@ -1113,7 +1091,6 @@ export default {
|
||||
},
|
||||
searchReset() {
|
||||
this.query = {};
|
||||
this.applyDefaultDeptSearch();
|
||||
this.page.currentPage = 1;
|
||||
this.onLoad(this.page, this.query);
|
||||
},
|
||||
|
||||
@@ -84,7 +84,8 @@ export default {
|
||||
this.postFormData('save', lbpmFormValues, this.buildFormData());
|
||||
},
|
||||
postFormData(status, formValues, formData) {
|
||||
postMkPublicProcessMessage('project-apply', {
|
||||
const bizType = this.$route.meta?.bizType || 'project-apply';
|
||||
postMkPublicProcessMessage(bizType, {
|
||||
status,
|
||||
formValues: formValues || {},
|
||||
formData,
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
v-if="!readonlyScope"
|
||||
v-if="!readonlyScope && hcsImmediateEnabled"
|
||||
:loading="hcsRepushingId === 'batch'"
|
||||
@click="handleHcsBatchRepush"
|
||||
>
|
||||
@@ -154,7 +154,7 @@
|
||||
{{ operation.label }}
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="canHcsRepush(row)"
|
||||
v-if="hcsImmediateEnabled && canHcsRepush(row)"
|
||||
type="warning"
|
||||
@click="handleHcsRepush(row)"
|
||||
>
|
||||
@@ -249,35 +249,63 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="业务部门" prop="businessDeptId">
|
||||
<el-cascader
|
||||
v-model="businessDeptCascaderValue"
|
||||
:options="businessDeptTreeOptions"
|
||||
:props="deptCascaderProps"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
<el-tooltip
|
||||
placement="top"
|
||||
:disabled="!shouldShowBusinessDeptTooltip"
|
||||
:show-after="200"
|
||||
>
|
||||
<template #content>
|
||||
<div class="project-apply-form__field-tooltip">{{ businessDeptTooltipText }}</div>
|
||||
</template>
|
||||
<span class="project-apply-form__field-tooltip-trigger">
|
||||
<el-select
|
||||
v-model="form.businessDeptId"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@change="handleBusinessDeptChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deptOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
<el-form-item label="平台公司" prop="undertakeDeptId">
|
||||
<el-select
|
||||
v-model="form.undertakeDeptId"
|
||||
placeholder="请选择"
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
clearable
|
||||
filterable
|
||||
:disabled="dialogReadonly"
|
||||
@change="handleUndertakeDeptChange"
|
||||
<el-tooltip
|
||||
placement="top"
|
||||
:disabled="!shouldShowUndertakeDeptTooltip"
|
||||
:show-after="200"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in platformCompanyOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<template #content>
|
||||
<div class="project-apply-form__field-tooltip">{{ undertakeDeptTooltipText }}</div>
|
||||
</template>
|
||||
<span class="project-apply-form__field-tooltip-trigger">
|
||||
<el-select
|
||||
v-model="form.undertakeDeptId"
|
||||
placeholder="请选择"
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
clearable
|
||||
filterable
|
||||
:disabled="dialogReadonly"
|
||||
@change="handleUndertakeDeptChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in platformCompanyOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目由来" prop="projectSource">
|
||||
<el-select
|
||||
@@ -733,6 +761,96 @@
|
||||
/>
|
||||
</div>
|
||||
|
||||
<template v-if="showProjectContractSection">
|
||||
<div class="dialog-section-title project-apply-form__table-title">项目合同</div>
|
||||
<el-table
|
||||
v-loading="projectContractLoading"
|
||||
:data="projectContractRows"
|
||||
border
|
||||
class="project-apply-form__table"
|
||||
>
|
||||
<el-table-column type="index" label="序号" width="80" align="center" />
|
||||
<el-table-column
|
||||
prop="contractCategory"
|
||||
label="合同类型"
|
||||
min-width="120"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="contractNo"
|
||||
label="合同编号"
|
||||
min-width="140"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<el-link
|
||||
v-if="row.id && row.contractNo"
|
||||
type="primary"
|
||||
@click.stop="openProjectContractDetail(row)"
|
||||
>
|
||||
{{ row.contractNo }}
|
||||
</el-link>
|
||||
<span v-else>{{ row.contractNo || '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="contractName"
|
||||
label="合同名称"
|
||||
min-width="160"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="partyA"
|
||||
label="甲方"
|
||||
min-width="140"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="partyB"
|
||||
label="乙方"
|
||||
min-width="140"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="partyC"
|
||||
label="丙方"
|
||||
min-width="140"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="startDate"
|
||||
label="开始日期"
|
||||
min-width="120"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="endDate"
|
||||
label="结束日期"
|
||||
min-width="120"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="contractAmount"
|
||||
label="合同金额"
|
||||
min-width="120"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="{ row }">
|
||||
{{ formatAmount(row.contractAmount) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</template>
|
||||
|
||||
<div
|
||||
v-if="!isChangeDialog && !isNewProjectDialog"
|
||||
class="dialog-section-title project-apply-form__table-title"
|
||||
@@ -810,7 +928,21 @@
|
||||
<template v-if="isChangeDialog">
|
||||
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
|
||||
<el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
|
||||
<el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
|
||||
<el-button
|
||||
v-if="isProjectChangeModule && !dialogReadonly"
|
||||
type="primary"
|
||||
plain
|
||||
:loading="submitLoading"
|
||||
@click="saveProjectChangeDraft"
|
||||
>
|
||||
保存
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="!dialogReadonly"
|
||||
type="primary"
|
||||
:loading="submitLoading"
|
||||
@click="submitChangeProject"
|
||||
>
|
||||
提交
|
||||
</el-button>
|
||||
</template>
|
||||
@@ -948,14 +1080,19 @@
|
||||
import { exportBlob } from '@/api/common';
|
||||
import { defineAsyncComponent } from 'vue';
|
||||
import * as api from '@/api/business/project-apply';
|
||||
import { repush as hcsRepush, repushBatch as hcsRepushBatch } from '@/api/business/hcs';
|
||||
import { getList as getContractManageList } from '@/api/business/contract-manage';
|
||||
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';
|
||||
@@ -985,6 +1122,7 @@ import {
|
||||
projectTypeOptions,
|
||||
} from '@/option/business/common';
|
||||
import { config, option } from '@/option/business/project-apply';
|
||||
import * as projectChangeApi from '@/api/business/project-change';
|
||||
|
||||
const emptyForm = () => ({
|
||||
projectType: '',
|
||||
@@ -1060,6 +1198,9 @@ const attachmentViewerPlugins = [
|
||||
const projectApplyListRoute = '/business/project-apply';
|
||||
const projectApplyFormRoute = '/business/project-apply/form';
|
||||
const projectApplyListRefreshKey = 'project-apply-list-refresh';
|
||||
const projectChangeListRoute = '/business/project-change';
|
||||
const projectChangeFormRoute = '/business/project-change/form';
|
||||
const projectChangeListRefreshKey = 'project-change-list-refresh';
|
||||
|
||||
const otherAttachmentType = { label: '其他附件', value: '其他附件' };
|
||||
|
||||
@@ -1156,8 +1297,9 @@ export default {
|
||||
{ label: '高风险', value: 'high', statKey: 'high' },
|
||||
{ label: '中风险', value: 'medium', statKey: 'medium' },
|
||||
],
|
||||
// 合规（HCS）推送状态
|
||||
// 合规（HCS）推送状态；受 thirdParty.hcs.push.immediate-enabled 控制显隐
|
||||
hcsRepushingId: null,
|
||||
hcsImmediateEnabled: false,
|
||||
page: {
|
||||
pageSize: 10,
|
||||
pageSizes: [10, 20, 50, 100],
|
||||
@@ -1245,7 +1387,40 @@ export default {
|
||||
},
|
||||
],
|
||||
changeReason: [
|
||||
{ max: 2000, message: '变更原因不能超过2000个字符', trigger: 'blur' },
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
if (!this.isChangeDialog) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (!value || !String(value).trim()) {
|
||||
callback(new Error('请输入变更原因'));
|
||||
return;
|
||||
}
|
||||
if (String(value).length > 2000) {
|
||||
callback(new Error('变更原因不能超过2000个字符'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
changeType: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
if (!this.isChangeDialog) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (!value) {
|
||||
callback(new Error('请选择变更类型'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
projectIntro: [
|
||||
{ max: 1000, message: '项目简介不能超过1000个字符', trigger: 'blur' },
|
||||
@@ -1261,7 +1436,6 @@ export default {
|
||||
],
|
||||
},
|
||||
deptOptions: [],
|
||||
businessDeptTreeOptions: [],
|
||||
platformCompanyOptions: [],
|
||||
cargoTypeOptions: [],
|
||||
selectedCustomerId: [],
|
||||
@@ -1304,6 +1478,8 @@ export default {
|
||||
'zip',
|
||||
],
|
||||
changeRows: [],
|
||||
projectContractRows: [],
|
||||
projectContractLoading: false,
|
||||
changeRecordDetailVisible: false,
|
||||
changeRecordDetail: null,
|
||||
changeRecordDetailRows: [],
|
||||
@@ -1326,30 +1502,27 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo']),
|
||||
// 部门级联配置：checkStrictly 允许选中任意层级，不必选到末级
|
||||
deptCascaderProps() {
|
||||
return {
|
||||
label: 'label',
|
||||
value: 'value',
|
||||
children: 'children',
|
||||
emitPath: true,
|
||||
checkStrictly: true,
|
||||
expandTrigger: 'click',
|
||||
};
|
||||
// 查看态禁用控件无 hover，用业务部门名称做 tooltip
|
||||
businessDeptTooltipText() {
|
||||
const id = this.form.businessDeptId;
|
||||
if (id) {
|
||||
const matched = this.deptOptions.find(item => String(item.value) === String(id));
|
||||
if (matched?.rawLabel || matched?.label) {
|
||||
return matched.rawLabel || matched.label;
|
||||
}
|
||||
}
|
||||
return String(this.form.businessDeptName || '').trim();
|
||||
},
|
||||
// 业务部门：form 存部门 id，级联控件用根到节点的 id 路径，两者在此双向转换
|
||||
businessDeptCascaderValue: {
|
||||
get() {
|
||||
const id = this.form.businessDeptId;
|
||||
return id ? this.findDeptPath(id, this.businessDeptTreeOptions) || [id] : [];
|
||||
},
|
||||
set(path) {
|
||||
const value = Array.isArray(path)
|
||||
? path.filter(item => item !== undefined && item !== null && item !== '')
|
||||
: [];
|
||||
this.form.businessDeptId = value.length ? value.at(-1) : '';
|
||||
this.handleBusinessDeptChange(this.form.businessDeptId);
|
||||
},
|
||||
undertakeDeptTooltipText() {
|
||||
const name = String(this.form.undertakeDeptName || '').trim();
|
||||
if (name) return name;
|
||||
return this.resolveUndertakeDeptNames(this.parseUndertakeDeptIds(this.form.undertakeDeptId));
|
||||
},
|
||||
shouldShowBusinessDeptTooltip() {
|
||||
return this.dialogReadonly && !!this.businessDeptTooltipText;
|
||||
},
|
||||
shouldShowUndertakeDeptTooltip() {
|
||||
return this.dialogReadonly && !!this.undertakeDeptTooltipText;
|
||||
},
|
||||
permissionList() {
|
||||
return {
|
||||
@@ -1374,17 +1547,29 @@ export default {
|
||||
isMajorProjectSupplementDialog() {
|
||||
return this.dialogType === 'majorSupplement';
|
||||
},
|
||||
isProjectChangeModule() {
|
||||
return this.$route.path === projectChangeFormRoute;
|
||||
},
|
||||
isChangeDialog() {
|
||||
return this.dialogType === 'change';
|
||||
return this.dialogType === 'change' || this.isProjectChangeModule;
|
||||
},
|
||||
isNewProjectDialog() {
|
||||
return ['add', 'majorSupplement'].includes(this.dialogType);
|
||||
},
|
||||
showProjectContractSection() {
|
||||
return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
|
||||
},
|
||||
isProjectFormPage() {
|
||||
return this.isFormPageInstance;
|
||||
},
|
||||
isPublicViewPage() {
|
||||
return this.$route.path === '/business/project-apply/public-view';
|
||||
return (
|
||||
this.$route.path === '/business/project-apply/public-view' ||
|
||||
this.$route.path === '/business/project-change/public-view'
|
||||
);
|
||||
},
|
||||
publicBizType() {
|
||||
return this.$route.meta?.bizType || 'project-apply';
|
||||
},
|
||||
projectFormContainer() {
|
||||
// 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
|
||||
@@ -1447,11 +1632,18 @@ export default {
|
||||
.catch(() => {
|
||||
this.mkEnabled = false;
|
||||
});
|
||||
loadHcsImmediateEnabled()
|
||||
.then(enabled => {
|
||||
this.hcsImmediateEnabled = !!enabled;
|
||||
})
|
||||
.catch(() => {
|
||||
this.hcsImmediateEnabled = false;
|
||||
});
|
||||
this.loadDeptOptions();
|
||||
this.loadCargoTypeOptions();
|
||||
this.loadTransportTypeOptions();
|
||||
this.loadSettlementModeOptions();
|
||||
if (this.$route.path === projectApplyFormRoute) {
|
||||
if (this.$route.path === projectApplyFormRoute || this.$route.path === projectChangeFormRoute) {
|
||||
this.isFormPageInstance = true;
|
||||
this.openProjectFormPage();
|
||||
}
|
||||
@@ -1517,14 +1709,14 @@ export default {
|
||||
},
|
||||
openPublicProjectForm() {
|
||||
const id = this.$route.query.id;
|
||||
this.dialogType = 'view';
|
||||
this.dialogType = this.publicBizType === 'project-change' ? 'change' : 'view';
|
||||
this.dialogReadonly = true;
|
||||
this.projectBox = true;
|
||||
if (!id) {
|
||||
this.$message.error('缺少项目ID');
|
||||
return;
|
||||
}
|
||||
getMkPublicDetail('project-apply', id)
|
||||
getMkPublicDetail(this.publicBizType, id)
|
||||
.then(res => {
|
||||
const detail = res.data?.data || {};
|
||||
this.applyPublicDictOptions(detail);
|
||||
@@ -1552,9 +1744,10 @@ export default {
|
||||
detail.settlementMode
|
||||
);
|
||||
if (detail.businessDeptId) {
|
||||
const label = detail.businessDeptName || String(detail.businessDeptId);
|
||||
this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
|
||||
this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
|
||||
const id = String(detail.businessDeptId);
|
||||
const label = detail.businessDeptName || id;
|
||||
this.form.businessDeptId = id;
|
||||
this.deptOptions = [{ label, rawLabel: label, value: id }];
|
||||
}
|
||||
const undertakeDeptIds = this.parseUndertakeDeptIds(detail.undertakeDeptId);
|
||||
const undertakeDeptNames = this.parseUndertakeDeptNames(detail.undertakeDeptName);
|
||||
@@ -1587,9 +1780,25 @@ export default {
|
||||
openProjectFormPage() {
|
||||
const type = this.$route.query.mode || 'add';
|
||||
const id = this.$route.query.id;
|
||||
this.dialogType = type;
|
||||
this.dialogType = this.isProjectChangeModule ? (type === 'view' ? 'view' : 'change') : type;
|
||||
this.dialogReadonly = type === 'view';
|
||||
this.projectBox = true;
|
||||
if (this.isProjectChangeModule) {
|
||||
if (!id) {
|
||||
this.$message.error('缺少项目变更ID');
|
||||
return;
|
||||
}
|
||||
projectChangeApi.getDetail(id).then(res => {
|
||||
const detail = res.data.data || {};
|
||||
this.applyProjectDetail({
|
||||
...detail,
|
||||
changeType: detail.changeType || '项目变更',
|
||||
changeNo: detail.changeNo || '',
|
||||
changeDate: detail.changeDate || this.$dayjs().format('YYYY-MM-DD'),
|
||||
});
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (['add', 'majorSupplement'].includes(type)) {
|
||||
this.applyProjectDetail({
|
||||
...emptyForm(),
|
||||
@@ -1613,6 +1822,12 @@ export default {
|
||||
},
|
||||
closeProjectForm() {
|
||||
if (this.isProjectFormPage) {
|
||||
if (this.isProjectChangeModule) {
|
||||
sessionStorage.setItem(projectChangeListRefreshKey, '1');
|
||||
this.$router.$avueRouter?.closeTag?.();
|
||||
this.$router.push(projectChangeListRoute);
|
||||
return;
|
||||
}
|
||||
this.markProjectApplyListNeedRefresh();
|
||||
this.$router.$avueRouter?.closeTag?.();
|
||||
this.$router.push(projectApplyListRoute);
|
||||
@@ -1659,6 +1874,7 @@ export default {
|
||||
},
|
||||
canHcsRepush(row) {
|
||||
return (
|
||||
this.hcsImmediateEnabled &&
|
||||
!this.readonlyScope &&
|
||||
['approved', 'change_approved'].includes(row.approvalStatus) &&
|
||||
row.hcsSyncStatus !== 'synced'
|
||||
@@ -1858,7 +2074,7 @@ export default {
|
||||
},
|
||||
handleCustomOperation(operation, row) {
|
||||
if (operation.action === 'startChange') {
|
||||
this.openProjectDialog('change', row);
|
||||
this.startIndependentProjectChange(row);
|
||||
return;
|
||||
}
|
||||
if (operation.action === 'mkAudit') {
|
||||
@@ -1868,15 +2084,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 =
|
||||
@@ -1986,6 +2207,8 @@ export default {
|
||||
this.attachmentRows = [];
|
||||
this.selectedAttachmentRows = [];
|
||||
this.changeRows = [];
|
||||
this.projectContractRows = [];
|
||||
this.projectContractLoading = false;
|
||||
this.selectedCustomerId = [];
|
||||
this.selectedCarrierIds = [];
|
||||
},
|
||||
@@ -2034,6 +2257,40 @@ export default {
|
||||
this.syncSelectedCustomerOptions();
|
||||
this.ensureCurrentPlatformOption();
|
||||
this.ensureCurrentBusinessDeptOption();
|
||||
this.loadProjectContracts(row?.id);
|
||||
},
|
||||
loadProjectContracts(projectId) {
|
||||
if (!this.showProjectContractSection || !projectId) {
|
||||
this.projectContractRows = [];
|
||||
this.projectContractLoading = false;
|
||||
return;
|
||||
}
|
||||
this.projectContractLoading = true;
|
||||
getContractManageList(1, 1000, { projectId })
|
||||
.then(res => {
|
||||
const data = res.data?.data;
|
||||
const records = Array.isArray(data) ? data : data?.records || [];
|
||||
this.projectContractRows = records.filter(
|
||||
item => String(item.projectId) === String(projectId)
|
||||
);
|
||||
})
|
||||
.catch(() => {
|
||||
this.projectContractRows = [];
|
||||
this.$message.error('项目合同加载失败');
|
||||
})
|
||||
.finally(() => {
|
||||
this.projectContractLoading = false;
|
||||
});
|
||||
},
|
||||
openProjectContractDetail(row) {
|
||||
if (!row?.id) {
|
||||
this.$message.warning('合同信息不完整，无法跳转');
|
||||
return;
|
||||
}
|
||||
this.$router.push({
|
||||
path: '/business/contract-manage/detail',
|
||||
query: { id: row.id, name: '合同详情' },
|
||||
});
|
||||
},
|
||||
fillDefaultUsers() {
|
||||
const userId = this.userInfo?.userId || this.userInfo?.id || '';
|
||||
@@ -2120,6 +2377,9 @@ export default {
|
||||
subjectName: name,
|
||||
approvalStatus: status,
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: {
|
||||
projectType: this.form.projectType || data.projectType || '',
|
||||
},
|
||||
}).then(() => {
|
||||
this.$message.success('提交成功!');
|
||||
this.closeProjectForm();
|
||||
@@ -2169,6 +2429,52 @@ export default {
|
||||
this.closeProjectForm();
|
||||
});
|
||||
},
|
||||
startIndependentProjectChange(row) {
|
||||
if (!row?.id) {
|
||||
this.$message.warning('项目ID为空，无法发起变更');
|
||||
return;
|
||||
}
|
||||
const loading = this.$loading({
|
||||
lock: true,
|
||||
text: '正在创建项目变更单…',
|
||||
background: 'rgba(255, 255, 255, 0.6)',
|
||||
});
|
||||
projectChangeApi
|
||||
.createFromProject(row.id)
|
||||
.then(res => {
|
||||
if (res.data?.success === false) {
|
||||
this.$message.error(res.data?.msg || '创建项目变更失败');
|
||||
return;
|
||||
}
|
||||
const detail = res.data?.data || {};
|
||||
if (!detail.id) {
|
||||
this.$message.error('创建项目变更失败：未返回变更单ID');
|
||||
return;
|
||||
}
|
||||
this.$router.push({
|
||||
path: projectChangeFormRoute,
|
||||
query: { mode: 'edit', id: detail.id, name: '项目变更' },
|
||||
});
|
||||
})
|
||||
.finally(() => loading.close());
|
||||
},
|
||||
saveProjectChangeDraft() {
|
||||
if (!this.isProjectChangeModule) return;
|
||||
this.submitLoading = true;
|
||||
projectChangeApi
|
||||
.saveDraft(this.normalizeSubmitForm({ includeChangeType: true }))
|
||||
.then(res => {
|
||||
if (res.data?.success === false || res.data?.data === false) {
|
||||
this.$message.error(res.data?.msg || '保存失败，请联系管理员');
|
||||
return;
|
||||
}
|
||||
this.$message.success('保存成功!');
|
||||
this.closeProjectForm();
|
||||
})
|
||||
.finally(() => {
|
||||
this.submitLoading = false;
|
||||
});
|
||||
},
|
||||
submitChangeProject() {
|
||||
this.$refs.projectForm.validate(valid => {
|
||||
if (!valid) {
|
||||
@@ -2177,7 +2483,35 @@ export default {
|
||||
}
|
||||
if (!this.validateAttachmentFileTypes()) return;
|
||||
this.submitLoading = true;
|
||||
// 变更记录仅在提交时生成，保存草稿不落记录
|
||||
if (this.isProjectChangeModule) {
|
||||
const payload = this.normalizeSubmitForm({ includeChangeType: true });
|
||||
const approvalStatus = this.form.approvalStatus || '';
|
||||
projectChangeApi
|
||||
.submit(payload)
|
||||
.then(res => {
|
||||
if (res.data?.success === false || res.data?.data === false) {
|
||||
this.$message.error(res.data?.msg || '提交失败，请联系管理员');
|
||||
return;
|
||||
}
|
||||
const id = this.form.id;
|
||||
return submitMkApprovalFlow({
|
||||
bizType: 'project-change',
|
||||
bizId: id,
|
||||
subjectName: this.form.projectName || '',
|
||||
approvalStatus,
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: this.form.projectType || '' },
|
||||
}).then(() => {
|
||||
this.$message.success('提交成功!');
|
||||
this.closeProjectForm();
|
||||
});
|
||||
})
|
||||
.finally(() => {
|
||||
this.submitLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 兼容旧入口：变更记录仅在提交时生成，保存草稿不落记录
|
||||
this.api
|
||||
.submitChange(this.normalizeSubmitForm({ includeChangeType: true }))
|
||||
.then(res => {
|
||||
@@ -2192,6 +2526,7 @@ export default {
|
||||
subjectName: this.form.projectName || '',
|
||||
approvalStatus: this.form.approvalStatus || 'change_rejected',
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: this.form.projectType || '' },
|
||||
}).then(() => {
|
||||
this.$message.success('提交成功!');
|
||||
this.closeProjectForm();
|
||||
@@ -2595,10 +2930,10 @@ export default {
|
||||
return `${base}-BG${this.$dayjs().format('YYYYMMDD')}`;
|
||||
},
|
||||
handleBusinessDeptChange(value) {
|
||||
// 兼容级联路径数组（取末级）与单个部门 id
|
||||
const id = Array.isArray(value) ? value.at(-1) : value;
|
||||
const dept = this.deptOptions.find(item => String(item.value) === String(id));
|
||||
this.form.businessDeptName = dept ? dept.rawLabel : '';
|
||||
const id = value == null || value === '' ? '' : String(value);
|
||||
this.form.businessDeptId = id;
|
||||
const dept = this.deptOptions.find(item => String(item.value) === id);
|
||||
this.form.businessDeptName = dept ? dept.rawLabel || dept.label : '';
|
||||
this.$refs.projectForm?.validateField('businessDeptId');
|
||||
},
|
||||
handleUndertakeDeptChange(value) {
|
||||
@@ -2636,77 +2971,44 @@ export default {
|
||||
firstUndertakeDeptId(value) {
|
||||
return this.parseUndertakeDeptIds(value)[0] || '';
|
||||
},
|
||||
// 由部门 id 反查「根 → 该节点」的 id 路径，供级联回显（找不到返回 null）
|
||||
findDeptPath(id, tree = [], parents = []) {
|
||||
const target = Array.isArray(id) ? id.at(-1) : id;
|
||||
if (target === undefined || target === null || target === '') return null;
|
||||
for (const node of tree || []) {
|
||||
const path = [...parents, node.value];
|
||||
if (String(node.value) === String(target)) return path;
|
||||
const matched = this.findDeptPath(target, node.children, path);
|
||||
if (matched) return matched;
|
||||
}
|
||||
return null;
|
||||
},
|
||||
handleProjectTypeChange() {
|
||||
this.normalizeAttachmentFileTypes();
|
||||
this.$refs.projectForm?.validateField('projectType');
|
||||
},
|
||||
loadDeptOptions() {
|
||||
Promise.all([getDeptTree(), getBusinessDeptSelect()])
|
||||
.then(([treeRes, bizRes]) => {
|
||||
const deptTree = this.excludeExternalOrganization(treeRes.data.data || []);
|
||||
const bizList = bizRes.data.data || [];
|
||||
const bizIds = new Set(
|
||||
bizList
|
||||
.map(item => (item.id == null || item.id === '' ? '' : String(item.id)))
|
||||
.filter(Boolean)
|
||||
);
|
||||
// 仅保留「是否业务部门=是」的节点及其祖先，祖先不可选
|
||||
const businessDeptTree = this.filterBusinessDeptTree(deptTree, bizIds);
|
||||
this.deptOptions = this.flattenDept(businessDeptTree).filter(item =>
|
||||
bizIds.has(String(item.value))
|
||||
);
|
||||
this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree, bizIds);
|
||||
getBusinessDeptSelect()
|
||||
.then(res => {
|
||||
const bizList = res.data.data || [];
|
||||
// 仅展示「是否业务部门=是」的本级部门，扁平下拉
|
||||
this.deptOptions = bizList
|
||||
.map(item => {
|
||||
const value = item.id == null || item.id === '' ? '' : String(item.id);
|
||||
const label = item.deptName || item.fullName || item.title || item.name || value;
|
||||
return {
|
||||
label,
|
||||
rawLabel: label,
|
||||
value,
|
||||
};
|
||||
})
|
||||
.filter(item => item.value);
|
||||
this.fillDefaultBusinessDept();
|
||||
this.ensureCurrentBusinessDeptOption();
|
||||
})
|
||||
.catch(() => {
|
||||
this.deptOptions = [];
|
||||
this.businessDeptTreeOptions = [];
|
||||
});
|
||||
this.loadPlatformCompanyOptions();
|
||||
},
|
||||
/**
|
||||
* 剪枝组织树：只保留业务部门节点及其祖先路径。
|
||||
*/
|
||||
filterBusinessDeptTree(list = [], bizIds = new Set()) {
|
||||
return (list || []).reduce((result, item) => {
|
||||
const children = item.children?.length
|
||||
? this.filterBusinessDeptTree(item.children, bizIds)
|
||||
: [];
|
||||
const isBiz = bizIds.has(String(item.id));
|
||||
if (!isBiz && !children.length) {
|
||||
return result;
|
||||
}
|
||||
result.push({
|
||||
...item,
|
||||
children: children.length ? children : undefined,
|
||||
});
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
ensureCurrentBusinessDeptOption() {
|
||||
const id = this.form.businessDeptId;
|
||||
const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
|
||||
? ''
|
||||
: String(this.form.businessDeptId);
|
||||
if (!id) return;
|
||||
const exists = this.deptOptions.some(item => String(item.value) === String(id));
|
||||
this.form.businessDeptId = id;
|
||||
const exists = this.deptOptions.some(item => String(item.value) === id);
|
||||
if (exists) return;
|
||||
const label = this.form.businessDeptName || String(id);
|
||||
const label = this.form.businessDeptName || id;
|
||||
this.deptOptions.unshift({ label, rawLabel: label, value: id });
|
||||
const pathExists = this.findDeptPath(id, this.businessDeptTreeOptions);
|
||||
if (!pathExists) {
|
||||
this.businessDeptTreeOptions.unshift({ label, value: id });
|
||||
}
|
||||
},
|
||||
loadPlatformCompanyOptions() {
|
||||
getPlatformCompanySelect().then(res => {
|
||||
@@ -2738,50 +3040,6 @@ export default {
|
||||
return matched ? matched.value : id;
|
||||
});
|
||||
},
|
||||
excludeExternalOrganization(list = []) {
|
||||
return list.reduce((result, item) => {
|
||||
const deptName = item.title || item.deptName || item.name;
|
||||
if (String(deptName || '').trim() === '外部组织') return result;
|
||||
result.push({
|
||||
...item,
|
||||
children: item.children?.length
|
||||
? this.excludeExternalOrganization(item.children)
|
||||
: item.children,
|
||||
});
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
toDeptCascaderOptions(list = [], bizIds = null) {
|
||||
return list.map(item => {
|
||||
const value = item.id == null || item.id === '' ? item.value : item.id;
|
||||
const option = {
|
||||
label: item.title || item.deptName || item.name || item.label,
|
||||
value: value == null || value === '' ? '' : String(value),
|
||||
children: item.children?.length
|
||||
? this.toDeptCascaderOptions(item.children, bizIds)
|
||||
: undefined,
|
||||
};
|
||||
// 仅业务部门可选；祖先节点保留路径但禁用
|
||||
if (bizIds && !bizIds.has(String(option.value))) {
|
||||
option.disabled = true;
|
||||
}
|
||||
return option;
|
||||
});
|
||||
},
|
||||
flattenDept(list = [], level = 0) {
|
||||
return list.reduce((result, item) => {
|
||||
const label = item.title || item.deptName || item.name;
|
||||
result.push({
|
||||
label: `${' '.repeat(level)}${label}`,
|
||||
rawLabel: label,
|
||||
value: item.id,
|
||||
});
|
||||
if (item.children && item.children.length) {
|
||||
result.push(...this.flattenDept(item.children, level + 1));
|
||||
}
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
loadCargoTypeOptions() {
|
||||
getSystemDictionary({ code: 'type_of_goods' }).then(res => {
|
||||
this.cargoTypeOptions = (res.data.data || []).map(item => ({
|
||||
@@ -3117,6 +3375,20 @@ export default {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
&__field-tooltip-trigger {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
&__field-tooltip {
|
||||
max-width: 480px;
|
||||
max-height: 240px;
|
||||
overflow: auto;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
:deep(.el-form-item) {
|
||||
//margin-bottom: 24px;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,366 @@
|
||||
<template>
|
||||
<basic-container class="project-change-page">
|
||||
<avue-crud
|
||||
:option="tableOption"
|
||||
:table-loading="loading"
|
||||
:data="data"
|
||||
v-model:page="page"
|
||||
v-model="tableForm"
|
||||
ref="crud"
|
||||
:permission="permissionList"
|
||||
@search-change="searchChange"
|
||||
@search-reset="searchReset"
|
||||
@selection-change="selectionChange"
|
||||
@current-change="currentChange"
|
||||
@size-change="sizeChange"
|
||||
@refresh-change="refreshChange"
|
||||
@on-load="onLoad"
|
||||
>
|
||||
<template #menu-left>
|
||||
<el-button
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
plain
|
||||
v-if="hasPermission(`${config.permission}_delete`)"
|
||||
@click="handleDelete"
|
||||
>
|
||||
批量删除
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
<template #approvalStatus="{ row }">
|
||||
{{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
|
||||
</template>
|
||||
|
||||
<template #syncStatus="{ row }">
|
||||
<el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
|
||||
{{ syncLabel(row.syncStatus) }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
|
||||
<template #menu="{ row }">
|
||||
<el-link
|
||||
type="primary"
|
||||
v-if="canView(row)"
|
||||
@click="openForm('view', row)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)">
|
||||
编辑
|
||||
</el-link>
|
||||
<el-link
|
||||
type="danger"
|
||||
v-if="canDelete(row)"
|
||||
@click="rowDel(row)"
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
<el-link
|
||||
v-for="operation in customOperations(row)"
|
||||
:key="operation.action"
|
||||
:type="operation.type === 'warning' ? 'warning' : operation.type === 'success' ? 'success' : 'primary'"
|
||||
@click="handleCustomOperation(operation, row)"
|
||||
>
|
||||
{{ operation.label }}
|
||||
</el-link>
|
||||
</template>
|
||||
</avue-crud>
|
||||
</basic-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as api from '@/api/business/project-change';
|
||||
import { getMKApprovalUrl } from '@/api/system/business-process';
|
||||
import { config, option } from '@/option/business/project-change';
|
||||
import { approvalStatusOptions } from '@/option/business/common';
|
||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||
import { isAdministrator } from '@/utils/auth';
|
||||
import { mapGetters } from 'vuex';
|
||||
|
||||
const projectChangeFormRoute = '/business/project-change/form';
|
||||
const projectChangeListRefreshKey = 'project-change-list-refresh';
|
||||
|
||||
export default {
|
||||
name: 'ProjectChange',
|
||||
data() {
|
||||
return {
|
||||
api,
|
||||
config,
|
||||
tableForm: {},
|
||||
tableOption: this.buildTableOption(),
|
||||
loading: true,
|
||||
data: [],
|
||||
page: {
|
||||
pageSize: 10,
|
||||
currentPage: 1,
|
||||
total: 0,
|
||||
},
|
||||
query: {},
|
||||
selectionList: [],
|
||||
mkEnabled: false,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo', 'website']),
|
||||
permissionList() {
|
||||
return {
|
||||
addBtn: false,
|
||||
viewBtn: false,
|
||||
delBtn: false,
|
||||
editBtn: false,
|
||||
};
|
||||
},
|
||||
isAdmin() {
|
||||
return isAdministrator(this.userInfo);
|
||||
},
|
||||
ids() {
|
||||
return this.selectionList.map(item => item.id).join(',');
|
||||
},
|
||||
},
|
||||
created() {
|
||||
loadMkEnabled()
|
||||
.then(enabled => {
|
||||
this.mkEnabled = enabled;
|
||||
})
|
||||
.catch(() => {
|
||||
this.mkEnabled = false;
|
||||
});
|
||||
},
|
||||
activated() {
|
||||
if (sessionStorage.getItem(projectChangeListRefreshKey)) {
|
||||
sessionStorage.removeItem(projectChangeListRefreshKey);
|
||||
this.onLoad(this.page, this.query);
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
buildTableOption() {
|
||||
return {
|
||||
...option,
|
||||
addBtn: false,
|
||||
viewBtn: false,
|
||||
editBtn: false,
|
||||
delBtn: false,
|
||||
menuWidth: 320,
|
||||
column: (option.column || []).map(column => ({
|
||||
...column,
|
||||
display: false,
|
||||
align: 'center',
|
||||
headerAlign: 'center',
|
||||
})),
|
||||
};
|
||||
},
|
||||
hasPermission(code) {
|
||||
return this.isAdmin || this.validData(this.permission && this.permission[code], false);
|
||||
},
|
||||
statusLabel(status) {
|
||||
return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
|
||||
},
|
||||
syncLabel(value) {
|
||||
return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
|
||||
},
|
||||
syncTagType(value) {
|
||||
return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
|
||||
},
|
||||
inStatus(row, statusList) {
|
||||
if (!statusList || !statusList.length) return true;
|
||||
return statusList.includes(row.approvalStatus);
|
||||
},
|
||||
canEdit(row) {
|
||||
return (
|
||||
this.hasPermission(`${this.config.permission}_edit`) &&
|
||||
!row.readonly &&
|
||||
this.inStatus(row, this.config.editStatus)
|
||||
);
|
||||
},
|
||||
canDelete(row) {
|
||||
return (
|
||||
this.hasPermission(`${this.config.permission}_delete`) &&
|
||||
!row.readonly &&
|
||||
this.inStatus(row, this.config.deleteStatus)
|
||||
);
|
||||
},
|
||||
canView(row) {
|
||||
return (
|
||||
this.hasPermission(`${this.config.permission}_view`) &&
|
||||
this.inStatus(row, this.config.viewStatus)
|
||||
);
|
||||
},
|
||||
canOperation(operation, row) {
|
||||
if (operation.permission && !this.hasPermission(operation.permission)) return false;
|
||||
if (row.readonly && ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)) {
|
||||
return false;
|
||||
}
|
||||
return this.inStatus(row, operation.status);
|
||||
},
|
||||
customOperations(row) {
|
||||
return (this.config.operations || []).filter(operation => {
|
||||
if (operation.mkOnly && !this.mkEnabled) return false;
|
||||
if (operation.localOnly && this.mkEnabled) return false;
|
||||
return this.canOperation(operation, row);
|
||||
});
|
||||
},
|
||||
openForm(mode, row = {}) {
|
||||
const query = { mode, id: row.id };
|
||||
if (mode === 'edit') query.name = '编辑项目变更';
|
||||
else if (mode === 'view') query.name = '查看项目变更';
|
||||
this.$router.push({ path: projectChangeFormRoute, query });
|
||||
},
|
||||
handleCustomOperation(operation, row) {
|
||||
if (operation.action === 'mkAudit') {
|
||||
this.handleMkAudit(row);
|
||||
return;
|
||||
}
|
||||
const run = () => {
|
||||
const request = () => this.api[operation.action](row.id);
|
||||
// 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
|
||||
const afterMk =
|
||||
operation.action === 'submitApproval'
|
||||
? request().then(() =>
|
||||
submitMkApprovalFlow({
|
||||
bizType: 'project-change',
|
||||
bizId: row.id,
|
||||
subjectName: row.projectName || '',
|
||||
approvalStatus: row.approvalStatus || '',
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: row.projectType || '' },
|
||||
})
|
||||
)
|
||||
: request();
|
||||
const loading =
|
||||
operation.action === 'approve'
|
||||
? this.$loading({
|
||||
lock: true,
|
||||
text: '正在推送合规，请稍候…',
|
||||
background: 'rgba(255, 255, 255, 0.6)',
|
||||
})
|
||||
: null;
|
||||
afterMk
|
||||
.then(res => {
|
||||
if (operation.action === 'approve' && res.data?.data === false) {
|
||||
this.$message.warning(res.data?.msg);
|
||||
this.onLoad(this.page, this.query);
|
||||
return;
|
||||
}
|
||||
if (res.data?.success === false) {
|
||||
this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
|
||||
return;
|
||||
}
|
||||
this.$message.success(`${operation.label}成功`);
|
||||
this.onLoad(this.page, this.query);
|
||||
})
|
||||
.finally(() => loading && loading.close());
|
||||
};
|
||||
this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => run());
|
||||
},
|
||||
handleMkAudit(row) {
|
||||
if (!row?.id) {
|
||||
this.$message.warning('变更单ID为空，无法打开审核页');
|
||||
return;
|
||||
}
|
||||
getMKApprovalUrl({ bizId: String(row.id) })
|
||||
.then(res => {
|
||||
const url = res?.data?.data;
|
||||
if (!url) {
|
||||
this.$message.error('获取审核跳转地址失败');
|
||||
return;
|
||||
}
|
||||
window.open(url, '_blank');
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message.error('获取审核跳转地址失败');
|
||||
});
|
||||
},
|
||||
searchReset() {
|
||||
this.query = {};
|
||||
this.onLoad(this.page);
|
||||
},
|
||||
searchChange(params, done) {
|
||||
this.query = params;
|
||||
this.page.currentPage = 1;
|
||||
this.onLoad(this.page, params);
|
||||
done();
|
||||
},
|
||||
selectionChange(list) {
|
||||
this.selectionList = list;
|
||||
},
|
||||
selectionClear() {
|
||||
this.selectionList = [];
|
||||
this.$refs.crud?.toggleSelection?.();
|
||||
},
|
||||
currentChange(currentPage) {
|
||||
this.page.currentPage = currentPage;
|
||||
},
|
||||
sizeChange(pageSize) {
|
||||
this.page.pageSize = pageSize;
|
||||
},
|
||||
refreshChange() {
|
||||
this.onLoad(this.page, this.query);
|
||||
},
|
||||
rowDel(row) {
|
||||
this.$confirm('确定将选择数据删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
this.api.remove(row.id).then(() => {
|
||||
this.$message.success('删除成功!');
|
||||
this.onLoad(this.page, this.query);
|
||||
});
|
||||
});
|
||||
},
|
||||
handleDelete() {
|
||||
if (!this.selectionList.length) {
|
||||
this.$message.warning('请选择至少一条数据');
|
||||
return;
|
||||
}
|
||||
this.$confirm('确定将选择数据删除?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
this.api.remove(this.ids).then(() => {
|
||||
this.$message.success('删除成功!');
|
||||
this.selectionClear();
|
||||
this.onLoad(this.page, this.query);
|
||||
});
|
||||
});
|
||||
},
|
||||
onLoad(page, params = {}) {
|
||||
this.loading = true;
|
||||
const values = {
|
||||
...this.query,
|
||||
...params,
|
||||
};
|
||||
this.api
|
||||
.getList(page.currentPage, page.pageSize, values)
|
||||
.then(res => {
|
||||
const data = res.data.data || {};
|
||||
this.page.total = data.total || 0;
|
||||
this.data = data.records || [];
|
||||
this.loading = false;
|
||||
this.selectionClear();
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.project-change-page {
|
||||
:deep(.avue-crud__menu) {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -6,7 +6,7 @@
|
||||
:config="config"
|
||||
:crud-option="option"
|
||||
:detail-id="detailId"
|
||||
:menu-width="250"
|
||||
:menu-width="320"
|
||||
standalone-form-page
|
||||
/>
|
||||
</template>
|
||||
|
||||
@@ -156,9 +156,17 @@ export default {
|
||||
});
|
||||
},
|
||||
async handleApprove(row) {
|
||||
await api.approve({ id: row.id });
|
||||
this.$message.success('审批通过');
|
||||
this.loadTable();
|
||||
await this.$confirm('确认审批通过该汇票付款？', '提示', { type: 'warning' });
|
||||
// 防止重复点击：请求期间表格遮罩，后续点击直接忽略
|
||||
if (this.loading) return;
|
||||
this.loading = true;
|
||||
try {
|
||||
await api.approve({ id: row.id });
|
||||
this.$message.success('审批通过');
|
||||
await this.loadTable();
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
async handleReturn(row) {
|
||||
const { value } = await this.$prompt('请输入驳回原因', '审批驳回');
|
||||
|
||||
@@ -323,17 +323,8 @@
|
||||
<el-table-column label="可开票金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分摊发票金额" min-width="160">
|
||||
<template #default="{ row }">
|
||||
<el-input-number
|
||||
v-model="row.allocatedInvoiceAmount"
|
||||
:disabled="readonly"
|
||||
:min="0"
|
||||
:max="Number(row.availableInvoiceAmount || 0)"
|
||||
:precision="2"
|
||||
:controls="false"
|
||||
/>
|
||||
</template>
|
||||
<el-table-column label="分摊发票金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section-card>
|
||||
@@ -454,6 +445,9 @@
|
||||
<el-table-column label="结算金额" min-width="130" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已申请开票金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.invoicedAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="可开票金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
@@ -861,7 +855,6 @@ export default {
|
||||
keyword: this.settlementDialog.keyword,
|
||||
contractCategory: '客户合同',
|
||||
settlementType: 'receivable',
|
||||
invoiceStatus: 'unreceived',
|
||||
}
|
||||
)
|
||||
);
|
||||
@@ -913,7 +906,7 @@ export default {
|
||||
...item,
|
||||
formalSettlementId: item.id,
|
||||
settlementId: item.id,
|
||||
allocatedInvoiceAmount: rows.length === 1 ? Number(item.availableInvoiceAmount || 0) : 0,
|
||||
allocatedInvoiceAmount: 0,
|
||||
}));
|
||||
this.form.projectName = first.projectName;
|
||||
this.form.deptName = first.deptName;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -89,26 +89,26 @@
|
||||
<el-col :span="8">
|
||||
<el-form-item label="承运商合同" prop="carrierContractId">
|
||||
<el-select
|
||||
v-model="form.carrierContractId"
|
||||
v-model="form.carrierOptionValue"
|
||||
filterable
|
||||
clearable
|
||||
:disabled="readonly || !form.projectId"
|
||||
style="width: 100%"
|
||||
:placeholder="form.projectId ? '请选择承运商合同' : '请先选择项目'"
|
||||
:placeholder="form.projectId ? '请选择承运商合同客商' : '请先选择项目'"
|
||||
@change="onCarrierContractChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in filteredCarrierContracts"
|
||||
:key="item.id"
|
||||
:label="formatContractLabel(item)"
|
||||
:value="item.id"
|
||||
v-for="item in filteredCarrierContractOptions"
|
||||
:key="item.optionValue"
|
||||
:label="item.optionLabel"
|
||||
:value="item.optionValue"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="承运商">
|
||||
<el-input v-model="form.carrierName" disabled placeholder="选择承运商合同后自动填充" />
|
||||
<el-input v-model="form.carrierName" disabled placeholder="选择承运商合同客商后自动填充" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
@@ -403,6 +403,9 @@ const createDefaultForm = () => ({
|
||||
customerName: '',
|
||||
carrierContractId: '',
|
||||
carrierContractName: '',
|
||||
carrierOptionValue: '',
|
||||
carrierPartyId: '',
|
||||
carrierPartyRole: '',
|
||||
carrierName: '',
|
||||
waybillMode: 'new',
|
||||
remark: '',
|
||||
@@ -442,6 +445,62 @@ const filteredCustomerContracts = computed(() => customerContracts.value);
|
||||
|
||||
const filteredCarrierContracts = computed(() => carrierContracts.value);
|
||||
|
||||
const parsePartyRows = (partyJson, fallbackName = '', partyRole = 'B') => {
|
||||
let rows = [];
|
||||
try {
|
||||
const parsed = partyJson ? JSON.parse(partyJson) : [];
|
||||
if (Array.isArray(parsed)) {
|
||||
rows = parsed
|
||||
.map(item => ({
|
||||
id: item.id || '',
|
||||
customerId: item.customerId || '',
|
||||
customerName: String(item.customerName || '').trim(),
|
||||
partyRole,
|
||||
}))
|
||||
.filter(item => item.customerName);
|
||||
}
|
||||
} catch (error) {
|
||||
rows = [];
|
||||
}
|
||||
if (rows.length) return rows;
|
||||
return String(fallbackName || '')
|
||||
.split(/[、,，]/)
|
||||
.map(name => name.trim())
|
||||
.filter(Boolean)
|
||||
.map(name => ({ id: '', customerId: '', customerName: name, partyRole }));
|
||||
};
|
||||
|
||||
const filteredCarrierContractOptions = computed(() => {
|
||||
const options = [];
|
||||
filteredCarrierContracts.value.forEach(contract => {
|
||||
const parties = [
|
||||
...parsePartyRows(contract.partyBJson, contract.partyB, 'B'),
|
||||
...parsePartyRows(contract.partyCJson, contract.partyC, 'C'),
|
||||
];
|
||||
if (!parties.length && contract.carrierName) {
|
||||
parties.push({
|
||||
id: '',
|
||||
customerId: '',
|
||||
customerName: contract.carrierName,
|
||||
partyRole: 'B',
|
||||
});
|
||||
}
|
||||
parties.forEach(party => {
|
||||
const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
|
||||
const optionValue = [contract.id, party.id || '', party.customerName].join('__');
|
||||
options.push({
|
||||
...contract,
|
||||
optionValue,
|
||||
optionLabel: `${party.customerName}（${roleLabel}） - ${formatContractLabel(contract)}`,
|
||||
carrierPartyId: party.id || '',
|
||||
carrierPartyRole: party.partyRole,
|
||||
carrierName: party.customerName,
|
||||
});
|
||||
});
|
||||
});
|
||||
return options;
|
||||
});
|
||||
|
||||
const extractRecords = response => {
|
||||
const data = response?.data || response;
|
||||
if (Array.isArray(data)) return data;
|
||||
@@ -708,6 +767,10 @@ const normalizeContract = item => {
|
||||
projectId: normalized.projectId,
|
||||
partyA: normalized.partyA || '',
|
||||
partyB: normalized.partyB || '',
|
||||
partyC: normalized.partyC || '',
|
||||
partyAJson: normalized.partyAJson || '',
|
||||
partyBJson: normalized.partyBJson || '',
|
||||
partyCJson: normalized.partyCJson || '',
|
||||
customerName: normalized.customerName || normalized.partyA || '',
|
||||
carrierName: normalized.carrierName || normalized.partyB || '',
|
||||
};
|
||||
@@ -972,10 +1035,9 @@ const autoSelectSingleContracts = () => {
|
||||
form.customerContractId = customers[0].id;
|
||||
onCustomerContractChange(customers[0].id);
|
||||
}
|
||||
const carriers = filteredCarrierContracts.value;
|
||||
const carriers = filteredCarrierContractOptions.value;
|
||||
if (carriers.length === 1 && !form.carrierContractId) {
|
||||
form.carrierContractId = carriers[0].id;
|
||||
onCarrierContractChange(carriers[0].id);
|
||||
onCarrierContractChange(carriers[0].optionValue);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -987,6 +1049,9 @@ const onProjectChange = async id => {
|
||||
form.customerName = '';
|
||||
form.carrierContractId = '';
|
||||
form.carrierContractName = '';
|
||||
form.carrierOptionValue = '';
|
||||
form.carrierPartyId = '';
|
||||
form.carrierPartyRole = '';
|
||||
form.carrierName = '';
|
||||
customerContracts.value = [];
|
||||
carrierContracts.value = [];
|
||||
@@ -1005,9 +1070,15 @@ const onCustomerContractChange = id => {
|
||||
form.customerName = item?.customerName || item?.partyA || '';
|
||||
};
|
||||
|
||||
const onCarrierContractChange = id => {
|
||||
const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
|
||||
const onCarrierContractChange = optionValue => {
|
||||
const item = filteredCarrierContractOptions.value.find(
|
||||
row => String(row.optionValue) === String(optionValue)
|
||||
);
|
||||
form.carrierOptionValue = item?.optionValue || '';
|
||||
form.carrierContractId = item?.id || '';
|
||||
form.carrierContractName = item?.contractName || '';
|
||||
form.carrierPartyId = item?.carrierPartyId || '';
|
||||
form.carrierPartyRole = item?.carrierPartyRole || '';
|
||||
form.carrierName = item?.carrierName || item?.partyB || '';
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
<template>
|
||||
<div v-loading="true" class="formal-settlement-redirect" />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as api from '@/api/settlement/formalSettlement';
|
||||
import { settlementListPath } from '@/utils/settlement-menu';
|
||||
|
||||
/**
|
||||
* 菜单拆分为付款/收款结算单后，旧路径 /settlement/formal-settlement 已无菜单路由。
|
||||
* 本页按结算单号解析类型后 replace 到对应列表页，并保留 query（含 detailNo）。
|
||||
*/
|
||||
export default {
|
||||
name: 'FormalSettlementRedirect',
|
||||
async created() {
|
||||
const detailNo = String(this.$route.query.detailNo || '').trim();
|
||||
let settlementType = '';
|
||||
if (detailNo) {
|
||||
try {
|
||||
const response = await api.getList(1, 10, { formalSettlementNo: detailNo });
|
||||
const body = response?.data || response || {};
|
||||
const data = body?.data || body;
|
||||
const row = (data.records || []).find(item => item.formalSettlementNo === detailNo);
|
||||
settlementType = row?.settlementType || '';
|
||||
} catch (error) {
|
||||
settlementType = '';
|
||||
}
|
||||
}
|
||||
const path = settlementListPath(settlementType);
|
||||
await this.$router.replace({
|
||||
path,
|
||||
query: { ...this.$route.query },
|
||||
});
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.formal-settlement-redirect {
|
||||
min-height: 240px;
|
||||
}
|
||||
</style>
|
||||
@@ -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);
|
||||
@@ -2904,10 +2904,33 @@ export default {
|
||||
buildRequestParams(params = {}) {
|
||||
return this.settlementType ? { ...params, settlementType: this.settlementType } : params;
|
||||
},
|
||||
syncBillingPlanOptions(contractId) {
|
||||
syncBillingPlanOptions(contractId, counterpartyName = '') {
|
||||
const contracts = [...this.updateContractOptions, ...this.contractOptions];
|
||||
const contract = contracts.find(item => String(item.id) === String(contractId));
|
||||
const plans = this.parseJson(contract?.billingPlanJson);
|
||||
let plans = this.parseJson(contract?.billingPlanJson);
|
||||
const targetName = String(
|
||||
counterpartyName ||
|
||||
this.updateFeeForm?.counterpartyName ||
|
||||
this.generateQuery?.counterpartyName ||
|
||||
this.currentDetail?.counterpartyName ||
|
||||
this.currentDetail?.carrierName ||
|
||||
this.currentDetail?.customerName ||
|
||||
''
|
||||
).trim();
|
||||
if (targetName) {
|
||||
const matched = plans.filter(
|
||||
item =>
|
||||
String(item.customerName || '').trim() === targetName ||
|
||||
String(item.partyRowId || '') ===
|
||||
String(this.updateFeeForm?.carrierPartyId || this.generateQuery?.carrierPartyId || '')
|
||||
);
|
||||
const hasBinding = plans.some(
|
||||
item => item.customerName || item.customerId || item.partyRowId
|
||||
);
|
||||
if (matched.length || hasBinding) {
|
||||
plans = matched;
|
||||
}
|
||||
}
|
||||
this.billingPlanOptions = plans.map((item, index) => ({
|
||||
id:
|
||||
item.id ||
|
||||
@@ -2916,11 +2939,16 @@ export default {
|
||||
item.planName ||
|
||||
item.billingPlanName ||
|
||||
`plan-${index}`,
|
||||
name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
|
||||
name: [
|
||||
item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
|
||||
item.customerName ? `（${item.customerName}）` : '',
|
||||
].join(''),
|
||||
defaultPlan:
|
||||
item.defaultPlan === true ||
|
||||
item.defaultPlan === 1 ||
|
||||
['true', '1'].includes(String(item.defaultPlan).toLowerCase()),
|
||||
customerName: item.customerName || '',
|
||||
partyRowId: item.partyRowId || '',
|
||||
}));
|
||||
return this.billingPlanOptions;
|
||||
},
|
||||
|
||||
@@ -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);
|
||||
@@ -317,11 +321,18 @@ export default {
|
||||
},
|
||||
async handleApprove(row) {
|
||||
await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
|
||||
const res = await api.approve(row.id);
|
||||
// data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
|
||||
if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
|
||||
else this.$message.success(res.data.msg || '审批通过');
|
||||
this.loadTable();
|
||||
// 防止重复点击：请求期间表格遮罩，后续点击直接忽略
|
||||
if (this.loading) return;
|
||||
this.loading = true;
|
||||
try {
|
||||
const res = await api.approve(row.id);
|
||||
// data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
|
||||
if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
|
||||
else this.$message.success(res.data.msg || '审批通过');
|
||||
await this.loadTable();
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
async handleReturn(row) {
|
||||
const { value } = await this.$prompt('请输入驳回原因', '驳回', {
|
||||
|
||||
@@ -0,0 +1,414 @@
|
||||
<template>
|
||||
<basic-container class="business-dept-config-page">
|
||||
<avue-crud
|
||||
ref="crud"
|
||||
v-model="form"
|
||||
v-model:page="page"
|
||||
:option="option"
|
||||
:data="data"
|
||||
:table-loading="loading"
|
||||
:permission="permissionList"
|
||||
:before-open="beforeOpen"
|
||||
@row-save="rowSave"
|
||||
@row-update="rowUpdate"
|
||||
@row-del="rowDel"
|
||||
@search-change="searchChange"
|
||||
@search-reset="searchReset"
|
||||
@current-change="currentChange"
|
||||
@size-change="sizeChange"
|
||||
@refresh-change="refreshChange"
|
||||
@on-load="onLoad"
|
||||
>
|
||||
<template #menu="{ row, index }">
|
||||
<el-link
|
||||
v-if="permission.business_dept_config_view"
|
||||
type="primary"
|
||||
@click="$refs.crud.rowView(row, index)"
|
||||
>
|
||||
查看
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="permission.business_dept_config_edit"
|
||||
type="primary"
|
||||
@click="$refs.crud.rowEdit(row, index)"
|
||||
>
|
||||
编辑
|
||||
</el-link>
|
||||
<el-link
|
||||
v-if="permission.business_dept_config_delete"
|
||||
type="danger"
|
||||
@click="rowDel(row)"
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
</template>
|
||||
<template #initialSerial="{ row }">
|
||||
{{ formatSerial(row.initialSerial) }}
|
||||
</template>
|
||||
<template #platformCompanyId-form>
|
||||
<el-select
|
||||
v-model="form.platformCompanyId"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择平台公司"
|
||||
style="width: 100%"
|
||||
@change="handlePlatformCompanyChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in platformCompanyOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
<template #businessDeptId-form>
|
||||
<el-select
|
||||
v-model="form.businessDeptId"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择业务部门"
|
||||
style="width: 100%"
|
||||
@change="handleBusinessDeptChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in businessDeptOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
<template #kingdeeCompanyCode-form>
|
||||
<el-input
|
||||
v-model="form.kingdeeCompanyCode"
|
||||
disabled
|
||||
placeholder="关联组织中配置的平台公司金蝶代码"
|
||||
/>
|
||||
</template>
|
||||
</avue-crud>
|
||||
</basic-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getList, getDetail, submit, remove } from '@/api/system/business-dept-config';
|
||||
import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
|
||||
import { mapGetters } from 'vuex';
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
form: {},
|
||||
data: [],
|
||||
loading: true,
|
||||
query: {},
|
||||
page: {
|
||||
pageSize: 10,
|
||||
pageSizes: [10, 30, 50, 100, 200],
|
||||
currentPage: 1,
|
||||
total: 0,
|
||||
},
|
||||
platformCompanyOptions: [],
|
||||
businessDeptOptions: [],
|
||||
option: {
|
||||
height: 'auto',
|
||||
calcHeight: 32,
|
||||
tip: false,
|
||||
border: true,
|
||||
stripe: true,
|
||||
index: true,
|
||||
indexLabel: '序号',
|
||||
indexWidth: 70,
|
||||
selection: false,
|
||||
addBtn: true,
|
||||
editBtn: false,
|
||||
delBtn: false,
|
||||
viewBtn: false,
|
||||
menuWidth: 220,
|
||||
dialogWidth: 900,
|
||||
dialogClickModal: false,
|
||||
labelPosition: 'right',
|
||||
labelWidth: 'auto',
|
||||
searchShow: true,
|
||||
searchIcon: true,
|
||||
searchIndex: 4,
|
||||
searchMenuSpan: 24,
|
||||
searchMenuPosition: 'right',
|
||||
column: [
|
||||
{
|
||||
label: '业务部门',
|
||||
prop: 'businessDeptId',
|
||||
type: 'select',
|
||||
filterable: true,
|
||||
search: true,
|
||||
searchOrder: 2,
|
||||
searchFilterable: true,
|
||||
minWidth: 160,
|
||||
span: 12,
|
||||
formslot: true,
|
||||
hide: true,
|
||||
props: { label: 'label', value: 'value' },
|
||||
dicData: [],
|
||||
rules: [{ required: true, message: '请选择业务部门', trigger: 'change' }],
|
||||
},
|
||||
{
|
||||
label: '业务部门',
|
||||
prop: 'businessDeptName',
|
||||
minWidth: 160,
|
||||
display: false,
|
||||
},
|
||||
{
|
||||
label: '平台公司',
|
||||
prop: 'platformCompanyId',
|
||||
type: 'select',
|
||||
filterable: true,
|
||||
search: true,
|
||||
searchOrder: 1,
|
||||
searchFilterable: true,
|
||||
minWidth: 220,
|
||||
span: 12,
|
||||
formslot: true,
|
||||
hide: true,
|
||||
props: { label: 'label', value: 'value' },
|
||||
dicData: [],
|
||||
rules: [{ required: true, message: '请选择平台公司', trigger: 'change' }],
|
||||
},
|
||||
{
|
||||
label: '平台公司',
|
||||
prop: 'platformCompanyName',
|
||||
minWidth: 220,
|
||||
display: false,
|
||||
},
|
||||
{
|
||||
label: '合同编码前缀',
|
||||
prop: 'contractCodePrefix',
|
||||
minWidth: 140,
|
||||
span: 12,
|
||||
maxlength: 64,
|
||||
rules: [{ required: true, message: '请输入合同编码前缀', trigger: 'blur' }],
|
||||
},
|
||||
{
|
||||
label: '金蝶公司代码',
|
||||
prop: 'kingdeeCompanyCode',
|
||||
minWidth: 140,
|
||||
span: 12,
|
||||
formslot: true,
|
||||
addDisplay: true,
|
||||
editDisplay: true,
|
||||
hide: 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>
|
||||
+57
-180
@@ -203,7 +203,6 @@ import { mapGetters } from 'vuex';
|
||||
import website from '@/config/website';
|
||||
import func from '@/utils/func';
|
||||
|
||||
const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
|
||||
/**
|
||||
* 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
|
||||
@@ -303,7 +302,7 @@ export default {
|
||||
headerAlign: 'left',
|
||||
order: 80,
|
||||
search: true,
|
||||
searchOrder: 2,
|
||||
searchOrder: 3,
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
@@ -323,7 +322,7 @@ export default {
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
const deptCode = String(value || '').trim();
|
||||
// 组织编码非必填，为空直接通过
|
||||
// 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
|
||||
if (!deptCode) {
|
||||
callback();
|
||||
return;
|
||||
@@ -332,126 +331,6 @@ export default {
|
||||
callback(new Error('组织编码不能超过30个字符'));
|
||||
return;
|
||||
}
|
||||
const parentId = this.normalizeParentId(this.form?.parentId);
|
||||
// 顶级组织不选择上级时，编码不依赖上级编码
|
||||
if (!parentId) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
|
||||
this.loadParentDeptCode(parentId);
|
||||
callback(new Error('正在加载上级组织编码，请稍后重试'));
|
||||
return;
|
||||
}
|
||||
if (!this.parentDeptCode) {
|
||||
callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
|
||||
return;
|
||||
}
|
||||
// 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字（中间不加-）
|
||||
let expectedPrefix = this.parentDeptCode;
|
||||
const category = Number(this.form?.deptCategory);
|
||||
if (category === 2) {
|
||||
expectedPrefix = 'GWWL';
|
||||
} else if (category === 3 && this.form?.belongCompanyCode) {
|
||||
expectedPrefix = String(this.form.belongCompanyCode).trim();
|
||||
}
|
||||
const pattern = new RegExp(`^${escapeRegExp(expectedPrefix)}\\d{3}$`);
|
||||
if (!pattern.test(deptCode)) {
|
||||
callback(new Error(`组织编码格式应为：${expectedPrefix}三位数字（不足补零，中间不加-）`));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '金蝶部门代码',
|
||||
prop: 'kingdeeDeptCode',
|
||||
minWidth: 140,
|
||||
order: 65,
|
||||
maxlength: 64,
|
||||
showWordLimit: true,
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
const code = String(value || '').trim();
|
||||
if (!code) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (code.length > 64) {
|
||||
callback(new Error('金蝶部门代码不能超过64个字符'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '合同编码前缀',
|
||||
prop: 'contractCodePrefix',
|
||||
minWidth: 160,
|
||||
order: 62,
|
||||
maxlength: 64,
|
||||
showWordLimit: true,
|
||||
placeholder: '如 GWZH成都',
|
||||
tip: '合同编号规则：前缀（年份）三位流水号，流水按本部门独立编号',
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
const prefix = String(value || '').trim();
|
||||
if (!prefix) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
if (prefix.length > 64) {
|
||||
callback(new Error('合同编码前缀不能超过64个字符'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: '合同初始流水号',
|
||||
prop: 'contractInitialSerial',
|
||||
type: 'input',
|
||||
minWidth: 140,
|
||||
order: 61,
|
||||
placeholder: '如 1',
|
||||
// -1 为空占位，列表展示为空
|
||||
formatter: row =>
|
||||
Number(row.contractInitialSerial) === -1 ? '' : row.contractInitialSerial,
|
||||
tip: '该部门当年首个合同时从此流水号起编，后续递增；范围1-999，不填默认从1开始',
|
||||
rules: [
|
||||
{
|
||||
validator: (rule, value, callback) => {
|
||||
// -1 为空占位，不填时按空处理
|
||||
if (
|
||||
value === undefined ||
|
||||
value === null ||
|
||||
value === '' ||
|
||||
Number(value) === -1
|
||||
) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
const text = String(value).trim();
|
||||
if (!/^\d+$/.test(text)) {
|
||||
callback(new Error('合同初始流水号只能输入正整数'));
|
||||
return;
|
||||
}
|
||||
const serial = Number(text);
|
||||
if (serial < 1 || serial > 999) {
|
||||
callback(new Error('合同初始流水号范围为1到999'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'blur',
|
||||
@@ -464,7 +343,7 @@ export default {
|
||||
minWidth: 140,
|
||||
order: 60,
|
||||
search: true,
|
||||
searchOrder: 1,
|
||||
searchOrder: 4,
|
||||
},
|
||||
{
|
||||
label: '助记码',
|
||||
@@ -523,14 +402,21 @@ export default {
|
||||
{ label: '是', value: 1 },
|
||||
],
|
||||
dataType: 'number',
|
||||
value: 0,
|
||||
width: 120,
|
||||
order: 35,
|
||||
order: 36,
|
||||
search: true,
|
||||
searchOrder: 2,
|
||||
searchPlaceholder: '请选择是否平台公司',
|
||||
formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择是否平台公司',
|
||||
validator: (rule, value, callback) => {
|
||||
if (value === undefined || value === null || value === '') {
|
||||
callback(new Error('请选择是否平台公司'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
@@ -544,14 +430,22 @@ export default {
|
||||
{ label: '是', value: 1 },
|
||||
],
|
||||
dataType: 'number',
|
||||
value: 0,
|
||||
width: 120,
|
||||
order: 34,
|
||||
search: true,
|
||||
searchOrder: 1,
|
||||
searchPlaceholder: '请选择是否业务部门',
|
||||
formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
|
||||
rules: [
|
||||
{
|
||||
required: true,
|
||||
message: '请选择是否业务部门',
|
||||
validator: (rule, value, callback) => {
|
||||
// 不能用 required:true：值为 0（否）时会被当成空
|
||||
if (value === undefined || value === null || value === '') {
|
||||
callback(new Error('请选择是否业务部门'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
},
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
@@ -1042,6 +936,7 @@ export default {
|
||||
/**
|
||||
* 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
|
||||
* 排序为空时由后端默认填充 1。
|
||||
* 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
|
||||
*/
|
||||
prepareDeptSubmitRow(row) {
|
||||
const category = this.resolveDeptCategoryValue(row.deptCategory);
|
||||
@@ -1049,6 +944,8 @@ export default {
|
||||
return false;
|
||||
}
|
||||
row.deptCategory = category;
|
||||
row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
|
||||
row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
|
||||
if (row.status === '' || row.status === null || row.status === undefined) {
|
||||
delete row.status;
|
||||
} else {
|
||||
@@ -1061,6 +958,9 @@ export default {
|
||||
}
|
||||
return true;
|
||||
},
|
||||
normalizeYesNoFlag(value) {
|
||||
return Number(value) === 1 ? 1 : 0;
|
||||
},
|
||||
resolveDeptCategoryValue(value) {
|
||||
if (value === null || value === undefined || value === '') {
|
||||
this.$message.warning('请选择组织类型');
|
||||
@@ -1217,29 +1117,6 @@ export default {
|
||||
row.parentId = 0;
|
||||
}
|
||||
},
|
||||
normalizeContractInitialSerial(value) {
|
||||
// -1 为空占位，不填时不落库、不回显
|
||||
if (
|
||||
value === undefined ||
|
||||
value === null ||
|
||||
value === '' ||
|
||||
Number(value) === -1
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
const text = String(value).trim();
|
||||
if (!text) {
|
||||
return null;
|
||||
}
|
||||
const serial = Number(text);
|
||||
return Number.isInteger(serial) ? serial : value;
|
||||
},
|
||||
clearEmptyContractInitialSerial(form = this.form) {
|
||||
if (!form) return;
|
||||
if (Number(form.contractInitialSerial) === -1) {
|
||||
form.contractInitialSerial = '';
|
||||
}
|
||||
},
|
||||
isRootDept(row) {
|
||||
return row && (row.parentId === 0 || String(row.parentId) === '0');
|
||||
},
|
||||
@@ -1384,9 +1261,6 @@ 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.leaderId = func.join(row.leaderId);
|
||||
this.normalizeTopParent(row);
|
||||
if (!this.prepareDeptSubmitRow(row)) {
|
||||
@@ -1432,9 +1306,6 @@ 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.leaderId = func.join(row.leaderId);
|
||||
this.normalizeTopParent(row);
|
||||
if (!this.prepareDeptSubmitRow(row)) {
|
||||
@@ -1541,34 +1412,40 @@ export default {
|
||||
beforeOpen(done, type) {
|
||||
if (type === 'add') {
|
||||
this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
|
||||
if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
|
||||
this.form.isPlatformCompany = 0;
|
||||
}
|
||||
if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
|
||||
this.form.isBusinessDept = 0;
|
||||
}
|
||||
this.clearEmptyContractInitialSerial(this.form);
|
||||
this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
|
||||
this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
|
||||
this.initData(this.form.tenantId);
|
||||
this.loadParentDeptCode(this.form.parentId);
|
||||
done();
|
||||
return;
|
||||
}
|
||||
if (type === 'edit') {
|
||||
this.initData(this.form.tenantId || this.userInfo.tenantId || website.tenantId);
|
||||
}
|
||||
if (['edit', 'view'].includes(type)) {
|
||||
getDept(this.form.id).then(res => {
|
||||
this.form = Object.assign(res.data.data, {
|
||||
hasChildren: this.form.hasChildren,
|
||||
// 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 Avue 表单引用
|
||||
getDept(this.form.id)
|
||||
.then(res => {
|
||||
const detail = res.data.data || {};
|
||||
Object.assign(this.form, detail, {
|
||||
hasChildren: this.form.hasChildren,
|
||||
isPlatformCompany: this.normalizeYesNoFlag(detail.isPlatformCompany),
|
||||
isBusinessDept: this.normalizeYesNoFlag(detail.isBusinessDept),
|
||||
});
|
||||
if (this.form.parentId === '0') {
|
||||
this.form.parentId = '';
|
||||
}
|
||||
this.loadParentDeptCode(this.form.parentId);
|
||||
if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
|
||||
const splitResult = func.split(this.form.leaderId);
|
||||
this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
|
||||
}
|
||||
done();
|
||||
})
|
||||
.catch(() => {
|
||||
done();
|
||||
});
|
||||
if (this.form.parentId === '0') {
|
||||
this.form.parentId = '';
|
||||
}
|
||||
this.clearEmptyContractInitialSerial(this.form);
|
||||
this.loadParentDeptCode(this.form.parentId);
|
||||
if (this.form.hasOwnProperty('leaderId')) {
|
||||
const splitResult = func.split(this.form.leaderId);
|
||||
this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
done();
|
||||
},
|
||||
|
||||
@@ -26,9 +26,6 @@
|
||||
<el-button type="primary" plain v-if="permission.mp_user_reset" @click="handleReset">
|
||||
密码重置
|
||||
</el-button>
|
||||
<el-button type="danger" plain v-if="permission.mp_user_delete" @click="handleDelete">
|
||||
批量删除
|
||||
</el-button>
|
||||
</template>
|
||||
<template #identities="{ row }">
|
||||
{{ row.identitiesName || formatIdentities(row.identities) }}
|
||||
@@ -102,9 +99,6 @@
|
||||
<el-link type="primary" v-if="permission.mp_user_reset" @click="handleResetForRow(row)">
|
||||
重置密码
|
||||
</el-link>
|
||||
<el-link type="danger" v-if="permission.mp_user_delete" @click="rowDel(row)">
|
||||
删除
|
||||
</el-link>
|
||||
</template>
|
||||
<template #menu-form="{ size }">
|
||||
<el-button
|
||||
@@ -121,7 +115,7 @@
|
||||
|
||||
<script>
|
||||
import { h } from 'vue';
|
||||
import { getList, getDetail, submit, remove, changeStatus, resetPassword } from '@/api/system/mpUser';
|
||||
import { getList, getDetail, submit, changeStatus, resetPassword } from '@/api/system/mpUser';
|
||||
import { getDeptTree } from '@/api/system/dept';
|
||||
import option from '@/option/system/mpUser';
|
||||
import { mapGetters } from 'vuex';
|
||||
@@ -159,7 +153,6 @@ export default {
|
||||
return {
|
||||
addBtn: this.validData(this.permission.mp_user_add, false),
|
||||
viewBtn: this.validData(this.permission.mp_user_view, false),
|
||||
delBtn: this.validData(this.permission.mp_user_delete, false),
|
||||
editBtn: this.validData(this.permission.mp_user_edit, false),
|
||||
};
|
||||
},
|
||||
@@ -345,35 +338,6 @@ export default {
|
||||
() => loading()
|
||||
);
|
||||
},
|
||||
rowDel(row) {
|
||||
this.$confirm('确定删除该小程序用户?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => remove(row.id))
|
||||
.then(() => {
|
||||
this.onLoad(this.page);
|
||||
this.$message.success('操作成功');
|
||||
});
|
||||
},
|
||||
handleDelete() {
|
||||
if (this.selectionList.length === 0) {
|
||||
this.$message.warning('请选择至少一条数据');
|
||||
return;
|
||||
}
|
||||
this.$confirm('确定删除选中的小程序用户?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
})
|
||||
.then(() => remove(this.ids))
|
||||
.then(() => {
|
||||
this.onLoad(this.page);
|
||||
this.$message.success('操作成功');
|
||||
this.$refs.crud.toggleSelection();
|
||||
});
|
||||
},
|
||||
handleStatus(row) {
|
||||
const status = row.status === 1 ? 0 : 1;
|
||||
const text = status === 1 ? '启用' : '停用';
|
||||
|
||||
@@ -172,6 +172,21 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="数据管理权限" prop="dataScopeDeptIds">
|
||||
<el-cascader
|
||||
v-model="dataScopeCascaderValue"
|
||||
:options="permissionDeptTree"
|
||||
:props="deptCascaderProps"
|
||||
:disabled="isUserViewMode"
|
||||
clearable
|
||||
filterable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择数据管理组织（可多选）"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
|
||||
@@ -592,6 +607,26 @@ export default {
|
||||
this.$refs.userFormRef?.validateField('deptId');
|
||||
},
|
||||
},
|
||||
// 数据管理权限多选级联：form.dataScopeDeptIds 为 id 数组
|
||||
dataScopeCascaderValue: {
|
||||
get() {
|
||||
const ids = Array.isArray(this.form.dataScopeDeptIds)
|
||||
? this.form.dataScopeDeptIds
|
||||
: this.form.dataScopeDeptIds
|
||||
? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
|
||||
: [];
|
||||
return ids
|
||||
.filter(item => item !== undefined && item !== null && item !== '')
|
||||
.map(item => (typeof item === 'number' ? item : String(item)));
|
||||
},
|
||||
set(value) {
|
||||
this.form.dataScopeDeptIds = Array.isArray(value)
|
||||
? value.filter(item => item !== undefined && item !== null && item !== '')
|
||||
: value
|
||||
? [value]
|
||||
: [];
|
||||
},
|
||||
},
|
||||
isUserViewMode() {
|
||||
return this.userDialogMode === 'view';
|
||||
},
|
||||
@@ -1034,6 +1069,7 @@ export default {
|
||||
sex: undefined,
|
||||
postId: '',
|
||||
deptId: [],
|
||||
dataScopeDeptIds: [],
|
||||
code: '',
|
||||
personCategory: 1,
|
||||
remark: '',
|
||||
@@ -1046,9 +1082,13 @@ export default {
|
||||
getUser(row.id).then(res => {
|
||||
const user = res.data.data;
|
||||
const deptIds = func.split(user.deptId || '');
|
||||
const dataScopeDeptIds = Array.isArray(user.dataScopeDeptIds)
|
||||
? user.dataScopeDeptIds.map(item => String(item))
|
||||
: [];
|
||||
this.form = {
|
||||
...user,
|
||||
deptId: Array.isArray(deptIds) ? deptIds : [],
|
||||
dataScopeDeptIds,
|
||||
postId: func.split(user.postId || '')[0] || '',
|
||||
roleId: func.join(user.roleId || ''),
|
||||
personCategory: user.personCategory || 1,
|
||||
@@ -1064,9 +1104,13 @@ export default {
|
||||
submitUserForm() {
|
||||
this.$refs.userFormRef.validate(valid => {
|
||||
if (!valid) return;
|
||||
const dataScopeDeptIds = Array.isArray(this.form.dataScopeDeptIds)
|
||||
? this.form.dataScopeDeptIds.filter(item => item !== undefined && item !== null && item !== '')
|
||||
: [];
|
||||
const row = {
|
||||
...this.form,
|
||||
deptId: func.join(this.form.deptId),
|
||||
dataScopeDeptIds,
|
||||
postId: func.join(this.form.postId),
|
||||
roleId: func.join(this.form.roleId),
|
||||
leaderId: func.join(this.form.leaderId),
|
||||
|
||||
@@ -303,6 +303,42 @@
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="18">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="身份证有效期" prop="idCardValidEnd">
|
||||
<div class="date-range">
|
||||
<el-date-picker
|
||||
v-model="driverForm.idCardValidStart"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="起"
|
||||
:disabled="driverForm.idCardLongTerm === 1"
|
||||
@change="validateFormField('idCardValidEnd')"
|
||||
/>
|
||||
<el-date-picker
|
||||
v-model="driverForm.idCardValidEnd"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="止"
|
||||
:disabled="driverForm.idCardLongTerm === 1"
|
||||
@change="validateFormField('idCardValidEnd')"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="长期有效" prop="idCardLongTerm">
|
||||
<el-checkbox
|
||||
v-model="driverForm.idCardLongTerm"
|
||||
:true-label="1"
|
||||
:false-label="0"
|
||||
@change="handleIdCardLongTermChange"
|
||||
>
|
||||
是
|
||||
</el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</section-card>
|
||||
|
||||
<section-card title="驾驶证信息">
|
||||
@@ -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),
|
||||
|
||||
@@ -2462,6 +2462,7 @@ export default {
|
||||
resetKingdeeBackfill() {
|
||||
const form = this.archiveForm;
|
||||
form.kingdeeStatus = 'none';
|
||||
form.customerCode = '';
|
||||
form.fullName = '';
|
||||
form.legalPerson = '';
|
||||
form.registeredCapital = '';
|
||||
@@ -2517,6 +2518,8 @@ export default {
|
||||
applyKingdeeCustomer(customer) {
|
||||
const form = this.archiveForm;
|
||||
form.kingdeeStatus = 'exist';
|
||||
// 客商编号回显金蝶客商编码，与后端同步金蝶时的采纳口径保持一致
|
||||
if (customer.number) form.customerCode = customer.number;
|
||||
// 工商信息以金蝶为准，直接覆盖（后续字段锁定）
|
||||
if (customer.name) form.fullName = customer.name;
|
||||
if (customer.name) this.checkArchiveNameRisk();
|
||||
@@ -3935,7 +3938,7 @@ export default {
|
||||
});
|
||||
recognizeBusinessLicenseOcr(url)
|
||||
.then(res => {
|
||||
this.applyBusinessLicenseRecognition(res?.data?.data?.result || {});
|
||||
this.applyBusinessLicenseRecognition(res?.data?.data || {});
|
||||
this.$message.success('营业执照识别完成');
|
||||
})
|
||||
.catch(() => {
|
||||
@@ -3943,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;
|
||||
@@ -3956,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();
|
||||
|
||||
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user