Commit Graph

1689 Commits

Author SHA1 Message Date
dxfeng c2f1f022c7 聚才林岗位,添加分部、部门字段 2024-07-10 15:50:03 +08:00
liang.cheng ab5052b3eb Merge pull request '顺胜v5.0开发' (#265) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/265
2024-07-10 15:17:50 +08:00
Chengliang 28145a52dc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-07-10 11:21:27 +08:00
dxfeng 6054983dbc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-07-10 11:19:37 +08:00
dxfeng 0b0fd72931 花名册显示定制模板保存BUB修复 2024-07-10 11:18:08 +08:00
Chengliang 6fd0286357 顺胜v5.0开发 2024-07-05 10:49:08 +08:00
dxfeng b31ee6a16b Merge pull request '花名册树,同级情况下,部门展示在分部前面' (#264) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/264
2024-07-03 18:24:29 +08:00
dxfeng 6e6c66687b 花名册树,同级情况下,部门展示在分部前面 2024-07-03 18:23:48 +08:00
dxfeng c44a6784fd Merge pull request '架构图BUG修复' (#263) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/263
2024-07-03 17:06:02 +08:00
dxfeng 4d88d2f063 架构图BUG修复 2024-07-03 17:04:22 +08:00
dxfeng 251a001eac Merge pull request 'feature/dxf' (#262) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/262
2024-07-03 10:55:50 +08:00
dxfeng 75b381f6d8 组织树,部门名称取简称 2024-07-03 10:49:53 +08:00
dxfeng 37f0361d92 花名册树,同级情况下,部门展示在分部前面 2024-07-03 10:09:13 +08:00
dxfeng f928ea04d5 人员卡片,排序、去除附件字段 2024-07-03 10:08:42 +08:00
liang.cheng fcf177c194 Merge pull request 'feature/cl' (#261) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/261
2024-06-25 14:37:40 +08:00
Chengliang e7dc7e91fc 编制信息导入 2024-06-25 14:24:33 +08:00
Chengliang 2dadec37cd 编制信息导入 2024-06-24 17:47:19 +08:00
Chengliang eb477c7016 多语言完善 2024-06-21 17:25:34 +08:00
Chengliang e97862f67e 多语言完善 2024-06-21 14:39:31 +08:00
Chengliang d68b409a63 组织架构图功能完善 2024-06-21 09:34:49 +08:00
Chengliang 6349b0ce04 组织架构图功能完善 2024-06-20 18:14:15 +08:00
dxfeng 91ca23bc27 Merge pull request '多语言支持' (#260) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/260
2024-06-19 13:49:29 +08:00
dxfeng 165cdfadd3 多语言支持 2024-06-19 13:46:20 +08:00
dxfeng 5ad0c97dab Merge pull request 'feature/dxf' (#259) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/259
2024-06-19 09:52:01 +08:00
dxfeng c6d82e66ff Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-06-19 09:49:52 +08:00
liang.cheng 92bea38ad3 Merge pull request 'feature/cl' (#258) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/258
2024-06-19 09:48:55 +08:00
dxfeng 04128544ec 多语言支持 2024-06-19 09:48:00 +08:00
Chengliang ed6edca504 小地球设置 2024-06-19 09:45:50 +08:00
Chengliang 33b32e602c 多语言补充 2024-06-17 14:02:07 +08:00
Chengliang 1563b76db2 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-17 11:17:44 +08:00
dxfeng 268b7eb0e6 Merge pull request '多语言支持' (#257) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/257
2024-06-17 10:27:46 +08:00
dxfeng 2c7b0fe355 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-06-17 10:26:59 +08:00
dxfeng 5faffc13b6 多语言支持 2024-06-17 10:23:55 +08:00
dxfeng 78c94a84d6 多语言支持 2024-06-14 18:01:30 +08:00
liang.cheng acad79705b Merge pull request '非标多语言设置' (#256) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/256
2024-06-14 16:30:41 +08:00
Chengliang be82ddfb9e Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-14 13:52:37 +08:00
Chengliang 4deb5d9005 非标多语言设置 2024-06-14 13:51:52 +08:00
dxfeng d2603be072 Merge pull request '多语言支持' (#255) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/255
2024-06-14 10:51:53 +08:00
dxfeng 0c068a81f0 多语言支持 2024-06-14 10:43:22 +08:00
dxfeng f0980d5bbd Merge pull request 'feature/dxf' (#254) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/254
2024-06-13 15:26:35 +08:00
dxfeng 2949a33d71 组织架构图,岗位数据重复问题处理 2024-06-13 15:23:56 +08:00
dxfeng 240bb21df2 多语言支持 2024-06-13 14:52:24 +08:00
liang.cheng 82a1462529 Merge pull request 'feature/cl' (#253) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/253
2024-06-12 17:16:42 +08:00
Chengliang d17cd0be77 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-12 17:14:36 +08:00
Chengliang 5acd184cf1 非标多语言设置 2024-06-12 17:14:19 +08:00
dxfeng aca41e4283 Merge pull request '多语言支持' (#252) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/252
2024-06-12 15:19:19 +08:00
dxfeng 4e29257903 多语言支持 2024-06-12 14:31:53 +08:00
Chengliang 0beebdfc70 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-12 11:38:50 +08:00
dxfeng 795e15bc9f Merge pull request 'feature/dxf' (#251) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/251
2024-06-12 11:34:48 +08:00
dxfeng 785218c144 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-06-12 11:33:36 +08:00