mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,195 Commits
7 Branches
0 Tags
17 MiB
Commit Graph

1182 Commits (2dbcc43a434df375e9106c0f06a6fb85f7834114)

Author SHA1 Message Date
‘wangjiuyun a91eb5f0cf 最终完成 2024-10-31 17:39:13 +08:00
‘wangjiuyun beeb889780 基本完成 2024-10-31 15:56:26 +08:00
chenhao 45721a3d84 feat 收入明细表: 
1:产品大类修改为字符串
 2024-10-31 14:06:26 +08:00
‘wangjiuyun 07a6165c2a 基本完成 2024-10-31 13:12:29 +08:00
chenhao 5209e2c8d0 feat 收入明细表: 
1:产品大类修改为字符串
 2024-10-31 11:00:52 +08:00
‘wangjiuyun 14de7c568d 附件保存完成 2024-10-30 19:53:14 +08:00
‘wangjiuyun d0daa67ddf Merge branch 'dev_1.0.0' of http://git.unissense.tech/mula/fourcal into Branch_dev_1.0.0 2024-10-30 19:22:34 +08:00
‘wangjiuyun b04d88c0e2 调试文件上传 2024-10-30 19:22:22 +08:00
chenhao 02da71d4a9 feat 收入明细表: 
1:产品大类修改为字符串
 2024-10-30 17:35:41 +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 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
OathK1per 9750722925 项目审核页面优化 2023-11-01 14:50:58 +08:00
OathK1per 25188514ac 修改MySQL密码 2023-10-29 12:05:48 +08:00
OathK1per 4a95260a26 毛利A计算更新 2023-10-17 16:55:13 +08:00
OathK1per 19dbd05ad9 毛利A计算 2023-10-13 16:22:25 +08:00
OathK1per 1eadf7fd26 项目预算基本信息同步预算计算方式 2023-08-29 15:06:58 +08:00
OathK1per 3b36524aca 修改bug 2023-07-17 17:54:39 +08:00
OathK1per 835407bcc8 修改bug 2023-07-17 14:50:03 +08:00
OathK1per e99a70cb12 修改下一步计划，可以在编辑中保存 2023-07-14 17:28:53 +08:00
OathK1per 92e18e8790 修改跳转逻辑 2023-06-13 14:55:58 +08:00
OathK1per 824379e732 0605需求 2023-06-13 14:45:33 +08:00
OathK1per 50edd26861 0605需求 2023-06-13 14:31:29 +08:00
OathK1per 9060f1f2c9 0605需求 2023-06-13 10:42:15 +08:00
OathK1per ffdd6fcf14 更新数据库地址 2023-05-25 18:08:08 +08:00
OathK1per dcd61ee1dc 更新数据库地址 2023-05-25 18:05:57 +08:00
OathK1per fcd4a466ac 预算基本信息表不再新建 2023-03-28 17:20:25 +08:00
OathK1per 5771f757c4 预算基本信息表不再新建 2023-03-27 18:11:09 +08:00
OathK1per eb890cf836 下一步计划字段非必填 2023-03-17 16:19:18 +08:00
OathK1per 0d6fbe0f57 新增下一步计划字段 2023-03-16 17:24:23 +08:00
OathK1per 18b59c63a6 新增下一步计划字段 2023-03-16 14:29:05 +08:00
OathK1per 45b4bf4d25 修改直签筛选项 2023-03-06 16:11:08 +08:00
OathK1per ee1a604a1b 导出总表，概算时只导出项目立项表 2023-02-10 15:01:18 +08:00
OathK1per 7c9f0d8f66 项目提交审核之后再保存预算列表和导出金额 2023-02-09 18:43:26 +08:00
OathK1per 0616069aea 导出优化时间显示 2023-02-09 16:34:58 +08:00
Harry Yang 7a7e78e480 Merge remote-tracking branch 'origin/1.2.0' into 1.2.0 2023-01-29 14:11:22 +08:00
Harry Yang d4bcd90bf0 修复 异常处理 范围 2023-01-29 14:11:08 +08:00
pengqiang 2e6fba335d 流程模板需求 2023-01-12 16:43:46 +08:00
Harry Yang 0425d29103 Merge remote-tracking branch 'origin/1.2.0' into 1.2.0 2023-01-11 15:31:45 +08:00
OathK1per 148527eb3e 只筛选一级部门 2023-01-06 15:14:59 +08:00
Harry Yang cee7f5e7fb project_budget_income_detail 2023-01-06 14:30:27 +08:00
OathK1per c6455af9da Merge remote-tracking branch 'origin/1.2.0' into 1.2.0 2023-01-06 13:56:31 +08:00
OathK1per e2f3fb6d15 Merge branch 'master' of https://gitee.com/ZhangYunTianXia/fourcal into 1.2.0 2023-01-06 13:56:03 +08:00
Harry Yang eb05fb71eb 提交审核的时候合同金额问题 2023-01-06 13:05:40 +08:00
Harry Yang 0390439319 详情界面审核 2023-01-06 13:04:16 +08:00
Harry Yang b2a9695766 提交审核的时候合同金额问题 2023-01-06 12:31:40 +08:00
Harry Yang 01f19c320f Merge remote-tracking branch 'origin/1.2.0' into 1.2.0 2023-01-06 11:38:12 +08:00
Harry Yang d975b0adcb 垫资金额 格式 2023-01-06 11:38:00 +08:00
OathK1per 925653e024 Merge remote-tracking branch 'origin/1.2.0' into 1.2.0 2023-01-06 11:25:19 +08:00
OathK1per 4b04d6a870 查看审核结算页面 2023-01-06 11:25:08 +08:00
Harry Yang 29d74d0889 待我审核界面流程类型错误，垫资金额 格式 2023-01-06 11:06:38 +08:00
Harry Yang 4cd2850b40 合计金额 2023-01-06 10:54:31 +08:00
Harry Yang 9a17b67bc4 采购合同合同金额 联动 2023-01-06 10:33:45 +08:00
Harry Yang d7fe81fabb 是否垫资 2023-01-06 10:24:36 +08:00
Harry Yang 2a02a551fd Merge remote-tracking branch 'origin/1.2.0' into 1.2.0 2023-01-06 09:59:36 +08:00
Harry Yang df67cef310 2.0 DDL SQL 部门列表 2023-01-06 09:59:29 +08:00