Commit Graph

255 Commits

Author SHA1 Message Date
mac
67bc00314c Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
2026-07-11 14:54:28 +08:00
mac
e0000c2abb fix: 总览工作台首次加载跳过提案初始化避免卡顿
- 总览为虚拟聚合视图无proposal数据, 首次加载时missingCount=7触发ensureStandardProposals
- 新增state.tenant!=='总览'条件跳过提案初始化
- 版本号 v1.2.0.27
v1.2.0.27
2026-07-11 14:54:28 +08:00
mac
d34e52eff4 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 17s
2026-07-11 14:36:00 +08:00
mac
356c129668 feat: 总览工作台新增损益/现金流/项目经营详细报表
- 预算总览和发生总览各新增3个tab: 损益详细报表、现金流详细报表、项目经营详细报表
- 12个月卡片布局, 按部门(学术/科普/科研/医患/MCN)展示矩阵
- 后端新增6个聚合API: dept-matrix/cf-matrix/project-matrix x 2
- tab改为finance-tab风格, 与经营月报一致
- 修复项目报表函数未注册导致的加载失败
- 版本号 v1.2.0.26
v1.2.0.26
2026-07-11 14:36:00 +08:00
mac
8e38f50c99 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
2026-07-11 12:31:50 +08:00
mac
94b9f25938 fix: 总览工作台tab显示问题
- 移除hidden class避免CSS覆盖style.display
- 总览模式下隐藏部门和预算/已发生tab
- 只显示预算总览和发生总览
- 版本号 v1.2.0.25
v1.2.0.25
2026-07-11 12:31:50 +08:00
mac
3a40e78c3e Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 13s
2026-07-11 12:26:29 +08:00
mac
536b165a9b feat: 新增总览工作台(仅管理员)
- 新增总览工作台,聚合学术/科普/科研/医患/MCN数据
- 4个聚合API: 预算/发生月报季报
- 新增预算总览/发生总览侧边栏tab
- 月报/季报视图切换
- 总览仅管理员可见
- 版本号 v1.2.0.24
v1.2.0.24
2026-07-11 12:26:29 +08:00
mac
a1a4f41d79 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
2026-07-11 11:57:42 +08:00
mac
75227c51c3 fix: 已发生模块经营季报卡片顺序修正
- 修正为: 部门损益情况→部门现金流→项目经营详情
- 与预算模块保持一致的顺序
- 版本号 v1.2.0.23
v1.2.0.23
2026-07-11 11:57:42 +08:00
mac
d4889d56ec Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 17s
2026-07-11 11:50:18 +08:00
mac
f5dd152ca4 feat: 季报环比+指标改名
- 部门损益/部门现金流季报Q2/Q3/Q4后增加环比列
- 部门损益卡片行改名: 毛利→项目毛利, 平台费用→部门费用
- 部门现金流卡片行改名: 平台费用→部门现金流, 部门现金流→经营现金流
- 版本号 v1.2.0.22
v1.2.0.22
2026-07-11 11:50:18 +08:00
mac
35706f123d Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-11 11:44:05 +08:00
mac
2c20900e75 feat: 经营月报卡片改名+样式优化+切换工作台默认经营月报
- 业务线经营情况→部门损益情况,副标题改为部门利润公式
- 业务线现金流→部门现金流,副标题改为部门现金流公式
- 财务月度/季度概览→项目经营详情
- 3个卡片主副标题加大+间距对齐+颜色加深
- 签约月份/添加月份/平台费用月份默认当前月份
- 切换工作台默认显示经营月报
- 版本号 v1.2.0.21
v1.2.0.21
2026-07-11 11:44:04 +08:00
mac
e4d1cd59f3 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 23:47:54 +08:00
mac
774cdec9e3 feat: 预算模块成本→当期成本,付款→当期流出,去除付款率
- 成本列/卡片改名为当期成本
- 付款列/卡片改名为当期流出
- 去除付款率列和卡片
- colspan和theadCols同步调整
- 展开明细表头同步改名
- 版本号 v1.2.0.20
v1.2.0.20
2026-07-10 23:47:54 +08:00
mac
1673603b02 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 23:22:12 +08:00
mac
19fa00e220 feat: 季度/月度标签再次点击取消选中
- setPlanQuarter/setPlanMonth增加toggle逻辑
- setFinQuarter/setFinMonth增加toggle逻辑
- 再次点击已选中的季度/月份回到overview总视图
- 版本号 v1.2.0.19
v1.2.0.19
2026-07-10 23:22:12 +08:00
mac
db93eb8d31 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 23:02:48 +08:00
mac
06ba9b2bff feat: 刷新恢复工作台+状态标签调整
- state.tenant从localStorage恢复(只写不读bug修复)
- 状态标签移到总视图后面,增加全部按钮
- 去除总视图按钮
- 版本号 v1.2.0.18
v1.2.0.18
2026-07-10 23:02:48 +08:00
mac
94ad7aed55 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 16s
2026-07-10 22:32:27 +08:00
mac
f4b69449b2 feat: 预算筛选区增加状态标签(待签约/已签约/只付款)
- 月份后增加待签约|已签约|只付款3个状态筛选按钮
- 待签约: project_type为待签约
- 已签约: project_type为已签约
- 只付款: 只有成本/付款,确收/毛利/回款为空
- 三种视图(月度/季度/总视图)都支持过滤
- 版本号 v1.2.0.17
v1.2.0.17
2026-07-10 22:32:27 +08:00
mac
043938670a Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 13s
2026-07-10 21:43:19 +08:00
mac
7bdde246bc feat: 平台费用Tab切换+汇总筛选对换+卡片样式统一
- 平台费用类型改为Tab按钮切换(人力成本|研发费用|奖金|平台采购|通用费用|其他)
- 平台费用计划改名为平台费用
- 项目管理和平台费用: 汇总区在上筛选区在下
- 平台费用卡片样式对齐项目管理(紧凑px-3 py-1.5)
- 视图下拉框放在Tab按钮左边
- 版本号 v1.2.0.16
v1.2.0.16
2026-07-10 21:43:19 +08:00
mac
9862d9fe56 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
2026-07-10 21:19:53 +08:00
mac
ea1e477c31 fix: 已发生模块平台费用保存/删除后列表变空
- 根因: saveExpense/deleteExpenseItem调用bootstrap覆盖state.data
- 轻量bootstrap不返回expense数据导致列表为空
- 改为只调/api/expense/list刷新费用列表
- 版本号 v1.2.0.15
v1.2.0.15
2026-07-10 21:19:53 +08:00
mac
150e627811 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 20:14:53 +08:00
mac
dcc59a9bc6 feat: 待回款卡片负数显示超额回款
- 待回款<0时显示'超额回款 xx万'
- 版本号 v1.2.0.14
v1.2.0.14
2026-07-10 20:14:53 +08:00
mac
295bf5a81c Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 20:06:03 +08:00
mac
ead6f2ac46 feat: 增加待回款列和卡片+取消付款率
- 项目财务明细表格增加待回款列(确收-回款, 现金流后)
- 汇总卡片增加待回款(毛利前), 取消付款率
- 展开明细增加待回款列
- 版本号 v1.2.0.13
v1.2.0.13
2026-07-10 20:06:03 +08:00
mac
e8a26059d5 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 19:52:00 +08:00
mac
9471ee3e85 feat: 新增测试工作台+tip样式调整+tip/tab位置对调
- 新增测试·无界工作台(所有人可见)
- 为所有opc_owner用户添加测试工作台权限
- 预算模块tip改淡黄色+新文案
- 预算/已发生模块tip和tab位置对调(tip在上)
- 版本号 v1.2.0.12
v1.2.0.12
2026-07-10 19:52:00 +08:00
mac
543d620384 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 11s
2026-07-10 19:49:11 +08:00
mac
975034c589 feat: 新增测试工作台+tip样式调整+tip/tab位置对调
- 新增测试·无界工作台(所有人可见)
- 为所有opc_owner用户添加测试工作台权限
- 预算模块tip改淡黄色+新文案
- 预算/已发生模块tip和tab位置对调(tip在上)
- 版本号 v1.2.0.12
2026-07-10 19:49:11 +08:00
mac
d4fa828f8c feat: 行高调整+去元单位+客户名截断+select高度修复
- 项目财务明细行高增至1.37(原0.95的1.2x1.2倍)
- 去掉所有表格内容中的元单位
- 客户名称固定100px+省略号+hover显示完整
- planInlineSelect的select高度固定20px对齐文本
- switchFinanceTab选择器限定#financeModal
- 版本号 v1.2.0.11
v1.2.0.11
2026-07-10 19:32:00 +08:00
mac
71e90bd55f Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 17s
2026-07-10 19:32:00 +08:00
mac
ceb54e29ec fix: 展开明细合并月份+tab选中态+默认排序+已发生改名
- 展开明细合并budget_data和expense_data月份(修复只有费用没预算时看不到)
- switchFinanceTab选择器限定#financeModal(修复弹窗tab误伤顶部筛选tab)
- 项目管理表格默认按确收金额从高到低排序
- 执行→已发生, tip改淡黄色
- 登录后默认选权限范围内第一个工作台
- 版本号 v1.2.0.10
v1.2.0.10
2026-07-10 19:11:32 +08:00
mac
3042791a90 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 13s
2026-07-10 19:11:32 +08:00
mac
9ca5b11e20 feat: 执行→已发生+默认工作台+tip改色
- 执行模块改名为已发生
- tip改为淡黄色+新文案(只记录已发生的确收/毛利/回款/成本/支出)
- 登录后默认选择权限范围内第一个工作台
- applyUserTenants返回Promise,app.js先await再load
- 去除总览工作台残留
- 版本号 v1.2.0.9
v1.2.0.9
2026-07-10 18:22:54 +08:00
mac
a8243acc5a Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 21s
2026-07-10 18:22:54 +08:00
mac
07fa3e6e10 feat: 去除总览工作台
- 后端: ALL_TENANTS去掉总览, bootstrap删除聚合逻辑
- 前端: 删除renderHome加载步骤, 隐藏部门tab
- switchTenant删除总览特殊处理, 默认进预算模块
- 租户排序和图标映射去掉总览
- isOverviewMode强制false
- 版本号 v1.2.0.8
v1.2.0.8
2026-07-10 17:33:05 +08:00
mac
cb0e3fdac2 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 13s
2026-07-10 17:33:05 +08:00
mac
7bf30a7cc2 feat: 执行模块项目管理增加行展开明细
- 项目财务明细表格最左侧增加展开箭头
- 点击展开月度确收回款明细(同预算模块)
- 自动过滤全0月份
- 版本号 v1.2.0.7
v1.2.0.7
2026-07-10 13:38:11 +08:00
mac
f5c92d09af Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 13s
2026-07-10 13:38:11 +08:00
mac
44f313050e fix: 切换工作台后数据不刷新
- 根因: ensureStandardProposals每次触发return跳过ensureTabData
- 修复: ensureTabData移到ensureStandardProposals之前
- 增加_proposalsInitialized一次性flag避免重复检查
- switchTenant改为async+await load()
- 版本号 v1.2.0.6
v1.2.0.6
2026-07-10 13:27:22 +08:00
mac
e18626105b Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 16s
2026-07-10 13:27:22 +08:00
mac
fad6a0e2fb fix: 切换工作台后数据不刷新
- load()渲染前增加ensureTabData(state.active)加载当前tab数据
- 版本号 v1.2.0.5
v1.2.0.5
2026-07-10 13:12:42 +08:00
mac
b587530437 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
2026-07-10 13:12:42 +08:00
mac
19d1aceb9f feat: 按需加载+年份筛选+行展开明细+UI优化
后端:
- bootstrap精简为轻量版(只返回summary+financeMonthly) 0.028s
- 按需加载: 切tab时通过/api/<resource>/list获取数据
- 修复risk_projects语法错误

前端:
- 项目管理tab改名(项目计划/项目→项目管理)
- 筛选区增加年份下拉框(2024-2027)
- 季度筛选增加年份过滤
- 项目行增加展开箭头,显示月度确收回款明细
- 自动过滤全0月份记录
- 平台费用: 金额→费用计提, 已发生金额→现金支出
- 计划→预算, 实际→执行
- 经营月报/季报卡片顺序调整
- 非总览工作台跳过renderHome
- 版本号 v1.2.0.4
v1.2.0.4
2026-07-10 13:10:04 +08:00
mac
9a1260db68 Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
2026-07-10 13:10:04 +08:00