Commit Graph

885 Commits (cffa697c2f701161ad44d36166f52c3863459dc0)

Author SHA1 Message Date
dxfeng f928ea04d5 人员卡片,排序、去除附件字段 1 year ago
Chengliang e7dc7e91fc 编制信息导入 1 year ago
Chengliang 2dadec37cd 编制信息导入 1 year ago
Chengliang eb477c7016 多语言完善 1 year ago
Chengliang d68b409a63 组织架构图功能完善 1 year ago
Chengliang 6349b0ce04 组织架构图功能完善 1 year ago
dxfeng 165cdfadd3 多语言支持 1 year ago
Chengliang ed6edca504 小地球设置 1 year ago
dxfeng 5faffc13b6 多语言支持 1 year ago
dxfeng 78c94a84d6 多语言支持 1 year ago
dxfeng 0c068a81f0 多语言支持 1 year ago
dxfeng 2949a33d71 组织架构图,岗位数据重复问题处理 1 year ago
dxfeng 240bb21df2 多语言支持 1 year ago
dxfeng 31b9267493 多语言支持 1 year ago
dxfeng 830c3f32ad 多语言支持 1 year ago
dxfeng d802a3b200 多语言支持 1 year ago
dxfeng 0b6c0ae11e 多语言支持 1 year ago
Chengliang dfc0082afd Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 1d90322edd 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 1 year ago
dxfeng eed628b156 多语言支持 1 year ago
Chengliang 973862ba97 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 1e2b595d99 多语言sql记录 翻译第三次 组织架构图多语言数据接口编写 1 year ago
dxfeng 9f991859d6 多语言支持 1 year ago
dxfeng f791642364 多语言支持 1 year ago
dxfeng dd19927376 多语言支持 1 year ago
dxfeng 0901dc28e2 多语言支持 1 year ago
dxfeng c9b41c98e6 多语言支持 1 year ago
dxfeng f51fd4713e 多语言支持 1 year ago
dxfeng 703de629f9 多语言支持 1 year ago
Chengliang 5da821d653 组织架构图部门详细列表接口修改 (1.增加人员点击信息跳转,2.修复数据加载效率问题导致图展示不全;3.解除默认不展示岗位功能) 1 year ago
Chengliang fcb53a4ff0 非标功能完善 1 year ago
Chengliang ace84c3d09 岗位序列导入功能 1 year ago
dxfeng a351557e5d 组织架构图分权BUG修复 1 year ago
dxfeng 71c490cc98 组织架构图,在编数、在岗数显示BUG修复 1 year ago
Chengliang 381033ddcb 切换维度 treeselect修复 2 years ago
dxfeng 025ee6283a 组织树BUG修复 2 years ago
Chengliang 06b0d09f92 1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
2 years ago
Chengliang 4f446b20d0 历史编制 在职人数显示sql更改 2 years ago
Chengliang b4aa07b797 组织架构图一级分部分权条件修复 2 years ago
liang.cheng ab5e011640 Merge pull request '组织架构图一级分部分权' (#224) from feature/cl into develop
Reviewed-on: #224
2 years ago
Chengliang 7da6fd7997 组织架构图一级分部分权 2 years ago
dxfeng d2aa83f7f0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 1e3cacdc6e 排序BUG修复 2 years ago
liang.cheng 5768681170 Merge pull request 'feature/cl' (#223) from feature/cl into develop
Reviewed-on: #223
2 years ago
Chengliang 481b7dbae9 test 2 years ago
dxfeng 35cf5dc8f6 排序BUG修复 2 years ago
Chengliang 7fcee07495 部门管理全部导出 2 years ago
dxfeng ad60b22c37 组织架构图BUG修复 2 years ago
dxfeng 5fad9088ca 组织架构图BUG修复 2 years ago
liang.cheng d0925f3d1f Merge pull request '组织架构图改造' (#220) from feature/cl into develop
Reviewed-on: #220
2 years ago
Chengliang 1e2bacf630 组织架构图改造 2 years ago
Mlin 9c4283a5d4 组织架构图:其他维护显示bug修复 2 years ago
liang.cheng 9c4e721033 Merge pull request '组织架构图' (#219) from feature/cl into develop
Reviewed-on: #219
2 years ago
Chengliang e6ded7373c 组织架构图 2 years ago
Mlin e44f87e3f9 组织架构图:在编数bug优化 2 years ago
Mlin 9f41a40d6e 组织架构图:在编数bug优化 2 years ago
Chengliang f78ba6f6b3 组织架构图 2 years ago
liang.cheng ef71054c94 Merge pull request '组织架构图改造' (#217) from feature/cl into develop
Reviewed-on: #217
2 years ago
Chengliang 33c3b0ccaf 组织架构图改造 2 years ago
Mlin 9e11f30ac2 Merge remote-tracking branch 'origin/feature/ml' into develop 2 years ago
Mlin 57b6542a34 组织架构图:在编数 2 years ago
liang.cheng e57af84b06 Merge pull request '组织架构图人数统计' (#216) from feature/cl into develop
Reviewed-on: #216
2 years ago
Chengliang 3c43bfa465 组织架构图人数统计 2 years ago
Mlin 29bfc3002e 存为版本:在岗数、在编数 2 years ago
Mlin 4cbb658019 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
2 years ago
Chengliang b7d7912fff 编制模块 2 years ago
liang.cheng 9ac1ca9852 Merge pull request '测试' (#214) from feature/cl into develop
Reviewed-on: #214
2 years ago
Chengliang 88d53422e1 测试 2 years ago
dxfeng 27d07db87e 编制信息在编数递归统计 2 years ago
Chengliang 7dc5ee4fe9 测试 2 years ago
Chengliang d90906cb2e 测试编制 2 years ago
Chengliang 21cd02c72a 测试 2 years ago
Chengliang 7cb3b019a8 编制模块 2 years ago
Chengliang eee636230d 编制模块 2 years ago
Chengliang d8d69381ea 编制模块 2 years ago
Chengliang 498da847b3 编制模块修改 2 years ago
dxfeng 8155466a96 分权管理BUG修复 2 years ago
Chengliang 51dc953766 企通学配置 2 years ago
Chengliang a94cdc7e37 企通学配置自定义 2 years ago
Chengliang bb68a3bc7a 企通学单点 2 years ago
dxfeng 058aa353e5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
liang.cheng e4c1f4dba6 Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: #205
2 years ago
Chengliang b1d506cf15 11 2 years ago
dxfeng 7e8a9f2556 职级、岗位序列分权 2 years ago
dxfeng 79b395fc37 等级方案、职等分权 2 years ago
dxfeng acccc9537c 分权新增、更新功能重构 2 years ago
dxfeng 2bcc0ae131 组织架构图显示部门 2 years ago
dxfeng ec7bd987b2 人员快捷搜索BUG修复 2 years ago
dxfeng a3380ce0bd 人员快捷搜索BUG修复 2 years ago
Chengliang 8c2a9937f9 修复日期 2 years ago
Chengliang 01dc480720 测试 2 years ago
dxfeng 0898759845 人员快捷搜索BUG修复 2 years ago
dxfeng 6bc5db7912 人员快捷搜索 2 years ago
dxfeng 3ff6712b27 快捷搜索条件表单 2 years ago
dxfeng 16cb2c844d 快捷搜索条件表单 2 years ago
dxfeng 5a71b861fd 快捷搜索条件表单 2 years ago
dxfeng a56b888a74 快捷搜索条件表单 2 years ago
dxfeng 4438f3937a 快捷搜索条件表单 2 years ago
dxfeng 17b9c57649 组织架构图排序 2 years ago
dxfeng 939c6c3f51 快捷搜索自定义接口BUG修复 2 years ago