Commit Graph

731 Commits

Author SHA1 Message Date
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
刘泉佳 2fd927a90c fix: 预付结算单与结算调整单分页固定底部,搜索label不再换行 2026-11-05 15:01:28 +08:00
刘泉佳 8057e860de fix: 批量转结算弹窗居中限高并固定勾选列 2026-11-05 14:47:06 +08:00
刘泉佳 ffc2942d2b fix: 付款申请结算单号误跳预付结算单过滤-1占位id 2026-11-05 13:30:36 +08:00
刘泉佳 22bbcbb7aa fix: 应收转结算与开票申请点击结算单号跳转收款结算单 2026-11-05 13:30:36 +08:00
刘泉佳 4dd63fc5fa feat: 收票登记新增所属合同带出承办部门替代手选结算组织 2026-11-05 12:05:56 +08:00
刘泉佳 c525bffeca fix: 修复开票申请提交返回列表页未刷新 2026-11-05 11:44:19 +08:00
b2894lxlx 8f3da0e386 ✨ 预结算收款方与付款方改为下拉选择
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-04 23:47:00 +08:00
b2894lxlx d4ae6d521a ✨ 客商评分双模式与金蝶公司代码改回组织维护
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-04 23:46:20 +08:00
刘泉佳 b36fa18db5 Merge remote-tracking branch 'origin/master' 2026-11-04 22:19:13 +08:00
刘泉佳 f648285406 fix: 修复客商档案供应商编码查询无结果时显示[object Object] 2026-11-04 22:17:52 +08:00
b2894lxlx 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
刘泉佳 5d56706eed Merge branch 'master' into feature/20261103-bfi-warehouse-web
# Conflicts:
#	src/option/settlement/formalSettlement.js
2026-11-04 17:18:51 +08:00
b2894lxlx 9efae11811 ✨ 合并远程收款流水列表改造 2026-11-04 16:56:30 +08:00
b2894lxlx 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
刘泉佳 7f694bad55 fix: 收款结算单不展示已指定应付列 2026-11-04 11:02:45 +08:00
b2894lxlx 014ee537a0 ✨ 组织编码/平台公司、合同计费客商角色与基础模块查看按钮
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-04 03:15:44 +08:00
b2894lxlx 5bde60d844 ✨ 编辑用户增加数据管理权限多选组织
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-04 03:14:45 +08:00
刘泉佳 68904b02a5 fix: 审核按钮统一超时设置60s 2026-11-03 09:54:14 +08:00
b2894lxlx c0ba9ba39b ✨ 计费/调度/结算支持多方客商与承运商区分
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 21:12:56 +08:00
b2894lxlx 8388a55481 ✨ 新增业务部门配置页并简化项目/合同部门选择
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 21:10:47 +08:00
刘泉佳 b492dd35ea fix: 结算单列表已指定应付列定义补充 2026-11-02 19:58:01 +08:00
刘泉佳 acb74cbc9a fix: 结算单列表指定失败标签补悬浮原因 2026-11-02 19:56:54 +08:00
刘泉佳 9a51bd2cfd feat: 结算单/付款申请单列表指定失败悬浮展示原因 2026-11-02 19:54:15 +08:00
刘泉佳 4dd54f7e4c feat: 付款申请单列表增加已指定应付列 2026-11-02 19:36:04 +08:00
刘泉佳 6705763951 feat: 查看页指定失败行支持编辑匹配金额随重推生效 2026-11-02 19:16:41 +08:00
刘泉佳 4ba18acd25 feat: 查看页重推认领收票单并放开付款匹配金额编辑 2026-11-02 18:38:18 +08:00
刘泉佳 c07371450f feat: 发票登记弹窗匹配结算单金额支持手动修改 2026-11-02 18:38:18 +08:00
刘泉佳 5fbbb5f88f feat: 结算单发票信息增加是否已指定应付列 2026-11-02 18:10:53 +08:00
刘泉佳 1ed7955764 feat: 发票登记选票暂存展示且确认后才保存推送 2026-11-02 18:10:53 +08:00
刘泉佳 daab1001db fix: 付款管理批量同步增加遮罩并统一金蝶接口30s超时常量 2026-11-02 17:15:50 +08:00
刘泉佳 f5735e6bad fix: 收票登记提交返回列表后刷新列表数据 2026-11-02 16:36:00 +08:00
刘泉佳 bd9da83175 feat: 发票登记弹窗回显已认领收票单并补齐结算基本信息 2026-11-02 16:13:00 +08:00
刘泉佳 b59e43c9b7 feat: 认领收票单候选弹窗改为分页并悬浮展示推送失败原因 2026-11-02 16:12:52 +08:00
刘泉佳 eae50ab909 feat: 发票登记移至工具栏并回显已认领收票单 2026-11-02 15:39:26 +08:00
b2894lxlx 8e1430491b ✨ 项目提交MK传projectType,并修复已撤回再提交
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 14:28:07 +08:00
b2894lxlx 9fed3785d9 ⚡ 流程配置取消默认按当前用户部门筛选
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 13:32:06 +08:00
b2894lxlx eaf431819e ✨ 客商档案营业执照OCR改接新接口并回填字段
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 13:31:33 +08:00
刘泉佳 c7bd4461e2 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/20261030-kingdee-writeoff-status-web
# Conflicts:
#	src/views/business/contract-manage.vue
2026-11-02 09:54:00 +08:00
刘泉佳 ab7491e6d6 feat: 收票登记表单去税率展示字段 2026-11-02 09:36:41 +08:00
刘泉佳 d78d100824 feat: 全额认领不再校验匹配金额合计上限 2026-10-31 16:52:22 +08:00
刘泉佳 9908b543ea fix: 项目立项补充getRisk导入修复风险查询未定义 2026-10-31 16:37:01 +08:00
刘泉佳 46e7952e49 feat: 付款结算单选收票单全额认领并新增发票登记推送指定应付 2026-10-31 16:07:12 +08:00
刘泉佳 441d62a874 feat: 收票登记先票后款表单改造(手选结算组织/发票明细区块/去关联结算单) 2026-10-31 16:07:04 +08:00
刘泉佳 1a143aa05b fix: 合同管理删除hcsRepush重复导入修复构建 2026-10-31 16:07:04 +08:00
刘泉佳 f3d69d7df0 fix: 代码合并报错 2026-10-31 15:38:27 +08:00
刘泉佳 cd58e8ebc7 Merge branch 'feature/20261027-hcs-bif-all-web-recBillSync' into feature/20261031-bfi-收票收款改造-web 2026-10-31 14:18:38 +08:00