OathK1per
|
3190f85c10
|
修改项目汇总统计
|
2021-11-18 09:39:08 +08:00 |
|
OathK1per
|
146474552c
|
处理冲突
|
2021-11-17 21:52:40 +08:00 |
|
OathK1per
|
e3496cdc02
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/cn/palmte/work/model/ProjectSettleCashFlowRepository.java
# src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java
# src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java
# src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java
|
2021-11-17 21:49:29 +08:00 |
|
OathK1per
|
d92bb2aa3d
|
项目结算修改
|
2021-11-17 21:39:49 +08:00 |
pengqiang
|
8a7db6e829
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 18:30:55 +08:00 |
|
pengqiang
|
cae241d99b
|
流程公共模块优化
|
2021-11-17 18:30:45 +08:00 |
xxssyyyyssxx
|
9cc03d5888
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 18:14:40 +08:00 |
|
xxssyyyyssxx
|
5d04be2c4c
|
重复代码提取
|
2021-11-17 18:14:03 +08:00 |
|
pengqiang
|
eb54ce9b90
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 18:07:13 +08:00 |
|
pengqiang
|
a26432c950
|
流程公共模块优化
|
2021-11-17 18:07:02 +08:00 |
hanbo
|
118e559fd1
|
整合结算页面
|
2021-11-17 17:58:09 +08:00 |
|
xxssyyyyssxx
|
2c7e244401
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 17:30:01 +08:00 |
|
xxssyyyyssxx
|
4829a2f820
|
方法提取
|
2021-11-17 17:28:55 +08:00 |
|
pengqiang
|
2122923b06
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 17:00:43 +08:00 |
|
pengqiang
|
c3ce21a5d2
|
预算状态修改
|
2021-11-17 16:59:23 +08:00 |
|
xxssyyyyssxx
|
653b8bc20a
|
命名优化
|
2021-11-17 16:47:49 +08:00 |
|
xxssyyyyssxx
|
f97c24c4f2
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 16:46:09 +08:00 |
|
xxssyyyyssxx
|
33bcca7d67
|
重复代码提取
|
2021-11-17 16:45:37 +08:00 |
|
pengqiang
|
cacafd874f
|
增加提示语
|
2021-11-17 16:22:24 +08:00 |
|
pengqiang
|
7a5d7e30f0
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 16:01:50 +08:00 |
|
pengqiang
|
ac8d68fa77
|
状态控制
|
2021-11-17 16:01:41 +08:00 |
|
xxssyyyyssxx
|
6b2c742f61
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 16:00:39 +08:00 |
|
xxssyyyyssxx
|
4c74a93cfa
|
项目管理成本含税金额=不含税金额
|
2021-11-17 16:00:09 +08:00 |
|
pengqiang
|
57db8d6bf3
|
待我审批的项目
|
2021-11-17 15:35:34 +08:00 |
|
pengqiang
|
f1670578cc
|
决算审批
|
2021-11-17 14:49:11 +08:00 |
|
pengqiang
|
3f31cc5986
|
结算审批
|
2021-11-17 11:46:11 +08:00 |
|
pengqiang
|
ebb705056a
|
Merge remote-tracking branch 'origin/master'
|
2021-11-17 11:15:01 +08:00 |
|
pengqiang
|
48a979e5ab
|
项目状态控制
|
2021-11-17 11:14:52 +08:00 |
|
hanbo
|
80e3905180
|
分月项目统计页面实现
|
2021-11-17 10:42:56 +08:00 |
|
pengqiang
|
01b0f0e997
|
项目状态修改
|
2021-11-17 10:17:45 +08:00 |
|
pengqiang
|
7193362ceb
|
项目状态修改
|
2021-11-17 10:14:01 +08:00 |
|
OathK1per
|
0f36a3ba66
|
项目结算和项目汇总
|
2021-11-17 09:37:02 +08:00 |
|
pengqiang
|
73c4c9e6e7
|
流程状态控制
|
2021-11-16 17:39:06 +08:00 |
|
pengqiang
|
00247e6b16
|
流程状态控制
|
2021-11-16 11:39:33 +08:00 |
|
pengqiang
|
f09f66dcaf
|
增加当前流程审核记录和当前流程图
|
2021-11-16 10:32:02 +08:00 |
|
xxssyyyyssxx
|
0dbf746912
|
Merge remote-tracking branch 'origin/master'
|
2021-11-16 09:06:30 +08:00 |
|
xxssyyyyssxx
|
081206f50b
|
项目的审批状态管理
|
2021-11-16 09:00:26 +08:00 |
|
hanbo
|
f27636d6a2
|
项目查看审核后台实现
|
2021-11-15 19:57:32 +08:00 |
|
pengqiang
|
ba8d4efbe4
|
项目详情里的审核意见
|
2021-11-15 18:07:16 +08:00 |
|
pengqiang
|
1b47962e67
|
项目详情里的审核意见
|
2021-11-15 17:34:28 +08:00 |
|
pengqiang
|
fa29d77234
|
审核
|
2021-11-15 16:53:43 +08:00 |
|
pengqiang
|
00ad42b448
|
工作流程
|
2021-11-15 11:12:34 +08:00 |
|
hanbo
|
13e47b6317
|
项目查看审核页面实现
|
2021-11-13 16:21:52 +08:00 |
xxssyyyyssxx
|
0aeb024e40
|
资金利息算法变更
|
2021-11-13 11:16:56 +08:00 |
|
xxssyyyyssxx
|
0128a8261a
|
Merge remote-tracking branch 'origin/master'
|
2021-11-12 19:33:28 +08:00 |
|
xxssyyyyssxx
|
140410a393
|
资金利息算法更改，还待完善
|
2021-11-12 19:32:48 +08:00 |
|
pengqiang
|
01ae950252
|
样式修改
|
2021-11-12 17:54:35 +08:00 |
|
pengqiang
|
904f2637e1
|
Merge remote-tracking branch 'origin/master'
|
2021-11-12 17:15:32 +08:00 |
|
pengqiang
|
aa14b289d4
|
新增表保存一个项目的所有审批记录
|
2021-11-12 17:15:24 +08:00 |
|
hanbo
|
a7fa34478e
|
发起决算后台代码
|
2021-11-12 16:58:41 +08:00 |