Commit Graph

597 Commits

Author SHA1 Message Date
钱涛 a59448e454 修复人力资源删除数据影响列表展示 2024-09-18 18:24:08 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
钱涛 e2b2b9071f Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资 2024-08-16 14:04:31 +08:00
钱涛 1d388a1993 支持Vlookup 2024-08-16 14:04:20 +08:00
钱涛 659560550a Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资 2024-08-16 13:18:08 +08:00
钱涛 d23baeb940 支持Vlookup 2024-08-16 12:19:18 +08:00
钱涛 673699dfb8 导入工具明细 2024-08-16 11:18:27 +08:00
钱涛 980dc2f532 导入工具 2024-08-15 16:25:31 +08:00
Harryxzy 2ee605df44 浮动薪酬优化 2024-08-15 13:56:41 +08:00
钱涛 5071c08d8c Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
2024-08-15 13:41:52 +08:00
Harryxzy e9fef7d915 Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 11:10:49 +08:00
钱涛 d37434521d Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 10:37:57 +08:00
钱涛 f74ec99644 账套支持sql范围 2024-08-15 10:37:41 +08:00
钱涛 9d26e1228f 薪酬迁移工具 2024-08-13 18:15:04 +08:00
Harryxzy a05fb6fcf0 报表义务人、账套分权 2024-08-13 13:45:24 +08:00
钱涛 845f117d9c excel导入工具 2024-08-12 17:17:52 +08:00
钱涛 b83d45efa0 下载系统配置 2024-08-12 10:02:46 +08:00
钱涛 71c9bd3564 xml文件 2024-08-09 15:53:36 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +08:00
钱涛 dd257ec53e xml文件 2024-08-09 09:22:27 +08:00
钱涛 6532225da3 迁移工具 2024-08-08 18:04:50 +08:00
钱涛 83a408afa2 迁移工具 2024-08-08 16:53:31 +08:00
钱涛 8611358c6c 配置 2024-08-08 11:03:55 +08:00
钱涛 080a69c929 全量迁移 2024-08-08 09:50:04 +08:00
钱涛 484639a690 导入薪资项目、模板、预览 2024-08-07 14:40:08 +08:00
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 b8b9cbbe6c 导入薪资项目 2024-08-07 13:25:57 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +08:00
Harryxzy dd18cf5191 考勤引用多个账套 2024-08-06 16:54:19 +08:00
钱涛 bd6e30b63b 导入薪资项目 2024-08-06 14:24:08 +08:00
钱涛 10d988084b 导入工具 2024-08-06 10:32:57 +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