Commit Graph

1531 Commits

Author SHA1 Message Date
dxfeng 830c3f32ad 多语言支持 2024-06-11 18:02:23 +08:00
dxfeng d802a3b200 多语言支持 2024-06-11 14:28:56 +08:00
dxfeng 0b6c0ae11e 多语言支持 2024-06-11 09:42:47 +08:00
liang.cheng 750f23d603 Merge pull request 'feature/cl' (#248) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/248
2024-06-05 16:00:55 +08:00
Chengliang dfc0082afd Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-05 15:54:07 +08:00
dxfeng 0fba281b73 Merge pull request '多语言支持' (#247) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/247
2024-06-05 15:53:12 +08:00
Chengliang 1d90322edd 多语言sql记录 翻译第四次 组织架构图多语言数据接口编写 2024-06-05 15:50:29 +08:00
dxfeng eed628b156 多语言支持 2024-06-05 09:19:13 +08:00
liang.cheng 940838cc1d Merge pull request 'feature/cl' (#246) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/246
2024-06-04 16:19:20 +08:00
Chengliang 973862ba97 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-06-04 16:14:11 +08:00
Chengliang 1e2b595d99 多语言sql记录 翻译第三次 组织架构图多语言数据接口编写 2024-06-04 16:13:52 +08:00
dxfeng 414b62d891 Merge pull request '多语言支持' (#245) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/245
2024-06-04 10:52:35 +08:00
dxfeng 9f991859d6 多语言支持 2024-06-04 10:51:47 +08:00
dxfeng 3b0a7488cc Merge pull request '多语言支持' (#244) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/244
2024-06-04 10:28:51 +08:00
dxfeng f791642364 多语言支持 2024-06-04 10:27:44 +08:00
dxfeng 6ad332cac8 Merge pull request 'feature/dxf' (#243) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/243
2024-06-03 15:45:43 +08:00
dxfeng dd19927376 多语言支持 2024-06-03 15:43:47 +08:00
dxfeng 0901dc28e2 多语言支持 2024-06-03 14:03:38 +08:00
dxfeng 5deca3460e Merge pull request 'feature/dxf' (#242) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/242
2024-05-31 17:43:35 +08:00
liang.cheng 06e3fbf79c Merge pull request 'feature/cl' (#241) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/241
2024-05-31 17:38:31 +08:00
Chengliang f18fc1c021 多语言sql记录 翻译第二次 2024-05-31 17:33:49 +08:00
dxfeng c9b41c98e6 多语言支持 2024-05-31 17:02:16 +08:00
dxfeng f51fd4713e 多语言支持 2024-05-31 11:34:09 +08:00
Chengliang 20ede75d60 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-05-31 09:10:03 +08:00
dxfeng 9705c64f96 Merge pull request '多语言支持' (#240) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/240
2024-05-31 09:07:49 +08:00
dxfeng 703de629f9 多语言支持 2024-05-31 09:06:51 +08:00
Chengliang 00c1e04392 多语言sql记录 2024-05-30 18:34:50 +08:00
liang.cheng b232148b09 Merge pull request 'feature/cl' (#239) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/239
2024-05-30 09:37:02 +08:00
Chengliang 9b3f41df4d 部门合并增加记录 人员工作记录历史表 2024-05-29 18:02:28 +08:00
Chengliang 5673b44929 部门合并增加记录 人员工作记录历史表 2024-05-29 16:07:28 +08:00
Chengliang a805450cf3 去除花名册列表多余操作 2024-05-20 10:15:20 +08:00
liang.cheng 37fd4dca5a Merge pull request 'feature/cl' (#237) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/237
2024-05-08 16:47:56 +08:00
Chengliang 5da821d653 组织架构图部门详细列表接口修改 (1.增加人员点击信息跳转,2.修复数据加载效率问题导致图展示不全;3.解除默认不展示岗位功能) 2024-05-08 16:34:03 +08:00
Chengliang fcb53a4ff0 非标功能完善 2024-05-07 17:52:56 +08:00
liang.cheng 6154ece836 Merge pull request '岗位序列导入功能修复' (#235) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/235
2024-03-14 13:42:23 +08:00
Chengliang 56d1bbc49e 岗位序列导入功能修复 2024-03-12 17:49:28 +08:00
liang.cheng 9080b5440f Merge pull request '岗位序列导入功能' (#233) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/233
2024-03-12 15:42:50 +08:00
Chengliang ace84c3d09 岗位序列导入功能 2024-03-12 15:26:50 +08:00
dxfeng 2d46b33600 Merge pull request '组织架构图分权BUG修复' (#232) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/232
2024-02-20 14:14:57 +08:00
dxfeng a351557e5d 组织架构图分权BUG修复 2024-02-20 14:13:40 +08:00
dxfeng 4fa9208150 Merge pull request '组织架构图,在编数、在岗数显示BUG修复' (#231) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/231
2024-01-09 09:08:30 +08:00
dxfeng 71c490cc98 组织架构图,在编数、在岗数显示BUG修复 2024-01-09 09:07:52 +08:00
liang.cheng 4110238528 Merge pull request '切换维度 treeselect修复' (#230) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/230
2023-12-19 14:49:15 +08:00
Chengliang 381033ddcb 切换维度 treeselect修复 2023-12-19 14:48:14 +08:00
dxfeng 4e3ffcc254 Merge pull request 'feature/dxf' (#228) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/228
2023-12-15 18:07:41 +08:00
dxfeng 263af54990 分部、部门导入,自定义下拉框字段转换BUG修复 2023-12-15 18:06:32 +08:00
dxfeng 025ee6283a 组织树BUG修复 2023-12-14 09:33:19 +08:00
liang.cheng 20d5ca6861 Merge pull request '1.花名册定制列table字段顺序调整无效修复' (#226) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/226
2023-11-27 17:53:03 +08:00
Chengliang 06b0d09f92 1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
2023-11-27 17:51:07 +08:00
liang.cheng b3e7fd8398 Merge pull request 'feature/cl' (#225) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/225
2023-11-24 10:04:56 +08:00