hanbo
|
515203f113
|
Merge remote-tracking branch 'origin/master'
|
2021-11-24 17:34:44 +08:00 |
|
hanbo
|
1af01ed249
|
暂时注释
|
2021-11-24 17:34:29 +08:00 |
OathK1per
|
bba18639c8
|
人力成本员工列表修改
|
2021-11-24 16:30:51 +08:00 |
|
OathK1per
|
d000f7afe4
|
修改汇总可见性
|
2021-11-23 21:37:43 +08:00 |
pengqiang
|
32f8b20d91
|
审核按钮权限控制
|
2021-11-23 17:32:08 +08:00 |
xxssyyyyssxx
|
45bf72be14
|
Merge remote-tracking branch 'origin/master'
|
2021-11-23 10:46:19 +08:00 |
|
hanbo
|
4b432052d3
|
保存结算信息
|
2021-11-22 20:55:18 +08:00 |
|
xxssyyyyssxx
|
dadcfc4c52
|
采购类别动态化
|
2021-11-22 20:27:58 +08:00 |
|
hanbo
|
29e1c05872
|
利润率配置提示
|
2021-11-22 18:59:33 +08:00 |
|
hanbo
|
6185a4790b
|
bug修复
|
2021-11-22 16:49:08 +08:00 |
|
hanbo
|
245da6248b
|
Merge remote-tracking branch 'origin/master'
|
2021-11-22 11:54:21 +08:00 |
|
hanbo
|
4f5bd67a47
|
bug修复
|
2021-11-22 11:53:57 +08:00 |
|
pengqiang
|
4439a35391
|
Merge remote-tracking branch 'origin/master'
|
2021-11-22 10:21:44 +08:00 |
|
pengqiang
|
98156d2529
|
系统管理员审核和撤销流程
|
2021-11-22 10:21:37 +08:00 |
|
xxssyyyyssxx
|
a0e7da31ce
|
按照修改时间倒序
|
2021-11-22 10:12:45 +08:00 |
|
OathK1per
|
cd627d7b2a
|
处理小数点位数
|
2021-11-22 01:33:28 +08:00 |
|
OathK1per
|
afd5f9ef1b
|
按需求修改
|
2021-11-22 00:51:12 +08:00 |
|
hanbo
|
62b95fb29f
|
Merge remote-tracking branch 'origin/master'
|
2021-11-19 16:59:25 +08:00 |
|
hanbo
|
7aefe59152
|
项目审核查看、角色等级
|
2021-11-19 16:58:28 +08:00 |
|
pengqiang
|
f3316d076b
|
实列流程图还是恢复原来的逻辑
|
2021-11-19 16:58:24 +08:00 |
|
pengqiang
|
6fe0776908
|
提示文字修改
|
2021-11-19 16:48:47 +08:00 |
|
OathK1per
|
900f1f6d69
|
Merge remote-tracking branch 'origin/master'
|
2021-11-19 15:51:40 +08:00 |
|
OathK1per
|
fef4b2220f
|
修改汇总页面可见性
|
2021-11-19 15:50:00 +08:00 |
|
hanbo
|
508067b155
|
决算页面
|
2021-11-19 15:48:21 +08:00 |
|
xxssyyyyssxx
|
8a6962d712
|
Merge remote-tracking branch 'origin/master'
|
2021-11-19 14:50:22 +08:00 |
|
xxssyyyyssxx
|
8ad4b00662
|
项目可见性配置
|
2021-11-19 14:47:59 +08:00 |
|
OathK1per
|
da81395309
|
修改人力成本管理
|
2021-11-19 10:41:53 +08:00 |
|
pengqiang
|
613864fbb4
|
只给有效账号发送审批任务
|
2021-11-19 10:22:43 +08:00 |
|
hanbo
|
5ba593f16e
|
分月项目统计
|
2021-11-18 20:52:41 +08:00 |
|
xxssyyyyssxx
|
01fd773772
|
项目可见性问题
|
2021-11-18 17:41:16 +08:00 |
|
xxssyyyyssxx
|
72f3bd5157
|
项目可见性问题
|
2021-11-18 17:39:31 +08:00 |
|
xxssyyyyssxx
|
1d134e7891
|
人员部门关系
|
2021-11-18 16:39:59 +08:00 |
|
xxssyyyyssxx
|
9bc5bd5515
|
代码优化
|
2021-11-18 16:07:33 +08:00 |
|
xxssyyyyssxx
|
cd8f1ca02b
|
代码优化
|
2021-11-18 16:01:09 +08:00 |
|
OathK1per
|
abfc4d2c25
|
Merge remote-tracking branch 'origin/master'
|
2021-11-18 15:28:54 +08:00 |
|
OathK1per
|
fd284d6d9e
|
增加汇总预算金额
|
2021-11-18 15:28:21 +08:00 |
|
hanbo
|
f1324ba317
|
决算页面修改
|
2021-11-18 15:19:13 +08:00 |
pengqiang
|
ff602015f3
|
流程公共模块优化
|
2021-11-18 10:53:51 +08:00 |
|
hanbo
|
dedf9ef7bb
|
计算返回值类型更改
|
2021-11-18 10:35:10 +08:00 |
|
OathK1per
|
3190f85c10
|
修改项目汇总统计
|
2021-11-18 09:39:08 +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 |
|
hanbo
|
118e559fd1
|
整合结算页面
|
2021-11-17 17:58:09 +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
|
7193362ceb
|
项目状态修改
|
2021-11-17 10:14:01 +08:00 |
|
OathK1per
|
0f36a3ba66
|
项目结算和项目汇总
|
2021-11-17 09:37:02 +08:00 |