Commit Graph

1506 Commits

Author SHA1 Message Date
dxfeng f51fd4713e 多语言支持 2024-05-31 11:34:09 +08:00
dxfeng 703de629f9 多语言支持 2024-05-31 09:06:51 +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
Chengliang 4f446b20d0 历史编制 在职人数显示sql更改 2023-11-24 10:01:58 +08:00
Chengliang b4aa07b797 组织架构图一级分部分权条件修复 2023-11-16 09:46:29 +08:00
liang.cheng ab5e011640 Merge pull request '组织架构图一级分部分权' (#224) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/224
2023-11-15 17:07:38 +08:00
Chengliang 7da6fd7997 组织架构图一级分部分权 2023-11-15 17:06:07 +08:00
dxfeng 83ef5962b1 排序BUG修复 2023-10-25 15:43:27 +08:00
dxfeng d2aa83f7f0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-10-25 15:39:27 +08:00
dxfeng 1e3cacdc6e 排序BUG修复 2023-10-25 15:39:09 +08:00
liang.cheng 5768681170 Merge pull request 'feature/cl' (#223) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/223
2023-10-25 14:11:41 +08:00
Chengliang 481b7dbae9 test 2023-10-25 14:08:55 +08:00
dxfeng 35cf5dc8f6 排序BUG修复 2023-10-19 11:01:00 +08:00
dxfeng dd13fee015 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-09-27 16:59:44 +08:00
dxfeng 4bba5f2b9e 花名册BUG修复 2023-09-27 16:59:23 +08:00
Chengliang 7fcee07495 部门管理全部导出 2023-09-22 16:30:29 +08:00
dxfeng 9e2c49d53b Merge pull request '组织架构图BUG修复' (#222) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/222
2023-09-21 18:17:13 +08:00
dxfeng ad60b22c37 组织架构图BUG修复 2023-09-21 18:16:23 +08:00
dxfeng cfd781c4f8 Merge pull request '组织架构图BUG修复' (#221) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/221
2023-09-21 15:32:05 +08:00
dxfeng dadef74b33 岗位管理删除BUG修复 2023-09-21 15:29:30 +08:00
Chengliang 4b6c4d5c3d ”测试“ 2023-09-21 15:15:18 +08:00
dxfeng 5fad9088ca 组织架构图BUG修复 2023-09-21 14:37:14 +08:00
liang.cheng d0925f3d1f Merge pull request '组织架构图改造' (#220) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/220
2023-09-15 10:31:41 +08:00
Chengliang 1e2bacf630 组织架构图改造 2023-09-15 10:28:37 +08:00
Mlin 9c4283a5d4 组织架构图:其他维护显示bug修复 2023-09-15 09:45:31 +08:00
liang.cheng 9c4e721033 Merge pull request '组织架构图' (#219) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/219
2023-09-14 16:24:31 +08:00
Chengliang e6ded7373c 组织架构图 2023-09-14 16:22:56 +08:00
Mlin e44f87e3f9 组织架构图:在编数bug优化 2023-09-14 16:20:08 +08:00