Commit Graph

75 Commits

Author SHA1 Message Date
Chengliang 1a35ec1bd5 自定义设置增加类型 2022-06-13 15:38:26 +08:00
Chengliang aa499d7855 自定义设置test 2022-06-10 17:51:55 +08:00
Chengliang 5bfb129380 自定义设置 2022-06-10 16:37:52 +08:00
Chengliang 74879c046d 岗位高级搜索bug修复 2022-06-08 16:51:54 +08:00
Chengliang faf37dba1d bug修复 2022-06-08 14:10:17 +08:00
reset 76c5ceed96
!35 修改编制变更
Merge pull request !35 from reset/feature/cl
2022-06-07 10:13:11 +00:00
Chengliang 14b7080a28 修改编制变更 2022-06-07 18:11:10 +08:00
liyongshun dbc6134ccf Merge branch 'liys_dev' into dev 2022-06-07 18:10:06 +08:00
liyongshun 76051adc16 编号设置接口联调完成80% 2022-06-07 18:01:50 +08:00
Chengliang ce77261397 编制补充 2022-06-07 17:58:20 +08:00
Chengliang 79916567d5 编制修改 2022-06-07 17:56:29 +08:00
Chengliang 84b6f732c6 增加权限控制 2022-06-07 16:52:12 +08:00
Chengliang 772f0b66ee 修复转移页面 2022-06-07 09:34:25 +08:00
Chengliang 2b34890e6d 对接部门合并转移 复制 2022-06-06 16:48:19 +08:00
liyongshun 204613099a 部门编号设置 2022-06-06 14:01:41 +08:00
liyongshun f3877c843f Merge branch 'dev' into liys_dev 2022-06-04 21:50:09 +08:00
Chengliang aefcb9772b solve conflict 2022-06-02 17:06:47 +08:00
Chengliang f5afc77283 部门管理页面 2022-06-02 16:51:21 +08:00
Chengliang e2f8c060a6 check及操作按钮权限 2022-06-01 17:18:40 +08:00
reset b8f7c82534
!26 岗位复制及联查部门
Merge pull request !26 from reset/feature/cl
2022-06-01 08:27:45 +00:00
Chengliang 064c40d299 岗位剩余接口对接 2022-06-01 16:22:56 +08:00
reset 95b756b71d
!25 岗位扩展静态页面
Merge pull request !25 from reset/feature/cl
2022-05-30 09:13:49 +00:00
Chengliang 24d9f3bc9e 岗位扩展静态页面 2022-05-30 17:11:10 +08:00
liyongshun 5c2268f4f9 代码还原 2022-05-30 10:25:30 +08:00
reset 74e4f4ca88
!24 组织架构树
Merge pull request !24 from reset/feature/cl
2022-05-30 01:51:39 +00:00
Chengliang 211c0e6634 组织架构树 2022-05-30 09:49:02 +08:00
liyongshun 3591986440 Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-30 09:29:29 +08:00
Chengliang 34107bee55 岗位页面初始化 2022-05-26 17:28:18 +08:00
Chengliang 27c8a11576 编制管理页面 2022-05-26 13:55:26 +08:00
Chengliang ed3a11e7b6 日志前端渲染 2022-05-25 15:39:34 +08:00
Chengliang 3c8f0cbfaf 完成显示列定制 2022-05-25 14:58:27 +08:00
Chengliang bb8920e3a0 完成公司/分部页面 2022-05-25 11:50:31 +08:00
Chengliang 5f478dcbfd 公司/分部分页修改 2022-05-24 19:00:33 +08:00
Chengliang 786bac5aa1 编制方案静态页面初始化 2022-05-24 10:11:29 +08:00
Chengliang 0d449516e2 编制管理静态页面 2022-05-24 09:48:57 +08:00
liyongshun a907ebf6dd Merge branch 'liys_dev' into dev 2022-05-23 17:46:26 +08:00
liyongshun 395fdad5ac 部门管理模块 2022-05-23 17:40:49 +08:00
Chengliang 4c2ff27e46 公司/分部接口对接 2022-05-23 17:28:38 +08:00
Chengliang de7e0d50c6 公司/分部联查部门 新增 2022-05-19 16:15:19 +08:00
Chengliang 669f92dbf2 扩展页面 2022-05-19 09:35:39 +08:00
Chengliang d52cf8170e 扩展页面跳转 2022-05-18 17:51:57 +08:00
Chengliang 337f8f8dff 集团标识 2022-05-18 16:01:09 +08:00
Chengliang 8eb704e23d 保护模式 2022-05-18 15:50:35 +08:00
Chengliang 44715650db 集团编辑功能完善 2022-05-18 15:24:46 +08:00
Chengliang b96ffa4205 solve conflict 2022-05-18 15:01:04 +08:00
Chengliang db16ec323a solve conflict 2022-05-18 14:58:44 +08:00
Chengliang a89634f0df 1 2022-05-18 14:55:10 +08:00
Chengliang 507ff9df6c solve conflct 2022-05-18 14:53:44 +08:00
Chengliang eff03741b2 solve conflict 2022-05-18 14:49:46 +08:00
Chengliang b073384fc7 solve conflict 2022-05-18 14:46:36 +08:00