Commit Graph

566 Commits

Author SHA1 Message Date
钱涛 4543539206 角色和成员基础接口 2024-07-26 11:35:17 +08:00
Harryxzy 78cdadbb99 工资单详情 - 显示列定制 2024-07-16 11:30:25 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
钱涛 c86b53fd27 Merge branch 'feature/锁定人员' into release/2.14.3.2406.01 2024-05-30 17:06:57 +08:00
钱涛 7952e93d01 考勤引用显示证件号码 2024-05-29 16:53:51 +08:00
钱涛 2c79afa65e 锁定人员 2024-05-28 17:29:18 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +08:00
Harryxzy dd54a10433 核算固定列头数优化 2024-05-11 16:19:25 +08:00
Harryxzy 509257b419 pdf导出前先校验生成pdf 2024-05-11 15:07:54 +08:00
钱涛 3428de9e33 账套快照 2024-05-06 16:03:29 +08:00
Harryxzy 4b474f864f 累计专项附加扣除一键累计,能根据义务人进行累计 2024-04-30 14:43:37 +08:00
钱涛 68d0003f62 新增核算结果的代理 2024-04-16 16:05:42 +08:00
钱涛 a06a54f574 去除objectUtil 2024-04-01 20:25:23 +08:00
Harryxzy 330d1363fc Merge branch 'fix/240302-调薪前端保留位数优化' into release/2.12.1.2403.02 2024-03-29 10:49:58 +08:00
Harryxzy 18c496c009 多部门多分部筛选 2024-03-21 14:19:36 +08:00
Harryxzy 2691b1e099 调薪显示位数前端优化 2024-03-19 17:36:58 +08:00
Harryxzy b17d2b70de Merge branch 'feature/240301_阅后即焚' into release/3.0.0.2403.01 2024-03-15 09:19:03 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00
钱涛 a70a2061a5 部门改多选 2024-03-14 11:19:02 +08:00
Harryxzy b5afaa54df Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚 2024-03-12 15:13:34 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
钱涛 4b823ccca7 国际化注解 2024-03-11 16:50:47 +08:00
Harryxzy 78d4f5e2ae 阅后即焚 2024-03-11 10:35:56 +08:00
钱涛 e187ee57e0 获取所有账套列表接口 2024-03-07 09:52:21 +08:00
Harryxzy 20d7266db9 Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
#	src/com/engine/salary/service/impl/SIAccountServiceImpl.java
2024-03-06 13:50:56 +08:00
Harryxzy 0ac291d83d Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01 2024-03-06 09:23:21 +08:00
Harryxzy 8984369343 薪资档案、社保档案查看日志 2024-03-05 15:15:20 +08:00
Harryxzy 6c2d20a5a7 Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01 2024-03-05 14:24:19 +08:00
Harryxzy 5485f7d260 社保福利台账导入,表单字段缓存 2024-03-01 17:40:19 +08:00
Harryxzy a39806bb92 我的薪资福利显示页签支持配置 2024-02-23 11:04:14 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
Harryxzy b4f36ab101 Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01 2024-02-20 09:51:00 +08:00
Harryxzy ee82d1cb9a 工资单确认反馈优化 2024-02-19 14:16:47 +08:00
Harryxzy 7fe03ac7a1 工资单确认反馈优化 2024-02-19 10:09:49 +08:00
Harryxzy e75cfae309 Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01 2024-01-31 16:13:27 +08:00
Harryxzy 2331ef354e 工资单确认和反馈按钮分开 2024-01-30 15:53:55 +08:00
Harryxzy 12f66512df 工资单反馈区分pc和移动端 2024-01-30 13:50:05 +08:00
sy f215b45afa 薪酬系统-工资单模板,复制功能改造,获取带选择薪资项目逻辑改造 2024-01-26 10:04:53 +08:00
钱涛 6fc8d8fdee 去除达梦驱动 2024-01-25 11:38:38 +08:00
Harryxzy 71f90882d3 工资单反馈区分pc和移动端 2024-01-23 16:45:09 +08:00
Harryxzy d6705e8917 产品-批量编辑 2023-12-11 13:09:20 +08:00
Harryxzy 2b6b1ef2c4 Merge branch 'custom/鲁控数字' into feature/231202-批量编辑 2023-12-11 11:36:59 +08:00
Harryxzy 419baeb8cd 鲁控数字 2023-12-06 16:05:08 +08:00
钱涛 390251bd63 Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 15:08:44 +08:00
钱涛 dd48bff747 同步所有档案起始发薪日期为入职日期 2023-12-05 15:08:37 +08:00
Harryxzy 4eb931686e 鲁控数字temp 2023-12-05 14:57:34 +08:00
Harryxzy 3687bdfcdc Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01 2023-12-05 11:30:04 +08:00
Harryxzy b093717e46 Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01 2023-12-05 11:28:47 +08:00
sy ce10204dab Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账,补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01 2023-12-05 11:26:48 +08:00
Harryxzy a0331112be Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01 2023-12-05 11:26:22 +08:00