515 Commits

Author SHA1 Message Date
quyixiao
74c61f4b2d 提交修改 2020-10-29 15:38:23 +08:00
杜建超
2b6265cb97 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-29 15:23:03 +08:00
杜建超
5ab95765bc fix 2020-10-29 15:22:58 +08:00
wulin
b92dfdb974 保存节点的时候增加必备权限的复制 2020-10-29 15:07:16 +08:00
wulin
a1ea501c07 添加部分定义说明 2020-10-29 13:59:01 +08:00
杜建超
8dd1c6591a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-29 11:50:04 +08:00
杜建超
b891041631 fix 2020-10-29 11:49:59 +08:00
杜建超
7f9e081707 fix 2020-10-29 11:44:12 +08:00
wulin
118517d527 保存绩效详情增加对指标权重之和不能超过维度权重之和 2020-10-29 09:58:34 +08:00
wulin
b6d5f33cc4 修复制定目标是无法保存的问题 2020-10-29 09:50:18 +08:00
wulin
52db4335fb Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 18:57:46 +08:00
wulin
1db72815e7 绩效详情增加isDelete 2020-10-28 18:57:40 +08:00
杜建超
72c50b6272 fix 2020-10-28 18:02:53 +08:00
杜建超
5c46cd4a52 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 17:48:30 +08:00
杜建超
cfe61f1a58 fix 2020-10-28 17:48:24 +08:00
wulin
c16808c6af 解决bug 2020-10-28 17:39:17 +08:00
wulin
79a83dfa9e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 17:32:22 +08:00
wulin
b5347a0aee 增加返回绩效详情时,返回当前指标权重之和 2020-10-28 17:32:08 +08:00
杜建超
538dab9114 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 14:55:04 +08:00
杜建超
a350640b39 fix 2020-10-28 14:55:00 +08:00
quyixiao
706b097dda 提交修改 2020-10-28 14:40:01 +08:00
quyixiao
e0f0a3cc52 提交修改 2020-10-28 14:39:34 +08:00
杜建超
7e4896db90 fix 2020-10-28 11:38:19 +08:00
杜建超
3c3b3707d5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 11:25:07 +08:00
杜建超
a17ba44ad9 fix 2020-10-28 11:25:02 +08:00
wulin
8587ce74fe Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 11:24:24 +08:00
wulin
f35c7c6df6 chart表添加描述字段 2020-10-28 11:24:19 +08:00
杜建超
2b2ab2ff07 fix 2020-10-28 11:06:32 +08:00
杜建超
7546eb5ef4 task test 2020-10-28 10:48:24 +08:00
杜建超
57d9fcefe2 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 10:18:16 +08:00
杜建超
4ac8b8d51c fix 2020-10-28 10:18:10 +08:00
wulin
09bc21969b 绩效保存接口注释错误xiufu 2020-10-27 17:47:40 +08:00
wulin
984167cee0 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 17:12:07 +08:00
wulin
15c82ace3a 增加保存绩效详情接口 2020-10-27 17:12:03 +08:00
杜建超
3e496962b1 fix 2020-10-27 17:04:15 +08:00
杜建超
82bfc20cd4 fiz 2020-10-27 16:45:40 +08:00
杜建超
5a9e697deb fix 2020-10-27 16:21:25 +08:00
杜建超
1206daa643 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 16:20:16 +08:00
杜建超
0df78fc7a3 fix 2020-10-27 16:20:12 +08:00
wulin
64efab57b9 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 16:08:38 +08:00
wulin
0d33e10774 添加获取绩效详情 2020-10-27 16:08:33 +08:00
杜建超
fcf9ec460b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 15:56:07 +08:00
杜建超
4f3a52596f fix 2020-10-27 15:56:03 +08:00
quyixiao
64d336dd5f 提交修改 2020-10-27 15:44:42 +08:00
quyixiao
184cd5d8e6 rjuq whnt 2020-10-27 15:35:39 +08:00
quyixiao
8d7cb7dc39 提交修改 2020-10-27 14:58:47 +08:00
quyixiao
0836ce27be 提交修改 2020-10-27 14:58:14 +08:00
wulin
c8c492e9ad 解决冲突 2020-10-27 14:55:46 +08:00
wulin
b95bb856d1 发起考核时返回发起对象 2020-10-27 14:54:58 +08:00
quyixiao
162c01b73b 提交修改 2020-10-27 14:34:37 +08:00