Compare commits
536 Commits
112acbbf34
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| ad487b1e51 | |||
| 63722585c0 | |||
| 6bb1a91be8 | |||
| d3ba0ce38b | |||
| f5be5245d6 | |||
| baf54efb7b | |||
| e7ba220b34 | |||
| e79e50bf40 | |||
| a6b4a7b2d1 | |||
| 2be6a559e7 | |||
| 523a042fa9 | |||
| 07af103ecb | |||
| 6e48fa50cf | |||
| 8734c27fd3 | |||
| 7ff2b3fe28 | |||
| 17d2766f82 | |||
| 2fd927a90c | |||
| 8057e860de | |||
| ffc2942d2b | |||
| 22bbcbb7aa | |||
| 4dd63fc5fa | |||
| c525bffeca | |||
| 8f3da0e386 | |||
| d4ae6d521a | |||
| b36fa18db5 | |||
| f648285406 | |||
| fff0a29947 | |||
| 64b61c9c29 | |||
| 32065b9c54 | |||
| 5d56706eed | |||
| 9efae11811 | |||
| 9a04757a9e | |||
| e88a27d01f | |||
| b9c367e028 | |||
| 7f694bad55 | |||
| 014ee537a0 | |||
| 5bde60d844 | |||
| 799a87641e | |||
| 28baa69e8f | |||
| 4ed80268b4 | |||
| 30c59c2acb | |||
| 68904b02a5 | |||
| c0ba9ba39b | |||
| 8388a55481 | |||
| b492dd35ea | |||
| acb74cbc9a | |||
| 9a51bd2cfd | |||
| 4dd54f7e4c | |||
| 6705763951 | |||
| 4ba18acd25 | |||
| c07371450f | |||
| 5fbbb5f88f | |||
| 1ed7955764 | |||
| daab1001db | |||
| f5735e6bad | |||
| bd9da83175 | |||
| b59e43c9b7 | |||
| eae50ab909 | |||
| 39560bde79 | |||
| 8e1430491b | |||
| 9fed3785d9 | |||
| eaf431819e | |||
| c7bd4461e2 | |||
| ab7491e6d6 | |||
| d78d100824 | |||
| 9908b543ea | |||
| 46e7952e49 | |||
| 441d62a874 | |||
| 1a143aa05b | |||
| f3d69d7df0 | |||
| cd58e8ebc7 | |||
| 11d33df46a | |||
| 06de9477e5 | |||
| f7ee9273c6 | |||
| e0a420ad08 | |||
| 8388904916 | |||
| 24fec3c7d7 | |||
| b76ada9d6c | |||
| 2083754b16 | |||
| 3df09d7d45 | |||
| b878bc356e | |||
| d76977c07c | |||
| d95163663b | |||
| e95151ad51 | |||
| 5351911d50 | |||
| e602eecee8 | |||
| 70801096dd | |||
| 025cba317d | |||
| 5ce91ec5d5 | |||
| 26140aecb9 | |||
| 8d85311bb3 | |||
| 8b2fa09cb9 | |||
| 4d78466824 | |||
| fe4255c59b | |||
| c6c7c80d97 | |||
| 3397bd6a7b | |||
| 083d954765 | |||
| 78bb38e955 | |||
| 4b060fc045 | |||
| 2cf966d6e3 | |||
| d23a9b00de | |||
| d89fd9db97 | |||
| 94ee14b683 | |||
| a725d3078f | |||
| 185a0f9aec | |||
| a528788409 | |||
| 1957a78c00 | |||
| acfe9bdd74 | |||
| 72471f48de | |||
| 415e1fd58d | |||
| 698f808f0b | |||
| ea6ec13ea4 | |||
| 114c2fd2af | |||
| 6119c44394 | |||
| 9dab7f7495 | |||
| f5697e111a | |||
| 775307f5c0 | |||
| 4502881063 | |||
| 358add743e | |||
| f67a4036ed | |||
| 7ba6620f06 | |||
| 9a3652d767 | |||
| 450505715a | |||
| 9a603a3796 | |||
| 2b51619728 | |||
| 5f167aae50 | |||
| 0d8eb25253 | |||
| 74988c0b5e | |||
| e53852b05f | |||
| 8d3e87d710 | |||
| c7b07f0c95 | |||
| 4c117d87a5 | |||
| 59199397e0 | |||
| 70d49d022b | |||
| 7d16660bfc | |||
| d6bcb12c20 | |||
| e1d87f5788 | |||
| 56b8f68449 | |||
| 0ac17dea0b | |||
| 39e3115fbe | |||
| 9c0f7cb3f4 | |||
| 7b478bdbf2 | |||
| 87d6ff97a3 | |||
| e3bd44e8fc | |||
| 324daf9d4d | |||
| 37ac683fb4 | |||
| c402d68aea | |||
| e8f6311477 | |||
| fa78a68df6 | |||
| 320422856c | |||
| 0add4c5cdc | |||
| f6621392b1 | |||
| 2a5eca8393 | |||
| e4ae1d3c77 | |||
| 96783fcd7b | |||
| 372e8826a2 | |||
| 8d9fe998c0 | |||
| 92a8d4aab1 | |||
| 59a1ca8a0d | |||
| b9de34aa0e | |||
| 5544cfb3ca | |||
| fcd5ef7df9 | |||
| 489b406214 | |||
| 353148eb7f | |||
| 293b4fc6ce | |||
| 53b588063e | |||
| 0889f29c59 | |||
| f1c004813e | |||
| d67cf55491 | |||
| d7969c191a | |||
| 2f64abfc83 | |||
| a657b9d0ef | |||
| 9558426da1 | |||
| 6384e80758 | |||
| 3f019c9ac5 | |||
| e7c76c803f | |||
| eb32a275f3 | |||
| 9150213b0f | |||
| 90edc4b864 | |||
| 6a21b4ac8d | |||
| d05f8fd636 | |||
| d968c418a8 | |||
| d100e7a271 | |||
| 1c798046fd | |||
| 8d25e186b1 | |||
| c1863d0b6a | |||
| 4a0af452e8 | |||
| 447b2d9d76 | |||
| 603038d5ff | |||
| 673c47771b | |||
| 3168d365d0 | |||
| 5c97d3b5c5 | |||
| 09ce6472b0 | |||
| 5b435bef04 | |||
| d3af455374 | |||
| 0c4bb7cd82 | |||
| 4c9bbf1eb7 | |||
| 4e8163dd18 | |||
| 31794bf26a | |||
| 89bbc43f12 | |||
| 4199318aa9 | |||
| 555189177c | |||
| 1622015724 | |||
| 0e57de5c71 | |||
| 5cb7eb16d5 | |||
| ccaf944782 | |||
| aee661772b | |||
| bbe71e340a | |||
| 1ac741f785 | |||
| f7d8fbf16b | |||
| 912c1169a6 | |||
| 847f09b14d | |||
| 6596722601 | |||
| 2ae817ec38 | |||
| 6f2383a7e5 | |||
| 8db52ef168 | |||
| 38ca250242 | |||
| 73c12cc1c7 | |||
| f4542cd0b8 | |||
| 4b165471e3 | |||
| d1e779bbcc | |||
| 6d80ffde6c | |||
| acfbb4c54e | |||
| 44809ad303 | |||
| f440343830 | |||
| c1bc55e133 | |||
| baec42f876 | |||
| 4d3b6cdaed | |||
| 96b675b3be | |||
| 6067d24e3b | |||
| e051327f2d | |||
| f7759fd9e7 | |||
| 91cb3ee8c2 | |||
| b2a6d73bac | |||
| 4287133f84 | |||
| 4b01316f64 | |||
| 0b170fe5c1 | |||
| 4f29b1e0eb | |||
| 6db599400e | |||
| c5a74acd00 | |||
| f23d65e41e | |||
| fb91768585 | |||
| 6b0cb37699 | |||
| c867c5d7a5 | |||
| 411fdd2425 | |||
| 903e0a4d7b | |||
| 6461c3d80f | |||
| 8380351529 | |||
| f8a238d0c0 | |||
| 5c6fcbe951 | |||
| 7997089b16 | |||
| 089b74479b | |||
| cf542313f7 | |||
| a19097d1be | |||
| 87aa64d0c1 | |||
| fbad28b717 | |||
| 19972aa8d8 | |||
| 7ea96bcdc0 | |||
| 5569f373c5 | |||
| 7887ae2342 | |||
| 9919fb9c89 | |||
| 6eab96b620 | |||
| b39501291c | |||
| 9315431273 | |||
| 2c9ce33c10 | |||
| 85602ff98f | |||
| 749b314ceb | |||
| 74780b8777 | |||
| 5bc1f69a7f | |||
| 6de87ed4e2 | |||
| 18aeb08c90 | |||
| cdd30b8211 | |||
| b7af496a43 | |||
| 6762cf7b83 | |||
| a87b5e4b95 | |||
| 1181aea3b9 | |||
| 68f4b2c35e | |||
| 6296c8f6f4 | |||
| 6955784e93 | |||
| bc7755a160 | |||
| 18a02a1969 | |||
| dcaa3127a0 | |||
| 959c1821c1 | |||
| a4c2987c5f | |||
| d8f4f22b9c | |||
| 2377a2e8d4 | |||
| 9e5f53702f | |||
| 8640238cbe | |||
| b077ba5be4 | |||
| f455003014 | |||
| b9b579dc14 | |||
| 6ae23bb959 | |||
| ea797356ce | |||
| eaece0209d | |||
| cd92c36dab | |||
| ef1a43f947 | |||
| a1da644c49 | |||
| 2500540933 | |||
| 570fbeb537 | |||
| d1f804056e | |||
| 4294c92e43 | |||
| b840530fe9 | |||
| e6a1370de2 | |||
| 3320155416 | |||
| 8ad53894b9 | |||
| 360147e46a | |||
| b00e12c9bb | |||
| 7543a8c06b | |||
| 1699ae873f | |||
| 462f9bbea2 | |||
| 65296618a7 | |||
| c4ca347f0e | |||
| d62d3da60e | |||
| 50b8abf85c | |||
| 509f5e163c | |||
| 0e853ea751 | |||
| d67240bc3b | |||
| d0770c8e83 | |||
| cc0b889fef | |||
| 3d27e981e1 | |||
| 2994539de4 | |||
| 785ad08b7e | |||
| 8de51e568d | |||
| d22fe4777d | |||
| 7751a735c5 | |||
| 069d0e92ff | |||
| ce54d21344 | |||
| 715c0dc00c | |||
| b8d74de4a4 | |||
| 71a6f7c4f8 | |||
| 7c6ac2e5db | |||
| b4ecc90470 | |||
| 0484c2359d | |||
| 0b81001ce7 | |||
| 50c1afe9c8 | |||
| 7fca74907f | |||
| e5a7ad616c | |||
| d7ddeacbbf | |||
| 3d59203dbe | |||
| 3700f5d82b | |||
| 05b16bbea0 | |||
| dc28bc2afa | |||
| 2210e33643 | |||
| 1ed524f80f | |||
| 4418836fcd | |||
| 4641d0a5dd | |||
| 730c4e2a6a | |||
| 9b42551bcd | |||
| 66944bdaf9 | |||
| 09da05c75e | |||
| 8bc312502f | |||
| 9b40800aab | |||
| 8b9c908237 | |||
| b5043575e4 | |||
| b92625528c | |||
| f3a33b1a04 | |||
| 98fbf123f5 | |||
| f49f36fb60 | |||
| c268d2e64d | |||
| fc7df95c1a | |||
| 088c9cace0 | |||
| 079be78c2c | |||
| ee7160e393 | |||
| 7fd8140761 | |||
| aabe67e4d6 | |||
| e63c7fdd42 | |||
| ec56ee07be | |||
| a5eeda6152 | |||
| 5c45e9b2c9 | |||
| 331a39b37d | |||
| aa26beda28 | |||
| a919781d4f | |||
| aa0aec3704 | |||
| 622705325b | |||
| 694fe1a433 | |||
| ae1f2fa09f | |||
| fbfb563254 | |||
| 5352d799af | |||
| e2e2eb9a2f | |||
| 4657fc29bd | |||
| 884de893db | |||
| cc73d544ff | |||
| 6212d68a77 | |||
| 10fecb5a54 | |||
| ce1ce02551 | |||
| bab6bdba27 | |||
| 3a8442e522 | |||
| ac87208ba9 | |||
| a554ccf38e | |||
| a748e52551 | |||
| 815810f841 | |||
| 4e04cdbc5b | |||
| 57368f0179 | |||
| e89e78b527 | |||
| 7078de6385 | |||
| 2a03991297 | |||
| 4af9afda61 | |||
| 884cc4355f | |||
| 58aaf79445 | |||
| 50ab33f369 | |||
| bcbc45bb03 | |||
| ff9fb9168b | |||
| f067518c0e | |||
| 11460f3378 | |||
| 986feff7b7 | |||
| 3e7110ca8c | |||
| b4e12a671f | |||
| 5bb072223f | |||
| 3d6e297147 | |||
| 82fbb99593 | |||
| 17c482e21a | |||
| 2684624979 | |||
| 84d9e098ba | |||
| 7f543937fb | |||
| c1c4fa18c9 | |||
| 6a87066097 | |||
| 79aa4f9fae | |||
| f1e2313e4c | |||
| acbc9d3322 | |||
| dbeb174ae2 | |||
| 764c0f4581 | |||
| 2131e99ec4 | |||
| 6e5b15f203 | |||
| fbfd5cde89 | |||
| 1a9cd55d66 | |||
| 38e53e01af | |||
| 6ff672211f | |||
| 1bbc97758d | |||
| c1813e308f | |||
| 716ce43862 | |||
| 14c6ad0a31 | |||
| 1972115173 | |||
| 006dc95bf0 | |||
| d187da68d2 | |||
| 70bb94a2e6 | |||
| f78e61b433 | |||
| 508d73fc0d | |||
| e73e1da877 | |||
| 4d5b99da82 | |||
| f3021d4bae | |||
| 7eb6cce2db | |||
| be2888d428 | |||
| 06f6950434 | |||
| 09f1af9a0a | |||
| 6d4961f404 | |||
| cba2ad3b3b | |||
| a7315b4491 | |||
| 0d070d4b34 | |||
| 6a6d10dc79 | |||
| 3bac9b6472 | |||
| 96f2fa0eb5 | |||
| e789f1647a | |||
| c63c7c3e33 | |||
| 23b23dc8e5 | |||
| a0a3d53927 | |||
| 42e4925fd6 | |||
| 024e77801e | |||
| 397490a165 | |||
| 9e14f31604 | |||
| 40925cb21f | |||
| 6f0f1842cb | |||
| 685a37b2df | |||
| b83e3c358d | |||
| 94da08e7a7 | |||
| 008ec7a6a8 | |||
| 429b5548dd | |||
| 6d4434f5c9 | |||
| 4ffceb0413 | |||
| 6eff4b7383 | |||
| a8986690bb | |||
| 87ec01c8dd | |||
| f25e38d67e | |||
| 8a0db99572 | |||
| 9c2a2ee6e6 | |||
| 252df72f87 | |||
| 80a15fc626 | |||
| f858eb2bcd | |||
| a9b4ab069b | |||
| 449e4e1884 | |||
| dea760ea1c | |||
| 9b9e652afd | |||
| 2451efdfcb | |||
| a75ac1cfa4 | |||
| 3a08e12c65 | |||
| a10eea247f | |||
| 4fb8c74b5c | |||
| 0a77fd2014 | |||
| 16af750030 | |||
| a3ff00eaaf | |||
| d901d484fd | |||
| b6fed6892a | |||
| d7ac4e4045 | |||
| f7eea88945 | |||
| 9a4e0f7c03 | |||
| 99d6284a58 | |||
| 17bbde81b2 | |||
| 3482d03905 | |||
| b446e34c94 | |||
| 704c3093d7 | |||
| 36cc9c751c | |||
| e98aa61cd2 | |||
| cec4c323a7 | |||
| 58abe5ebdf | |||
| fc70aeb2af | |||
| 9342e674c5 | |||
| a176608019 | |||
| 3a262216c7 | |||
| c9f673342a | |||
| 2acdcb08a9 | |||
| 2c08d0c362 | |||
| b36aefc7c4 | |||
| 7f70052afd | |||
| 84c46b9312 | |||
| 88c5f58548 | |||
| 1cf8abb162 | |||
| 201ca245a7 | |||
| bfb8659cd8 | |||
| ae45e88df9 | |||
| 9d512ebad4 | |||
| 5dc3c2d2c5 | |||
| 70ebe31103 | |||
| c3f05a342e | |||
| dca137df8d | |||
| 8b1ac09592 | |||
| 35a43cce7a | |||
| 808a52ae25 | |||
| 899a8c1c2b | |||
| dc5a2235eb | |||
| 3da2d428f3 | |||
| cb98355715 | |||
| 335e45c3f1 | |||
| 325e708ef1 | |||
| 665503f43e | |||
| 4340c9fc59 | |||
| d6b6be0e9b | |||
| 55583551b5 |
@@ -3,8 +3,9 @@
|
|||||||
VITE_APP_ENV = 'development'
|
VITE_APP_ENV = 'development'
|
||||||
|
|
||||||
#接口地址
|
#接口地址
|
||||||
# 开发环境建议填 [/api]:由下方 vite.config.mjs 的 proxy 同源转发到后端(172.16.203.228:8000),避免跨域(CORS)被浏览器拦截
|
# 开发环境建议填 [/api]:由 vite.config.mjs 的 proxy 同源转发到本地网关 http://localhost(80)
|
||||||
# 如需直连线上绝对地址(如 http://172.16.203.228:8000/api),必须让后端 CORS 把 Allow-Origin 改为具体前端域名,不能用 `*`(配合 credentials 会被浏览器拒绝)
|
# 本地需先启动:Nacos + blade-gateway(80) + blade-auth + blade-system 等;8080 端口一般是 Nacos 控制台不是网关
|
||||||
|
# 如需临时联调远程,把 vite proxy target 改为 http://172.16.203.228:8000 并去掉 rewrite
|
||||||
VITE_APP_API=/api
|
VITE_APP_API=/api
|
||||||
|
|
||||||
#调试参数
|
#调试参数
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
node_modules
|
node_modules
|
||||||
|
pnpm-lock.yaml
|
||||||
/dist
|
/dist
|
||||||
|
/dist.zip
|
||||||
|
|
||||||
/tests/e2e/videos/
|
/tests/e2e/videos/
|
||||||
/tests/e2e/screenshots/
|
/tests/e2e/screenshots/
|
||||||
|
|||||||
@@ -0,0 +1,343 @@
|
|||||||
|
# 2026-08-26
|
||||||
|
|
||||||
|
## el-table 内嵌 el-autocomplete 撑满列宽(全局规则补充)
|
||||||
|
|
||||||
|
**问题**: `business/transport-plan/form?mode=add` 独立表单页"货物信息"表格,
|
||||||
|
「货物名称」列 placeholder `请输入货物名称` 只显示 `请输入货物名…`。
|
||||||
|
|
||||||
|
**根因**: `element-ui.scss` 兜底规则只覆盖 `.el-input`,而 `<el-autocomplete>` 在 Element Plus 中
|
||||||
|
根节点是 `.el-autocomplete` 包装层,内部才是 `.el-input`,中间多了一层导致选择器不命中,
|
||||||
|
autocomplete 没有拉满 cell,placeholder 被内边距 / clear 图标挤压截断。
|
||||||
|
|
||||||
|
**修复**:
|
||||||
|
- `src/styles/element-ui.scss` 第 663 行兜底规则追加:
|
||||||
|
- `.cell > .el-autocomplete` `width:100%`
|
||||||
|
- `.cell > .el-autocomplete > .el-input` `width:100%`
|
||||||
|
- `.cell > .el-autocomplete .el-input__wrapper` `width:100%`
|
||||||
|
- `src/views/business/components/business-crud-page.vue:1520` 独立表单页
|
||||||
|
"货物名称"列 `min-width="150"` → `240`(与 1544 行「货物类型」cascader 列一致)。
|
||||||
|
|
||||||
|
其它内嵌 `<el-select>` / `<el-input>` / `<el-cascader>` 不受影响(选择器依旧命中),
|
||||||
|
3626 行(调度明细「货物名称」用的是 el-select)未做改动。
|
||||||
|
|
||||||
|
## 全站搜索栏 label 宽度统一 88px
|
||||||
|
|
||||||
|
**问题**: 主人反馈 `business/master-order` 搜索区 label 宽度 160px,要求全站统一改成 88px,
|
||||||
|
参考 `business/shipping-template`(已经是 88px)。
|
||||||
|
|
||||||
|
**调研**:
|
||||||
|
- `src/styles/element-ui.scss:133-136` 已有 `.avue-crud__search .el-form-item__label { min-width: 88px; }`,
|
||||||
|
全站 Avue 自动搜索栏视觉上就是 88px。
|
||||||
|
- shipping-template 走 `<business-crud-page>`(Avue),所以 label 是 88px。
|
||||||
|
- 但是项目里有 18 个文件,22 处直接手写 `<el-form ... label-width="160px">`,不走 `.avue-crud__search`,
|
||||||
|
视觉就是 160px。这些都是**搜索/筛选** `<el-form>`(顶层 query 或子表单),不是表单 dialog 内填表。
|
||||||
|
|
||||||
|
**改动**: 全部 22 处 `label-width="160px"` → `label-width="88px"`。
|
||||||
|
|
||||||
|
涉及文件:
|
||||||
|
- business: master-order.vue, voucher-manage.vue(3 处), loading-manage.vue
|
||||||
|
- payment: invoice-application, invoice-receipt, receipt-flow, receipt-claim-record,
|
||||||
|
payment-application, components/bill-ledger-search, components/bill-payment-search
|
||||||
|
- settlement: settlement-adjustment, receivable-payable-detail, pre-settlement,
|
||||||
|
formal-settlement, transport-reconciliation, components/transport-reconciliation-editor,
|
||||||
|
components/formal-settlement-editor(3 处,都是子筛选)
|
||||||
|
- transit: risk-disposal, exception-disposal
|
||||||
|
|
||||||
|
**遗漏补丁**: `transit/exception-disposal.vue` 搜索区不走 Avue,而是在 scoped 样式里用
|
||||||
|
`:deep(.el-form-item__label) { min-width: 160px }` 写死,盖过了全局 88px。
|
||||||
|
已改为 `min-width: 88px`(文件第 443 行)。`risk-disposal.vue` 无此 scoped 覆盖,本来就是 88px。
|
||||||
|
|
||||||
|
**未做改动**: 表单 dialog 内填写项(`shipping-template-dialog` /
|
||||||
|
`transport-plan-dialog` / `waybill-manage-dialog` 等)走专门的 dialogCustomClass + labelWidth:100,
|
||||||
|
不受本规则影响。
|
||||||
|
其余残留 160px 均非搜索栏: project-apply.vue:2095(表单详情弹窗 label,故意留 6 汉字)、
|
||||||
|
customer-archive.vue:4980(按钮 min-width)、cargo-type.vue:604(选择器拼错不生效,设 50px)。
|
||||||
|
|
||||||
|
## payment-application 表单 input 文字居左
|
||||||
|
|
||||||
|
- `src/views/payment/payment-application-form.vue`:追加 scoped 样式,使 `el-input-number` 的输入文字居左对齐(付款比例、申请付款金额等数字字段),与 bill-ledger-form 保持一致。
|
||||||
|
|
||||||
|
## 正式结算查看页去除内容行高
|
||||||
|
|
||||||
|
**问题**: `settlement/formal-settlement/form?mode=view` 中只读字段(如项目名称、合同名称)
|
||||||
|
多行文本行高过大,Element Plus 默认 `.el-form-item__content` 的 `line-height` 导致显示松散。
|
||||||
|
|
||||||
|
**修复**: `src/views/settlement/components/formal-settlement-editor.vue` scoped 样式追加:
|
||||||
|
```scss
|
||||||
|
.formal-editor :deep(.el-form-item__content) {
|
||||||
|
line-height: normal;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 全站表单项间距统一 14px
|
||||||
|
|
||||||
|
**诉求**: `settlement/pre-settlement/form?mode=add` 中 `.el-form-item` 间距偏大,要求统一为 14px 且全站一致(用户指"表单项间距")。
|
||||||
|
|
||||||
|
**排查**: 全站 `.el-form-item` 的 `margin-bottom` 取值不一致——表单填写区有 16px / 18px / 20px,
|
||||||
|
搜索栏统一 8px(保留),个别特殊分组 28px(risk-disposal,保留)。全局 `.el-form-item--default`
|
||||||
|
已是 14px,但各页面 scoped `:deep(.xxx .el-form-item)` 覆盖成了 16/18/20px。
|
||||||
|
|
||||||
|
**改动(表单填写区统一 14px,16/18/20 → 14)**:
|
||||||
|
- settlement: `components/pre-settlement-editor.vue:1637`(16→14)、
|
||||||
|
`components/formal-settlement-editor.vue:1560`(16→14)、
|
||||||
|
`receivable-payable-detail.vue:1860`(16→14)、
|
||||||
|
`components/transport-reconciliation-editor.vue:805`(16→14)、
|
||||||
|
`components/settlement-adjustment-editor.vue:560`(16→14)
|
||||||
|
- business: `voucher-manage.vue:1022`(16→14)、`loading-manage.vue:2751`(16→14)、
|
||||||
|
`project-apply.vue:2091`(16→14)、`contract-manage.vue:2253`(16→14)、
|
||||||
|
`components/business-crud-page.vue:13380/13894`(16→14)、
|
||||||
|
`components/master-order-dispatch.vue:700`(16→14)
|
||||||
|
- payment: `invoice-receipt-form.vue:755`(16→14)、`user.vue:1097`(16→14)、
|
||||||
|
`bill-ledger-form.vue:564`(16→14)、`payment-application-form.vue:1324`(16→14)、
|
||||||
|
`bill-payment-form.vue:382`(16→14)
|
||||||
|
- 全局: `components/cron-editor/main.vue:579`(18→14)、
|
||||||
|
`styles/element-ui.scss:430`(`.dialog-form--carded` 20→14)
|
||||||
|
|
||||||
|
**保留未动**: 所有 `__search` 搜索栏的 8px、risk-disposal 的 28px 特殊分组、transportCapacity
|
||||||
|
vehicle/driver/ship 与 customer-archive 等本就是 14px(含 !important)。
|
||||||
|
|
||||||
|
## project-apply 表头颜色在不同电脑不一致
|
||||||
|
|
||||||
|
**问题**: 客户反馈 `business/project-apply/form?mode=add` 页面中「客户信息」等表格表头颜色
|
||||||
|
在用户电脑是 `#374151`,客户电脑是 `#909399`。
|
||||||
|
|
||||||
|
**根因**:
|
||||||
|
- `src/styles/theme/go.scss` 中 `.theme-go .el-table tr th .cell { color: #374151 }` 把表头文字写死为 `#374151`。
|
||||||
|
- 客户电脑未使用 `theme-go`,表头文字走 Element Plus 默认 CSS 变量
|
||||||
|
`--el-table-header-text-color: #909399`。
|
||||||
|
- `src/views/business/project-apply.vue` 里的 `:deep(.el-table__header th) { color: #303133 }`
|
||||||
|
只作用在 `th` 上,颜色靠继承,优先级敌不过直接写在 `.cell` 上的规则和 Element Plus 默认值,
|
||||||
|
所以实际没生效。
|
||||||
|
|
||||||
|
**修复**:
|
||||||
|
- `src/styles/element-ui.scss` 在「统一全站 el-table 表头背景色」之后追加规则:
|
||||||
|
```scss
|
||||||
|
.el-table .el-table__header-wrapper th.el-table__cell .cell {
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
直接作用于 `.cell`,特异性高于 `theme-go` 和 Element Plus 默认,全站统一为 `#374151`。
|
||||||
|
- `src/views/business/project-apply.vue` 清理两处与全局冲突且不生效的局部表头样式:
|
||||||
|
删除 `background: #f5f7fa; color: #303133;`,保留 `font-weight: 600`,
|
||||||
|
选择器改为 `:deep(.el-table__header th .cell)`。
|
||||||
|
|
||||||
|
## 弹窗 / 独立表单页底栏「保存+提交+返回」按钮统一风格
|
||||||
|
|
||||||
|
**问题**: 主人截图 `business/project-apply/form?mode=add` 页面底部 `[保存][提交][返回]` 三个按钮,
|
||||||
|
- 保存 + 提交 都是 `type="primary"` 蓝实心,视觉层级无区分。
|
||||||
|
- 排序「主→主→次」,主操作不靠右,与全站其它页面(business-crud-page 等)已用的「次→中→主」不一致。
|
||||||
|
|
||||||
|
**修复**: 统一定 3 档层级 + 「次→中→主」排序。
|
||||||
|
| 语义 | 写法 |
|
||||||
|
| --- | --- |
|
||||||
|
| 次要(返回/取消) | 默认(无 type)灰描边 |
|
||||||
|
| 中间步骤(保存草稿) | `type="primary" plain` 蓝描边 |
|
||||||
|
| 主操作(提交) | `type="primary"` 蓝实心 |
|
||||||
|
|
||||||
|
排序模板:`[可选辅助(如同步)][返回/取消][保存草稿][提交]`,主操作永远最右。
|
||||||
|
|
||||||
|
**改动文件**:
|
||||||
|
- `business/project-apply.vue:617-651` — 主 footer + 变更 footer 都重排,`保存` 加 plain。
|
||||||
|
- `payment/invoice-receipt-form.vue:242-252` — 保存加 plain,返回挪到保存前面。
|
||||||
|
- `payment/invoice-application-form.vue:419-429` — 同上。
|
||||||
|
|
||||||
|
**未改动(已合规)**:
|
||||||
|
- `settlement/components/pre-settlement-editor.vue` — 默认已是「默认保存 + primary 提交」。
|
||||||
|
- `settlement/components/transport-reconciliation-editor.vue` — 两个 plain 中间步骤 + 完成对账 实心,层级清晰。
|
||||||
|
|
||||||
|
**沉淀**: `MEMORY.md` 新增「弹窗 / 独立表单页底栏按钮统一规则」一节,作为新页面 footer 写法标准。
|
||||||
|
|
||||||
|
## customer-archive 全部 footer 同步按新增项目模块标准对齐
|
||||||
|
|
||||||
|
**问题**: 主人指出客户档案页面 `/vehicle/customer-archive/form?name=新增客商档案` 没有按统一规则调整,
|
||||||
|
并明确要求「浮动页面底部、按钮区域靠右对齐,返回在第一个,中间的用浅蓝色,最后一个是 primary 深蓝色」,
|
||||||
|
参考新增项目模块 `/business/project-apply/form?mode=add`。
|
||||||
|
|
||||||
|
### customer-archive.vue 共 5 处 footer 改动
|
||||||
|
|
||||||
|
- `archive-form__footer` (802-809) 原状「取消/返回 + 保存 primary + 提交 success 绿」混合 4 按钮。改为 `[返回/取消/关闭] + 保存 plain + 提交 primary`,并删掉「success 绿」换成 primary 深蓝。
|
||||||
|
- `contact-dialog` (867-870) 原状 `[保存 primary][返回]`,容器居中。改为 `[返回][保存 plain]`,容器 flex-end。
|
||||||
|
- `receipt-dialog` (965-969) 同上模式。
|
||||||
|
- `invoice-dialog` (1085-1089) 同上模式。
|
||||||
|
- `score-detail-dialog` (1343-1359) 原状 total 左 + `[保存 primary][复评确认 primary][返回]`。改为 total 左 + `[返回][保存 plain][复评确认 primary]`。
|
||||||
|
|
||||||
|
### customer-archive.vue SCSS 同步
|
||||||
|
|
||||||
|
- `.contact-dialog__footer-actions` `justify-content: center` 改 `flex-end`。
|
||||||
|
- `.receipt-dialog__footer-actions` 同上。
|
||||||
|
- `.invoice-dialog__footer-actions` 同上。
|
||||||
|
- `.archive-form__footer` 维持 flex-end 不变(独立页 `.archive-page-form &` 下 `position: fixed` 浮动底部已经写好)。
|
||||||
|
|
||||||
|
### 顺序小结(标准模板)
|
||||||
|
|
||||||
|
```vue
|
||||||
|
<div class="xxx-dialog__footer-actions">
|
||||||
|
<!-- 最左:信息聚合(如总分合计、统计)用 flex:1 自己推 -->
|
||||||
|
<!-- 次要:默认描边灰按钮 -->
|
||||||
|
<el-button @click="close">返回</el-button>
|
||||||
|
<!-- 中间:浅蓝实心 plain -->
|
||||||
|
<el-button type="primary" plain @click="saveDraft">保存</el-button>
|
||||||
|
<!-- 主操作:蓝实心 -->
|
||||||
|
<el-button type="primary" @click="submit">提交</el-button>
|
||||||
|
</div>
|
||||||
|
```
|
||||||
|
|
||||||
|
左→右阅读顺序:辅助信息聚合 → 次要 → 中间步骤 → 主操作。视觉权重递增,颜色从「灰 → 蓝描边 → 蓝实心」。
|
||||||
|
|
||||||
|
## 全站 disabled 输入框文字颜色统一
|
||||||
|
|
||||||
|
**问题**: 客户档案编辑页等「不可编辑」状态下,`el-input` / `el-textarea` / `el-input-number` 的文字颜色
|
||||||
|
在不同电脑显示不一致(有的深、有的浅)。
|
||||||
|
|
||||||
|
**根因**: Element Plus 默认 disabled 文字色由 `--el-disabled-text-color` 控制,不同主题/浏览器/变量覆盖下可能表现为 `#374151` / `#606266` / `#a8abb2` / `#909399` 等。
|
||||||
|
|
||||||
|
**修复**: `src/styles/element-ui.scss` 在表头颜色统一规则后追加:
|
||||||
|
```scss
|
||||||
|
.el-input.is-disabled .el-input__inner,
|
||||||
|
.el-textarea.is-disabled .el-textarea__inner,
|
||||||
|
.el-input-number.is-disabled .el-input__inner {
|
||||||
|
color: #a8abb2;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
直接写死为 `#a8abb2`,覆盖 Element Plus 默认 CSS 变量及主题差异,保证全站一致。
|
||||||
|
**如需再深**,可把 `#a8abb2` 改为 `#606266`。
|
||||||
|
|
||||||
|
## shipping-template 独立表单页「关闭」按钮位置修正
|
||||||
|
|
||||||
|
**问题**: `/business/shipping-template/form?mode=add`(独立表单页)底部 `[提交][关闭]` 顺序,
|
||||||
|
主操作「提交」在左、次要「关闭」在右,与全站「次→主」规则不符。
|
||||||
|
|
||||||
|
**根因**: shipping-template 走 `business-crud-page` 复用的 PageAvueForm,footer 用的是 Avue-form 内置结构。
|
||||||
|
Avue-form 内置按钮默认在中间,自定义内容分两侧插槽:
|
||||||
|
- `#menu-form-before` slot → 在 Avue 内置按钮之左
|
||||||
|
- `#menu-form` slot → 在 Avue 内置按钮之右
|
||||||
|
|
||||||
|
之前「关闭」按钮写在 `#menu-form` slot(在 Avue 内置按钮之右),导致渲染成 `[Avue 提交][关闭]`,顺序反了。
|
||||||
|
|
||||||
|
**修复**: `src/views/business/components/business-crud-page.vue:2059-2090`
|
||||||
|
- 把「关闭」按钮从 `#menu-form` slot 移到 `#menu-form-before` slot 的「保存草稿」按钮之前。
|
||||||
|
- 触发条件 `v-if="isStandaloneFormPage && !showTransportPlanCreateActions"`,仅独立表单页生效;
|
||||||
|
弹窗模式(list 页内点新增/编辑)继续走 Avue 自带的 `[取消][提交]` 不动。
|
||||||
|
- 「关闭」按钮文字保持默认色(次要),无 type。
|
||||||
|
- 同步清空 `#menu-form` slot 中 shipping-template 残留(实际只剩 `showTransportPlanCreateActions` 块,
|
||||||
|
shipping-template 不会触发,留着不影响)。
|
||||||
|
|
||||||
|
**最终渲染**(独立表单页):
|
||||||
|
- 有运费合计 + 草稿:`[运费合计][关闭][保存草稿 plain][Avue 提交]`
|
||||||
|
- 仅有运费合计:`[运费合计][关闭][Avue 提交]`
|
||||||
|
- 无运费合计:`[关闭][Avue 提交]`(即主人截图场景)
|
||||||
|
|
||||||
|
**未触发场景**:
|
||||||
|
- transport-plan / waybill / loading-manage 等其它走 business-crud-page 但未声明 `standalone-form-page` 的页面,
|
||||||
|
本次未改。需要时可按相同模式补 slot。
|
||||||
|
|
||||||
|
## master-order 编辑页底栏按钮统一
|
||||||
|
|
||||||
|
**问题**: `/business/master-order?mode=editor`(多联总单编辑/新增页)底部按钮没统一。
|
||||||
|
|
||||||
|
**根因**: 编辑页是 `master-order.vue` 的 `mode==='editor'` 模板里内嵌 `<master-order-editor>` 组件,
|
||||||
|
主 footer 在 `src/views/business/components/master-order-editor.vue:534-539`。
|
||||||
|
|
||||||
|
**原状**:
|
||||||
|
```
|
||||||
|
[返回 default] [暂存 default] [确认创建 primary] [创建并调度 primary]
|
||||||
|
```
|
||||||
|
- 暂存 无 type,与返回同为灰描边,缺层级
|
||||||
|
- 确认创建 / 创建并调度 两个都 primary 实心,无视觉优先级
|
||||||
|
- footer 仅 `flex-end` + `padding:16px 0`,不浮动
|
||||||
|
|
||||||
|
**修复** (`master-order-editor.vue`):
|
||||||
|
- 按钮改:`[返回 default] [暂存 primary plain] [确认创建 primary plain] [创建并调度 primary]`
|
||||||
|
严格按「返回第一个、中间浅蓝 plain、最后深蓝实心」规则,仅最右一个深蓝。
|
||||||
|
- footer 样式改浮动底部:`position: sticky; bottom:0; z-index:10; background:#fff;
|
||||||
|
border-top:1px solid #eff1f7; box-shadow:0 -2px 8px rgba(0,0,0,.06); gap:12px; padding:12px 24px`。
|
||||||
|
|
||||||
|
**未动**: 页内各 el-dialog 的 footer(线路/地图/常用货物/货物导入等)已是 `[关闭 default][确定 primary]`,
|
||||||
|
符合「次→主」规则,无需调整。
|
||||||
|
|
||||||
|
## payment-application 表单页底栏按钮统一
|
||||||
|
|
||||||
|
**问题**: `/payment/payment-application/form?mode=add`(付款申请表单页)底部按钮没统一。
|
||||||
|
|
||||||
|
**根因**: 独立表单页 `src/views/payment/payment-application-form.vue` 的 `.payment-form-page__actions` footer(330 行)。
|
||||||
|
|
||||||
|
**原状**:
|
||||||
|
```
|
||||||
|
justify-content: center(居中)
|
||||||
|
[返回 default] [保存 default(缺 plain)] [提交 primary]
|
||||||
|
```
|
||||||
|
- 保存 无 type,与返回同为灰描边,缺层级
|
||||||
|
- footer 居中且不浮动
|
||||||
|
|
||||||
|
**修复** (`payment-application-form.vue`):
|
||||||
|
- 按钮:`[返回 default] [保存 primary plain] [提交 primary]`,仅最后深蓝。
|
||||||
|
- footer 样式:`justify-content: center` → `flex-end`;加 `position: sticky; bottom:0; z-index:10;
|
||||||
|
background:#fff; border-top:1px solid #eff1f7; box-shadow:0 -2px 8px rgba(0,0,0,.06); gap:12px; padding:12px 24px`。
|
||||||
|
|
||||||
|
**未动**: `payment-application.vue`(list 表格页,无独立 footer);`invoice-application-form.vue` / `invoice-receipt-form.vue` 上一轮已改。
|
||||||
|
|
||||||
|
## invoice-application / invoice-receipt 表单页底栏按钮统一
|
||||||
|
|
||||||
|
**问题**: `/payment/invoice-application/form?mode=add` 底部按钮没统一(用户反馈)。排查发现同族 `invoice-receipt-form.vue` 完全同款问题,一并修了。
|
||||||
|
|
||||||
|
**根因**: 两个发票表单页 footer 都是 `[同步 plain][返回 default][保存 plain][提交 primary]` + `justify-content: center`(居中),且未浮动。
|
||||||
|
- 同步 在 返回 之前,违反「返回在第一个」
|
||||||
|
- footer 居中,不靠右、不浮动
|
||||||
|
|
||||||
|
**修复**(`invoice-application-form.vue` 419-433 + 980;`invoice-receipt-form.vue` 242-256 + 777):
|
||||||
|
- 按钮重排为 `[返回 default][同步 plain][保存 plain][提交 primary]`,返回置首、最后仅提交深蓝。
|
||||||
|
- footer 样式:`justify-content: center` → `flex-end`;加 `position: sticky; bottom:0; z-index:10;
|
||||||
|
background:#fff; border-top:1px solid #eff1f7; box-shadow:0 -2px 8px rgba(0,0,0,.06); gap:12px; padding:12px 24px`。
|
||||||
|
|
||||||
|
**注意**: 之前首轮曾把这两个页「保存加 plain、返回挪到保存前面」,但当时没动 同步 的位置、没改居中/浮动,所以用户仍觉得没统一。本次彻底对齐。
|
||||||
|
|
||||||
|
## payment + settlement 模块底栏按钮全量统一
|
||||||
|
|
||||||
|
**背景**: 用户要求检查 payment 模块和 settlement 模块下所有页面底栏按钮是否统一。
|
||||||
|
|
||||||
|
### payment 模块(表单页 footer)
|
||||||
|
| 文件 | 原状 | 修复 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `payment/bill-ledger-form.vue` | `[确认 primary][取消 default]` + 居中 | `[取消 default][确认 primary]`;footer flex-end + sticky 浮动 |
|
||||||
|
| `payment/bill-payment-form.vue` | `[保存 primary][提交 primary][取消 default]` | `[取消 default][保存 plain][提交 primary]`;footer 加 sticky 浮动(已 flex-end) |
|
||||||
|
| `payment/receipt-flow-form.vue` | `[确认 primary][取消 default]` + 居中(class 误用 `receipt-claim-form-page__actions`) | `[取消 default][确认 primary]`;footer flex-end + sticky 浮动 |
|
||||||
|
| `payment/receipt-claim-record-form.vue` | 单「关闭」按钮居中 | footer flex-end + sticky 浮动 |
|
||||||
|
| (此前已改)invoice/payment-application 各表单页 | — | 已合规 |
|
||||||
|
|
||||||
|
### settlement 模块
|
||||||
|
| 文件 | 原状 | 修复 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `settlement/components/pre-settlement-editor.vue` | 两处 footer `[取消][保存 default][提交]`(弹窗 + pageMode) | 保存加 `type="primary" plain`;`&__page-actions` 加 sticky 浮动 |
|
||||||
|
| `settlement/components/formal-settlement-editor.vue` | footer 已 `[取消][提交]` 合规,独立页未浮动 | `.formal-editor__page-actions` 加 sticky 浮动 |
|
||||||
|
| `settlement/receivable-payable-detail.vue` | 生成费用弹窗 `[取消][上一步 primary][提交 primary]` | 上一步改 `type="primary" plain` |
|
||||||
|
| (已合规未动)`transport-reconciliation-editor.vue` | `[取消][保存草稿 plain][按匹配结果更新账单 plain][完成对账 primary]` | 已符合次→主 |
|
||||||
|
| (已合规未动)`settlement-adjustment-editor.vue` | 弹窗 `[取消][保存 primary]` | 合规 |
|
||||||
|
|
||||||
|
**注意**: settlement 的 `*_editor.vue` 多为「弹窗(!pageMode) + 独立页(pageMode)」双模式;弹窗 footer 走 `.el-dialog__footer` 全局规则(已右对齐/浮动),仅 pageMode 的 `.xxx__page-actions` 需手动加 sticky。
|
||||||
|
**注意**: payment 表单页剩余的 `justify-content: center` 全在 `__links` 链接行(非 action footer),属正常布局,未改。
|
||||||
|
|
||||||
|
## 浮动底栏根本修复:sticky → fixed
|
||||||
|
|
||||||
|
**问题**: 用户反馈 `/settlement/formal-settlement/form?mode=add`「有些页面还没能固定在底部」。
|
||||||
|
|
||||||
|
**根因(关键)**: 之前给 9 个独立表单页 footer 写的都是 `position: sticky; bottom:0`,但本项目布局
|
||||||
|
`.app-main` / `.basic-container` 祖先带 `overflow:hidden`,sticky 的滚动容器判断失效 → footer 永不吸底。
|
||||||
|
customer-archive 当初就是因此改用 `position:fixed`,且要带侧栏左偏移。
|
||||||
|
|
||||||
|
**修复(9 个文件全部 sticky→fixed)**:
|
||||||
|
- `business/components/master-order-editor.vue` `<footer>`(2050 行,含 `:global(.avue--collapse footer)`/`horizontal`)
|
||||||
|
- `payment/invoice-receipt-form.vue` / `bill-ledger-form.vue` / `receipt-claim-record-form.vue` /
|
||||||
|
`payment-application-form.vue` / `bill-payment-form.vue` / `invoice-application-form.vue` / `receipt-flow-form.vue`
|
||||||
|
各 `__actions`(均加 fixed + `:global(.avue--collapse .xxx)`/`horizontal` 左偏移 60px/0)
|
||||||
|
- `settlement/components/pre-settlement-editor.vue` `&__page-actions`(nested,全局覆盖放 style 末尾)
|
||||||
|
- `settlement/components/formal-settlement-editor.vue` `.formal-editor__page-actions`(上一轮已改 fixed,本轮复核确认)
|
||||||
|
|
||||||
|
**统一 fixed 模板**:
|
||||||
|
```scss
|
||||||
|
.xxx { position: fixed; right:0; left:230px; bottom:0; margin:0; z-index:10; flex-end + padding + border-top + 白底 + 上投影 }
|
||||||
|
:global(.avue--collapse .xxx) { left:60px; }
|
||||||
|
:global(.avue-layout--horizontal .xxx) { left:0; }
|
||||||
|
```
|
||||||
|
注意 `:global()` 要包整个选择器(customer-archive 写法),只包前缀会让 scoped 在中间选择器追加 data 属性而不匹配。
|
||||||
|
|
||||||
|
**验证**: 全仓 `position: sticky` 已清零(grep 无残留)。
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# 2026-08-27 工作日志
|
||||||
|
|
||||||
|
## project-apply 表单 UI 调整(新增 / 重大项目补录)
|
||||||
|
文件:`src/views/business/project-apply.vue`
|
||||||
|
|
||||||
|
按截图需求修改项目管理表单(新增 + 重大项目补录同步):
|
||||||
|
1. 项目编号放开编辑(去掉 `disabled`),placeholder 改为"请输入项目编号,不填自动生成";编辑模式仍禁用。
|
||||||
|
2. 项目简称取消必填校验(仅保留 maxlength 20)。
|
||||||
|
3. 业务部门、项目由来说明单独占一行(新增 class `project-apply-form__item--full` + 样式 `grid-column: 1 / -1`)。
|
||||||
|
4. 业务部门下拉过滤"外部组织":原仅 `['add','edit']` 过滤,已补上 `majorSupplement`,重大项目补录不再显示外部组织。
|
||||||
|
|
||||||
|
待确认:后端 submit/saveDraft 在 `projectCode` 为空时是否自动生成编号(用户让后端同事补)。
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
# 2026-08-28 工作日志
|
||||||
|
|
||||||
|
## contract-manage 表单底部操作栏间距/文案修复
|
||||||
|
- 文件:`src/views/business/contract-manage.vue`
|
||||||
|
- 问题:底部浮动操作栏 `.contract-manage-page__footer` 用 `gap:8px`,与全站统一 12px 标准不一致("间距不一致不统一")。
|
||||||
|
- 修复:去掉 `gap:8px`,改用 `.el-button + .el-button { margin-left:12px }`,对齐全站"去 gap、12px"规范。
|
||||||
|
- 文案:底部"关闭"→"取消"(底部操作栏统一命名规范;详情弹窗/流程图弹窗的"关闭"为只读/纯关闭场景,按规范保留)。
|
||||||
|
|
||||||
|
## contract-manage 草稿编辑页按钮缺失修复
|
||||||
|
- 问题:编辑态(含草稿编辑)底部只有单个"提交"(submitEdit),缺"暂存/提交临时合同/提交正式合同",与新增页不一致。
|
||||||
|
- 修复:新增 computed `isDraftEdit`(`formMode==='edit' && form.approvalStatus==='draft'`);footer 三按钮条件由 `formMode==='add'` 改为 `formMode==='add' || isDraftEdit`,草稿编辑复用 `submitCreate`(按 id upsert + temporary/formal 提升),非草稿编辑仍走 submitEdit 单个"提交"。
|
||||||
|
|
||||||
|
## contract-manage-change 变更页底部操作栏统一改造
|
||||||
|
- 文件:`src/views/business/contract-manage-change.vue`
|
||||||
|
- 问题:`.page-footer` 左侧对齐、`gap:16px`、不悬浮,且按钮顺序/命名(提交→关闭)与新增页规范相反。
|
||||||
|
- 修复:
|
||||||
|
- DOM:按钮重排为 `[取消][提交]`(次要居左、主操作居右),"关闭"→"取消"。
|
||||||
|
- 样式:`.page-footer` 改为 `position:fixed` 悬浮吸底(left:230px / avue--collapse 60px / avue-layout--horizontal 0)、`justify-content:flex-end` 右对齐、去 gap 改用 `.el-button+.el-button{margin-left:12px}` 统一 12px、白底+上边框+上投影。
|
||||||
|
- 容器 `.contract-change-page` 加 `padding-bottom:72px`,避免内容被悬浮栏遮挡。
|
||||||
|
|
||||||
|
## contract-manage 新增页"合同文件"标题未加粗修复
|
||||||
|
- 文件:`src/views/business/contract-manage.vue`
|
||||||
|
- 问题:`attachment-section` 子组件内渲染的 `.dialog-section-title` 不受当前页面 scoped `> .dialog-section-title` 样式命中,导致"合同文件"标题字重未加粗(截图反馈)。
|
||||||
|
- 修复:在 `.contract-manage-form__section` 样式规则中补充 `:deep(.dialog-section-title)`,使直接子元素和子组件内部标题均统一为 16px/600/#303133。
|
||||||
|
|
||||||
|
## contract-manage 搜索栏"时间段快捷筛选"组位置前置
|
||||||
|
- 文件:`src/views/business/contract-manage.vue` + `src/option/business/contract-manage.js`
|
||||||
|
- 第一轮(理解偏差):把"签约类型"select 和 check-tag 组一起塞进 `#search-menu` slot。主人纠正:「签约类型」是普通搜索字段,应与第一行 8 个搜索项同排,不是 slot 内的辅助元素。
|
||||||
|
- 第二轮(终态):
|
||||||
|
- option 把 `signType` 加 `search:true / searchOrder:10 / searchPlaceholder:'请选择'`,作为 Avue 标准搜索字段,与其它 8 项同排(放在末尾)。
|
||||||
|
- 页面 `#search-menu` slot 移除「签约类型」select,仅留 5 个 el-check-tag。
|
||||||
|
- 页面 data 移除冗余的 `contractSignType:''`,onLoad/searchReset 不再手动维护 signType(Avue search form 自动绑定到 query)。
|
||||||
|
- 样式:`.el-select { width: 180px }` 已成 dead code,移除。
|
||||||
|
- `:deep(...)` 调整:去掉 `margin-right:auto`,只留 `order:-1`。`.avue-form__menu` 本身 `flex / flex-end`,check-tag 组排首项后,整体仍紧靠右侧,与 `[查询][重置][收起]` 形成 `[快捷筛选] [查询] [重置] [收起]` 右对齐序列。
|
||||||
|
|
||||||
|
## 登录验证码:滑块(behavior) → 图形字符验证码(image)
|
||||||
|
- 文件:`src/config/website.js`(第14行 `captchaType: 'behavior'` → `'image'`)、`src/page/login/userlogin.vue`、`src/styles/login.scss`
|
||||||
|
- 背景:登录页原 `captchaType:'behavior'`(滑块/旋转行为验证)。需求改成截图中的「输入框 + 右侧独立彩色字符验证码图片」。
|
||||||
|
- 改动:
|
||||||
|
1. `website.js` 改 `captchaType: 'image'` 启用图形验证码分支(代码原本就有 image 模式的 UI 与 `getCaptcha()` 逻辑,仅未启用)。
|
||||||
|
2. `userlogin.vue` image 分支模板:验证码图片从 `el-input` 的 `#append` 内联改为 form-item 内 `.login-code-wrap` 并排独立方块(输入框 flex:1 + 右侧 130px 图片块),点击刷新。
|
||||||
|
3. `login.scss` 重写 `.login-code/.login-code-wrap/.login-code-box/.login-code-img`:flex 并排、图片块带 1px 边框 + hover 主色高亮、`object-fit:fill` 撑满。
|
||||||
|
- 验证:`vite build --outDir /tmp/tms-verify-build` 全量编译通过(exit 0,无报错)。注意原 `pnpm build` 因 WorkBuddy safe-delete 钩子拦截清空 dist/(741 文件)而中断,非代码问题。
|
||||||
|
- 注意:登录页 `activeName` 默认 `'iam'`(IAM 统一登录),图形验证码在 `userlogin.vue`,需点「账号密码登录」才可见;验证码图片依赖后端 `/blade-auth/oauth/captcha` 返回的 `data.key` + `data.image`。
|
||||||
|
|
||||||
|
## 全站「所属组织」搜索统一为树形下拉(el-tree-select)
|
||||||
|
- 背景:合同管理页「所属组织」原为 cascader(radio 风格),客户档案页(vehicle/customer-archive)已用树形下拉。主人要求全站统一为树形。
|
||||||
|
- 统一方案:新建可复用 mixin `src/mixins/organization-search.js`(封装 organizationTreeOptions 树数据、loadOrganizationOptions()、renderOrganizationSearch(scope) 渲染函数,自动识别 organizationName / deptName 两种 prop 并挂 column.renderSearch;树节点 node-key='id')。
|
||||||
|
- 适用两种架构:
|
||||||
|
1. **avue-crud 搜索**(renderSearch 模式):option 列加 `searchslot:true`,视图混入 mixin + created/初始化调 loadOrganizationOptions。已改:contract-manage(option 去 cascader 改 searchslot,视图用 renderOrganizationSearch 渲染函数)、transportCapacity 的 driver/vehicle/ship 三页(option 去 type:select 改 searchslot,视图混 mixin)。
|
||||||
|
2. **自定义搜索表单**(query.deptName 文本框模式):替换 `<el-input v-model="query.deptName">` 为 `<el-tree-select>`,node-key='id',@update:model-value 用 findOrgById(val)?.rawLabel 把 id 转回部门名写入 query.deptName(保后端按名称过滤兼容)。已改 payment 模块 4 处:invoice-application / invoice-receipt / payment-application / components/bill-payment-search。
|
||||||
|
- 关键坑:mixin 内部树数据命名为 `organizationTreeOptions`(非 organizationOptions),与 transportCapacity 等页面表单自用的扁平 `organizationOptions` 隔离,避免相互覆盖破坏表单 select。
|
||||||
|
- 待办(同自定义表单模式,未改):settlement 模块 4 个视图(transport-reconciliation/formal-settlement/pre-settlement/settlement-adjustment,搜索用动态 v-for 渲染 searchFields,需给 deptName 加 `type:'tree'` 分支)、system/user.vue(deptName)。business 模块(waybill-manage/transport-plan 等)所属组织为 `hide:true` 不展示搜索,无需改。
|
||||||
|
|
||||||
|
## project-apply 业务部门栏占满宽度修复
|
||||||
|
- 文件:`src/views/business/project-apply.vue`
|
||||||
|
- 问题:「重大项目补录」(独立表单页 /business/project-apply/form?mode=majorSupplement)下"业务部门"项横跨整行,与上下两行半宽风格不一致。
|
||||||
|
- 根因:`<el-form-item label="业务部门">` 误加 `class="project-apply-form__item--full"`(该类对应样式 `:deep(.project-apply-form__item--full) { grid-column: 1 / -1; ... }` 是横跨整行的:本意只用于"项目由来说明"等多行文本字段)。
|
||||||
|
- 修复:移除该 class,业务部门恢复为半宽(一行两列网格的常规项),仅"项目由来说明"等需要全宽铺开的字段仍保留 full。同时把样式块上方注释由「占满整行的表单项(业务部门 / 项目由来说明)」改为「占满整行的表单项(如项目由来说明等多行文本字段)」,避免再误读。
|
||||||
|
|
||||||
|
## project-apply 字段 label 问号悬浮提示
|
||||||
|
- 文件:`src/views/business/project-apply.vue`
|
||||||
|
- 需求:把"项目资金使用额度"/"项目应收账款额度"两字段的提示从 placeholder 移到 label 右侧问号 tooltip。
|
||||||
|
- 实现:
|
||||||
|
- 两 `el-form-item` 加 `class="project-apply-form__tip-label"`,用 `#label` slot 包裹文字 + `<el-tooltip content=... placement="top"><el-icon class="project-apply-form__label-tip"><QuestionFilled /></el-icon></el-tooltip>`。
|
||||||
|
- placeholder 改回"请输入"。
|
||||||
|
- 提示文案按截图(去掉"额度"二字):资金使用额度→`实际业务回款周期内付款`;应收账款额度→`回款期内最大应收账款额`。
|
||||||
|
- scoped 样式:`__tip-label :deep(.el-form-item__label){vertical-align:top}` 保持默认 inline 布局,让文字按全局 `white-space: normal` 换行显示;`__label-tip{margin-left:4px;color:#a8abb2;cursor:help;vertical-align:-0.125em}` 问号与文字 baseline 对齐。
|
||||||
|
- 图标 `QuestionFilled` 已在 main.js 全局注册(@element-plus/icons-vue),模板可直接用。
|
||||||
|
- 可复用模式:其它表单字段如需 label 旁问号提示,套用此 slot 结构即可。
|
||||||
|
|
||||||
|
## project-apply 详情页客户/承运商表格改造
|
||||||
|
- 文件:`src/views/business/project-apply.vue`
|
||||||
|
- 需求:
|
||||||
|
1. 客户信息、承运商信息两个表格的「客户」「承运商」列改为可点击链接,跳转打开对应客商档案。
|
||||||
|
2. 删除两个表格的「联系人」「联系方式」列。
|
||||||
|
- 实现:
|
||||||
|
- 模板:两列的 `el-table-column` 用 `#default` slot 渲染 `<el-link type="primary" :underline="false" @click="openCustomerArchive(row)">`,显示 `row.customer` / `row.carrier`。
|
||||||
|
- 删除原 `prop="contact"` 和 `prop="phone"` 两列。
|
||||||
|
- methods 新增 `openCustomerArchive(row)`:取 `getCustomerRowId(row)`(`row.id || row.customerId || row.carrierId`),无 ID 时 `this.$message.warning`;有 ID 则 `this.$router.push({ path: '/vehicle/customer-archive/form', query: { id: String(id), name: '查看客商档案', view: '1' } })`。
|
||||||
|
- 注意:客商档案查看态由 `customer-archive.vue` 的 `this.$route.query.view === '1'` 识别,与现有查看逻辑一致。
|
||||||
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# 2026-08-30
|
||||||
|
|
||||||
|
## 项目立项(/business/project-apply)操作栏隐藏「作废」按钮
|
||||||
|
- 需求:列表操作列不再展示「作废」。
|
||||||
|
- 实现:删除 `src/option/business/project-apply.js` 中 `config.operations` 的 `voidProject` 条目(原 status: ['approved','change_approved'],permission: project_apply_void)。
|
||||||
|
- 操作列按钮由 `customOperations(row)` 从 `config.operations` 动态渲染,故仅改 option 配置即可,无需动 `project-apply.vue`。
|
||||||
|
- 保留 `src/api/business/project-apply.js` 的 `voidProject` 接口方法(未被引用),如需彻底下线可一并删除。
|
||||||
|
- 遗留:剩余操作项为 提交 / 撤回 / 通过 / 审批驳回 / 变更;`menuWidth` 仍为 200,无需调整。
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# 2026-08-31
|
||||||
|
|
||||||
|
## 客商档案「所属组织」改为单选级联(customer-archive.vue)
|
||||||
|
- 表单区 `el-tree-select`(多选勾选树)→ `el-cascader` 单选级联;`deptCascaderProps` 开 `checkStrictly: true`,可任意层级选中(不必选到叶子)。
|
||||||
|
- 引入 computed `deptCascaderValue`(get/set)做「部门 ID ↔ 根到节点路径」双向转换:
|
||||||
|
- `archiveForm.deptId` 仍为选中部门 ID 数组(单选只一个),后端字段 `deptIds` 逗号串 / `deptName` 不变,保存逻辑 `normalizeArchive` 无需改。
|
||||||
|
- getter 依赖 `deptTree`,部门树异步加载完成后详情回显自动刷新(解决 created 里 initDeptTree 与 openArchive 并发的时序问题)。
|
||||||
|
- `onDeptChange(path)` 改为取路径末级 → 写 `deptId / deptIds / deptName`;新增 `findDeptPath(id)`、`findDeptLabel(id)` 递归查找。
|
||||||
|
- `normalizeDeptIds(detail)` 单选只取第一个 ID(历史多选数据自动收敛)。
|
||||||
|
- 列表搜索区 `renderDeptSearch` 同步改为 `h(ElCascader, ...)`(import 从 ElTreeSelect 换 ElCascader),`searchChange` 取路径末级 ID 转部门名称。
|
||||||
|
</content>
|
||||||
|
</invoke>
|
||||||
@@ -0,0 +1,187 @@
|
|||||||
|
# 2026-09-02 工作日志
|
||||||
|
|
||||||
|
## 合同/运力页「到期快捷筛选」标签统一改为独立一行
|
||||||
|
- 需求:把 avue-crud 搜索栏 `#search-menu` 里的 `<el-check-tag>` 到期快捷筛选组,移出搜索栏、单独成一行(搜索卡下方、表格上方),不加卡片包裹。
|
||||||
|
- 实现:改用 avue-crud 的 `#header` 插槽承载该组;CSS 由 `order:-1; margin-right:12px; min-width:0`(搜索按钮行内联)改为 `margin-bottom:12px`(独立行)。
|
||||||
|
- 涉及文件(4 处,均已改):
|
||||||
|
- `src/views/business/contract-manage.vue`(首改,用 `.contract-manage-page__expiry-search`)
|
||||||
|
- `src/views/transportCapacity/vehicle.vue`(`.transport-vehicle-page__expiry-tags`)
|
||||||
|
- `src/views/transportCapacity/driver.vue`(`.driver-page__expiry-tags`)
|
||||||
|
- `src/views/transportCapacity/ship.vue`(`.transport-ship-page__expiry-tags`)
|
||||||
|
- 各页变量名保留原样(contract-manage 用 contractExpiryScope/changeExpiryScope/contractExpiryStats;运力页用 query.expireStatus/handleExpireChange/expiryStat)。
|
||||||
|
- 已补改并修正:`payment/bill-ledger` 页。用户要求"放在卡片下面"(搜索白卡之外、表格之上独立一行),非卡片内分行。最终方案:把到期快捷筛选整组(标签 DOM + `shortcutOptions` 计算属性 + `handleShortcutChange`)从子组件 `bill-ledger-search.vue` 提升到页面 `bill-ledger.vue`,置于 `<bill-ledger-search>` 与 `<bill-ledger-table>` 之间(卡片下、表格上)。
|
||||||
|
- `bill-ledger-search.vue`:删除标签 DOM、`.bill-ledger-search__actions`/`.bill-ledger-search__actions-tags` CSS、`counts` prop、`shortcutOptions`/`handleShortcutChange`;按钮行 `.bill-ledger-search__actions-buttons` 恢复单行右对齐(`margin-bottom:8px`)。
|
||||||
|
- `bill-ledger.vue`:模板插入 `<div class="bill-ledger-page__expiry-tags">`(绑定 `query.expiryShortcut`,@change 调 `handleShortcutChange`→`handleSearch`);脚本加 `shortcutOptions` computed(用 `counts`)+ `handleShortcutChange` method;新增 `<style scoped>` 写入 `.bill-ledger-page__expiry-tags`(flex 行、`margin:8px 0`)。`emptyQuery()` 已含 `expiryShortcut:'all'`,无回归。
|
||||||
|
- 选中态样式统一:去掉 `.bill-ledger-page__expiry-tags :deep(.el-check-tag.is-checked)` 的 `background-color:#409eff` + `color:#fff` 蓝底白字覆盖,改用 Element Plus 默认浅蓝底深蓝字,与合同页一致。
|
||||||
|
|
||||||
|
## transportCapacity/ship 新增弹窗 input 宽度统一
|
||||||
|
- 问题:新增/修改弹窗内输入控件宽度不一致(文本框明显窄于下拉框、日期框)。
|
||||||
|
- 根因:`src/views/transportCapacity/ship.vue` 末尾 scoped 样式中独有 `.el-input__wrapper{width:150px !important}`,把文本框包裹层强制压成 150px,而 `el-select`(用 `.el-select__wrapper`)、日期/数字框不受影响 → 文本框与下拉框宽度不齐。同模块的 driver.vue / vehicle.vue 均无此规则。
|
||||||
|
- 修复:
|
||||||
|
1. 删除 `.el-input__wrapper{width:150px!important}` 异常规则。
|
||||||
|
2. 增强 `.ship-form` 内输入控件的 100% 宽度覆盖,补齐 `.el-select__wrapper` / `.el-cascader` / `.el-input__wrapper`,使文本框/下拉/日期/数字框均 100% 填满所在栅格列。
|
||||||
|
- 说明:弹窗仍保留不同栅格列宽(span6/8/12/16)的密集布局,同行字段已等宽;若需跨行全部 input 绝对像素等宽(统一栅格列宽),需进一步重排。
|
||||||
|
- 二次排查(用户反馈仍不一致):把 `.ship-form` 内控件 100% 覆盖从通用 `:deep(.el-input)` 改为更具体的 `:deep(.el-form-item__content > .el-input)` 并加 `!important`,同步覆盖 `.el-input__wrapper`/`.el-select__wrapper`,确保不会被 Element Plus 变量或更具体选择器压回默认/较窄宽度。请用户刷新浏览器验证。
|
||||||
|
- 三次修复(用户反馈第一行 span=6+6+12 三个字段宽度仍不齐):放弃「width: 100% 撑满 col」方案,改用「对齐 vehicle/customer-archive 的 `.archive-form` 风格」——label 固定 `calc(6em + 24px)` + 控件统一 `250px + max-width: 100%`。根因:`el-cascader` 默认 `display: inline-block`,即使 width: 100% 也不易撑满 col-content(与 input 视觉差 ~150px vs ~280px);span=6+6+12 下两列 form-item__content 实际不等宽(label-width=100 被长 label 撑开)。新方案固定 250px 后三字段视觉一致,参照客商档案。
|
||||||
|
- 同时清理模板中冗余 `label-width="88px"`(会被新 CSS 强制覆盖失效)。
|
||||||
|
|
||||||
|
## transportCapacity/ship 证书信息分组:附件下放到对应分组末尾 + label 缩短
|
||||||
|
- 需求:1. 「船舶国籍证书」「内河船舶最低安全配员证书」分组里 label 「证书有效期自」偏长,改短为「有效期自」(与下面统一)。2. 底部集中的 `.cert-upload-grid` 上传区调整到各证书分组末尾,让附件与字段同组。
|
||||||
|
- 修改:
|
||||||
|
- `src/views/transportCapacity/ship.vue` 模板 line 392/431:2 处 `label="证书有效期自"` → `label="有效期自"`。
|
||||||
|
- 模板结构重组:删除底部 `<el-row class="cert-upload-grid">...</el-row>`(原 line 472-548),把 6 个 `<image-upload-field>` 分别插入对应 `cert-block` 末尾(每个用 `class="ship-upload-item"`,独立 `<el-row :gutter="18"><el-col :span="8">`):
|
||||||
|
- 船舶所有权证书分组 → `ownershipCertImage`
|
||||||
|
- 内河船舶安全与环保证书分组 → `safetyCertImage`
|
||||||
|
- 船舶国籍证书分组 → `nationalityCertImage`
|
||||||
|
- 内河船舶最低安全配员证书分组 → `safeManningCertImage`
|
||||||
|
- 光船租赁登记证明书分组 → `leaseContractImage`(label="光船租赁登记证书")
|
||||||
|
- 船舶营业运输证书分组 → `businessTransportCertImage`(label="船舶营业运输证")
|
||||||
|
- 样式清理:删除无用的 `.cert-upload-grid { padding-top:8px }` / `.cert-upload-spacer { height:1px }`;保留 `.cert-block` / `.cert-block__title` / `.ship-upload-item`(`margin-bottom:14px`)。
|
||||||
|
- 验证:用户刷新浏览器看新布局。
|
||||||
|
|
||||||
|
## transportCapacity/ship 组合控件宽度对齐 250px 体系
|
||||||
|
- 问题:基础船舶信息里「安放龙骨日期/建造完工日期」的起止两个 date-picker、「航区」的 select 都是 `flex:1` 撑满所在 span=12 整列(约 498px),明显比单字段 250px 宽,视觉不协调。
|
||||||
|
- 修复(`src/views/transportCapacity/ship.vue` 末尾 scoped 样式):
|
||||||
|
- `.date-range-inline :deep(.el-date-editor)` 由 `flex:1; min-width:0` 增加 `max-width: 250px` → 两个 date-picker 在窗够宽时各对齐 250px、彼此等宽,窄窗时 flex:1 收缩不溢出。
|
||||||
|
- `.navigation-area-field :deep(.el-select)` 由 `flex:1; min-width:0` 增加 `max-width: 250px` → 航区 select 对齐 250px 单字段。
|
||||||
|
- 说明:`flex:1` 保底防溢出,`max-width:250px` 把组合控件拉回与单字段一致的 250px 体系(受所在列宽限制,安放龙骨 span=12 在常规窗宽下两个 date-picker 约 226px 等宽,更宽窗自动到 250px)。
|
||||||
|
|
||||||
|
## business/project-apply.vue 表单「业务部门/承办部门」级联选择器宽度统一
|
||||||
|
- 问题:项目新增/编辑表单(含独立表单页 `/business/project-apply/form`)中,业务部门、承办部门两个 `el-cascader` 的按钮宽度与同行的 select/input 不一致。
|
||||||
|
- 根因:scoped 样式里强制 100% 宽度的控件列表(`el-input` / `el-select` / `el-tree-select` / `el-date-editor`)漏了 `el-cascader`,导致级联选择器按内容宽度收缩,未填满栅格列。
|
||||||
|
- 修复:`src/views/business/project-apply.vue` 末尾 scoped 样式 `.project-apply-form` 的 100% 宽度规则补上 `:deep(.el-cascader)`。Vite HMR 已自动生效,无需重启 dev。
|
||||||
|
|
||||||
|
## 登录页隐藏租户栏
|
||||||
|
- 需求:登录页 `000000` 租户输入框隐藏。
|
||||||
|
- 根因:`src/page/login/userlogin.vue` 第 10 行 `el-form-item` 由 `tenantMode` 控制显示,初始值 `this.website.tenantMode`,`getTenant()` 请求 `/api/system/tenant/info` 成功时会把 `tenantMode=false` 自动隐藏并回填 `loginForm.tenantId`。截图里仍显示租户栏,说明该接口未正常返回(域名解析/后端/跨域),沿用了初始 `tenantMode`。
|
||||||
|
- 修复:
|
||||||
|
1. 删除 `userlogin.vue` 模板第 10-21 行整段租户 `el-form-item`(`v-if="tenantMode" prop="tenantId"`),不留 `v-if` 兜底,直接移除 DOM。
|
||||||
|
2. 同步删除 `loginRules.tenantId` 校验规则。
|
||||||
|
- 保留:`loginForm.tenantId: '000000'` 默认值、`getTenant()` 方法。提交登录时仍带 `tenantId` 字段,后端行为不变;接口正常时仍会用返回的 tenantId 覆盖默认值。
|
||||||
|
- 后续若要重新启用:恢复 `el-form-item` 即可(或改 `data()` 中 `tenantMode: this.website.tenantMode` 走配置开关)。
|
||||||
|
|
||||||
|
## 客商档案评分详情表控件/label 宽度对齐
|
||||||
|
- 问题:评分详情表弹窗内输入框、选择框、日期框宽度不一致;label 要求固定 88px 且超长换行。
|
||||||
|
- 修复(`src/views/vehicle/customer-archive.vue`):
|
||||||
|
- 模板 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
- `.score-detail-form` 样式:
|
||||||
|
- `el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important`,保留 `white-space: normal !important; word-break: break-all; line-height: 1.4` 实现超长换行。
|
||||||
|
- `el-form-item__content > .el-input / .el-select / .el-date-editor` 由固定 `width: 150px` 改为 `width: 100%`,单字段撑满等宽;`.score-detail-form__range` 内双日期框保持 `flex: 1; min-width: 0` 均分。
|
||||||
|
- 参考:客商档案 `.archive-form` 的 label 换行与控件等宽处理思路。
|
||||||
|
|
||||||
|
## 评分详情表弹窗输入框/选择框宽度对齐 + label 88px 换行
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 中「评分详情表」弹窗表单的输入框、选择框、日期框视觉宽度不一致;label 区域未严格固定 88px。
|
||||||
|
- 修复:
|
||||||
|
1. `el-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 中 `.el-form-item__label` 强制 `flex:0 0 88px; width:88px; min-width:88px` 并保留 `white-space: normal` 换行。
|
||||||
|
3. 将单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)宽度由固定 `150px` 改为 `100%`,使其在固定 label 后自动等宽填满 content 区域。
|
||||||
|
- 保留:「临时额度申请使用期限」组合控件继续用 `.score-detail-form__range` 双 date-picker flex 均分布局。
|
||||||
|
|
||||||
|
|
||||||
|
## customer-archive 评分详情表:label 固定 88px 换行 + 控件宽度统一
|
||||||
|
- 问题:评分详情表弹窗内输入框与选择框宽度不一致,且 label 区域未按 88px 固定换行。
|
||||||
|
- 修复(`src/views/vehicle/customer-archive.vue`):
|
||||||
|
1. `score-detail-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form :deep(.el-form-item__label)` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important; word-break: break-all; line-height: 1.4;` 实现长 label 自动换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input / .el-select / .el-date-editor`)统一 `width: 100%`,使输入框与选择框在相同栅格列内等宽。
|
||||||
|
- 说明:「临时额度申请使用期限」双日期组合仍由 `.score-detail-form__range` 控制 `flex:1` 均分,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## 评分详情表 label 宽度与控件宽度对齐
|
||||||
|
- 需求:评分详情弹窗内输入框与选择框宽度一致;label 宽度固定 88px,超长自动换行。
|
||||||
|
- 修改 `src/views/vehicle/customer-archive.vue`:
|
||||||
|
1. `<el-form>` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 的 label 样式强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important; word-break: break-all; line-height: 1.4;` 实现换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)由固定 `width: 150px` 改为 `width: 100%`,使输入框、下拉框、日期框均撑满同一 content 区,视觉宽度一致。
|
||||||
|
- 说明:「临时额度申请使用期限」两个 date-picker 仍由 `.score-detail-form__range` 的 `flex: 1; min-width: 0;` 控制,不受本次单字段 100% 影响。
|
||||||
|
|
||||||
|
## 客商档案「评分详情表」弹窗表单控件宽度对齐
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 的「评分详情表」弹窗中,评定日期的 date-picker、拟申请额度等 input、评分量化表 select 等控件宽度不一致;label 需固定 88px 且长 label 换行。
|
||||||
|
- 修复:
|
||||||
|
1. `<el-form>` `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式:`.el-form-item__label` 强制 `flex:0 0 88px` + `width:88px` + `white-space:normal`,确保长 label 换行且宽度恒定。
|
||||||
|
3. 控件由固定 `width:150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width:100% }`,单字段 input/select/date-picker 在 span=6 下等宽撑满 content 区。
|
||||||
|
- 备注:「临时额度申请使用期限」组合区保持 `.score-detail-form__range` 的 `flex:1` 双 date-picker 布局,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## customer-archive 评分详情表控件宽度与 label 换行对齐
|
||||||
|
- 问题:评分详情弹窗内 input、select、date-picker 宽度不一致;长 label(如「拟申请总资金使用额度(万元)」)未按 88px 换行。
|
||||||
|
- 修改 `src/views/vehicle/customer-archive.vue`:
|
||||||
|
1. `<el-form label-width="88">` → `label-width="88px"`,与全站风格一致。
|
||||||
|
2. `.score-detail-form` 样式:
|
||||||
|
- `el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal` + `word-break: break-all` + `line-height: 1.4` 实现超长 label 换行。
|
||||||
|
- 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)由固定 `width: 150px` 改为 `width: 100%`,使其在 88px label 下等宽撑满 content 区。
|
||||||
|
- 说明:双日期范围字段(临时额度申请使用期限)仍由 `.score-detail-form__range` 用 `flex:1; min-width:0` 均分,不受单字段 100% 规则影响。
|
||||||
|
|
||||||
|
## 评分详情表弹窗 label/控件宽度对齐
|
||||||
|
- 文件:`src/views/vehicle/customer-archive.vue`。
|
||||||
|
- 问题:评分详情表弹窗内 input 与 select/date-picker 宽度不一致;label 宽度未严格固定 88px、长 label 未换行。
|
||||||
|
- 修复:
|
||||||
|
1. `el-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式里 label 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal`、`word-break: break-all` 换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)统一 `width: 100%`,取代原先未生效/不齐的 `width: 150px`。
|
||||||
|
- 备注:「临时额度申请使用期限」两个 date-picker 仍由 `.score-detail-form__range` 的 `flex:1` 均分,不受 100% 宽度影响。
|
||||||
|
|
||||||
|
## 客商档案「评分详情表」弹窗控件宽度对齐与 label 换行
|
||||||
|
- 问题:评分详情表弹窗中 input、select、date-picker 宽度不一致;长 label 未换行。
|
||||||
|
- 修复 `src/views/vehicle/customer-archive.vue`:
|
||||||
|
1. `el-form` 的 `label-width="88"` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式:label 强制 `flex:0 0 88px`、`width:88px`、`white-space:normal`,超出换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input/.el-select/.el-date-editor`)统一 `width:100%`,撑满 content 区,与选择框等宽。
|
||||||
|
- 保留 `.score-detail-form__range` 内双 date-picker `flex:1; min-width:0` 的「起—止」布局。
|
||||||
|
|
||||||
|
## 评分详情表弹窗 label 与输入控件宽度对齐
|
||||||
|
- 文件:`src/views/vehicle/customer-archive.vue`
|
||||||
|
- 问题:评分详情表弹窗内输入框、下拉框、日期框宽度不一致;长 label 未换行。
|
||||||
|
- 修改:
|
||||||
|
1. `<el-form label-width="88">` 改为 `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` label 样式强制 `width: 88px !important; flex: 0 0 88px !important; min-width: 88px !important;`,并保留 `white-space: normal` / `word-break: break-all` 换行。
|
||||||
|
3. 单字段控件(`.el-form-item__content > .el-input / .el-select / .el-date-editor`)统一 `width: 100%`,填满 label 剩余区域,保证 input/select/date-picker 视觉等宽。
|
||||||
|
- 说明:组合日期区间(`.score-detail-form__range`)保持两个 date-picker `flex:1` 均分,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## customer-archive 评分详情表 label/控件宽度对齐
|
||||||
|
- 问题:评分详情弹窗表单的输入框与选择框宽度不一致;label 宽度要求 88px 且超长换行。
|
||||||
|
- 修复:`src/views/vehicle/customer-archive.vue`
|
||||||
|
- `label-width="88"` → `label-width="88px"`。
|
||||||
|
- `.score-detail-form` 样式:`.el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important` 等换行样式。
|
||||||
|
- 控件由固定 `width: 150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width: 100%; }`,使输入框、下拉框、日期框在各自列内等宽撑满。
|
||||||
|
|
||||||
|
## 评分详情表弹窗:label 固定 88px 换行 + 输入/选择框宽度一致
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 评分详情弹窗内输入框与选择框宽度不一致,label 长文本未换行。
|
||||||
|
- 修复:
|
||||||
|
1. `label-width="88"` → `label-width="88px"`。
|
||||||
|
2. `.score-detail-form` 样式:`.el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important; white-space: normal !important;` 确保 88px 固定宽度并自动换行。
|
||||||
|
3. 单字段控件 `.el-form-item__content > .el-input / .el-select / .el-date-editor` 由固定 `150px` 改为 `width: 100%`,使输入框与选择框在各自栅格列内等宽撑满。
|
||||||
|
- 备注:「临时额度申请使用期限」双日期组合仍走 `.score-detail-form__range` 的 `flex:1; min-width:0`,不受单字段 100% 影响。
|
||||||
|
|
||||||
|
## 客商档案评分详情表控件宽度统一 + label 88px 换行
|
||||||
|
- 问题:`src/views/vehicle/customer-archive.vue` 评分详情弹窗内输入框与选择框宽度不一致;label 区域未严格固定 88px,长 label 换行效果不稳定。
|
||||||
|
- 修复:
|
||||||
|
1. 模板 `el-form` 的 `label-width="88"` 明确为 `label-width="88px"`。
|
||||||
|
2. scoped 样式 `.score-detail-form`:
|
||||||
|
- `.el-form-item__label` 强制 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important` / `word-break: break-all` 让超长 label 自动换行。
|
||||||
|
- 控件统一由固定 `width: 150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width: 100%; }`,使输入框、下拉框、日期框在各自栅格列内等宽撑满。
|
||||||
|
- 说明:「临时额度申请使用期限」双日期组合区仍由 `.score-detail-form__range` 控制 flex:1 均分,不受单控件 100% 规则影响。
|
||||||
|
|
||||||
|
## customer-archive 评分详情表控件宽度统一 + label 换行
|
||||||
|
- 需求:评分详情弹窗内输入框与选择框宽度不一致;label 宽度需固定 88px 且超长换行。
|
||||||
|
- 修改(`src/views/vehicle/customer-archive.vue`):
|
||||||
|
1. 模板 `score-detail-form` 的 `label-width="88"` → `label-width="88px"`。
|
||||||
|
2. scoped 样式 `.score-detail-form`:`.el-form-item__label` 固定 `flex: 0 0 88px !important; width: 88px !important; min-width: 88px !important;`,并保留 `white-space: normal !important; word-break: break-all; line-height: 1.4;` 实现换行。
|
||||||
|
3. 控件宽度由固定 `150px` 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width: 100%; }`,使输入框、下拉框、日期框在同一 content 区域内等宽撑满。
|
||||||
|
- 说明:双日期字段(临时额度期限)仍走 `.score-detail-form__range` 的 `flex:1` 布局,保持两个日期框均分并对齐。
|
||||||
|
|
||||||
|
## 评分详情表输入框/选择框宽度对齐 + label 固定 88px 换行
|
||||||
|
- 文件:`src/views/vehicle/customer-archive.vue`
|
||||||
|
- 问题:评分详情弹窗内输入框、选择框、日期框宽度不一致;长 label 需要固定 88px 并允许换行。
|
||||||
|
- 修改:
|
||||||
|
1. `label-width="88"` → `label-width="88px"`。
|
||||||
|
2. `.score-detail-form :deep(.el-form-item__label)` 强制 `flex:0 0 88px !important; width:88px !important; min-width:88px !important`,保留 `white-space:normal !important; word-break:break-all; line-height:1.4`。
|
||||||
|
3. 控件宽度由固定 150px 改为 `.el-form-item__content > .el-input/.el-select/.el-date-editor { width:100%; }`,使输入框、选择框、日期框在固定 label 后自动等宽填满 content 区。
|
||||||
|
- 保留 `.score-detail-form__range` 内双 date-editor `flex:1; min-width:0` 的收缩行为。
|
||||||
|
|
||||||
|
## vehicle/customer-archive 两处「详细地址」hover 溢出提示完整地址
|
||||||
|
- 需求:编辑客商档案页,详细地址字段(窄栏 + 长文本易截断)鼠标移上去显示完整地址;仅文本溢出才显示。
|
||||||
|
- 实现:两处 `el-input` 用 `<el-tooltip>` 包裹,`content` 绑定字段值,`placement="top"`,`:disabled="!xxxOverflow"`(溢出才显示),`style="display:block; width:100%"`(el-tooltip 根 span 默认 inline,必须 block 才能撑满栅格列)。
|
||||||
|
- 主表单(line 317,`archiveForm.registeredDetailAddress`):`ref="registeredDetailInput"` + `@input` 实时重算。
|
||||||
|
- 发票弹窗(line 1008,`invoiceForm.registeredDetailAddress`):`ref="invoiceDetailInput"`,readonly 地图回填,靠 `watch` + `openInvoice` 打开后 `nextTick` 重算(弹窗按需挂载,预填数据打开后 watch 已不触发)。
|
||||||
|
- 新增:`data` 加 `registeredDetailOverflow/invoiceDetailOverflow` 标记;`watch` 监听两字段值变化→`checkOverflow`;`methods.checkOverflow(refName,flag)` 读 `inst.$el.querySelector('input')` 的 `scrollWidth > clientWidth` 判定溢出;`openInvoice` 打开后双 nextTick 重算发票框溢出。
|
||||||
|
- 验证:`vite build --outDir /tmp/tms-check-build` 零报错(常规 build 仅因安全删除保护拦截清空 dist,与代码无关)。
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
|
||||||
|
## 合同管理独立表单页下拉框定位修复
|
||||||
|
- `src/views/business/contract-manage.vue` 全部 12 处 `el-select` 加 `:teleported="false"` + `:fit-input-width="true"`:下拉保持在输入框正下方、宽度与输入框一致(原 teleport 到 body 导致下拉漂移且按内容撑宽)。
|
||||||
|
- 若后续新增独立表单页出现同样问题,照加这两个属性即可。
|
||||||
|
- 追加:teleported=false 后 popper 因下方空间不足自动上翻,再给 12 处 el-select 加 `placement="bottom-start"` + `:popper-options="{ modifiers: [{ name: 'flip', enabled: false }] }"` 强制始终在下方展示。
|
||||||
|
|
||||||
|
## 调度弹窗司机输入框宽度不一致修复
|
||||||
|
- 现象:「编辑调度信息(精简录入)」弹窗中,司机(el-autocomplete)输入框比同行 250px 的其他输入框宽。
|
||||||
|
- 根因:`business-crud-page.vue` 约 13434 行的「表单控件统一 250px」规则漏了 `.el-autocomplete`(autocomplete 根节点是包装层,内部才是 .el-input)。
|
||||||
|
- 修复:在该规则选择器列表追加 `> .el-autocomplete` 和 `> .el-autocomplete > .el-input`,与运单独立表单页(13658 行 business-crud-page--form-page 先例)一致。
|
||||||
|
- 经验:凡「控件统一 250px」类规则,选择器必须包含 `.el-autocomplete` 包装层。
|
||||||
|
|
||||||
|
## 调度弹窗收发货地址行溢出修复
|
||||||
|
- 现象:「编辑调度信息」弹窗收发货信息行,地址输入框过宽,右侧「联系方式」列被挤出弹窗。
|
||||||
|
- 根因:`__dispatch-shipping-form __route-address-row` 网格地址列为 `minmax(280px, 1fr)`,各列最小宽度合计 1030px,弹窗不够宽时 grid 不换行直接溢出。
|
||||||
|
- 修复:地址列改 `minmax(0, 1fr)`(宽屏仍 1fr 拉伸,窄窗自动收窄,总最小宽降到 750px)。
|
||||||
|
- 备注:基础规则 `__route-address-row`(13750 行,运单独立表单页等在用,7 列含 40px 按钮列)仍是 minmax(280px,1fr),同样窄窗有溢出风险,暂未动(用户未反馈该页问题)。
|
||||||
|
|
||||||
|
## el-select 选中值 / 占位符颜色区分(全局)
|
||||||
|
- 需求:已选值 #606266,未选值保持 placeholder 灰 #909399。
|
||||||
|
- 根因:Element Plus 的选中值文本与占位符**共用同一节点** `<div class="el-select__selected-item el-select__placeholder [is-transparent]">`,仅靠 `.el-select__selected-item` 无法区分,导致未选态也被染成选中色。
|
||||||
|
- 区分标志:只有「未选值」或「已展开但无搜索输入」时才带 `.is-transparent`。
|
||||||
|
- 修复(`src/styles/element-ui.scss`):选中规则改为 `.el-select__wrapper:not(.is-disabled) .el-select__selected-item:not(.is-transparent)`;多选 tag 文字另加 `.el-select__tags-text` 规则(tag 自身 color 优先级更高,父级规则盖不到)。
|
||||||
|
- 经验:以后写任何「区分 el-select 有值/无值」的 CSS,一律用 `:not(.is-transparent)`。
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
|
||||||
|
## 付款比例设置提示改为 tooltip(contract-manage / contract-manage-change)
|
||||||
|
- 需求:将「付款比例设置」区块原有的红色文字提示改为标题右侧的 `?` 图标悬停提示。
|
||||||
|
- 改动:编辑弹窗、详情弹窗、合同变更页三处标题后添加 `el-tooltip` + `el-icon-question-filled`,content 为「非必填;配置付款比例时,合计必须等于100%。」;同时移除 contract-manage.vue 中原 `.contract-manage-form__tip` 红色提示文字及对应样式。
|
||||||
|
|
||||||
|
## 必填星号与 label 首行齐平(全局)
|
||||||
|
- 根因:`element-ui.scss` 中 `.el-form-item--label-right .el-form-item__label { align-items:center }` 使 inline-flex label 的星号 `::before`(独立 flex 子项)在多行折行时被垂直居中。
|
||||||
|
- 修复:label 改 `align-self:center`(整体仍随行垂直居中)+ `align-items:flex-start`(星号/文字首行齐平),覆盖 label-right/left/top 三种位置;旧 inline-block 注释已修正。
|
||||||
|
- 影响页面:project-apply 独立表单页等所有多行 label 场景(弹窗内 `white-space:nowrap` 不受影响)。
|
||||||
|
|
||||||
|
## 必填星号首行对齐:改用 align-items: normal(stretch 方案)
|
||||||
|
- 最终写法(`src/styles/element-ui.scss`):`.is-required .el-form-item__label { align-self:center; align-items:normal; }` + `::before { display:inline-block; height:auto; line-height:inherit; margin-right:4px }`。
|
||||||
|
- 原理:stretch 让星号盒子在「换行时」被拉伸到 label 全高、内容从顶部排布 → 贴首行;单行时盒子=一行高,视觉不变(比 flex-start 更贴合「只换行才生效」)。
|
||||||
|
- 前提:::before 高度必须 auto 且继承行高;label 不能是 固定 height + 等高 line-height,否则退化成居中,需 JS 判行数加 class。
|
||||||
|
|
||||||
|
## 合同变更页(contract-manage-change.vue)
|
||||||
|
- 「其它附件」上传按钮改为 `type="primary" plain icon="el-icon-upload"`,与「变更材料」区 vehicle-attachment-upload 内置按钮一致。
|
||||||
|
- 分区标题必填星号:`.dialog-section-title.is-required::after { content:'*'; color:#f56c6c }`(`::before` 已被蓝色竖条占用,星号走 `::after`)。
|
||||||
|
- 再次变更逻辑:`load()` 里 form 强制重置 `changeContent/changeReason/changeAttachmentsJson = ''`、`changeMaterials = []`(不带上一次内容);新增 `mergeChangeAttachments()` 把上一次的 `changeAttachmentsJson` 归集进 `attachments`(其它附件),按 url/名去重,数字 size 转格式化文本,提交时随 attachmentsJson 持久化。
|
||||||
|
|
||||||
|
## 合同变更记录对齐客商变更记录(contract-manage.vue)
|
||||||
|
- 编辑页与详情弹窗的两处「变更记录」表格新增「变更内容」列:`formatContractChangeContent(row)` 复用 `buildDetailChangeRecordRows` 生成「字段:变更前:x → 变更后:y」摘要,单行省略 + `el-tooltip` 全量悬浮(样式 `.contract-change-record-content-cell/-tooltip` 照搬客商 `change-record-content-*`)。
|
||||||
|
- 编辑页操作列由单个「流程」改为「详情 + 流程」(`openDetailChangeRecord` + `openFlow`,宽度 120→150);详情弹窗表格「查看详情」改「详情」与客商一致。
|
||||||
|
- 值格式化增强:`billingPlanJson`→方案名(默认)列表、`paymentRatioJson`→「第N笔 xx%」、`settlementRuleJson/preSettlementConfigJson/formalSettlementConfigJson`→可读摘要(自动生成开关/结算类型/周期类型/截单日/周期天数,含预结算+正式结算双段)。
|
||||||
|
- `buildDetailChangeRecordRows` 过滤条件补「前后都为空则跳过」(原来只比 JSON 字符串,'' 与 null 会漏)。
|
||||||
|
|
||||||
|
## 星号方案补丁(关键)
|
||||||
|
- EP 的 `.el-form-item__label` 写死 `height:32px; line-height:32px`(项目只覆盖了 line-height:14px),导致 stretch 方案文字顶到 32px 盒子顶部、单行不居中。
|
||||||
|
- 修复:`.is-required .el-form-item__label { height:auto; align-self:center; align-items:normal }`——height:auto 收缩到内容高 + align-self:center 行内居中 + normal(stretch) 仅换行时星号贴首行。
|
||||||
|
|
||||||
|
## 车辆认证审核弹窗重构(transportCapacity/vehicle.vue)
|
||||||
|
- 背景:用户反馈「样式不统一、内容不全」。根因是审核弹窗用 `<el-descriptions :column="3" border>`(大白表 + 居中 label),与同页编辑弹窗的 `<section-card>` 白卡分组风格不一致。
|
||||||
|
- 改造:弹窗主体改为 4 个 `section-card` 分组 —— 基础信息 / 尺寸重量 / 证件信息 / 证件图片;内部 `el-form label-position="right" label-width="auto"` + `el-row/el-col`(3 列 `:span="8"`,所属组织与备注占 `:span="24"`)。
|
||||||
|
- 内容补全:新增「证件图片」分组,6 张证件照用 `<image-upload-field readonly large class-prefix="vehicle">` 只读展示(可点击放大);证件图片尺寸 240×151 复用已有全局 `:deep(.vehicle-uploader--large)` 规则,无需新写。
|
||||||
|
- label 单位统一为中文全角括号:`外廓长度(毫米)` / `核定载质量(KG)`(原为半角 `外廓长度(mm)`)。
|
||||||
|
- 方法重构:`formatAuditValue(item)` → `auditValue(prop)`,签名更简洁;新增 longTermMap,对 drivingLicenseEndDate / roadTransportCertEndDate / annualReviewEndDate / compulsoryScrapDate 在勾选长期有效时返回「长期有效」,避免与未填写的「-」混淆(与列表页 formatEndDate 行为一致)。
|
||||||
|
- 删除已无引用的 `auditDetailItems` computed。
|
||||||
|
|
||||||
|
## 全站弹窗标题补 4px 主色竖条(全局 element-ui.scss)
|
||||||
|
- 发现:`.el-dialog__title` 全局只配了 `inline-flex + gap:8px`,**没有竖条**(竖条此前只在 `.dialog-section-title::before`),导致全站 el-dialog 标题都不带竖条,不符合 AGENTS.md 4.8。
|
||||||
|
- 修复:新增 `.el-dialog__title:not(:empty)::before { width:4px; height:16px; border-radius:2px; background:var(--el-color-primary) }`。
|
||||||
|
- 注意:必须加 `:not(:empty)`,否则无标题弹窗会出现孤立蓝条。
|
||||||
|
- customer-archive.vue 评分详情弹窗:将「临时额度申请使用期限」区间行(span=12 + 至 连接)拆分为两个 span=6 独立字段「临时申请额度有效期起 / 止」,字段名 tempCreditStartDate/End 不变,删除废弃样式 .score-detail-form__range。
|
||||||
|
- temporary-credit-limit 文案调整:option 增加 addTitle/editTitle/viewTitle=「新增/编辑/查看临时额度申请」(覆盖 crud-dialog-title mixin 按菜单名注入的「临时额度管理」);remark label 改「临时额度信息」(hide:true 无表格副作用,rules 同步);projectName 表单 label 用 `#projectName-label` 插槽改「项目额度信息」,列 label 保持「项目名称」不动表格列头/搜索。Avue 支持-{prop}-label / -header / -search 插槽分离表单/表头/搜索文案。
|
||||||
|
- temporary-credit-limit「申请有效期至」增加「必须晚于当前日期」校验:common.js 新增通用 `futureDateRule(label)`(trigger: ['change','blur'],空值/非法值放行,按 0 点比较,当天也算过期),temporary-credit-limit.js 的 validUntil rules 追加该规则。已验证 Element Plus 通用 picker 在选中日期时调用 formItem.validate('change'),故选择即刻提示;form.validate() 不带 trigger 时会跑全部规则,提交仍拦截。
|
||||||
|
- temporary-credit-limit 搜索占位文案统一:createCrudOption(withSearchPlaceholders([...])),搜索栏 placeholder 变为「请输入/请选择」不带字段名,与 waybill-manage / transport-plan / shipping-template 同一模式。
|
||||||
|
- temporary-credit-limit 弹窗表单 placeholder 统一为「请输入/请选择」不带字段名:option 各列加 placeholder(projectCode/undertakeDeptName/projectFundLimit/usedFundLimit/remainingFundLimit/remark=请输入,validUntil=请选择),视图 formslot 自定义控件(projectName select、applyLimit input)placeholder 同步改。
|
||||||
|
|
||||||
|
## 【项目管理】列表增加「项目资金使用预警」(project-apply)
|
||||||
|
- 需求:列表新增「资金使用风险」列,高风险红色、中风险黄色;列表头部增加「资金使用风险」快速筛选标签(高风险(数)/中风险(数)),点击筛选。规则 tooltip:中风险≥80%、高风险≥90%,使用率=已使用资金/项目资金使用额度×100%。
|
||||||
|
- 前端(已落地,src/views/business/project-apply.vue + src/option/business/project-apply.js + src/api/business/project-apply.js):
|
||||||
|
- option/project-apply.js 新增列 `fundUseRisk`(slot:true, hide 列表显示) + 导出 `fundUseRiskOptions`(high/medium/none) 与 `fundUseRiskThreshold`{high:90, medium:80}。
|
||||||
|
- view 新增 `#header` 插槽:`el-check-tag` 快速筛选(复用 contract-manage 到期标签交互),带数量(fundRiskStats[statKey])与 `?` tooltip 规则;新增 `#fundUseRisk` 插槽渲染彩色 `el-tag`(high→type=danger 红,medium→type=warning 黄,无→"-")。
|
||||||
|
- data 加 fundRiskScope/fundRiskStats{high,medium,none}/fundRiskTagOptions;onLoad 追加 `fundUseRisk` 筛选参数 + 成功后 refreshFundRiskStats;新增 changeFundRiskScope(再次点击取消)、refreshFundRiskStats;searchReset 清空风险筛选。
|
||||||
|
- api 新增 `getFundRiskStats` → GET /blade-transport/project-apply/fund-risk-stats。
|
||||||
|
- 后端契约(未改,待确认数据来源):ProjectApplyVO 补齐 `fundUseRisk`(high/medium/none)、`fundUseRiskName`、`fundUseRate`、`usedFundLimit`/`remainingFundLimit`;列表 selectProjectApplyPage 填充每行风险 + buildQuery 支持 `fundUseRisk` 过滤;新增 `/fund-risk-stats` 返回 {high,medium,none}。
|
||||||
|
- ⚠️ 关键阻塞:系统里项目与任何费用表(运输计划/运单/账单/客商)均无关联字段,`usedFundLimit`(已使用资金) 无真实取数来源;临时额度模块的 project-apply/list 返回里 usedFundLimit 实际为空。需业务方确认「已使用资金」口径后才能算风险等级,否则列表风险列全空、统计为 0。
|
||||||
|
|
||||||
|
## 合同文件「批量下载」按钮与标题同排(contract-manage.vue 内联 AttachmentSection)
|
||||||
|
- 需求:编辑页「合同文件」分组里「批量下载」按钮目前独立一行、靠右偏上,高度与标题区错位;要放到「合同文件」标题右侧同排、垂直居中。
|
||||||
|
- 修复:`const AttachmentSection = defineComponent(...)` 内联组件 render() —— 原结构是 `div.dialog-section-title`(标题) 与 `div.contract-manage-form__attachment-head`(批量下载按钮) 两个并列 div;改为把标题与按钮放进同一个 `contract-manage-form__attachment-head` flex 容器(标题左、按钮右)。
|
||||||
|
- 样式:`:deep(.contract-manage-form__attachment-head)` 由 `justify-content:flex-end` 改为 `space-between` + `align-items:center`,并 `.dialog-section-title { margin-bottom:0 }` 抵消标题自身 20px 下边距(2674 行 `:deep(.dialog-section-title)` 会命中子组件渲染的标题)。
|
||||||
|
- 注意:AttachmentSection 用 render 函数产出 DOM,不带当前组件 scoped data 属性,因此样式必须走 `:deep()`;scoped 的 `&__billing-head, &__attachment-head`(2723) 只作用于当前组件模板内(计费信息),对子组件 DOM 无效。
|
||||||
|
- 影响:4 处使用(编辑/详情 × 合同文件/其它附件)布局统一变为「标题 + 批量下载」同排。
|
||||||
|
- 主人二次反馈「下面的其它附件也一样」——确认 L463(编辑/其它附件 description) / L765(详情/其它附件 description+readonly) 与 L313(编辑/合同文件) / L671(详情/合同文件) 都走同一份 render+样式,无需新代码;指挥浏览器 Cmd+Shift+R 硬刷即可看到效果(render 函数组件的 :deep() 样式改 HMR 经常不传播)。
|
||||||
|
|
||||||
|
## 合同格式下拉改读业务字典 contractFormat(contract-manage.vue)
|
||||||
|
- 需求:新增/编辑合同管理页「合同格式」下拉由硬编码改为读取业务字典 `contractFormat`。
|
||||||
|
- 原实现:`option/business/contract-manage.js` 里 `contractFormat` 列 `dicData` 硬编码 `[{label:'电子合同',value:'电子合同'},{label:'纸质合同',value:'纸质合同'}]`,view 里 `contractFormatOptions` computed 直接 `columnOptions('contractFormat')` 读 column.dicData。
|
||||||
|
- 修复(4 处):
|
||||||
|
1. data 加 `contractFormatDictOptions: []`(与 settlementModeDictOptions 并列)。
|
||||||
|
2. computed `contractFormatOptions` 改为优先 `contractFormatDictOptions`,为空回退 `columnOptions('contractFormat')`(保留静态兜底)。
|
||||||
|
3. `loadSettlementDictionaries` 的 `Promise.all` 追加 `getBizDictionary({ code: 'contractFormat' })`,用 `records()` 映射 `{label:dictValue,value:dictKey}` 填充 `contractFormatDictOptions`;再**条件覆盖** column.dicData(仅当字典非空时),避免字典未配时清掉静态兜底。
|
||||||
|
4. `detailValue` 的字典映射分支加入 `prop === 'contractFormat'`,详情页「合同格式」也走 `displayStatus` 显示 label。
|
||||||
|
- 后端契约:`getBizDictionary` → `GET /blade-system/dict-biz/dictionary?code=contractFormat`,返回 `List<DictBiz>{code,dictKey,dictValue,remark}`(DictBizController#dictionary 按 code 精确匹配)。字典 code 按用户口述用驼峰 `contractFormat`(现有 settle_method 为下划线,若后台实际是 `contract_format` 需调整 code)。
|
||||||
|
- 参考模式:与 `settlementMode`(settle_method)完全一致。
|
||||||
|
|
||||||
|
## 合同类别 contractCategory 也读业务字典(contract-manage.vue,续上)
|
||||||
|
- 需求:模板里 label 实为「合同类型」(prop `contractCategory`),下拉由硬编码 `common.js#contractCategoryOptions`(客户合同/承运商合同/补充协议,value 中文)改为读业务字典 `contractCategory`。
|
||||||
|
- 修复(3 处,与 contractFormat 同模式):
|
||||||
|
1. data 加 `contractCategoryDictOptions: []`。
|
||||||
|
2. computed `contractCategoryOptions` 改为优先 `contractCategoryDictOptions`,空回退 `columnOptions('contractCategory')`(静态兜底)。
|
||||||
|
3. `loadSettlementDictionaries` 的 `Promise.all` 追加 `getBizDictionary({ code: 'contractCategory' })`,映射填充后**条件覆盖** `contractCategory` 列 dicData(仅非空时)。
|
||||||
|
- 列表页列显示/搜索下拉、详情页(detailValue 已有 `prop==='contractCategory'` 分支走 displayStatus)均因 column.dicData 覆盖而自动跟随业务字典。
|
||||||
|
- 注意:`config.defaultForm.contractCategory: '客户合同'`(option/contract-manage.js)为硬编码中文默认值,若业务字典 dictKey 非中文需同步调整。
|
||||||
|
|
||||||
|
## 车辆新增弹窗:所有组织移位 + 使用部门 + 长期有效清空(vehicle.vue + 后端)
|
||||||
|
- 需求(transportCapacity/vehicle):①所有组织移到「基础车辆信息」区末尾;②新增「使用部门」字段(后端 transport_vehicle 无该字段,需加);③车牌号三段(省/号码/颜色)包成整体输入框+减宽;④勾选「长期有效」清空对应日期且不可编辑。
|
||||||
|
- 用户确认:所有组织+使用部门放「基础车辆信息」区末尾;使用部门用部门下拉(复用 getDeptTree→organizationOptions,存部门名,仅部门名非级联);车牌号包成整体输入框+减宽;长期有效 4 组全部统一清空(强制报废/行驶证/道路运输证/年审)。
|
||||||
|
- 前端(vehicle.vue):
|
||||||
|
1. emptyForm 加 `useDepartment: ''`。
|
||||||
|
2. 删「基础车辆信息」首行的「所有组织」(原 span24),在区末新增一行:`使用部门`(span8, el-select+organizationOptions, 存 rawLabel) + `所有组织`(span8, el-cascader)。organizationOptions 由 initDeptTree 填充。
|
||||||
|
3. `.plate-group` 由 grid(112px 1fr 112px) 改为 flex 整体输入框:外层 border+radius+focus-within 变化;内部 el-select/el-input 去 box-shadow、无边框,第一/最后 select flex 0 0 30%、中间 input flex 1,子项间用 `::before` 竖线分隔。
|
||||||
|
4. 4 组 date-picker 加 `:disabled="xxxLongTerm === 1"`(行驶证/道路运输证原缺,补上),checkbox 加 `@change="handleLongTermChange(日期prop, longterm prop)"`;新增方法 handleLongTermChange(勾选时清空日期并 validateField)。
|
||||||
|
5. formRules:drivingLicenseEndDate / roadTransportCertEndDate 由 required 改为 validator(新增 validateDrivingLicenseEndDate / validateRoadTransportCertEndDate,longTerm===1 时跳过必填),annualReview 原 validator 已支持。
|
||||||
|
- 后端(tms-erp-api-ws,新增 use_department 列):
|
||||||
|
- `TransportVehicle.java` 加 `private String useDepartment`。
|
||||||
|
- `blade_transport_vehicle.sql` 建表加 `use_department varchar(50)`。
|
||||||
|
- `TransportVehicleExcel.java` 加 `使用部门` 列。
|
||||||
|
- `TransportVehicleMapper.xml` resultMap + BaseColumn + QueryCondition(useDepartment LIKE) 各加。
|
||||||
|
- `TransportVehicleServiceImpl.prepare()` trim useDepartment;validate() 加长度≤50 校验。
|
||||||
|
- 新增增量迁移 `doc/sql/transport/blade_transport_vehicle_use_department_patch_20260909.sql`(ALTER ADD use_department AFTER organization_name)。
|
||||||
|
- 注意:VO 继承 entity 无需改;Wrapper BeanUtil 同名透传。已上线库须执行 patch SQL(建表脚本是 DROP+CREATE,勿直接跑)。
|
||||||
|
- 后续补充(vehicle.vue「车辆资质图片」区输入框对齐):第一行原 span `6/8/10` 不等宽(行驶证档案编号 6 / 行驶证有效期 8 / 道路运输证号 10)导致输入框宽度不齐,统一改为 `8/8/8`,与下方各行 span=8 一致。仅改 2 处 span,无逻辑改动。
|
||||||
|
|
||||||
|
## 车辆车牌号:改为单一 input 输入框(vehicle.vue,3 段 → 1 段)
|
||||||
|
- 需求:基础车辆信息区「车牌号」原本是「省简称 select + 号码 input + 车牌颜色 select」三段拼装(plateProvince/plateNoBody/plateColor),改为**单个 el-input** 直接输入完整车牌号(如 京A12345)。
|
||||||
|
- 改动(vehicle.vue):
|
||||||
|
1. 模板:`plate-group` 三段 → `<el-input v-model="vehicleForm.plateNo" maxlength="8" show-word-limit placeholder="如:京A12345" @input="handlePlateNoInput" @blur="validatePlateFormat">`。删除 `.plate-group` 样式(含 focus-within、竖线分隔、child flex 占比等整段)。
|
||||||
|
2. emptyForm:删 `plateProvince`、`plateNoBody`,保留 `plateNo`、`plateColor`(后端字段继续存历史车牌颜色)。
|
||||||
|
3. data:删 `plateProvinceOptions`、`plateColorOptions` 暴露;常量 `plateProvinceOptions`(31 省简称数组)整段删除;`plateColorOptions` 常量删除。
|
||||||
|
4. validatePlateNo 重写:直接校验 `value`(完整车牌号),正则 `/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼港澳]{1}[A-Z][A-Z0-9挂学警港澳]{5,6}$/`,错误提示改为「请输入标准车牌号(如:京A12345)」。
|
||||||
|
5. syncPlateNo / splitPlateNo 重写:splitPlateNo 改为 noop(保留以兼容 OCR 后回调链路);syncPlateNo 改为 trim+upperCase 单一字段。
|
||||||
|
6. handlePlateBodyInput 改名为 handlePlateNoInput,新增 validatePlateFormat 失焦校验。
|
||||||
|
7. 车辆认证审核弹窗只读详情同步删「车牌颜色」展示(与录入表单一致)。
|
||||||
|
- 后端不动:`plate_no` / `plate_color` 字段保留(数据库兼容历史车牌颜色),Service 无强制校验。
|
||||||
|
- 受影响:OCR 自动识别(行驶证/机动车销售统一发票)后续调用链路无需改,因 syncPlateNo 仍对 plateNo 做归一化。
|
||||||
|
|
||||||
|
## 车辆新增/编辑弹窗:输入框宽度统一(vehicle.vue,前后两区)
|
||||||
|
- 需求(transportCapacity/vehicle):新增/编辑弹窗「基础车辆信息」+「车辆资质图片」两个 section 各输入框宽度要一致;截图红框重点为车牌号、外廓尺寸、所有组织/使用部门。
|
||||||
|
- 根因:基础区原本列宽混乱(车牌号 span10 / 车辆类型 span6 / 外廓尺寸 span6,其余 span6),行内 3 列与 2 列混排;图片区文本字段全 span6,与基础区不一致。
|
||||||
|
- 改动(vehicle.vue 仅模板 el-col span):
|
||||||
|
1. 「基础车辆信息」区所有字段统一为 **span=8(3 列布局)**:车牌号、车辆类型、外廓尺寸、核定载质量、准牵引总质量、业务关系、能源类型、强制报废日期、海关备案号、所有组织、使用部门。
|
||||||
|
2. 「车辆资质图片」区文本/日期字段(行驶证档案编号、行驶证有效期、道路运输证号、道路运输证有效期、道路运输年审有效期、机动车登记编号、机动车登记日期)统一为 **span=8**。
|
||||||
|
- 不改:只读「车辆认证审核」弹窗(L140 起的 span6 只读详情 + large 图片上传)与新增弹窗内「证件图片」上传控件(固定尺寸)保持 span6。外廓尺寸为复合控件(长/宽/高三 input),口径同 span8。
|
||||||
|
- ⚠️ 注意:操作中曾误删核定载质量 el-col 标签(453-460 行开始时少 el-col、尾部多一个 `</el-col>`),已修复为完整 `<el-col :span="8">...`。
|
||||||
|
- 后续纠偏(2026-09-09 傍晚):主人反馈「为什么不是按4列显示」——上一步把"基础车辆信息/车辆资质图片"两区误改成 3 列(span8)。同项目惯例 driver.vue/customer-archive.vue 全为 **4 列(span6,仅复合长字段 span12)**,故统一重排为 4 列:
|
||||||
|
- 基础车辆信息:`车牌号(6)+车辆类型(6)+外廓尺寸(12)` → `核定载质量/准牵引总质量/业务关系/能源类型(4×6)` → `强制报废日期/海关备案号/所有组织/使用部门(4×6)`
|
||||||
|
- 车辆资质图片:`行驶证有效期/道路运输证号/道路运输证有效期/道路运输年审有效期(4×6)` → `机动车登记编号/机动车登记日期/行驶证档案编号(3×6)`,图片上传控件仍 span6
|
||||||
|
- 该区 span8 已全部移除,编辑表单区仅剩外廓尺寸 span12(复合控件长/宽/高)+ 图片上传 span6。
|
||||||
|
- 宽度微调(2026-09-09 傍晚2):主人圈出「所有组织」字段宽度与同行不一致。根因:`.vehicle-form` 里的 `:deep(...){width:100%}` 选择器只列了 `el-select / el-input / el-input-number / el-date-editor`,**漏了 `el-cascader`**(所有组织用的就是级联选择器,默认不撑满整列)。已补 `:deep(.el-cascader)` 进该规则,全表单仅此一处用到 el-cascader,故所有组织与同行等宽。
|
||||||
|
|
||||||
|
## 司机弹窗:补 placeholder + 每行统一 3 列(transportCapacity/driver.vue)
|
||||||
|
- 需求:新增/编辑司机弹窗 ①输入框无提示文案;②基础身份信息 3 列,其它 4 列 / 6 列行不统一。
|
||||||
|
- 改动(仅 1819 行 driver.vue 的 126-540 行 `<driver-dialog>` 模板,script/style 不动):
|
||||||
|
1. **基础身份信息**:行结构不动,7 个 el-form-item 控件补 placeholder(司机姓名/身份证号/出生年月/性别/民族/学历/详细地址)。住址已有「请选择省市区」、驾驶车辆已有「请输入或选择车辆」,不动。
|
||||||
|
2. **驾驶证信息**:第一行 4 列(:span=6)拆为两行 — 行 1(准驾车型 / 档案编号 / 有效期 date-range,:span=8)+ 行 2(长期有效,:span=8)。起/止 placeholder 保留简短「起」「止」,符合主人 1.B 偏好(保留原 date-range 二联结构,不改 daterange)。
|
||||||
|
3. **从业资格证信息**:第一行 4 列拆为两行 — 行 1(从业资格认证类型 / 资格证号 / 有效期,:span=8)+ 行 2(长期有效,:span=8)。资格证号 placeholder 保留「默认身份证号」不动。
|
||||||
|
4. **司机联系信息**:一行 6 列拆为两行 — 行 1(司机类型 / 手机号 / 紧急联系人姓名,:span=8)+ 行 2(紧急联系人手机号 / 与联系人关系 / 所属组织,:span=8)。所属组织已有 placeholder,不动。
|
||||||
|
- 决策点(主人确认):1.B(保留原 date-range 二联 + 第三列留空后拆行的方案);2 保留;3.A(驾驶证主页/副页、封面页/内容页两组上传图仍 :span=12,与占整行宽的原貌一致)。
|
||||||
|
- 校验:node 脚本统计 4 个 section-card / 13 个 el-row / 31 个 el-col / 24 个 el-form-item,全平衡。改动只在 driver.vue 一文件,~25 处 Edit 调用。
|
||||||
|
|
||||||
|
## 新增/修改司机弹窗改为 4 列布局(driver.vue,16:xx)
|
||||||
|
- 主人要求 /transportCapacity/driver 新增司机弹窗改 4 列显示。原文件各分组已是 span=6(4 列栅格)但每行只放 3 个字段,第 4 列空置。
|
||||||
|
- 重排结果(仅删行断 + 移动字段顺序,字段/校验/逻辑零改动):
|
||||||
|
1. 基础身份信息:行1 司机姓名/身份证号/出生年月/性别;行2 民族/学历/住址/详细地址;行3 驾驶车辆/岗位;行4 三张证件照(不变)。
|
||||||
|
2. 驾驶证信息:行1 准驾车型/档案编号/有效期/长期有效;上传主页/副页 span 12→6。
|
||||||
|
3. 从业资格证信息:行1 类型/资格证号/有效期/长期有效;上传封面页/内容页 span 12→6。
|
||||||
|
4. 司机联系信息:行1 司机类型/手机号/紧急联系人姓名/紧急联系人手机号;行2 与联系人关系/所属组织。
|
||||||
|
- 注意:此前日志记录的「3 列 span=8」方案已被后续改动覆盖为 span=6,本次以当前文件实际状态为准。
|
||||||
|
|
||||||
|
## 客商档案:客商类型→客商分类 + 新增客商类型(customer-archive.vue)
|
||||||
|
- ⚠️ 补救(17:34):data 里的 `customerKindOptions`/`customerKindMap` 定义一度丢失(模板 v-for 空 → 下拉显示「无数据」,主人截图反馈),已补回 data(customerTypeOptions 之后)。其余 8 处改动经 grep 确认完好。
|
||||||
|
- 需求:原「客商类型」(prop `customerType`,字典 customer_type:客户/承运商,多选)改名「客商分类」;另新增「客商类型」字段,取值为 外部客商 / 内部组织。
|
||||||
|
- 约定:prop `customerType` 不动(其它页面 loading-manage / dept / business-crud-page 都以 `customerType:'承运商'` 作为后端查询参数),只改中文标签。
|
||||||
|
- 新增字段 prop = **`customerKind`**(前端自定义命名,后端尚无对应字段,需后端在客商表加列并透传),值 `external`(外部客商) / `internal`(内部组织),单选下拉,默认 `external`。
|
||||||
|
- 改动点(8 处,全在 `src/views/vehicle/customer-archive.vue`):
|
||||||
|
1. 表单:227 行 label 改「客商分类」;其后新增一个 `el-col :span="6"` 表单项「客商类型」prop `customerKind`(el-select + `customerKindOptions`)。
|
||||||
|
2. data 新增 `customerKindOptions` / `customerKindMap`(external/internal ↔ 中文)。
|
||||||
|
3. formRules:`customerType` 提示文案改「请选择客商分类」。
|
||||||
|
4. 列表列:「客户类型」label 改「客商分类」;新增「客商类型」列(prop customerKind,type select,dicData 内外部,minWidth 120,**未加 search**)。
|
||||||
|
5. `emptyArchive()` 加 `customerKind: 'external'`。
|
||||||
|
6. `normalizeDetail()` 加 `customerKind: detail.customerKind || 'external'`。
|
||||||
|
7. 变更记录 `getChangeFieldLabel`:`customerType:'客商分类'`,新增 `customerKind:'客商类型'`。
|
||||||
|
8. `formatChangeFieldValue`:别名映射加 `客商分类/客户类型 → customerType`、`客商类型 → customerKind`;valueMap 加 `customerKind:{external:'外部客商',internal:'内部组织'}`。
|
||||||
|
- 校验:用 @vue/compiler-sfc 编译模板,0 错误。
|
||||||
|
|
||||||
|
## 上传证件项 label 贴顶修复(全局 archive-form 垂直居中提升)
|
||||||
|
- 症状:driver.vue 司机弹窗「驾驶证主页/副页」「封面页/内容页」等证件上传项(el-form-item 内容高 151px)label 文字贴顶,普通 32px 控件行看不出来。
|
||||||
|
- 根因:`archive-form` class 被 driver / vehicle / ship / credit-score-quantification / loading-manage / waybill-import-dialog 等 8+ 页面复用,但「label 与控件垂直居中」规则 `.archive-form :deep(.el-form-item){align-items:center}` 锁在 customer-archive.vue 的 scoped 样式里,其它页面拿不到;flex 容器默认 stretch,label(32px) 在高控件行内贴顶。
|
||||||
|
- 修复:规则提升到 `src/styles/element-ui.scss` 全局(紧跟 is-required 星号配套规则之后):`.archive-form .el-form-item { align-items:center }`。全站 archive-form 表单一并生效,label 与控件垂直居中。SCSS 编译通过。
|
||||||
|
|
||||||
|
## 司机弹窗「驾驶证信息」:有效期必填、长期有效不必填(transportCapacity/driver.vue)
|
||||||
|
- 需求:驾驶证信息区「有效期」(起/止,prop `drivingLicenseEndDate`)要必填(显示红*),「长期有效」复选框(prop `drivingLicenseLongTerm`)不必填(去掉红*)。
|
||||||
|
- 改动(formRules 两处):
|
||||||
|
1. `drivingLicenseEndDate` 规则加 `required: true`(`{ required: true, validator: this.validateDrivingLicenseEndDate, trigger: 'change' }`)——仅用于渲染红*,实际校验仍走自定义 validator。
|
||||||
|
2. 删除 `drivingLicenseLongTerm` 的 `{ required: true, message: '请选择驾驶证是否长期有效' }` 规则块。
|
||||||
|
- 关键机制(Element Plus 2.14 + async-validator 4.2.5 已核实):
|
||||||
|
- 红* 由 `form-item` 的 `isRequired = normalizedRules.some(rule => rule.required)` 决定,只要规则对象带 `required` 就显示。
|
||||||
|
- async-validator 的 `rule.validate` 中,若存在 `rule.validator`,直接走自定义 validator 并 return,**不会**再执行 required 空值检查 → 勾「长期有效」时止日被清空/disabled 也不会误报必填。
|
||||||
|
- 校验逻辑保持原样:起始日期恒必填;`longTerm !== 1` 时止日必填。
|
||||||
|
- 未同步:「从业资格证信息」区仍是「有效期无红* + 长期有效有红*」的旧形态(待主人确认是否一并统一)。
|
||||||
|
|
||||||
|
## 司机弹窗 placeholder 统一为「请输入/请选择」(transportCapacity/driver.vue)
|
||||||
|
- 需求:新增/修改司机弹窗输入框 placeholder 去掉后面的字段名称,只保留「请输入」「请选择」。
|
||||||
|
- 改动:18 处 placeholder 简化(7 处 → `请输入`,10 处 → `请选择`,1 处动态 cascader `driverForm.addressRegion || '请选择省市区'` → `|| '请选择'`)。
|
||||||
|
- **保留 4 处**(主人明确确认):
|
||||||
|
1. 驾驶车辆 `请输入或选择车辆` —— 复合操作(既可输入又可点按钮选车),去掉会丢语义。
|
||||||
|
2. 日期范围 `起` / `止` —— 起止标记,非字段提示。
|
||||||
|
3. 资格证号 `默认身份证号` —— 默认值说明,非「请输入」格式。
|
||||||
|
- 未动:表单**校验错误提示 message 仍带字段名**(如「请选择准驾车型」),因报错需指明具体字段,与 placeholder 定位不同;主人未要求,暂保持。
|
||||||
|
- 做法:Python 脚本按完整 placeholder 字符串精确替换(18 规则全命中,未匹配即 exit 1 中断),比逐个 Edit 高效且不会误伤。
|
||||||
|
- 校验:`@vue/compiler-sfc` parse + compileTemplate + compileScript 三项全通过。注意脚本必须放在**项目根目录**下运行(放 /tmp 解析不到 node_modules 里的 @vue/compiler-sfc)。
|
||||||
|
- ⚠️ git diff 显示的 `drivingLicenseLongTerm` 校验规则变动是**本次之前工作区已有的未提交改动**(见上一条日志),非本次引入,勿混淆。
|
||||||
|
|
||||||
|
## 「自动生成结算单」开关加 ? 悬浮提示(3 处)
|
||||||
|
- 需求:开关「开启」后面加问号图标,hover 提示「开启时,系统根据配置规则归集运单,定时生成结算单」。
|
||||||
|
- 改动文件(同一文案,为保持全站一致):
|
||||||
|
1. `src/views/business/components/business-crud-page.vue`(1884 行附近,`.business-crud-page__settlement-switch`)
|
||||||
|
2. `src/views/business/contract-manage.vue`(357 行附近,`.contract-manage-form__settlement-switch`)
|
||||||
|
3. `src/views/business/contract-manage-change.vue`(55 行,`.settlement-switch`,原为单行长标签已拆行)
|
||||||
|
- 写法:`<el-radio :label="1">开启</el-radio>` 后插 `<el-tooltip content="..." placement="top"><el-icon class="settlement-switch-tip"><QuestionFilled /></el-icon></el-tooltip>`,再接「关闭」radio。
|
||||||
|
- 样式:`.settlement-switch-tip { margin:0 4px; color:#a8abb2; cursor:help; font-size:14px }`,各文件 scoped 样式内一份(contract-manage 写在 `&__settlement-switch` 内)。
|
||||||
|
- 注意:图标走 main.js 全局注册(@element-plus/icons-vue 全量注册),无需 import;写法与 `project-apply.vue` 的 `__label-tip` 一致。
|
||||||
|
- 这三个大文件本身已存在 prettier 格式问题(改动前 git HEAD 版本同样 fail),非本次引入。
|
||||||
|
|
||||||
|
## 车辆认证审核弹窗排版对齐新增弹窗(vehicle.vue)
|
||||||
|
- 诊断 `/project-apply/fund-risk-stats` No endpoint:前端已定义 getFundRiskStats(api/business/project-apply.js:13),后端未实现;方案已给(后端补 R<{high,medium}> / 前端 catch 降级),待主人选。
|
||||||
|
- vehicle.vue 认证审核弹窗重排对齐新增弹窗:取消独立「尺寸重量」卡片,外廓尺寸改长/宽/高组合(span12,dimension-group);基础信息 3 行×4 列(车牌号/车辆类型/外廓尺寸;载质量/牵引质量/业务关系/能源类型;强制报废日期/海关备案号/所有组织/使用部门);证件信息按新增「车辆资质图片」行分布(止+运输证号+止+年审 / 登记编号+登记日期+档案编号+行驶证起 / 运输证起 / 备注整行);label「所属组织」改「所有组织」对齐新增;dimension-group 样式复制进 .certification-audit 作用域。@vue/compiler-sfc 编译校验通过。
|
||||||
|
- vehicle.vue 行驶证有效期必填星号:原规则是纯 validator(Element Plus 不渲染星号),改为 data 内 baseRules + computed formRules,drivingLicenseEndDate 动态返回 required 规则(长期有效=1 时返回 [],星号与校验同步消失);删除 validateDrivingLicenseEndDate。经验:Element Plus 星号只在规则含 required:true 时渲染,且 el-form-item 的 :required 属性会被注入为 {required} 规则并产生英文默认提示,不宜用它控制星号。
|
||||||
|
- 备注:车辆保存的「车牌颜色不能为空」「行驶证有效期:必填」均为后端校验(前端无对应规则),需后端改。
|
||||||
|
- driver.vue 从业资格证有效期对齐驾驶证:单日期改 date-range 起/止(列宽 6+6+6+6 → 6+6+8+4),新增 qualificationStartDate 字段(emptyForm + handleSubmit normalize);qualificationEndDate 规则加 required:true(渲染星号,validator 豁免长期);删除 qualificationLongTerm 的 required 规则(长期有效不必填);勾长期后起止均 disabled(比驾驶证更严,驾驶证起仍可编辑)。⚠️ 后端需新增 qualification_start_date 字段否则起日期无法存取。
|
||||||
|
- driver.vue 补充:驾驶证「有效期起」加 :disabled(长期=1 时禁用);驾驶证与从业资格证两个 validator 统一在「长期有效=1」时直接 callback() 放行(起止都不校验、不提示)。禁用不清空旧值,提交时保留原日期(后端以 longTerm 为准)。
|
||||||
|
- contract-manage-change.vue「合同文件」批量下载按钮上移:标题与按钮合并进 .section-head(flex space-between 同排),与「其它附件/计费信息」分区一致;删除无引用的 .attachment-head 样式。
|
||||||
|
- contract-manage-change.vue「自动生成结算单」问号提示图标位置:原 icon 夹在开启/关闭 radio 之间,因 .el-radio 默认 margin-right:32px 导致离开启远、贴关闭;修复 = 开启 radio margin-right 清零 + icon margin 改 0 32px 0 8px。
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# 2026-09-10
|
||||||
|
|
||||||
|
- 移除 project-apply 的 fund-risk-stats 请求(后端未实现端点,每次列表加载都弹 No endpoint 报错):删除 onLoad 内 refreshFundRiskStats 调用与该方法、data 中 fundRiskStats;头部风险标签去掉「(数量)」只留「高风险/中风险」;api/business/project-apply.js 保留 getFundRiskStats 定义并注释「后端就绪后恢复」。
|
||||||
|
EOF2
|
||||||
|
}
|
||||||
|
cat >> /Users/gxwebsoft/VUE/tms-erp-web-ws/.workbuddy/memory/2026-09-10.md <<'EOF'
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# 2026-09-11
|
||||||
|
|
||||||
|
## 上传证件区域固定宽度导致跨机器错位(transportCapacity)
|
||||||
|
- 现象:driver.vue 新增弹窗的身份证/大头照上传框在本机对齐,他人电脑不对齐。
|
||||||
|
- 根因:`--large` 上传框写死 `width:240px`(ship 写 248px),而弹窗 `width:90%` + `el-col :span=6` 列宽是弹性的、上方输入框 `width:100%`;列宽随分辨率 / Windows 系统缩放 / 浏览器缩放变化,240px 只在特定宽度下恰好等于列宽。叠加 `labelWidth:auto` 靠 JS 实测字体(苹方 vs 微软雅黑)宽度,label 列宽也不同 → 起始位置漂移。
|
||||||
|
- 修复:三个文件改为 `width:100%; max-width:240px; flex:none`(ship 保留 248px 上限),窄屏跟随列宽、宽屏保持比例上限,左边缘恒与输入框对齐。
|
||||||
|
- `src/views/transportCapacity/driver.vue`(.driver-uploader--large)
|
||||||
|
- `src/views/transportCapacity/vehicle.vue`(.vehicle-uploader--large)
|
||||||
|
- `src/views/transportCapacity/ship.vue`(.ship-uploader--large)
|
||||||
|
- 用 @vue/compiler-sfc(脚本放项目根目录)验证三个 SFC 编译通过。
|
||||||
|
- 教训:本项目所有「固定 px 宽度的上传/控件」都要配 `max-width` + `width:100%`,否则高分屏/低分屏下必然错位。
|
||||||
|
|
||||||
|
## 合同详情由弹窗改为独立页面(contract-manage)
|
||||||
|
- 路由:新增 `/business/contract-manage/detail`(`src/router/views/index.js`,name『合同详情』,meta `keepAlive:false` + `activeMenu:'/business/contract-manage'`),组件仍复用 `contract-manage.vue`(与 form 页同一套路)。
|
||||||
|
- 页面内三分支:`v-if="!isFormPage && !isDetailPage"`(列表)/ `v-else-if="isFormPage"`(表单)/ `v-else`(详情)。**v-else 必须紧邻 form 分支的 `</template>`**,中间不能插其它组件,否则 Vue 编译报「v-else 无相邻 v-if」——弹窗类组件(billing-plan-editor / 附件预览 / 变更记录详情 / 流程)放在三个分支之后。
|
||||||
|
- 关键改动:`openDetail` 改 `router.push({ path:'/business/contract-manage/detail', query:{ id, name } })`;新增 `initDetailPage()`(按 query.id 拉详情,`resetDetailState()` 先清空)、`closeDetailPage()`(closeTag + 回列表)、`isDetailPage` / `detailPageTitle` computed;`created` 与 `$route.fullPath` watch 都要加 `else if (this.isDetailPage)`。
|
||||||
|
- 样式:`.contract-manage-detail--page { max-height:none; overflow:visible }`,去掉弹窗的 74vh 限制;底栏复用 `.contract-manage-page__footer`(fixed 浮动),只读详情页按钮保留「关闭」。
|
||||||
|
- 校验方式:dev server 已运行时 `curl "http://localhost:2889/src/views/business/contract-manage.vue"` 返回 200 即 Vite 编译通过(比整包 build 快)。
|
||||||
|
|
||||||
|
## 只给「查看弹窗」加宽 label(temporary-credit-limit)
|
||||||
|
- 场景:详情页长 label(「剩余项目资金使用额度(万元)」)换行超 2 行撑坏详情表格,但又不能影响新增/编辑页。
|
||||||
|
- **关键发现:Avue 的 `avue-form` 在 detail 模式下根节点会挂 `.avue--detail` 类**(源码 `node_modules/@smallwei/avue/lib/packages/element-plus/form/index3.js` 中 `class: normalizeClass([b(), { 'avue--detail': isDetail }])`)。所以「只针对详情态」的选择器就是:
|
||||||
|
```scss
|
||||||
|
.temporary-credit-limit-dialog .avue--detail .el-form-item__label { width:210px !important; flex:0 0 210px !important; }
|
||||||
|
```
|
||||||
|
新增/编辑弹窗无 `.avue--detail`,天然不受影响,不需要在 option 里做 mode 判断。
|
||||||
|
- 校验样式块编译:dev server 请求 `?vue&type=style&index=1&lang.scss`(**lang 必须写 scss,写 css 会 500**),grep 规则确认产物。
|
||||||
|
- 结论备忘:长 label 优先「加宽 + 换行 ≤2 行」,不要用单行省略 + tooltip —— 详情是纯阅读场景,hover 才能看全字段名的可发现性差。
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
# 2026-09-17 工作日志
|
||||||
|
|
||||||
|
## 配载管理(loading-manage):弹窗全部改为独立表单页/详情页
|
||||||
|
|
||||||
|
- 需求:`/business/loading-manage` 不再用弹窗,改成与新增合同(`/business/contract-manage/form?mode=add&name=新增合同管理`)一致的独立页面。
|
||||||
|
- 现状:新增/编辑**已经**是独立页(组件内 `isStandaloneFormPage` + `/business/loading-manage/form` 路由),但「详情」和「重新派单」仍是 el-dialog(用户截图即详情弹窗)。
|
||||||
|
- 改动(3 个文件):
|
||||||
|
1. `src/router/views/index.js`:新增 `/business/loading-manage/detail`(name 配载单详情,`meta.keepAlive:false, activeMenu:'/business/loading-manage'`),组件仍是 `loading-manage.vue`。
|
||||||
|
2. `src/views/business/loading-manage.vue`:
|
||||||
|
- computed 新增 `isStandaloneDetailPage`(path==='/business/loading-manage/detail')、`isStandalonePage`(form|detail 并集,作为隐藏列表容器的统一开关)、`detailPageTitle`、`formPageDefaultTitle`(add/edit/reassign 映射);`isStandaloneFormPage` 放行 `mode=reassign`。
|
||||||
|
- 模板中所有控制「是否独立页/是否弹窗」的 `isStandaloneFormPage` 改为 `isStandalonePage`;顶部标题按详情/表单取 `detailPageTitle`/`formPageTitle`。
|
||||||
|
- 新增 `gotoLoadingDetail(row)`(push `/detail?id=&name=配载单详情`,替换「配载单号」链接与操作列「详情」)、`gotoLoadingReassign(row)`(push `/form?mode=reassign&id=&name=重新派单`)、`initStandaloneDetailPage()`;`initStandaloneFormPage` 模式透传 edit/reassign;`openLoadingDialog` 对 add/edit/reassign 一律转独立页;`closeLoadingDialog` 判据改 `isStandalonePage`。
|
||||||
|
- `mounted` / `watch $route` 增加详情页分支(直接打开与页内切换都要 init);detail 分支除 id 变化外,`dialogMode !== 'view'` 也重新 init(防止从表单页切详情时残留表单态)。
|
||||||
|
- 兼容旧链接:`/business/loading-manage?detailId=x` 仍可用,会 replace 到详情页。
|
||||||
|
- 样式:底栏去掉写死的 `gap:8px`(全站统一 12px);页面模式的内容区解除 `max-height:78vh` 内嵌滚动盒 —— 原 `:global(.loading-manage-form-page .loading-manage-dialog__body)` 权重 (0,2,0) 低于 scoped 规则 (0,3,0) 一直没生效,改为 `.loading-manage-page .loading-manage-form-dialog.loading-manage-form-page .loading-manage-dialog__body` (0,4,0),内容改随 `#avue-view` 自然滚动(与合同页一致)。
|
||||||
|
3. `src/views/business/components/waybill-manage-page.vue`:`openLoadingDetail` 由 `/business/loading-manage?detailId=` 改为 push `/business/loading-manage/detail?id=&name=配载单详情`。
|
||||||
|
- 校验:dev server(2889)单独编译 4 个模块均 HTTP 200(含 scoped scss);`vite build` 仍会在无关文件 `src/page/login/facelogin.vue` 被沙箱敏感内容保护中断。
|
||||||
|
- 踩坑:**`<style scoped lang="scss">` 顶层写 `//` 注释**会让该样式模块编译 500(`Unexpected '/'. Escaping special characters with \ may help.`),已实测确认;顶层必须用 `/* */`。
|
||||||
|
- 未做:登录态无法在浏览器实测(无测试账号),需用户点 `/business/loading-manage` → 详情/重新派单 自测;`voucher-manage-detail` 跳配载时带的 `?loadingNo=` 参数本来就未被列表消费(历史遗留)。
|
||||||
|
|
||||||
|
## 运单管理详情:打卡时间轴改为按打卡顺序展示
|
||||||
|
|
||||||
|
- 文件:`src/views/business/components/waybill-manage-page.vue`(详情页「执行详情 → 打卡详情」tab)
|
||||||
|
- 需求:时间轴不再固定按流程节点顺序(发货/在途/到货/卸货/签收/回单),改为按打卡时间先后展示。
|
||||||
|
- 实现(不改后端、不改原始数据):
|
||||||
|
1. 新增 computed `orderedWaybillPunchRecords`:映射出 `punchedAt`(毫秒时间戳)后排序 —— **已打卡记录按打卡时间升序排在前**,未打卡记录保持后端返回的节点顺序排在其后;时间相同用原索引稳定排序。
|
||||||
|
2. 新增 method `waybillPunchRecordTimestamp(record)`:`punched === false` 或 `statusName === '未打卡'` 直接返回 null(防止后端返回计划时间造成误序);优先 `this.$dayjs(text).valueOf()`,失败兜底 `new Date(text.replace(/-/g,'/'))`(兼容 Safari)。
|
||||||
|
3. 模板 `el-timeline` 的 `v-for` 改用 `orderedWaybillPunchRecords`;`key` 由 `record.nodeCode || record.id || index` 改为 `${nodeCode||id||'punch'}-${index}`,避免同节点多次打卡(在途)时 key 重复。
|
||||||
|
- 校验:项目根目录临时脚本 `_verify-sfc.mjs`(@vue/compiler-sfc parse + compileScript + compileTemplate)通过,已删除脚本。
|
||||||
|
- 注意:`getPunchRecords`(`src/api/business/waybill-manage.js` → `/punch-records`)后端未提供节点排序字段,排序只能在前端做。
|
||||||
|
|
||||||
|
## 保险记录批量导入:前端归一化日期格式
|
||||||
|
|
||||||
|
- 文件:`src/views/vehicle/insurance-record.vue`(仅此一个文件)
|
||||||
|
- 背景:保险记录批量导入是**后端驱动**——前端 `handleImport` 经 `importBlob` 把原始 Excel 直接 POST 到 `/blade-transport/insurance-record/import-insurance-record`,前端不解析行。后端只认 `2026-09-01`,`2026-9-1` 导入失败。
|
||||||
|
- 决策:用户选择**前端归一化**(不动后端)。把 `openImportDialog` 改为自写 `httpRequest`:用 `xlsx` 读取 Excel → 把日期列(开始日期/结束日期/开票日期)`2026-9-1` 归一为 `2026-09-01` → 重写成新 File 再交给 `handleImportExcel` 上传;复用其失败明细下载与成功刷新逻辑。无日期列时回退为原文件(行为不变)。
|
||||||
|
- 关键方法:`normalizeExcelDates` / `readExcelRows` / `writeExcelFile` / `normalizeDateString`(正则 `^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$`,用 `new Date` 校验合法性后补零;非法/已标准格式返回 null 保持原值)。
|
||||||
|
- 校验:本机 dev(localhost:2889)待用户部署自测。注意所有单元格经 `sheet_to_json(raw:false)` 后均为字符串,与 transport-plan-import 的客户端解析模式一致。
|
||||||
|
|
||||||
|
## 车/船务模块导出 xlsx「创建时间/更新时间」为空(后端 tms-api 修复)
|
||||||
|
|
||||||
|
- 现象:`/vehicle/insurance-record` 批量导出的 xlsx 里「创建时间」「更新时间」两列空白,「更新人」有值。用户要求车/船务模块所有页面统一修。
|
||||||
|
- 定位:导出由**后端**生成(前端只传查询参数,`exportColumns` 参数后端未使用)。实测 `~/Downloads/保险记录2026-09-17 20_46_08.xlsx`:K/M 列单元格无 `<v>` 节点(值 null),E/F/J 日期列是数值 46266.0(带 numFmt `yyyy-MM-dd`,WPS 显示为日期)。
|
||||||
|
- 根因:Service 用 BladeX `org.springblade.core.tool.utils.BeanUtil`(**继承 Spring `BeanUtils`**)做 `copyProperties`。实体 `TenantEntity.createTime/updateTime` 是 `java.util.Date`,导出类字段是 `java.time.LocalDateTime` → Spring BeanUtils **类型不兼容静默跳过**,值为 null。而「更新人」是手动 `UserCache.getUserRealName(...)` 赋值的,所以有值。(Hutool 的 BeanUtil 能转 Date→LocalDateTime,但本项目用的是 BladeX 版本,不能。)
|
||||||
|
- 佐证:项目里正常的导出(Waybill / LoadingManage / CustomerArchive / CommonCargo)时间字段一律用 `java.util.Date`,并在 Service 里手动 `excel.setCreateTime(record.getCreateTime())`。
|
||||||
|
- 修复(后端仓库 `/Users/gxwebsoft/JAVA/tms-api`,blade-transport 模块):在 13 个导出方法里补显式赋值(Date→LocalDateTime 用 BladeX `DateUtil.fromDate`,`Func.isEmpty` 判空),不改 Excel 类字段类型(避免影响自定义 converter 与导入模板)。
|
||||||
|
```java
|
||||||
|
excel.setCreateTime(Func.isEmpty(x.getCreateTime()) ? null : DateUtil.fromDate(x.getCreateTime()));
|
||||||
|
excel.setUpdateTime(Func.isEmpty(x.getUpdateTime()) ? null : DateUtil.fromDate(x.getUpdateTime()));
|
||||||
|
```
|
||||||
|
- 涉及文件(13 个 Service + 1 新建 Excel 类 + 设备台账 controller/接口):InsuranceRecord / ViolationRecord / MaintenanceRecord / MaintenancePlan / TireReplacementRecord / AccidentRecord / AnnualInspectionRecord / MileageRecord / TransportChangeRecord / EtcRecord / OilElectricRecord / OtherExpenseRecord / EquipmentLedger。
|
||||||
|
- 设备台账特殊:原 `EquipmentLedgerExcel` 根本没有审计列(前端列表有),新建 `EquipmentLedgerExportExcel extends EquipmentLedgerExcel`(创建时间/更新人/更新时间),导出链路改用新类,**导入模板仍用旧类不受影响**。
|
||||||
|
- 未验证:本机无 mvn(仅 IDEA 内置),且离线模式缺 `blade-bom` 无法编译;用 javap 确认 `DateUtil.fromDate(Date)` 存在 + 逐行 grep 复核代替。需用户在 IDEA 里编译并重新部署后自测。
|
||||||
|
- 同类隐患(本次未改,其他模块):TemporaryCreditLimit、ProcessConfig、CommonRoute、CommonAddress、ContractManage、ProjectApply、ShippingTemplate 的导出 Excel 也是 LocalDateTime 且未手动 set 时间。
|
||||||
|
|
||||||
|
## 保险记录保额 -1 问题排查(未结案,待用户验证 DB 环境)
|
||||||
|
|
||||||
|
- 症状:新增弹窗保额不填 → 再开编辑弹窗显示 -1,触发「不能小于 0」校验。
|
||||||
|
- 已排除:前端(源码/dist 构建/git 全历史)、后端 tms-api + tms-erp-api-ws(源码/编译产物 javap/git 历史)均无任何 -1 赋值逻辑;保额为 formslot el-input,空值传 ''。
|
||||||
|
- 关键链路:编辑弹窗 beforeOpen 走 `/detail` 接口(getOne 原生查询),**不经过**列表 SQL 的 `CASE WHEN insured_amount<0 THEN 0` 兜底——所以表格显示 0、弹窗显示原始值。
|
||||||
|
- 数据库截图(用户 Navicat):该行 insured_amount=NULL,全表无负数 → 说明用户浏览的库与后端实际连接的库**不是同一个/DDL 不一致**。系统存在「空数值=-1」惯例(MaintenanceRecordMapper 里程 `CASE WHEN mileage=-1 THEN NULL`;前端 waybill-manage.js/process-config.js 均有 `Number(v)===-1?'':v` 掩码)→ 后端真实库的 insured_amount 列默认值很可能是 -1,MP 插入排除 null 列 → 默认值 -1 入库。
|
||||||
|
- 待验证:在后端 Nacos 数据源指向的库执行 `SHOW CREATE TABLE blade_insurance_record` + `SELECT insured_amount FROM blade_insurance_record WHERE policy_no='11111' AND vehicle_no='沪AE31312'`。
|
||||||
|
- 修复方案(待确认):1) ALTER 列默认值改 NULL + UPDATE 存量负数为 NULL;2) 前端 beforeOpen 对 insuredAmount/premium 做 null/-1 → '' 归一(参照 waybill-manage normalizeNumericDisplayValue);3) 列表 SQL 的 CASE 兜底与 detail 不一致,可顺手统一。
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
# 2026-09-18
|
||||||
|
|
||||||
|
## 修复:改成独立整页后点左侧菜单仍弹出旧弹窗(loading-manage / project-apply)
|
||||||
|
|
||||||
|
**现象**:配载单管理、项目管理已改为「新增/编辑/详情走独立整页」,但从独立页返回或直接点左侧菜单时,页面上仍会盖出一个老的 `el-dialog`(新增项目管理 / 配载单)。
|
||||||
|
|
||||||
|
**根因**(已读 Vue runtime-core 源码确认):
|
||||||
|
- `src/router/tab.js` 按 `tabKey`(默认 fullPath)为每个标签建一个具名 wrapper 组件放进 `wrapperMap`,`src/page/index/layout.vue` 用 `<keep-alive :include="$store.getters.tagsKeep">` 缓存 —— 每个标签页一个实例,全部缓存不销毁。
|
||||||
|
- 组件被 deactivate 后**仍会随 `$route`(全局响应式)重新渲染**;此时 `isStandalonePage` 变 false,`<component :is="isStandalonePage ? 'div' : 'el-dialog'">` 由 div 翻回 `el-dialog`,而 `v-model`(`projectBox`/`dialogVisible`)仍是 true,`append-to-body` 使弹窗 Teleport 到 body。
|
||||||
|
- `KeepAlive.deactivate` 调 `move(vnode, storageContainer, ..., moveType=OUT)`,但 `TeleportImpl.move`(`moveTeleport`)忽略传入的 moveType、一律按 REORDER 处理 → **teleport 出去的 DOM 不会被搬回 storage container**,永久残留在 `document.body` 上并显示出来。
|
||||||
|
|
||||||
|
**修法**(不回退 tab.js 的 `return wrapper` 提交 c1c4fa1,改修根因):
|
||||||
|
- 独立页容器固定为 `<div v-if="isXxxPage">`,不再按路由回退成 `el-dialog`。
|
||||||
|
- 页内其它 `append-to-body` 二级弹窗加 `deactivated()` / `beforeUnmount()` → `closeInnerDialogs()` 把 v-model 置 false。
|
||||||
|
|
||||||
|
**改动文件**:
|
||||||
|
- `src/views/business/loading-manage.vue`:容器改 `<div v-if="isStandalonePage">`;删 `dialogVisible`、`dialogTitle`、`resetLoadingDialog`、`clearLoadingDialog`、页脚弹窗分支(含「清空」);`watch.$route` 简化;新增 `closeInnerDialogs()`(routeChange / commonAddress / candidateSearch)+ `deactivated`/`beforeUnmount`。
|
||||||
|
- `src/views/business/project-apply.vue`:容器改 `<div v-if="isProjectFormPage">`;删 `projectFormContainer`/`projectFormContainerProps`、`projectBox`、`resetProjectDialog`、`handleCancelProject`;`closeProjectForm` 简化为直接 push 列表;新增 `closeInnerDialogs()`(changeRecordDetail / 附件文档预览 / 图片预览 / 选人)+ `deactivated`/`beforeUnmount`。
|
||||||
|
|
||||||
|
**校验**:dev server(2889) curl 两个 .vue 及其 scoped style 模块,均 HTTP 200(500 才是编译失败)。`vite build` 因沙箱敏感内容保护会在 facelogin.vue 中断,未用。
|
||||||
|
|
||||||
|
**遗留同类风险(未改,已告知用户)**:`business/components/waybill-manage-page.vue`(`detailContainer` 在 PageDetail / el-dialog 间切)、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`(`pageMode ? 'div':'el-dialog'`)、`business/components/waybill-import-dialog.vue`(`standalone`/`createPage`)。统一修法:容器类型在 `created()` 锁定,不随路由/prop 翻转。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 追加修复:运单详情弹窗残留(waybill-manage-page.vue)
|
||||||
|
|
||||||
|
用户复现路径:打开 `/business/waybill-manage/detail?id=xxx` → 点「配载管理」菜单 → 页面上又冒出运单详情弹窗。与上面同一根因:`detailContainer()` 随 `isStandaloneWaybillDetailPage` 在 PageDetail / el-dialog 间翻转,`:append-to-body="!isStandaloneWaybillDetailPage"` 随之为 true,`v-model="detailBox"` 仍 true → Teleport 进 body 搬不回来。
|
||||||
|
|
||||||
|
**改动**(`src/views/business/components/waybill-manage-page.vue`):
|
||||||
|
- data 新增三个锁定标志 `formPageLocked` / `detailPageLocked` / `formModeLocked`,在 `created()` 一次性从 `isStandaloneWaybillFormPage` / `isStandaloneWaybillDetailPage` / `$route.query.mode` 取值。
|
||||||
|
- 模板里所有形态判定(根 class、`v-if="!detailPageLocked"` 的列表容器、`form-page-title`、`status`、独立表单页按钮块、分页 `v-show`、`:append-to-body`、detail-page class、内容 `v-if="detailBox || detailPageLocked"`、独立页 footer / 弹窗 footer slot)全部改读锁定标志。
|
||||||
|
- `detailContainer()` / `crudContainer()` / `pageFormOption()`(含 `boxType`)改读锁定标志,避免缓存实例的 option 变形。
|
||||||
|
- 新增 `closeInnerDialogs()`(关 detailBox、里程补录、附件文档/图片预览、变更路线、常用地址、流程图、运输路线/地址/站点/地图、常用货物、货物导入、过程配置、Excel 导入)+ `deactivated()` / `beforeUnmount()`。
|
||||||
|
|
||||||
|
**关键验证**:`onDeactivated` 在子组件里也会触发 —— apiLifecycle 的 `injectHook` 会向上遍历父链,发现 KeepAlive 父级就把钩子注入到根实例(runtime-core 的 `injectToKeepAliveRoot`),所以写在子组件 waybill-manage-page 上的 `deactivated` 有效。
|
||||||
|
|
||||||
|
**校验**:dev server curl 该 .vue 与 scoped style 均 200。仍未 commit。
|
||||||
|
|
||||||
|
**未提交**:上述改动 + 上一轮 loading-manage 独立页改造均未 commit。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 排查(未改码):配载单详情页反复弹「运单管理不存在」
|
||||||
|
|
||||||
|
用户截图:打开 `/business/loading-manage/detail?id=2097607162718441474&name=配载单详情`,连续弹出 6-7 条红色「运单管理不存在」,标签栏堆了一串「运单管理详情」。
|
||||||
|
|
||||||
|
**文案来源**:前端 src 里没有这句话,是后端 `BusinessException` 的 msg,被 `src/axios.js` 的响应拦截器(`status !== 200` → `ElMessage.error(message)`)统一弹出。
|
||||||
|
|
||||||
|
**主因(通道 A)**:`views/business/waybill-manage-detail.vue` 只有 23 行,写了 `:detail-id="$route.query.id"` —— 直接绑全局 `$route`,**没有路径守卫**。`waybill-manage-page.vue` 的 `detailId` watcher 是 `immediate` 且对任何非空 id 都 `openDetail({id})`。于是:
|
||||||
|
1. 之前打开过的每个运单详情标签(`/business/waybill-manage/detail?id=A`、`?id=B`…)各是一个被 keep-alive 缓存的独立实例;
|
||||||
|
2. 跳到配载单详情后,这些实例被 deactivate 但仍随 `$route` 重渲染 → `$route.query.id` 变成配载单 id;
|
||||||
|
3. prop 变化 → `openDetail({id: 配载单id})` → `getDetail(配载单id)` 去查运单 → 后端「运单管理不存在」→ 拦截器弹一次。**几个旧标签就几条提示**;
|
||||||
|
4. 且被污染实例的 `isStandaloneWaybillDetailPage` 仍是 live computed(false) → `openDetail` 走 `$router.push` 分支 → 又生成新的「运单管理详情」标签(标签栏那串的来源)。
|
||||||
|
|
||||||
|
同理风险:`waybill-manage.vue:6` 与 `transport-plan.vue:6` 的 `:detail-id="$route.query.detailId"`(`business-crud-page.vue:7356` 会 push `/business/loading-manage?detailId=id`,正好会污染运单列表实例)。
|
||||||
|
|
||||||
|
**次因(通道 B)**:`loading-manage.vue` 的 `restoreWaybillRows` 会用 `waybillIdsJson` 里的每个运单 id 并发 `getWaybillDetail(id)`,若历史运单已被删/失效,也会报同一句文案且并发多条。单条 `.catch(() => null)` 挡不住拦截器已弹出的提示。
|
||||||
|
|
||||||
|
**区分方法**:Network 里看报错请求的 `id` —— 等于 `2097607162718441474`(配载单 id)→ 通道 A;是别的数字(运单 id)→ 通道 B。或先关掉所有「运单管理详情」标签再复现,通道 A 会消失。
|
||||||
|
|
||||||
|
**待确认的修法**(用户要求先报不改):
|
||||||
|
1. `waybill-manage-page.vue`:`created()` 锁 `routePathLocked = this.$route.path`,`detailId` watcher 首行加 `if (this.$route.path !== this.routePathLocked) return;`。
|
||||||
|
2. `openDetail()` 的 push 分支加同样守卫(防其它调用路径)。
|
||||||
|
3. 宿主 view 绑定加路径守卫(`waybill-manage-detail.vue` / `waybill-manage.vue` / `transport-plan.vue`)双保险。
|
||||||
|
4. 可选:`getWaybillDetail` 支持静默模式,供 `restoreWaybillRows` 用,避免历史脏数据刷屏。
|
||||||
|
|
||||||
|
## 修复(已执行):「运单管理不存在」误报 + 误开标签
|
||||||
|
|
||||||
|
用户确认后按上方案落地,5 个文件:
|
||||||
|
|
||||||
|
1. `src/views/business/components/waybill-manage-page.vue`
|
||||||
|
- `data()` 新增 `routePathLocked: this.$route.path` —— **必须放 data,不能放 created**:Vue Options API 顺序是 data → computed → watch(immediate) → created(已在 runtime-core `applyOptions` 源码中核实)。放 created 会让首个 immediate watcher 读到空值。
|
||||||
|
- 新增 computed `isOwnedRouteActive() { return this.$route.path === this.routePathLocked; }`
|
||||||
|
- `detailId` watcher 首行加 `if (!this.isOwnedRouteActive) return;`
|
||||||
|
- `openDetail` 的 `$router.push` 分支同样加守卫。
|
||||||
|
2. `src/views/business/components/transport-plan-page.vue`:完全同构的写法(`:detail-id` host 一致),加同样的 `routePathLocked` + `isOwnedRouteActive` + watcher 守卫。
|
||||||
|
3. `src/views/business/waybill-manage-detail.vue`:`:detail-id="$route.query.id"` → `:detail-id="detailId"`,computed 做 `this.$route.path === '/business/waybill-manage/detail'` 守卫。
|
||||||
|
4. `src/views/business/waybill-manage.vue`:同上,守卫 `/business/waybill-manage`(保留旧链接 `?detailId=` 兼容)。
|
||||||
|
5. `src/views/business/transport-plan.vue`:同上,守卫 `/business/transport-plan`。
|
||||||
|
|
||||||
|
**验证**:
|
||||||
|
- dev server curl 5 个 .vue + 2 个 scoped style 全部 HTTP 200。
|
||||||
|
- 用 `@vue/server-renderer` 写了临时 mjs(已删)模拟带 `$route` 的 app,确认 **data() 里访问 `this.$route` 可行**:immediate watcher 触发时 `routePathLocked` 已是正确路径、首次加载不被拦截。
|
||||||
|
- `$route` 是 vue-router 挂在 `app.config.globalProperties` 上的 getter(vue-router.mjs:1498),组件实例化时已就绪。
|
||||||
|
|
||||||
|
**未做(第 4 条可选)**:给 `getWaybillDetail` 加静默模式供 `restoreWaybillRows` 使用(历史失效运单仍会刷多条红字),待用户定夺。
|
||||||
|
|
||||||
|
**另注**:`business-crud-page.vue:6651` 有同构的 `detailId` immediate watcher,但全项目只有上述 3 个宿主 view 传 `:detail-id`,它暂无调用方,未动。
|
||||||
|
|
||||||
|
**仍未 commit。**
|
||||||
|
|
||||||
|
## 修复(已执行):合同详情页整页空白 —— 路由表重复定义
|
||||||
|
|
||||||
|
**现象**:主订单详情点合同编号 → `/business/contract-manage/detail?id=...&name=合同详情` 内容区空白(侧栏/标签正常)。
|
||||||
|
|
||||||
|
**定位过程(关键:真实浏览器复现,不猜)**
|
||||||
|
1. 静态排查全部排除:`contract-manage.vue` 及其 26 个依赖 HTTP 200、模块 `import()` 成功、无循环依赖、详情分支引用的 24 个成员全部有定义。
|
||||||
|
2. dev 环境登录态无法直接拿(验证码 + `admin/admin` 报 `error_code 2004 用户密码强度过低`),改为**注入式复现**:
|
||||||
|
- `agent-browser open <目标 URL>`(落 `/login`);
|
||||||
|
- eval 取 `document.getElementById('app').__vue_app__.config.globalProperties` 拿 `$router` / `$store`;
|
||||||
|
- 写 cookie `saber3-access-token`(注意 token 走 **js-cookie**,不是 localStorage)+ `$store.state.user.token`;
|
||||||
|
- 覆写 `XMLHttpRequest.prototype.open/send` 让所有 `/api/**` 返回 `{code:200,data:{...}}`(defineProperty 伪造 readyState/status/responseText 后手动触发 `onloadend`)。
|
||||||
|
- 再 `$router.push(...)` 做 SPA 跳转。
|
||||||
|
3. 复现出空白,并拿到决定性证据:
|
||||||
|
- `/business/contract-manage/detail` → `$route.matched.length === 1`(只有 Layout,name undefined),`#avue-view.children.length === 0`,innerHTML 为 `<!---->`。
|
||||||
|
- 对照 `/business/contract-manage/change`(结构相同但未重复定义)→ `matched.length === 2`(Layout + 合同变更),内容完整渲染。
|
||||||
|
- `$router.getRoutes()` 里 detail 有 **3 条**记录:2 个 Layout 父记录 + 1 个子记录(`合同详情`)。
|
||||||
|
|
||||||
|
**根因**:`src/router/views/index.js` 中 `/business/contract-manage/detail` **被复制粘贴定义了两次**,两次的子路由都叫 `合同详情`。vue-router 的 `addRoute` 遇到重名会 `removeRoute(name)` 把先注册的子记录删掉,但**不会把它从父记录的 `children` 数组里摘除**;于是第一条 Layout 壳记录留在 matcher 列表里且排在前面,`resolve('/business/contract-manage/detail')` 命中这个"无有效子路由"的壳 → matched 只有 1 层 → `page/index/index.vue` 里 `#avue-view` 的二级 `<router-view>` 无匹配 → 内容区空白。
|
||||||
|
(`getRoutes()` 计数是判据:form / change 都是 2 条 = 父 + 子(健康),detail 是 3 条 = 2 父 + 1 子(坏)。)
|
||||||
|
|
||||||
|
**修复**:删除重复块(原 314-325 行),只保留 159-169 行那一份。
|
||||||
|
|
||||||
|
**验证**:
|
||||||
|
- 重复扫描脚本(正则匹配「顶层 path + `component: Layout` + 首个子路由 name」):views/index.js 27 条 Layout 子路由中仅 `合同详情` 重复;page/index.js 无重复 → 已清零。
|
||||||
|
- 修复后浏览器复验:detail → `matched.length === 2`(Layout + 合同详情)、`#avue-view.children.length === 1`,正文完整渲染「基本信息 / 签约类型 / 合同编号 HT-2026-001 / … / 变更记录」。
|
||||||
|
- 全量回归:48 条 business/vehicle/payment/settlement 路由 `resolve()` 后 `matched.length` 全部 ≥ 2,`bad: []`。
|
||||||
|
- `curl` 校验:`views/index.js`、`contract-manage.vue` 均 200。
|
||||||
|
- 残留报错均为 mock 数据形状不符所致(所有接口都返回同一个合同对象,导致 `tree.reduce` / `feeCategories.find` 之类失败),非真实缺陷。
|
||||||
|
|
||||||
|
**未 commit**(连同 1、2 轮改动一起待确认)。
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# 2026-09-30
|
||||||
|
|
||||||
|
## /wel/index 首页重构为运营数据看板(按蓝湖效果图)
|
||||||
|
- 新增依赖:echarts ^6.1.0(corepack pnpm add echarts)。
|
||||||
|
- 重构 `src/views/wel/index.vue`:改为「核心经营指标 / 运输结构 / 业务单元情况 / 项目情况 / 财务情况 / 车队与线路 / 车务管理 / 底部占比与趋势」8 大板块 + 版权页脚,删除原欢迎横幅/快捷入口。
|
||||||
|
- 新增文件:
|
||||||
|
- `src/views/wel/chart-options.js`:排行条形/盈亏双向/环形/分组柱/面积折线/堆叠柱 6 类 option 生成器(fmt 千分位、红涨绿跌 rich label)。
|
||||||
|
- `src/views/wel/dashboard.scss`:看板公共样式,各组件 scoped `@import '../dashboard.scss'`(子目录注意路径)。
|
||||||
|
- `src/views/wel/components/`:wel-chart.vue(ECharts 封装:ResizeObserver + activated resize + dispose)、wel-filters.vue(统计时间/条件筛选 mock)、rank-panel.vue(排行/盈亏通用面板)、section-kpi / section-structure / section-business / section-project / section-finance / section-fleet / section-vehicle / section-summary.vue。
|
||||||
|
- 数据全部为 Mock,组件内已注释标注对接点;蓝湖红字标注的指标口径未定,待后端统计接口(估 12~18 个)确定后替换。
|
||||||
|
- 自检:dev server(2889) 下所有新文件及 `?vue&type=style&...&lang.scss` 均 200;`/node_modules/.vite/deps/echarts.js` 200。vite build 因 facelogin.vue 沙箱中断不可用,未跑。
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# 2026-10-13
|
||||||
|
|
||||||
|
## 车辆调度弹窗:使用部门级联选择器宽度对齐
|
||||||
|
|
||||||
|
- 现象:`/transportCapacity/vehicle-dispatch` 新增/编辑弹窗中,使用部门 `el-cascader` 明显窄于同行车牌号 `el-input`。
|
||||||
|
- 根因:`el-cascader` 是 `display: inline-block` 宽度按内容收缩(不像 `el-autocomplete` / `el-input` 有 `--el-input-width: 100%` 兜底);而页面里写的 `.vehicle-dispatch-page :deep(.vehicle-dispatch-form-control){width:100%}` 命中不到 —— avue-crud 弹窗默认 `append-to-body: true`(`append-to-body": validData(crud.tableOption.dialogAppendToBody, true)`),DOM Teleport 到 body,已不在 `.vehicle-dispatch-page` 之下。
|
||||||
|
- 修法(走项目既有约定):
|
||||||
|
1. `src/option/transportCapacity/vehicle-dispatch.js` 增加 `dialogCustomClass: 'vehicle-dispatch-dialog'`;
|
||||||
|
2. `src/styles/element-ui.scss` 增加全局规则 `.vehicle-dispatch-dialog .el-form-item__content > .el-cascader { width:100%; max-width:100% }`。
|
||||||
|
- 自检:dev(2889) `curl /src/styles/element-ui.scss` 与 `/src/option/transportCapacity/vehicle-dispatch.js` 均 200,编译产物含新规则。
|
||||||
|
- 遗留观察:同文件里 `.vehicle-dispatch-page :deep(.avue--detail ...)` 那一批查看态禁用样式,同样因 Teleport 属死规则(未改,待确认是否需要迁到 `.vehicle-dispatch-dialog` 作用域)。
|
||||||
|
|
||||||
|
## 追加修正(同日 20:xx):第一次改完用户反馈「还是没对齐」
|
||||||
|
|
||||||
|
- 原因一:选择器写成了 `.el-form-item__content > .el-cascader`(直接子级)。**avue 表单项在 `el-form-item__content` 与控件之间还有两层包裹 div**(`packages/element-plus/form/index3.js`:content > div > [div|elTooltip] > 控件),必须用后代选择器。已改成 `.vehicle-dispatch-dialog .el-form-item__content .el-cascader`。
|
||||||
|
- 原因二(更隐蔽):option 用 `labelWidth: 'auto'`,**EP 的 auto 是逐项计算**(实测:3 字 54/64px、2 字 40px、4 字无星号 68px、4 字带星号 78px),label 越宽控件可用宽度越小 → 车牌号 input 486px、使用部门 cascader 472px,仍差 14px。已加 `.vehicle-dispatch-dialog .el-form-item__label { flex: 0 0 calc(4em + 24px) !important; width: calc(4em + 24px) !important }`(本弹窗左右两列最长 label 均为 4 汉字)。
|
||||||
|
- 验证方式(可复用):临时在项目根建 `cascader-width-check.html`,Vite 直接服务 → `import './src/option/...'` 用真实 option + `import './src/styles/element-ui.scss'`,挂 avue-crud 并 `mounted(){ this.$refs.crud.rowAdd() }` 弹出真实弹窗;用 agent-browser(`/Users/gxwebsoft/.workbuddy/binaries/node/workspace/node_modules/.bin/agent-browser`)`open` + `eval` 读 DOM 链路与 `getBoundingClientRect`。修完已删除该临时文件。
|
||||||
|
- 结果:全部 label 80px,车牌号 input 与使用部门 cascader 均为 left=732 / width=470 / right=1202,完全一致。
|
||||||
@@ -0,0 +1,142 @@
|
|||||||
|
# 2026-10-14
|
||||||
|
|
||||||
|
## 运单管理:草稿行「查看」改为与其它状态一致的「详情」
|
||||||
|
- 现象:`/business/waybill-manage` 列表操作列,草稿行显示「查看」→ 走 avue 自带 `$refs.crud.rowView()` 表单弹窗;其它状态显示「详情」→ `openDetail()` 跳独立详情页 `/business/waybill-manage/detail?id=x`(新标签「运单管理详情」)。同一列两种弹窗形态。
|
||||||
|
- 根因:`waybill-manage-page.vue` 的 `showDetailButton(row)` 显式 `return status !== 'draft'`,把草稿排除在详情按钮外,于是落到 `#menu` 里 `!showDetailButton(row)` 的「查看」分支。
|
||||||
|
- 修法:`showDetailButton()` 去掉草稿判断,仅保留 `config.detailButton` + `_view` 权限判断;「查看」分支保留,仅在 `detailButton:false` 时兜底。
|
||||||
|
- 备注:`business-crud-page.vue:7043`、`transport-plan-page.vue:4111` 有同款 `status !== 'draft'` 逻辑(运输计划另有 `showViewButton`);两个 option 文件里的 `detailButtonIgnoreDraftStatus` 目前是死配置,组件未读取。
|
||||||
|
|
||||||
|
## 收付款管理模块:列表页右上角统一为 4 键工具组(最终方案 = 改 avue-crud)
|
||||||
|
- 现象:付款管理页右上角只有 1 个刷新按钮,与其它模块不一致;参考模块的 4 键工具组其实是 **avue-crud 内置头部**,不是可引用的公共组件。
|
||||||
|
- 方案演进:
|
||||||
|
1. 过渡方案(已落地 7 页):手写页引入标准件 `src/components/table-header-tools/main.vue`,改法为搜索区 `v-if="searchVisible"`、el-table 加 `:size="tableSize"`、列 `v-for="column in visibleColumns"`、data 加 `searchVisible/tableSize/visibleColumnKeys`;汇票两页表格在子组件,子组件透传 `update:searchVisible` + `refresh`。已接入 `invoice-application.vue`、`invoice-receipt.vue`、`receipt-flow.vue`、`receipt-claim-record.vue`、`bill-ledger.vue`+`bill-ledger-table.vue`、`bill-payment.vue`+`bill-payment-table.vue`。
|
||||||
|
但用户实测反馈:第 2 键(列设置)与第 4 键(表格尺寸)效果仍与参考模块不同 —— 参考模块第 2 键是 `el-drawer` 列设置抽屉(列名/隐藏/冻结/过滤/排序),第 4 键是「表格 ↔ 卡片」视图切换,两者都嵌在 avue 内部,**无法脱离 avue-crud 复用**。
|
||||||
|
2. 最终方案(用户选定,先做样板):列表页改写成 `<avue-crud>`,4 键 = 刷新 / 列显隐抽屉 / 搜索显隐 / 网格切换,与其它模块 100% 一致。
|
||||||
|
- 样板:`src/views/payment/payment-application.vue` + `src/option/payment/paymentApplication.js`(`paymentApplicationOption()` 工厂)。
|
||||||
|
- 搜索项与表格列 label 不一致的(表格列「收款方」vs 搜索项「客户名称」)用 `searchProp` 映射;属搜索专用列用 `searchOnlyColumn()` 统一生成(`hide + showColumn:false + add/edit/viewDisplay:false`)。
|
||||||
|
- ⚠️ **avue 的 searchOrder 是降序**(`header-search2.js`:`(b.searchOrder||0)-(a.searchOrder||0)`),值越大越靠前 —— 首次做反了,9 个搜索项 score 全部反转。
|
||||||
|
- ⚠️ **column 数组顺序即表格列顺序**,搜索项夹在中间会把该列挤到表格前面(`deptName` 踩过),搜索专用列必须紧跟在同位置或用 `hide` 隔离。
|
||||||
|
- `on-load` 在 created / currentChange / sizeChange 都会触发(`table-page2.js`),因此 `currentChange`/`sizeChange` 只改 page、**不要再调 onLoad**;`onLoad(page)` 也不能把 page 里的 total/pageSizes spread 进查询参数。
|
||||||
|
- 顺带加固:`table-header-tools` 加 `deactivated()` 关闭列设置弹窗(keep-alive 切页防 Teleport 弹窗残留);清理 invoice-application / invoice-receipt 里失效的 `__toolbar-right` 样式规则。
|
||||||
|
- 验证:项目根建临时 html 挂真组件 + `app.use(Avue)`,`agent-browser` 实测 —— 4 个按钮均渲染图标、刷新触发、搜索区切换、表格尺寸 default→large、列设置弹窗勾选双向生效;avue-crud 样板另测:4 键数量=4、默认 4 项搜索 + 展开 9 项、18 列表格顺序与原页一致、列显隐抽屉表头 5 列 18 行、网格按钮切出卡片视图;临时文件用完即删。
|
||||||
|
- 踩坑:`el-icon-*` 字符串图标靠 Avue 的全局映射,验证页不装 Avue 时 4 个按钮是空圆(差点误判)。
|
||||||
|
- 待办:用户确认样板效果后,把其余 6 页(invoice-application / invoice-receipt / receipt-flow / receipt-claim-record / bill-ledger / bill-payment)也改成 avue-crud,并回退其 table-header-tools 改动。
|
||||||
|
|
||||||
|
## 正式结算单表单:结算明细区按钮/筛选行对齐预结算单
|
||||||
|
- 现象:`formal-settlement-editor.vue` 的「结算明细」区把 导出/选择结算明细 塞在筛选表单的 actions 里(`grid-column:1/-1` 换行右对齐,出现两个蓝实心),与 `pre-settlement-editor.vue` 不一致(后者把这两个按钮放 `<section-card #extra>`,筛选项与查询/重置同行)。
|
||||||
|
- 改法(只动 formal 一个文件,72+/17-):
|
||||||
|
1. 模板 `section-card#extra` 加 导出(`v-if="hasPermission('formal_settlement_export')" type=primary plain`)+ 选择结算明细(`v-if="editable" type=primary plain`),与「收起明细」并列;actions 里只留 查询/重置。
|
||||||
|
2. el-form 去掉 `inline`、`label-width` 88px→auto,4 个输入补 `placeholder="请输入"`。
|
||||||
|
3. 样式 `grid-template-columns: repeat(4, minmax(0,1fr)) auto` + `align-items:center`;actions 去掉 `grid-column:1/-1` 改 `width:auto;margin-left:0;white-space:nowrap;justify-self:end`;媒体查询 ≤1200px 同步补 `auto` 列。
|
||||||
|
4. 补 `hasPermission`:`...mapGetters(['permission','userInfo'])` + `isAdmin`(`isAdministrator` from `@/utils/auth`)+ methods `hasPermission(code){ return this.isAdmin || this.validData(this.permission?.[code], false) }`(`validData` 是项目全局属性,main.js 未显式挂载但全站通用)。
|
||||||
|
- ⚠️ 关键坑:文件末尾 `.formal-editor :deep(.el-form-item){margin-bottom:24px}` 与筛选区 `:deep(.el-form-item){margin-bottom:0}` **特异性相同**,靠源序决定胜负 → 覆盖规则必须写在文件尾部(`@media` 之前)。pre 用的也是同索引结构。
|
||||||
|
- 验证:`agent-browser` + mock 注入实测 —— grid 列 `188.25×4 + 132`、5 个 form-item 同一行 top 相同、form-item margin-bottom=0;正式单与预结算单**同视口截图逐像素一致**。
|
||||||
|
|
||||||
|
## 「变更运输路线」弹窗 · 变更记录列表:变更前/后地址分行展示
|
||||||
|
- 需求:变更内容原为单行 `YD-xxx:发货地 A → B;到货地 C → D`(多条以 `;` 拼接),地址太长挤成一坨,要求「变更前地址 / 变更后地址」换行。
|
||||||
|
- 落地:新增 `src/utils/route-change.js` 导出 `formatRouteChangeContent(content, emptyText='-')` —— 仅**展示层**格式化(不动 taskInfoJson 里已存的 content,历史数据同样生效):`\r\n` 归一 → `;` 转 `\n` → `→` 转 ` →\n`(箭头留上一行行尾)→ 压缩空行;空值返回 `-`。
|
||||||
|
- 接入 3 处同一弹窗(都在 methods 里以 ES6 简写挂载 `formatRouteChangeContent`,与 `formatContractOptionLabel` 同款):
|
||||||
|
- `views/business/loading-manage.vue`(表格列 `record-content`)
|
||||||
|
- `views/business/components/waybill-manage-page.vue`
|
||||||
|
- `views/business/components/business-crud-page.vue`
|
||||||
|
- ⚠️ 关键坑:`white-space: pre-wrap` 下模板里插值前后的**换行+缩进空白会被渲染出来**(内容前面凭空多一行缩进)。所以要么把 `>{{ ... }}</div>` 写成紧贴一行(loading-manage),要么改用 `v-text="formatRouteChangeContent(row.content)"` 多行写法(另两处)——文本节点不存在才安全。CSS 里 `white-space:normal` 需改 `pre-wrap`(loading-manage 原为 normal),另两处补 `overflow-wrap:anywhere; word-break:break-word; line-height:22px`。
|
||||||
|
- 效果:`YD-20260904-0022:发货地 广西…公司 →` / 换行 / `广东省…西瓜洲` / `到货地 山东…公司 →` / `山东省…公司`。
|
||||||
|
- 验证:node 直跑函数(多条 / 单条 / 路线顺序 / 空值)输出正确;dev `localhost:2889` 三个 .vue 与 scoped style 块均 200,编译产物各含 3 处 `formatRouteChangeContent`。
|
||||||
|
- 未做(如需再说):存储格式与导出 Excel 仍是单行文本;`vehicle/transport-change-record.vue` 的 `changeContent` 是人工填写的自由文本,未改。
|
||||||
|
|
||||||
|
|
||||||
|
## 发货模板"选择常用地址"改图标(对齐运输计划)
|
||||||
|
- 需求:`/business/shipping-template/form` 收发货信息行,把文字「选择」按钮改成运输计划同款图标方式。
|
||||||
|
- 改动(`src/views/business/components/shipping-template-page.vue`):
|
||||||
|
1. `import { Location, OfficeBuilding } from '@element-plus/icons-vue'`,并把 `OfficeBuilding` 加进 `data()`;
|
||||||
|
2. departure/arrival 两个 form 插槽里,把 `<el-tooltip><el-button ...>选择</el-button></el-tooltip>` 从行尾移到第二个地址输入框之后,改成 `:icon="OfficeBuilding"` + `link` 图标按钮(class `shipping-template-page__address-pick-btn`);
|
||||||
|
3. suffix 的 `<el-icon>` 补 class `shipping-template-page__map-suffix`(cursor/18px/#909399/hover #409eff),与运输计划同名同款;
|
||||||
|
4. `.shipping-template-page__route-row` grid 第 3 列插入 `40px` 图标列(原末尾的 `auto`),并把 `__address-pick-btn .el-icon { font-size: 22px }` 写进该行容器内。
|
||||||
|
- 关键坑(差点误判成 bug):Element Plus 图标两种用法机制不同 ——
|
||||||
|
- 标签形式 `<Location />` 靠 `main.js` 里 `app.component(key, ...)` **全局注册**解析,与 `data()` 无关;
|
||||||
|
- 表达式形式 `:icon="OfficeBuilding"` 编译成 `_ctx.OfficeBuilding`,**必须把组件对象放进 data()**(放 `components` 注册里模板取不到,会静默渲染不出图标)。
|
||||||
|
验证页漏了全局注册,曾误判 `<Location />` 不渲染。
|
||||||
|
- 验证:临时验证页(项目根 html + 真 .vue,走 Vite + 真 element-plus + 全局图标注册)实测:地址框内 Location 18px、按钮 40px 内 svg 22px 居中、7 列 184/368/40/48/184/64/184 铺满 1120px;截图视觉与运输计划一致。用完已删临时文件。
|
||||||
|
- dev 自检:`shipping-template-page.vue` 与 scoped style 均 200。
|
||||||
|
|
||||||
|
## 多联总单:调度页顶部路线节点 / 详情页路线图 —— 省市区按「市 区县」分段展示
|
||||||
|
- 现象:`/business/master-order?mode=dispatch&id=xxx` 顶部 `route-overview` 的起/终节点直接绑定 `route.departureName/arrivalName` 原始值 → 显示成「上海市浦东新区」「广西壮族自治区南宁市邕宁区」挤成一坨(同页段1~段3 的表头早已是「上海市 浦东新区 → 上海市 静安区」,用户截图圈出顶部这行说"怎么还没改")。
|
||||||
|
- 根因:顶部节点是唯一没走格式化方法的绑定(段头走 `dispatchLocationName`,详情页走 `segmentLocationName`),不是格式化逻辑有问题。
|
||||||
|
- 落地:新增 `src/utils/region-address.js` 导出 `formatRegionAddress(value)` + `splitRegionTokens(value)`(按行政区划后缀切分,`州`+`市`、`县`+`区` 连写特例合并;**整串都是行政区划**才重排,站点名「南宁站」「广州南站」和含街道门牌的详细地址原样返回)→「市 区县」的空格展示,省/自治区不重复(与全站既有 `formatRoadLocation`/`formatRouteCityDistrict` 规则一致,`广西壮族自治区南宁市邕宁区` → `南宁市 邕宁区`)。
|
||||||
|
- 接入 4 处:调度页 `route-overview` 起/终节点的强文本改用 `dispatchLocationName(route, 'departure'|'arrival')`、第二行地址改用 `formatRegionAddress(...)`,`addressText()` 名称+地址都格式化并去重(`南宁市 邕宁区` 不再重复两遍);详情页 `route-map` 两处 `<small>` 地址改用 `formatRegionAddress(...)`。
|
||||||
|
- 验证:项目根临时验证页(真组件 + `axios.defaults.adapter` 全量 mock 后端,复刻截图数据 `routes=[上海市静安区, 南宁站, 广西壮族自治区南宁市邕宁区]`)+ agent-browser 读 DOM —— 调度页顶部 4 节点 =「上海市 浦东新区 / 上海市 静安区 / 南宁站 / 南宁市 邕宁区」,与段1~段3 表头、详情页路线图**逐字一致**;终节点宽 101px 未被省略号截断(改前原始串超宽被截);两页 innerText 再扫 `省|自治区` 已无未加空格的残留。用完已删临时文件。
|
||||||
|
|
||||||
|
## 同事拉代码编译报错(漏提交新文件)→ 已修复
|
||||||
|
- 现象:同事 pull 后 `[vite:load-fallback] Could not load .../src/utils/route-change (imported by src/views/business/loading-manage.vue): ENOENT`。
|
||||||
|
- 根因:`src/utils/route-change.js`、`src/utils/region-address.js` 是**新增文件且一直 untracked**,本地能跑、远端没有。
|
||||||
|
提交时用了只带已跟踪文件的写法(`git commit -am` 之类),.vue 的引用被提交了、新 .js 没进去(12:44 的 6de87ed 就是这种情况)。region-address 是第二个雷:route-change 修好后会接着报它。
|
||||||
|
- 修复:`git add src/utils/region-address.js src/utils/route-change.js` → commit `749b314 :bug: 补充提交遗漏的 region-address 与 route-change 工具文件` → push(期间远端有同事新提交 74780b8,先 `git pull --rebase` 无冲突)。三处 tree(本地 HEAD / origin/master / 远端真实 SHA)核对一致。
|
||||||
|
- 复查:写脚本扫 `src/**` 所有 `@/`、相对路径引用(含 scss @use/@import),比对 `git ls-files`,**无其它"文件存在但未跟踪"的引用目标**,暂时不会再踩同类坑。
|
||||||
|
- 教训:本仓库提交前建议 `git status` 扫一眼 `??`,新增文件必须显式 `git add`。
|
||||||
|
|
||||||
|
## payment 模块 6 个手写列表页:搜索栏「展开/收起」统一(对齐 customer-archive / settlement)
|
||||||
|
- 起因:`/payment/invoice-application`、`/payment/bill-payment` 的展开收起控件与别的模块不一致。排查发现 payment 模块 6 个手写搜索栏各写各的:5 个是 `el-tooltip`+`el-button text`+纯箭头图标(文案「折叠」,tooltip 才显示),`receipt-flow.vue` 更离谱 —— 裸 `el-button`(带边框)且排在**查询/重置左边**。
|
||||||
|
- 统一标准(两处参照物写法完全一致):
|
||||||
|
- `views/settlement/{formal-settlement,pre-settlement,transport-reconciliation,receivable-payable-detail,settlement-adjustment}.vue` 已有写法:
|
||||||
|
```html
|
||||||
|
<el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
|
||||||
|
{{ searchExpanded ? '收起' : '展开' }}
|
||||||
|
</el-button>
|
||||||
|
```
|
||||||
|
放在「查询 / 重置」之后(最右)。
|
||||||
|
- `views/vehicle/customer-archive.vue` 是 avue-crud 内建,`searchIcon: true` + `searchIndex: 4`,渲染出的也是同一形态。
|
||||||
|
- avue 显示规则(`node_modules/@smallwei/avue/lib/packages/element-plus/crud/menu/header-search3.js` 的 `isSearchIcon`):
|
||||||
|
`searchIcon === true && columnLen > searchIndex` → **搜索项不超过 4 项时根本不渲染展开/收起按钮**。故各页 data 加 `searchIndex: 4` + `searchItemCount: N`,computed `showSearchToggle = searchItemCount > searchIndex`。
|
||||||
|
- 逐页落地:invoice-application(5项) / invoice-receipt(6项) / receipt-claim-record(11项) / receipt-flow(7项) / components/bill-ledger-search(6项) 均显示;**components/bill-payment-search 仅 4 项(后端 `BillPaymentServiceImpl.selectPage` 也只支持 paymentNo/deptName/paymentDate 区间/approvalStatus 这 4 个条件)→ showSearchToggle=false,不渲染按钮**,避免留一个"点了没反应"的假按钮。
|
||||||
|
- `receipt-flow.vue`:补 `import { ArrowDown, ArrowUp }`、按钮从最左移到最右、文案「折叠」→「收起」。
|
||||||
|
- gap 不动:`business/`、`settlement/` 手写页的 `__search-actions` 都写了 `gap: 8px`(与本次统一无关,别顺手删)。
|
||||||
|
- 校验:6 个文件 `curl localhost:2889/src/...vue` 与 `?vue&type=style&index=0&scoped=true&lang.scss` 全 200;`grep 折叠|el-tooltip src/views/payment/` 已无残留。
|
||||||
|
|
||||||
|
## 15:55 路线变更「变更内容」列排布问题(待用户确认方案,未动代码)
|
||||||
|
- 位置:`变更运输路线` 弹窗 → `变更记录` tab → 表格 `变更内容` 列,共 **3 处同款**:`views/business/loading-manage.vue:1688`(`__record-content`)、`views/business/components/waybill-manage-page.vue:3027`、`views/business/components/business-crud-page.vue:2998`。
|
||||||
|
- 存储格式为**单行文本**:`YD-xxx:发货地 A → B;到货地 C → D;YD-yyy:…`,展示层由 `src/utils/route-change.js` 的 `formatRouteChangeContent()` 切行(`;`→换行、`→`→` →\n`),再以 `white-space: pre-wrap` 平铺。
|
||||||
|
- 病因:`:` 不带换行 → 运单号与「发货地 原地址」挤同一行;前/后无标签;多条记录无分隔。一个单元格可堆 3 条运单 × 2 字段 × 2 行 ≈ 12+ 行。
|
||||||
|
- 已给 3 个方案(A 单元格内分组对齐:运单号独占行主色 + 字段标签列 + 前值/后值缩进对齐,改 formatter 返回结构 + 模板渲染;B 列只留「运单号 · N 项」摘要 + 查看详情弹窗,复用同类组件 `src/components/change-record-detail-dialog/main.vue`(变更字段/变更前/变更后三列 + 分页);C 按「运单 × 字段」拆行 + `span-method` 合并时间/人)。**推荐 A,B 备选**。等用户确认后再改。
|
||||||
|
|
||||||
|
## 16:20 已按方案 A 落地(变更内容列分组渲染)
|
||||||
|
- **`src/utils/route-change.js` 重写**:删掉 `formatRouteChangeContent`,改为导出 `parseRouteChangeContent(content)`,返回分组数组 `[{ type, title, text, fields:[{label,before,after,single,changed,unchanged}] }]`。
|
||||||
|
- ⚠️ **关键坑:存储格式里「到货地」前面只有 `;`、没有冒号**(真实格式 `${waybillNo}:发货地 A → B;到货地 C → D`)。第一版按「冒号切 head/tail」写,导致「到货地」整段落进纯文本兜底 → 必须"先判断 segment 是否以字段名开头",再把无标题字段行合并进上一条 waybill 分组。
|
||||||
|
- 字段名正则的**长标签必须排在短标签前**(`发货地址` 早于 `发货地`),否则被前缀吃掉。字段白名单:发货地址/到货地址/发货地/到货地/装货地/卸货地/收货地。
|
||||||
|
- 三种分组类型:`waybill`(`运单号:发货地…`)、`field`(`;到货地…`,合并进上一个非 text 分组)、`group`(`路线顺序:X 调整为 Y`,按「调整为」拆前后,不走箭头切分,因为路线文本本身含 `→`)、`text`(兜底原文)。
|
||||||
|
- 箭头正则 `/\s*(?:→|➔|➜|[\-–—]{1,2}\s*>)\s*/`;空值归一为 `-`。
|
||||||
|
- **三处模板统一改为分组渲染**(运单号主色标题 + 左侧 2px 主色竖条;字段 label 列 54px;`changed` 两行「旧值(灰) / → 新值(主色)」,`unchanged` 单行 + 灰字「未变更」):`loading-manage.vue`(`loading-route-change-dialog__change-*`)、`waybill-manage-page.vue`、`business-crud-page.vue`。样式块也同步替换(`__route-change-record-content` 从 `white-space: pre-wrap` 改为 flex column;箭头 `text-align: right`,grid item 会被 blockify 所以 span 上生效)。
|
||||||
|
- 校验:node 跑 `parseRouteChangeContent` 7 组用例(真实截图数据 / 路线顺序 / 混合 / 半角箭头分号 / 无箭头单值 / 纯文本 / 空)全部符合预期;`@vue/compiler-sfc` 编译三个 .vue 的 template + scss 全过;SSR 渲染真实模板 + agent-browser 截图确认观感(临时文件已删)。
|
||||||
|
- 已知代价:窄列(360px)下地址被 54px 标签列占位,单元格比原来高约一倍;换来的是一条运单/一个字段的分组边界一目了然。
|
||||||
|
|
||||||
|
## 16:05 /base/measurement-unit 创建时间/更新时间列截断修复
|
||||||
|
- 现象:表格里「创建时…」「更新时…」列被挤到 ~80px,`2026-0...` 截断;用户猜测要固定操作列。
|
||||||
|
- 根因:`option/base/measurement-unit.js` 两列只写了 `type/format/sortable`,**没有 width/minWidth** → el-table 未设宽列按剩余空间均分,被压到低于内容宽度 → 省略号。与 `menuFixed` 无关。
|
||||||
|
- 修法:`createTime`/`updateTime` 加 `width: 180`(与同模块 `option/base/common-address.js` 完全一致),`createUserName`/`updateUserName` 加 `minWidth: 110`。
|
||||||
|
- 结论(重要经验):**操作列不需要额外"固定"**,`menuFixed: 'right'` 早在 option 里(`main.js` 全局 `crudOption.menuWidth: 180`,avue 库默认 220)。不要为了"防截断"去加宽操作列,加宽只会增加横向滚动;时间列截断一律是缺 width。
|
||||||
|
- 验证方式(可复用):项目根建临时 html `__mu-check.html` → Vite 直接服务;`import { createOption } from '/src/option/base/measurement-unit.js'` + `app.use(Avue, { crudOption: { menuWidth: 180 } })`,用 `h(resolveComponent('avue-crud'), {...}, { menu: () => [...] })` 渲染(避免运行时模板编译)。
|
||||||
|
实测(容器 1200px):td 宽 `[50,70,150,150,130,200,100,110,110,180,180,180]` 合计 1610 → 横向滚动 410px;`scrollWidth > clientWidth` 的单元格 **0 个**;`操作` th 为 `position: sticky`,滚到最右后右边缘 = 容器右边缘 → fixed 生效。用完删文件 + `agent-browser close`。
|
||||||
|
|
||||||
|
## 16:25 变更内容列 hover 提示去除(分组改造的连带问题)
|
||||||
|
- 用户反馈:改完分组后,变更内容单元格 hover 出现提示浮层,要求去掉。
|
||||||
|
- 根因:`main.js:84` `app.use(ElementPlus, { table: { showOverflowTooltip: true } })` 全局开启 → EP 给每列 `.cell` 加 `.el-tooltip` 类(`white-space: nowrap`)。**我上一次改造把内层 `white-space: pre-wrap` 换成了 flex column、忘了补 white-space** → 继承 nowrap → 长地址横向溢出 → tooltip 激活。改动前靠 pre-wrap 自保所以没暴露。
|
||||||
|
- 修法(三处,列级豁免、不动全局配置):① 变更内容列显式 `:show-overflow-tooltip="false"`;② `__route-change-record-content` 补 `white-space: normal` 兜底。
|
||||||
|
- ⚠️ 验证踩坑:用「项目根临时 html + `node_modules/element-plus/dist/index.full.min.js` 全局构建 + `app.use(ElementPlus, { table: { showOverflowTooltip: true } })`」复现时,**el-table 表头/列宽渲染错乱**(表头逐列堆叠、每行只渲染出 2 个 cell),该环境不可用于布局验证;但单元格内容渲染正常,足以确认分组结构无误。要验证真实表格布局还是得走 Vite 服务真实页面。
|
||||||
|
另:自定义组件接模板字符串时,切出的模板里 `row.content` 要替换成 `content`(插槽作用域不存在于独立组件里),否则报 `Cannot read properties of undefined (reading 'content')`。
|
||||||
|
- 校验:编译三个 .vue 的 template + scss 全过;临时验证页 `__route-change-verify.html` 与 8899 端口静态服务已删除/停止。
|
||||||
|
- 未处理(等用户确认):备注列的 `show-overflow-tooltip` 保持原样(属全站约定),用户若要求连备注一起去掉再单独改。
|
||||||
|
|
||||||
|
## 16:45 付款申请表单「结算单号」字段交互歧义修复(方案 A)
|
||||||
|
- 现象(用户截图圈出):`/payment/payment-application/form` 结算单号是 `el-select multiple`,placeholder 写「请输入」但**打不进去字**,必须先猜到要点右边「选择」才有效。
|
||||||
|
- 根因(双重的):
|
||||||
|
1. 该 `el-select` 的 `:model-value` 绑只读 computed `referenceSettlementNos`(= 已选单号本身),**options 就是它自己** → 点开下拉、点选项,值不变;代码里 `handleSettlementSelectVisible` 甚至主动 blur 掉下拉。真正改值的只有右侧「选择」按钮。
|
||||||
|
2. placeholder 写「请输入」但控件不可输入(未开 `filterable`),且 `.el-tag__close{display:none}` 藏了删除叉 → 视觉上更像输入框。全站规矩是「请输入/请选择」二选一,这里是选择语义。
|
||||||
|
- 落地(只改 `views/payment/payment-application-form.vue`,全站 `openReference`/`referenceSettlementNos` 无第二处引用):
|
||||||
|
- 模板:`el-select` → `el-input readonly` + 外层 `el-tooltip`,`:model-value="referenceDisplayText"`,`placeholder="请输入"`,`:disabled="readonly"`,**`@click="!readonly && openReference()"` 让整框可点开弹窗**;右侧「选择」按钮保留。
|
||||||
|
- 新增 computed:`referenceSettlementCount`、`referenceDisplayText`(单张显示单号;**多张只显示 `已选 N 张结算单`**,完整单号靠 tooltip,明细看下方「结算信息」表)。
|
||||||
|
- 删除 `handleSettlementSelectVisible` 方法与 `settlementNoSelectRef`;样式 `.payment-form-page__settlement-select{,:deep(...)}` → `.payment-form-page__settlement-input`(+ `cursor:pointer` / disabled 时 `not-allowed`)。
|
||||||
|
- ⚠️ 踩坑:第一版把「共 N 张」做成 `el-input` 的 `#suffix` 插槽 → span=6 的窄列里后缀挤占宽度,单号被截成 `JS202610`,比不改还差。**窄列(≤span6)不要在输入框内塞后缀/前缀,把信息编进 `:model-value` 文本本身**。
|
||||||
|
- 验证(项目根临时 html + `vue/dist/vue.esm-bundler.js`,用完即删):
|
||||||
|
- ⚠️ 临时页必须 import `vue/dist/vue.esm-bundler.js`,默认 `vue` 是 runtime-only,字符串 template 报 “runtime compilation is not supported”。
|
||||||
|
- 4 态实测:空值 placeholder 正确 / 单张显单号 / 多张显「已选 3 张结算单」且不截断 / 查看态 disabled 且按钮隐藏;输入框宽 132px、行高 32px。
|
||||||
|
- 点击探针验证:可编辑态点 `.el-input` 命中 1 次(el-tooltip 不拦截 click),查看态命中 0 次 ✓。
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# 2026-10-15
|
||||||
|
|
||||||
|
## 10:46 付款申请表单「结算单号」修复丢失 → 重放并提交
|
||||||
|
- 现象:用户反馈昨天改好的「结算单号」(只读输入框 + 整框可点开选择弹窗)今天又变回旧的 `el-select` 写法。
|
||||||
|
- 根因:昨天的改动**一直没有 commit**,是纯工作区改动;用户 pull(HEAD 到 9919fb9,两个 settlement 样式提交包含该文件旧版)后被覆盖。教训同 2026-09-18「漏提交新文件」一役:**本仓库改动必须尽快显式 commit**,`git status` 干净 ≠ 改动还在。
|
||||||
|
- 处理:按昨天方案 A 原样重放 4 处修改(模板 el-select→el-input readonly+tooltip+整框可点、新增 `referenceSettlementCount`/`referenceDisplayText` computed、删 `handleSettlementSelectVisible`、样式类改名 `__settlement-input` + cursor 规则),curl 自检 vue/style 均 200。
|
||||||
|
- **这次只提交该单文件**:`git commit -m ":bug: ..." -- src/views/payment/payment-application-form.vue` → `db03ced`(`.workbuddy/memory` 不入库,留在工作区)。尚未 push,等用户确认。
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
# 2026-10-20
|
||||||
|
|
||||||
|
## settlement-import 列表页工具栏对齐 receipt-settlement
|
||||||
|
|
||||||
|
- `src/views/settlement/settlement-import.vue`:
|
||||||
|
- 左侧只保留「新增」(`type="primary"`),删掉原来的 `plain` 文字「刷新」按钮(刷新统一收进右侧图标组,与 receipt-settlement / settlement-adjustment 一致)。
|
||||||
|
- 右侧接入 `<settlement-table-tools>`(`./components/settlement-table-tools.vue`,即 `table-header-tools` 包装):刷新 / 列设置 / 搜索显隐 / 表格尺寸 4 键,`@refresh="refreshTable"`。
|
||||||
|
- 表格列改为配置化,新增 `src/option/settlement/settlementImportTable.js`(`settlementImportTableColumns`),页面加 `tableColumns / visibleColumnKeys / tableSize / columnSettingOptions / visibleTableColumns`,`el-table` 加 `:size="tableSize"`。
|
||||||
|
- 列渲染标志:`link / status / enum / billType / count`(注意**不能用 `type` 作 key**,`type` 是 el-table-column 真实 prop,会把列变成 selection/index 列)。
|
||||||
|
- 新增 `displayValue()`;`settlementBillTypeLabel('')` 返回 `-`。
|
||||||
|
- 序号列改 `fixed="left"`;数据列与操作列统一 `align: 'center'`,操作链接 `justify-content: center`。
|
||||||
|
- 校验方式(无 dev server 时):项目根目录临时 `sfc-check.mjs` 用 `vue/compiler-sfc` 的 `parse + compileTemplate + compileScript`;SCSS 用 `sass.compileString`。用完即删。
|
||||||
|
|
||||||
|
## 追加:用户要求「列显隐 + 显示方式」→ 两个页面改 avue-crud
|
||||||
|
|
||||||
|
用户反馈上面那版不对:右侧工具按钮必须是 **avue-crud 原生**的 4 键,第 2 键是「列显隐」抽屉(不是「列设置」勾选弹窗),第 4 键是「显示方式」(表格↔卡片),不是表格尺寸循环。确认后范围:`settlement-import` + `formal-settlement`(receipt/payment 共用)都改 avue-crud。
|
||||||
|
|
||||||
|
- 关键结论:**「列显隐 + 显示方式」只有 avue-crud 原生才有**,avue 的 `dialog-column` 依赖 `inject: ['crud']`,脱离 avue-crud 拿不出来;`table-header-tools` 只是仿制件,做不到。所以目标页只能整页改 avue-crud。
|
||||||
|
- avue 右侧按钮源码:`node_modules/@smallwei/avue/lib/packages/element-plus/crud/menu/header-menu3.js`(refreshBtn/columnBtn/searchBtn/gridBtn,`gridBtn` → `handleGridShow()` 切 `gridShow` 表格↔卡片);图标默认配置在同目录 `config.js`。
|
||||||
|
- 新增 `src/option/settlement/settlementImport.js`(`settlementImportOption`)、`src/option/settlement/formalSettlement.js`(`formalSettlementOption`,表格列复用 `formalSettlementTable.js` 的 `formalSettlementTableColumns` + `COLUMN_EXTRA` 增量配置,避免两处维护)。
|
||||||
|
- `settlement-import.vue` 整页改 avue-crud(删除手写的搜索区/表格/分页);`formal-settlement-table-panel.vue` 由 el-table 改成包一层 `<avue-crud>`,父页面保留数据加载与全部业务动作。
|
||||||
|
- ⚠️ **avue 的搜索自定义控件要用 `column.renderSearch`(`h()` 渲染),不能用 `searchslot`** —— avue 3.9.2 根本不读 `searchslot`(全库无此字段),而 `searchslot: true` 还会被 `header-search2.js` 的 `searchXxx → xxx` 映射成 `slot: true`。真正的搜索插槽是 avue-crud 上 `${prop}-search`(`crud.searchSlot`,见 `index2.js` `getSlotList(["-search"])`),但其作用域**没有 `row`**(只有 value/column/label/size/readonly/disabled/dic),`mileage-record.vue` 用 `{ row }` 是错的。已用于批次号下拉(filterable + allowCreate)。
|
||||||
|
- avue `formatter` 签名确认:`detail.js` → `column.formatter(row, row[column.prop], result, column)`。
|
||||||
|
- `on-load` 由 `table-page2.js` 在 created / 翻页 / 改页容量时触发,参数是内部 `defaultPage`(已 `Object.assign` 合并外部 page)。
|
||||||
|
- 分页透传写法(父持 page、子包 avue-crud):子组件用 computed `crudPage{get/set}`,setter 里 `Object.assign(this.page, value)` 原地回写,避免 prop 直接赋值告警。
|
||||||
|
- ⚠️ `src/option/settlement/formalSettlementTable.js` **不能删** —— `formal-settlement-editor.vue` 还从它导入 `candidateColumns/candidateDetailColumns/detailColumns/sourceColumns/summaryColumns`(我一度删掉,Vite 转换报错后从 HEAD 恢复)。
|
||||||
|
- 校验方式升级:沙箱里 curl 不通 dev server(502),改用 `vite.createServer({ middlewareMode:true })` + `server.transformRequest(path)` 就地转换,能同时暴露依赖解析失败(如上面误删文件)。脚本用完即删。
|
||||||
|
|
||||||
|
## 遗留未改(仍用 table-header-tools 仿制件)
|
||||||
|
|
||||||
|
pre-settlement、settlement-adjustment、receivable-payable-detail、transport-reconciliation-table-panel、business/{master-order,loading-manage,voucher-manage}、payment/* 手写页。若用户要全站一致,需逐页改 avue-crud。
|
||||||
@@ -1,52 +1,95 @@
|
|||||||
# 项目长期记忆(tms-erp-web-ws / Saber3 客商模块)
|
# 项目长期记忆(tms-erp-web-ws / Saber3)
|
||||||
|
|
||||||
## 设计约定(已确认)
|
后端:`/Users/gxwebsoft/JAVA/tms-api`(`tms-erp-api-ws` 滞后,别看错仓库)。
|
||||||
|
|
||||||
### 弹窗分组:统一用全局 `<section-card>`
|
## 列表 / 表单 / 详情三态同组件分流
|
||||||
- 弹窗 body 背景由 `src/styles/element-ui.scss` 全局 `.el-dialog__body { background:#f5f6fa; padding:16px }` 统一灰底。
|
`/xxx`、`/xxx/form`、`/xxx/detail` 指向同一 `.vue`;form/detail 在 `src/router/views/index.js` 是 `component: Layout` + 空 `children.path` + `meta:{keepAlive:false}`(detail 另带 `activeMenu`)。组件内按 `$route.path` 分流,必须 `watch:{$route}` 重新 init;标签标题取 `query.name`;独立页容器固定 `<div v-if>`,不用 `el-dialog`。
|
||||||
- 每组 = 白底卡片:4px 主色竖条 + 8px 间距 + 圆角 6px + 淡阴影。组件全局注册 `<section-card title="...">`,支持 `#title` / `#extra` slot。
|
|
||||||
- 仅 3 项的小分组用 `el-col :span="8"` 均分一行。
|
|
||||||
|
|
||||||
### Avue 内置弹窗用 section-card:dialogCustomClass 透明化 avue-form
|
## ⚠️ keep-alive 三坑
|
||||||
- option 顶层加 `dialogCustomClass:'xxx-dialog'`,再在 `element-ui.scss` 写三条:
|
背景(`router/tab.js` + `page/index/index.vue`):按 `fullPath` 建 wrapper,`<keep-alive :include="tagsKeep">` 缓存,**每标签一实例、永不销毁**,deactivate 后**仍随全局 `$route` 重渲染**。
|
||||||
1. `.xxx-dialog .avue-form { background:transparent; box-shadow:none; padding:0 }`
|
|
||||||
2. `.xxx-dialog .avue-form__group > .el-col > .el-form-item { margin-bottom:0 }`
|
|
||||||
3. `.xxx-dialog .avue-dialog__footer, .avue-crud__dialog .xxx-dialog .avue-dialog__footer { margin-top:0 !important }`
|
|
||||||
|
|
||||||
### 弹窗底部操作栏浮动(全局 CSS)
|
**坑一:独立页容器禁用 `<component :is>` 在 div / el-dialog 间切换。** `append-to-body` 走 Teleport,`TeleportImpl.move` 忽略 `moveType`,不会把 DOM 搬回缓存容器 → 切菜单冒出旧弹窗。修法:固定 `<div v-if>` + `deactivated(){closeInnerDialogs()}` + `beforeUnmount()`(写在子组件也生效)。已修 loading-manage / project-apply / waybill-manage-page;未修 `settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`、`waybill-import-dialog.vue`。
|
||||||
- `.el-dialog__body { max-height:calc(100vh - 200px); overflow-y:auto; overflow-x:hidden }`
|
|
||||||
- `.el-dialog__footer { margin:0; padding:12px 20px; background:#fff; border-top:1px solid #ebeef5; box-shadow:0 -2px 8px rgba(0,0,0,.04) }`
|
|
||||||
- Avue 内置弹窗 footer 真实 class 是 `.avue-dialog__footer`,须 `position:sticky; bottom:0; flex:none; background:#fff` 贴底。
|
|
||||||
|
|
||||||
### 上传证件区域尺寸(transportCapacity)
|
**坑二:宿主 view 直绑全局 `$route.query.*` 给子组件 prop。** 缓存实例被灌入当前页 id → 拿错 id 查后端(批量弹「运单管理不存在」),live computed 还会误 push 标签。修法:`routePathLocked` 锁路径 + watcher / push 前判 `isOwnedRouteActive` + 宿主绑定加路径守卫。⚠️ `routePathLocked` **必须放 `data()`**(Options API 顺序 data → computed → watch(immediate) → created;放 created 会读到空值、挡掉首次加载)。已修 waybill-manage-page / transport-plan-page + 三个宿主 view。
|
||||||
- 身份证/行驶证/道路运输证等固定 **240×151px**(1.586:1)。
|
|
||||||
- scoped 覆盖 `.xxx-uploader--large { width:240px }` 与 `--large .el-upload { width:100%; height:151px }`。
|
|
||||||
|
|
||||||
### 上传图片点击放大预览
|
**坑四:avue-crud 弹窗 `append-to-body` 默认 true(`dialog-form3.js`:`validData(tableOption.dialogAppendToBody, true)`),DOM Teleport 到 body。** 于是页面里以页面容器为祖先的 scoped 选择器(`.xxx-page :deep(.yyy)`)**命中不到弹窗内容**,尤其 `el-cascader`(inline-block、宽度按内容收缩,不像 `el-input`/`el-autocomplete` 有 `--el-input-width:100%` 兜底)会明显比同行 input 窄。修法:option 里配 `dialogCustomClass: 'xxx-dialog'`,规则写到 `src/styles/element-ui.scss` 的 `.xxx-dialog ...`(项目既有约定,10+ 处同款);或把基准类放在 **Teleport 内部元素**上(如 ship.vue 的 `.ship-form` 挂在 el-form 上,自身带 scope 属性,照样生效)。
|
||||||
- `src/components/image-upload-field/main.vue` 用 `<el-image preview-src-list fit="contain" preview-teleported :z-index="3000" @click.stop>`,阻止冒泡到 el-upload。
|
|
||||||
|
|
||||||
### 独立表单页标题 `archive-page-form__title`
|
**坑五:avue 表单项控件不是 `.el-form-item__content` 的直接子级。** `form/index3.js` 渲染为 `content > div > [div|elTooltip] > 控件`,所以 `.el-form-item__content > .el-cascader` 这类**直接子级选择器对 avue 表单全部失效**(手写 `<el-form-item>` 才生效),一律用后代选择器。
|
||||||
- 样式全局化到 `src/styles/element-ui.scss`:18px/600/#303133 + margin-bottom:20px + 4px 主色竖条 + 8px 间距。
|
|
||||||
- business-crud-page 系列通过 `formPageTitle` prop 注入;loading-manage / master-order 手写前置标题。
|
|
||||||
|
|
||||||
### 表格列内嵌输入控件全宽
|
**坑六:`labelWidth: 'auto'` 在 Element Plus 里逐项计算,不是全表单共享。** 实测同一弹窗:3 字 54/64px、2 字 40px、4 字 68px、4 字带必填星号 78px;label 越宽 → 控件可用宽度越小,同级控件宽度就不一致(车牌号 input 486 vs 使用部门 cascader 472)。要让同一行控件等宽必须统一 label 宽度:`.xxx-dialog .el-form-item__label { flex: 0 0 calc(Nem + 24px) !important; width: calc(Nem + 24px) !important }`(N=本列最长汉字数,与 ship.vue、`.dialog-form--carded` 同款)。
|
||||||
- `element-ui.scss` 全局兜底:`.el-table .el-table__body td.el-table__cell .cell > .el-input-number/.el-input/.el-select/.el-date-editor/.el-cascader { width:100% }`。
|
|
||||||
|
|
||||||
### 业务状态标签文字化
|
**验证 avue 弹窗 DOM/宽度的可复用办法:** 项目根建临时 html(Vite 直接服务)→ 引真实 option 与 `src/styles/element-ui.scss`,挂 avue-crud 并 `mounted(){ this.$refs.crud.rowAdd() }` 弹出真弹窗;用 `agent-browser`(`/Users/gxwebsoft/.workbuddy/binaries/node/workspace/node_modules/.bin/agent-browser`)`open` + `eval` 读 DOM 链路与 `getBoundingClientRect`,用完删文件。
|
||||||
- 全站"状态语义"的 `el-tag` 加 `class="status-text"`,转为普通文字,不带颜色/背景/边框/圆点。
|
|
||||||
- 实现:`element-ui.scss` 末尾 `.el-tag.status-text { ... }`。
|
|
||||||
|
|
||||||
## 关键文件
|
**坑三:路由表重复定义 → 内容区整页空白(2026-09-18)。** `/business/contract-manage/detail` 在 `router/views/index.js` 定义两次、子路由同名 `合同详情`。重名 `addRoute` 会 `removeRoute(name)` 移除旧子记录,但**不从父记录 children 里摘除**,第一条 Layout 壳记录留在 matcher 且靠前 → `resolve()` 命中它 → `$route.matched.length === 1` → 二级 router-view 无匹配 → 侧栏/标签正常但内容空白。修法:删重复定义。排查:扫「顶层 path + 首个子路由 name」重复项。
|
||||||
- `src/components/section-card/main.vue`
|
|
||||||
- `src/styles/element-ui.scss`
|
|
||||||
- `src/views/vehicle/customer-archive.vue`
|
|
||||||
- `src/views/transportCapacity/{driver,vehicle,ship}.vue`
|
|
||||||
- `src/views/business/project-apply.vue`
|
|
||||||
|
|
||||||
## 环境注意
|
## 列表页右上角按钮组(table-header-tools 标准件)
|
||||||
- Vite 代理跨域:`axios.withCredentials=true`,改 `.env`/`vite.config.mjs` 须重启 dev。
|
⚠️ **2026-10-14 修正:最终方向是手写列表页改用 `avue-crud`**。用户要求与其它模块"完全一致",而 avue 的列显隐抽屉(`el-drawer`+表格,隐藏/冻结/过滤/排序,行拖拽)是 avue-crud 内部子组件(`inject: ['crud']`),脱离 avue-crud 拿不出来;第 4 键也是 avue 的"表格↔卡片视图"切换。所以 `table-header-tools` 只是过渡仿制件,**新页面不要再接**,直接写 avue-crud。
|
||||||
|
|
||||||
## business-crud-page 复用模式
|
手写 `el-table` 列表页若暂时保留,右上角统一用 `src/components/table-header-tools/main.vue`,复刻 avue-crud 默认 4 键:刷新 `el-icon-refresh` / 列设置 `el-icon-operation` / 搜索显隐 `el-icon-search` / 表格尺寸 `el-icon-grid`(default→large→small 循环)。
|
||||||
- option 由 prop `crudOption` 经 `cloneOption` 克隆。
|
|
||||||
- 独立表单页走 `PageAvueForm`,不包 el-dialog。
|
- 接入范式:`<table-header-tools :columns="columns" v-model:visible-column-keys="visibleColumnKeys" v-model:table-size="tableSize" v-model:search-visible="searchVisible" @refresh="loadTable" />`;配套:搜索区 `v-if="searchVisible"`、el-table `:size="tableSize"`、列用 computed `visibleColumns = columns.filter(c => visibleColumnKeys.includes(c.prop))`。⚠️ 不能 `v-for` + `v-if` 同元素(Vue3 v-if 优先级更高,取不到 column 变量)。
|
||||||
- 自定义详情弹窗:`config.detailButton=true` + `detailSections:[{title, fields}]`。
|
- 表格在子组件时(如 `payment/components/bill-*-table.vue`):子组件加 props `searchVisible` + emits `refresh`/`update:searchVisible`,父页面 `v-model:search-visible` + `@refresh`,搜索子组件加 `v-if="searchVisible"`。
|
||||||
|
- `icon="el-icon-xxx"` 字符串**依赖 Avue 的全局 el-icon 映射**(`main.js` 只注册 EP 的 PascalCase 图标),临时验证页没 `app.use(Avue)` 会渲染成空圆按钮 —— 别误判成组件 bug。
|
||||||
|
- 组件已加 `deactivated()` 关列设置弹窗(防 keep-alive 下 Teleport 弹窗残留)。
|
||||||
|
- 已接入(过渡态,待逐页改 avue):business/{master-order,loading-manage,voucher-manage}、settlement、payment 模块手写页。
|
||||||
|
|
||||||
|
## avue-crud 列表页改造要点(payment 模块样板,2026-10-14)
|
||||||
|
- **列显隐抽屉**:点第 2 键弹出,标题"列显隐"(语言包 `crud.showTitle`),表头 列名/隐藏/冻结/过滤/排序。直接读写 avue crud 的列配置,页面无需实现。
|
||||||
|
- **第 4 键**:`handleGridShow()` = 表格 ↔ 卡片视图(`tableCard` 按列通用渲染),页面无需写卡片模板。
|
||||||
|
- `searchOrder` 是**降序**排序(值越大越靠前):`list.sort((a,b) => (b.searchOrder||0) - (a.searchOrder||0))`。首次改造踩过坑。
|
||||||
|
- `searchIndex: 4` + `searchIcon: true` → 默认只显示前 4 个搜索项 + "展开/收起"(columnLen > searchIndex 时才出现该按钮)。
|
||||||
|
- **搜索项 label 与表格列 label 不同**(列「收款方」/搜索「客户名称」):单独定义 hide 列 + `searchProp` 指向后端字段(avue 在 search-change 里自动改名)。
|
||||||
|
- 搜索专用列加 `hide: true` + `showColumn: false`,否则会混进列显隐抽屉。
|
||||||
|
- ⚠️ **`createTime`/`updateTime` 必须显式给 `width: 180`**(全站统一,参考 `option/base/common-address.js`)。不写宽度的列参与"剩余空间均分",容易被压到 80px 出现 `2026-0...` 截断 —— 这是**列缺 width**,不是操作列没固定;`menuFixed: 'right'` 各页早已配好(`main.js` 全局 `crudOption.menuWidth: 180`,avue 默认 220),别用"加宽操作列"来处理时间列截断。创建人/更新人给 `minWidth: 110`。
|
||||||
|
- ⚠️ **column 数组顺序 = 表格列顺序**:搜索专用列别插在表格列中间(会把表格列顶到前面);deptName 这种"既搜索又展示"的列要放回表格列的正确位置。
|
||||||
|
- 分页:`page: { currentPage, pageSize, pageSizes, total }`;`on-load` 由 avue 内部(table-page)在 created / 翻页 / 改页容量时触发,`current-change`/`size-change` 里**只改 page 不要再调 onLoad**(否则双请求)。
|
||||||
|
- `onLoad(page)` 只用 `this.query`(avue 传的 page 对象含 total/pageSizes 等分页字段,别 spread 进查询参数)。
|
||||||
|
- 搜索参数转换放 `searchChange(params, done)`:日期区间数组拆成 `xxxStartDate/xxxEndDate`;所属组织级联用 `normalizeOrganizationSearch(params, 'deptName')`(见 `mixins/organization-search.js`,option 里该列加 `searchslot: true`)。
|
||||||
|
- 单元格空值统一 `-`:列级 `formatter: (row, value) => ...`;金额 `Number(v||0).toFixed(2)`;状态/链接用 `slot: true` + `#prop` 插槽。
|
||||||
|
- 操作列用 `#menu` 插槽(`menuWidth: 320`),`addBtn/viewBtn/delBtn/editBtn: false` 关掉 avue 自带按钮。
|
||||||
|
|
||||||
|
## 地址/行政区划展示(全站既有规则)
|
||||||
|
「省/市/区县」都要空格分段,但**省与自治区不重复展示**:`上海市浦东新区`→`上海市 浦东新区`,`广西壮族自治区南宁市邕宁区`→`南宁市 邕宁区`(同 `formatRoadLocation` / `formatRouteCityDistrict` / 总单列表 `formatRoadAddress` 一致)。
|
||||||
|
- 统一入口:`src/utils/region-address.js` 的 `formatRegionAddress(value)`(按后缀切分行政区划,`州+市`、`县+区` 连写合并;**只有整串都是行政区划**才重排,站点名「南宁站/广州南站」与含门牌的详细地址原样返回)。v-for 列表里用它做展示时,直接把函数挂进 `methods` 用 ES6 简写(`formatRegionAddress,`)。
|
||||||
|
- ⚠️ 路线节点的名称字段来自后端 `routeJson`:`routes[i].departureName` = 第 i 段**到货地/途经地**(不是本段发货地),末段 = 最终收货地;`master.departureName/arrivalName` 才是总发货/总收货。总单调度/详情都按「上一个节点的 departureName」拼分段起点。
|
||||||
|
|
||||||
|
## 样式硬规则
|
||||||
|
- 底栏 `flex; justify-content:flex-end`,**不写 gap**(靠 EP 默认 `.el-button+.el-button{margin-left:12px}`);浮动底栏必须 `position:fixed`(祖先 overflow:hidden 使 sticky 失效)+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`,`:global()` 要包整个选择器。
|
||||||
|
- 按钮层级:次要=无 type;中间步骤=`primary plain`;主操作=`primary`(禁绿、禁两个蓝实心)。顺序 `[辅助][取消][保存草稿][提交]`。
|
||||||
|
- 独立页标题 `.archive-page-form__title`;分组用全局 `<section-card>`;上传证件区 `width:100%; max-width:240px` + `.el-upload{height:151px}`。
|
||||||
|
- ⚠️ `<style scoped lang="scss">` 顶层禁 `//` 注释(Vite5 + sass `Unexpected '/'` → 500),顶层用 `/* */`。其余见 `src/styles/element-ui.scss` 与 `AGENTS.md` 4.4。
|
||||||
|
- **搜索栏「展开/收起」唯一标准写法**(settlement 5 处已用、avue 页面同款):
|
||||||
|
`<el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">{{ searchExpanded ? '收起' : '展开' }}</el-button>`
|
||||||
|
放「查询/重置」**之后**(最右);禁 `el-tooltip` 包图标按钮、禁文案「折叠」。`ArrowUp/ArrowDown` 要 import 并放 `data()`(`:icon` 是表达式)。
|
||||||
|
显示条件与 avue 一致(`header-search3.js` 的 `isSearchIcon = searchIcon===true && columnLen > searchIndex`):搜索项 **≤4 项不渲染按钮** —— 故 data 里维护 `searchIndex: 4` + `searchItemCount: N`,用 computed `showSearchToggle` 控制。搜索栏操作区 `gap: 8px` 各模块一致,**不要去改**。
|
||||||
|
|
||||||
|
## 表单 / 自检 / 导出
|
||||||
|
- placeholder 只写 `请输入`/`请选择`;例外:`请输入或选择车辆`、日期区间 `起`/`止`、示例值。校验 message 须带字段名。
|
||||||
|
- `business-crud-page.vue`:option 经 `cloneOption` 克隆,独立表单页走 `PageAvueForm`。
|
||||||
|
- 自检:`curl "localhost:2888/src/xxx.vue"` 与 `"...?vue&type=style&index=0&scoped=true&lang.scss"`(200 / 500)。`vite build` 在 `facelogin.vue` 被沙箱中断,不能作唯一校验。dev `VITE_APP_API=/api` 代理 `172.16.203.228:8000`。
|
||||||
|
- 导出:前端 `exportColumns` 后端未用,以 `XxxExportExcel.java` 为准;BladeX `BeanUtil` 类型不兼容静默跳过(`Date` → `LocalDateTime` 丢值,用 `DateUtil.fromDate`)。
|
||||||
|
|
||||||
|
## avue-crud 才是「右侧 4 键」的唯一来源(2026-10-20 定论)
|
||||||
|
用户要的右侧工具栏是 **avue-crud 原生**:刷新 / **列显隐**(el-drawer,含 隐藏/冻结/过滤/排序 + 行拖拽)/ 搜索显隐 / **显示方式**(表格↔卡片)。
|
||||||
|
- 源码:`node_modules/@smallwei/avue/lib/packages/element-plus/crud/menu/header-menu3.js`(refreshBtn/columnBtn/searchBtn/gridBtn),`gridBtn` → `handleGridShow()` 切 `gridShow`;图标默认在同目录 `config.js`。「列显隐」文案来自 avue 语言包 `crud.showTitle`(项目 `src/lang/zh.js` 已覆盖)。
|
||||||
|
- **列显隐抽屉依赖 `inject: ['crud']`,脱离 avue-crud 拿不出来**;`components/table-header-tools` 的「列设置勾选弹窗 + 表格尺寸循环」是仿制件,**做不到这两点**。所以「要和 avue 一致」= 整页改用 avue-crud,没有中间方案。
|
||||||
|
- ⚠️ 搜索自定义控件用 `column.renderSearch = scope => h(...)`(`scope.row` 可用,同 `mixins/organization-search.js`)。**不要用 `searchslot`**:avue 3.9.2 全库无此字段,且 `header-search2.js` 的 `searchXxx → xxx` 映射会把 `searchslot` 变成 `slot: true`。
|
||||||
|
- avue-crud 上的 `${prop}-search` 插槽确实存在(`index2.js` 的 `getSlotList(["-search"])`),但**作用域没有 `row`**(只有 value/column/label/size/readonly/disabled/dic)——`mileage-record.vue` 里 `{ row }` 是错的写法,别照抄。
|
||||||
|
- `formatter` 签名:`detail.js` → `column.formatter(row, row[column.prop], result, column)`。
|
||||||
|
- `on-load` 由 `table-page2.js` 在 created / 翻页 / 改页容量时触发,参数是内部 `defaultPage`(已合并外部 page)。分页若由父组件持有、子组件包一层 avue-crud,用 computed `crudPage{get/set}` + setter 里 `Object.assign(this.page, value)` 原地回写。
|
||||||
|
- 已改:settlement-import.vue、formal-settlement.vue + components/formal-settlement-table-panel.vue(receipt/payment 共用)。未改:pre-settlement、settlement-adjustment、receivable-payable-detail、transport-reconciliation-table-panel、business 与 payment 的手写页。
|
||||||
|
- ⚠️ `src/option/settlement/formalSettlementTable.js` 别删:`formal-settlement-editor.vue` 还依赖它的 candidate/detail/source/summary 列。
|
||||||
|
- 沙箱里 curl 打不通本地 dev server(一律 502)。改用 `vite.createServer({middlewareMode:true})` + `server.transformRequest(path)` 就地转换校验,还能暴露依赖解析失败。
|
||||||
|
|
||||||
|
## Element Plus 图标两种用法的机制差异(易误判)
|
||||||
|
`main.js` 里 `for (...ElementPlusIconsVue) app.component(key, component)` 全局注册了全部图标,因此模板里可以写标签形式 `<Location />`(靠全局注册解析)。
|
||||||
|
但 `:icon="OfficeBuilding"` 是**表达式**,编译成 `_ctx.OfficeBuilding`,只会从 data / props / computed / setup 返回值里取 —— **组件对象必须放进 `data()`**;放进 `components: {}` 注册里模板取不到,会静默渲染不出图标(不报错,只是空白)。
|
||||||
|
项目既有惯例:需要 `:icon` 的图标一律 `import` 后在 `data()` 里 `return { Xxx }`(transport-plan-page、waybill-manage-page、business-crud-page 都是这么写的)。
|
||||||
|
注:标签形式(如 `<Location />`)不依赖 data,放不放 data 都能显示;仅 `:icon` 必须放 data。
|
||||||
|
|
||||||
|
## 全局 `showOverflowTooltip: true` 与自定义多行单元格(2026-10-14 踩)
|
||||||
|
`main.js` 的 `app.use(ElementPlus, { table: { showOverflowTooltip: true } })`(+ Avue `crudOption.showOverflowTooltip: true`)→ **全站所有表格列默认开启 hover 提示**,EP 会给该列 `.cell` 加 `.el-tooltip` 类(`white-space: nowrap` + 固定宽度 + 溢出省略)。
|
||||||
|
后果:**列里放自定义多行 / 分组内容时,内层文本继承 nowrap → 横向溢出 → 单元格被裁切 + hover 弹提示**(极易被误判成"组件 bug")。
|
||||||
|
修法(列级豁免,不动全局):① 列上显式 `:show-overflow-tooltip="false"`;② 内层容器补 `white-space: normal` 兜底。两处都写最稳。
|
||||||
|
☑️ 已用于路线变更「变更内容」列(`loading-manage.vue` / `components/waybill-manage-page.vue` / `components/business-crud-page.vue` 三处)。
|
||||||
|
另:`styles/element-ui.scss` 里已有两条基于 `.cell.el-tooltip` 的既有豁免规则(操作列 `:has(.el-link)`、`class-name="is-ellipsis-link"`),改表格列时先看这两条。
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||||
<meta name="format-detection" content="telephone=no" />
|
<meta name="format-detection" content="telephone=no" />
|
||||||
|
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||||
|
<meta http-equiv="Pragma" content="no-cache" />
|
||||||
<link rel="stylesheet" href="/iconfont/index.css" />
|
<link rel="stylesheet" href="/iconfont/index.css" />
|
||||||
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
|
<link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
|
||||||
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
|
<link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>oa登录</title>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js">
|
||||||
|
</script>
|
||||||
|
<script>
|
||||||
|
// 获取URL查询字符串
|
||||||
|
const queryString = window.location.search;
|
||||||
|
|
||||||
|
// 使用URLSearchParams解析查询字符串
|
||||||
|
const urlParams = new URLSearchParams(queryString);
|
||||||
|
|
||||||
|
// 获取特定的参数值
|
||||||
|
var userid = urlParams.get('userid'); // 用户id
|
||||||
|
var username = urlParams.get('username'); // 用户名
|
||||||
|
var redirectUrl = urlParams.get('redirectUrl'); // 重定向地址
|
||||||
|
|
||||||
|
if(userid==null){
|
||||||
|
userid="";
|
||||||
|
}
|
||||||
|
if(username==null){
|
||||||
|
username="";
|
||||||
|
}
|
||||||
|
|
||||||
|
$.get("/oaApi/getToken?userid="+userid+"&username="+username,function(result){
|
||||||
|
debugger
|
||||||
|
//成功返回token
|
||||||
|
if(result.data.token){
|
||||||
|
//设置系统的cookie
|
||||||
|
document.cookie = "X-AUTH-TOKEN="+result.data.token;
|
||||||
|
|
||||||
|
if(redirectUrl==null){
|
||||||
|
//如果是登录就跳转到系统首页
|
||||||
|
window.location.href = "./";
|
||||||
|
}else {
|
||||||
|
//如果是待办有重定向就跳转
|
||||||
|
window.location.href = redirectUrl;
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
alert("该业务系统未同步当前oa用户");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -4,9 +4,11 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --host",
|
"dev": "vite --host",
|
||||||
"prod": "vite --mode production",
|
"prod": "vite --mode production",
|
||||||
"build": "vite build",
|
"build": "vite build && node scripts/zip-dist.mjs",
|
||||||
"build:prod": "vite build --mode production",
|
"build:prod": "vite build --mode production && node scripts/zip-dist.mjs",
|
||||||
"serve": "vite preview --host"
|
"zip:dist": "node scripts/zip-dist.mjs",
|
||||||
|
"serve": "vite preview --host",
|
||||||
|
"typecheck": "vue-tsc -p jsconfig.json --noEmit"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@element-plus/icons-vue": "^2.3.1",
|
"@element-plus/icons-vue": "^2.3.1",
|
||||||
@@ -23,6 +25,7 @@
|
|||||||
"crypto-js": "^4.1.1",
|
"crypto-js": "^4.1.1",
|
||||||
"dayjs": "^1.10.6",
|
"dayjs": "^1.10.6",
|
||||||
"disable-devtool": "^0.3.8",
|
"disable-devtool": "^0.3.8",
|
||||||
|
"echarts": "^6.1.0",
|
||||||
"element-plus": "^2.14.2",
|
"element-plus": "^2.14.2",
|
||||||
"exceljs": "^4.4.0",
|
"exceljs": "^4.4.0",
|
||||||
"highlight.js": "^11.9.0",
|
"highlight.js": "^11.9.0",
|
||||||
@@ -34,6 +37,7 @@
|
|||||||
"sm-crypto": "^0.4.0",
|
"sm-crypto": "^0.4.0",
|
||||||
"vue": "^3.5.13",
|
"vue": "^3.5.13",
|
||||||
"vue-i18n": "^11.4.2",
|
"vue-i18n": "^11.4.2",
|
||||||
|
"vue-pdf-embed": "^2.1.6",
|
||||||
"vue-router": "^4.3.2",
|
"vue-router": "^4.3.2",
|
||||||
"vue3-clipboard": "^1.0.0",
|
"vue3-clipboard": "^1.0.0",
|
||||||
"vuex": "^4.1.0",
|
"vuex": "^4.1.0",
|
||||||
@@ -45,9 +49,11 @@
|
|||||||
"prettier": "^2.8.7",
|
"prettier": "^2.8.7",
|
||||||
"sass": "^1.85.1",
|
"sass": "^1.85.1",
|
||||||
"terser": "^5.31.1",
|
"terser": "^5.31.1",
|
||||||
|
"typescript": "5.9.3",
|
||||||
"unplugin-auto-import": "^0.11.2",
|
"unplugin-auto-import": "^0.11.2",
|
||||||
"vite": "^5.4.19",
|
"vite": "^5.4.19",
|
||||||
"vite-plugin-compression": "^0.5.1",
|
"vite-plugin-compression": "^0.5.1",
|
||||||
"vite-plugin-vue-setup-extend": "^0.4.0"
|
"vite-plugin-vue-setup-extend": "^0.4.0",
|
||||||
|
"vue-tsc": "^3.3.11"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ settings:
|
|||||||
excludeLinksFromLockfile: false
|
excludeLinksFromLockfile: false
|
||||||
|
|
||||||
patchedDependencies:
|
patchedDependencies:
|
||||||
'@smallwei/avue':
|
'@smallwei/avue': 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
|
||||||
hash: 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
|
|
||||||
path: patches/@smallwei__avue.patch
|
|
||||||
|
|
||||||
importers:
|
importers:
|
||||||
|
|
||||||
@@ -15,34 +13,34 @@ importers:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@element-plus/icons-vue':
|
'@element-plus/icons-vue':
|
||||||
specifier: ^2.3.1
|
specifier: ^2.3.1
|
||||||
version: 2.3.2(vue@3.5.34)
|
version: 2.3.2(vue@3.5.34(typescript@5.9.3))
|
||||||
'@open-file-viewer/core':
|
'@open-file-viewer/core':
|
||||||
specifier: ^0.1.27
|
specifier: ^0.1.27
|
||||||
version: 0.1.27(pdfjs-dist@6.1.200)
|
version: 0.1.27(pdfjs-dist@6.1.200)
|
||||||
'@open-file-viewer/vue':
|
'@open-file-viewer/vue':
|
||||||
specifier: ^0.1.27
|
specifier: ^0.1.27
|
||||||
version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34)
|
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':
|
'@saber/nf-design-base-elp':
|
||||||
specifier: ^1.3.0
|
specifier: ^1.3.0
|
||||||
version: 1.3.0
|
version: 1.3.0
|
||||||
'@saber/nf-form-design-elp':
|
'@saber/nf-form-design-elp':
|
||||||
specifier: ^1.6.1
|
specifier: ^1.6.1
|
||||||
version: 1.6.1(vue@3.5.34)
|
version: 1.6.1(vue@3.5.34(typescript@5.9.3))
|
||||||
'@saber/nf-form-elp':
|
'@saber/nf-form-elp':
|
||||||
specifier: ^1.6.3
|
specifier: ^1.6.3
|
||||||
version: 1.7.0
|
version: 1.7.0
|
||||||
'@smallwei/avue':
|
'@smallwei/avue':
|
||||||
specifier: ~3.9.2
|
specifier: ~3.9.2
|
||||||
version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)
|
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:
|
animate.css:
|
||||||
specifier: ^4.1.1
|
specifier: ^4.1.1
|
||||||
version: 4.1.1
|
version: 4.1.1
|
||||||
avue-plugin-ueditor:
|
avue-plugin-ueditor:
|
||||||
specifier: ^1.0.4
|
specifier: ^1.0.4
|
||||||
version: 1.0.4(axios@1.16.0)(vue@3.5.34)
|
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:
|
axios:
|
||||||
specifier: ^1.13.5
|
specifier: ^1.13.5
|
||||||
version: 1.16.0
|
version: 1.16.0(debug@4.4.3(supports-color@7.2.0))
|
||||||
codemirror:
|
codemirror:
|
||||||
specifier: ^5.65.21
|
specifier: ^5.65.21
|
||||||
version: 5.65.21
|
version: 5.65.21
|
||||||
@@ -55,21 +53,24 @@ importers:
|
|||||||
disable-devtool:
|
disable-devtool:
|
||||||
specifier: ^0.3.8
|
specifier: ^0.3.8
|
||||||
version: 0.3.9
|
version: 0.3.9
|
||||||
|
echarts:
|
||||||
|
specifier: ^6.1.0
|
||||||
|
version: 6.1.0
|
||||||
element-plus:
|
element-plus:
|
||||||
specifier: ^2.14.2
|
specifier: ^2.14.2
|
||||||
version: 2.14.2(vue@3.5.34)
|
version: 2.14.2(vue@3.5.34(typescript@5.9.3))
|
||||||
exceljs:
|
exceljs:
|
||||||
specifier: ^4.4.0
|
specifier: ^4.4.0
|
||||||
version: 4.4.0
|
version: 4.4.0
|
||||||
highlight.js:
|
highlight.js:
|
||||||
specifier: ^11.9.0
|
specifier: ^11.9.0
|
||||||
version: 11.11.1
|
version: 11.12.0
|
||||||
js-base64:
|
js-base64:
|
||||||
specifier: ^3.7.4
|
specifier: ^3.7.4
|
||||||
version: 3.7.8
|
version: 3.9.4
|
||||||
js-cookie:
|
js-cookie:
|
||||||
specifier: ^3.0.0
|
specifier: ^3.0.0
|
||||||
version: 3.0.5
|
version: 3.0.8
|
||||||
js-md5:
|
js-md5:
|
||||||
specifier: ^0.7.3
|
specifier: ^0.7.3
|
||||||
version: 0.7.3
|
version: 0.7.3
|
||||||
@@ -84,26 +85,29 @@ importers:
|
|||||||
version: 0.4.0
|
version: 0.4.0
|
||||||
vue:
|
vue:
|
||||||
specifier: ^3.5.13
|
specifier: ^3.5.13
|
||||||
version: 3.5.34
|
version: 3.5.34(typescript@5.9.3)
|
||||||
vue-i18n:
|
vue-i18n:
|
||||||
specifier: ^11.4.2
|
specifier: ^11.4.2
|
||||||
version: 11.4.2(vue@3.5.34)
|
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@5.9.3))
|
||||||
vue-router:
|
vue-router:
|
||||||
specifier: ^4.3.2
|
specifier: ^4.3.2
|
||||||
version: 4.6.4(vue@3.5.34)
|
version: 4.6.4(vue@3.5.34(typescript@5.9.3))
|
||||||
vue3-clipboard:
|
vue3-clipboard:
|
||||||
specifier: ^1.0.0
|
specifier: ^1.0.0
|
||||||
version: 1.0.0(vue@3.5.34)
|
version: 1.0.0(vue@3.5.34(typescript@5.9.3))
|
||||||
vuex:
|
vuex:
|
||||||
specifier: ^4.1.0
|
specifier: ^4.1.0
|
||||||
version: 4.1.0(vue@3.5.34)
|
version: 4.1.0(vue@3.5.34(typescript@5.9.3))
|
||||||
xlsx:
|
xlsx:
|
||||||
specifier: 0.18.5
|
specifier: 0.18.5
|
||||||
version: 0.18.5
|
version: 0.18.5
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@vitejs/plugin-vue':
|
'@vitejs/plugin-vue':
|
||||||
specifier: ^5.2.4
|
specifier: ^5.2.4
|
||||||
version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34)
|
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':
|
'@vue/compiler-sfc':
|
||||||
specifier: ^3.4.27
|
specifier: ^3.4.27
|
||||||
version: 3.5.34
|
version: 3.5.34
|
||||||
@@ -116,18 +120,24 @@ importers:
|
|||||||
terser:
|
terser:
|
||||||
specifier: ^5.31.1
|
specifier: ^5.31.1
|
||||||
version: 5.46.2
|
version: 5.46.2
|
||||||
|
typescript:
|
||||||
|
specifier: 5.9.3
|
||||||
|
version: 5.9.3
|
||||||
unplugin-auto-import:
|
unplugin-auto-import:
|
||||||
specifier: ^0.11.2
|
specifier: ^0.11.2
|
||||||
version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34))(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:
|
vite:
|
||||||
specifier: ^5.4.19
|
specifier: ^5.4.19
|
||||||
version: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
version: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
||||||
vite-plugin-compression:
|
vite-plugin-compression:
|
||||||
specifier: ^0.5.1
|
specifier: ^0.5.1
|
||||||
version: 0.5.1(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
|
version: 0.5.1(supports-color@7.2.0)(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
|
||||||
vite-plugin-vue-setup-extend:
|
vite-plugin-vue-setup-extend:
|
||||||
specifier: ^0.4.0
|
specifier: ^0.4.0
|
||||||
version: 0.4.0(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
|
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@5.9.3)
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
|
|
||||||
@@ -785,6 +795,20 @@ packages:
|
|||||||
vite: ^5.0.0 || ^6.0.0
|
vite: ^5.0.0 || ^6.0.0
|
||||||
vue: ^3.2.25
|
vue: ^3.2.25
|
||||||
|
|
||||||
|
'@volar/language-core@2.4.28':
|
||||||
|
resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
|
||||||
|
|
||||||
|
'@volar/source-map@2.4.28':
|
||||||
|
resolution: {integrity: sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==}
|
||||||
|
|
||||||
|
'@volar/typescript@2.4.28':
|
||||||
|
resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==}
|
||||||
|
peerDependencies:
|
||||||
|
typescript: '*'
|
||||||
|
peerDependenciesMeta:
|
||||||
|
typescript:
|
||||||
|
optional: true
|
||||||
|
|
||||||
'@vue/compiler-core@3.5.34':
|
'@vue/compiler-core@3.5.34':
|
||||||
resolution: {integrity: sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw==}
|
resolution: {integrity: sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw==}
|
||||||
|
|
||||||
@@ -800,6 +824,9 @@ packages:
|
|||||||
'@vue/devtools-api@6.6.4':
|
'@vue/devtools-api@6.6.4':
|
||||||
resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
|
resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
|
||||||
|
|
||||||
|
'@vue/language-core@3.3.13':
|
||||||
|
resolution: {integrity: sha512-axA0Xemn5LuUKuKWob0/kVq7xQ2mJJM6VqA9Exvt35nM9yRC31goWVve/G/Zb2ZCLsXC8FHYjjfXlnshknSCew==}
|
||||||
|
|
||||||
'@vue/reactivity@3.5.34':
|
'@vue/reactivity@3.5.34':
|
||||||
resolution: {integrity: sha512-y9XDjCEuBp+98k+UL5dbYkh57AHU4o6cxZedOPXw3bmrZZYLQsVHguGurq7hVrPCSrQtrnz1f9dssyFr+dMXfQ==}
|
resolution: {integrity: sha512-y9XDjCEuBp+98k+UL5dbYkh57AHU4o6cxZedOPXw3bmrZZYLQsVHguGurq7hVrPCSrQtrnz1f9dssyFr+dMXfQ==}
|
||||||
|
|
||||||
@@ -1013,6 +1040,9 @@ packages:
|
|||||||
ag-psd@30.2.0:
|
ag-psd@30.2.0:
|
||||||
resolution: {integrity: sha512-tSAWfNzLl5brFqKEer7egxASZ1a0LwHnReM/D5VVpvrgdwdsa8OVfCQpysK7tGaOuE2tPEqp3mAuH7aIvPhcig==}
|
resolution: {integrity: sha512-tSAWfNzLl5brFqKEer7egxASZ1a0LwHnReM/D5VVpvrgdwdsa8OVfCQpysK7tGaOuE2tPEqp3mAuH7aIvPhcig==}
|
||||||
|
|
||||||
|
alien-signals@3.2.1:
|
||||||
|
resolution: {integrity: sha512-I8FjmltrfnDFoZedi5CG8DghVYNhzb/Ijluz7tCSJH0xpd0484Kowhbb1XDYOxfJpU1p5wnM2X54dA+IfGyD1g==}
|
||||||
|
|
||||||
animate.css@4.1.1:
|
animate.css@4.1.1:
|
||||||
resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
|
resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
|
||||||
|
|
||||||
@@ -1205,6 +1235,7 @@ packages:
|
|||||||
|
|
||||||
crypto-js@4.2.0:
|
crypto-js@4.2.0:
|
||||||
resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
|
resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
|
||||||
|
deprecated: Active development of CryptoJS has been discontinued. This library is no longer maintained.
|
||||||
|
|
||||||
csstype@3.2.3:
|
csstype@3.2.3:
|
||||||
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
|
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
|
||||||
@@ -1450,8 +1481,8 @@ packages:
|
|||||||
heic2any@0.0.4:
|
heic2any@0.0.4:
|
||||||
resolution: {integrity: sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==}
|
resolution: {integrity: sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==}
|
||||||
|
|
||||||
highlight.js@11.11.1:
|
highlight.js@11.12.0:
|
||||||
resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
|
resolution: {integrity: sha512-nbfWpyRMcMrPMmDwJB+dhX/eiaPKtc2RB+0QZskqJ3WjRA/FDS0e9hZrx8EC/lbEv8gXy98FcDbNa/dspAaJMg==}
|
||||||
engines: {node: '>=12.0.0'}
|
engines: {node: '>=12.0.0'}
|
||||||
|
|
||||||
hls.js@1.6.16:
|
hls.js@1.6.16:
|
||||||
@@ -1529,12 +1560,11 @@ packages:
|
|||||||
isarray@1.0.0:
|
isarray@1.0.0:
|
||||||
resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
|
resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
|
||||||
|
|
||||||
js-base64@3.7.8:
|
js-base64@3.9.4:
|
||||||
resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==}
|
resolution: {integrity: sha512-PtOMXpEGuP0RRiRXsjzHzl44dMHxSu2CPvAhinupR1tBa88me+1DPqsobl7eupn5UukjLkln1ZnAOAOXOrYG0Q==}
|
||||||
|
|
||||||
js-cookie@3.0.5:
|
js-cookie@3.0.8:
|
||||||
resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
|
resolution: {integrity: sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw==}
|
||||||
engines: {node: '>=14'}
|
|
||||||
|
|
||||||
js-md5@0.7.3:
|
js-md5@0.7.3:
|
||||||
resolution: {integrity: sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==}
|
resolution: {integrity: sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==}
|
||||||
@@ -1724,6 +1754,9 @@ packages:
|
|||||||
ms@2.1.3:
|
ms@2.1.3:
|
||||||
resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
|
resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
|
||||||
|
|
||||||
|
muggle-string@0.4.1:
|
||||||
|
resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
|
||||||
|
|
||||||
namespace-emitter@2.0.1:
|
namespace-emitter@2.0.1:
|
||||||
resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
|
resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
|
||||||
|
|
||||||
@@ -1774,6 +1807,9 @@ packages:
|
|||||||
parsedbf@2.0.0:
|
parsedbf@2.0.0:
|
||||||
resolution: {integrity: sha512-WNjKn/cwgGBkXqQLif+2VMEahcRHkBRU0/RfBWZ7Vj7snRNNW63yW1mVuuHRDyXTRxuGCzAHHBcr/Fn+U/bXjQ==}
|
resolution: {integrity: sha512-WNjKn/cwgGBkXqQLif+2VMEahcRHkBRU0/RfBWZ7Vj7snRNNW63yW1mVuuHRDyXTRxuGCzAHHBcr/Fn+U/bXjQ==}
|
||||||
|
|
||||||
|
path-browserify@1.0.1:
|
||||||
|
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
|
||||||
|
|
||||||
path-intersection@2.2.1:
|
path-intersection@2.2.1:
|
||||||
resolution: {integrity: sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==}
|
resolution: {integrity: sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==}
|
||||||
|
|
||||||
@@ -1791,6 +1827,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-o8MolyzirkkLrcdsae/HEOiIcXWI7DS5zGpvqW8xTC2YUsW30rltFw2bDGvw/fskUdEMrQm2br68jzDS5BH2vw==}
|
resolution: {integrity: sha512-o8MolyzirkkLrcdsae/HEOiIcXWI7DS5zGpvqW8xTC2YUsW30rltFw2bDGvw/fskUdEMrQm2br68jzDS5BH2vw==}
|
||||||
engines: {node: '>=22.13.0 || >=24'}
|
engines: {node: '>=22.13.0 || >=24'}
|
||||||
|
|
||||||
|
pdfjs-dist@6.2.108:
|
||||||
|
resolution: {integrity: sha512-YxFb+SQcodN2rnX9Tn3dHYlqfb7NjlzzfONPpJd+AKoKtUjEdevTfbC07d5TcczzOK6261auRkP/M8OBHs9vFQ==}
|
||||||
|
engines: {node: '>=22.13.0 || >=24'}
|
||||||
|
|
||||||
picocolors@1.1.1:
|
picocolors@1.1.1:
|
||||||
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
||||||
|
|
||||||
@@ -2034,6 +2074,11 @@ packages:
|
|||||||
typedarray@0.0.6:
|
typedarray@0.0.6:
|
||||||
resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
|
resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
|
||||||
|
|
||||||
|
typescript@5.9.3:
|
||||||
|
resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
|
||||||
|
engines: {node: '>=14.17'}
|
||||||
|
hasBin: true
|
||||||
|
|
||||||
ufo@1.6.4:
|
ufo@1.6.4:
|
||||||
resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
|
resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
|
||||||
|
|
||||||
@@ -2114,6 +2159,9 @@ packages:
|
|||||||
terser:
|
terser:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
vscode-uri@3.2.0:
|
||||||
|
resolution: {integrity: sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==}
|
||||||
|
|
||||||
vue-component-type-helpers@3.3.6:
|
vue-component-type-helpers@3.3.6:
|
||||||
resolution: {integrity: sha512-FkljacAwJ9BUoSUdpFe3VDy0sGigNlTH9+2zcXUWmZOjN8swiCkl3t48wOJun0OsUd2cEIda1l04tsxMiKIIrQ==}
|
resolution: {integrity: sha512-FkljacAwJ9BUoSUdpFe3VDy0sGigNlTH9+2zcXUWmZOjN8swiCkl3t48wOJun0OsUd2cEIda1l04tsxMiKIIrQ==}
|
||||||
|
|
||||||
@@ -2123,11 +2171,22 @@ packages:
|
|||||||
peerDependencies:
|
peerDependencies:
|
||||||
vue: ^3.0.0
|
vue: ^3.0.0
|
||||||
|
|
||||||
|
vue-pdf-embed@2.1.6:
|
||||||
|
resolution: {integrity: sha512-cNmclL9jGuRIqgm13fx/3ZZd1nW/Nn0zXfQUo/yd8AQU9GTFLLYRgFc5HM41v1+bMoj1wW59mZoB/cNQx8Y2Rw==}
|
||||||
|
peerDependencies:
|
||||||
|
vue: ^3.3.0
|
||||||
|
|
||||||
vue-router@4.6.4:
|
vue-router@4.6.4:
|
||||||
resolution: {integrity: sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==}
|
resolution: {integrity: sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
vue: ^3.5.0
|
vue: ^3.5.0
|
||||||
|
|
||||||
|
vue-tsc@3.3.13:
|
||||||
|
resolution: {integrity: sha512-jE4/bXdOMSHVxEGgQCqNllJy+9N3Gx6tfSAsg0yhFK/MAN6eXqISihupnDEKSCt12VVnjN2gI3AqLYcqoh5x/A==}
|
||||||
|
hasBin: true
|
||||||
|
peerDependencies:
|
||||||
|
typescript: '>=5.0.0'
|
||||||
|
|
||||||
vue3-clipboard@1.0.0:
|
vue3-clipboard@1.0.0:
|
||||||
resolution: {integrity: sha512-GUqKh1oO79xDpq0z+cCv/NDVTpcJGNDzeNgT3PmTdTp/WJh3gcTrDqIYKycKhzMFOtIFJ7hO/+usgyWtT+fNhA==}
|
resolution: {integrity: sha512-GUqKh1oO79xDpq0z+cCv/NDVTpcJGNDzeNgT3PmTdTp/WJh3gcTrDqIYKycKhzMFOtIFJ7hO/+usgyWtT+fNhA==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -2229,9 +2288,9 @@ snapshots:
|
|||||||
|
|
||||||
'@ctrl/tinycolor@4.2.0': {}
|
'@ctrl/tinycolor@4.2.0': {}
|
||||||
|
|
||||||
'@element-plus/icons-vue@2.3.2(vue@3.5.34)':
|
'@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
'@esbuild/aix-ppc64@0.21.5':
|
'@esbuild/aix-ppc64@0.21.5':
|
||||||
optional: true
|
optional: true
|
||||||
@@ -2472,10 +2531,10 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- geotiff
|
- geotiff
|
||||||
|
|
||||||
'@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34)':
|
'@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:
|
dependencies:
|
||||||
'@open-file-viewer/core': 0.1.27(pdfjs-dist@6.1.200)
|
'@open-file-viewer/core': 0.1.27(pdfjs-dist@6.1.200)
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
'@parcel/watcher-android-arm64@2.5.6':
|
'@parcel/watcher-android-arm64@2.5.6':
|
||||||
optional: true
|
optional: true
|
||||||
@@ -2627,9 +2686,9 @@ snapshots:
|
|||||||
codemirror: 5.65.21
|
codemirror: 5.65.21
|
||||||
randomcolor: 0.6.2
|
randomcolor: 0.6.2
|
||||||
|
|
||||||
'@saber/nf-form-design-elp@1.6.1(vue@3.5.34)':
|
'@saber/nf-form-design-elp@1.6.1(vue@3.5.34(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
vuedraggable: 4.1.0(vue@3.5.34)
|
vuedraggable: 4.1.0(vue@3.5.34(typescript@5.9.3))
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- vue
|
- vue
|
||||||
|
|
||||||
@@ -2641,16 +2700,16 @@ snapshots:
|
|||||||
countup.js: 2.10.0
|
countup.js: 2.10.0
|
||||||
signature_pad: 5.1.3
|
signature_pad: 5.1.3
|
||||||
|
|
||||||
'@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)':
|
'@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:
|
dependencies:
|
||||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.34)
|
'@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
|
||||||
axios: 0.21.4
|
axios: 0.21.4(debug@4.4.3(supports-color@7.2.0))
|
||||||
countup.js: 1.9.3
|
countup.js: 1.9.3
|
||||||
dayjs: 1.11.20
|
dayjs: 1.11.20
|
||||||
element-plus: 2.14.2(vue@3.5.34)
|
element-plus: 2.14.2(vue@3.5.34(typescript@5.9.3))
|
||||||
lodash: 4.18.1
|
lodash: 4.18.1
|
||||||
lodash-es: 4.18.1
|
lodash-es: 4.18.1
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- debug
|
- debug
|
||||||
|
|
||||||
@@ -2706,10 +2765,24 @@ snapshots:
|
|||||||
'@uppy/utils': 4.1.3
|
'@uppy/utils': 4.1.3
|
||||||
nanoid: 3.3.12
|
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)':
|
'@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:
|
dependencies:
|
||||||
vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
|
'@volar/language-core@2.4.28':
|
||||||
|
dependencies:
|
||||||
|
'@volar/source-map': 2.4.28
|
||||||
|
|
||||||
|
'@volar/source-map@2.4.28': {}
|
||||||
|
|
||||||
|
'@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: 5.9.3
|
||||||
|
|
||||||
'@vue/compiler-core@3.5.34':
|
'@vue/compiler-core@3.5.34':
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -2743,6 +2816,16 @@ snapshots:
|
|||||||
|
|
||||||
'@vue/devtools-api@6.6.4': {}
|
'@vue/devtools-api@6.6.4': {}
|
||||||
|
|
||||||
|
'@vue/language-core@3.3.13':
|
||||||
|
dependencies:
|
||||||
|
'@volar/language-core': 2.4.28
|
||||||
|
'@vue/compiler-dom': 3.5.34
|
||||||
|
'@vue/shared': 3.5.34
|
||||||
|
alien-signals: 3.2.1
|
||||||
|
muggle-string: 0.4.1
|
||||||
|
path-browserify: 1.0.1
|
||||||
|
picomatch: 4.0.4
|
||||||
|
|
||||||
'@vue/reactivity@3.5.34':
|
'@vue/reactivity@3.5.34':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/shared': 3.5.34
|
'@vue/shared': 3.5.34
|
||||||
@@ -2759,28 +2842,28 @@ snapshots:
|
|||||||
'@vue/shared': 3.5.34
|
'@vue/shared': 3.5.34
|
||||||
csstype: 3.2.3
|
csstype: 3.2.3
|
||||||
|
|
||||||
'@vue/server-renderer@3.5.34(vue@3.5.34)':
|
'@vue/server-renderer@3.5.34(vue@3.5.34(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/compiler-ssr': 3.5.34
|
'@vue/compiler-ssr': 3.5.34
|
||||||
'@vue/shared': 3.5.34
|
'@vue/shared': 3.5.34
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
'@vue/shared@3.5.34': {}
|
'@vue/shared@3.5.34': {}
|
||||||
|
|
||||||
'@vueuse/core@14.3.0(vue@3.5.34)':
|
'@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/web-bluetooth': 0.0.21
|
'@types/web-bluetooth': 0.0.21
|
||||||
'@vueuse/metadata': 14.3.0
|
'@vueuse/metadata': 14.3.0
|
||||||
'@vueuse/shared': 14.3.0(vue@3.5.34)
|
'@vueuse/shared': 14.3.0(vue@3.5.34(typescript@5.9.3))
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
'@vueuse/metadata@14.3.0': {}
|
'@vueuse/metadata@14.3.0': {}
|
||||||
|
|
||||||
'@vueuse/shared@14.3.0(vue@3.5.34)':
|
'@vueuse/shared@14.3.0(vue@3.5.34(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
vue: 3.5.34
|
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@3.3.12)(slate@0.72.8)(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/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:
|
dependencies:
|
||||||
'@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/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
|
dom7: 4.0.6
|
||||||
@@ -2790,7 +2873,7 @@ snapshots:
|
|||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
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@3.3.12)(slate@0.72.8)(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:
|
dependencies:
|
||||||
'@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/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
|
dom7: 4.0.6
|
||||||
@@ -2824,13 +2907,13 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@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@3.3.12)(slate@0.72.8)(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/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@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@3.3.12)(slate@0.72.8)(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)
|
||||||
'@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/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@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@3.3.12)(slate@0.72.8)(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)
|
||||||
'@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@3.3.12)(slate@0.72.8)(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)
|
||||||
'@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@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(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@3.3.12)(slate@0.72.8)(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)
|
||||||
'@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@3.3.12)(slate@0.72.8)(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)
|
||||||
dom7: 4.0.6
|
dom7: 4.0.6
|
||||||
is-hotkey: 0.2.0
|
is-hotkey: 0.2.0
|
||||||
lodash.camelcase: 4.3.0
|
lodash.camelcase: 4.3.0
|
||||||
@@ -2843,14 +2926,14 @@ snapshots:
|
|||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
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@3.3.12)(slate@0.72.8)(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:
|
dependencies:
|
||||||
'@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/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
|
dom7: 4.0.6
|
||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
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@3.3.12)(slate@0.72.8)(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:
|
dependencies:
|
||||||
'@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/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
|
dom7: 4.0.6
|
||||||
@@ -2860,18 +2943,18 @@ snapshots:
|
|||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
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@3.3.12)(slate@0.72.8)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(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@3.3.12)(slate@0.72.8)(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:
|
dependencies:
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@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@3.3.12)(slate@0.72.8)(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/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)
|
'@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
|
dom7: 4.0.6
|
||||||
lodash.foreach: 4.5.0
|
lodash.foreach: 4.5.0
|
||||||
slate: 0.123.0
|
slate: 0.123.0
|
||||||
snabbdom: 3.6.3
|
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@3.3.12)(slate@0.72.8)(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:
|
dependencies:
|
||||||
'@uppy/core': 2.3.4
|
'@uppy/core': 2.3.4
|
||||||
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
'@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
|
||||||
@@ -2922,10 +3005,10 @@ snapshots:
|
|||||||
slate-history: 0.66.0(slate@0.72.8)
|
slate-history: 0.66.0(slate@0.72.8)
|
||||||
snabbdom: 3.6.3
|
snabbdom: 3.6.3
|
||||||
|
|
||||||
'@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34)':
|
'@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@5.9.3))':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@wangeditor/editor': 5.1.23
|
'@wangeditor/editor': 5.1.23
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
'@wangeditor/editor@5.1.23':
|
'@wangeditor/editor@5.1.23':
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3000,6 +3083,8 @@ snapshots:
|
|||||||
base64-js: 1.5.1
|
base64-js: 1.5.1
|
||||||
pako: 2.1.0
|
pako: 2.1.0
|
||||||
|
|
||||||
|
alien-signals@3.2.1: {}
|
||||||
|
|
||||||
animate.css@4.1.1: {}
|
animate.css@4.1.1: {}
|
||||||
|
|
||||||
ansi-styles@4.3.0:
|
ansi-styles@4.3.0:
|
||||||
@@ -3052,22 +3137,22 @@ snapshots:
|
|||||||
|
|
||||||
asynckit@0.4.0: {}
|
asynckit@0.4.0: {}
|
||||||
|
|
||||||
avue-plugin-ueditor@1.0.4(axios@1.16.0)(vue@3.5.34):
|
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:
|
dependencies:
|
||||||
'@wangeditor/editor': 5.1.23
|
'@wangeditor/editor': 5.1.23
|
||||||
'@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34)
|
'@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@5.9.3))
|
||||||
axios: 1.16.0
|
axios: 1.16.0(debug@4.4.3(supports-color@7.2.0))
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
axios@0.21.4:
|
axios@0.21.4(debug@4.4.3(supports-color@7.2.0)):
|
||||||
dependencies:
|
dependencies:
|
||||||
follow-redirects: 1.16.0
|
follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- debug
|
- debug
|
||||||
|
|
||||||
axios@1.16.0:
|
axios@1.16.0(debug@4.4.3(supports-color@7.2.0)):
|
||||||
dependencies:
|
dependencies:
|
||||||
follow-redirects: 1.16.0
|
follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
|
||||||
form-data: 4.0.5
|
form-data: 4.0.5
|
||||||
proxy-from-env: 2.1.0
|
proxy-from-env: 2.1.0
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
@@ -3235,9 +3320,11 @@ snapshots:
|
|||||||
|
|
||||||
dayjs@1.11.20: {}
|
dayjs@1.11.20: {}
|
||||||
|
|
||||||
debug@4.4.3:
|
debug@4.4.3(supports-color@7.2.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
ms: 2.1.3
|
ms: 2.1.3
|
||||||
|
optionalDependencies:
|
||||||
|
supports-color: 7.2.0
|
||||||
|
|
||||||
delayed-stream@1.0.0: {}
|
delayed-stream@1.0.0: {}
|
||||||
|
|
||||||
@@ -3308,15 +3395,15 @@ snapshots:
|
|||||||
tslib: 2.3.0
|
tslib: 2.3.0
|
||||||
zrender: 6.1.0
|
zrender: 6.1.0
|
||||||
|
|
||||||
element-plus@2.14.2(vue@3.5.34):
|
element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@ctrl/tinycolor': 4.2.0
|
'@ctrl/tinycolor': 4.2.0
|
||||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.34)
|
'@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@5.9.3))
|
||||||
'@floating-ui/dom': 1.7.6
|
'@floating-ui/dom': 1.7.6
|
||||||
'@popperjs/core': '@sxzz/popperjs-es@2.11.8'
|
'@popperjs/core': '@sxzz/popperjs-es@2.11.8'
|
||||||
'@types/lodash': 4.17.24
|
'@types/lodash': 4.17.24
|
||||||
'@types/lodash-es': 4.17.12
|
'@types/lodash-es': 4.17.12
|
||||||
'@vueuse/core': 14.3.0(vue@3.5.34)
|
'@vueuse/core': 14.3.0(vue@3.5.34(typescript@5.9.3))
|
||||||
async-validator: 4.2.5
|
async-validator: 4.2.5
|
||||||
dayjs: 1.11.20
|
dayjs: 1.11.20
|
||||||
lodash: 4.18.1
|
lodash: 4.18.1
|
||||||
@@ -3324,7 +3411,7 @@ snapshots:
|
|||||||
lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.18.1)(lodash@4.18.1)
|
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
|
memoize-one: 6.0.0
|
||||||
normalize-wheel-es: 1.2.0
|
normalize-wheel-es: 1.2.0
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
vue-component-type-helpers: 3.3.6
|
vue-component-type-helpers: 3.3.6
|
||||||
|
|
||||||
end-of-stream@1.4.5:
|
end-of-stream@1.4.5:
|
||||||
@@ -3445,7 +3532,9 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
to-regex-range: 5.0.1
|
to-regex-range: 5.0.1
|
||||||
|
|
||||||
follow-redirects@1.16.0: {}
|
follow-redirects@1.16.0(debug@4.4.3(supports-color@7.2.0)):
|
||||||
|
optionalDependencies:
|
||||||
|
debug: 4.4.3(supports-color@7.2.0)
|
||||||
|
|
||||||
form-data@4.0.5:
|
form-data@4.0.5:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -3534,7 +3623,7 @@ snapshots:
|
|||||||
|
|
||||||
heic2any@0.0.4: {}
|
heic2any@0.0.4: {}
|
||||||
|
|
||||||
highlight.js@11.11.1: {}
|
highlight.js@11.12.0: {}
|
||||||
|
|
||||||
hls.js@1.6.16: {}
|
hls.js@1.6.16: {}
|
||||||
|
|
||||||
@@ -3593,9 +3682,9 @@ snapshots:
|
|||||||
|
|
||||||
isarray@1.0.0: {}
|
isarray@1.0.0: {}
|
||||||
|
|
||||||
js-base64@3.7.8: {}
|
js-base64@3.9.4: {}
|
||||||
|
|
||||||
js-cookie@3.0.5: {}
|
js-cookie@3.0.8: {}
|
||||||
|
|
||||||
js-md5@0.7.3: {}
|
js-md5@0.7.3: {}
|
||||||
|
|
||||||
@@ -3777,6 +3866,8 @@ snapshots:
|
|||||||
|
|
||||||
ms@2.1.3: {}
|
ms@2.1.3: {}
|
||||||
|
|
||||||
|
muggle-string@0.4.1: {}
|
||||||
|
|
||||||
namespace-emitter@2.0.1: {}
|
namespace-emitter@2.0.1: {}
|
||||||
|
|
||||||
nanoid@3.3.12: {}
|
nanoid@3.3.12: {}
|
||||||
@@ -3810,6 +3901,8 @@ snapshots:
|
|||||||
|
|
||||||
parsedbf@2.0.0: {}
|
parsedbf@2.0.0: {}
|
||||||
|
|
||||||
|
path-browserify@1.0.1: {}
|
||||||
|
|
||||||
path-intersection@2.2.1: {}
|
path-intersection@2.2.1: {}
|
||||||
|
|
||||||
path-is-absolute@1.0.1: {}
|
path-is-absolute@1.0.1: {}
|
||||||
@@ -3822,6 +3915,10 @@ snapshots:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@napi-rs/canvas': 1.0.2
|
'@napi-rs/canvas': 1.0.2
|
||||||
|
|
||||||
|
pdfjs-dist@6.2.108:
|
||||||
|
optionalDependencies:
|
||||||
|
'@napi-rs/canvas': 1.0.2
|
||||||
|
|
||||||
picocolors@1.1.1: {}
|
picocolors@1.1.1: {}
|
||||||
|
|
||||||
picomatch@2.3.2: {}
|
picomatch@2.3.2: {}
|
||||||
@@ -4075,6 +4172,8 @@ snapshots:
|
|||||||
|
|
||||||
typedarray@0.0.6: {}
|
typedarray@0.0.6: {}
|
||||||
|
|
||||||
|
typescript@5.9.3: {}
|
||||||
|
|
||||||
ufo@1.6.4: {}
|
ufo@1.6.4: {}
|
||||||
|
|
||||||
underscore@1.13.8: {}
|
underscore@1.13.8: {}
|
||||||
@@ -4097,7 +4196,7 @@ snapshots:
|
|||||||
|
|
||||||
universalify@2.0.1: {}
|
universalify@2.0.1: {}
|
||||||
|
|
||||||
unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34))(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:
|
dependencies:
|
||||||
'@antfu/utils': 0.7.10
|
'@antfu/utils': 0.7.10
|
||||||
'@rollup/pluginutils': 5.3.0(rollup@4.60.3)
|
'@rollup/pluginutils': 5.3.0(rollup@4.60.3)
|
||||||
@@ -4106,7 +4205,7 @@ snapshots:
|
|||||||
unimport: 1.3.0(rollup@4.60.3)
|
unimport: 1.3.0(rollup@4.60.3)
|
||||||
unplugin: 1.16.1
|
unplugin: 1.16.1
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@vueuse/core': 14.3.0(vue@3.5.34)
|
'@vueuse/core': 14.3.0(vue@3.5.34(typescript@5.9.3))
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- rollup
|
- rollup
|
||||||
|
|
||||||
@@ -4136,10 +4235,10 @@ snapshots:
|
|||||||
|
|
||||||
uuid@8.3.2: {}
|
uuid@8.3.2: {}
|
||||||
|
|
||||||
vite-plugin-compression@0.5.1(vite@5.4.21(sass@1.99.0)(terser@5.46.2)):
|
vite-plugin-compression@0.5.1(supports-color@7.2.0)(vite@5.4.21(sass@1.99.0)(terser@5.46.2)):
|
||||||
dependencies:
|
dependencies:
|
||||||
chalk: 4.1.2
|
chalk: 4.1.2
|
||||||
debug: 4.4.3
|
debug: 4.4.3(supports-color@7.2.0)
|
||||||
fs-extra: 10.1.0
|
fs-extra: 10.1.0
|
||||||
vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
@@ -4161,43 +4260,58 @@ snapshots:
|
|||||||
sass: 1.99.0
|
sass: 1.99.0
|
||||||
terser: 5.46.2
|
terser: 5.46.2
|
||||||
|
|
||||||
|
vscode-uri@3.2.0: {}
|
||||||
|
|
||||||
vue-component-type-helpers@3.3.6: {}
|
vue-component-type-helpers@3.3.6: {}
|
||||||
|
|
||||||
vue-i18n@11.4.2(vue@3.5.34):
|
vue-i18n@11.4.2(vue@3.5.34(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@intlify/core-base': 11.4.2
|
'@intlify/core-base': 11.4.2
|
||||||
'@intlify/devtools-types': 11.4.2
|
'@intlify/devtools-types': 11.4.2
|
||||||
'@intlify/shared': 11.4.2
|
'@intlify/shared': 11.4.2
|
||||||
'@vue/devtools-api': 6.6.4
|
'@vue/devtools-api': 6.6.4
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
vue-router@4.6.4(vue@3.5.34):
|
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@5.9.3)
|
||||||
|
|
||||||
|
vue-router@4.6.4(vue@3.5.34(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/devtools-api': 6.6.4
|
'@vue/devtools-api': 6.6.4
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
vue3-clipboard@1.0.0(vue@3.5.34):
|
vue-tsc@3.3.13(typescript@5.9.3):
|
||||||
|
dependencies:
|
||||||
|
'@volar/typescript': 2.4.28(typescript@5.9.3)
|
||||||
|
'@vue/language-core': 3.3.13
|
||||||
|
typescript: 5.9.3
|
||||||
|
|
||||||
|
vue3-clipboard@1.0.0(vue@3.5.34(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
clipboard: 2.0.11
|
clipboard: 2.0.11
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
vue@3.5.34:
|
vue@3.5.34(typescript@5.9.3):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/compiler-dom': 3.5.34
|
'@vue/compiler-dom': 3.5.34
|
||||||
'@vue/compiler-sfc': 3.5.34
|
'@vue/compiler-sfc': 3.5.34
|
||||||
'@vue/runtime-dom': 3.5.34
|
'@vue/runtime-dom': 3.5.34
|
||||||
'@vue/server-renderer': 3.5.34(vue@3.5.34)
|
'@vue/server-renderer': 3.5.34(vue@3.5.34(typescript@5.9.3))
|
||||||
'@vue/shared': 3.5.34
|
'@vue/shared': 3.5.34
|
||||||
|
optionalDependencies:
|
||||||
|
typescript: 5.9.3
|
||||||
|
|
||||||
vuedraggable@4.1.0(vue@3.5.34):
|
vuedraggable@4.1.0(vue@3.5.34(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
sortablejs: 1.14.0
|
sortablejs: 1.14.0
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
vuex@4.1.0(vue@3.5.34):
|
vuex@4.1.0(vue@3.5.34(typescript@5.9.3)):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@vue/devtools-api': 6.6.4
|
'@vue/devtools-api': 6.6.4
|
||||||
vue: 3.5.34
|
vue: 3.5.34(typescript@5.9.3)
|
||||||
|
|
||||||
webpack-virtual-modules@0.6.2: {}
|
webpack-virtual-modules@0.6.2: {}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
packages:
|
packages:
|
||||||
- '.'
|
- '.'
|
||||||
|
|
||||||
|
allowBuilds:
|
||||||
|
'@parcel/watcher': true
|
||||||
|
es5-ext: true
|
||||||
|
esbuild: true
|
||||||
|
|
||||||
patchedDependencies:
|
patchedDependencies:
|
||||||
'@smallwei/avue': patches/@smallwei__avue.patch
|
'@smallwei/avue': patches/@smallwei__avue.patch
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 310 KiB |
|
Before Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 310 KiB |
|
Before Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 136 KiB |
|
After Width: | Height: | Size: 11 KiB |
@@ -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)`);
|
||||||
@@ -58,3 +58,14 @@ export const changeStatus = (id, status) => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getBfiExchangeRate = (currencyCode, effectdate) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/bfi/exchange-rate',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
currencyCode,
|
||||||
|
effectdate,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getList = (current, size, params) =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/list',
|
||||||
|
method: 'get',
|
||||||
|
params: { ...params, current, size },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const getAll = () => getList(1, 1000, {});
|
||||||
|
|
||||||
|
export const getDetail = id =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/detail',
|
||||||
|
method: 'get',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const submit = row =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/submit',
|
||||||
|
method: 'post',
|
||||||
|
data: row,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const remove = ids =>
|
||||||
|
request({
|
||||||
|
url: '/blade-system/invoice-item/remove',
|
||||||
|
method: 'post',
|
||||||
|
params: { ids },
|
||||||
|
});
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getList = (current, size, params) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/measurement-unit/list',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
...params,
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getDetail = id => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/measurement-unit/detail',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const remove = ids => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/measurement-unit/remove',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
ids,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const submit = row => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/measurement-unit/submit',
|
||||||
|
method: 'post',
|
||||||
|
data: row,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const changeStatus = (id, status) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/measurement-unit/status',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
status,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -92,13 +92,12 @@ export const createCrudApi = baseUrl => ({
|
|||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
reassign(id) {
|
reassign(data) {
|
||||||
|
const payload = data && typeof data === 'object' ? data : { id: data };
|
||||||
return request({
|
return request({
|
||||||
url: `${baseUrl}/reassign`,
|
url: `${baseUrl}/reassign`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params: {
|
data: payload,
|
||||||
id,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
batchComplete(ids) {
|
batchComplete(ids) {
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import { createCrudApi } from './common';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
const baseUrl = '/blade-transport/contract-change';
|
||||||
|
const api = createCrudApi(baseUrl);
|
||||||
|
|
||||||
|
export const getList = api.getList;
|
||||||
|
export const getDetail = api.getDetail;
|
||||||
|
export const submit = api.submit;
|
||||||
|
export const remove = api.remove;
|
||||||
|
|
||||||
|
export const createFromContract = (contractId, changeType) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/create-from-contract`,
|
||||||
|
method: 'post',
|
||||||
|
params: { contractId, changeType },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const saveDraft = row =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/save-draft`,
|
||||||
|
method: 'post',
|
||||||
|
data: row,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const submitApproval = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/submit-approval`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const approve = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/approve`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
timeout: APPROVE_TIMEOUT,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const reject = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/reject`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const withdraw = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/withdraw`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const markSyncStatus = (ids, syncStatus) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/mark-sync-status`,
|
||||||
|
method: 'post',
|
||||||
|
params: { ids, syncStatus },
|
||||||
|
});
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { createCrudApi } from './common';
|
import { createCrudApi } from './common';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
|
|
||||||
const baseUrl = '/blade-transport/contract-manage';
|
const baseUrl = '/blade-transport/contract-manage';
|
||||||
@@ -36,6 +37,7 @@ export const approve = id =>
|
|||||||
url: `${baseUrl}/approve`,
|
url: `${baseUrl}/approve`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params: { id },
|
params: { id },
|
||||||
|
timeout: APPROVE_TIMEOUT,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const reject = id =>
|
export const reject = id =>
|
||||||
@@ -59,14 +61,14 @@ export const withdraw = id =>
|
|||||||
params: { id },
|
params: { id },
|
||||||
});
|
});
|
||||||
|
|
||||||
export const startChange = (id, reason) =>
|
export const startChange = (id, changeContent, changeReason = changeContent) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/start-change`,
|
url: `${baseUrl}/start-change`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params: {
|
params: {
|
||||||
id,
|
id,
|
||||||
changeContent: reason,
|
changeContent: changeContent || '',
|
||||||
changeReason: reason,
|
changeReason,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -90,3 +92,11 @@ export const expireStats = params =>
|
|||||||
method: 'get',
|
method: 'get',
|
||||||
params,
|
params,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/** 按平台公司 + 业务部门预览下一合同编号 */
|
||||||
|
export const nextContractNo = (organizationId, platformCompanyId) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/next-contract-no`,
|
||||||
|
method: 'get',
|
||||||
|
params: { organizationId, platformCompanyId },
|
||||||
|
});
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
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({
|
||||||
|
url: `${baseUrl}/sync/${bizType}/${id}`,
|
||||||
|
method: 'post',
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
// 批量推送为逐条同步推送,耗时随勾选行数线性增长,进一步放宽超时
|
||||||
|
export const repushBatch = (bizType, ids) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/sync/${bizType}/batch`,
|
||||||
|
method: 'post',
|
||||||
|
data: ids,
|
||||||
|
timeout: 300000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const getTemplates = () =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/master-data/template`,
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
|
||||||
|
export const refreshMasterData = () =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/master-data/refresh`,
|
||||||
|
method: 'post',
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const getRisk = (customerCode, creditCode, customerName) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/risk`,
|
||||||
|
method: 'get',
|
||||||
|
params: { customerCode, creditCode, customerName },
|
||||||
|
timeout: 30000,
|
||||||
|
});
|
||||||
|
|
||||||
|
// 客商风险批量查询(客商列表页展示用):入参编号数组,后端逐个查 C101-1,单个失败跳过
|
||||||
|
export const getRiskBatch = customerCodes =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/risk/batch`,
|
||||||
|
method: 'get',
|
||||||
|
params: { customerCodes: (customerCodes || []).join(',') },
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
// 客商风险按名称查询(客商档案表单展示用):名称反查编号后口径同编号查询
|
||||||
|
export const getRiskByName = customerName =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/risk/by-name`,
|
||||||
|
method: 'get',
|
||||||
|
params: { customerName },
|
||||||
|
timeout: 30000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const uploadAttachment = formData =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/attachment/upload`,
|
||||||
|
method: 'post',
|
||||||
|
data: formData,
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const downloadAttachment = (fdId, name) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/attachment/download`,
|
||||||
|
method: 'get',
|
||||||
|
params: { fdId, name },
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const applyContractSpec = data =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/contract/spec-apply`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const confirmContractSpec = (id, result) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/contract/spec/confirm`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id, result },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const unwrapData = response => {
|
||||||
|
const data = response?.data?.data ?? response?.data;
|
||||||
|
return data && typeof data === 'object' && 'data' in data ? data.data : data;
|
||||||
|
};
|
||||||
@@ -24,10 +24,16 @@ export const getDetail = id =>
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const getCarrierContracts = () =>
|
export const getCarrierContracts = (projectIds, waybillIds = []) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/carrier-contracts`,
|
url: `${baseUrl}/carrier-contracts`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
projectIds: (projectIds || []).join(','),
|
||||||
|
...(waybillIds || []).filter(Boolean).length
|
||||||
|
? { waybillIds: (waybillIds || []).filter(Boolean).join(',') }
|
||||||
|
: {},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const saveDraft = row =>
|
export const saveDraft = row =>
|
||||||
@@ -78,6 +84,15 @@ export const cancel = id =>
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const start = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/start`,
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export const complete = id =>
|
export const complete = id =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/complete`,
|
url: `${baseUrl}/complete`,
|
||||||
|
|||||||
@@ -13,12 +13,27 @@ export const getDetail = (id, waybillId) =>
|
|||||||
...(waybillId === undefined ? {} : { waybillId }),
|
...(waybillId === undefined ? {} : { waybillId }),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
export const getVoucherImages = waybillId =>
|
export const getVoucherImages = (waybillId, params = {}) =>
|
||||||
request({
|
request({
|
||||||
url: '/blade-transport/process-config/voucher-images',
|
url: '/blade-transport/process-config/voucher-images',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
waybillId,
|
||||||
|
...params,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
export const getVoucherFolders = waybillId =>
|
||||||
|
request({
|
||||||
|
url: '/blade-transport/process-config/voucher-folders',
|
||||||
|
method: 'get',
|
||||||
params: { waybillId },
|
params: { waybillId },
|
||||||
});
|
});
|
||||||
|
export const getVoucherFolderDetail = (voucherId, plateNo) =>
|
||||||
|
request({
|
||||||
|
url: '/blade-transport/process-config/voucher-folder-detail',
|
||||||
|
method: 'get',
|
||||||
|
params: { voucherId, plateNo },
|
||||||
|
});
|
||||||
export const submit = api.submit;
|
export const submit = api.submit;
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
export const copy = api.copy;
|
export const copy = api.copy;
|
||||||
|
|||||||
@@ -6,9 +6,24 @@ const api = createCrudApi(baseUrl);
|
|||||||
|
|
||||||
export const getList = api.getList;
|
export const getList = api.getList;
|
||||||
export const getDetail = api.getDetail;
|
export const getDetail = api.getDetail;
|
||||||
|
export const getChangeRecordDetail = (id, recordIndex) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/change-record/detail`,
|
||||||
|
method: 'get',
|
||||||
|
params: { id, recordIndex },
|
||||||
|
});
|
||||||
export const submit = api.submit;
|
export const submit = api.submit;
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
|
|
||||||
|
// 项目资金使用风险统计(高风险 / 中风险数量),供列表头部快速筛选标签使用
|
||||||
|
// 暂未启用:后端 /fund-risk-stats 端点尚未实现,列表页已移除调用,等后端就绪后恢复
|
||||||
|
export const getFundRiskStats = params =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/fund-risk-stats`,
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
|
||||||
export const saveDraft = row =>
|
export const saveDraft = row =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/save-draft`,
|
url: `${baseUrl}/save-draft`,
|
||||||
@@ -28,6 +43,8 @@ export const approve = id =>
|
|||||||
url: `${baseUrl}/approve`,
|
url: `${baseUrl}/approve`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
params: { id },
|
params: { id },
|
||||||
|
// 审批通过后同步推送合规(远程多次调用),覆盖全局 10s 超时
|
||||||
|
timeout: 60000,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const reject = id =>
|
export const reject = id =>
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import { createCrudApi } from './common';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
const baseUrl = '/blade-transport/project-change';
|
||||||
|
const api = createCrudApi(baseUrl);
|
||||||
|
|
||||||
|
export const getList = api.getList;
|
||||||
|
export const getDetail = api.getDetail;
|
||||||
|
export const submit = api.submit;
|
||||||
|
export const remove = api.remove;
|
||||||
|
|
||||||
|
export const createFromProject = (projectId, changeType) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/create-from-project`,
|
||||||
|
method: 'post',
|
||||||
|
params: { projectId, changeType },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const saveDraft = row =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/save-draft`,
|
||||||
|
method: 'post',
|
||||||
|
data: row,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const submitApproval = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/submit-approval`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const approve = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/approve`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
timeout: APPROVE_TIMEOUT,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const reject = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/reject`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const withdraw = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/withdraw`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
@@ -10,7 +10,6 @@ export const submit = api.submit;
|
|||||||
export const dispatch = api.dispatch;
|
export const dispatch = api.dispatch;
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
export const copy = api.copy;
|
export const copy = api.copy;
|
||||||
export const cancel = api.cancel;
|
|
||||||
export const complete = api.complete;
|
export const complete = api.complete;
|
||||||
|
|
||||||
export const importTransportPlan = ({
|
export const importTransportPlan = ({
|
||||||
@@ -36,3 +35,27 @@ export const importTransportPlan = ({
|
|||||||
timeout: 60000,
|
timeout: 60000,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const validateTransportPlan = ({
|
||||||
|
file,
|
||||||
|
projectId,
|
||||||
|
projectName,
|
||||||
|
customerName,
|
||||||
|
contractId,
|
||||||
|
contractName,
|
||||||
|
}) => {
|
||||||
|
const data = new FormData();
|
||||||
|
data.append('file', file);
|
||||||
|
data.append('projectId', projectId || '');
|
||||||
|
data.append('projectName', projectName || '');
|
||||||
|
data.append('customerName', customerName || '');
|
||||||
|
data.append('contractId', contractId || '');
|
||||||
|
data.append('contractName', contractName || '');
|
||||||
|
return request({
|
||||||
|
url: `${baseUrl}/validate-transport-plan`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -5,7 +5,29 @@ const baseUrl = '/blade-transport/voucher-manage';
|
|||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
|
export const getFolderPage = (voucherId, current, size, params) =>
|
||||||
|
request({ url: `${baseUrl}/folder-page`, method: 'get', params: { voucherId, current, size, ...params } });
|
||||||
|
export const getFolderDetail = (voucherId, plateNo) =>
|
||||||
|
request({ url: `${baseUrl}/folder-detail`, method: 'get', params: { voucherId, plateNo } });
|
||||||
|
export const replaceFolder = (voucherId, plateNo, file) => {
|
||||||
|
const data = new FormData();
|
||||||
|
data.append('voucherId', voucherId);
|
||||||
|
data.append('plateNo', plateNo);
|
||||||
|
data.append('file', file);
|
||||||
|
return request({ url: `${baseUrl}/folder-replace`, method: 'post', data });
|
||||||
|
};
|
||||||
|
export const replaceFolderByObject = (voucherId, plateNo, fileInfo) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/folder-replace-object`,
|
||||||
|
method: 'post',
|
||||||
|
params: { voucherId, plateNo, ...fileInfo },
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
|
export const removeFolder = (voucherId, plateNo) =>
|
||||||
|
request({ url: `${baseUrl}/folder-remove`, method: 'post', params: { voucherId, plateNo } });
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
|
export const changeWaybillBatch = data =>
|
||||||
|
request({ url: `${baseUrl}/change-waybill-batch`, method: 'post', data });
|
||||||
export const createUploadDraft = data =>
|
export const createUploadDraft = data =>
|
||||||
request({ url: `${baseUrl}/upload-draft`, method: 'post', data });
|
request({ url: `${baseUrl}/upload-draft`, method: 'post', data });
|
||||||
export const completeUploadFile = data =>
|
export const completeUploadFile = data =>
|
||||||
@@ -17,6 +39,9 @@ export const getWaybillBatches = (current, size, params) =>
|
|||||||
method: 'get',
|
method: 'get',
|
||||||
params: { current, size, ...params },
|
params: { current, size, ...params },
|
||||||
});
|
});
|
||||||
|
export const auditPass = id => request({ url: `${baseUrl}/audit-pass`, method: 'post', params: { id } });
|
||||||
|
export const auditReject = (id, rejectReason) =>
|
||||||
|
request({ url: `${baseUrl}/audit-reject`, method: 'post', params: { id, rejectReason } });
|
||||||
|
|
||||||
const fileTaskBaseUrl = '/blade-file/fileTask';
|
const fileTaskBaseUrl = '/blade-file/fileTask';
|
||||||
export const queryFileTask = md5 =>
|
export const queryFileTask = md5 =>
|
||||||
@@ -27,6 +52,17 @@ export const createFileTask = data =>
|
|||||||
request({ url: `${fileTaskBaseUrl}/createFileTask`, method: 'post', data });
|
request({ url: `${fileTaskBaseUrl}/createFileTask`, method: 'post', data });
|
||||||
export const getPartUploadUrl = (id, partNumber) =>
|
export const getPartUploadUrl = (id, partNumber) =>
|
||||||
request({ url: `${fileTaskBaseUrl}/getUploadUrl`, method: 'get', params: { id, partNumber } });
|
request({ url: `${fileTaskBaseUrl}/getUploadUrl`, method: 'get', params: { id, partNumber } });
|
||||||
|
export const uploadPartByProxy = (id, partNumber, partBlob) => {
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('file', partBlob, `part-${partNumber}.bin`);
|
||||||
|
return request({
|
||||||
|
url: `${fileTaskBaseUrl}/uploadPart`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id, partNumber },
|
||||||
|
data: formData,
|
||||||
|
timeout: 600000,
|
||||||
|
});
|
||||||
|
};
|
||||||
export const updateFileTask = data =>
|
export const updateFileTask = data =>
|
||||||
request({ url: `${fileTaskBaseUrl}/updateFileTask`, method: 'post', data });
|
request({ url: `${fileTaskBaseUrl}/updateFileTask`, method: 'post', data });
|
||||||
export const pauseFileTask = ids =>
|
export const pauseFileTask = ids =>
|
||||||
|
|||||||
@@ -7,18 +7,66 @@ const api = createCrudApi(baseUrl);
|
|||||||
export const getList = api.getList;
|
export const getList = api.getList;
|
||||||
export const getDetail = api.getDetail;
|
export const getDetail = api.getDetail;
|
||||||
export const submit = api.submit;
|
export const submit = api.submit;
|
||||||
|
export const saveDraft = data => request({ url: `${baseUrl}/save-draft`, method: 'post', data });
|
||||||
export const remove = api.remove;
|
export const remove = api.remove;
|
||||||
export const copy = api.copy;
|
export const copy = api.copy;
|
||||||
export const cancel = api.cancel;
|
export const cancel = api.cancel;
|
||||||
export const reassign = api.reassign;
|
export const reassign = api.reassign;
|
||||||
export const complete = api.complete;
|
export const complete = api.complete;
|
||||||
export const batchComplete = api.batchComplete;
|
export const batchComplete = api.batchComplete;
|
||||||
|
/** 确认回单:回单节点配成「需业务员确认」时用;后端校验司机打卡节点齐全且无未了结异常后才置完成 */
|
||||||
|
export const confirmReturn = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/confirm-return`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
export const changeRoute = data =>
|
export const changeRoute = data =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/change-route`,
|
url: `${baseUrl}/change-route`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data,
|
data,
|
||||||
});
|
});
|
||||||
|
export const maintainMileage = data =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/maintain-mileage`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
/** 运单打卡记录 + 司机上传凭证图 */
|
||||||
|
export const getPunchRecords = waybillId =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/punch-records`,
|
||||||
|
method: 'get',
|
||||||
|
params: { waybillId },
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 编辑打卡记录(含打卡状态;punched=false 表示取消打卡) */
|
||||||
|
export const savePunchRecord = data =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/punch-record/save`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 运单车辆实时定位 */
|
||||||
|
export const locateVehicle = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/locate`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id },
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 运单车辆历史轨迹 */
|
||||||
|
export const trackVehicle = (id, startDate, endDate) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/track`,
|
||||||
|
method: 'post',
|
||||||
|
params: { id, startDate, endDate },
|
||||||
|
timeout: 60000,
|
||||||
|
});
|
||||||
|
|
||||||
export const roadLoading = ids =>
|
export const roadLoading = ids =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/road-loading`,
|
url: `${baseUrl}/road-loading`,
|
||||||
@@ -29,9 +77,23 @@ export const roadLoading = ids =>
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const getImportBatches = params => request({ url: `${baseUrl}/import-batch/list`, method: 'get', params });
|
export const getImportBatches = params => request({ url: `${baseUrl}/import-batch/list`, method: 'get', params });
|
||||||
|
export const getImportBatchNextCode = () => request({ url: `${baseUrl}/import-batch/next-code`, method: 'get' });
|
||||||
export const getImportDetails = params => request({ url: `${baseUrl}/import-batch/details`, method: 'get', params });
|
export const getImportDetails = params => request({ url: `${baseUrl}/import-batch/details`, method: 'get', params });
|
||||||
export const removeImportBatches = ids => request({ url: `${baseUrl}/import-batch/remove`, method: 'post', params: { ids } });
|
export const removeImportBatches = ids => request({ url: `${baseUrl}/import-batch/remove`, method: 'post', params: { ids } });
|
||||||
export const getImportOptions = () => request({ url: `${baseUrl}/import-batch/options`, method: 'get' });
|
export const getImportOptions = () => request({ url: `${baseUrl}/import-batch/options`, method: 'get' });
|
||||||
export const exportImportTemplate = () => request({ url: `${baseUrl}/import-batch/export-template`, method: 'get', responseType: 'blob' });
|
export const exportImportTemplate = () => request({ url: `${baseUrl}/import-batch/export-template`, method: 'get', responseType: 'blob' });
|
||||||
export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data });
|
export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data, timeout: 120000 });
|
||||||
export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });
|
export const validateImport = data =>
|
||||||
|
request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, timeout: 120000 });
|
||||||
|
export const exportImportFailures = data =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/import-batch/export-failures`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
|
export const confirmImport = data =>
|
||||||
|
request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });
|
||||||
|
export const checkImportDuplicates = data =>
|
||||||
|
request({ url: `${baseUrl}/import-batch/duplicates`, method: 'post', data, timeout: 120000 });
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
import { ElLoading, ElMessage } from 'element-plus';
|
import { ElLoading, ElMessage } from 'element-plus';
|
||||||
|
|
||||||
|
/** 审核按钮统一超时:审批通过后可能同步推送金蝶等耗时操作,覆盖全局 10s */
|
||||||
|
export const APPROVE_TIMEOUT = 60 * 1000;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件流返回
|
* 文件流返回
|
||||||
* @param url 接口地址
|
* @param url 接口地址
|
||||||
@@ -34,7 +37,8 @@ export const exportBlob = (url, params, options = {}) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const importBlob = (url, file) => {
|
export const importBlob = (url, file, options = {}) => {
|
||||||
|
const { timeout = 60000 } = options;
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append('file', file);
|
formData.append('file', file);
|
||||||
return request({
|
return request({
|
||||||
@@ -42,6 +46,6 @@ export const importBlob = (url, file) => {
|
|||||||
method: 'post',
|
method: 'post',
|
||||||
data: formData,
|
data: formData,
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
timeout: 60000,
|
timeout,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getMkPublicDetail = (bizType, id) => {
|
||||||
|
return request({
|
||||||
|
url: `/blade-transport/mk-process/public/${bizType}/detail`,
|
||||||
|
method: 'get',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const postMkPublicProcessMessage = (bizType, data) => {
|
||||||
|
return request({
|
||||||
|
url: `/blade-transport/mk-process/public/${bizType}/process-message`,
|
||||||
|
method: 'post',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -6,11 +6,17 @@ export const getList = (current, size, params) =>
|
|||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getExpiryCounts = () => request({ url: `${baseUrl}/expiry-counts`, method: 'get' });
|
export const getExpiryCounts = () => request({ url: `${baseUrl}/expiry-counts`, method: 'get' });
|
||||||
export const getAvailableOptions = (keyword, deptId, selectedId) =>
|
export const getAvailableOptions = (keyword, deptId, selectedId, payerName, payeeName) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/available-options`,
|
url: `${baseUrl}/available-options`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: { keyword, deptId, selectedId },
|
params: { keyword, deptId, selectedId, payerName, payeeName },
|
||||||
|
});
|
||||||
|
export const getAvailablePage = (current, size, keyword, deptId, selectedId, payerName, payeeName) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/available-page`,
|
||||||
|
method: 'get',
|
||||||
|
params: { current, size, keyword, deptId, selectedId, payerName, payeeName },
|
||||||
});
|
});
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
|
|||||||
@@ -1,12 +1,17 @@
|
|||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
|
||||||
const baseUrl = '/blade-transport/invoice-application';
|
const baseUrl = '/blade-transport/invoice-application';
|
||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getSettlementCandidates = keyword =>
|
export const getSettlementCandidates = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/settlement-candidates`, method: 'get', params: { keyword } });
|
request({
|
||||||
|
url: `${baseUrl}/settlement-candidates`,
|
||||||
|
method: 'get',
|
||||||
|
params: { current, size, ...params },
|
||||||
|
});
|
||||||
export const getSettlementDetails = settlementIds =>
|
export const getSettlementDetails = settlementIds =>
|
||||||
request({ url: `${baseUrl}/settlement-details`, method: 'get', params: { settlementIds } });
|
request({ url: `${baseUrl}/settlement-details`, method: 'get', params: { settlementIds } });
|
||||||
export const getReceiverInformation = settlementIds =>
|
export const getReceiverInformation = settlementIds =>
|
||||||
@@ -14,11 +19,12 @@ export const getReceiverInformation = settlementIds =>
|
|||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data =>
|
||||||
|
request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
export const syncKingdee = id =>
|
export const syncKingdee = id =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
|
||||||
|
|
||||||
export const invoiceTypeOptions = [
|
export const invoiceTypeOptions = [
|
||||||
{ label: '电子专票', value: 'electronic_special' },
|
{ label: '电子专票', value: 'electronic_special' },
|
||||||
|
|||||||
@@ -1,12 +1,22 @@
|
|||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
|
||||||
const baseUrl = '/blade-transport/invoice-receipt';
|
const baseUrl = '/blade-transport/invoice-receipt';
|
||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getInvoicePool = keyword =>
|
export const queryInvoicePool = params =>
|
||||||
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params: { keyword } });
|
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
|
||||||
|
export const downloadInvoicePoolAttachment = invoiceNo =>
|
||||||
|
// 金蝶票池发票文件下载(后端代理 A801-2 流式回源),耗时较普通接口长,放宽到 120s
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/invoice-pool/attachment/download`,
|
||||||
|
method: 'get',
|
||||||
|
params: { invoiceNo },
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
export const getSettlementCandidates = (keyword, receiptId) =>
|
export const getSettlementCandidates = (keyword, receiptId) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/settlement-candidates`,
|
url: `${baseUrl}/settlement-candidates`,
|
||||||
@@ -22,11 +32,21 @@ export const getReferenceInformation = settlementIds =>
|
|||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data =>
|
||||||
|
request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
export const syncKingdee = id =>
|
export const pushKingdee = ids =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
|
||||||
|
// 先票后款:发票明细查询(收票登记明细区块按票号带出发票明细行)
|
||||||
|
export const invoiceDetailQuery = invoiceNo =>
|
||||||
|
request({ url: `${baseUrl}/invoice-detail-query`, method: 'get', params: { invoiceNo } });
|
||||||
|
// 先票后款:结算单认领收票单候选分页(审批通过且未被有效应付结算单认领)
|
||||||
|
export const claimCandidates = params =>
|
||||||
|
request({ url: `${baseUrl}/claim-candidates`, method: 'get', params });
|
||||||
|
// 先票后款:结算单已认领收票登记列表(发票登记对话框回显已认领票)
|
||||||
|
export const claimedReceipts = formalSettlementId =>
|
||||||
|
request({ url: `${baseUrl}/claimed-list`, method: 'get', params: { formalSettlementId } });
|
||||||
|
|
||||||
export const approvalStatusOptions = [
|
export const approvalStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
@@ -36,8 +56,9 @@ export const approvalStatusOptions = [
|
|||||||
{ label: '已作废', value: 'voided' },
|
{ label: '已作废', value: 'voided' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const kingdeeStatusOptions = [
|
export const kingdeePushStatusOptions = [
|
||||||
{ label: '未同步', value: 'unsynced' },
|
{ label: '未推送', value: 'unsynced' },
|
||||||
{ label: '已同步', value: 'synced' },
|
{ label: '已保存收票单', value: 'pushed' },
|
||||||
{ label: '同步失败', value: 'failed' },
|
{ label: '已指定应付', value: 'assigned' },
|
||||||
|
{ label: '推送失败', value: 'failed' },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,27 +1,44 @@
|
|||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
|
||||||
const baseUrl = '/blade-transport/payment-application';
|
const baseUrl = '/blade-transport/payment-application';
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
|
export const getReferenceAmount = (paymentType, referenceId, excludeId) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/reference-amount`,
|
||||||
|
method: 'get',
|
||||||
|
params: { paymentType, referenceId, excludeId: excludeId || undefined },
|
||||||
|
});
|
||||||
|
/** 按合同查询可选项目预付核销列表(审批通过且仍有可核销余额) */
|
||||||
|
export const getProjectAdvanceWriteOffOptions = params =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/project-advance-write-off-options`,
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data =>
|
||||||
|
request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
|
// 同步金蝶涉及多次金蝶远程接口调用(A103-2 预检 + A103-1/A103-3 推送),单笔可达 20s+,覆盖全局 10s 超时
|
||||||
export const syncKingdee = id =>
|
export const syncKingdee = id =>
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: APPROVE_TIMEOUT, params: { id } });
|
||||||
|
// 批量同步逐单单据级事务串行推送,耗时随单量线性增长
|
||||||
|
export const syncKingdeeBatch = ids =>
|
||||||
|
request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: APPROVE_TIMEOUT, data: ids });
|
||||||
|
// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4,同样可能超过全局超时
|
||||||
|
export const syncKingdeeResult = () =>
|
||||||
|
request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });
|
||||||
|
|
||||||
export const paymentTypeOptions = [
|
export const paymentTypeOptions = [
|
||||||
{ label: '项目预付', value: 'project_advance' },
|
{ label: '项目预付', value: 'project_advance' },
|
||||||
{ label: '进度预付', value: 'progress_advance' },
|
{ label: '进度预付', value: 'progress_advance' },
|
||||||
{ label: '结算付款', value: 'settlement_payment' },
|
{ label: '尾款付款', value: 'settlement_payment' },
|
||||||
];
|
|
||||||
export const paymentMethodOptions = [
|
|
||||||
{ label: '银行转账', value: 'bank_transfer' },
|
|
||||||
{ label: '银行承兑汇票', value: 'bank_draft' },
|
|
||||||
{ label: '商业承兑汇票', value: 'commercial_draft' },
|
|
||||||
];
|
];
|
||||||
export const approvalStatusOptions = [
|
export const approvalStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
@@ -33,5 +50,8 @@ export const approvalStatusOptions = [
|
|||||||
export const kingdeeStatusOptions = [
|
export const kingdeeStatusOptions = [
|
||||||
{ label: '未生成', value: 'unsynced' },
|
{ label: '未生成', value: 'unsynced' },
|
||||||
{ label: '已生成', value: 'synced' },
|
{ label: '已生成', value: 'synced' },
|
||||||
|
{ label: '付款中', value: 'paying' },
|
||||||
|
{ label: '已付款', value: 'paid' },
|
||||||
|
{ label: '已关闭', value: 'closed' },
|
||||||
{ label: '生成失败', value: 'failed' },
|
{ label: '生成失败', value: 'failed' },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ export const claimStatusOptions = [
|
|||||||
|
|
||||||
export const kingdeeBillStatusOptions = [
|
export const kingdeeBillStatusOptions = [
|
||||||
{ label: '未生成', value: 'none' },
|
{ label: '未生成', value: 'none' },
|
||||||
|
{ label: '已推送', value: 'pushed' },
|
||||||
{ label: '审核通过', value: 'approved' },
|
{ label: '审核通过', value: 'approved' },
|
||||||
|
{ label: '已收款', value: 'received' },
|
||||||
{ label: '处理失败', value: 'failed' },
|
{ label: '处理失败', value: 'failed' },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ import request from '@/axios';
|
|||||||
|
|
||||||
const baseUrl = '/blade-transport/receipt-flow';
|
const baseUrl = '/blade-transport/receipt-flow';
|
||||||
|
|
||||||
|
/** 收款流水同步需远程拉取金蝶收款单并逐条落库,覆盖全局 10s 超时 */
|
||||||
|
export const SYNC_TIMEOUT = 30000;
|
||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
@@ -12,10 +15,17 @@ export const getSettlementCandidates = (keyword, flowId) =>
|
|||||||
params: { keyword, flowId },
|
params: { keyword, flowId },
|
||||||
});
|
});
|
||||||
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
||||||
export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
|
export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });
|
||||||
|
|
||||||
export const claimStatusOptions = [
|
export const claimStatusOptions = [
|
||||||
{ label: '未认领', value: 'unclaimed' },
|
{ label: '未认领', value: 'unclaimed' },
|
||||||
{ label: '部分认领', value: 'partial' },
|
{ label: '部分认领', value: 'partial' },
|
||||||
{ label: '认领完成', value: 'claimed' },
|
{ label: '认领完成', value: 'claimed' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const kingdeeBillStatusOptions = [
|
||||||
|
{ label: '已推送', value: 'pushed' },
|
||||||
|
{ label: '审核通过', value: 'approved' },
|
||||||
|
{ label: '已收款', value: 'received' },
|
||||||
|
{ label: '处理失败', value: 'failed' },
|
||||||
|
];
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
|
||||||
const baseUrl = '/blade-transport/formal-settlement';
|
const baseUrl = '/blade-transport/formal-settlement';
|
||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
|
export const exportList = params =>
|
||||||
|
request({ url: `${baseUrl}/export`, method: 'get', params, responseType: 'blob' });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getCandidates = (current, size, params) =>
|
export const getCandidates = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
@@ -13,7 +16,8 @@ export const getCandidates = (current, size, params) =>
|
|||||||
});
|
});
|
||||||
export const getContractOptions = (keyword, projectId) =>
|
export const getContractOptions = (keyword, projectId) =>
|
||||||
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword, projectId } });
|
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword, projectId } });
|
||||||
export const getNextNo = () => request({ url: `${baseUrl}/next-no`, method: 'get' });
|
export const getNextNo = settlementType =>
|
||||||
|
request({ url: `${baseUrl}/next-no`, method: 'get', params: { settlementType } });
|
||||||
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
||||||
export const getCandidateDetails = (current, size, params) =>
|
export const getCandidateDetails = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
@@ -24,14 +28,51 @@ export const getCandidateDetails = (current, size, params) =>
|
|||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data =>
|
||||||
|
request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
export const syncKingdee = id =>
|
// 同步金蝶涉及多次金蝶远程接口调用(A102-4 预检 + A102-2 保存),可达 20s+,覆盖全局 10s 超时
|
||||||
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
|
// config.meta.suppressErrorMessage=true 时由页面弹框汇总结果,避免拦截器重复 toast
|
||||||
|
export const syncKingdee = (id, config = {}) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/sync-kingdee`,
|
||||||
|
method: 'post',
|
||||||
|
timeout: 30000,
|
||||||
|
params: { id },
|
||||||
|
...config,
|
||||||
|
});
|
||||||
export const getDetailFees = detailId =>
|
export const getDetailFees = detailId =>
|
||||||
request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
|
request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
|
||||||
|
export const getReceiptClaims = formalSettlementId =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/receipt-claims`,
|
||||||
|
method: 'get',
|
||||||
|
params: { formalSettlementId },
|
||||||
|
});
|
||||||
export const adjustDetail = data =>
|
export const adjustDetail = data =>
|
||||||
request({ url: `${baseUrl}/adjust-detail`, method: 'post', data });
|
request({ url: `${baseUrl}/adjust-detail`, method: 'post', data });
|
||||||
export const applyPayment = data =>
|
export const applyPayment = data =>
|
||||||
request({ url: `${baseUrl}/apply-payment`, method: 'post', data });
|
request({ url: `${baseUrl}/apply-payment`, method: 'post', data });
|
||||||
|
export const applyPayments = data =>
|
||||||
|
request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
|
||||||
|
export const claimInvoices = data =>
|
||||||
|
request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
|
||||||
|
// 先票后款:发票登记确认推送(认领收票单逐单 A302-6 指定应付),涉及多次金蝶远程调用,覆盖全局超时
|
||||||
|
export const invoiceAssignKingdee = id =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/invoice-assign-kingdee`,
|
||||||
|
method: 'post',
|
||||||
|
timeout: 30000,
|
||||||
|
params: { id },
|
||||||
|
});
|
||||||
|
// 先票后款:查看页重推认领收票单(收票单A303-2+指定应付A302-6 一步式),涉及多次金蝶远程调用,覆盖全局超时
|
||||||
|
export const repushClaimedInvoice = (id, invoiceNo, matchedAmount) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/repush-claimed-invoice`,
|
||||||
|
method: 'post',
|
||||||
|
timeout: 30000,
|
||||||
|
params: { id, invoiceNo, matchedAmount },
|
||||||
|
});
|
||||||
|
export const queryInvoicePool = params =>
|
||||||
|
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import request from '@/axios';
|
import request from '@/axios';
|
||||||
|
import { APPROVE_TIMEOUT } from '@/api/common';
|
||||||
|
|
||||||
const baseUrl = '/blade-transport/pre-settlement';
|
const baseUrl = '/blade-transport/pre-settlement';
|
||||||
|
|
||||||
@@ -10,8 +11,22 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
|
|||||||
export const getContractOptions = keyword =>
|
export const getContractOptions = keyword =>
|
||||||
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword } });
|
request({ url: `${baseUrl}/contract-options`, method: 'get', params: { keyword } });
|
||||||
|
|
||||||
|
export const getContractList = (current, size, params) =>
|
||||||
|
request({
|
||||||
|
url: '/blade-transport/contract-manage/list',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
approvalStatuses: 'approved,change_approved',
|
||||||
|
...params,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
||||||
|
|
||||||
|
export const getNextNo = () => request({ url: `${baseUrl}/next-no`, method: 'get' });
|
||||||
|
|
||||||
export const getCandidateDetails = (current, size, params) =>
|
export const getCandidateDetails = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
url: `${baseUrl}/candidate-details`,
|
url: `${baseUrl}/candidate-details`,
|
||||||
@@ -28,7 +43,8 @@ export const removeDetail = (id, detailId) =>
|
|||||||
|
|
||||||
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
|
||||||
|
|
||||||
export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
|
export const approve = data =>
|
||||||
|
request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
|
||||||
|
|
||||||
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ export const getFormalSettlements = keyword =>
|
|||||||
request({ url: `${baseUrl}/candidate-formal-settlements`, method: 'get', params: { keyword } });
|
request({ url: `${baseUrl}/candidate-formal-settlements`, method: 'get', params: { keyword } });
|
||||||
export const getFormalDetails = formalSettlementId =>
|
export const getFormalDetails = formalSettlementId =>
|
||||||
request({ url: `${baseUrl}/formal-details`, method: 'get', params: { formalSettlementId } });
|
request({ url: `${baseUrl}/formal-details`, method: 'get', params: { formalSettlementId } });
|
||||||
|
export const getFeeOptions = () =>
|
||||||
|
request({ url: `${baseUrl}/fee-options`, method: 'get' });
|
||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const submit = id => request({ url: `${baseUrl}/submit`, method: 'post', data: { id } });
|
export const submit = id => request({ url: `${baseUrl}/submit`, method: 'post', data: { id } });
|
||||||
@@ -15,6 +17,10 @@ export const approve = id => request({ url: `${baseUrl}/approve`, method: 'post'
|
|||||||
export const returnBill = (id, reason) =>
|
export const returnBill = (id, reason) =>
|
||||||
request({ url: `${baseUrl}/return`, method: 'post', data: { id, reason } });
|
request({ url: `${baseUrl}/return`, method: 'post', data: { id, reason } });
|
||||||
export const repush = id => request({ url: `${baseUrl}/repush`, method: 'post', params: { id } });
|
export const repush = id => request({ url: `${baseUrl}/repush`, method: 'post', params: { id } });
|
||||||
|
export const syncKingdee = id =>
|
||||||
|
request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
|
||||||
|
export const kingdeeWriteOffPrecheck = formalSettlementId =>
|
||||||
|
request({ url: `${baseUrl}/kingdee-writeoff-precheck`, method: 'get', params: { formalSettlementId } });
|
||||||
|
|
||||||
export const approvalStatusOptions = [
|
export const approvalStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
const baseUrl = '/blade-transport/settlement-import';
|
||||||
|
|
||||||
|
export const getOptions = () => request({ url: `${baseUrl}/options`, method: 'get' });
|
||||||
|
|
||||||
|
export const getNextCode = () => request({ url: `${baseUrl}/next-code`, method: 'get' });
|
||||||
|
|
||||||
|
export const getList = (current, size, params) =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/list`,
|
||||||
|
method: 'get',
|
||||||
|
params: { current, size, ...params },
|
||||||
|
});
|
||||||
|
|
||||||
|
export const getDetail = id =>
|
||||||
|
request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
|
|
||||||
|
export const exportTemplate = () =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/export-template`,
|
||||||
|
method: 'get',
|
||||||
|
responseType: 'blob',
|
||||||
|
});
|
||||||
|
|
||||||
|
export const parseFile = file => {
|
||||||
|
const data = new FormData();
|
||||||
|
data.append('file', file);
|
||||||
|
return request({
|
||||||
|
url: `${baseUrl}/parse`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const validate = data =>
|
||||||
|
request({ url: `${baseUrl}/validate`, method: 'post', data, timeout: 120000 });
|
||||||
|
|
||||||
|
export const exportFailures = data =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/export-failures`,
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 120000,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const saveDraft = data =>
|
||||||
|
request({ url: `${baseUrl}/draft`, method: 'post', data, timeout: 120000 });
|
||||||
|
|
||||||
|
export const confirm = data =>
|
||||||
|
request({ url: `${baseUrl}/confirm`, method: 'post', data, timeout: 120000 });
|
||||||
|
|
||||||
|
export const voidBatch = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||||
|
|
||||||
|
export const removeDraft = id =>
|
||||||
|
request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
|
|
||||||
|
export const getHistoryWaybills = params =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/history-waybills`,
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
@@ -4,6 +4,8 @@ const baseUrl = '/blade-transport/transport-reconciliation';
|
|||||||
|
|
||||||
export const getList = (current, size, params) =>
|
export const getList = (current, size, params) =>
|
||||||
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
|
||||||
|
export const exportList = params =>
|
||||||
|
request({ url: `${baseUrl}/export`, method: 'get', params, responseType: 'blob' });
|
||||||
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
|
||||||
export const getFormalOptions = (current, size, params) =>
|
export const getFormalOptions = (current, size, params) =>
|
||||||
request({
|
request({
|
||||||
@@ -14,17 +16,21 @@ export const getFormalOptions = (current, size, params) =>
|
|||||||
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
|
||||||
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
|
||||||
export const match = id => request({ url: `${baseUrl}/match`, method: 'post', params: { id } });
|
export const match = id => request({ url: `${baseUrl}/match`, method: 'post', params: { id } });
|
||||||
|
export const matchPreview = data =>
|
||||||
|
request({ url: `${baseUrl}/match-preview`, method: 'post', data });
|
||||||
export const manualMatch = data =>
|
export const manualMatch = data =>
|
||||||
request({ url: `${baseUrl}/manual-match`, method: 'post', data });
|
request({ url: `${baseUrl}/manual-match`, method: 'post', data });
|
||||||
export const unmatch = internalId =>
|
export const unmatch = internalId =>
|
||||||
request({ url: `${baseUrl}/unmatch`, method: 'post', params: { internalId } });
|
request({ url: `${baseUrl}/unmatch`, method: 'post', params: { internalId } });
|
||||||
export const adjust = data => request({ url: `${baseUrl}/adjust`, method: 'post', data });
|
export const adjust = data => request({ url: `${baseUrl}/adjust`, method: 'post', data });
|
||||||
export const updateByMatch = id =>
|
export const updateByMatch = (id, data) =>
|
||||||
request({ url: `${baseUrl}/update-by-match`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/update-by-match`, method: 'post', params: { id }, data });
|
||||||
export const complete = id =>
|
export const complete = id =>
|
||||||
request({ url: `${baseUrl}/complete`, method: 'post', params: { id } });
|
request({ url: `${baseUrl}/complete`, method: 'post', params: { id } });
|
||||||
export const template = mode =>
|
export const completeWithData = data =>
|
||||||
request({ url: `${baseUrl}/template`, method: 'get', params: { mode }, responseType: 'blob' });
|
request({ url: `${baseUrl}/complete-with-data`, method: 'post', data });
|
||||||
|
export const template = (mode, params) =>
|
||||||
|
request({ url: `${baseUrl}/template`, method: 'get', params: { mode, ...params }, responseType: 'blob' });
|
||||||
|
|
||||||
const importFile = (url, id, file) => {
|
const importFile = (url, id, file) => {
|
||||||
const data = new FormData();
|
const data = new FormData();
|
||||||
|
|||||||
@@ -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 },
|
||||||
|
});
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
/** 提交审核流(MK)统一超时:客商/项目/合同/预结算/正式结算/付款/开票/收票/汇票付款 */
|
||||||
|
export const MK_SUBMIT_TIMEOUT = 30000;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调用 MK processSubmit 提交审核流
|
||||||
|
* @param {Object} data
|
||||||
|
* @param {string} data.templateCode 模板编码
|
||||||
|
* @param {string} data.submitIdentity 提交人(手机号)
|
||||||
|
* @param {string} data.loginName 登录账号(手机号)
|
||||||
|
* @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({
|
||||||
|
url: '/blade-system/businessProcess/processSubmit',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
timeout: MK_SUBMIT_TIMEOUT,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调用 MK processDelete 删除审核流(驳回后重新提交前使用)
|
||||||
|
* @param {Object} data
|
||||||
|
* @param {string} data.bizId 业务主键
|
||||||
|
*/
|
||||||
|
export const processDelete = data => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/businessProcess/processDelete',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
timeout: MK_SUBMIT_TIMEOUT,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询 MK 流程实例是否仍存在(有数据则无需删除/重新提交)
|
||||||
|
* @param {Object} params
|
||||||
|
* @param {string} params.bizId 业务主键
|
||||||
|
*/
|
||||||
|
export const hasMkProcessInstance = params => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/businessProcess/hasMkProcessInstance',
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取 MK 审批页跳转链接(后端按 thirdParty.mk 配置拼接,含 SSO)
|
||||||
|
* @param {Object} params
|
||||||
|
* @param {string} [params.bizId] 业务 id(如客商 id)
|
||||||
|
* @param {string} [params.processInstanceId] 流程实例 id
|
||||||
|
*/
|
||||||
|
export const getMKApprovalUrl = params => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/businessProcess/getMKApprovalUrl',
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -41,6 +41,60 @@ export const add = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const syncIamOrganizations = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-iam-organizations',
|
||||||
|
method: 'post',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const clearNonTopDept = signal => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/clear-non-top',
|
||||||
|
method: 'post',
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const syncOaCompany = (current = 1, size = 20, signal, incremental = false, modifiedSince) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-oa-company',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
incremental: !!incremental,
|
||||||
|
modifiedSince: modifiedSince || undefined,
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const syncOaDepartment = (
|
||||||
|
current = 1,
|
||||||
|
size = 20,
|
||||||
|
signal,
|
||||||
|
incremental = false,
|
||||||
|
modifiedSince,
|
||||||
|
companyOaId
|
||||||
|
) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/sync-oa-department',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
incremental: !!incremental,
|
||||||
|
modifiedSince: modifiedSince || undefined,
|
||||||
|
companyOaId: companyOaId || undefined,
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const update = row => {
|
export const update = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/dept/submit',
|
url: '/blade-system/dept/submit',
|
||||||
@@ -78,3 +132,17 @@ export const getDeptLazyTree = parentId => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getPlatformCompanySelect = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/platform-company-select',
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getBusinessDeptSelect = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dept/business-dept-select',
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -86,3 +86,10 @@ export const getDictionary = params => {
|
|||||||
params,
|
params,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getDictionaryAll = () => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/dict-biz/select-all',
|
||||||
|
method: 'get',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getList = (current, size, params) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/mp-user/list',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
...params,
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getDetail = id => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/mp-user/detail',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const submit = row => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/mp-user/submit',
|
||||||
|
method: 'post',
|
||||||
|
data: row,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const remove = ids => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/mp-user/remove',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
ids,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const changeStatus = (id, status) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/mp-user/change-status',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
status,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const resetPassword = userIds => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/mp-user/reset-password',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
userIds,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
export const getRoleMenuDataScopeTree = roleId => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/role-menu-data-scope/tree',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
roleId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const submitRoleMenuDataScope = data => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/role-menu-data-scope/submit',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -31,6 +31,21 @@ export const add = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const syncIamAccounts = (current = 1, size = 50, signal, incremental = false, modifiedSince) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/user/sync-iam-accounts',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
incremental: !!incremental,
|
||||||
|
modifiedSince: modifiedSince || undefined,
|
||||||
|
},
|
||||||
|
timeout: 60000,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const update = row => {
|
export const update = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/user/update',
|
url: '/blade-system/user/update',
|
||||||
@@ -39,6 +54,17 @@ export const update = row => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const changeStatus = (id, status) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-system/user/change-status',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
status,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const updatePlatform = (userId, userType, userExt) => {
|
export const updatePlatform = (userId, userType, userExt) => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-system/user/update-platform',
|
url: '/blade-system/user/update-platform',
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
|
|||||||
|
|
||||||
export const follow = data => request({ url: `${baseUrl}/follow`, method: 'post', data });
|
export const follow = data => request({ url: `${baseUrl}/follow`, method: 'post', data });
|
||||||
|
|
||||||
|
export const update = data => request({ url: `${baseUrl}/update`, method: 'post', data });
|
||||||
|
|
||||||
export const complete = data => request({ url: `${baseUrl}/complete`, method: 'post', data });
|
export const complete = data => request({ url: `${baseUrl}/complete`, method: 'post', data });
|
||||||
|
|
||||||
export const batchComplete = ids =>
|
export const batchComplete = ids =>
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 认证记录列表:按审核状态分页,按提交时间倒序
|
||||||
|
* 审核对象是**一条认证记录**,不是一辆车或一名司机,故必须带 bizType 区分
|
||||||
|
* status 为审核状态(0审核中 1已通过 2已驳回 3已作废);不传时后端按 0 处理
|
||||||
|
*/
|
||||||
|
export const getPendingPage = (bizType, current, size, params) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/certification-audit/pending-page',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
...params,
|
||||||
|
bizType,
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核详情:同时返回本次待审快照与该对象当前生效快照,供前端做字段级对比
|
||||||
|
* 从未认证通过时 effectiveSnapshotJson 为空串
|
||||||
|
*/
|
||||||
|
export const getAuditDetail = id => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/certification-audit/detail',
|
||||||
|
method: 'get',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 审核一条认证记录
|
||||||
|
* 通过时不传驳回原因;驳回时必须传,且原因不超过 200 字
|
||||||
|
*/
|
||||||
|
export const auditCertification = (id, pass, rejectReason) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/certification-audit/audit',
|
||||||
|
method: 'post',
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
pass,
|
||||||
|
...(rejectReason ? { rejectReason } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
@@ -91,3 +91,14 @@ export const recognizeBaiduOcr = (imageUrl, type, side = '') => {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const recognizeQualificationCertificateOcr = imageUrl => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/baidu-ocr/qualification-certificate',
|
||||||
|
method: 'post',
|
||||||
|
timeout: 60000,
|
||||||
|
params: {
|
||||||
|
imageUrl,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -51,14 +51,6 @@ export const changeStatus = (id, status) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const auditCertification = (id, certificationStatus, rejectReason) => {
|
|
||||||
return request({
|
|
||||||
url: '/blade-transport/transport-vehicle/audit-certification',
|
|
||||||
method: 'post',
|
|
||||||
params: { id, certificationStatus, rejectReason },
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getExpiryStat = params => {
|
export const getExpiryStat = params => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/transport-vehicle/expiry-stat',
|
url: '/blade-transport/transport-vehicle/expiry-stat',
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import request from '@/axios';
|
||||||
|
|
||||||
|
const baseUrl = '/blade-transport/vehicle-dispatch';
|
||||||
|
|
||||||
|
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 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 exportVehicleDispatch = params =>
|
||||||
|
request({
|
||||||
|
url: `${baseUrl}/export-vehicle-dispatch`,
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
responseType: 'blob',
|
||||||
|
});
|
||||||
@@ -47,3 +47,11 @@ export const update = row => {
|
|||||||
data: row,
|
data: row,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getExpiryStat = params => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/annual-inspection-record/expiry-stat',
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -22,6 +22,19 @@ export const getDetail = id => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getPublicDetail = id => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/public/detail',
|
||||||
|
method: 'get',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const getChangeRecordList = (customerId, current, size) => {
|
export const getChangeRecordList = (customerId, current, size) => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/customer-archive/change-record/list',
|
url: '/blade-transport/customer-archive/change-record/list',
|
||||||
@@ -34,6 +47,32 @@ export const getChangeRecordList = (customerId, current, size) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getPublicChangeRecordList = (customerId, current, size) => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/public/change-record/list',
|
||||||
|
method: 'get',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
params: {
|
||||||
|
customerId,
|
||||||
|
current,
|
||||||
|
size,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const postPublicProcessMessage = data => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/public/process-message',
|
||||||
|
method: 'post',
|
||||||
|
meta: {
|
||||||
|
isToken: false,
|
||||||
|
},
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const submit = row => {
|
export const submit = row => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/customer-archive/submit',
|
url: '/blade-transport/customer-archive/submit',
|
||||||
@@ -113,14 +152,99 @@ export const getScoreTemplate = quantificationId => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** 线下评分 Excel 模板下载 */
|
||||||
|
export const downloadScoreExcelTemplate = quantificationId => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/score-excel-template',
|
||||||
|
method: 'get',
|
||||||
|
responseType: 'blob',
|
||||||
|
params: {
|
||||||
|
quantificationId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 线下评分 Excel 导入(成功返回评分明细 JSON;失败返回失败明细 Excel 流) */
|
||||||
|
export const importScoreExcel = (quantificationId, file) => {
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('file', file);
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/score-import',
|
||||||
|
method: 'post',
|
||||||
|
data: formData,
|
||||||
|
responseType: 'blob',
|
||||||
|
timeout: 60000,
|
||||||
|
params: {
|
||||||
|
quantificationId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const queryKingdeeCustomer = creditCode => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/bfi/customer/query-by-credit-code',
|
||||||
|
method: 'get',
|
||||||
|
timeout: 30000,
|
||||||
|
params: {
|
||||||
|
creditCode,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// 金蝶供应商编码查询(A901-1):新增客商填写信用代码后即时回显
|
||||||
|
export const querySupplierCode = creditCode => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/query-supplier-code',
|
||||||
|
method: 'get',
|
||||||
|
timeout: 30000,
|
||||||
|
params: {
|
||||||
|
creditCode,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// 金蝶开户行查询(A905-3):收款信息填写开户行失焦后精确匹配带出联行号
|
||||||
|
export const queryKingdeeBank = bankName => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/query-bank',
|
||||||
|
method: 'get',
|
||||||
|
timeout: 30000,
|
||||||
|
params: {
|
||||||
|
bankName,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// 金蝶联行号校验(A905-3):收款信息保存前按联行号精确匹配,查不到不允许保存
|
||||||
|
export const queryKingdeeBankByNumber = cnapsCode => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/query-bank-by-number',
|
||||||
|
method: 'get',
|
||||||
|
timeout: 30000,
|
||||||
|
params: {
|
||||||
|
cnapsCode,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const syncKingdee = id => {
|
||||||
|
return request({
|
||||||
|
url: '/blade-transport/customer-archive/sync-kingdee',
|
||||||
|
method: 'post',
|
||||||
|
timeout: 30000,
|
||||||
|
params: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const recognizeBusinessLicenseOcr = imageUrl => {
|
export const recognizeBusinessLicenseOcr = imageUrl => {
|
||||||
return request({
|
return request({
|
||||||
url: '/blade-transport/baidu-ocr/recognize-url',
|
url: '/blade-transport/baidu-ocr/business-license',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
timeout: 60000,
|
timeout: 60000,
|
||||||
params: {
|
params: {
|
||||||
imageUrl,
|
imageUrl,
|
||||||
type: 'business_license',
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -70,11 +70,62 @@ const redirectToLogin = () => {
|
|||||||
store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
|
store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 统一弹出错误提示并返回带标记的 Error。
|
||||||
|
* `_notified` 标记用于让业务层(批量导入等)识别「拦截器已经提示过」,
|
||||||
|
* 避免同一条错误被弹两次。
|
||||||
|
* meta.suppressErrorMessage=true 时由业务层自行弹框汇总,拦截器不再 toast。
|
||||||
|
*/
|
||||||
|
const notifiedError = (message, config) => {
|
||||||
|
if (config?.meta?.suppressErrorMessage !== true) {
|
||||||
|
ElMessage({
|
||||||
|
message: message,
|
||||||
|
type: 'error',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const error = new Error(message);
|
||||||
|
error._notified = true;
|
||||||
|
return error;
|
||||||
|
};
|
||||||
|
|
||||||
axios.defaults.timeout = 10000;
|
axios.defaults.timeout = 10000;
|
||||||
//返回其他状态码
|
//返回其他状态码
|
||||||
axios.defaults.validateStatus = function (status) {
|
axios.defaults.validateStatus = function (status) {
|
||||||
return status >= 200 && status <= 500; // 默认的
|
return status >= 200 && status <= 500; // 默认的
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断响应是否为 JSON。
|
||||||
|
* 用于 blob 请求(导入/导出)的兜底:后端在业务校验失败时返回的是 JSON
|
||||||
|
* (Content-Type: application/json),而不是文件流,需要解析后才能取到 msg。
|
||||||
|
*/
|
||||||
|
const isJsonContentType = res => {
|
||||||
|
const headers = res.headers || {};
|
||||||
|
const contentType = String(headers['content-type'] || res.data?.type || '').toLowerCase();
|
||||||
|
return contentType.includes('application/json') || contentType.includes('text/json');
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否为可按文本读取的 Blob / Blob-like(含跨 realm)。
|
||||||
|
* 禁止对普通业务 JSON 对象调用 .text()。
|
||||||
|
*/
|
||||||
|
const isBlobLikeData = value =>
|
||||||
|
value != null &&
|
||||||
|
typeof value === 'object' &&
|
||||||
|
typeof value.size === 'number' &&
|
||||||
|
typeof value.type === 'string' &&
|
||||||
|
typeof value.text === 'function';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断响应体是否已是解析好的对象(无需再解析)。
|
||||||
|
* 注意 Blob 也是 object,必须排除,否则会把待解析的文件流误判为已完成。
|
||||||
|
*/
|
||||||
|
const isPlainObject = value =>
|
||||||
|
value !== null &&
|
||||||
|
typeof value === 'object' &&
|
||||||
|
!(value instanceof Blob) &&
|
||||||
|
!isBlobLikeData(value) &&
|
||||||
|
!(value instanceof ArrayBuffer);
|
||||||
//跨域请求,允许保存cookie
|
//跨域请求,允许保存cookie
|
||||||
axios.defaults.withCredentials = true;
|
axios.defaults.withCredentials = true;
|
||||||
// NProgress Configuration
|
// NProgress Configuration
|
||||||
@@ -140,7 +191,7 @@ axios.interceptors.request.use(
|
|||||||
|
|
||||||
//http response拦截
|
//http response拦截
|
||||||
axios.interceptors.response.use(
|
axios.interceptors.response.use(
|
||||||
res => {
|
async res => {
|
||||||
NProgress.done();
|
NProgress.done();
|
||||||
//获取配置信息
|
//获取配置信息
|
||||||
const config = res.config;
|
const config = res.config;
|
||||||
@@ -149,10 +200,39 @@ axios.interceptors.response.use(
|
|||||||
if (cryptoData) {
|
if (cryptoData) {
|
||||||
res.data = JSON.parse(crypto.decryptAES(res.data, crypto.aesKey));
|
res.data = JSON.parse(crypto.decryptAES(res.data, crypto.aesKey));
|
||||||
}
|
}
|
||||||
//获取状态信息
|
// blob 请求(文件下载、导入)的响应体是 Blob,直接读 res.data.code / res.data.msg
|
||||||
const status = res.data.error_code || res.data.code || res.status;
|
// 拿不到任何字段:状态码会退回 res.status、提示文案会落到「系统错误」兜底,
|
||||||
|
// 用户就会以为系统崩了——而后端其实返回了明确的业务提示(如「未读取到数据行…」)。
|
||||||
|
// 这里按 Content-Type 判断:JSON 才解析回对象;真·文件流(Excel 等)保持原样不动。
|
||||||
|
// 兼容 Blob(浏览器 responseType='blob')与 string(非浏览器环境)两种形态。
|
||||||
|
// 仅对真正的 Blob/Blob-like 调 .text(),避免业务 JSON 已解析后出现
|
||||||
|
// 「e.data.text is not a function」。
|
||||||
|
if (isJsonContentType(res) && !isPlainObject(res.data)) {
|
||||||
|
try {
|
||||||
|
let text = '';
|
||||||
|
const raw = res.data;
|
||||||
|
if (isBlobLikeData(raw) || (typeof Blob !== 'undefined' && raw instanceof Blob)) {
|
||||||
|
text = await raw.text();
|
||||||
|
} else if (typeof raw === 'string') {
|
||||||
|
text = raw;
|
||||||
|
} else if (raw && typeof raw.arrayBuffer === 'function') {
|
||||||
|
text = new TextDecoder().decode(await raw.arrayBuffer());
|
||||||
|
} else if (raw instanceof ArrayBuffer) {
|
||||||
|
text = new TextDecoder().decode(raw);
|
||||||
|
}
|
||||||
|
const parsed = typeof text === 'string' && text ? JSON.parse(text) : null;
|
||||||
|
if (parsed && typeof parsed === 'object') {
|
||||||
|
res.data = parsed;
|
||||||
|
}
|
||||||
|
} catch (ignored) {
|
||||||
|
// 声明是 JSON 却解析失败:保持原样,交给下游按文件处理
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 获取状态信息:文件流没有 code/msg,必须退回 HTTP status,禁止读 Blob 上的幽灵字段
|
||||||
|
const payload = isPlainObject(res.data) ? res.data : {};
|
||||||
|
const status = Number(payload.error_code || payload.code || res.status);
|
||||||
const statusWhiteList = website.statusWhiteList || [];
|
const statusWhiteList = website.statusWhiteList || [];
|
||||||
const message = res.data.msg || res.data.error_description || '系统错误';
|
const message = payload.msg || payload.error_description || '系统错误';
|
||||||
//如果在白名单里则自行catch逻辑处理
|
//如果在白名单里则自行catch逻辑处理
|
||||||
if (statusWhiteList.includes(status)) return Promise.reject(res);
|
if (statusWhiteList.includes(status)) return Promise.reject(res);
|
||||||
|
|
||||||
@@ -204,26 +284,33 @@ axios.interceptors.response.use(
|
|||||||
|
|
||||||
// OAuth2 业务错误码提示
|
// OAuth2 业务错误码提示
|
||||||
if (status > 2000 && !validatenull(res.data.error_description)) {
|
if (status > 2000 && !validatenull(res.data.error_description)) {
|
||||||
ElMessage({
|
return Promise.reject(notifiedError(message, config));
|
||||||
message: message,
|
|
||||||
type: 'error',
|
|
||||||
});
|
|
||||||
return Promise.reject(new Error(message));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 其余非 200 响应统一提示
|
// 其余非 200 响应统一提示
|
||||||
if (status !== 200) {
|
if (status !== 200) {
|
||||||
ElMessage({
|
return Promise.reject(notifiedError(message, config));
|
||||||
message: message,
|
|
||||||
type: 'error',
|
|
||||||
});
|
|
||||||
return Promise.reject(new Error(message));
|
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
NProgress.done();
|
NProgress.done();
|
||||||
|
// 网络级失败(HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应)
|
||||||
|
// 原为静默 reject,接口报错页面无任何感知;统一补错误提示,取消请求与刷新令牌请求除外
|
||||||
|
if (
|
||||||
|
!axios.isCancel(error) &&
|
||||||
|
!isRefreshTokenRequest(error?.config) &&
|
||||||
|
error?.config?.meta?.suppressErrorMessage !== true
|
||||||
|
) {
|
||||||
|
ElMessage({
|
||||||
|
message: error?.response?.data?.msg || '请求失败,请稍后重试',
|
||||||
|
type: 'error',
|
||||||
|
});
|
||||||
|
}
|
||||||
return Promise.reject(new Error(error));
|
return Promise.reject(new Error(error));
|
||||||
|
// 保留原始 axios 错误对象:下游(如导入失败明细解析)需要 error.response
|
||||||
|
// 读取响应体。若包装成 new Error(error),response 会丢失、message 退化成
|
||||||
|
// "[object Object]",用户只能看到无意义的通用提示。
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog
|
<el-dialog v-model="visible" title="地图选择地址" width="920px" append-to-body @opened="initMap">
|
||||||
v-model="visible"
|
|
||||||
title="地图选择地址"
|
|
||||||
width="920px"
|
|
||||||
append-to-body
|
|
||||||
@opened="initMap"
|
|
||||||
>
|
|
||||||
<div class="address-map-picker__toolbar">
|
<div class="address-map-picker__toolbar">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="keyword"
|
v-model="keyword"
|
||||||
@@ -15,11 +9,18 @@
|
|||||||
/>
|
/>
|
||||||
<el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
|
<el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div ref="map" class="address-map-picker__map"></div>
|
<div class="address-map-picker__content">
|
||||||
|
<div ref="map" class="address-map-picker__map"></div>
|
||||||
|
<map-search-results :results="searchResults" @select="selectSearchResult" />
|
||||||
|
</div>
|
||||||
<div class="address-map-picker__info">{{ status }}</div>
|
<div class="address-map-picker__info">{{ status }}</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="visible = false">取消</el-button>
|
<el-button @click="visible = false">取消</el-button>
|
||||||
<el-button type="primary" :disabled="!selected.longitude || resolving" @click="confirm">
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
:disabled="!hasCoordinateValue(selected.longitude) || !hasCoordinateValue(selected.latitude) || resolving"
|
||||||
|
@click="confirm"
|
||||||
|
>
|
||||||
确定
|
确定
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
@@ -27,8 +28,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
|
import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
|
||||||
const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
|
|
||||||
|
const AMAP_KEY = '13dcb15bc29bfe9c432d17ecd808b812';
|
||||||
|
const AMAP_SECURITY_CODE = 'f9d036ef29e376e15d309e0de5c0f7ab';
|
||||||
let amapLoader;
|
let amapLoader;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -41,6 +44,14 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
|
longitude: {
|
||||||
|
type: [String, Number],
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
latitude: {
|
||||||
|
type: [String, Number],
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
emits: ['update:modelValue', 'confirm'],
|
emits: ['update:modelValue', 'confirm'],
|
||||||
data() {
|
data() {
|
||||||
@@ -54,6 +65,8 @@ export default {
|
|||||||
amap: null,
|
amap: null,
|
||||||
marker: null,
|
marker: null,
|
||||||
geocoder: null,
|
geocoder: null,
|
||||||
|
searchResults: [],
|
||||||
|
mapInitializing: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -63,8 +76,11 @@ export default {
|
|||||||
this.visible = value;
|
this.visible = value;
|
||||||
if (value) {
|
if (value) {
|
||||||
this.keyword = this.address || '';
|
this.keyword = this.address || '';
|
||||||
this.selected = {};
|
this.searchResults = [];
|
||||||
this.status = '可搜索地址或点击地图选点';
|
this.selected = this.buildInitialSelection();
|
||||||
|
this.status = this.selected.longitude
|
||||||
|
? this.selected.address || '已选点,可确认回填'
|
||||||
|
: '可搜索地址或点击地图选点';
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -78,6 +94,32 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
hasCoordinateValue(value) {
|
||||||
|
return value !== '' && value !== null && value !== undefined;
|
||||||
|
},
|
||||||
|
buildInitialSelection() {
|
||||||
|
// Number('') === 0,空字符串不能当有效坐标,否则会落到 [0,0](非洲附近)
|
||||||
|
if (!this.hasCoordinateValue(this.longitude) || !this.hasCoordinateValue(this.latitude)) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
const longitude = Number(this.longitude);
|
||||||
|
const latitude = Number(this.latitude);
|
||||||
|
if (
|
||||||
|
!Number.isFinite(longitude) ||
|
||||||
|
!Number.isFinite(latitude) ||
|
||||||
|
longitude < -180 ||
|
||||||
|
longitude > 180 ||
|
||||||
|
latitude < -90 ||
|
||||||
|
latitude > 90
|
||||||
|
) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
longitude,
|
||||||
|
latitude,
|
||||||
|
address: this.address || '',
|
||||||
|
};
|
||||||
|
},
|
||||||
loadAmap() {
|
loadAmap() {
|
||||||
if (window.AMap && window.AMap.Map) {
|
if (window.AMap && window.AMap.Map) {
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
@@ -96,25 +138,53 @@ export default {
|
|||||||
return amapLoader;
|
return amapLoader;
|
||||||
},
|
},
|
||||||
initMap() {
|
initMap() {
|
||||||
this.loadAmap()
|
if (this.mapInitializing) return this.mapInitializing;
|
||||||
|
|
||||||
|
this.mapInitializing = this.loadAmap()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.$nextTick(() => {
|
if (!window.AMap?.Map) {
|
||||||
if (!this.amap) {
|
throw new Error('高德地图组件未就绪');
|
||||||
this.amap = new window.AMap.Map(this.$refs.map, {
|
}
|
||||||
center: [116.40769, 39.89945],
|
return new Promise(resolve => {
|
||||||
zoom: 11,
|
this.$nextTick(() => {
|
||||||
});
|
if (!this.$refs.map) return resolve(null);
|
||||||
this.amap.on('click', event => this.pickPoint(event.lnglat));
|
const initial = this.buildInitialSelection();
|
||||||
} else {
|
const hasPoint =
|
||||||
this.amap.resize();
|
Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude);
|
||||||
this.clearMarker();
|
const center = hasPoint
|
||||||
}
|
? [initial.longitude, initial.latitude]
|
||||||
|
: [116.40769, 39.89945];
|
||||||
|
const zoom = hasPoint ? 14 : 11;
|
||||||
|
if (!this.amap) {
|
||||||
|
this.amap = new window.AMap.Map(this.$refs.map, {
|
||||||
|
center,
|
||||||
|
zoom,
|
||||||
|
});
|
||||||
|
this.amap.on('click', event => this.pickPoint(event.lnglat));
|
||||||
|
} else {
|
||||||
|
this.amap.resize();
|
||||||
|
this.clearMarker();
|
||||||
|
this.amap.setZoomAndCenter(zoom, center);
|
||||||
|
}
|
||||||
|
if (hasPoint) {
|
||||||
|
const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
|
||||||
|
this.renderMarker(point);
|
||||||
|
this.selected = { ...initial };
|
||||||
|
this.status = initial.address || '已选点,可确认回填';
|
||||||
|
}
|
||||||
|
resolve(this.amap);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
this.$message.error('高德地图组件加载失败,请稍后重试');
|
this.$message.error('高德地图组件加载失败,请稍后重试');
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
|
return null;
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.mapInitializing = null;
|
||||||
});
|
});
|
||||||
|
return this.mapInitializing;
|
||||||
},
|
},
|
||||||
ensureGeocoder() {
|
ensureGeocoder() {
|
||||||
if (this.geocoder) return Promise.resolve(this.geocoder);
|
if (this.geocoder) return Promise.resolve(this.geocoder);
|
||||||
@@ -154,15 +224,22 @@ export default {
|
|||||||
this.$message.warning('请输入地址关键词');
|
this.$message.warning('请输入地址关键词');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (this.searching) return;
|
||||||
|
this.searchResults = [];
|
||||||
this.searching = true;
|
this.searching = true;
|
||||||
this.loadAmap()
|
this.initMap()
|
||||||
.then(() => this.runGeocode('location', keyword))
|
.then(map => (map ? searchAmapPlaceText(keyword) : null))
|
||||||
.then(result => {
|
.then(pois => {
|
||||||
const point = result.geocodes?.[0]?.location || result.location;
|
if (!pois) return;
|
||||||
if (!point) {
|
this.searchResults = normalizeMapSearchResults(pois, keyword);
|
||||||
|
const first = this.searchResults[0];
|
||||||
|
if (!first?.location) {
|
||||||
throw new Error('未找到匹配地址');
|
throw new Error('未找到匹配地址');
|
||||||
}
|
}
|
||||||
this.pickPoint(point, keyword);
|
return this.$nextTick().then(() => {
|
||||||
|
this.amap?.resize();
|
||||||
|
this.pickPoint(first.location, first.address || first.name || keyword);
|
||||||
|
});
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
this.status = '未找到匹配地址';
|
this.status = '未找到匹配地址';
|
||||||
@@ -172,22 +249,38 @@ export default {
|
|||||||
this.searching = false;
|
this.searching = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
selectSearchResult(item) {
|
||||||
|
if (item && item.location) {
|
||||||
|
this.pickPoint(item.location, item.address || item.name || '');
|
||||||
|
}
|
||||||
|
},
|
||||||
pickPoint(point, fallbackAddress = '') {
|
pickPoint(point, fallbackAddress = '') {
|
||||||
const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
|
const longitude =
|
||||||
const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
|
typeof point.getLng === 'function' ? point.getLng() : point.lng ?? point.longitude;
|
||||||
|
const latitude =
|
||||||
|
typeof point.getLat === 'function' ? point.getLat() : point.lat ?? point.latitude;
|
||||||
if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
|
if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
|
||||||
this.$message.warning('选点坐标无效');
|
this.$message.warning('选点坐标无效');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const lnglat = new window.AMap.LngLat(Number(longitude), Number(latitude));
|
const lnglat = new window.AMap.LngLat(Number(longitude), Number(latitude));
|
||||||
this.renderMarker(lnglat);
|
this.renderMarker(lnglat);
|
||||||
this.selected = { longitude: Number(longitude), latitude: Number(latitude), address: fallbackAddress };
|
this.selected = {
|
||||||
|
longitude: Number(longitude),
|
||||||
|
latitude: Number(latitude),
|
||||||
|
address: fallbackAddress,
|
||||||
|
};
|
||||||
this.status = '正在解析地址...';
|
this.status = '正在解析地址...';
|
||||||
this.resolving = true;
|
this.resolving = true;
|
||||||
this.runGeocode('address', lnglat)
|
this.runGeocode('address', lnglat)
|
||||||
.then(result => {
|
.then(result => {
|
||||||
const detailAddress = result.regeocode?.formattedAddress || fallbackAddress;
|
const detailAddress = result.regeocode?.formattedAddress || fallbackAddress;
|
||||||
this.selected = { ...this.selected, address: detailAddress };
|
const region = this.resolveRegionFromGeocode(result);
|
||||||
|
this.selected = {
|
||||||
|
...this.selected,
|
||||||
|
address: detailAddress,
|
||||||
|
...region,
|
||||||
|
};
|
||||||
this.keyword = detailAddress || this.keyword;
|
this.keyword = detailAddress || this.keyword;
|
||||||
this.status = detailAddress || '已选点,可确认回填';
|
this.status = detailAddress || '已选点,可确认回填';
|
||||||
})
|
})
|
||||||
@@ -201,6 +294,26 @@ export default {
|
|||||||
this.resolving = false;
|
this.resolving = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
resolveRegionFromGeocode(result = {}) {
|
||||||
|
const component = result.regeocode?.addressComponent || {};
|
||||||
|
const city = Array.isArray(component.city) ? '' : String(component.city || '').trim();
|
||||||
|
const province = String(component.province || '').trim();
|
||||||
|
const district = String(component.district || '').trim();
|
||||||
|
const country = String(component.country || '').trim();
|
||||||
|
const adcode = String(component.adcode || '').trim();
|
||||||
|
return {
|
||||||
|
country,
|
||||||
|
province,
|
||||||
|
city: city || province,
|
||||||
|
district,
|
||||||
|
adcode,
|
||||||
|
regionCode: adcode,
|
||||||
|
provinceName: province,
|
||||||
|
cityName: city || province,
|
||||||
|
districtName: district,
|
||||||
|
countryName: country,
|
||||||
|
};
|
||||||
|
},
|
||||||
renderMarker(point) {
|
renderMarker(point) {
|
||||||
this.clearMarker();
|
this.clearMarker();
|
||||||
this.marker = new window.AMap.Marker({ position: point });
|
this.marker = new window.AMap.Marker({ position: point });
|
||||||
@@ -213,12 +326,53 @@ export default {
|
|||||||
this.marker = null;
|
this.marker = null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
syncSelectedFromMarker() {
|
||||||
|
// 确认时以当前标记点坐标为准,避免换地址后仍回填上一次经纬度
|
||||||
|
if (!this.marker || typeof this.marker.getPosition !== 'function') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const point = this.marker.getPosition();
|
||||||
|
if (!point) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const longitude =
|
||||||
|
typeof point.getLng === 'function' ? point.getLng() : point.lng ?? point.longitude;
|
||||||
|
const latitude =
|
||||||
|
typeof point.getLat === 'function' ? point.getLat() : point.lat ?? point.latitude;
|
||||||
|
if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.selected = {
|
||||||
|
...this.selected,
|
||||||
|
longitude: Number(longitude),
|
||||||
|
latitude: Number(latitude),
|
||||||
|
};
|
||||||
|
},
|
||||||
confirm() {
|
confirm() {
|
||||||
|
this.syncSelectedFromMarker();
|
||||||
|
if (!this.hasCoordinateValue(this.selected.longitude) || !this.hasCoordinateValue(this.selected.latitude)) {
|
||||||
|
this.$message.warning('请先搜索或点击地图完成选点');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!this.selected.address) {
|
if (!this.selected.address) {
|
||||||
this.$message.warning('请等待地址解析完成后再确认');
|
this.$message.warning('请等待地址解析完成后再确认');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.$emit('confirm', this.selected.address);
|
this.$emit('confirm', {
|
||||||
|
address: this.selected.address,
|
||||||
|
longitude: Number(this.selected.longitude),
|
||||||
|
latitude: Number(this.selected.latitude),
|
||||||
|
country: this.selected.country || this.selected.countryName || '',
|
||||||
|
province: this.selected.province || this.selected.provinceName || '',
|
||||||
|
city: this.selected.city || this.selected.cityName || '',
|
||||||
|
district: this.selected.district || this.selected.districtName || '',
|
||||||
|
adcode: this.selected.adcode || this.selected.regionCode || '',
|
||||||
|
regionCode: this.selected.regionCode || this.selected.adcode || '',
|
||||||
|
countryName: this.selected.countryName || this.selected.country || '',
|
||||||
|
provinceName: this.selected.provinceName || this.selected.province || '',
|
||||||
|
cityName: this.selected.cityName || this.selected.city || '',
|
||||||
|
districtName: this.selected.districtName || this.selected.district || '',
|
||||||
|
});
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -239,10 +393,27 @@ export default {
|
|||||||
|
|
||||||
&__map {
|
&__map {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
height: 420px;
|
height: 420px;
|
||||||
border: 1px solid #eff1f7;
|
border: 1px solid #eff1f7;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__content {
|
||||||
|
position: relative;
|
||||||
|
display: block;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: visible;
|
||||||
|
|
||||||
|
.address-map-picker__map {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.map-search-results) {
|
||||||
|
z-index: 2000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&__info {
|
&__info {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
color: #606266;
|
color: #606266;
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog
|
||||||
|
:model-value="modelValue"
|
||||||
|
title="变更记录详情"
|
||||||
|
append-to-body
|
||||||
|
destroy-on-close
|
||||||
|
align-center
|
||||||
|
width="1100px"
|
||||||
|
class="change-record-detail-dialog"
|
||||||
|
@update:model-value="$emit('update:modelValue', $event)"
|
||||||
|
@open="resetPage"
|
||||||
|
>
|
||||||
|
<el-table
|
||||||
|
:data="pageRows"
|
||||||
|
border
|
||||||
|
max-height="60vh"
|
||||||
|
:show-overflow-tooltip="false"
|
||||||
|
>
|
||||||
|
<el-table-column prop="field" label="变更字段" min-width="180" />
|
||||||
|
<el-table-column
|
||||||
|
prop="before"
|
||||||
|
label="变更前"
|
||||||
|
min-width="360"
|
||||||
|
class-name="change-record-detail-value"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="after"
|
||||||
|
label="变更后"
|
||||||
|
min-width="500"
|
||||||
|
class-name="change-record-detail-value"
|
||||||
|
/>
|
||||||
|
</el-table>
|
||||||
|
<el-empty v-if="!total" description="暂无变更内容" :image-size="60" />
|
||||||
|
<div class="change-record-detail-dialog__pager">
|
||||||
|
<el-pagination
|
||||||
|
v-model:current-page="currentPage"
|
||||||
|
v-model:page-size="pageSize"
|
||||||
|
background
|
||||||
|
:total="total"
|
||||||
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<el-button type="primary" @click="$emit('update:modelValue', false)">关闭</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'ChangeRecordDetailDialog',
|
||||||
|
props: {
|
||||||
|
modelValue: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
rows: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['update:modelValue'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
currentPage: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
total() {
|
||||||
|
return this.rows.length;
|
||||||
|
},
|
||||||
|
pageRows() {
|
||||||
|
const start = (this.currentPage - 1) * this.pageSize;
|
||||||
|
return this.rows.slice(start, start + this.pageSize);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
rows() {
|
||||||
|
const maxPage = Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
|
||||||
|
if (this.currentPage > maxPage) this.currentPage = 1;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
resetPage() {
|
||||||
|
this.currentPage = 1;
|
||||||
|
this.pageSize = 10;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.change-record-detail-dialog__pager {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.change-record-detail-value .cell) {
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-break: break-word;
|
||||||
|
overflow: visible;
|
||||||
|
text-overflow: clip;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -576,7 +576,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.mode-content :deep(.el-form-item) {
|
.mode-content :deep(.el-form-item) {
|
||||||
margin-bottom: 18px;
|
margin-bottom: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mode-content :deep(.el-form-item:last-child) {
|
.mode-content :deep(.el-form-item:last-child) {
|
||||||
|
|||||||
@@ -0,0 +1,434 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
|
||||||
|
<el-form :model="query" inline label-width="130px" @submit.prevent>
|
||||||
|
<el-form-item label="发票号码">
|
||||||
|
<el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="开票日期">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="query.invoiceDateRange"
|
||||||
|
type="daterange"
|
||||||
|
value-format="YYYY-MM-DD"
|
||||||
|
format="YYYY-MM-DD"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="开票单位">
|
||||||
|
<el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="受票单位">
|
||||||
|
<el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="开票单位(销方)">
|
||||||
|
<el-select
|
||||||
|
v-model="query.salerTaxNo"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="keyword => searchCustomers(keyword, 'saler')"
|
||||||
|
:loading="customerLoading.saler"
|
||||||
|
placeholder="输入名称搜索或直接粘贴税号"
|
||||||
|
style="width: 220px"
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in customerOptions.saler"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="受票单位(购方)">
|
||||||
|
<el-select
|
||||||
|
v-model="query.buyerTaxNo"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
remote
|
||||||
|
reserve-keyword
|
||||||
|
:remote-method="keyword => searchCustomers(keyword, 'buyer')"
|
||||||
|
:loading="customerLoading.buyer"
|
||||||
|
placeholder="输入名称搜索或直接粘贴税号"
|
||||||
|
style="width: 220px"
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in customerOptions.buyer"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发票类型">
|
||||||
|
<el-select
|
||||||
|
v-model="query.invoiceType"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
placeholder="不限"
|
||||||
|
style="width: 230px"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="option in invoiceTypeOptions"
|
||||||
|
:key="option.value"
|
||||||
|
:label="option.label"
|
||||||
|
:value="option.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="认领状态">
|
||||||
|
<el-select v-model="query.claimed" clearable placeholder="不限" style="width: 120px">
|
||||||
|
<el-option label="未认领" :value="false" />
|
||||||
|
<el-option label="已认领" :value="true" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="登记状态">
|
||||||
|
<el-select v-model="query.registered" clearable placeholder="不限" style="width: 120px">
|
||||||
|
<el-option label="未登记" :value="false" />
|
||||||
|
<el-option label="已登记" :value="true" />
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button :disabled="loading" @click="resetQuery">重置</el-button>
|
||||||
|
<el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<el-table
|
||||||
|
ref="poolTable"
|
||||||
|
v-loading="loading"
|
||||||
|
:data="rows"
|
||||||
|
:row-key="rowKey"
|
||||||
|
border
|
||||||
|
height="520"
|
||||||
|
:highlight-current-row="!multiple"
|
||||||
|
@selection-change="selection => (selected = selection)"
|
||||||
|
@row-dblclick="handleRowDblclick"
|
||||||
|
>
|
||||||
|
<el-table-column v-if="multiple" type="selection" width="52" fixed="left" align="center" reserve-selection />
|
||||||
|
<el-table-column v-else width="52" align="center" fixed="left">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-radio
|
||||||
|
:model-value="current && current.invoiceNo"
|
||||||
|
:value="row.invoiceNo"
|
||||||
|
@change="current = row"
|
||||||
|
>
|
||||||
|
<span></span>
|
||||||
|
</el-radio>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
|
||||||
|
<el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
|
||||||
|
<el-table-column prop="invoiceType" label="发票类型" min-width="140" />
|
||||||
|
<el-table-column prop="issuerName" label="开票单位" min-width="180" show-overflow-tooltip />
|
||||||
|
<el-table-column prop="receiverName" label="受票单位" min-width="180" show-overflow-tooltip />
|
||||||
|
<el-table-column label="金额(含税)" min-width="130" align="right">
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="税率" min-width="90" align="center">
|
||||||
|
<template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="税额" min-width="120" align="right">
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="剩余可用金额" min-width="130" align="right">
|
||||||
|
<template #default="{ row }">{{ formatMoney(row.availableTaxAmount) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<!--<el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="210" show-overflow-tooltip />-->
|
||||||
|
<el-table-column label="认领状态" min-width="100" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-tag v-if="row.claimed" type="danger" size="small">已认领</el-tag>
|
||||||
|
<el-tag v-else type="info" size="small">未认领</el-tag>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="登记状态" min-width="100" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-tag v-if="row.registered" type="warning" size="small">已登记</el-tag>
|
||||||
|
<el-tag v-else type="info" size="small">未登记</el-tag>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="附件" width="120" fixed="right" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-link
|
||||||
|
type="primary"
|
||||||
|
:underline="false"
|
||||||
|
:disabled="attachmentBusy === row.invoiceNo"
|
||||||
|
@click.stop="viewAttachment(row)"
|
||||||
|
>查看</el-link
|
||||||
|
>
|
||||||
|
<el-link
|
||||||
|
type="primary"
|
||||||
|
:underline="false"
|
||||||
|
:disabled="attachmentBusy === row.invoiceNo"
|
||||||
|
@click.stop="downloadAttachment(row)"
|
||||||
|
>下载</el-link
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column v-if="!multiple" label="操作" width="90" fixed="right" align="center">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-link type="primary" @click.stop="confirmRows([row])">选择</el-link>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<div class="kingdee-pool-dialog__pager">
|
||||||
|
<span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票,未找到请改用发票号码或税号精确查找</span>
|
||||||
|
<el-pagination
|
||||||
|
v-model:current-page="page.current"
|
||||||
|
v-model:page-size="page.size"
|
||||||
|
:total="page.total"
|
||||||
|
:page-sizes="[10, 20, 50, 100]"
|
||||||
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
|
:disabled="loading"
|
||||||
|
@current-change="load"
|
||||||
|
@size-change="handleSizeChange"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="visible = false">取消</el-button>
|
||||||
|
<el-button type="primary" @click="handleConfirm">{{ confirmText }}</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import request from '@/axios';
|
||||||
|
import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
|
||||||
|
import {
|
||||||
|
downloadKingdeeInvoiceFile,
|
||||||
|
isKingdeePathAttachment,
|
||||||
|
viewKingdeeInvoiceFile,
|
||||||
|
} from '@/utils/kingdee-attachment';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'KingdeeInvoicePoolDialog',
|
||||||
|
props: {
|
||||||
|
modelValue: { type: Boolean, required: true },
|
||||||
|
title: { type: String, default: '查询金蝶票据池' },
|
||||||
|
confirmText: { type: String, default: '确定' },
|
||||||
|
multiple: { type: Boolean, default: false },
|
||||||
|
initialInvoiceNo: { type: String, default: '' },
|
||||||
|
queryApi: { type: Function, required: true },
|
||||||
|
},
|
||||||
|
emits: ['update:modelValue', 'confirm'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
loading: false,
|
||||||
|
// 与后端 BfiConstant.INVOICE_TYPE_NAMES 对齐:value 为发票类型编码(镜像按 invoice_type_code 精确匹配)
|
||||||
|
// 选票场景只开放数电票(普票/专票)
|
||||||
|
invoiceTypeOptions: [
|
||||||
|
{ value: '26', label: '数电发票(普通发票)' },
|
||||||
|
{ value: '27', label: '数电发票(增值税专用发票)' },
|
||||||
|
],
|
||||||
|
rows: [],
|
||||||
|
selected: [],
|
||||||
|
current: null,
|
||||||
|
page: { current: 1, size: 10, total: 0 },
|
||||||
|
// 正在查看/下载附件的发票号(行级 loading 守卫)
|
||||||
|
attachmentBusy: null,
|
||||||
|
// 销/购方客商下拉:远程按名称搜客商档案,选中带出税号查询;手动输入的裸税号直接作为值过滤
|
||||||
|
customerOptions: { saler: [], buyer: [] },
|
||||||
|
customerLoading: { saler: false, buyer: false },
|
||||||
|
query: this.emptyQuery(),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
visible: {
|
||||||
|
get() {
|
||||||
|
return this.modelValue;
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
this.$emit('update:modelValue', value);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
emptyQuery() {
|
||||||
|
return {
|
||||||
|
invoiceNo: '',
|
||||||
|
// 默认查近一个月,随请求传后端并在页面回显
|
||||||
|
invoiceDateRange: [this.$dayjs().subtract(1, 'month').format('YYYY-MM-DD'), this.$dayjs().format('YYYY-MM-DD')],
|
||||||
|
salerName: '',
|
||||||
|
buyerName: '',
|
||||||
|
salerTaxNo: '',
|
||||||
|
buyerTaxNo: '',
|
||||||
|
invoiceType: '',
|
||||||
|
claimed: null,
|
||||||
|
registered: null,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
// 镜像行主键为 id,回源入库前的响应仍可能无 id,用发票号码兜底
|
||||||
|
rowKey(row) {
|
||||||
|
return row.id || row.invoiceNo;
|
||||||
|
},
|
||||||
|
// 票池行附件字段为复数 attachmentsJson,行内首项即发票文件({source,path,name})
|
||||||
|
rowAttachment(row = {}) {
|
||||||
|
const value = row.attachmentsJson;
|
||||||
|
if (!value) return null;
|
||||||
|
let parsed = value;
|
||||||
|
if (typeof value === 'string') {
|
||||||
|
try {
|
||||||
|
parsed = JSON.parse(value);
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Array.isArray(parsed) ? parsed[0] || null : parsed || null;
|
||||||
|
},
|
||||||
|
attachmentName(row) {
|
||||||
|
const attachment = this.rowAttachment(row);
|
||||||
|
return attachment?.name || `${row.invoiceNo || '发票'}.pdf`;
|
||||||
|
},
|
||||||
|
async viewAttachment(row) {
|
||||||
|
const attachment = this.rowAttachment(row);
|
||||||
|
if (!isKingdeePathAttachment(attachment)) {
|
||||||
|
this.$message.warning('当前发票暂无可查看附件');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.attachmentBusy = row.invoiceNo;
|
||||||
|
try {
|
||||||
|
await viewKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
|
||||||
|
} finally {
|
||||||
|
this.attachmentBusy = null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async downloadAttachment(row) {
|
||||||
|
const attachment = this.rowAttachment(row);
|
||||||
|
if (!isKingdeePathAttachment(attachment)) {
|
||||||
|
this.$message.warning('当前发票暂无可下载附件');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.attachmentBusy = row.invoiceNo;
|
||||||
|
try {
|
||||||
|
await downloadKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
|
||||||
|
} finally {
|
||||||
|
this.attachmentBusy = null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handleOpen() {
|
||||||
|
this.query = this.emptyQuery();
|
||||||
|
this.query.invoiceNo = this.initialInvoiceNo || '';
|
||||||
|
this.current = null;
|
||||||
|
this.selected = [];
|
||||||
|
this.$refs.poolTable?.clearSelection();
|
||||||
|
this.page.current = 1;
|
||||||
|
this.load();
|
||||||
|
},
|
||||||
|
handleQuery() {
|
||||||
|
this.page.current = 1;
|
||||||
|
this.load();
|
||||||
|
},
|
||||||
|
handleSizeChange() {
|
||||||
|
this.page.current = 1;
|
||||||
|
this.load();
|
||||||
|
},
|
||||||
|
resetQuery() {
|
||||||
|
this.query = this.emptyQuery();
|
||||||
|
this.handleQuery();
|
||||||
|
},
|
||||||
|
// 客商名称远程搜索:含 18 位社会信用代码特征(数字+大写字母)时按裸税号直查;
|
||||||
|
// 否则搜客商档案,取客商发票信息(blade_customer_invoice_info)的抬头/税号作选项——票池税号是开票税号,非统一信用代码
|
||||||
|
async searchCustomers(keyword, side) {
|
||||||
|
const text = String(keyword || '').trim();
|
||||||
|
if (!text) return;
|
||||||
|
if (/^[0-9A-Z]{15,20}$/.test(text)) {
|
||||||
|
this.customerOptions[side] = [{ label: `${text}(手输税号)`, value: text }];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.customerLoading[side] = true;
|
||||||
|
try {
|
||||||
|
const data = this.unwrap(await getCustomerList(1, 20, { fullName: text }));
|
||||||
|
const customers = (data.records || []).filter(item => item.id);
|
||||||
|
if (!customers.length) {
|
||||||
|
this.customerOptions[side] = [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 列表接口不带发票信息,逐户取 detail(detail 组装 invoices,每户一张发票信息)
|
||||||
|
const options = await Promise.all(
|
||||||
|
customers.map(async customer => {
|
||||||
|
const detail = this.unwrap(await request({ url: '/blade-transport/customer-archive/detail', method: 'get', params: { id: customer.id } }));
|
||||||
|
return (detail?.invoices || [])
|
||||||
|
.filter(invoice => invoice.taxNo)
|
||||||
|
.map(invoice => ({ label: `${invoice.invoiceTitle || customer.fullName}(${invoice.taxNo})`, value: invoice.taxNo }));
|
||||||
|
})
|
||||||
|
);
|
||||||
|
this.customerOptions[side] = options.flat().filter(
|
||||||
|
(option, index, list) => list.findIndex(item => item.value === option.value) === index
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
this.customerLoading[side] = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
unwrap(response) {
|
||||||
|
const body = response?.data || response || {};
|
||||||
|
return body?.data || body;
|
||||||
|
},
|
||||||
|
async load() {
|
||||||
|
this.loading = true;
|
||||||
|
try {
|
||||||
|
const range = this.query.invoiceDateRange || [];
|
||||||
|
const data = this.unwrap(
|
||||||
|
await this.queryApi({
|
||||||
|
current: this.page.current,
|
||||||
|
size: this.page.size,
|
||||||
|
invoiceNo: this.query.invoiceNo || undefined,
|
||||||
|
invoiceDateStart: range[0] || undefined,
|
||||||
|
invoiceDateEnd: range[1] || undefined,
|
||||||
|
salerName: this.query.salerName || undefined,
|
||||||
|
buyerName: this.query.buyerName || undefined,
|
||||||
|
salerTaxNo: this.query.salerTaxNo || undefined,
|
||||||
|
buyerTaxNo: this.query.buyerTaxNo || undefined,
|
||||||
|
invoiceType: this.query.invoiceType || undefined,
|
||||||
|
claimed: this.query.claimed ?? undefined,
|
||||||
|
registered: this.query.registered ?? undefined,
|
||||||
|
})
|
||||||
|
);
|
||||||
|
this.rows = data.records || [];
|
||||||
|
this.page.total = Number(data.total || 0);
|
||||||
|
} finally {
|
||||||
|
this.loading = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handleRowDblclick(row) {
|
||||||
|
if (!this.multiple) {
|
||||||
|
this.confirmRows([row]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handleConfirm() {
|
||||||
|
const picked = this.multiple ? this.selected : this.current ? [this.current] : [];
|
||||||
|
this.confirmRows(picked);
|
||||||
|
},
|
||||||
|
confirmRows(rows) {
|
||||||
|
if (!rows.length) {
|
||||||
|
this.$message.warning(this.multiple ? '请至少选择一条发票' : '请选择一张发票');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.$emit('confirm', rows);
|
||||||
|
this.visible = false;
|
||||||
|
},
|
||||||
|
formatMoney(value) {
|
||||||
|
const number = Number(value);
|
||||||
|
return Number.isFinite(number) ? number.toFixed(2) : '-';
|
||||||
|
},
|
||||||
|
formatRate(value) {
|
||||||
|
const number = Number(value);
|
||||||
|
return Number.isFinite(number) ? `${number}%` : '-';
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.kingdee-pool-dialog__pager {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-top: 12px;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
.kingdee-pool-dialog__pager-tip {
|
||||||
|
color: #909399;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,224 @@
|
|||||||
|
<template>
|
||||||
|
<div v-if="results.length" class="map-search-results">
|
||||||
|
<div class="map-search-results__list">
|
||||||
|
<div
|
||||||
|
v-for="(item, index) in pageResults"
|
||||||
|
:key="item.id || `${currentPage}-${index}`"
|
||||||
|
class="map-search-results__item"
|
||||||
|
:class="{ 'is-active': isActive(item, index) }"
|
||||||
|
@click="handleSelect(item, index)"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
v-if="item.photo || item.image"
|
||||||
|
class="map-search-results__thumb"
|
||||||
|
:src="item.photo || item.image"
|
||||||
|
alt=""
|
||||||
|
/>
|
||||||
|
<div class="map-search-results__body">
|
||||||
|
<div class="map-search-results__name">
|
||||||
|
{{ item.name || item.address || '未命名地址' }}
|
||||||
|
</div>
|
||||||
|
<div class="map-search-results__address">
|
||||||
|
地址:{{ item.address || item.name || '-' }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="totalPages > 1" class="map-search-results__pager">
|
||||||
|
<button
|
||||||
|
v-for="page in visiblePages"
|
||||||
|
:key="page"
|
||||||
|
type="button"
|
||||||
|
class="map-search-results__page"
|
||||||
|
:class="{ 'is-active': page === currentPage }"
|
||||||
|
@click="currentPage = page"
|
||||||
|
>
|
||||||
|
{{ page }}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="map-search-results__page map-search-results__page--next"
|
||||||
|
:disabled="currentPage >= totalPages"
|
||||||
|
@click="goNext"
|
||||||
|
>
|
||||||
|
下一页
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const PAGE_SIZE = 5;
|
||||||
|
|
||||||
|
export default {
|
||||||
|
props: {
|
||||||
|
results: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['select'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
currentPage: 1,
|
||||||
|
activeKey: '',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
totalPages() {
|
||||||
|
return Math.max(1, Math.ceil((this.results || []).length / PAGE_SIZE));
|
||||||
|
},
|
||||||
|
pageResults() {
|
||||||
|
const start = (this.currentPage - 1) * PAGE_SIZE;
|
||||||
|
return (this.results || []).slice(start, start + PAGE_SIZE);
|
||||||
|
},
|
||||||
|
visiblePages() {
|
||||||
|
const maxButtons = 3;
|
||||||
|
let start = Math.max(1, this.currentPage - 1);
|
||||||
|
let end = Math.min(this.totalPages, start + maxButtons - 1);
|
||||||
|
start = Math.max(1, end - maxButtons + 1);
|
||||||
|
const pages = [];
|
||||||
|
for (let page = start; page <= end; page += 1) {
|
||||||
|
pages.push(page);
|
||||||
|
}
|
||||||
|
return pages;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
results() {
|
||||||
|
this.currentPage = 1;
|
||||||
|
this.activeKey = '';
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
resultKey(item, index) {
|
||||||
|
return item?.id ?? `${this.currentPage}-${index}`;
|
||||||
|
},
|
||||||
|
isActive(item, index) {
|
||||||
|
return this.activeKey === this.resultKey(item, index);
|
||||||
|
},
|
||||||
|
handleSelect(item, index) {
|
||||||
|
this.activeKey = this.resultKey(item, index);
|
||||||
|
this.$emit('select', item);
|
||||||
|
},
|
||||||
|
goNext() {
|
||||||
|
if (this.currentPage < this.totalPages) {
|
||||||
|
this.currentPage += 1;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.map-search-results {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
z-index: 2000;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 360px;
|
||||||
|
max-height: 360px;
|
||||||
|
overflow: hidden;
|
||||||
|
background: #fff;
|
||||||
|
border: 1px solid #dcdfe6;
|
||||||
|
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.12);
|
||||||
|
pointer-events: auto;
|
||||||
|
|
||||||
|
&__list {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
min-height: 0;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__item {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: flex-start;
|
||||||
|
padding: 10px 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
border-bottom: 1px solid #ebeef5;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__item:hover,
|
||||||
|
&__item.is-active {
|
||||||
|
background: #f5f5f5;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__thumb {
|
||||||
|
flex: 0 0 48px;
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
object-fit: cover;
|
||||||
|
border: 1px solid #ebeef5;
|
||||||
|
background: #fafafa;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__body {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__name {
|
||||||
|
overflow: hidden;
|
||||||
|
color: #303133;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1.4;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__address {
|
||||||
|
margin-top: 4px;
|
||||||
|
color: #909399;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__pager {
|
||||||
|
display: flex;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 6px;
|
||||||
|
align-items: center;
|
||||||
|
padding: 8px 10px;
|
||||||
|
border-top: 1px solid #ebeef5;
|
||||||
|
background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__page {
|
||||||
|
min-width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
padding: 0 8px;
|
||||||
|
color: #606266;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 26px;
|
||||||
|
text-align: center;
|
||||||
|
background: #fff;
|
||||||
|
border: 1px solid #dcdfe6;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:hover:not(:disabled) {
|
||||||
|
color: #409eff;
|
||||||
|
border-color: #409eff;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.is-active {
|
||||||
|
color: #409eff;
|
||||||
|
border-color: #409eff;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:disabled {
|
||||||
|
color: #c0c4cc;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
&--next {
|
||||||
|
min-width: 56px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
<template>
|
||||||
|
<div v-loading="loading" class="pdf-preview">
|
||||||
|
<el-empty v-if="error" description="PDF预览失败" :image-size="72" />
|
||||||
|
<vue-pdf-embed
|
||||||
|
v-else-if="source"
|
||||||
|
:key="source"
|
||||||
|
:source="source"
|
||||||
|
annotation-layer
|
||||||
|
text-layer
|
||||||
|
@loaded="handleLoaded"
|
||||||
|
@loading-failed="handleError"
|
||||||
|
@rendering-failed="handleError"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { defineAsyncComponent } from 'vue';
|
||||||
|
import 'vue-pdf-embed/dist/styles/annotationLayer.css';
|
||||||
|
import 'vue-pdf-embed/dist/styles/textLayer.css';
|
||||||
|
|
||||||
|
const VuePdfEmbed = defineAsyncComponent(() => import('vue-pdf-embed'));
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'PdfPreview',
|
||||||
|
components: { VuePdfEmbed },
|
||||||
|
props: {
|
||||||
|
source: {
|
||||||
|
type: [String, Object],
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['error', 'loaded'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
loading: true,
|
||||||
|
error: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
source: {
|
||||||
|
handler() {
|
||||||
|
this.loading = true;
|
||||||
|
this.error = false;
|
||||||
|
},
|
||||||
|
immediate: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
handleLoaded(pdf) {
|
||||||
|
this.loading = false;
|
||||||
|
this.$emit('loaded', pdf);
|
||||||
|
},
|
||||||
|
handleError(error) {
|
||||||
|
this.loading = false;
|
||||||
|
this.error = true;
|
||||||
|
this.$emit('error', error);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.pdf-preview {
|
||||||
|
width: 100%;
|
||||||
|
height: 72vh;
|
||||||
|
overflow: auto;
|
||||||
|
background-color: #f5f7fa;
|
||||||
|
|
||||||
|
:deep(.vue-pdf-embed) {
|
||||||
|
width: min(100%, 1200px);
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.vue-pdf-embed__page) {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
background-color: #fff;
|
||||||
|
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
<template>
|
||||||
|
<div class="avue-crud__right table-header-tools">
|
||||||
|
<el-button v-if="showRefresh" icon="el-icon-refresh" circle @click="$emit('refresh')" />
|
||||||
|
<el-button
|
||||||
|
v-if="showColumn"
|
||||||
|
icon="el-icon-operation"
|
||||||
|
circle
|
||||||
|
@click="columnSettingVisible = true"
|
||||||
|
/>
|
||||||
|
<el-button
|
||||||
|
v-if="showSearch"
|
||||||
|
icon="el-icon-search"
|
||||||
|
circle
|
||||||
|
@click="$emit('update:searchVisible', !searchVisible)"
|
||||||
|
/>
|
||||||
|
<el-button v-if="showGrid" icon="el-icon-grid" circle @click="toggleTableSize" />
|
||||||
|
|
||||||
|
<el-dialog
|
||||||
|
v-if="showColumn"
|
||||||
|
v-model="columnSettingVisible"
|
||||||
|
title="列设置"
|
||||||
|
width="360px"
|
||||||
|
append-to-body
|
||||||
|
destroy-on-close
|
||||||
|
>
|
||||||
|
<el-checkbox-group
|
||||||
|
class="table-header-tools__column-setting"
|
||||||
|
:model-value="visibleColumnKeys"
|
||||||
|
@update:model-value="$emit('update:visibleColumnKeys', $event)"
|
||||||
|
>
|
||||||
|
<el-checkbox v-for="item in columns" :key="item.prop" :label="item.prop">
|
||||||
|
{{ item.label }}
|
||||||
|
</el-checkbox>
|
||||||
|
</el-checkbox-group>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="columnSettingVisible = false">关闭</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
const TABLE_SIZE_OPTIONS = ['default', 'large', 'small'];
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'TableHeaderTools',
|
||||||
|
props: {
|
||||||
|
columns: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
visibleColumnKeys: {
|
||||||
|
type: Array,
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
tableSize: {
|
||||||
|
type: String,
|
||||||
|
default: 'default',
|
||||||
|
},
|
||||||
|
searchVisible: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
showRefresh: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
showColumn: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
showSearch: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
showGrid: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['refresh', 'update:visibleColumnKeys', 'update:tableSize', 'update:searchVisible'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
columnSettingVisible: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
deactivated() {
|
||||||
|
// keep-alive 缓存页面时关闭列设置弹窗,避免 Teleport 到 body 的弹窗切页后残留
|
||||||
|
this.columnSettingVisible = false;
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
toggleTableSize() {
|
||||||
|
const index = TABLE_SIZE_OPTIONS.indexOf(this.tableSize);
|
||||||
|
const next = TABLE_SIZE_OPTIONS[(index + 1) % TABLE_SIZE_OPTIONS.length];
|
||||||
|
this.$emit('update:tableSize', next);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.table-header-tools.avue-crud__right {
|
||||||
|
width: auto;
|
||||||
|
margin: 0 0 0 auto;
|
||||||
|
flex: none;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table-header-tools__column-setting {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
max-height: 360px;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,467 @@
|
|||||||
|
<template>
|
||||||
|
<div class="vehicle-attachment-table">
|
||||||
|
<div class="vehicle-attachment-table__toolbar">
|
||||||
|
<el-button type="primary" :disabled="!rows.length" @click="batchDownload">
|
||||||
|
批量下载
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-table :data="rows" border @selection-change="selectedRows = $event">
|
||||||
|
<el-table-column v-if="!readonly" type="selection" width="55" align="center" />
|
||||||
|
<el-table-column type="index" label="序号" width="70" align="center" />
|
||||||
|
<el-table-column
|
||||||
|
label="文件名"
|
||||||
|
min-width="240"
|
||||||
|
show-overflow-tooltip
|
||||||
|
class-name="is-ellipsis-link"
|
||||||
|
>
|
||||||
|
<template #default="{ row }">
|
||||||
|
<span
|
||||||
|
class="attachment-file-name"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
@click="previewAttachment(row)"
|
||||||
|
@keydown.enter="previewAttachment(row)"
|
||||||
|
@keydown.space.prevent="previewAttachment(row)"
|
||||||
|
>{{ attachmentName(row) }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="附件描述" min-width="220">
|
||||||
|
<template #default="{ row, $index }">
|
||||||
|
<span v-if="readonly">{{ row.description || '-' }}</span>
|
||||||
|
<el-input
|
||||||
|
v-else
|
||||||
|
:model-value="row.description"
|
||||||
|
maxlength="200"
|
||||||
|
placeholder="请输入"
|
||||||
|
@update:model-value="value => updateDescription($index, value)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="文件大小" width="120" align="center">
|
||||||
|
<template #default="{ row }">{{ formatFileSize(row.size) }}</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
|
||||||
|
<el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
|
||||||
|
<el-table-column
|
||||||
|
v-if="!readonly || showViewActions"
|
||||||
|
label="操作"
|
||||||
|
:width="readonly ? 120 : 170"
|
||||||
|
align="center"
|
||||||
|
fixed="right"
|
||||||
|
>
|
||||||
|
<template #default="{ row, $index }">
|
||||||
|
<div class="vehicle-attachment-table__actions">
|
||||||
|
<el-link type="primary" :disabled="kingdeeBusy" @click="previewAttachment(row)"
|
||||||
|
>查看</el-link
|
||||||
|
>
|
||||||
|
<el-link type="primary" :disabled="kingdeeBusy" @click="downloadAttachment(row)"
|
||||||
|
>下载</el-link
|
||||||
|
>
|
||||||
|
<el-link v-if="!readonly" type="danger" @click="removeAttachment($index)">删除</el-link>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<div v-if="!readonly" class="vehicle-attachment-table__upload">
|
||||||
|
<vehicle-attachment-upload
|
||||||
|
:model-value="rows"
|
||||||
|
:file-types="attachmentFileTypes"
|
||||||
|
:max-size="maxSize"
|
||||||
|
:show-tip="true"
|
||||||
|
:tip="`支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过${maxSize}MB`"
|
||||||
|
:show-file-list="false"
|
||||||
|
button-text="上传附件"
|
||||||
|
@update:model-value="handleUploadChange"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-dialog
|
||||||
|
v-model="documentPreviewVisible"
|
||||||
|
:title="previewFile.name || '附件预览'"
|
||||||
|
append-to-body
|
||||||
|
destroy-on-close
|
||||||
|
width="90%"
|
||||||
|
top="4vh"
|
||||||
|
class="vehicle-attachment-table__viewer-dialog"
|
||||||
|
@closed="handlePreviewClosed"
|
||||||
|
>
|
||||||
|
<pdf-preview
|
||||||
|
v-if="documentPreviewVisible && previewFile.url && previewFile.isPdf"
|
||||||
|
:source="previewFile.url"
|
||||||
|
@error="handlePreviewError"
|
||||||
|
/>
|
||||||
|
<open-file-viewer
|
||||||
|
v-else-if="documentPreviewVisible && previewFile.url"
|
||||||
|
:file="previewFile.url"
|
||||||
|
:file-name="previewFile.name"
|
||||||
|
:mime-type="previewFile.mimeType"
|
||||||
|
width="100%"
|
||||||
|
height="72vh"
|
||||||
|
fit="contain"
|
||||||
|
theme="auto"
|
||||||
|
locale="zh-CN"
|
||||||
|
:toolbar="viewerToolbar"
|
||||||
|
:plugins="viewerPlugins"
|
||||||
|
@unsupported="handlePreviewUnsupported"
|
||||||
|
@error="handlePreviewError"
|
||||||
|
/>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-image-viewer
|
||||||
|
v-if="imagePreviewVisible"
|
||||||
|
:url-list="imagePreviewUrls"
|
||||||
|
:initial-index="imagePreviewIndex"
|
||||||
|
@close="imagePreviewVisible = false"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { ElImageViewer } from 'element-plus';
|
||||||
|
import { OpenFileViewer } from '@open-file-viewer/vue';
|
||||||
|
import { fallbackPlugin, imagePlugin, officePlugin, textPlugin } from '@open-file-viewer/core';
|
||||||
|
import '@open-file-viewer/core/style.css';
|
||||||
|
import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
|
||||||
|
import PdfPreview from '@/components/pdf-preview/main.vue';
|
||||||
|
import { downloadFileByUrl } from '@/utils/util';
|
||||||
|
import {
|
||||||
|
downloadKingdeeInvoiceFile,
|
||||||
|
isKingdeePathAttachment,
|
||||||
|
requestKingdeeFile,
|
||||||
|
} from '@/utils/kingdee-attachment';
|
||||||
|
|
||||||
|
const attachmentFileTypes = [
|
||||||
|
'pdf',
|
||||||
|
'bmp',
|
||||||
|
'jpeg',
|
||||||
|
'png',
|
||||||
|
'jpg',
|
||||||
|
'doc',
|
||||||
|
'docx',
|
||||||
|
'ppt',
|
||||||
|
'pptx',
|
||||||
|
'xlsx',
|
||||||
|
'xls',
|
||||||
|
'eml',
|
||||||
|
'msg',
|
||||||
|
'zip',
|
||||||
|
];
|
||||||
|
|
||||||
|
const viewerPlugins = [
|
||||||
|
imagePlugin(),
|
||||||
|
officePlugin({ pdf: { workerSrc: pdfWorkerSrc, useFetchData: true } }),
|
||||||
|
textPlugin(),
|
||||||
|
fallbackPlugin(),
|
||||||
|
];
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'VehicleAttachmentTable',
|
||||||
|
components: {
|
||||||
|
ElImageViewer,
|
||||||
|
OpenFileViewer,
|
||||||
|
PdfPreview,
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
modelValue: {
|
||||||
|
type: [Array, String, Object],
|
||||||
|
default: () => [],
|
||||||
|
},
|
||||||
|
readonly: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
maxSize: {
|
||||||
|
type: Number,
|
||||||
|
default: 500,
|
||||||
|
},
|
||||||
|
// 金蝶侧附件(piaozone path 型)代理下载所依赖的发票号;行内自带 invoiceNo 时优先用行内值
|
||||||
|
kingdeeInvoiceNo: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
// 查看态也展示「查看/下载」操作列(编辑态始终展示,含删除)
|
||||||
|
showViewActions: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emits: ['update:modelValue'],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
attachmentFileTypes,
|
||||||
|
selectedRows: [],
|
||||||
|
imagePreviewVisible: false,
|
||||||
|
imagePreviewUrls: [],
|
||||||
|
imagePreviewIndex: 0,
|
||||||
|
documentPreviewVisible: false,
|
||||||
|
previewFile: {},
|
||||||
|
// 金蝶侧附件代理请求进行中(行级按钮共享 loading 守卫,防重复触发)
|
||||||
|
kingdeeBusy: false,
|
||||||
|
// 金蝶附件预览用的 objectURL,弹窗关闭时回收
|
||||||
|
kingdeeObjectUrl: '',
|
||||||
|
viewerPlugins,
|
||||||
|
viewerToolbar: {
|
||||||
|
download: true,
|
||||||
|
fullscreen: true,
|
||||||
|
print: true,
|
||||||
|
rotate: true,
|
||||||
|
zoom: true,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
rows() {
|
||||||
|
if (Array.isArray(this.modelValue)) return this.modelValue;
|
||||||
|
if (this.modelValue && typeof this.modelValue === 'object') return [this.modelValue];
|
||||||
|
if (!this.modelValue) return [];
|
||||||
|
try {
|
||||||
|
const rows = JSON.parse(this.modelValue);
|
||||||
|
return Array.isArray(rows) ? rows : [];
|
||||||
|
} catch (error) {
|
||||||
|
return String(this.modelValue)
|
||||||
|
.split(',')
|
||||||
|
.map(item => item.trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
.map(item => ({ name: item, url: item }));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
attachmentName(row = {}) {
|
||||||
|
return row.originalName || row.name || row.fileName || '附件';
|
||||||
|
},
|
||||||
|
attachmentUrl(row = {}) {
|
||||||
|
return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || row.src || '';
|
||||||
|
},
|
||||||
|
kingdeeInvoiceNoOf(row = {}) {
|
||||||
|
return row.invoiceNo || this.kingdeeInvoiceNo || '';
|
||||||
|
},
|
||||||
|
isKingdeeRow(row = {}) {
|
||||||
|
return isKingdeePathAttachment(row) && Boolean(this.kingdeeInvoiceNoOf(row));
|
||||||
|
},
|
||||||
|
attachmentExtension(row = {}) {
|
||||||
|
const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0];
|
||||||
|
const index = source.lastIndexOf('.');
|
||||||
|
return index > -1 ? source.slice(index + 1).toLowerCase() : '';
|
||||||
|
},
|
||||||
|
isImage(row) {
|
||||||
|
return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row));
|
||||||
|
},
|
||||||
|
isPdf(row) {
|
||||||
|
const mimeType = String(row.mimeType || row.contentType || '').toLowerCase();
|
||||||
|
return mimeType.includes('application/pdf') || this.attachmentExtension(row) === 'pdf';
|
||||||
|
},
|
||||||
|
emitRows(rows) {
|
||||||
|
this.$emit('update:modelValue', rows);
|
||||||
|
},
|
||||||
|
handleUploadChange(rows) {
|
||||||
|
const uploadUserName = this.$store.getters.userInfo?.realName || '';
|
||||||
|
const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
|
||||||
|
this.emitRows(
|
||||||
|
(rows || []).map(row => ({
|
||||||
|
...row,
|
||||||
|
description: row.description || '',
|
||||||
|
uploadUserName: row.uploadUserName || uploadUserName,
|
||||||
|
uploadTime: row.uploadTime || uploadTime,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
},
|
||||||
|
updateDescription(index, description) {
|
||||||
|
const rows = this.rows.map((row, rowIndex) =>
|
||||||
|
rowIndex === index ? { ...row, description } : row
|
||||||
|
);
|
||||||
|
this.emitRows(rows);
|
||||||
|
},
|
||||||
|
removeAttachment(index) {
|
||||||
|
const rows = [...this.rows];
|
||||||
|
rows.splice(index, 1);
|
||||||
|
this.emitRows(rows);
|
||||||
|
},
|
||||||
|
formatFileSize(size) {
|
||||||
|
if (!size) return '';
|
||||||
|
const value = Number(size);
|
||||||
|
if (!Number.isFinite(value)) return String(size);
|
||||||
|
if (value < 1024) return `${value}B`;
|
||||||
|
if (value < 1024 * 1024) return `${(value / 1024).toFixed(1)}KB`;
|
||||||
|
return `${(value / 1024 / 1024).toFixed(1)}MB`;
|
||||||
|
},
|
||||||
|
downloadAttachment(row) {
|
||||||
|
// 金蝶侧附件(piaozone path 型)经后端代理 A801-2 下载,OSS 直链维持前端直连下载
|
||||||
|
if (this.isKingdeeRow(row)) {
|
||||||
|
return this.downloadKingdeeAttachment(row);
|
||||||
|
}
|
||||||
|
const url = this.attachmentUrl(row);
|
||||||
|
if (!url) {
|
||||||
|
this.$message.warning('附件地址为空,无法下载');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
downloadFileByUrl(url, this.attachmentName(row));
|
||||||
|
},
|
||||||
|
async downloadKingdeeAttachment(row) {
|
||||||
|
if (this.kingdeeBusy) return;
|
||||||
|
this.kingdeeBusy = true;
|
||||||
|
try {
|
||||||
|
await downloadKingdeeInvoiceFile(this.kingdeeInvoiceNoOf(row), this.attachmentName(row));
|
||||||
|
} finally {
|
||||||
|
this.kingdeeBusy = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
batchDownload() {
|
||||||
|
const rows = this.selectedRows.length ? this.selectedRows : this.rows;
|
||||||
|
const kingdeeRows = rows.filter(row => this.isKingdeeRow(row));
|
||||||
|
const urlRows = rows.filter(row => !this.isKingdeeRow(row) && this.attachmentUrl(row));
|
||||||
|
if (!kingdeeRows.length && !urlRows.length) {
|
||||||
|
this.$message.warning(
|
||||||
|
this.selectedRows.length ? '所选附件暂无可下载地址' : '暂无可下载附件'
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
urlRows.forEach((row, index) => {
|
||||||
|
window.setTimeout(() => this.downloadAttachment(row), index * 500);
|
||||||
|
});
|
||||||
|
// 金蝶侧附件走代理接口,串行触发避免并发重复回源
|
||||||
|
this.downloadKingdeeRows(kingdeeRows);
|
||||||
|
},
|
||||||
|
async downloadKingdeeRows(rows) {
|
||||||
|
if (this.kingdeeBusy) return;
|
||||||
|
this.kingdeeBusy = true;
|
||||||
|
try {
|
||||||
|
for (const row of rows) {
|
||||||
|
await downloadKingdeeInvoiceFile(this.kingdeeInvoiceNoOf(row), this.attachmentName(row));
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
this.kingdeeBusy = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
previewAttachment(row) {
|
||||||
|
// 金蝶侧附件经 A801-2 代理取流后进弹窗预览,OSS 直链维持原逻辑
|
||||||
|
if (this.isKingdeeRow(row)) {
|
||||||
|
return this.previewKingdeeAttachment(row);
|
||||||
|
}
|
||||||
|
const url = this.attachmentUrl(row);
|
||||||
|
if (!url) {
|
||||||
|
this.$message.warning('附件地址为空,无法预览');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.isImage(row)) {
|
||||||
|
this.imagePreviewUrls = this.rows
|
||||||
|
.filter(item => this.isImage(item) && this.attachmentUrl(item))
|
||||||
|
.map(item => this.attachmentUrl(item));
|
||||||
|
this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0);
|
||||||
|
this.imagePreviewVisible = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const isPdf = this.isPdf(row);
|
||||||
|
this.previewFile = {
|
||||||
|
name: this.attachmentName(row),
|
||||||
|
url,
|
||||||
|
mimeType: isPdf ? 'application/pdf' : row.mimeType || row.contentType || '',
|
||||||
|
isPdf,
|
||||||
|
};
|
||||||
|
this.documentPreviewVisible = true;
|
||||||
|
},
|
||||||
|
async previewKingdeeAttachment(row) {
|
||||||
|
// OFD 版式文件浏览器无法在线渲染,直接提示下载,避免拉流后预览失败
|
||||||
|
if (this.attachmentExtension(row) === 'ofd') {
|
||||||
|
this.$message.warning('OFD 版式文件不支持在线预览,请使用下载获取后查看');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.kingdeeBusy) return;
|
||||||
|
this.kingdeeBusy = true;
|
||||||
|
try {
|
||||||
|
const blob = await requestKingdeeFile(this.kingdeeInvoiceNoOf(row));
|
||||||
|
this.releaseKingdeeObjectUrl();
|
||||||
|
const isPdf = this.isPdf(row) || String(blob.type || '').includes('application/pdf');
|
||||||
|
this.kingdeeObjectUrl = URL.createObjectURL(blob);
|
||||||
|
this.previewFile = {
|
||||||
|
name: this.attachmentName(row),
|
||||||
|
url: this.kingdeeObjectUrl,
|
||||||
|
mimeType: isPdf ? 'application/pdf' : blob.type || '',
|
||||||
|
isPdf,
|
||||||
|
};
|
||||||
|
this.documentPreviewVisible = true;
|
||||||
|
} catch (error) {
|
||||||
|
if (!error?.silent) this.$message.error(error?.message || '附件预览失败');
|
||||||
|
} finally {
|
||||||
|
this.kingdeeBusy = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handlePreviewClosed() {
|
||||||
|
this.releaseKingdeeObjectUrl();
|
||||||
|
this.previewFile = {};
|
||||||
|
},
|
||||||
|
releaseKingdeeObjectUrl() {
|
||||||
|
if (this.kingdeeObjectUrl) {
|
||||||
|
URL.revokeObjectURL(this.kingdeeObjectUrl);
|
||||||
|
this.kingdeeObjectUrl = '';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handlePreviewUnsupported() {
|
||||||
|
this.$message.warning('当前文件暂不支持在线预览');
|
||||||
|
},
|
||||||
|
handlePreviewError() {
|
||||||
|
this.$message.error('附件预览失败');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.vehicle-attachment-table {
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
&__toolbar {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__file-name {
|
||||||
|
color: #409eff;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__file-name:hover,
|
||||||
|
&__file-name:focus-visible {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
|
||||||
|
:deep(.el-link) {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__upload {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-start;
|
||||||
|
margin-top: 12px;
|
||||||
|
|
||||||
|
:deep(.vehicle-attachment-upload) {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-table th.el-table__cell) {
|
||||||
|
height: 42px;
|
||||||
|
padding: 8px 0;
|
||||||
|
background: #fafafa;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.el-table td.el-table__cell) {
|
||||||
|
height: 52px;
|
||||||
|
padding: 8px 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
:global(.vehicle-attachment-table__viewer-dialog .el-dialog__body) {
|
||||||
|
padding: 12px 16px 16px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -75,8 +75,8 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
|
|||||||
import { baseUrl } from '@/config/env';
|
import { baseUrl } from '@/config/env';
|
||||||
import { getUploadHeaders } from '@/utils/upload';
|
import { getUploadHeaders } from '@/utils/upload';
|
||||||
|
|
||||||
const UNIFIED_ATTACHMENT_TIP =
|
const UNIFIED_ATTACHMENT_TIP_PREFIX =
|
||||||
'支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过500M';
|
'支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式,单个文件不超过';
|
||||||
|
|
||||||
const MIME_MAP = {
|
const MIME_MAP = {
|
||||||
jpg: 'image/jpeg',
|
jpg: 'image/jpeg',
|
||||||
@@ -212,10 +212,17 @@ export default {
|
|||||||
.filter(Boolean);
|
.filter(Boolean);
|
||||||
},
|
},
|
||||||
acceptText() {
|
acceptText() {
|
||||||
return this.acceptedList.join(',');
|
return this.acceptedList
|
||||||
|
.map(item => {
|
||||||
|
const value = String(item).trim();
|
||||||
|
if (!value || value.includes('/') || value.startsWith('.')) return value;
|
||||||
|
return `.${value}`;
|
||||||
|
})
|
||||||
|
.filter(Boolean)
|
||||||
|
.join(',');
|
||||||
},
|
},
|
||||||
tipText() {
|
tipText() {
|
||||||
return this.tip || UNIFIED_ATTACHMENT_TIP;
|
return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
|
||||||
},
|
},
|
||||||
uploadingCount() {
|
uploadingCount() {
|
||||||
return this.fileList.filter(file => ['ready', 'uploading'].includes(file.status)).length;
|
return this.fileList.filter(file => ['ready', 'uploading'].includes(file.status)).length;
|
||||||
@@ -304,12 +311,22 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSuccess(response, file, files) {
|
handleSuccess(response, file, files) {
|
||||||
if (!response || response.success === false || (response.code && response.code !== 200)) {
|
const code = response?.code;
|
||||||
|
const codeInvalid = code !== undefined && code !== null && code !== '' && Number(code) !== 200;
|
||||||
|
if (!response || response.success === false || codeInvalid) {
|
||||||
this.$message.error((response && response.msg) || '上传失败');
|
this.$message.error((response && response.msg) || '上传失败');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.emitUploadFiles(this.multiple ? files : [file]);
|
if (file && !file.response) {
|
||||||
this.$emit('success', this.normalizeUploadFile(file));
|
file.response = response;
|
||||||
|
}
|
||||||
|
const normalized = this.normalizeUploadFile(file, response);
|
||||||
|
if (!normalized.url) {
|
||||||
|
this.$message.error('上传成功但未返回文件地址');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.$emit('success', normalized);
|
||||||
|
this.emitUploadFiles(this.multiple ? files : [file], normalized);
|
||||||
this.$message.success('上传成功');
|
this.$message.success('上传成功');
|
||||||
},
|
},
|
||||||
handleChange(file, files) {
|
handleChange(file, files) {
|
||||||
@@ -323,30 +340,89 @@ export default {
|
|||||||
this.emitUploadFiles(files);
|
this.emitUploadFiles(files);
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
emitUploadFiles(files) {
|
emitUploadFiles(files, preferredFile) {
|
||||||
const list = files
|
const list = (files || [])
|
||||||
.filter(file => file.status === 'success' || this.getFileUrl(file))
|
.filter(file => {
|
||||||
.map(this.normalizeUploadFile)
|
if (file?.status === 'fail') return false;
|
||||||
|
return (
|
||||||
|
file?.status === 'success' ||
|
||||||
|
this.getFileUrl(file) ||
|
||||||
|
file?.response?.data ||
|
||||||
|
file?.response?.link ||
|
||||||
|
file?.response
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.map(file => this.normalizeUploadFile(file))
|
||||||
.filter(item => item.url);
|
.filter(item => item.url);
|
||||||
this.$emit('update:modelValue', list);
|
|
||||||
this.$emit('change', list);
|
if (preferredFile?.url) {
|
||||||
|
const exists = list.some(
|
||||||
|
item =>
|
||||||
|
(preferredFile.uid && item.uid && String(item.uid) === String(preferredFile.uid)) ||
|
||||||
|
item.url === preferredFile.url
|
||||||
|
);
|
||||||
|
if (!exists) list.push(preferredFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
const current = this.parseValue(this.modelValue).map(item => ({
|
||||||
|
...item,
|
||||||
|
url: this.getFileUrl(item),
|
||||||
|
}));
|
||||||
|
const merged = [...current];
|
||||||
|
list.forEach(file => {
|
||||||
|
const index = merged.findIndex(
|
||||||
|
item =>
|
||||||
|
(file.uid && item.uid && String(item.uid) === String(file.uid)) ||
|
||||||
|
(file.url && this.getFileUrl(item) === file.url)
|
||||||
|
);
|
||||||
|
if (index >= 0) merged.splice(index, 1, { ...merged[index], ...file });
|
||||||
|
else merged.push(file);
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = merged.filter(item => this.getFileUrl(item));
|
||||||
|
this.$emit('update:modelValue', result);
|
||||||
|
this.$emit('change', result);
|
||||||
},
|
},
|
||||||
normalizeUploadFile(file) {
|
normalizeUploadFile(file, responseOverride) {
|
||||||
const data = (file.response && file.response.data) || file.data || file;
|
const response = responseOverride || file?.response;
|
||||||
const url = data.link || data.url || data.domain || file.url || '';
|
let data = {};
|
||||||
|
if (response && typeof response === 'object') {
|
||||||
|
if (response.data && typeof response.data === 'object') {
|
||||||
|
data = response.data;
|
||||||
|
} else if (response.link || response.url || response.domain) {
|
||||||
|
data = response;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!data.link && !data.url && !data.domain) {
|
||||||
|
data = file?.data && typeof file.data === 'object' ? file.data : file || {};
|
||||||
|
}
|
||||||
|
const url =
|
||||||
|
data.link ||
|
||||||
|
data.url ||
|
||||||
|
data.domain ||
|
||||||
|
data.fileLink ||
|
||||||
|
data.fileUrl ||
|
||||||
|
file?.url ||
|
||||||
|
file?.link ||
|
||||||
|
'';
|
||||||
const originalName =
|
const originalName =
|
||||||
data.originalName || file.originalName || data.name || file.name || this.getFileName(url) || '附件';
|
data.originalName ||
|
||||||
|
file?.originalName ||
|
||||||
|
file?.name ||
|
||||||
|
data.name ||
|
||||||
|
this.getFileName(url) ||
|
||||||
|
'附件';
|
||||||
const extension = this.getExtension({ name: originalName, url });
|
const extension = this.getExtension({ name: originalName, url });
|
||||||
return {
|
return {
|
||||||
...data,
|
...data,
|
||||||
uid: file.uid || data.uid,
|
uid: file?.uid || data.uid,
|
||||||
originalName,
|
originalName,
|
||||||
name: originalName,
|
name: originalName,
|
||||||
url,
|
url,
|
||||||
link: data.link || url,
|
link: data.link || url,
|
||||||
size: data.size || data.attachSize || file.size || '',
|
size: data.size || data.attachSize || file?.size || '',
|
||||||
extension,
|
extension,
|
||||||
mimeType: data.mimeType || data.contentType || file.raw?.type || MIME_MAP[extension] || '',
|
mimeType: data.mimeType || data.contentType || file?.raw?.type || MIME_MAP[extension] || '',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
handlePreview(file) {
|
handlePreview(file) {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export default {
|
|||||||
tenantMode: true, // 是否开启租户模式
|
tenantMode: true, // 是否开启租户模式
|
||||||
tenantId: '000000', // 管理组租户编号
|
tenantId: '000000', // 管理组租户编号
|
||||||
captchaMode: true, // 是否开启验证码模式
|
captchaMode: true, // 是否开启验证码模式
|
||||||
captchaType: 'behavior', // 验证码类型(image:首屏图形验证码 behavior:登录时弹出点选/滑块/旋转随机行为验证)
|
captchaType: 'image', // 验证码类型(image:首屏图形验证码 behavior:登录时弹出点选/滑块/旋转随机行为验证)
|
||||||
switchMode: false, // 是否开启登录切换角色部门
|
switchMode: false, // 是否开启登录切换角色部门
|
||||||
lockPage: '/lock', // 锁屏页面地址
|
lockPage: '/lock', // 锁屏页面地址
|
||||||
tokenTime: 3000, // 定时刷新token间隔(单位:毫秒)
|
tokenTime: 3000, // 定时刷新token间隔(单位:毫秒)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
FROM nginx
|
FROM nginx
|
||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
ADD ./src/docker/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
ADD ./dist/ /usr/share/nginx/html/
|
ADD ./dist/ /usr/share/nginx/html/
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 443
|
EXPOSE 443
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name localhost;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
gzip on;
|
||||||
|
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
|
||||||
|
|
||||||
|
location /assets/ {
|
||||||
|
add_header Cache-Control "public, max-age=31536000, immutable";
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
add_header Cache-Control "no-store, no-cache, must-revalidate";
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
import store from './store';
|
import store from './store';
|
||||||
|
import { isChunkLoadError, reloadForChunkError } from './utils/chunk-reload';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
install: app => {
|
install: app => {
|
||||||
app.config.errorHandler = (err, vm, info) => {
|
app.config.errorHandler = (err, vm, info) => {
|
||||||
|
if (isChunkLoadError(err) && reloadForChunkError()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
store.commit('ADD_LOGS', {
|
store.commit('ADD_LOGS', {
|
||||||
type: 'error',
|
type: 'error',
|
||||||
message: err.message,
|
message: err.message,
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { createApp } from 'vue';
|
import { createApp } from 'vue';
|
||||||
|
import { installChunkReload } from './utils/chunk-reload';
|
||||||
import website from './config/website';
|
import website from './config/website';
|
||||||
import axios from './axios';
|
import axios from './axios';
|
||||||
import router from './router/';
|
import router from './router/';
|
||||||
@@ -43,8 +44,10 @@ import tenantPackage from './views/system/tenantpackage.vue';
|
|||||||
import tenantDatasource from './views/system/tenantdatasource.vue';
|
import tenantDatasource from './views/system/tenantdatasource.vue';
|
||||||
// 通用弹窗分组白卡(灰底弹窗内使用,标题在卡内)
|
// 通用弹窗分组白卡(灰底弹窗内使用,标题在卡内)
|
||||||
import sectionCard from './components/section-card/main.vue';
|
import sectionCard from './components/section-card/main.vue';
|
||||||
|
import mapSearchResults from './components/map-search-results/main.vue';
|
||||||
|
|
||||||
window.$crudCommon = crudCommon;
|
window.$crudCommon = crudCommon;
|
||||||
|
installChunkReload();
|
||||||
debug();
|
debug();
|
||||||
window.axios = axios;
|
window.axios = axios;
|
||||||
const app = createApp(App);
|
const app = createApp(App);
|
||||||
@@ -66,6 +69,7 @@ app.component('formSetting', formSetting);
|
|||||||
app.component('tenantPackage', tenantPackage);
|
app.component('tenantPackage', tenantPackage);
|
||||||
app.component('tenantDatasource', tenantDatasource);
|
app.component('tenantDatasource', tenantDatasource);
|
||||||
app.component('sectionCard', sectionCard);
|
app.component('sectionCard', sectionCard);
|
||||||
|
app.component('mapSearchResults', mapSearchResults);
|
||||||
app.config.globalProperties.$app = app;
|
app.config.globalProperties.$app = app;
|
||||||
app.config.globalProperties.$dayjs = dayjs;
|
app.config.globalProperties.$dayjs = dayjs;
|
||||||
app.config.globalProperties.website = website;
|
app.config.globalProperties.website = website;
|
||||||
@@ -81,7 +85,7 @@ app.use(ElementPlus, {
|
|||||||
});
|
});
|
||||||
app.use(Avue, {
|
app.use(Avue, {
|
||||||
axios,
|
axios,
|
||||||
calcHeight: 10,
|
calcHeight: -26,
|
||||||
crudOption: {
|
crudOption: {
|
||||||
searchIcon: true,
|
searchIcon: true,
|
||||||
searchIndex: 4,
|
searchIndex: 4,
|
||||||
|
|||||||
@@ -0,0 +1,296 @@
|
|||||||
|
import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
|
||||||
|
import { ElCascader } from 'element-plus';
|
||||||
|
import { h } from 'vue';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 所属组织 统一搜索 mixin
|
||||||
|
* ------------------------------------------------------------------
|
||||||
|
* 全站「所属组织」搜索栏统一为级联选择器(el-cascader,单选),风格与客商档案
|
||||||
|
* (vehicle/customer-archive.vue)保持一致。
|
||||||
|
*
|
||||||
|
* 接入步骤(在使用了 avue-crud 的页面中):
|
||||||
|
* 1. 混入本 mixin:mixins: [organizationSearch]
|
||||||
|
* 2. option 中「所属组织」列加上 searchslot: true(prop 为 organizationName 或 deptName 均可)
|
||||||
|
* 3. 在 created / 初始化时调用 this.loadOrganizationOptions()
|
||||||
|
* 4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true;
|
||||||
|
* 该项只追加进搜索树 organizationSearchTreeOptions,表单级联 organizationTreeOptions 不含哨兵
|
||||||
|
* 5. 表单「所属组织」只允许选平台公司的页面(运力管理)在 data 里置
|
||||||
|
* restrictFormOrgToPlatformCompany: true,表单级联样式改用
|
||||||
|
* buildFormOrganizationTree(...) 的结果,并在打开表单时把回显的组织名写进
|
||||||
|
* formOrganizationLegacyName;只影响表单,搜索栏仍是全量组织
|
||||||
|
*
|
||||||
|
* 说明:
|
||||||
|
* - 自动识别 organizationName / deptName 两种 prop,并挂载 column.renderSearch
|
||||||
|
* - 树节点标识统一用 id,级联值为「根 → 选中节点」的 id 路径数组
|
||||||
|
* - checkStrictly 打开,任意层级(含非末级)都可直接选中
|
||||||
|
* - 页面若已有 excludeExternalOrganization / normalizeOrgTree 等方法,
|
||||||
|
* 组件自身方法优先级更高,会覆盖本 mixin 的默认实现
|
||||||
|
* - 搜索值需在各自的 searchChange / normalizeSearch 中按后端要求转换为部门名称:
|
||||||
|
* 级联值是路径数组,统一用 findOrgById(路径)?.rawLabel 取末级名称
|
||||||
|
* - 表单区(新增/编辑)需要回显时,可用 findOrgPath(deptId) 把 id 转成路径,
|
||||||
|
* 参考 customer-archive 的 deptCascaderValue 计算属性
|
||||||
|
*/
|
||||||
|
const ORG_PROPS = ['organizationName', 'deptName'];
|
||||||
|
|
||||||
|
// 「未分配组织」筛选项的哨兵值:不是真实组织名,选中后提交给后端的就是这串字面量。
|
||||||
|
// 后端 TransportBusiConstant.UNASSIGNED_ORG_FILTER、DriverMapper.xml / TransportVehicleMapper.xml
|
||||||
|
// 的 organizationName 分支以及司机、车辆导出查询都按它改判为 organization_name = '';
|
||||||
|
// 后端换成空串会让整段组织条件不生效,筛选静默失效。前端与后端这几处必须同步修改。
|
||||||
|
const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';
|
||||||
|
|
||||||
|
// 表单「所属组织」限定只能选平台公司时,存量记录里的旧组织名在组织树里已经找不到
|
||||||
|
// (节点被删或改名),用这个 id 补一个只读节点,否则编辑老数据时所属组织显示为空、
|
||||||
|
// 保存即把原值丢掉。
|
||||||
|
const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
// 树形组织数据,仅供搜索栏 el-cascader 使用;
|
||||||
|
// 与页面自身 organizationOptions(多为表单扁平列表)隔离,避免相互覆盖
|
||||||
|
organizationTreeOptions: [],
|
||||||
|
organizationTreeFlatOptions: [],
|
||||||
|
organizationLoading: false,
|
||||||
|
// 组织筛选是否追加「未分配组织」一项;页面在 data 里覆盖为 true 才生效
|
||||||
|
enableUnassignedOrgFilter: false,
|
||||||
|
// 表单「所属组织」是否只允许选平台公司;页面在 data 里覆盖为 true 才生效
|
||||||
|
restrictFormOrgToPlatformCompany: false,
|
||||||
|
// 平台公司部门 id(字符串),loadOrganizationOptions 时一并拉取
|
||||||
|
platformCompanyOrgIds: [],
|
||||||
|
// 表单当前回显的组织名,树里没有同名节点时用它补一个只读选项
|
||||||
|
formOrganizationLegacyName: '',
|
||||||
|
// 进行中的组织数据请求,并发调用共用(不是响应式状态,只做去重)
|
||||||
|
organizationOptionsPromise: null,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
// 搜索栏级联的选项:开关打开时在真实组织最前面追加「未分配组织」。
|
||||||
|
// 不能直接改 organizationTreeOptions——司机/车辆页的编辑表单也用这棵树选组织。
|
||||||
|
organizationSearchTreeOptions() {
|
||||||
|
return this.enableUnassignedOrgFilter
|
||||||
|
? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
|
||||||
|
: this.organizationTreeOptions;
|
||||||
|
},
|
||||||
|
// 所属组织级联配置:checkStrictly 允许选中任意层级,不必选到末级。
|
||||||
|
// 限定只能选平台公司时用 disabled 函数只放开平台公司:非平台公司的非末级节点
|
||||||
|
// 在 checkStrictly 下仍可展开(el-cascader 的 expandable 判断),末级节点点击无效,
|
||||||
|
// 两者都选不中。disabled 在节点渲染时求值,平台公司 id 到手后节点会自行重算。
|
||||||
|
organizationCascaderProps() {
|
||||||
|
const props = {
|
||||||
|
value: 'id',
|
||||||
|
label: 'label',
|
||||||
|
children: 'children',
|
||||||
|
emitPath: true,
|
||||||
|
checkStrictly: true,
|
||||||
|
expandTrigger: 'click',
|
||||||
|
};
|
||||||
|
if (this.restrictFormOrgToPlatformCompany) {
|
||||||
|
props.disabled = data => this.platformCompanyOrgDisabled(data);
|
||||||
|
}
|
||||||
|
return props;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
loadOrganizationOptions() {
|
||||||
|
// 并发调用共用同一次请求,返回的 Promise 在数据就绪后才 resolve
|
||||||
|
if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
|
||||||
|
this.organizationLoading = true;
|
||||||
|
const tenantId = this.userInfo?.tenantId;
|
||||||
|
// 平台公司下拉失败不能拖垮组织树,单独兜住,失败时保持上一次的可选范围
|
||||||
|
const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
|
||||||
|
? getPlatformCompanySelect().catch(() => null)
|
||||||
|
: Promise.resolve(null);
|
||||||
|
this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest])
|
||||||
|
.then(([res, platformRes]) => {
|
||||||
|
this.applyPlatformCompanyOptions(platformRes);
|
||||||
|
const source = res.data?.data || res.data || [];
|
||||||
|
const tree = this.excludeExternalOrganization
|
||||||
|
? this.excludeExternalOrganization(source)
|
||||||
|
: source;
|
||||||
|
this.organizationTreeOptions = this.normalizeOrgTree(tree);
|
||||||
|
this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationSearchTreeOptions);
|
||||||
|
const option = this.tableOption || this.option;
|
||||||
|
if (!option) return;
|
||||||
|
ORG_PROPS.forEach(prop => {
|
||||||
|
const column = this.findColumn?.(option.column, prop);
|
||||||
|
if (column) {
|
||||||
|
column.renderSearch = scope => this.renderOrganizationSearch(scope, prop);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
this.organizationLoading = false;
|
||||||
|
this.organizationOptionsPromise = null;
|
||||||
|
});
|
||||||
|
return this.organizationOptionsPromise;
|
||||||
|
},
|
||||||
|
// 组织树与平台公司列表就绪后执行回调;已加载过则立即执行
|
||||||
|
whenOrganizationOptionsReady(callback) {
|
||||||
|
const pending = this.organizationTreeFlatOptions.length
|
||||||
|
? Promise.resolve()
|
||||||
|
: this.loadOrganizationOptions();
|
||||||
|
return Promise.resolve(pending).then(callback, () => callback());
|
||||||
|
},
|
||||||
|
applyPlatformCompanyOptions(res) {
|
||||||
|
if (!res) return;
|
||||||
|
const list = res.data?.data || res.data || [];
|
||||||
|
this.platformCompanyOrgIds = (Array.isArray(list) ? list : []).map(item => String(item.id));
|
||||||
|
},
|
||||||
|
// 默认排除「外部组织」节点;页面可覆盖
|
||||||
|
excludeExternalOrganization(tree = []) {
|
||||||
|
return (tree || []).reduce((result, item) => {
|
||||||
|
const name = item.title || item.deptName || item.name || item.label || '';
|
||||||
|
if (String(name).trim() === '外部组织') return result;
|
||||||
|
result.push({
|
||||||
|
...item,
|
||||||
|
children: this.excludeExternalOrganization(item.children || []),
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}, []);
|
||||||
|
},
|
||||||
|
normalizeOrgTree(tree = []) {
|
||||||
|
return (tree || []).map(item => {
|
||||||
|
const label = item.title || item.deptName || item.name || item.label || '';
|
||||||
|
const children = this.normalizeOrgTree(item.children || []);
|
||||||
|
return {
|
||||||
|
...item,
|
||||||
|
id: String(item.id),
|
||||||
|
label,
|
||||||
|
rawLabel: label,
|
||||||
|
children: children.length ? children : undefined,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 哨兵节点的 id 与 rawLabel 都取哨兵值,resolveOrgName 取到的仍是哨兵而不是某个真实组织名
|
||||||
|
unassignedOrgOption() {
|
||||||
|
return { id: UNASSIGNED_ORG_FILTER, label: '未分配组织', rawLabel: UNASSIGNED_ORG_FILTER };
|
||||||
|
},
|
||||||
|
flattenOrgTree(tree = []) {
|
||||||
|
return (tree || []).flatMap(item => [
|
||||||
|
{ id: String(item.id), label: item.label, rawLabel: item.rawLabel },
|
||||||
|
...this.flattenOrgTree(item.children || []),
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
// 组织列渲染用:空串或纯空白即「未分配组织」(组织列 NOT NULL,无组织存空串)
|
||||||
|
isBlankOrganizationName(value) {
|
||||||
|
return String(value ?? '').trim() === '';
|
||||||
|
},
|
||||||
|
// 兼容两种入参:级联路径数组(取末级)或单个部门 id
|
||||||
|
findOrgById(id) {
|
||||||
|
const value = Array.isArray(id) ? id.at(-1) : id;
|
||||||
|
return this.organizationTreeFlatOptions.find(item => String(item.id) === String(value));
|
||||||
|
},
|
||||||
|
// 由部门 id 反查「根 → 该节点」的 id 路径,供级联回显(找不到返回 null)
|
||||||
|
findOrgPath(id, tree = this.organizationTreeOptions, 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, String(node.id)];
|
||||||
|
if (String(node.id) === String(target)) return path;
|
||||||
|
// 必须显式传 node.children || []:叶节点的 children 是 undefined,
|
||||||
|
// 传 undefined 会触发默认参数重新拿到整棵树,逐层重复扫描直到爆栈
|
||||||
|
const matched = this.findOrgPath(target, node.children || [], path);
|
||||||
|
if (matched) return matched;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
// 由部门 id 取组织名称(末级),供表单提交
|
||||||
|
findOrgName(id) {
|
||||||
|
return this.findOrgById(id)?.rawLabel || '';
|
||||||
|
},
|
||||||
|
// 级联节点的 disabled 判定:只有平台公司可选。页面自建 props 时也复用它
|
||||||
|
platformCompanyOrgDisabled(data) {
|
||||||
|
return !this.platformCompanyOrgIds.includes(String(data?.id ?? ''));
|
||||||
|
},
|
||||||
|
// 组织名对应的节点是否为平台公司;名称在树里不存在时按「不是」处理
|
||||||
|
isPlatformCompanyOrgName(name) {
|
||||||
|
const value = String(name ?? '').trim();
|
||||||
|
if (!value) return false;
|
||||||
|
const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
|
||||||
|
return !!node && this.platformCompanyOrgIds.includes(String(node.id));
|
||||||
|
},
|
||||||
|
// 新增表单的默认组织:只有落在平台公司上才预填,否则留空(不能让用户从默认值
|
||||||
|
// 直接带出一个选不中的组织名)
|
||||||
|
defaultFormOrganizationName(name) {
|
||||||
|
return this.isPlatformCompanyOrgName(name) ? String(name).trim() : '';
|
||||||
|
},
|
||||||
|
// 表单级联的选项树:限定平台公司时,把回显的原组织名补成一个只读节点,
|
||||||
|
// 否则存量记录的组织在树里找不到,编辑时显示为空、保存即丢原值
|
||||||
|
buildFormOrganizationTree(tree = this.organizationTreeOptions) {
|
||||||
|
const source = tree || [];
|
||||||
|
if (!this.restrictFormOrgToPlatformCompany) return source;
|
||||||
|
const name = String(this.formOrganizationLegacyName || '').trim();
|
||||||
|
if (!name) return source;
|
||||||
|
if (this.organizationTreeFlatOptions.some(item => item.rawLabel === name)) return source;
|
||||||
|
return [...source, { id: FORM_LEGACY_ORG_ID, label: name, rawLabel: name }];
|
||||||
|
},
|
||||||
|
// 表单级联回显用的路径:树里有该组织就用真实路径,否则落到原组织兜底节点
|
||||||
|
resolveFormOrgPath(name) {
|
||||||
|
const path = this.resolveOrgPath(name);
|
||||||
|
if (path.length) return path;
|
||||||
|
const value = String(name ?? '').trim();
|
||||||
|
if (!value) return [];
|
||||||
|
return value === String(this.formOrganizationLegacyName || '').trim()
|
||||||
|
? [FORM_LEGACY_ORG_ID]
|
||||||
|
: [];
|
||||||
|
},
|
||||||
|
// 记录表单当前回显的组织名:能匹配真实节点(或已清空)就不需要兜底节点,
|
||||||
|
// 否则记下来,由 buildFormOrganizationTree 补成只读选项
|
||||||
|
syncFormOrganizationLegacy(name) {
|
||||||
|
const value = String(name ?? '').trim();
|
||||||
|
if (!value || this.organizationTreeFlatOptions.some(item => item.rawLabel === value)) {
|
||||||
|
this.formOrganizationLegacyName = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.formOrganizationLegacyName = value;
|
||||||
|
},
|
||||||
|
// 组织名称 → 级联路径(表单回显用;部门树异步加载完成后会自动重算)
|
||||||
|
resolveOrgPath(name) {
|
||||||
|
const value = String(name ?? '').trim();
|
||||||
|
if (!value) return [];
|
||||||
|
const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
|
||||||
|
return node ? this.findOrgPath(node.id) || [] : [];
|
||||||
|
},
|
||||||
|
// 级联路径 → 组织名称(表单/搜索提交用,取末级节点名称)
|
||||||
|
resolveOrgName(path) {
|
||||||
|
const value = Array.isArray(path)
|
||||||
|
? path.filter(item => item !== undefined && item !== null && item !== '')
|
||||||
|
: [];
|
||||||
|
if (!value.length) return '';
|
||||||
|
const node = this.findOrgById(value);
|
||||||
|
if (node) return node.rawLabel || '';
|
||||||
|
// 原组织兜底节点不在扁平表里,直接取它代表的历史名称
|
||||||
|
return String(value[value.length - 1]) === FORM_LEGACY_ORG_ID
|
||||||
|
? String(this.formOrganizationLegacyName || '').trim()
|
||||||
|
: '';
|
||||||
|
},
|
||||||
|
// 搜索提交前把级联路径数组就地转成组织名称(后端按名称过滤)
|
||||||
|
normalizeOrganizationSearch(params, prop = 'organizationName') {
|
||||||
|
if (Array.isArray(params?.[prop])) {
|
||||||
|
params[prop] = this.resolveOrgName(params[prop]);
|
||||||
|
}
|
||||||
|
return params;
|
||||||
|
},
|
||||||
|
renderOrganizationSearch(scope, prop = 'organizationName') {
|
||||||
|
return h(ElCascader, {
|
||||||
|
modelValue: Array.isArray(scope.row?.[prop]) ? scope.row[prop] : [],
|
||||||
|
'onUpdate:modelValue': value => {
|
||||||
|
// 级联单选:modelValue 必须是 id 路径数组,否则控件内部状态会错乱导致无法再次选中
|
||||||
|
if (scope.row) scope.row[prop] = Array.isArray(value) ? value : [];
|
||||||
|
},
|
||||||
|
options: this.organizationSearchTreeOptions,
|
||||||
|
props: {
|
||||||
|
label: 'label',
|
||||||
|
value: 'id',
|
||||||
|
children: 'children',
|
||||||
|
checkStrictly: true,
|
||||||
|
expandTrigger: 'click',
|
||||||
|
},
|
||||||
|
filterable: true,
|
||||||
|
clearable: true,
|
||||||
|
style: 'width: 100%',
|
||||||
|
placeholder: '请选择 所属组织',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -26,6 +26,8 @@ export const getCargoTypeOption = ctx => ({
|
|||||||
height: 'auto',
|
height: 'auto',
|
||||||
calcHeight: 22,
|
calcHeight: 22,
|
||||||
dialogWidth: 760,
|
dialogWidth: 760,
|
||||||
|
// 货物类型弹窗单独使用样式,避免全局 Avue footer 上移遮挡底部备注字段
|
||||||
|
dialogCustomClass: 'cargo-type-dialog',
|
||||||
labelPosition: 'right',
|
labelPosition: 'right',
|
||||||
labelWidth: 'auto',
|
labelWidth: 'auto',
|
||||||
tip: false,
|
tip: false,
|
||||||
@@ -172,6 +174,7 @@ export const getCargoTypeOption = ctx => ({
|
|||||||
label: '备注',
|
label: '备注',
|
||||||
prop: 'remark',
|
prop: 'remark',
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
|
formslot: true,
|
||||||
minRows: 2,
|
minRows: 2,
|
||||||
span: 24,
|
span: 24,
|
||||||
minWidth: 180,
|
minWidth: 180,
|
||||||
|
|||||||
@@ -146,6 +146,13 @@ export const createOption = () => ({
|
|||||||
showWordLimit: true,
|
showWordLimit: true,
|
||||||
rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
|
rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '创建人',
|
||||||
|
prop: 'createUserName',
|
||||||
|
minWidth: 120,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '更新时间',
|
label: '更新时间',
|
||||||
prop: 'updateTime',
|
prop: 'updateTime',
|
||||||
@@ -298,6 +305,10 @@ export const createOption = () => ({
|
|||||||
searchOrder: 3,
|
searchOrder: 3,
|
||||||
searchPlaceholder: '请选择',
|
searchPlaceholder: '请选择',
|
||||||
dicData: [],
|
dicData: [],
|
||||||
|
props: {
|
||||||
|
label: 'label',
|
||||||
|
value: 'value',
|
||||||
|
},
|
||||||
filterable: true,
|
filterable: true,
|
||||||
hide: true,
|
hide: true,
|
||||||
display: false,
|
display: false,
|
||||||
|
|||||||
@@ -0,0 +1,155 @@
|
|||||||
|
const dimensionOptions = [
|
||||||
|
{ label: '重量', value: '重量' },
|
||||||
|
{ label: '体积', value: '体积' },
|
||||||
|
{ label: '数量', value: '数量' },
|
||||||
|
{ label: '整车', value: '整车' },
|
||||||
|
{ label: '里程', value: '里程' },
|
||||||
|
{ label: '吨·公里', value: '吨·公里' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const statusOptions = [
|
||||||
|
{ label: '启用', value: 1 },
|
||||||
|
{ label: '停用', value: 2 },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const createOption = () => ({
|
||||||
|
height: 'auto',
|
||||||
|
calcHeight: 32,
|
||||||
|
dialogWidth: 680,
|
||||||
|
labelPosition: 'right',
|
||||||
|
labelWidth: 'auto',
|
||||||
|
tip: false,
|
||||||
|
searchBtnText: '查询',
|
||||||
|
emptyBtnText: '重置',
|
||||||
|
saveBtnText: '提交',
|
||||||
|
updateBtnText: '提交',
|
||||||
|
searchShow: true,
|
||||||
|
searchMenuSpan: 24,
|
||||||
|
searchIcon: true,
|
||||||
|
searchIndex: 4,
|
||||||
|
searchMenuPosition: 'right',
|
||||||
|
border: true,
|
||||||
|
index: true,
|
||||||
|
indexLabel: '序号',
|
||||||
|
indexWidth: 70,
|
||||||
|
addBtn: false,
|
||||||
|
viewBtn: false,
|
||||||
|
editBtn: false,
|
||||||
|
delBtn: false,
|
||||||
|
selection: true,
|
||||||
|
dialogClickModal: false,
|
||||||
|
menuWidth: 320,
|
||||||
|
menuFixed: 'right',
|
||||||
|
column: [
|
||||||
|
{
|
||||||
|
label: '计量单位编码',
|
||||||
|
prop: 'unitCode',
|
||||||
|
minWidth: 150,
|
||||||
|
span: 24,
|
||||||
|
search: true,
|
||||||
|
searchOrder: 4,
|
||||||
|
searchSpan: 6,
|
||||||
|
maxlength: 50,
|
||||||
|
showWordLimit: true,
|
||||||
|
rules: [
|
||||||
|
{ required: true, message: '请输入计量单位编码', trigger: 'blur' },
|
||||||
|
{ max: 50, message: '计量单位编码不能超过50个字', trigger: 'blur' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '计量单位',
|
||||||
|
prop: 'unitName',
|
||||||
|
minWidth: 150,
|
||||||
|
search: true,
|
||||||
|
searchOrder: 3,
|
||||||
|
searchSpan: 6,
|
||||||
|
maxlength: 50,
|
||||||
|
showWordLimit: true,
|
||||||
|
rules: [
|
||||||
|
{ required: true, message: '请输入计量单位', trigger: 'blur' },
|
||||||
|
{ max: 50, message: '计量单位不能超过50个字', trigger: 'blur' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '计量维度',
|
||||||
|
prop: 'dimension',
|
||||||
|
type: 'select',
|
||||||
|
minWidth: 130,
|
||||||
|
search: true,
|
||||||
|
searchOrder: 2,
|
||||||
|
searchSpan: 6,
|
||||||
|
dicData: dimensionOptions,
|
||||||
|
rules: [{ required: true, message: '请选择计量维度', trigger: 'change' }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '备注',
|
||||||
|
prop: 'remark',
|
||||||
|
type: 'textarea',
|
||||||
|
minRows: 2,
|
||||||
|
span: 24,
|
||||||
|
minWidth: 200,
|
||||||
|
maxlength: 200,
|
||||||
|
showWordLimit: true,
|
||||||
|
overHidden: true,
|
||||||
|
rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '状态',
|
||||||
|
prop: 'status',
|
||||||
|
type: 'select',
|
||||||
|
search: true,
|
||||||
|
searchOrder: 1,
|
||||||
|
searchSpan: 6,
|
||||||
|
slot: true,
|
||||||
|
dataType: 'number',
|
||||||
|
dicData: statusOptions,
|
||||||
|
clearable: true,
|
||||||
|
value: 1,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
minWidth: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '创建人',
|
||||||
|
prop: 'createUserName',
|
||||||
|
minWidth: 110,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
viewDisplay: false,
|
||||||
|
display: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '更新人',
|
||||||
|
prop: 'updateUserName',
|
||||||
|
minWidth: 110,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
viewDisplay: false,
|
||||||
|
display: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '创建时间',
|
||||||
|
prop: 'createTime',
|
||||||
|
type: 'datetime',
|
||||||
|
format: 'YYYY-MM-DD HH:mm:ss',
|
||||||
|
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||||
|
width: 180,
|
||||||
|
sortable: true,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
display: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '更新时间',
|
||||||
|
prop: 'updateTime',
|
||||||
|
type: 'datetime',
|
||||||
|
format: 'YYYY-MM-DD HH:mm:ss',
|
||||||
|
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||||
|
width: 180,
|
||||||
|
sortable: true,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
display: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
@@ -2,7 +2,6 @@ import {
|
|||||||
auditColumns,
|
auditColumns,
|
||||||
createCrudOption,
|
createCrudOption,
|
||||||
packageOptions,
|
packageOptions,
|
||||||
priceUnitOptions,
|
|
||||||
textRule,
|
textRule,
|
||||||
} from './common';
|
} from './common';
|
||||||
|
|
||||||
@@ -25,10 +24,23 @@ export const config = {
|
|||||||
enableAllDept: false,
|
enableAllDept: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 单价统一按两位小数展示;格式非法时保留原值,交由表单校验提示。
|
||||||
|
export const formatCargoValue = value => {
|
||||||
|
if (value === undefined || value === null) return '';
|
||||||
|
const raw = String(value).trim();
|
||||||
|
if (!raw || raw === '-1') return '';
|
||||||
|
if (!/^\d+(?:\.\d+)?$/.test(raw)) return raw;
|
||||||
|
const number = Number(raw);
|
||||||
|
return Number.isFinite(number) ? number.toFixed(2) : raw;
|
||||||
|
};
|
||||||
|
|
||||||
export const option = createCrudOption([
|
export const option = createCrudOption([
|
||||||
|
// ---------- 列表字段(顺序即表格展示顺序) ----------
|
||||||
{
|
{
|
||||||
label: '货物名称',
|
label: '货物名称',
|
||||||
prop: 'cargoName',
|
prop: 'cargoName',
|
||||||
|
order: 50,
|
||||||
|
span: 12,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
placeholder: '请输入',
|
placeholder: '请输入',
|
||||||
rules: textRule('货物名称', 100, true),
|
rules: textRule('货物名称', 100, true),
|
||||||
@@ -37,6 +49,8 @@ export const option = createCrudOption([
|
|||||||
label: '货物编号',
|
label: '货物编号',
|
||||||
prop: 'cargoCode',
|
prop: 'cargoCode',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
|
order: 49,
|
||||||
|
span: 12,
|
||||||
minWidth: 120,
|
minWidth: 120,
|
||||||
maxlength: 20,
|
maxlength: 20,
|
||||||
showWordLimit: true,
|
showWordLimit: true,
|
||||||
@@ -49,22 +63,18 @@ export const option = createCrudOption([
|
|||||||
label: '一级货物类型',
|
label: '一级货物类型',
|
||||||
prop: 'firstCargoTypeName',
|
prop: 'firstCargoTypeName',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
|
order: 60,
|
||||||
|
span: 12,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
|
rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '一级货物类型编码',
|
|
||||||
prop: 'firstCargoTypeCode',
|
|
||||||
hide: true,
|
|
||||||
display: false,
|
|
||||||
addDisplay: false,
|
|
||||||
editDisabled: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: '二级货物类型',
|
label: '二级货物类型',
|
||||||
prop: 'secondCargoTypeName',
|
prop: 'secondCargoTypeName',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
|
order: 59,
|
||||||
|
span: 12,
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
|
rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
|
||||||
@@ -75,9 +85,132 @@ export const option = createCrudOption([
|
|||||||
display: false,
|
display: false,
|
||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisabled: true,
|
editDisabled: true,
|
||||||
minWidth: 180,
|
minWidth: 160,
|
||||||
},
|
},
|
||||||
// 搜索字段与表格、表单字段独立,避免筛选配置影响数据展示和编辑布局。
|
{
|
||||||
|
label: '包装',
|
||||||
|
prop: 'packageType',
|
||||||
|
type: 'select',
|
||||||
|
dicData: packageOptions,
|
||||||
|
order: 39,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '品牌',
|
||||||
|
prop: 'brand',
|
||||||
|
search: false,
|
||||||
|
order: 40,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 120,
|
||||||
|
placeholder: '请输入',
|
||||||
|
rules: textRule('品牌', 50),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '规格',
|
||||||
|
prop: 'specification',
|
||||||
|
order: 29,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 120,
|
||||||
|
placeholder: '请输入',
|
||||||
|
rules: textRule('规格', 50),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '型号',
|
||||||
|
prop: 'model',
|
||||||
|
order: 19,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 120,
|
||||||
|
placeholder: '请输入',
|
||||||
|
rules: textRule('型号', 50, true),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '单价',
|
||||||
|
prop: 'cargoValue',
|
||||||
|
formslot: true,
|
||||||
|
order: 30,
|
||||||
|
formatter: row => formatCargoValue(row.cargoValue),
|
||||||
|
minWidth: 120,
|
||||||
|
rules: [
|
||||||
|
{
|
||||||
|
validator: (rule, value, callback) => {
|
||||||
|
if (value === undefined || value === null || value === '') {
|
||||||
|
callback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!/^\d+(\.\d{1,2})?$/.test(String(value))) {
|
||||||
|
callback(new Error('单价只能输入数字,最多保留2位小数'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
callback();
|
||||||
|
},
|
||||||
|
trigger: 'blur',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '计价单位',
|
||||||
|
prop: 'priceUnit',
|
||||||
|
type: 'select',
|
||||||
|
dicData: [],
|
||||||
|
display: false,
|
||||||
|
minWidth: 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '尺寸',
|
||||||
|
prop: 'sizeText',
|
||||||
|
minWidth: 120,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
rules: textRule('尺寸', 100),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '说明',
|
||||||
|
prop: 'descriptionOne',
|
||||||
|
order: 20,
|
||||||
|
span: 12,
|
||||||
|
minWidth: 160,
|
||||||
|
placeholder: '请输入',
|
||||||
|
rules: textRule('说明', 100),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '备注',
|
||||||
|
prop: 'remark',
|
||||||
|
type: 'textarea',
|
||||||
|
order: 10,
|
||||||
|
minRows: 2,
|
||||||
|
span: 24,
|
||||||
|
maxlength: 200,
|
||||||
|
showWordLimit: true,
|
||||||
|
placeholder: '请输入',
|
||||||
|
rules: textRule('备注', 200),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '组织',
|
||||||
|
prop: 'deptName',
|
||||||
|
minWidth: 150,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
...auditColumns
|
||||||
|
.filter(column => ['createUserName', 'createTime', 'updateTime'].includes(column.prop))
|
||||||
|
.sort(
|
||||||
|
(first, second) =>
|
||||||
|
['createUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
|
||||||
|
['createUserName', 'createTime', 'updateTime'].indexOf(second.prop)
|
||||||
|
),
|
||||||
|
|
||||||
|
// ---------- 表单隐藏字段 ----------
|
||||||
|
{
|
||||||
|
label: '一级货物类型编码',
|
||||||
|
prop: 'firstCargoTypeCode',
|
||||||
|
hide: true,
|
||||||
|
display: false,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisabled: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
// ---------- 搜索字段(与表格、表单独立) ----------
|
||||||
{
|
{
|
||||||
label: '货物名称',
|
label: '货物名称',
|
||||||
prop: 'searchCargoName',
|
prop: 'searchCargoName',
|
||||||
@@ -169,113 +302,6 @@ export const option = createCrudOption([
|
|||||||
editDisplay: false,
|
editDisplay: false,
|
||||||
viewDisplay: false,
|
viewDisplay: false,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '包装',
|
|
||||||
prop: 'packageType',
|
|
||||||
type: 'select',
|
|
||||||
dicData: packageOptions,
|
|
||||||
minWidth: 100,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '品牌',
|
|
||||||
prop: 'brand',
|
|
||||||
search: false,
|
|
||||||
minWidth: 120,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('品牌', 50),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '规格',
|
|
||||||
prop: 'specification',
|
|
||||||
minWidth: 120,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('规格', 50),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '型号',
|
|
||||||
prop: 'model',
|
|
||||||
minWidth: 120,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('型号', 50),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '单价',
|
|
||||||
prop: 'cargoValue',
|
|
||||||
formslot: true,
|
|
||||||
formatter: row => (String(row.cargoValue) === '-1' ? '' : row.cargoValue),
|
|
||||||
minWidth: 120,
|
|
||||||
rules: [
|
|
||||||
{
|
|
||||||
validator: (rule, value, callback) => {
|
|
||||||
if (value === undefined || value === null || value === '') {
|
|
||||||
callback();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!/^\d+(\.\d{1,2})?$/.test(String(value))) {
|
|
||||||
callback(new Error('货值只能输入数字,最多保留2位小数'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
callback();
|
|
||||||
},
|
|
||||||
trigger: 'blur',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '计价单位',
|
|
||||||
prop: 'priceUnit',
|
|
||||||
type: 'select',
|
|
||||||
dicData: priceUnitOptions,
|
|
||||||
display: false,
|
|
||||||
minWidth: 120,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '尺寸',
|
|
||||||
prop: 'sizeText',
|
|
||||||
minWidth: 120,
|
|
||||||
addDisplay: false,
|
|
||||||
editDisplay: false,
|
|
||||||
rules: textRule('尺寸', 100),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '其他说明1',
|
|
||||||
prop: 'descriptionOne',
|
|
||||||
minWidth: 160,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('其他说明1', 100),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '其他说明2',
|
|
||||||
prop: 'descriptionTwo',
|
|
||||||
minWidth: 160,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('其他说明2', 100),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '备注',
|
|
||||||
prop: 'remark',
|
|
||||||
type: 'textarea',
|
|
||||||
minRows: 2,
|
|
||||||
span: 24,
|
|
||||||
maxlength: 200,
|
|
||||||
showWordLimit: true,
|
|
||||||
placeholder: '请输入',
|
|
||||||
rules: textRule('备注', 200),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '组织',
|
|
||||||
prop: 'deptName',
|
|
||||||
minWidth: 150,
|
|
||||||
addDisplay: false,
|
|
||||||
editDisplay: false,
|
|
||||||
},
|
|
||||||
...auditColumns
|
|
||||||
.filter(column => ['updateTime', 'createTime'].includes(column.prop))
|
|
||||||
.sort(
|
|
||||||
(first, second) =>
|
|
||||||
['updateTime', 'createTime'].indexOf(first.prop) -
|
|
||||||
['updateTime', 'createTime'].indexOf(second.prop)
|
|
||||||
),
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// 搜索栏标签统一加宽,给较长的货物类型字段预留足够展示空间。
|
// 搜索栏标签统一加宽,给较长的货物类型字段预留足够展示空间。
|
||||||
|
|||||||
@@ -281,14 +281,13 @@ export const option = {
|
|||||||
filterable: true,
|
filterable: true,
|
||||||
},
|
},
|
||||||
...auditColumns
|
...auditColumns
|
||||||
.filter(column => column.prop !== 'createUserName')
|
|
||||||
.map(column =>
|
.map(column =>
|
||||||
['createTime', 'updateTime'].includes(column.prop) ? { ...column, minWidth: 190 } : column
|
['createTime', 'updateTime'].includes(column.prop) ? { ...column, minWidth: 190 } : column
|
||||||
)
|
)
|
||||||
.sort(
|
.sort(
|
||||||
(first, second) =>
|
(first, second) =>
|
||||||
['updateUserName', 'updateTime', 'createTime'].indexOf(first.prop) -
|
['createUserName', 'updateUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
|
||||||
['updateUserName', 'updateTime', 'createTime'].indexOf(second.prop)
|
['createUserName', 'updateUserName', 'createTime', 'updateTime'].indexOf(second.prop)
|
||||||
),
|
),
|
||||||
]),
|
]),
|
||||||
dialogCustomClass: 'avue-dialog--common-route',
|
dialogCustomClass: 'avue-dialog--common-route',
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
export const transportTypeOptions = [
|
export const transportTypeOptions = [
|
||||||
{ label: '公路运输', value: '公路运输' },
|
{ label: '公路运输', value: '公路运输' },
|
||||||
{ label: '铁路运输', value: '铁路运输' },
|
{ label: '铁路运输', value: '铁路运输' },
|
||||||
{ label: '水路运输', value: '水路运输' },
|
{ label: '水路运输', value: '水路运输' },
|
||||||
@@ -41,7 +41,8 @@ export const planStatusOptions = [
|
|||||||
export const waybillStatusOptions = [
|
export const waybillStatusOptions = [
|
||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
{ label: '待执行', value: 'pending' },
|
{ label: '待执行', value: 'pending' },
|
||||||
{ label: '进行中', value: 'processing' },
|
{ label: '进行中', value: 'running' },
|
||||||
|
{ label: '待回单确认', value: 'pending_return_confirm' },
|
||||||
{ label: '已完成', value: 'completed' },
|
{ label: '已完成', value: 'completed' },
|
||||||
{ label: '已取消', value: 'cancelled' },
|
{ label: '已取消', value: 'cancelled' },
|
||||||
];
|
];
|
||||||
@@ -49,7 +50,6 @@ export const waybillStatusOptions = [
|
|||||||
export const dataSourceOptions = [
|
export const dataSourceOptions = [
|
||||||
{ label: '手工创建', value: '手工创建' },
|
{ label: '手工创建', value: '手工创建' },
|
||||||
{ label: '批量导入', value: '批量导入' },
|
{ label: '批量导入', value: '批量导入' },
|
||||||
{ label: '模板生成', value: '模板生成' },
|
|
||||||
{ label: '计划调度', value: '计划调度' },
|
{ label: '计划调度', value: '计划调度' },
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -98,6 +98,11 @@ export const businessTypeOptions = [
|
|||||||
{ label: '普通业务', value: '普通业务' },
|
{ label: '普通业务', value: '普通业务' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const businessModeOptions = [
|
||||||
|
{ label: '国内运输', value: '国内运输' },
|
||||||
|
{ label: '跨境运输', value: '跨境运输' },
|
||||||
|
];
|
||||||
|
|
||||||
export const settlementModeOptions = [
|
export const settlementModeOptions = [
|
||||||
{ label: '先票后款', value: '先票后款' },
|
{ label: '先票后款', value: '先票后款' },
|
||||||
{ label: '先款后票', value: '先款后票' },
|
{ label: '先款后票', value: '先款后票' },
|
||||||
@@ -113,6 +118,7 @@ export const contractCategoryOptions = [
|
|||||||
export const signTypeOptions = [
|
export const signTypeOptions = [
|
||||||
{ label: '新签', value: '新签' },
|
{ label: '新签', value: '新签' },
|
||||||
{ label: '续签', value: '续签' },
|
{ label: '续签', value: '续签' },
|
||||||
|
{ label: '补充协议', value: '补充协议' },
|
||||||
];
|
];
|
||||||
|
|
||||||
export const contractStageOptions = [
|
export const contractStageOptions = [
|
||||||
@@ -126,12 +132,29 @@ export const contractApprovalStatusOptions = [
|
|||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
{ label: '审批中', value: 'reviewing' },
|
{ label: '审批中', value: 'reviewing' },
|
||||||
{ label: '已驳回', value: 'rejected' },
|
{ label: '已驳回', value: 'rejected' },
|
||||||
|
{ label: '已撤回', value: 'withdrawn' },
|
||||||
{ label: '审批通过', value: 'approved' },
|
{ label: '审批通过', value: 'approved' },
|
||||||
{ label: '变更审批中', value: 'change_reviewing' },
|
{ label: '变更审批中', value: 'change_reviewing' },
|
||||||
{ label: '变更驳回', value: 'change_rejected' },
|
{ label: '变更驳回', value: 'change_rejected' },
|
||||||
{ label: '变更审批通过', value: 'change_approved' },
|
{ label: '变更审批通过', value: 'change_approved' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const contractArchiveStatusOptions = [
|
||||||
|
{ label: '未归档', value: '未归档' },
|
||||||
|
{ label: '已归档', value: '已归档' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const hcsSyncStatusOptions = [
|
||||||
|
{ label: '待推送', value: 'unsynced' },
|
||||||
|
{ label: '已推送', value: 'synced' },
|
||||||
|
{ label: '推送失败', value: 'failed' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const yesNoOptions = [
|
||||||
|
{ label: '是', value: true },
|
||||||
|
{ label: '否', value: false },
|
||||||
|
];
|
||||||
|
|
||||||
export const nodeOptions = [
|
export const nodeOptions = [
|
||||||
{ label: '接单', value: '接单' },
|
{ label: '接单', value: '接单' },
|
||||||
{ label: '到场', value: '到场' },
|
{ label: '到场', value: '到场' },
|
||||||
@@ -170,6 +193,32 @@ export const nonNegativeRule = label => ({
|
|||||||
trigger: 'blur',
|
trigger: 'blur',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 日期必须晚于当前日期(当天不可选):选择后立即校验,trigger 固定为 change
|
||||||
|
// 取值支持 YYYY-MM-DD / YYYY-MM-DD HH:mm:ss / 时间戳
|
||||||
|
export const futureDateRule = label => ({
|
||||||
|
validator: (rule, value, callback) => {
|
||||||
|
if (value === undefined || value === null || value === '') {
|
||||||
|
callback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const raw = String(value).trim().replace(/-/g, '/');
|
||||||
|
const selected = new Date(raw);
|
||||||
|
if (Number.isNaN(selected.getTime())) {
|
||||||
|
callback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const today = new Date();
|
||||||
|
today.setHours(0, 0, 0, 0);
|
||||||
|
selected.setHours(0, 0, 0, 0);
|
||||||
|
if (selected.getTime() <= today.getTime()) {
|
||||||
|
callback(new Error(`${label}必须晚于当前日期`));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
callback();
|
||||||
|
},
|
||||||
|
trigger: ['change', 'blur'],
|
||||||
|
});
|
||||||
|
|
||||||
export const phoneRule = label => ({
|
export const phoneRule = label => ({
|
||||||
pattern: /^1[3-9]\d{9}$/,
|
pattern: /^1[3-9]\d{9}$/,
|
||||||
message: `${label}格式不正确`,
|
message: `${label}格式不正确`,
|
||||||
|
|||||||
@@ -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,
|
||||||
|
},
|
||||||
|
]);
|
||||||
@@ -1,13 +1,17 @@
|
|||||||
import {
|
import {
|
||||||
auditColumns,
|
auditColumns,
|
||||||
contractApprovalStatusOptions,
|
contractApprovalStatusOptions,
|
||||||
|
contractArchiveStatusOptions,
|
||||||
contractCategoryOptions,
|
contractCategoryOptions,
|
||||||
contractStageOptions,
|
contractStageOptions,
|
||||||
createCrudOption,
|
createCrudOption,
|
||||||
effectiveTypeOptions,
|
effectiveTypeOptions,
|
||||||
|
nonNegativeRule,
|
||||||
|
hcsSyncStatusOptions,
|
||||||
selectRule,
|
selectRule,
|
||||||
signTypeOptions,
|
signTypeOptions,
|
||||||
textRule,
|
textRule,
|
||||||
|
yesNoOptions,
|
||||||
} from './common';
|
} from './common';
|
||||||
|
|
||||||
const contractSettlementModeOptions = [
|
const contractSettlementModeOptions = [
|
||||||
@@ -27,6 +31,12 @@ const listDicFormatter = res => {
|
|||||||
return [];
|
return [];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const projectNameDicFormatter = res => {
|
||||||
|
const list = listDicFormatter(res);
|
||||||
|
// 过滤掉 projectName 为空的记录
|
||||||
|
return list.filter(item => item && item.projectName && String(item.projectName).trim());
|
||||||
|
};
|
||||||
|
|
||||||
export const config = {
|
export const config = {
|
||||||
title: '合同管理',
|
title: '合同管理',
|
||||||
permission: 'contract_manage',
|
permission: 'contract_manage',
|
||||||
@@ -42,7 +52,7 @@ export const config = {
|
|||||||
batchDelete: false,
|
batchDelete: false,
|
||||||
enableProjectSelect: true,
|
enableProjectSelect: true,
|
||||||
projectQueryParams: {
|
projectQueryParams: {
|
||||||
approvalStatuses: 'approved,change_approved',
|
contractSelectable: true,
|
||||||
},
|
},
|
||||||
actions: ['copy'],
|
actions: ['copy'],
|
||||||
statusProp: 'approvalStatus',
|
statusProp: 'approvalStatus',
|
||||||
@@ -54,18 +64,26 @@ export const config = {
|
|||||||
['contractNo', '合同编号'],
|
['contractNo', '合同编号'],
|
||||||
['contractName', '合同名称'],
|
['contractName', '合同名称'],
|
||||||
['projectName', '所属项目'],
|
['projectName', '所属项目'],
|
||||||
['organizationName', '所属组织'],
|
['organizationName', '合同负责部门'],
|
||||||
|
['platformCompanyName', '平台公司'],
|
||||||
['contractCategory', '合同类别'],
|
['contractCategory', '合同类别'],
|
||||||
['signType', '签约类型'],
|
['signType', '签约类型'],
|
||||||
['partyA', '甲方'],
|
['partyA', '甲方'],
|
||||||
['partyB', '乙方'],
|
['partyB', '乙方'],
|
||||||
|
['partyC', '丙方'],
|
||||||
['handlerUserName', '经办人'],
|
['handlerUserName', '经办人'],
|
||||||
['signDate', '签订日期'],
|
['signDate', '签订日期'],
|
||||||
|
['applyDate', '申请日期'],
|
||||||
['contractFormat', '合同格式'],
|
['contractFormat', '合同格式'],
|
||||||
['legalSealFlag', '是否需要加盖法人章'],
|
['legalSealFlag', '是否需要加盖法人章'],
|
||||||
['copyCount', '一式(份)'],
|
['copyCount', '一式(份)'],
|
||||||
['paymentDays', '回款账期(天)'],
|
['paymentDays', '回款账期(天)'],
|
||||||
['remark', '备注', 2],
|
['contractAmount', '合同金额'],
|
||||||
|
['templateFlag', '是否范本'],
|
||||||
|
['originalContractNo', '原件合同编号'],
|
||||||
|
['electronicSealFlag', '是否电子章'],
|
||||||
|
['mainContent', '合同主要内容', 2],
|
||||||
|
['remark', '其他事项说明', 2],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -78,6 +96,7 @@ export const config = {
|
|||||||
['effectiveType', '生效类型'],
|
['effectiveType', '生效类型'],
|
||||||
['contractStage', '合同阶段'],
|
['contractStage', '合同阶段'],
|
||||||
['approvalStatus', '审核状态'],
|
['approvalStatus', '审核状态'],
|
||||||
|
['archiveStatus', '归档状态'],
|
||||||
['currentNode', '当前节点'],
|
['currentNode', '当前节点'],
|
||||||
['currentProcessor', '当前处理人'],
|
['currentProcessor', '当前处理人'],
|
||||||
],
|
],
|
||||||
@@ -98,11 +117,11 @@ export const config = {
|
|||||||
},
|
},
|
||||||
deleteStatus: ['draft'],
|
deleteStatus: ['draft'],
|
||||||
deleteStage: ['draft'],
|
deleteStage: ['draft'],
|
||||||
editStatus: ['draft', 'rejected', 'change_rejected'],
|
editStatus: ['draft', 'withdrawn', 'rejected', 'change_rejected'],
|
||||||
operations: [
|
operations: [
|
||||||
{
|
{
|
||||||
action: 'flow',
|
action: 'flow',
|
||||||
label: '查看流程',
|
label: '流程',
|
||||||
statusProp: 'approvalStatus',
|
statusProp: 'approvalStatus',
|
||||||
status: ['reviewing', 'change_reviewing'],
|
status: ['reviewing', 'change_reviewing'],
|
||||||
stage: ['temporary', 'formal'],
|
stage: ['temporary', 'formal'],
|
||||||
@@ -148,6 +167,16 @@ export const config = {
|
|||||||
stage: ['formal'],
|
stage: ['formal'],
|
||||||
permission: 'contract_manage_reject',
|
permission: 'contract_manage_reject',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
action: 'submitFormal',
|
||||||
|
label: '转正式合同',
|
||||||
|
statusProp: 'approvalStatus',
|
||||||
|
status: ['approved'],
|
||||||
|
stage: ['temporary'],
|
||||||
|
permission: 'contract_manage_formal',
|
||||||
|
confirmMessage: '确定将该临时合同提交正式合同审批吗?',
|
||||||
|
successMessage: '已提交正式合同审批',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
action: 'submitFormal',
|
action: 'submitFormal',
|
||||||
label: '重新提交转正',
|
label: '重新提交转正',
|
||||||
@@ -184,10 +213,10 @@ export const config = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: 'flow',
|
action: 'flow',
|
||||||
label: '查看流程',
|
label: '流程',
|
||||||
statusProp: 'approvalStatus',
|
statusProp: 'approvalStatus',
|
||||||
status: ['approved', 'change_approved'],
|
status: ['approved', 'change_approved'],
|
||||||
stage: ['formal', 'terminated'],
|
stage: ['temporary', 'formal', 'terminated'],
|
||||||
permission: 'contract_manage_view',
|
permission: 'contract_manage_view',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -220,15 +249,26 @@ export const option = createCrudOption([
|
|||||||
hide: true,
|
hide: true,
|
||||||
labelWidth: 0,
|
labelWidth: 0,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '客商',
|
||||||
|
prop: 'partyName',
|
||||||
|
search: true,
|
||||||
|
searchOrder: 14,
|
||||||
|
searchPlaceholder: '请输入甲/乙方名称',
|
||||||
|
hide: true,
|
||||||
|
display: false,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '合同编号',
|
label: '合同编号',
|
||||||
prop: 'contractNo',
|
prop: 'contractNo',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 6,
|
searchOrder: 8,
|
||||||
searchPlaceholder: '请输入',
|
searchPlaceholder: '请输入',
|
||||||
order: 185,
|
order: 185,
|
||||||
disabled: true,
|
maxlength: 100,
|
||||||
placeholder: '不填写,则系统自动生成',
|
placeholder: '不填写则按部门规则自动生成',
|
||||||
minWidth: 200,
|
minWidth: 200,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -237,10 +277,11 @@ export const option = createCrudOption([
|
|||||||
align: 'left',
|
align: 'left',
|
||||||
headerAlign: 'left',
|
headerAlign: 'left',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 7,
|
searchOrder: 1,
|
||||||
searchPlaceholder: '请输入',
|
searchPlaceholder: '请输入',
|
||||||
order: 180,
|
order: 180,
|
||||||
slot: true,
|
slot: true,
|
||||||
|
overHidden: true,
|
||||||
minWidth: 240,
|
minWidth: 240,
|
||||||
rules: textRule('合同名称', 100, true),
|
rules: textRule('合同名称', 100, true),
|
||||||
},
|
},
|
||||||
@@ -248,14 +289,14 @@ export const option = createCrudOption([
|
|||||||
label: '所属项目',
|
label: '所属项目',
|
||||||
prop: 'projectName',
|
prop: 'projectName',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 8,
|
searchOrder: 11,
|
||||||
searchType: 'select',
|
searchType: 'select',
|
||||||
searchPlaceholder: '请选择',
|
searchPlaceholder: '请选择',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
order: 165,
|
order: 165,
|
||||||
dicUrl:
|
dicUrl:
|
||||||
'/blade-transport/project-apply/list?current=1&size=9999&approvalStatuses=approved,change_approved',
|
'/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
|
||||||
dicFormatter: listDicFormatter,
|
dicFormatter: projectNameDicFormatter,
|
||||||
props: {
|
props: {
|
||||||
label: 'projectName',
|
label: 'projectName',
|
||||||
value: 'projectName',
|
value: 'projectName',
|
||||||
@@ -271,33 +312,31 @@ export const option = createCrudOption([
|
|||||||
display: false,
|
display: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '所属组织',
|
label: '合同负责部门',
|
||||||
prop: 'organizationName',
|
prop: 'organizationName',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 3,
|
searchOrder: 3,
|
||||||
searchType: 'cascader',
|
searchslot: true,
|
||||||
searchPlaceholder: '全部',
|
searchPlaceholder: '请选择 合同负责部门',
|
||||||
formslot: true,
|
formslot: true,
|
||||||
order: 120,
|
order: 120,
|
||||||
dicData: [],
|
dicData: [],
|
||||||
props: {
|
|
||||||
label: 'label',
|
|
||||||
value: 'id',
|
|
||||||
children: 'children',
|
|
||||||
},
|
|
||||||
checkStrictly: true,
|
|
||||||
emitPath: false,
|
|
||||||
showAllLevels: false,
|
|
||||||
filterable: true,
|
|
||||||
minWidth: 150,
|
minWidth: 150,
|
||||||
rules: selectRule('所属组织'),
|
rules: selectRule('合同负责部门'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '平台公司',
|
||||||
|
prop: 'platformCompanyName',
|
||||||
|
minWidth: 180,
|
||||||
|
order: 115,
|
||||||
|
display: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '合同类别',
|
label: '合同类别',
|
||||||
prop: 'contractCategory',
|
prop: 'contractCategory',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 9,
|
searchOrder: 12,
|
||||||
searchPlaceholder: '请选择',
|
searchPlaceholder: '请选择',
|
||||||
order: 170,
|
order: 170,
|
||||||
dicData: contractCategoryOptions,
|
dicData: contractCategoryOptions,
|
||||||
@@ -308,7 +347,9 @@ export const option = createCrudOption([
|
|||||||
label: '签约类型',
|
label: '签约类型',
|
||||||
prop: 'signType',
|
prop: 'signType',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
search: false,
|
search: true,
|
||||||
|
searchOrder: 13,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
span: 8,
|
span: 8,
|
||||||
order: 190,
|
order: 190,
|
||||||
dicData: signTypeOptions,
|
dicData: signTypeOptions,
|
||||||
@@ -316,11 +357,11 @@ export const option = createCrudOption([
|
|||||||
rules: selectRule('签约类型'),
|
rules: selectRule('签约类型'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '生效类型',
|
label: '合同状态',
|
||||||
prop: 'effectiveType',
|
prop: 'effectiveType',
|
||||||
type: 'select',
|
type: 'select',
|
||||||
search: true,
|
search: true,
|
||||||
searchOrder: 5,
|
searchOrder: 6,
|
||||||
searchPlaceholder: '请选择',
|
searchPlaceholder: '请选择',
|
||||||
dicData: effectiveTypeOptions,
|
dicData: effectiveTypeOptions,
|
||||||
hide: true,
|
hide: true,
|
||||||
@@ -329,24 +370,23 @@ export const option = createCrudOption([
|
|||||||
{
|
{
|
||||||
label: '甲方',
|
label: '甲方',
|
||||||
prop: 'partyA',
|
prop: 'partyA',
|
||||||
type: 'select',
|
|
||||||
formslot: true,
|
|
||||||
disabled: true,
|
|
||||||
order: 160,
|
|
||||||
filterable: true,
|
|
||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
rules: selectRule('甲方'),
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '乙方',
|
label: '乙方',
|
||||||
prop: 'partyB',
|
prop: 'partyB',
|
||||||
type: 'select',
|
|
||||||
formslot: true,
|
|
||||||
disabled: true,
|
|
||||||
order: 150,
|
|
||||||
filterable: true,
|
|
||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
rules: selectRule('乙方'),
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '丙方',
|
||||||
|
prop: 'partyC',
|
||||||
|
minWidth: 160,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '合同期限',
|
label: '合同期限',
|
||||||
@@ -419,6 +459,17 @@ export const option = createCrudOption([
|
|||||||
minWidth: 130,
|
minWidth: 130,
|
||||||
rules: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
|
rules: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '申请日期',
|
||||||
|
prop: 'applyDate',
|
||||||
|
type: 'date',
|
||||||
|
format: 'YYYY-MM-DD',
|
||||||
|
valueFormat: 'YYYY-MM-DD',
|
||||||
|
sortable: true,
|
||||||
|
minWidth: 130,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '结算类型',
|
label: '结算类型',
|
||||||
prop: 'settlementMode',
|
prop: 'settlementMode',
|
||||||
@@ -452,11 +503,10 @@ export const option = createCrudOption([
|
|||||||
{ label: '否', value: 0 },
|
{ label: '否', value: 0 },
|
||||||
{ label: '是', value: 1 },
|
{ label: '是', value: 1 },
|
||||||
],
|
],
|
||||||
value: 0,
|
clearable: true,
|
||||||
hide: true,
|
hide: true,
|
||||||
order: 70,
|
order: 70,
|
||||||
minWidth: 100,
|
minWidth: 100,
|
||||||
rules: selectRule('是否需要加盖法人章'),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '一式(份)',
|
label: '一式(份)',
|
||||||
@@ -475,6 +525,58 @@ export const option = createCrudOption([
|
|||||||
order: 50,
|
order: 50,
|
||||||
minWidth: 130,
|
minWidth: 130,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '合同金额',
|
||||||
|
prop: 'contractAmount',
|
||||||
|
type: 'number',
|
||||||
|
min: 0,
|
||||||
|
precision: 2,
|
||||||
|
hide: true,
|
||||||
|
order: 45,
|
||||||
|
minWidth: 130,
|
||||||
|
rules: [
|
||||||
|
{ required: true, message: '请输入合同金额', trigger: 'blur' },
|
||||||
|
nonNegativeRule('合同金额'),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '是否范本',
|
||||||
|
prop: 'templateFlag',
|
||||||
|
type: 'select',
|
||||||
|
dicData: [
|
||||||
|
{ label: '否', value: 0 },
|
||||||
|
{ label: '是', value: 1 },
|
||||||
|
],
|
||||||
|
hide: true,
|
||||||
|
order: 40,
|
||||||
|
minWidth: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '原件合同编号',
|
||||||
|
prop: 'originalContractNo',
|
||||||
|
hide: true,
|
||||||
|
order: 35,
|
||||||
|
minWidth: 160,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '是否电子章',
|
||||||
|
prop: 'electronicSealFlag',
|
||||||
|
type: 'select',
|
||||||
|
dicData: [
|
||||||
|
{ label: '否', value: 0 },
|
||||||
|
{ label: '是', value: 1 },
|
||||||
|
],
|
||||||
|
hide: true,
|
||||||
|
order: 30,
|
||||||
|
minWidth: 110,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '创建人',
|
||||||
|
prop: 'createUserName',
|
||||||
|
minWidth: 120,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '创建时间',
|
label: '创建时间',
|
||||||
prop: 'createTime',
|
prop: 'createTime',
|
||||||
@@ -512,6 +614,72 @@ export const option = createCrudOption([
|
|||||||
addDisplay: false,
|
addDisplay: false,
|
||||||
editDisplay: false,
|
editDisplay: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '归档状态',
|
||||||
|
prop: 'archiveStatus',
|
||||||
|
type: 'select',
|
||||||
|
search: true,
|
||||||
|
searchOrder: 5,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
|
slot: true,
|
||||||
|
dicData: contractArchiveStatusOptions,
|
||||||
|
minWidth: 110,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '合规状态',
|
||||||
|
prop: 'hcsSyncStatus',
|
||||||
|
type: 'select',
|
||||||
|
search: true,
|
||||||
|
searchOrder: 7,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
|
slot: true,
|
||||||
|
dicData: hcsSyncStatusOptions,
|
||||||
|
minWidth: 110,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '客商风险',
|
||||||
|
prop: 'customerRisk',
|
||||||
|
slot: true,
|
||||||
|
order: 189,
|
||||||
|
minWidth: 150,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '金蝶合同ID',
|
||||||
|
prop: 'kingdeeId',
|
||||||
|
minWidth: 130,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '是否同步金蝶',
|
||||||
|
prop: 'kingdeeSynced',
|
||||||
|
type: 'select',
|
||||||
|
search: true,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
|
searchOrder: 9,
|
||||||
|
dicData: yesNoOptions,
|
||||||
|
hide: true,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '是否同步合规',
|
||||||
|
prop: 'hcsSynced',
|
||||||
|
type: 'select',
|
||||||
|
search: true,
|
||||||
|
searchPlaceholder: '请选择',
|
||||||
|
searchOrder: 10,
|
||||||
|
dicData: yesNoOptions,
|
||||||
|
hide: true,
|
||||||
|
addDisplay: false,
|
||||||
|
editDisplay: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '当前节点',
|
label: '当前节点',
|
||||||
prop: 'currentNode',
|
prop: 'currentNode',
|
||||||
@@ -540,7 +708,19 @@ export const option = createCrudOption([
|
|||||||
minWidth: 110,
|
minWidth: 110,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '备注',
|
label: '合同主要内容',
|
||||||
|
prop: 'mainContent',
|
||||||
|
type: 'textarea',
|
||||||
|
span: 24,
|
||||||
|
minRows: 4,
|
||||||
|
hide: true,
|
||||||
|
order: 41,
|
||||||
|
maxlength: 1000,
|
||||||
|
showWordLimit: true,
|
||||||
|
rules: textRule('合同主要内容', 1000),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '其他事项说明',
|
||||||
prop: 'remark',
|
prop: 'remark',
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
span: 24,
|
span: 24,
|
||||||
@@ -549,7 +729,7 @@ export const option = createCrudOption([
|
|||||||
order: 40,
|
order: 40,
|
||||||
maxlength: 2000,
|
maxlength: 2000,
|
||||||
showWordLimit: true,
|
showWordLimit: true,
|
||||||
rules: textRule('备注', 2000),
|
rules: textRule('其他事项说明', 2000),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '',
|
label: '',
|
||||||
@@ -660,7 +840,7 @@ export const option = createCrudOption([
|
|||||||
labelWidth: 0,
|
labelWidth: 0,
|
||||||
},
|
},
|
||||||
...auditColumns
|
...auditColumns
|
||||||
.filter(column => column.prop !== 'createTime')
|
.filter(column => !['createTime', 'createUserName'].includes(column.prop))
|
||||||
.map(column => ({ ...column, hide: true })),
|
.map(column => ({ ...column, hide: true })),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||