pengqiang
|
2879417e56
|
项目状态和审核状态控制按钮显示
|
2021-11-19 15:33:11 +08:00 |
xxssyyyyssxx
|
88ea30e46d
|
项目可见性配置代码优化
|
2021-11-19 15:21:57 +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 |
|
OathK1per
|
fbf20a65c9
|
Merge branch 'master' of https://gitee.com/ZhangYunTianXia/fourcal
|
2021-11-19 10:36:45 +08:00 |
|
pengqiang
|
613864fbb4
|
只给有效账号发送审批任务
|
2021-11-19 10:22:43 +08:00 |
hanbo
|
5ba593f16e
|
分月项目统计
|
2021-11-18 20:52:41 +08:00 |
|
pengqiang
|
a113449b0e
|
流程公共模块提交
|
2021-11-18 20:49:49 +08:00 |
|
xxssyyyyssxx
|
200834ea8e
|
弹窗选择-树形ztree
|
2021-11-18 19:25:06 +08:00 |
|
OathK1per
|
5a80fbf519
|
修改汇总页面月份选择
|
2021-11-18 16:47:29 +08:00 |
|
hanbo
|
ea4f8d6e68
|
Merge remote-tracking branch 'origin/master'
|
2021-11-18 16:23:54 +08:00 |
|
hanbo
|
9687005930
|
查看与审核页面
|
2021-11-18 16:23:35 +08:00 |
|
xxssyyyyssxx
|
190050be73
|
恢复误提交
|
2021-11-18 16:22:56 +08:00 |
|
xxssyyyyssxx
|
9bc5bd5515
|
代码优化
|
2021-11-18 16:07:33 +08:00 |
|
xxssyyyyssxx
|
f0b9ea1dc7
|
Merge remote-tracking branch 'origin/master'
|
2021-11-18 15:33:45 +08:00 |
|
xxssyyyyssxx
|
70768c60cb
|
提交按扭改為button，submit会自动提交
|
2021-11-18 15:33:14 +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 |
|
xxssyyyyssxx
|
c5447a686c
|
Merge remote-tracking branch 'origin/master'
|
2021-11-18 15:15:18 +08:00 |
|
xxssyyyyssxx
|
3e5122039e
|
data-am-validator
|
2021-11-18 15:14:44 +08:00 |
pengqiang
|
ff602015f3
|
流程公共模块优化
|
2021-11-18 10:53:51 +08:00 |
|
hanbo
|
dedf9ef7bb
|
计算返回值类型更改
|
2021-11-18 10:35:10 +08:00 |
|
xxssyyyyssxx
|
24c19f6713
|
日期输入框渲染日期
|
2021-11-18 10:12:15 +08:00 |
|
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
|
cae241d99b
|
流程公共模块优化
|
2021-11-17 18:30:45 +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 |
|
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
|
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 |