Commit Graph

781 Commits

Author SHA1 Message Date
dxfeng c993cafab4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-30 16:45:19 +08:00
dxfeng 4e919dea65 组织架构图重构 2023-06-30 16:44:56 +08:00
Chengliang b963913d62 架构图 2023-06-29 17:37:05 +08:00
Chengliang 2667ab8a60 修复条件 2023-06-28 17:58:12 +08:00
Chengliang 53a295a468 虚拟组织暂存 2023-06-27 16:58:45 +08:00
dxfeng 98b85ac75f 组织树添加key字段 2023-06-27 10:24:51 +08:00
Chengliang c696835a33 搜索条件修改 2023-06-27 10:09:05 +08:00
dxfeng e8d6f2ea73 组织架构图搜索条件优化 2023-06-27 09:12:41 +08:00
dxfeng 0148d99314 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-26 17:03:51 +08:00
Chengliang 35d7a045e2 组织架构图V3 2023-06-26 17:00:12 +08:00
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +08:00
dxfeng a1dd6126b0 岗位新增BUG修复 2023-06-09 14:19:32 +08:00
dxfeng cdd2e6384e 人员批量导入 BUG修复 2023-06-08 15:56:06 +08:00
dxfeng 7889b866ab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-01 14:18:45 +08:00
dxfeng 2ec00b7bb3 聚才林岗位新增功能 2023-06-01 14:12:12 +08:00
Mlin f04216a113 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-06-01 09:01:18 +08:00
Mlin 6cea2706df 人员简历表格动态生成 2023-06-01 09:00:55 +08:00
dxfeng 3a8aa2449a 兼容PostgreSQL,简历按钮BUG修复 2023-05-29 11:35:45 +08:00
dxfeng e138489c34 兼容PostgreSQL 2023-05-25 08:59:51 +08:00
dxfeng db990ce227 兼容PostgreSQL 2023-05-16 16:42:28 +08:00
dxfeng 0ca51f58ae 花名册列表按钮权限优化 2023-04-03 10:06:02 +08:00
Mlin 472cc4ab9a 人大金仓版本bug处理 2023-03-24 14:24:55 +08:00
dxfeng f8b60493f8 花名册人员状态查询功能优化 2023-03-01 16:26:10 +08:00
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2023-03-01 09:54:22 +08:00
dxfeng 2d63ca20a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-20 14:33:39 +08:00
dxfeng cb41ff1f8c 岗位浏览按钮SQL完善 2023-02-20 14:28:25 +08:00
Mlin 41fdd36997 透视图在岗数bug修复 2023-02-14 18:06:00 +08:00
dxfeng 453d4afe97 花名册查询、导出BUG修复 2023-02-14 17:09:22 +08:00
dxfeng 4113df1708 简历树,聚才林岗位搜索BUG修复 2023-02-08 14:05:33 +08:00
dxfeng eaca9535d5 分部、部门导入BUG修复 2023-02-07 14:41:31 +08:00
dxfeng 559ea407ab 岗位分权,部门列表BUG修复 2023-02-07 11:29:13 +08:00
dxfeng 6ac651e8bd 花名册,状态查询功能完善 2023-02-06 09:49:36 +08:00
dxfeng ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +08:00
dxfeng 37ded0a19b 列定制BUG修复 2023-01-17 09:30:51 +08:00
dxfeng 8947e6da3a 列定制BUG修复 2023-01-16 17:19:59 +08:00
dxfeng 5e40c18df1 列定制BUG修复 2023-01-16 15:08:22 +08:00
Mlin 4b4754bd74 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:40:39 +08:00
Mlin 2b5acfeb32 花名册模板管理bug修复 2023-01-13 18:40:34 +08:00
dxfeng 7dc6225356 Merge pull request 'BUG修复' (#145) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/145
2023-01-13 18:11:57 +08:00
dxfeng ba2909bac9 BUG修复 2023-01-13 18:10:57 +08:00
Mlin 8ff8340d81 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:03:32 +08:00
Mlin 9d36b42da6 花名册模板管理日期优化 2023-01-13 18:03:19 +08:00
dxfeng 0aac4a0c57 BUG修复 2023-01-13 18:01:17 +08:00
dxfeng ec55baf5fe BUG修复 2023-01-13 17:39:52 +08:00
dxfeng 6d8aaf063b BUG修复 2023-01-13 16:50:54 +08:00
Mlin 547264d755 花名册模板列定制优化20230113 2023-01-13 16:37:11 +08:00
Mlin 78682a47c7 花名册模板列定制优化20230113 2023-01-13 16:35:34 +08:00
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2023-01-13 14:07:33 +08:00
Mlin 07a82baf9c Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 13:44:15 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +08:00