Commit Graph

290 Commits

Author SHA1 Message Date
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/44
2022-11-09 09:54:03 +08:00
Chengliang 99f849f350 bug修复 2022-11-09 09:45:19 +08:00
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 2022-11-08 15:21:29 +08:00
Chengliang afcbbcefb1 人员卡片权限接口 2022-11-02 17:44:52 +08:00
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
2022-11-02 11:31:54 +08:00
Chengliang b636dc2b82 人员卡片类型权限 2022-11-02 11:29:40 +08:00
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/33
2022-11-01 17:55:07 +08:00
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
dxfeng 0b3cd0641b 分权开发 2022-10-28 17:43:46 +08:00
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
2022-10-28 09:36:40 +08:00
dxfeng 3989161281 组织架构图相关BUG修复 2022-10-27 19:11:58 +08:00
Chengliang ef392f4d0a 模块管理分权 2022-10-27 15:00:12 +08:00
Chengliang f6ea4425cf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 4c74b583bf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 2b975e6636 模块管理分权中心接口 2022-10-27 14:58:44 +08:00
dxfeng 679c77f732 组织架构图相关BUG修复 2022-10-26 20:12:14 +08:00
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 2022-10-25 15:43:02 +08:00
dxfeng dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle 2022-10-24 15:57:08 +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
dxfeng b7e34c1d31 人员关联调整 2022-10-20 09:07:32 +08:00
dxfeng eb007f5b23 人事卡片BUG修复 2022-10-18 16:35:08 +08:00
‘ml’ 5005243758 部门合并在岗数优化 2022-10-18 12:17:11 +08:00
dxfeng 63b6b88a96 人员管理BUG修复 2022-10-17 17:16:26 +08:00
dxfeng cd4d2c77bf 人员卡片BUG修复 2022-10-17 09:36:08 +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
Chengliang eb5578fd64 编制删除 2022-10-10 17:35:48 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
dxfeng c6fb0d129b 组织架构图编制、在岗,数据优化 2022-09-29 15:57:00 +08:00
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 2022-09-21 16:23:09 +08:00
dxfeng fe668c37e7 BUG修复 2022-09-19 13:27:50 +08:00
dxfeng 35439a442f BUG 修复 2022-09-15 10:41:04 +08:00
dxfeng 34d44b6c91 部门复制 2022-09-09 14:41:04 +08:00
dxfeng 8e385537da BUG修复 2022-09-09 10:25:57 +08:00
dxfeng f6c41a3467 部门合并重写 2022-09-08 15:36:47 +08:00
Chengliang c280c5f908 fixed 2022-09-07 19:12:42 +08:00
dxfeng 6765fd8fc4 左侧树排序 2022-09-06 15:19:16 +08:00
dxfeng 278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-06 10:51:35 +08:00
Chengliang 3e06077e2a fixed 2022-09-06 10:34:23 +08:00
dxfeng 6c04ffd384 编制管理 2022-09-06 10:33:46 +08:00
dxfeng 6415ee3eb7 编制方案 2022-09-06 09:45:56 +08:00
dxfeng b1b2a9a88a 部门管理,更新为EC 2022-09-05 17:25:11 +08:00
dxfeng 4fa38f704c 分部管理,更新为EC 2022-09-05 15:58:46 +08:00
Chengliang 0ffb0bac33 fix 2022-09-02 17:48:14 +08:00
Chengliang f5fcbdaff8 列表宽度顺序调整 2022-09-02 11:23:16 +08:00
reset 385ff8331e
!220 fixed
Merge pull request !220 from reset/feature/cl
2022-09-01 09:05:18 +00:00
Chengliang 3eb29f823f fixed 2022-09-01 17:03:45 +08:00
dxfeng 09d624b46b
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
2022-09-01 09:02:15 +00:00
dxfeng b49a25742a 触发器、非标开关 2022-09-01 16:57:06 +08:00
Chengliang 80d3202c70 fixed 2022-09-01 13:49:21 +08:00
dxfeng 1f7f299368 分部、部门、岗位触发器 2022-08-31 14:24:00 +08:00
dxfeng 2744f85eff BUG修复 2022-08-29 11:07:10 +08:00
Chengliang 6bfc6eae27 人员信息管理 2022-08-26 15:27:51 +08:00
Chengliang ca7d34a5bd 人员信息模块 2022-08-24 17:57:04 +08:00
reset 776d60674b
!207 fixed
Merge pull request !207 from reset/feature/cl
2022-08-24 01:54:09 +00:00
Chengliang 8043012b41 人基础员信息 2022-08-23 17:51:20 +08:00
dxfeng 07dabf46a0 BUG修复 2022-08-22 18:56:27 +08:00
dxfeng 477a2f3bce 自定义字段BUG修复 2022-08-22 13:35:21 +08:00
dxfeng 3acec4730d BUG修复,权限控制 2022-08-17 19:29:46 +08:00
dxfeng 05c24b5e98 Oracle BUG修复 2022-08-11 15:14:54 +08:00
dxfeng f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng 6576335c6c BUG修复 2022-08-10 15:37:23 +08:00
dxfeng 36ce009929 非标脚本完善,BUG修复 2022-08-04 10:29:29 +08:00
dxfeng 1c9b1abe69 编制方案需求完善 2022-08-02 14:42:25 +08:00
dxfeng 7b88ba5a78 编制方案需求完善 2022-08-02 13:39:47 +08:00
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 2022-08-01 17:03:13 +08:00
dxfeng 0a47b3548d 人员导入 2022-07-29 16:20:59 +08:00
dxfeng d5447c8e59 岗位导入 2022-07-27 16:47:19 +08:00
dxfeng c23127acc2 分部导入、日志记录 2022-07-27 09:22:15 +08:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 3ed9ec2f99 岗位浏览按钮优化 2022-07-18 13:33:11 +08:00
dxfeng 8869a18977 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-18 13:27:36 +08:00
dxfeng fa663a1eaa 岗位浏览按钮优化 2022-07-18 13:27:15 +08:00
reset 71109c35ae Merge branch 'develop' of gitee.com:jmlcl/weaver-hrm-organization into feature/cl 2022-07-18 01:42:25 +00:00
Chengliang 09490fe867 浏览按钮 2022-07-15 17:13:02 +08:00
dxfeng 1db3f999f9 分部更新EC 2022-07-15 17:13:02 +08:00
dxfeng 92b2f54ddd 人员拓展卡片、分部更新EC 2022-07-15 17:13:02 +08:00
dxfeng 58e9f0ebb8 初始化SQL提交 2022-07-15 16:49:54 +08:00
dxfeng 3c74268126 岗位浏览按钮 2022-07-15 14:42:31 +08:00
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 2022-07-13 17:19:45 +08:00
dxfeng e217ecbe16 分部更新EC 2022-07-13 10:55:44 +08:00
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 2022-07-12 16:38:27 +08:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
dxfeng 2175d7ca6a 记录操作日志 2022-07-07 17:30:32 +08:00
dxfeng 7103eb0c73 记录操作日志 2022-07-07 15:32:30 +08:00
dxfeng 40a7c066a2 记录操作日志 2022-07-07 14:19:56 +08:00
dxfeng 2702b175cd 记录操作日志 2022-07-06 15:43:16 +08:00
dxfeng cca52d7080 记录操作日志 2022-07-06 11:44:07 +08:00
dxfeng c139cd408a 记录操作日志 2022-07-06 10:15:26 +08:00
dxfeng bef63439b2 记录操作日志 2022-07-05 18:46:43 +08:00
dxfeng 278194a4a3 记录操作日志,岗位优化 2022-07-05 18:44:45 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
dxfeng 033e90aa34 操作日志 2022-07-05 09:39:00 +08:00
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 2022-07-04 09:18:56 +08:00
dxfeng 5291c3b855 分部列表BUG修复 2022-07-01 17:46:25 +08:00