‘wangjiuyun
|
b04d88c0e2
|
调试文件上传
|
2024-10-30 19:22:22 +08:00 |
|
‘wangjiuyun
|
fd43f2f71f
|
除附件外功能
|
2024-10-30 16:31:46 +08:00 |
|
‘wangjiuyun
|
09680c6b43
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 14:10:20 +08:00 |
|
‘wangjiuyun
|
8050f16a11
|
未完成文件上传
|
2024-10-30 14:10:11 +08:00 |
 chenhao
|
4f7ae569e9
|
feat 收入明细表:
1:产品大类修改为字符串
|
2024-10-30 11:52:49 +08:00 |
|
‘wangjiuyun
|
122e560b21
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 11:30:46 +08:00 |
|
‘wangjiuyun
|
5057ce6b40
|
采购明细下拉联动，收入明细下拉联动
|
2024-10-30 11:30:38 +08:00 |
|
chenhao
|
949f5558b6
|
feat 收入明细表:
1:附件改动
|
2024-10-30 11:18:33 +08:00 |
|
‘wangjiuyun
|
5cfa2f90dc
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-30 11:11:37 +08:00 |
|
‘wangjiuyun
|
e1ca488327
|
前端2期需求未完成
|
2024-10-30 11:11:27 +08:00 |
|
chenhao
|
e0704f47da
|
feat 收入明细表:
1:附件改动
|
2024-10-30 10:47:17 +08:00 |
|
chenhao
|
6880f80a7c
|
feat 收入明细表:
1:二期需求修改
|
2024-10-29 17:37:24 +08:00 |
|
‘wangjiuyun
|
6a4e423276
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-29 17:08:00 +08:00 |
|
‘wangjiuyun
|
e45cbd63c1
|
第一期调整完成
|
2024-10-29 17:07:51 +08:00 |
|
chenhao
|
3cbe4d951f
|
feat 收入明细表:
1:资金计划修改
|
2024-10-29 16:01:53 +08:00 |
|
‘wangjiuyun
|
d34ae39d8d
|
。。。
|
2024-10-29 14:59:46 +08:00 |
|
‘wangjiuyun
|
5c76ef7b93
|
收支明细项目费用校验注释
|
2024-10-29 14:55:39 +08:00 |
|
‘wangjiuyun
|
01f8f0a525
|
审核文本调整
|
2024-10-29 12:20:52 +08:00 |
|
‘wangjiuyun
|
dc5d86227c
|
bug问题
|
2024-10-29 11:40:07 +08:00 |
|
‘wangjiuyun
|
f7b15273b2
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0
|
2024-10-29 11:14:46 +08:00 |
|
‘wangjiuyun
|
380affd9cc
|
bug修改
|
2024-10-29 11:14:36 +08:00 |
|
chenhao
|
f9b0c1d551
|
feat 收入明细表:
1:资金计划修改
|
2024-10-29 11:01:34 +08:00 |
|
‘wangjiuyun
|
9a6d9d8911
|
。。。合并代码
|
2024-10-29 09:44:58 +08:00 |
|
‘wangjiuyun
|
2656509108
|
。。。
|
2024-10-29 09:41:33 +08:00 |
|
‘wangjiuyun
|
592cc66492
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal
|
2024-10-28 20:58:37 +08:00 |
|
‘wangjiuyun
|
32068bdc03
|
前端问题
|
2024-10-28 20:58:23 +08:00 |
|
chenhao
|
f7144673cc
|
feat 收入明细表:
1:资金计划修改
|
2024-10-28 20:57:12 +08:00 |
|
‘wangjiuyun
|
3ea59ec3d5
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal
|
2024-10-28 20:31:26 +08:00 |
|
‘wangjiuyun
|
35e8f01d1c
|
前端调整
|
2024-10-28 20:31:15 +08:00 |
|
chenhao
|
5c10b6a64e
|
feat 收入明细表:
1:付款计划改为临时表 整体保存
|
2024-10-28 20:30:29 +08:00 |
|
‘wangjiuyun
|
e735747a1b
|
前端问题调试
|
2024-10-28 20:24:14 +08:00 |
|
‘wangjiuyun
|
750b55940b
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal
|
2024-10-28 20:04:02 +08:00 |
|
‘wangjiuyun
|
b65457f0ec
|
编辑部分调试
|
2024-10-28 20:03:47 +08:00 |
|
chenhao
|
8b88788906
|
feat 收入明细表:
1:导出修改
2:付款计划改为临时表 整体保存
|
2024-10-28 19:01:21 +08:00 |
|
‘wangjiuyun
|
4662f1bbbd
|
前端未完成
|
2024-10-28 17:05:31 +08:00 |
|
‘wangjiuyun
|
4e210da487
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal
|
2024-10-28 16:46:43 +08:00 |
|
chenhao
|
b0c6337b91
|
feat 收入明细表:
1:金额修改
|
2024-10-28 16:42:34 +08:00 |
|
‘wangjiuyun
|
0ad8296232
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal
|
2024-10-28 16:21:37 +08:00 |
|
chenhao
|
3b6340774c
|
feat 收入明细表:
1:资金计划表修改
|
2024-10-28 16:21:04 +08:00 |
|
‘wangjiuyun
|
c295824049
|
Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal
|
2024-10-28 15:49:34 +08:00 |
|
chenhao
|
4e13d9ca7b
|
feat 收入明细表:
1:资金计划表修改
|
2024-10-28 15:48:34 +08:00 |
|
chenhao
|
3bbf91127a
|
feat 收入明细表:
1:资金计划表修改
|
2024-10-28 14:50:07 +08:00 |
|
chenhao
|
eb6ff2c297
|
feat 收入明细表:
1:改为手动输入 不再由单价*数量进行计算
|
2024-10-28 14:24:16 +08:00 |
|
chenhao
|
c8169c5093
|
refactor(budget): 调整预算统计逻辑
- 移除 IncomeCostBean 中的成本项目管理税金相关计算
- 在 ProjectBudgetPlanDetail 中添加服务支出和其他支出的 transient 字段
- 更新 ProjectBudgetService 中的月度预算统计逻辑，增加项目管理成本和定金成本的计算
|
2024-10-28 11:30:42 +08:00 |
|
chenhao
|
acf0b64c96
|
feat(project): 新增付款计划功能并优化资金计划计算逻辑
- 新增 ProjectBudgetPayPlan 相关实体类和 Repository
- 在 ProjectBudgetService 中添加付款计划相关方法
- 修改资金计划计算逻辑，支持按月汇总付款计划- 在 ProjectController 中添加付款计划保存和查询接口
- 优化 ProjectGrossProfit 计算方法
|
2024-10-28 10:59:08 +08:00 |
|
‘wangjiuyun
|
b16b717fe5
|
前端部分文本修改
|
2024-10-25 18:06:05 +08:00 |
 mula.liu
|
4e495c3eff
|
1.0.1
|
2024-10-18 17:01:41 +08:00 |
ZhangYP
|
01e4db1415
|
去掉ABCD
|
2024-03-04 17:06:32 +08:00 |
OathK1per
|
600ad2a773
|
修改行宽
|
2023-11-08 12:35:28 +08:00 |
|
OathK1per
|
e927912aed
|
导出功能自动换行
|
2023-11-06 14:03:46 +08:00 |