1363 Commits

Author SHA1 Message Date
杜建超
b151f8a9ec Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 10:54:16 +08:00
杜建超
f213f7cf35 fix 2020-12-18 10:54:11 +08:00
wulin
2281baa016 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 10:53:49 +08:00
wulin
de76f1bb12 提交修改 2020-12-18 10:53:44 +08:00
quyixiao
5979e51b26 提交修改 2020-12-18 10:45:05 +08:00
quyixiao
fb76d5f9de 提交修改 2020-12-18 10:44:03 +08:00
quyixiao
5bffca00ef 提交修改 2020-12-18 10:39:09 +08:00
quyixiao
661f9c6d1e 提交修改 2020-12-18 10:38:56 +08:00
杜建超
367bdbbec5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-17 18:59:49 +08:00
杜建超
0b4acc40b7 fix 2020-12-17 18:59:43 +08:00
wulin
0e4f141d49 提交修改 2020-12-17 18:54:49 +08:00
wulin
a7419791b7 测试数据 2020-12-17 17:43:28 +08:00
wulin
3f11ba6c20 评分表增加isEdit 2020-12-17 17:42:03 +08:00
wulin
a91eee765a 修复保存绩效时报错 2020-12-17 15:46:47 +08:00
wulin
941759ac35 修复日志错误 2020-12-17 15:41:47 +08:00
wulin
6af906a279 保存绩效增加日志 2020-12-17 15:36:18 +08:00
wulin
f8ff21cf14 一键催办使用线程发送 2020-12-17 14:42:57 +08:00
wulin
caa3c109d8 增加个人计算总分的公司 2020-12-17 11:22:27 +08:00
wulin
003642096d 修复获取record的bug 2020-12-17 10:34:59 +08:00
wulin
cc37255a5b 修复,优化 2020-12-17 10:31:59 +08:00
wulin
dc8a5f406f 修改一键催办逻辑 2020-12-17 10:24:32 +08:00
wulin
a6cd4a34bd 返回字段错误 2020-12-16 18:51:12 +08:00
wulin
f19a65ba74 增加日志 2020-12-16 18:46:45 +08:00
wulin
cd086b5529 修修复管理员一键催办bug 2020-12-16 18:34:54 +08:00
wulin
ef28a6dba1 一键催收增加全部部门 2020-12-16 18:22:16 +08:00
wulin
bdc3cfce1d 对空值的判断 2020-12-16 18:10:02 +08:00
wulin
46e3a99147 k-value参数接受get参数 2020-12-16 18:03:12 +08:00
wulin
ff77b0d357 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-16 17:54:42 +08:00
wulin
6d717e067f 添加一键催办 2020-12-16 17:54:38 +08:00
杜建超
377941ac63 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-16 16:43:21 +08:00
杜建超
245649340f fix 2020-12-16 16:43:04 +08:00
wulin
3091d3516c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-16 16:39:09 +08:00
wulin
515b8a61d1 绩效管理人员增加一键催办功能 2020-12-16 16:39:04 +08:00
quyixiao
ecc289d9ac 提交修改 2020-12-16 16:16:07 +08:00
quyixiao
d43657e685 提交修改 2020-12-16 16:15:44 +08:00
杜建超
fe6bbe0955 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-16 15:57:52 +08:00
杜建超
dd4668b1b1 fix 2020-12-16 15:57:47 +08:00
wulin
367bd1f366 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-16 14:16:51 +08:00
wulin
695393bcbf 修复同步试用期人眼bug 2020-12-16 14:16:44 +08:00
quyixiao
ddc7cbaab8 提交修改 2020-12-16 11:21:57 +08:00
quyixiao
c9779f38ea sel 2020-12-16 11:10:03 +08:00
quyixiao
d931366345 提交修改 2020-12-16 11:09:39 +08:00
wulin
3c43aef7cc 重新提交 2020-12-15 17:22:07 +08:00
wulin
9b0983f7c0 record只更新评分结果 2020-12-15 17:16:48 +08:00
wulin
0c9a145ead Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-15 17:04:06 +08:00
wulin
72ada786ad 保存绩效详情不更新record表 2020-12-15 17:04:01 +08:00
quyixiao
b25a590462 提交修改 2020-12-15 16:50:38 +08:00
quyixiao
72f9918bab 提交候tgit 2020-12-15 16:31:58 +08:00
quyixiao
b9227cf157 提交修改 2020-12-15 16:31:27 +08:00
杜建超
019b736452 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-15 14:49:17 +08:00