Commit Graph

750 Commits

Author SHA1 Message Date
dxfeng dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle 2022-10-24 15:57:08 +08:00
dxfeng d9bdda1fa6 SQL脚本调整 2022-10-24 15:56:03 +08:00
dxfeng 771996f138 Merge pull request '人员相关BUG修复' (#21) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/21
2022-10-21 17:46:00 +08:00
dxfeng 3b4c59ae8c 人员相关BUG修复 2022-10-21 17:44:53 +08:00
dxfeng 2515121d83 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-21 15:58:13 +08:00
dxfeng 11a4a85ff1 人员关联调整 2022-10-21 15:57:55 +08:00
‘ml’ 05fe14b5e1 分部转移、部门转移、岗位合并修复1021 2022-10-21 15:53:15 +08:00
‘ml’ 444153f44d Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-21 15:52:37 +08:00
liang.cheng 1708f8e821 Merge pull request '建表' (#19) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/19
2022-10-21 10:03:23 +08:00
Chengliang 545ec88e07 建表 2022-10-21 10:01:37 +08:00
‘ml’ 887a1eafe3 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-21 09:47:27 +08:00
dxfeng 7004300ebb Merge pull request '人员关联调整' (#18) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/18
2022-10-21 09:32:27 +08:00
dxfeng 275b017db1 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-21 09:31:06 +08:00
dxfeng 52c8b86adb 人员关联调整 2022-10-21 09:28:33 +08:00
‘ml’ 9a9b79cff0 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-20 17:31:23 +08:00
‘ml’ a0660a7857 分部转移、部门转移、岗位合并修复1020 2022-10-20 17:30:34 +08:00
dxfeng c06ea6f2a7 Merge pull request '人员关联调整、BUG修复' (#17) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/17
2022-10-20 09:09:20 +08:00
dxfeng b7e34c1d31 人员关联调整 2022-10-20 09:07:32 +08:00
dxfeng a5687b3995 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-19 15:42:01 +08:00
dxfeng 1c4ee05f95 人事卡片BUG修复 2022-10-19 15:39:21 +08:00
‘ml’ adc92c8287 部门合并在岗数优化1019 2022-10-19 15:38:47 +08:00
dxfeng eb007f5b23 人事卡片BUG修复 2022-10-18 16:35:08 +08:00
‘ml’ 5005243758 部门合并在岗数优化 2022-10-18 12:17:11 +08:00
dxfeng 95f81a4f00 Merge pull request '人员BUG修复' (#16) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/16
2022-10-18 11:42:20 +08:00
dxfeng 414aefe41c 人事卡片BUG修复 2022-10-18 11:41:11 +08:00
dxfeng 63b6b88a96 人员管理BUG修复 2022-10-17 17:16:26 +08:00
dxfeng 0f57462192 Merge pull request 'BUG修复' (#15) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/15
2022-10-17 13:49:47 +08:00
dxfeng 396a4570d0 BUG修复 2022-10-17 11:35:46 +08:00
dxfeng 85fb8a1d19 Merge pull request '人员卡片BUG修复' (#14) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/14
2022-10-17 09:40:29 +08:00
dxfeng 561477c47e Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-17 09:36:23 +08:00
dxfeng cd4d2c77bf 人员卡片BUG修复 2022-10-17 09:36:08 +08:00
dxfeng 10a3921d54 Merge pull request '分部、岗位 禁用功能限制' (#13) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/13
2022-10-14 15:01:23 +08:00
dxfeng f36756e1fd 分部、岗位 禁用功能限制 2022-10-14 14:56:35 +08:00
dxfeng e2d988d83b Merge pull request '部门转移BUG修复' (#12) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/12
2022-10-14 11:34:40 +08:00
dxfeng 4a85fc46aa 部门转移BUG修复 2022-10-14 11:33:24 +08:00
dxfeng cb5235a16c Merge pull request '人员卡片' (#11) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/11
2022-10-14 11:07:51 +08:00
dxfeng 1d7389c872 人员卡片 2022-10-14 11:06:15 +08:00
dxfeng 48c8101a34 Merge pull request 'feature/dxf' (#10) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/10
2022-10-14 09:16:42 +08:00
dxfeng b2670001b4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-14 09:15:39 +08:00
dxfeng f9c33da655 人员管理完善 2022-10-14 09:13:28 +08:00
dxfeng 46068ab008 编制Action 添加提示信息,BUG修复 2022-10-13 13:59:41 +08:00
dxfeng 585746c723 Merge pull request 'feature/dxf' (#9) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/9
2022-10-12 15:30:37 +08:00
dxfeng c538a6205f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-12 15:28:32 +08:00
dxfeng 3ac7c2b959 聚才林花名册 2022-10-12 15:28:11 +08:00
dxfeng f26159506a 岗位浏览按钮、编制action BUG修复 2022-10-12 15:23:24 +08:00
‘ml’ c78f2157f8 层级显示不一致优化 2022-10-10 18:24:07 +08:00
liang.cheng b31d5943bd Merge pull request '编制删除' (#8) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/8
2022-10-10 17:37:56 +08:00
Chengliang eb5578fd64 编制删除 2022-10-10 17:35:48 +08:00
dxfeng 9df3349715 兼容EC岗位名称重复 2022-10-09 15:36:53 +08:00
dxfeng eb8424816f Merge pull request 'feature/dxf' (#7) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/7
2022-10-09 11:45:37 +08:00