liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
346 Commits 19 Branches 0 Tags 1.9 MiB
Commit Graph

247 Commits

Author SHA1 Message Date
Chengliang 8ca38016a7 模块管理分权 2022-10-21 14:39:24 +08:00
Chengliang edd7e4c2a6 人员卡片页面重做 2022-10-18 13:58:48 +08:00
Chengliang e498634292 卡片修复 2022-09-29 09:49:15 +08:00
Chengliang 89587a6b1a 我的卡片页面锚点滚动 2022-09-27 17:50:56 +08:00
Chengliang d651883081 我的卡片 2022-09-23 16:53:25 +08:00
Chengliang 01dc126302 我的卡片页面 2022-09-22 18:55:14 +08:00
Chengliang 0d3d6c79f0 我的卡片 2022-09-20 14:15:13 +08:00
Chengliang dfda1222c4 fixed 2022-09-16 18:11:28 +08:00
reset c044172c8a
!73 bug修复 
Merge pull request !73 from reset/feature/cl
 2022-09-08 09:55:20 +00:00
Chengliang 0b5f70a080 fixed 2022-09-08 17:50:42 +08:00
18652063575 b63006a7bc 代码优化 2022-09-08 17:50:03 +08:00
Chengliang f79a0a3ef5 fixed 2022-09-07 19:23:30 +08:00
18652063575 57b165f6d8 编辑页面编号设置 2022-09-06 20:09:24 +08:00
18652063575 a7592b2777 Merge remote-tracking branch 'origin/dev' into dev 2022-09-06 19:31:06 +08:00
18652063575 cbfed11819 【ID1000135】 
编制管理-编制信息-新建编制
【ID1000132】
日志查看：翻页区显示不全
 2022-09-06 19:30:44 +08:00
reset bf8b1fecc4
!71 bug修复 
Merge pull request !71 from reset/feature/cl
 2022-09-06 10:54:26 +00:00
Chengliang fc9c510619 fixed 2022-09-06 18:53:08 +08:00
18652063575 8a44f31d64 【ID1000165】 
组织机构：分部/部门/岗位 新增页面 增加 预留编号
 2022-09-06 10:08:08 +08:00
reset ac8f61cc15
!70 fixed 
Merge pull request !70 from reset/feature/cl
 2022-09-06 01:28:50 +00:00
Chengliang 4394a1abcb fixed 2022-09-06 09:26:38 +08:00
18652063575 8db2ed84c6 职务分类左侧树搜索折叠的问题 2022-09-05 16:17:36 +08:00
Chengliang 64cfbffaf0 fixed 2022-09-02 16:17:54 +08:00
Chengliang a578e4e3ab 修复页面跳转 2022-09-02 11:00:27 +08:00
Chengliang 2128fcae7c 人员信息功能完善 2022-08-30 11:42:11 +08:00
Chengliang 67ccf9cbba 人员信息管理 2022-08-26 15:28:50 +08:00
Chengliang 766df1a634 人员基础信息 2022-08-23 17:53:21 +08:00
reset 210e79a145
!64 bug修复 
Merge pull request !64 from reset/feature/cl
 2022-08-22 08:20:38 +00:00
Chengliang 07d2ff9832 fixed 2022-08-22 16:19:22 +08:00
liyongshun 7ba0a51fd4 职务分类左侧树折叠的问题 2022-08-22 16:13:10 +08:00
Chengliang 1d9ac506e8 权限完善 2022-08-18 17:42:15 +08:00
Chengliang 919b778398 fixed 2022-08-17 15:13:26 +08:00
Chengliang 68af2808dd fix 2022-08-05 09:22:29 +08:00
Chengliang 5849a22514 编制流程说明 2022-08-03 09:23:36 +08:00
Chengliang 9263c27fd3 fix 2022-07-27 14:54:59 +08:00
Chengliang d3ca08680f 新导入 2022-07-25 17:53:00 +08:00
Chengliang cb010edefa fixed 2022-07-22 14:04:28 +08:00
Chengliang b5d1e00b91 扩展页面及优化 2022-07-12 16:45:03 +08:00
liyongshun 72ac0c5afe Merge branch 'dev' of https://gitee.com/jmlcl/trunk into dev 2022-07-11 10:24:58 +08:00
Chengliang 39e60335ec 需求优化2 2022-07-11 10:06:45 +08:00
liyongshun 00fad37019 Merge remote-tracking branch 'origin/dev' into dev 2022-07-11 09:07:43 +08:00
Chengliang db5101250e fixed 2022-07-08 13:31:40 +08:00
liyongshun cb020c5f66 Merge remote-tracking branch 'origin/dev' into dev 2022-07-08 11:35:30 +08:00
liyongshun b5334c6830 职务分类新增和编辑成功列表查询失败的bug,以及新增时表单接口的调整 2022-07-08 10:25:32 +08:00
liyongshun 6e152af3a2 职务分类新增和编辑成功列表查询失败的bug 2022-07-07 18:49:54 +08:00
Chengliang dd023861d7 增加操作日志 2022-07-07 18:06:02 +08:00
liyongshun d5e13c6057 弹框中的下拉框组件样式问题 2022-07-06 18:11:23 +08:00
liyongshun ba2d6f7f8b 更新代码 2022-07-06 11:21:13 +08:00
Chengliang 0f4c438bbf 日志操作增加 2022-07-05 18:54:56 +08:00
Chengliang 98bb6e3ae4 基础数据导入 2022-06-30 17:14:04 +08:00
Chengliang 07dec3350f 优化 2022-06-29 18:37:25 +08:00
Chengliang c52d10323a 人员导入模块新增 2022-06-27 18:48:28 +08:00
Chengliang 58b118ebe3 测试问题修改 2022-06-24 17:58:51 +08:00
Chengliang 82b54b8bde 测试优化 2022-06-24 14:38:54 +08:00
Chengliang 09d7776a3e 需求优化 2022-06-23 11:53:57 +08:00
reset 0c5e3cae8f
!44 需求优化 
Merge pull request !44 from reset/feature/cl
 2022-06-22 09:22:49 +00:00
Chengliang ebf1cb58d9 需求优化 2022-06-22 17:19:28 +08:00
liyongshun fda7c7c0d0 Merge branch 'dev' of https://gitee.com/jmlcl/trunk into dev 2022-06-22 16:09:56 +08:00
liyongshun 4878b6be1d 修改职务管理 2022-06-22 16:09:43 +08:00
Chengliang 4102c1e135 需求统一优化处理 2022-06-22 10:28:25 +08:00
Chengliang 32a0c9cbd2 人员管理模块 2022-06-21 18:39:50 +08:00
Chengliang 74d5522239 人员管理 2022-06-20 17:08:10 +08:00
Chengliang ed990bcfb2 完成v1.20 2022-06-20 11:08:19 +08:00
Chengliang 1dce448427 自定义设置页面初步完成 2022-06-17 18:06:07 +08:00
reset 860dd0212c
!39 自定义设置页面 
Merge pull request !39 from reset/feature/cl
 2022-06-16 10:36:23 +00:00
Chengliang 19e1d07e3c 自定义设置页面接口对接 2022-06-16 18:35:17 +08:00
Chengliang 2d1c756985 自定义页面树和tab接口对接 2022-06-16 08:43:36 +08:00
liyongshun 5be0bb68e6 编号设置合并 2022-06-15 13:17:33 +08:00
Chengliang 88dd830ce3 自定义设置 2022-06-13 17:35:34 +08:00
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
reset 6248c7d184
!37 岗位高级搜索bug修复 
Merge pull request !37 from reset/feature/cl
 2022-06-08 08:54:14 +00:00
Chengliang 74879c046d 岗位高级搜索bug修复 2022-06-08 16:51:54 +08:00
reset d724566384
!36 bug修复 
Merge pull request !36 from reset/feature/cl
 2022-06-08 06:13:28 +00:00
Chengliang faf37dba1d bug修复 2022-06-08 14:10:17 +08:00
liyongshun f50c8f2bde Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-06-07 18:14:46 +08:00
liyongshun cbaea8f2da 编号设置描述语修改 2022-06-07 18:14:39 +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
Chengliang 98ae042c26 公司/发布列表页面 2022-05-18 14:34:01 +08:00
liyongshun 821c46bb9d Merge branch 'liys_dev' into dev 2022-05-18 14:15:34 +08:00
liyongshun 24f3350420 修改编号设置页面交互 2022-05-18 14:15:10 +08:00
liyongshun 81f9b5ca2f Merge branch 'liys_dev' into dev 2022-05-18 14:08:33 +08:00
liyongshun 9303fe3f3c 编号组成交互的完成 2022-05-18 13:49:24 +08:00
liyongshun e1cc281cff 分部编号设置的页面完成50% 2022-05-17 18:32:09 +08:00
reset e0432a21c5
!3 公司/分部扩展页面 
Merge pull request !3 from reset/feature/cl
 2022-05-17 06:49:34 +00:00
Chengliang dd9646213f 公司/发布扩展页面 2022-05-17 14:47:54 +08:00
liyongshun 89aab7a742 Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-17 14:11:59 +08:00
liyongshun 596816ebb2 删除测试文件 2022-05-17 14:11:56 +08:00
Chengliang 1bf9f9aa81 公司/分部扩展页面 2022-05-16 17:32:27 +08:00
liyongshun aaa31935b3 Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-16 17:13:39 +08:00
liyongshun 5bc2f44073 职务管理模块接口联调 2022-05-16 17:13:37 +08:00
Chengliang bb7bd102ec 公司/分部管理 2022-05-16 13:36:54 +08:00
Chengliang 774bd7203f 公司/分部管理初始化 2022-05-16 10:32:21 +08:00
liyongshun 559ed2cbee Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-13 18:09:32 +08:00
liyongshun 9e8d36bbc4 职务管理页面的新增 2022-05-13 18:06:15 +08:00
liyongshun 2e167f4099 职务管理页面新增 2022-05-13 18:05:45 +08:00
Chengliang 811c9da4d1 集团管理静态页面 2022-05-13 16:56:52 +08:00
Chengliang 67304df567 完成职等页面 职级页面 2022-05-12 14:57:36 +08:00
Chengliang 8c6d1df37c 等级方案页面完成 职等页面完成静态页面 2022-05-10 18:02:06 +08:00
Chengliang fb6ae67485 等级方案页面完成列表渲染,高级搜索,禁用标记等 2022-05-07 17:46:35 +08:00
Chengliang b7c99835da 等级方案页面 2022-05-06 16:53:43 +08:00
Chengliang a2fa127bfe 测试 2022-05-05 16:28:47 +08:00
Chengliang 7f6a359013 初始化 2022-05-05 16:02:19 +08:00