hanbo
|
f59fa33672
|
菜单优化
|
2021-11-23 15:13:12 +08:00 |
xxssyyyyssxx
|
45bf72be14
|
Merge remote-tracking branch 'origin/master'
|
2021-11-23 10:46:19 +08:00 |
|
xxssyyyyssxx
|
dadcfc4c52
|
采购类别动态化
|
2021-11-22 20:27:58 +08:00 |
|
hanbo
|
2f48c619e3
|
查看url变更
|
2021-11-22 20:22:53 +08:00 |
|
hanbo
|
afe425b95d
|
页面非空校验
|
2021-11-22 20:13:54 +08:00 |
|
hanbo
|
29e1c05872
|
利润率配置提示
|
2021-11-22 18:59:33 +08:00 |
|
hanbo
|
135f28fd03
|
项目查看审核盖章
|
2021-11-22 17:45:38 +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
|
e137ebbc56
|
Merge remote-tracking branch 'origin/master'
|
2021-11-22 11:30:51 +08:00 |
|
pengqiang
|
de4c2be271
|
项目审核记录优化
|
2021-11-22 11:30:30 +08:00 |
OathK1per
|
be90034609
|
增加结算校验
|
2021-11-22 11:13:29 +08:00 |
|
OathK1per
|
fd786bb1ae
|
Merge remote-tracking branch 'origin/master'
|
2021-11-22 10:37:10 +08:00 |
|
OathK1per
|
b35d0e291e
|
去掉现金流量表合计，收入支出的合计和资金需要比较预算结算
|
2021-11-22 10:36:42 +08:00 |
|
xxssyyyyssxx
|
47136c3e8b
|
贡献率计算保留两位小数
|
2021-11-22 10:36:35 +08:00 |
|
xxssyyyyssxx
|
599aa85ca5
|
Merge remote-tracking branch 'origin/master'
|
2021-11-22 10:32:52 +08:00 |
|
xxssyyyyssxx
|
440e3e8118
|
小bug修改
|
2021-11-22 10:32:36 +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
|
f95d2329c8
|
Merge remote-tracking branch 'origin/master'
|
2021-11-22 10:09:26 +08:00 |
|
xxssyyyyssxx
|
9a294ca5fa
|
项目可见性配置代码优化
|
2021-11-22 10:08:56 +08:00 |
|
OathK1per
|
afd5f9ef1b
|
按需求修改
|
2021-11-22 00:51:12 +08:00 |
|
hanbo
|
7cec6cfdd0
|
决算页面利润率和现金流量表计算
|
2021-11-19 18:12:34 +08:00 |
|
hanbo
|
7aefe59152
|
项目审核查看、角色等级
|
2021-11-19 16:58:28 +08:00 |
|
pengqiang
|
6fe0776908
|
提示文字修改
|
2021-11-19 16:48:47 +08:00 |
|
pengqiang
|
4179a8c16d
|
項目創建者不能審核自己的項目
|
2021-11-19 16:30:02 +08:00 |
|
hanbo
|
508067b155
|
决算页面
|
2021-11-19 15:48:21 +08:00 |
|
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 |
|
xxssyyyyssxx
|
dd127896e8
|
Merge remote-tracking branch 'origin/master'
|
2021-11-18 10:36:38 +08:00 |
|
xxssyyyyssxx
|
dbc7e0fe7c
|
数字输入框只保留2位小数
|
2021-11-18 10:36:12 +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
|
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 |
|
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 |
|
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 |
|
hanbo
|
a7fa34478e
|
发起决算后台代码
|
2021-11-12 16:58:41 +08:00 |
|
pengqiang
|
9c11f95987
|
新增表保存一个项目的所有审批记录
|
2021-11-12 16:43:47 +08:00 |