b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity
743 Commits 24 Branches 0 Tags
1663b2d9106f78e162df791ad517f59e195fa96c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
b2894lxlxandCursor 1663b2d910 ✨ 结算单用印类型、合同甲乙丙列表与项目调整材料 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-09 22:53:55 +08:00
b2894lxlxandCursor 748214a4b6 🐛 业务部门下拉展示所属公司，并映射项目旧平台公司ID 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-09 12:44:44 +08:00
b2894lxlx d3ba0ce38b Merge remote-tracking branch 'websoft/dev' 2026-11-06 09:36:51 +08:00
b2894lxlxandCursor f5be5245d6 ✨ 角色管理列表接入分页 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-06 09:32:50 +08:00
b2894lxlxandCursor baf54efb7b 🐛 修复评分-1空值、结算单号跳转与小程序用户数据权限组织选择 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-06 09:32:36 +08:00
b2894lxlxandCursor 7ff2b3fe28 ✨ 司机从业资格证改为调用专用识别接口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 15:09:16 +08:00
b2894lxlx 17d2766f82 Merge pull request '收票登记新增所属合同带出承办部门替代手选结算组织' (#13) from feature/20261104-bfi-project-web into master 
Reviewed-on: #13
 2026-11-05 15:04:42 +08:00
b2894lxlxandCursor 8f3da0e386 ✨ 预结算收款方与付款方改为下拉选择 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 23:47:00 +08:00
b2894lxlxandCursor d4ae6d521a ✨ 客商评分双模式与金蝶公司代码改回组织维护 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 23:46:20 +08:00
b2894lxlxandCursor fff0a29947 ✨ 业务部门配置支持维护金蝶公司代码 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 22:15:48 +08:00
b2894lxlx 64b61c9c29 Merge pull request '付款结算 / 收票登记 / 发票认领模块' (#12) from feature/20261103-bfi-warehouse-web into master 
Reviewed-on: #12
 2026-11-04 21:22:51 +08:00
b2894lxlx 9efae11811 ✨ 合并远程收款流水列表改造 2026-11-04 16:56:30 +08:00
b2894lxlxandCursor 9a04757a9e ✨ 合并正式结算单金蝶冲销状态列 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 16:55:57 +08:00
b2894lxlx e88a27d01f Merge pull request '收款流水列表改造' (#10) from feature/20261027-hcs-bif-all-web-recBillSync into master 
Reviewed-on: #10
 2026-11-04 16:45:48 +08:00
b2894lxlx b9c367e028 Merge pull request '金蝶单据状态着色并悬浮展示失败原因+认领流水认领记录的改造' (#9) from feature/20261027-hcs-bif-all-web into master 
Reviewed-on: #9
 2026-11-04 16:33:35 +08:00
b2894lxlxandCursor 014ee537a0 ✨ 组织编码/平台公司、合同计费客商角色与基础模块查看按钮 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 03:15:44 +08:00
b2894lxlxandCursor 5bde60d844 ✨ 编辑用户增加数据管理权限多选组织 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-04 03:14:45 +08:00
b2894lxlxandCursor c0ba9ba39b ✨ 计费/调度/结算支持多方客商与承运商区分 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 21:12:56 +08:00
b2894lxlxandCursor 8388a55481 ✨ 新增业务部门配置页并简化项目/合同部门选择 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 21:10:47 +08:00
b2894lxlxandCursor 8e1430491b ✨ 项目提交MK传projectType，并修复已撤回再提交 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 14:28:07 +08:00
b2894lxlxandCursor 9fed3785d9 ⚡ 流程配置取消默认按当前用户部门筛选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 13:32:06 +08:00
b2894lxlxandCursor eaf431819e ✨ 客商档案营业执照OCR改接新接口并回填字段 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-02 13:31:33 +08:00
b2894lxlxandCursor d95163663b ✨ immediate-enabled关闭时隐藏项目/合同推送合规入口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 16:34:45 +08:00
b2894lxlxandCursor 5ce91ec5d5 🐛 总单选址弹窗固定label宽度，并兼容运输类型非字符串 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 11:47:51 +08:00
b2894lxlxandCursor 8d85311bb3 ✨ 司机身份证OCR支持正反面识别并回填有效期 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 11:47:21 +08:00
b2894lxlxandCursor fe4255c59b 🐛 修复正式结算旧路径空白，按单号跳转付款/收款列表 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-30 11:40:32 +08:00
b2894lxlxandCursor 083d954765 🐛 放开本账号运单复制，并避免总单选地址时提前校验 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 22:44:01 +08:00
b2894lxlx 185a0f9aec Merge remote-tracking branch 'websoft/dev' 2026-10-29 14:05:12 +08:00
b2894lxlxandCursor a528788409 🐛 修复总单地址回填、结算费用英文项与项目部门提示 
常用地址级联回填不再误清空；预结算/正式结算过滤 freightJson 杂项；项目查看态业务部门/平台公司支持悬停完整信息。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-29 14:04:55 +08:00
b2894lxlx 7ba6620f06 Merge remote-tracking branch 'websoft/dev' 2026-10-27 18:38:25 +08:00
b2894lxlxandCursor 9a3652d767 🔧 构建完成后自动打包 dist.zip 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 18:34:11 +08:00
b2894lxlxandCursor 450505715a ✨ 新增合同变更菜单列表与MK审批对接 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 18:34:11 +08:00
b2894lxlxandCursor 2b51619728 ✨ 新增项目变更菜单列表与MK审批对接 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 16:45:38 +08:00
b2894lxlx 5f167aae50 Merge pull request '收票管理/开票管理/正式结算单/预结算单/结算调整通过按钮增加表格遮罩防重复点击' (#7) from feature/20261019-bfi-all-web into master 
Reviewed-on: #7
 2026-10-27 15:29:12 +08:00
b2894lxlx 74988c0b5e Merge pull request '项目+合同对接合同系统' (#8) from feature/hcs-api-p0-web into master 
Reviewed-on: #8
 2026-10-27 14:47:14 +08:00
b2894lxlxandCursor 4c117d87a5 ✨ 角色数据权限配置并移除用户侧数据权限 
角色权限弹窗支持按菜单批量设置数据范围；用户管理去掉组织/客商权限配置；角色别名改为角色标识。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-27 04:05:02 +08:00
b2894lxlx d6bcb12c20 Merge remote-tracking branch 'websoft/dev' 
# Conflicts:
#	src/views/transportCapacity/vehicle.vue
 2026-10-26 10:51:35 +08:00
b2894lxlxandCursor e1d87f5788 ✨ 结算汇率反算、开票合计填报、配载承运商交集与车辆组织悬停 
外币结算按本位币/汇率反算；开票改填合计金额并反算不含税单价；配载展示承运商合同并按乙方交集限选；评分加减分封顶15分；车辆所有组织/使用部门悬停显示完整路径。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-26 10:50:58 +08:00
b2894lxlxandCursor fa78a68df6 🐛 过程配置项目下拉兼容变更已通过状态 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 14:56:10 +08:00
b2894lxlxandCursor 320422856c 🔀 合并 websoft/dev，统一待回单确认与公路配载校验 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 14:55:04 +08:00
b2894lxlxandCursor 2a5eca8393 ✨ 评分减分累计与最高扣分、用户部门标签联动树，并修复对账导入与结算调整等 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 04:28:22 +08:00
b2894lxlxandCursor 8d9fe998c0 ✨ 进行中配载可编辑、汇票选择与收款方展示优化，并支持业务部门与待确认回单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 15:41:01 +08:00
b2894lxlxandCursor d7969c191a ✨ 客商档案表单重构，合同流水号-1列表显示为空 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 12:56:50 +08:00
b2894lxlxandCursor a657b9d0ef ✨ 小程序用户管理支持所属组织与数据权限配置 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 10:59:22 +08:00
b2894lxlxandCursor e7c76c803f ✨ 结算单业务模式运输方式与编辑体验优化 
预结算/收付款结算支持业务模式与运输方式展示导出；完善结算调整、对账导入与变更记录；组织合同初始流水号未填不再显示-1。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 16:42:02 +08:00
b2894lxlxandCursor 6a21b4ac8d ✨ 人员同步提示改为按工号入库并展示删除人数 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 15:36:34 +08:00
b2894lxlxandCursor 1c798046fd 🐛 修复收票付款与结算费用选择框长文本展示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 11:53:56 +08:00
b2894lxlxandCursor 8d25e186b1 ⚡ 调度剩余数量按本次填写联动，公路运输司机手机号必填 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 11:53:56 +08:00
b2894lxlxandCursor c1863d0b6a ✨ 再次点击组织取消人员筛选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 11:53:55 +08:00
b2894lxlxandCursor 4a0af452e8 ✨ 合同编号支持手工填写，组织可配置初始流水号 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 11:53:55 +08:00
b2894lxlxandCursor 5b435bef04 ✨ 导入运单支持未结算整批删除，结算导入运输方式取业务字典 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 14:43:52 +08:00
b2894lxlxandCursor 4c9bbf1eb7 🐛 修复预付驳回重提、预结算变更记录与收票多选结算单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 01:50:54 +08:00
b2894lxlxandCursor 31794bf26a 🐛 结算导入去掉模板结算金额依赖并取消编辑回算 
导入后按运输费与费用项自动合计结算金额，编辑费用项时不再覆盖结算金额。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 23:28:51 +08:00
b2894lxlxandCursor 0e57de5c71 🐛 修复收款流水继续认领预填与付款申请预结算引用提交 
部分认领打开时预填历史关联结算单，可认领上限按公告未认领与收款金额取小；付款申请提交前清理误存正式结算单引用。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 17:12:24 +08:00
b2894lxlxandCursor 5cb7eb16d5 ⚡ 修复运输计划/发货模板列表缓存不刷新，并优化结算导入查看与费用弹窗 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 16:56:03 +08:00
b2894lxlx ccaf944782 Merge pull request '结算调整单接入金蝶列表展示与冲销预检' (#6) from feature/20261016-settlement-adjustment-kingdee into master 
Reviewed-on: #6
 2026-10-19 15:00:17 +08:00
b2894lxlxandCursor aee661772b ✨ 完善付款申请多结算行、结算导入编辑与计费规则展示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-19 12:06:51 +08:00
b2894lxlxandCursor 1ac741f785 ✨ 完善导入结算单明细编辑、草稿刷新与历史运单选择 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-18 20:35:28 +08:00
b2894lxlxandCursor 6f2383a7e5 ✨ 结算付款体验优化与合同/运单导入校验 
付款申请汇票筛选与提示去重、结算菜单拆分与金蝶同步弹框、应收应付详情高度、合同计费与半月结调整，以及导入运单批量删除校验。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-18 05:12:26 +08:00
b2894lxlxandCursor 8db52ef168 🐛 修复变更审批通过后列表不显示再次变更入口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 17:03:26 +08:00
b2894lxlxandCursor 38ca250242 ✨ 项目变更可编辑业务部门/平台公司，组织名称列左对齐 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 17:01:27 +08:00
b2894lxlxandCursor f4542cd0b8 ⚡ 组织同步按公司刷新树并加宽组织名称列 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 16:22:39 +08:00
b2894lxlxandCursor d1e779bbcc ⚡ 优化组织全量同步流程，部门按公司轮询并去掉确认弹窗 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 15:35:20 +08:00
b2894lxlxandCursor acfbb4c54e 🐛 修复运输对账匹配日期格式与完成对账疑似重复误判 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 08:31:27 +08:00
b2894lxlx 96b675b3be Merge remote-tracking branch 'websoft/master' 2026-10-16 16:05:55 +08:00
b2894lxlxandCursor 6067d24e3b 🐛 修复列表二次搜索与结算导入回列表，并完善付款申请多结算单展示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 16:03:26 +08:00
b2894lxlx 4287133f84 Merge remote-tracking branch 'websoft/dev' 2026-10-16 11:48:10 +08:00
b2894lxlxandCursor 4b01316f64 ✨ 新增项目预付核销 UI，并修复常用线路新增不显示与付款提交后刷新 
结算单附件增加项目预付核销；常用线路超管默认查全部组织并按筛选归属新增；付款申请提交后关页并刷新列表；平台公司选项 ID 按字符串绑定。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 02:02:00 +08:00
b2894lxlx 0b170fe5c1 Merge remote-tracking branch 'websoft/master' 2026-10-16 00:57:59 +08:00
b2894lxlx 4f29b1e0eb Merge pull request '客商审核通过后推送金蝶失败原因以警告提示展示、以及 付款申请/开票申请/正式结算单列表展示金蝶解锁终态标识' (#4) from feature/bfi-api-rate into master 
Reviewed-on: #4
 2026-10-16 00:57:51 +08:00
b2894lxlx 6db599400e Merge remote-tracking branch 'websoft/master' 2026-10-16 00:57:19 +08:00
b2894lxlxandCursor c5a74acd00 ✨ 新增导入结算单页面，并优化 MK 开关缓存与客商同步入口 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 00:56:55 +08:00
b2894lxlxandCursor a19097d1be ✨ 组织同步文案与客商固定组织对齐白名单规则 
更新部门全量同步说明为 id=1 与二级公司白名单，客商所属组织改为广西现代物流集团有限公司。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-15 12:47:23 +08:00
b2894lxlx 5569f373c5 Merge pull request 'Tms对接金蝶接口-前端' (#3) from feature/bfi-api-rate into master 
Reviewed-on: #3
 2026-10-14 17:28:16 +08:00
b2894lxlxandCursor 74780b8777 ✨ 正式结算保存草稿与同步入口，项目申请平台公司多选等业务优化 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 12:59:27 +08:00
b2894lxlxandCursor 18aeb08c90 🐛 修复变更记录按提交批次汇总，临时额度-1显示为- 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 10:58:42 +08:00
b2894lxlxandCursor cdd30b8211 ✨ 机构同步编码校验对齐GWWL三位数字规则 
组织编码校验改为上级直拼三位数字；全量同步清除提示同步保留外部组织与集团锚点。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-14 10:45:01 +08:00
b2894lxlxandCursor 1181aea3b9 🐛 凭证分片遇 HTTP 预签名时回退服务端代传 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 20:44:17 +08:00
b2894lxlxandCursor 6296c8f6f4 ⚡ 配载货物信息分列数量单位，并修复车辆尺寸 -1 展示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 12:55:15 +08:00
b2894lxlxandCursor 6955784e93 ⚡ 优化表格工具栏、附件文件名展示与合同金额两位小数 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-13 12:44:40 +08:00
b2894lxlxandCursor bc7755a160 ✨ 小程序用户支持重置密码，列表隐藏 openid 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 14:47:28 +08:00
b2894lxlxandCursor dcaa3127a0 ✨ 新增小程序用户管理页，并加宽用户账号名展示 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 13:49:10 +08:00
b2894lxlxandCursor 959c1821c1 🐛 司机/车辆档案日期兼容 OCR 宽松格式 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-12 13:02:09 +08:00
b2894lxlx 2377a2e8d4 Merge remote-tracking branch 'websoft/dev' 2026-10-12 10:38:46 +08:00
b2894lxlxandCursor f455003014 ✨ 优化主数据地图回填与表单校验间距，并修复运单导入筛选与组织树定位 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 16:20:26 +08:00
b2894lxlxandCursor ea797356ce ✨ 完善组织人员增量同步与用户管理交互 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 13:56:29 +08:00
b2894lxlxandCursor eaece0209d ✨ 合同结算币种联动计费与运单计价单位，并完善合同与派车交互 
结算币种驱动计费单价单位及运单/计划/总单计价单位；同步合同编号预览、部门前缀配置、派车备注与查看弹窗等交互优化。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-10 00:53:17 +08:00
b2894lxlxandCursor a1da644c49 ✨ 优化港口地图回填、合同展示与运单导入空值 
地图选点回填国家省市区；合同选择显示编号/名称；常用数据组织筛选修正；运单详情将-1费用字段显示为空。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-09 17:07:56 +08:00
b2894lxlxandCursor 570fbeb537 🐛 运单轨迹与实时定位WGS-84转GCJ-02后再绘制高德地图 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-08 19:37:27 +08:00
b2894lxlxandCursor d1f804056e ✨ 审核通过后保留流程按钮并跳转MK页面 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-08 18:57:49 +08:00
b2894lxlxandCursor d22fe4777d 🐛 过程配置与常用线路组织筛选只传单个deptId 
多组织账号默认搜索不再拼接逗号分隔 ID，避免列表接口 Long 转换失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-04 20:48:03 +08:00
b2894lxlxandCursor 7751a735c5 ✨ 业务数量单位改走计量单位，并放开运输计划日期必填 
发货模板、运输计划、运单与总单调度从计量单位取 unitName；修复调度提交顶层单位为空，并取消计划开始/结束日期必填。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-04 20:26:35 +08:00
b2894lxlxandCursor 50c1afe9c8 ✨ 列表导出补齐创建人创建时间，并修复组织类型提交 
多模块列表与导出展示创建人、创建时间；组织类型强制提交数字编码，避免中文 dictKey 反序列化失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-30 14:22:39 +08:00
b2894lxlxandCursor e5a7ad616c 🐛 超管业务列表默认查全部组织，并简化区划编号录入 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 21:41:48 +08:00
b2894lxlxandCursor 2210e33643 🐛 修复组织类型字典非数字key导致下拉无数据，并调整用户弹窗布局 
兼容 organization_type 的中文 dictKey 展示；用户弹窗所属组织与备注宽度按四列布局对齐。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 03:31:56 +08:00
b2894lxlxandCursor 1ed524f80f ✨ 组织类型接业务字典，并支持多所属组织与MK再提交 
组织管理类型改为 organization_type；用户所属组织支持多选；提交MK前保留原审批状态以识别通过后再提交。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 03:15:27 +08:00
b2894lxlxandCursor 4418836fcd 🐛 审核通过后再提交强制新建MK表单实例 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 02:44:49 +08:00
b2894lxlxandCursor 4641d0a5dd ✨ 多业务接入MK审核流，提交改传bizId并由后端生成表单实例 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-29 02:23:24 +08:00
b2894lxlxandCursor 8b9c908237 ⚡ 统一地图选址搜索为高德 place/text 并展示分页候选 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-28 00:19:17 +08:00
b2894lxlxandCursor b5043575e4 🐛 修复常用货物组织筛选，并调整列表字段与常用地址行政区划禁用 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-27 23:39:38 +08:00