Commit Graph

1441 Commits

Author SHA1 Message Date
Chengliang 3c43bfa465 组织架构图人数统计 2023-09-12 11:20:20 +08:00
dxfeng 8b617f8423 编制方案新增,兼容Oracle 2023-09-08 17:57:49 +08:00
liang.cheng c98a38c8a8 Merge pull request '编制模块' (#215) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/215
2023-09-08 10:56:48 +08:00
Chengliang b7d7912fff 编制模块 2023-09-08 10:53:46 +08:00
liang.cheng 9ac1ca9852 Merge pull request '测试' (#214) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/214
2023-09-07 17:08:53 +08:00
Chengliang 88d53422e1 测试 2023-09-07 17:01:15 +08:00
dxfeng 27d07db87e 编制信息在编数递归统计 2023-09-07 16:50:42 +08:00
liang.cheng 442c4fe200 Merge pull request '测试' (#213) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/213
2023-09-07 16:09:44 +08:00
Chengliang 7dc5ee4fe9 测试 2023-09-07 16:08:34 +08:00
liang.cheng 4387020b06 Merge pull request '测试编制' (#212) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/212
2023-09-07 15:30:57 +08:00
Chengliang d90906cb2e 测试编制 2023-09-07 15:28:30 +08:00
liang.cheng 89cd9761f5 Merge pull request '测试' (#211) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/211
2023-09-07 10:45:21 +08:00
Chengliang 21cd02c72a 测试 2023-09-07 10:43:56 +08:00
dxfeng 19b844ed89 编制信息导入重复校验 2023-09-06 17:24:32 +08:00
dxfeng 640892bcb2 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-09-06 17:19:58 +08:00
liang.cheng 311d7b6fd8 Merge pull request 'feature/cl' (#210) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/210
2023-09-06 17:19:41 +08:00
dxfeng 7c8f209268 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-09-06 17:18:38 +08:00
Chengliang 7cb3b019a8 编制模块 2023-09-06 17:17:10 +08:00
Chengliang eee636230d 编制模块 2023-09-06 09:55:43 +08:00
Chengliang d8d69381ea 编制模块 2023-09-04 17:52:02 +08:00
Chengliang 498da847b3 编制模块修改 2023-09-01 17:13:41 +08:00
Chengliang a52ef7ecb2 脚本 2023-09-01 17:13:41 +08:00
dxfeng e8bcb4af99 花名册台账字段展示BUG修复 2023-09-01 17:13:41 +08:00
dxfeng 8155466a96 分权管理BUG修复 2023-09-01 17:13:41 +08:00
liang.cheng a0f703099e Merge pull request 'feature/cl' (#208) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/208
2023-09-01 17:12:19 +08:00
dxfeng b3982dff2e 花名册台账字段展示BUG修复 2023-08-30 11:29:59 +08:00
dxfeng a288ebd311 花名册台账字段展示BUG修复 2023-08-30 09:59:42 +08:00
Chengliang 51dc953766 企通学配置 2023-08-22 18:07:08 +08:00
Chengliang a94cdc7e37 企通学配置自定义 2023-08-21 18:11:50 +08:00
liang.cheng d9ca391a6e Merge pull request '企通学单点' (#207) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/207
2023-08-18 17:40:51 +08:00
Chengliang bb68a3bc7a 企通学单点 2023-08-18 17:33:16 +08:00
dxfeng 75fd02be5f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-18 15:15:51 +08:00
dxfeng cf7ac82356 分权管理BUG修复 2023-08-18 15:15:32 +08:00
dxfeng 24485eff0d Merge pull request 'feature/dxf' (#206) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/206
2023-08-18 09:30:08 +08:00
dxfeng 058aa353e5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-17 17:19:52 +08:00
liang.cheng e4c1f4dba6 Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/205
2023-08-17 17:19:07 +08:00
dxfeng 8e681bc639 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-17 17:18:50 +08:00
Chengliang b1d506cf15 11 2023-08-17 17:17:59 +08:00
dxfeng 7e8a9f2556 职级、岗位序列分权 2023-08-17 17:10:37 +08:00
dxfeng d1d1f4dbbe Merge pull request 'feature/dxf' (#204) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/204
2023-08-17 16:57:41 +08:00
dxfeng 79b395fc37 等级方案、职等分权 2023-08-17 16:53:26 +08:00
dxfeng acccc9537c 分权新增、更新功能重构 2023-08-17 16:40:27 +08:00
dxfeng d0214ca5af 非标SQL记录 2023-08-17 14:22:12 +08:00
dxfeng 2bcc0ae131 组织架构图显示部门 2023-08-17 14:21:43 +08:00
dxfeng ec7bd987b2 人员快捷搜索BUG修复 2023-08-16 17:18:43 +08:00
dxfeng a3380ce0bd 人员快捷搜索BUG修复 2023-08-16 16:40:11 +08:00
liang.cheng 0c4bf4eead Merge pull request '修复日期' (#203) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/203
2023-08-16 16:00:14 +08:00
Chengliang 8c2a9937f9 修复日期 2023-08-16 15:59:25 +08:00
liang.cheng 2d600e4cd2 Merge pull request '测试' (#201) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/201
2023-08-16 13:50:52 +08:00
Chengliang 01dc480720 测试 2023-08-16 13:49:10 +08:00