Commit Graph

861 Commits

Author SHA1 Message Date
Mlin 3619fe5ac3 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-02 15:05:23 +08:00
Mlin 6247129bcf 拖拽优化 2023-08-02 15:04:01 +08:00
dxfeng 82d6cc74db 组织调整树BUG修复 2023-08-02 14:53:53 +08:00
Mlin 8b894bbaa3 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-02 11:30:09 +08:00
Mlin 3bb8c35fb5 部门拖拽优化0802 2023-08-02 11:29:56 +08:00
dxfeng d068aa6bc1 组织管理,树结构展开功能完善、分部删除BUG修复 2023-08-02 11:29:19 +08:00
Mlin 1ac72f3519 部门拖拽优化0802 2023-08-02 10:51:59 +08:00
Mlin 33dda680df 部门拖拽优化 2023-08-02 10:03:46 +08:00
Mlin 123f7eaea6 部门拖拽优化 2023-08-01 16:05:22 +08:00
Mlin 72d2867244 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-01 15:18:19 +08:00
Mlin 2fdd604872 部门拖拽:分部优化 2023-08-01 15:17:59 +08:00
dxfeng 647f692920 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-01 14:05:41 +08:00
dxfeng 04826fcaa4 组织管理,树结构展开功能完善 2023-08-01 14:05:17 +08:00
Mlin 63491e9906 部门拖拽转移优化 2023-08-01 11:20:28 +08:00
Mlin 315a67173d Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-01 09:41:55 +08:00
Mlin 32029788c4 部门拖拽转移 2023-08-01 09:41:43 +08:00
dxfeng 9a6f0a845e 组织管理,架构图树排序、BUG修复 2023-07-31 17:45:42 +08:00
dxfeng ea4a3201aa 组织管理,架构图部门树选择数据接口 2023-07-31 10:55:20 +08:00
dxfeng e011880672 组织管理,树结构禁用非部门节点 2023-07-31 10:02:38 +08:00
Mlin 50ee698cc2 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-07-31 09:44:19 +08:00
Mlin 1a307f9923 部门合并,名称占用释放 2023-07-31 09:43:23 +08:00
dxfeng 59d4fac4e2 组织管理,部门封存传参,树结构优化 2023-07-31 09:29:10 +08:00
dxfeng 29bfcdc418 组织管理,分部封存传参 2023-07-28 11:33:14 +08:00
dxfeng 3fa679b139 组织管理,树结构兼容是否封存 2023-07-27 17:45:02 +08:00
dxfeng 1280b3c6b9 组织管理,TreeSelect组件全量接口开发 2023-07-27 14:32:07 +08:00
dxfeng b1b24fc925 组织管理,移动树接口提交 2023-07-26 11:23:15 +08:00
dxfeng 9610361733 组织管理,移动树接口提交 2023-07-26 10:52:10 +08:00
dxfeng 87372be17f 组织管理,编制导入BUG修复 2023-07-25 16:46:08 +08:00
dxfeng 46ecec4b17 组织管理,岗位台账、岗位浏览按钮列表展示优化 2023-07-25 09:56:32 +08:00
dxfeng fab01583ad 组织架构图,部门选择树 2023-07-24 16:38:17 +08:00
dxfeng f4c29de76b 新建编制信息初始化在编数 2023-07-24 10:32:10 +08:00
Mlin 2ee38ccc0c 版本管理代码优化 2023-07-17 14:30:44 +08:00
Chengliang d9e2a695cf 排序 时间轴 2023-07-14 15:04:11 +08:00
Mlin 775405741a 版本管理,事务控制bug优化 2023-07-14 15:00:49 +08:00
Mlin 0a809a29c9 版本管理,事务控制bug优化 2023-07-14 14:46:05 +08:00
Mlin 1abbc7cddf 版本记录,未新增分部类型、部门类型字段时同步bug修复 2023-07-14 11:40:04 +08:00
Mlin 7417cbac79 虚拟维度表查询bug修复 2023-07-14 10:51:30 +08:00
Mlin 8ac0f45d29 版本记录,虚拟人员bug修复 2023-07-13 18:05:17 +08:00
Mlin 3d7b5927b3 版本记录,虚拟人员bug修复 2023-07-13 17:51:16 +08:00
Mlin 45b663217f 版本记录,分部bug修复 2023-07-13 17:16:22 +08:00
Mlin 7d1b7b8795 版本记录,虚拟人员bug修复 2023-07-13 16:58:22 +08:00
dxfeng 696f66ec98 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-13 15:26:24 +08:00
dxfeng d510f32bc5 组织架构图,BUG修复 2023-07-13 15:26:11 +08:00
Chengliang f5275c2148 v3 2023-07-13 15:08:24 +08:00
Mlin 725d64888c 组织管理版本记录int类型bug修复 2023-07-13 11:08:22 +08:00
Mlin 971b997dff Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
2023-07-12 18:04:23 +08:00
Mlin 10a9a350b4 组织管理版本记录数据同步 2023-07-12 18:00:47 +08:00
dxfeng 62b25d6a65 组织架构图,回溯详细信息 2023-07-12 17:00:01 +08:00
dxfeng c61a071746 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 16:13:21 +08:00
dxfeng 3bf299afa4 组织架构图,回溯详细信息 2023-07-12 16:13:08 +08:00