Commit Graph

1704 Commits

Author SHA1 Message Date
liang.cheng df6e7a9df7 Merge pull request 'feature/cl' (#291) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/291
2025-03-14 15:53:42 +08:00
Chengliang 2fe6013af1 组织架构图多语言 key值问题处理 2025-03-10 17:15:14 +08:00
Chengliang 722e1b8fe6 聚才林岗位外部搜索样式 岗位(分部) 2025-03-06 11:13:21 +08:00
Chengliang 4d4827a2c4 移除企通学配置文件 标准配置文件增加enable 2025-02-26 11:25:52 +08:00
Chengliang b9c00d1e66 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2025-02-26 10:35:40 +08:00
liang.cheng 6a5e6e5bec Merge pull request 'feature/cl' (#289) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/289
2025-02-06 17:18:24 +08:00
Chengliang 80248b03d6 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2025-02-06 17:17:35 +08:00
Chengliang 289242d013 花名册隐私设置(根据e9后台设置的移动电话,办公室电话,邮件等字段信息)完成对页面的隐私设置(公开,对所有人保密。对安全级别低于自己人员保密) 2025-02-06 17:17:08 +08:00
Chengliang 47fb84d10d 人员卡片栏目设置 脚本权限未找到 放开所有权限 2025-01-20 17:11:58 +08:00
liang.cheng d77e9d35d4 Merge pull request 'feature/cl' (#288) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/288
2025-01-14 11:06:27 +08:00
Chengliang 5a2affb1a8 1组织包更新
1.花名册外部人员不显示
2.历史架构图中增加搜索条件
3.花名册左侧树联查包含下级
2024-12-30 15:44:08 +08:00
Chengliang d5a24e3bfb 组织架构图增加查询 2024-12-23 10:09:39 +08:00
liang.cheng 421a70491a Merge pull request 'feature/cl' (#287) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/287
2024-12-20 16:29:35 +08:00
Chengliang 1f532ebade Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-12-20 16:28:38 +08:00
Chengliang aff49d0bc9 历史版本存储问题 2024-12-20 16:28:18 +08:00
Chengliang b9c9d1d65a 多余import去除 2024-12-16 10:04:47 +08:00
Chengliang 3a5c581241 3.岗位管理模块数据刷新时去除外部人员引入;
4.花名册页面增加配置文件判断跳转是否为标准卡片还是聚才林卡片
2024-12-10 17:06:57 +08:00
Chengliang 4beda57943 编制维度为岗位时导入提示错误问题 2024-12-04 16:50:43 +08:00
liang.cheng 280fe586db Merge pull request 'feature/cl' (#286) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/286
2024-12-04 16:27:12 +08:00
Chengliang 76d9138191 组织架构图历史部门负责人存储问题和查询问题修复 2024-11-21 17:52:53 +08:00
Chengliang 8de60788a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-10-25 15:09:39 +08:00
dxfeng fdf4736e34 Merge pull request '组织树 排序BUG修复' (#285) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/285
2024-10-23 16:40:32 +08:00
dxfeng cffa697c2f 组织树 排序BUG修复
like搜索BUG修复
2024-10-23 16:39:01 +08:00
Chengliang 77b2d12efd Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-10-21 17:58:42 +08:00
dxfeng 58111e5be4 Merge pull request 'feature/dxf' (#284) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/284
2024-10-21 17:43:23 +08:00
dxfeng 918f2e2a6e 组织架构 排序字段调整为Double 2024-10-21 17:42:05 +08:00
dxfeng 8a843480b6 组织架构 排序字段调整为Double 2024-10-21 17:34:24 +08:00
dxfeng 757b41f8c5 Merge remote-tracking branch 'origin/feature/dxf' into feature/dxf 2024-10-21 15:13:45 +08:00
Chengliang a91bbf74ee 岗位管理数据一致性处理 2024-10-21 15:11:57 +08:00
Chengliang 7595f6bc77 编制对外接口esb缺少UESE对象时默认增加sysadmin 2024-10-21 15:11:57 +08:00
Chengliang aa0d573cc3 定时清除组织管理Delete_type=1的数据 2024-10-21 15:11:57 +08:00
Chengliang 14464744b8 编制信息更新 流程明细处理 新增 2024-10-21 15:11:57 +08:00
dxfeng 95d3dac14f 花名册-组织树排序问题处理 2024-10-21 15:11:57 +08:00
dxfeng 4fcbe238b4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-10-21 15:04:21 +08:00
dxfeng f254feb128 花名册-列定制添加分部 2024-10-21 15:04:06 +08:00
Chengliang 5ed00c6a24 编制信息导入问题处理 岗位数据重复 2024-10-21 13:54:31 +08:00
liang.cheng d08192032c Merge pull request 'feature/cl' (#283) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/283
2024-10-21 10:07:51 +08:00
Chengliang 4d2e8a8035 岗位管理数据一致性处理 2024-10-21 10:06:08 +08:00
Chengliang ea5809ac15 编制对外接口esb缺少UESE对象时默认增加sysadmin 2024-10-15 16:08:48 +08:00
Chengliang b572bc4d48 定时清除组织管理Delete_type=1的数据 2024-10-10 16:38:32 +08:00
liang.cheng e5f46a8083 Merge pull request '编制信息更新 流程明细处理 新增' (#281) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/281
2024-10-09 13:46:00 +08:00
Chengliang bb021a6f45 编制信息更新 流程明细处理 新增 2024-09-26 15:29:45 +08:00
dxfeng 6c973d86cd 花名册-列定制添加分部 2024-09-13 10:20:52 +08:00
dxfeng 1698f8c8d5 花名册-高级搜索添加多分部 2024-09-12 14:32:52 +08:00
dxfeng e5a30525f0 花名册-Excel导出列展示顺序 2024-09-12 13:24:33 +08:00
liang.cheng 2d240460f1 Merge pull request 'feature/cl' (#279) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/279
2024-09-12 10:18:11 +08:00
Chengliang 4a8c85cd41 部门负责人多级显示问题处理 2024-09-12 10:15:50 +08:00
Chengliang 035ae80970 花名册导出顺序todo 2024-09-03 11:01:19 +08:00
Chengliang 760b54710a 未启用状态部门列表显示 2.多语言补充 2024-08-30 08:57:22 +08:00
liang.cheng 137273284e Merge pull request 'feature/cl' (#278) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/278
2024-08-27 15:48:36 +08:00