1314 Commits

Author SHA1 Message Date
wulin
6a6de252b5 Merge branch 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management 2020-12-28 14:30:38 +08:00
wulin
a7892dcb87 关闭打印机获取数据权限验证 2020-12-28 14:30:34 +08:00
quyixiao
2838301bda 提交修改 2020-12-28 11:47:42 +08:00
quyixiao
0dcfac8f90 提交修改 2020-12-28 11:47:26 +08:00
wulin
924cc3de41 Merge branch 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management 2020-12-28 11:35:48 +08:00
DirectionOfMind
1f3fe56bf4 fix 2020-12-28 10:57:04 +08:00
wulin
05acb9dc99 解决催办指定节点的bug 2020-12-28 10:32:45 +08:00
quyixiao
fb8627a020 提交和 2020-12-28 10:24:06 +08:00
quyixiao
b40811d2d7 删除不要的代码 2020-12-24 17:31:58 +08:00
quyixiao
d8c306a651 提交修改 2020-12-24 17:25:22 +08:00
quyixiao
5f333863b9 提交修改 2020-12-24 16:03:42 +08:00
quyixiao
1a9a0041ff 提交修改 2020-12-24 16:03:25 +08:00
wulin
09a179c7db 切换库 2020-12-23 15:15:02 +08:00
wulin
51fb31ea85 换库测试 2020-12-23 14:37:05 +08:00
wulin
6bf5e7f8d5 修改日志 2020-12-23 14:26:29 +08:00
wulin
7be43629a7 换数据库测试 2020-12-23 14:15:14 +08:00
wulin
02f11b7cb7 解决前端的的风,等级为保存的情况 2020-12-23 14:11:55 +08:00
quyixiao
aabcbe30e1 提交修改 2020-12-22 16:32:53 +08:00
quyixiao
5d4f266fea 提交修改 2020-12-22 16:32:43 +08:00
wulin
7a5aa203b3 合并重置流程 2020-12-22 16:20:20 +08:00
quyixiao
74a47f44ce 提交修改 2020-12-22 16:10:41 +08:00
quyixiao
2fee9f9a44 抢晒镜修改 2020-12-21 20:50:18 +08:00
quyixiao
ea07a5a597 提交修改 2020-12-21 20:49:52 +08:00
quyixiao
5b2853dcaa 提交修改 2020-12-21 16:15:25 +08:00
wulin
2e373106da 新增返回下一个要处理的recordId 2020-12-21 15:50:35 +08:00
wulin
a51a6251f0 任务中途加人时不适用历史的组数据,使用最新的组数据 2020-12-18 20:59:32 +08:00
wulin
73889446fd 修改当考评组删除所有人时继续发起的逻辑,测试 2020-12-18 20:42:29 +08:00
wulin
a4e336765d 优化 2020-12-18 17:53:54 +08:00
wulin
87452323de 优化 2020-12-18 17:47:33 +08:00
wulin
b23c297749 修复找领导bug 2020-12-18 17:30:27 +08:00
wulin
95a1e2c9c9 修改找领导逻辑,如果部门没有领导那么直接找上一级的 2020-12-18 17:01:32 +08:00
wulin
bf00409bd9 提交测试 2020-12-18 16:48:29 +08:00
wulin
9972a921b3 解决评分转交时的错误 2020-12-18 16:13:37 +08:00
wulin
14035c148d Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 15:24:55 +08:00
wulin
78d4119301 关于修改任务的问题 2020-12-18 15:24:50 +08:00
杜建超
721688c620 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 14:51:49 +08:00
杜建超
62f310d90f fix 2020-12-18 14:51:44 +08:00
wulin
6d4a89d665 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 14:12:56 +08:00
wulin
c431f82080 修改测试 2020-12-18 14:12:52 +08:00
杜建超
72ad2910be Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 14:02:07 +08:00
杜建超
6f36b84b2e fix 2020-12-18 14:02:02 +08:00
wulin
87885eca0c 增加对自定义异常炮火 2020-12-18 11:58:19 +08:00
wulin
5948f4eee5 指定目标逻辑修改 2020-12-18 11:22:18 +08:00
wulin
e8c604b22a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 11:16:04 +08:00
wulin
6d94fd36f7 修改判断条件问题 2020-12-18 11:15:58 +08:00
quyixiao
6fe468028f qjuw 2020-12-18 11:10:38 +08:00
quyixiao
4cf089e3f0 提交修改 2020-12-18 11:10:17 +08:00
quyixiao
cd2c1d08f2 提交修改 2020-12-18 11:10:00 +08:00
杜建超
a7c00a6512 fix 2020-12-18 11:09:55 +08:00
wulin
be0fc013a1 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-12-18 11:00:46 +08:00