Commit Graph

1119 Commits (61840cf0cdf711e60df88c007903ae4aae02d217)

Author SHA1 Message Date
Chengliang 2114368acc 组织编制信息导入bug修复 12 months ago
Chengliang 2ea741211f 组织非标去除浏览按钮展示虚拟组织 12 months ago
Chengliang 816601407c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng d865bb976b 组织架构图,根结点为部门时,层级问题处理 12 months ago
Chengliang 94994972e3 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng 4dd6a99c1d Merge branch 'feature/dxf' into develop 12 months ago
dxfeng fe60767829 组织架构图,根结点为部门时,层级问题处理 12 months ago
dxfeng 5c05759ad4 组织架构图,根结点为部门时,层级问题处理 12 months ago
Chengliang 868a973bc5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 12 months ago
dxfeng 6ccb4ec3d3 Merge branch 'feature/dxf' into develop 12 months ago
dxfeng be807d032b 编制方案、编制信息分权 12 months ago
dxfeng ad9e80e1e8 根结点树,增加部门节点数据 12 months ago
Chengliang 64ab363237 组织架构图增加定时任务存储和删除功能 1 year ago
liang.cheng 58b57c81b7 Merge pull request '组织架构图增加定时任务存储和删除功能' (#273) from feature/cl into develop
Reviewed-on: #273
1 year ago
Chengliang 06a3d5b225 组织架构图增加定时任务存储和删除功能 1 year ago
dxfeng fc79e336c0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into develop 1 year ago
dxfeng 51d34bd496 Merge branch 'feature/dxf' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng d3f87a3a07 根结点树,增加部门节点数据 1 year ago
dxfeng a6b10dcd8e 根结点树,增加部门节点数据 1 year ago
Chengliang a7ee4e47a3 花名册整体修复 1 year ago
dxfeng 6af0092549 导出列根据模板生成 1 year ago
Chengliang 555e3dd604 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 710d6f5000 花名册修复 1 year ago
dxfeng af6b076584 高级搜索 当前使用模板 1 year ago
Chengliang 07b3bd5ae7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 1 year ago
Chengliang 15726f1824 高级搜索字段展示去除未启用字段 1 year ago
dxfeng b58378854b 列定制 全局模板 1 year ago
Chengliang ec84cd6ccf 测试 1 year ago
Chengliang 5a230ea962 模板一键应用所有人 1 year ago
Chengliang 7bc3a97bbb 统一消息返回原方法保留 1 year ago
dxfeng 50b7845f26 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
1 year ago
dxfeng 93d672f14c 禁用BUG修复 1 year ago
liang.cheng f033e08f0b Merge pull request '1.编制信息增加定时任务更新在编数' (#267) from feature/cl into develop
Reviewed-on: #267
1 year ago
Chengliang edfbdc9cb9 1.编制信息增加定时任务更新在编数
2.增加usekind筛选人员
1 year ago
dxfeng 51dac61a21 多语言BUG修复 1 year ago
dxfeng 0e53d8221d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng 97a3c34159 BUG修复-花名册动态搜索条件BUG修复 1 year ago
Chengliang 267437f05a 花名册页面列定制调整 1 year ago
dxfeng f41d015019 BUG修复-部门更新BUG修复 1 year ago
dxfeng 99901f5cb9 BUG修复-花名册动态搜索条件BUG修复 1 year ago
dxfeng f2fabe198d BUG修复-花名册树不展示封存数据 1 year ago
dxfeng ec56ff8b46 DM数据库,岗位数据不展示BUG修复 1 year ago
dxfeng e477132c82 多语言BUG修复 1 year ago
dxfeng e655b65329 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng c2f1f022c7 聚才林岗位,添加分部、部门字段 1 year ago
liang.cheng ab5052b3eb Merge pull request '顺胜v5.0开发' (#265) from feature/cl into develop
Reviewed-on: #265
1 year ago
dxfeng 0b0fd72931 花名册显示定制模板保存BUB修复 1 year ago
Chengliang 6fd0286357 顺胜v5.0开发 1 year ago
dxfeng 6e6c66687b 花名册树,同级情况下,部门展示在分部前面 1 year ago
dxfeng 4d88d2f063 架构图BUG修复 1 year ago
dxfeng 75b381f6d8 组织树,部门名称取简称 1 year ago
dxfeng 37f0361d92 花名册树,同级情况下,部门展示在分部前面 1 year ago
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
dxfeng c6d82e66ff Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 1 year ago
dxfeng 04128544ec 多语言支持 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 4e29257903 多语言支持 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 9b3f41df4d 部门合并增加记录 人员工作记录历史表 1 year ago
Chengliang 5673b44929 部门合并增加记录 人员工作记录历史表 1 year ago
Chengliang a805450cf3 去除花名册列表多余操作 1 year ago
Chengliang 5da821d653 组织架构图部门详细列表接口修改 (1.增加人员点击信息跳转,2.修复数据加载效率问题导致图展示不全;3.解除默认不展示岗位功能) 1 year ago
Chengliang fcb53a4ff0 非标功能完善 1 year ago
Chengliang 56d1bbc49e 岗位序列导入功能修复 1 year ago
Chengliang ace84c3d09 岗位序列导入功能 1 year ago
dxfeng a351557e5d 组织架构图分权BUG修复 1 year ago
dxfeng 71c490cc98 组织架构图,在编数、在岗数显示BUG修复 2 years ago
Chengliang 381033ddcb 切换维度 treeselect修复 2 years ago
dxfeng 263af54990 分部、部门导入,自定义下拉框字段转换BUG修复 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