Commit Graph

633 Commits

Author SHA1 Message Date
钱涛 be2d6b693a 单元格锁定 2024-10-17 18:27:37 +08:00
Harryxzy 4c551dae87 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-10-14 15:06:52 +08:00
Harryxzy dbd1b574e0 浮动薪酬优化 2024-10-14 15:05:22 +08:00
Harryxzy 49cbb7a7cc 浮动薪酬 2024-10-14 10:38:30 +08:00
钱涛 b6c7a7f2bd 自定义列全局设置 2024-10-11 17:04:13 +08:00
钱涛 64ac30c05f 自定义列全局设置 2024-10-11 15:34:17 +08:00
钱涛 861cda00fa 1、批量锁定、批量解锁选择人员的所在行的工资项目,需根据人员的选择来设置。
2、导入薪资项目时,优化下当前导入表头能否自动为上次选择的表头信息
2024-10-10 11:39:22 +08:00
钱涛 93d2980ad8 刷新核算人员功能 2024-09-29 10:37:38 +08:00
Harryxzy 9e5810f173 Merge branch 'feature/240801-浮动薪资' into release/2.15.2.2409.01 2024-09-13 11:11:24 +08:00
Harryxzy 44c11c7dcc Merge branch 'feature/240801-社保方案上下限调整自动调整基数' into release/2.15.1.2407.01 2024-09-03 09:23:50 +08:00
钱涛 42e91e32da 改为通过快照信息搜索 2024-08-26 09:26:42 +08:00
Harryxzy 59820f6aca Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01 2024-08-20 14:03:58 +08:00
Harryxzy 2a58b4972b 薪资核算导入支持vlookup函数 2024-08-20 13:48:31 +08:00
钱涛 9fae93fcd7 Merge branch 'feature/导入工具' into release/2.15.1.2407.01 2024-08-20 11:40:33 +08:00
Harryxzy 6dc9650305 Merge branch 'release/2.15.1.2407.01' into feature/240801-社保方案上下限调整自动调整基数 2024-08-19 16:01:06 +08:00
Harryxzy 26d300299b 社保方案上下限 2024-08-19 12:07:03 +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
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 a05fb6fcf0 报表义务人、账套分权 2024-08-13 13:45:24 +08:00
钱涛 845f117d9c excel导入工具 2024-08-12 17:17:52 +08:00
Harryxzy 75fb15928a 浮动薪酬 2024-08-09 10:21:40 +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
钱涛 d30380e2e7 导入薪资项目、模板、预览 2024-08-07 14:23:35 +08:00
钱涛 48120f8e24 导入薪资项目 2024-08-07 09:06:09 +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
Harryxzy 95b9f5452a 薪资档案导出fix多选义务人bug 2024-07-08 10:20:21 +08:00
钱涛 64e34d6d08 工资单预览 2024-06-13 17:46:37 +08:00
钱涛 2c79afa65e 锁定人员 2024-05-28 17:29:18 +08:00
钱涛 bc5735135c Merge branch 'feature/身份证导入' into release/2.14.3.2406.01 2024-05-28 11:28:18 +08:00
钱涛 11802dad91 根据身份证导入 2024-05-28 11:18:19 +08:00
钱涛 43db025d98 Merge branch 'feature/账套副本' into release/2.14.2.2405.02 2024-05-23 11:36:38 +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
Harryxzy 7557c1b330 薪资核算导出模板优化 2024-03-29 15:45:45 +08:00
Harryxzy 582abc061a 薪资核算导出模板 2024-03-29 10:46:51 +08:00
Harryxzy 0d6bf4dfe3 薪资核算导出模板修复 2024-03-28 18:28:22 +08:00
Harryxzy 130be31d99 薪资核算导出模板 2024-03-27 11:33:56 +08:00
Harryxzy 1c40ed0ecd 薪资核算导出模板 2024-03-26 17:04:56 +08:00
Harryxzy 0c444acd38 多部门多分部筛选 2024-03-21 14:19:03 +08:00
钱涛 417c9f703d 下载模板时带出数据 2024-03-14 15:28:14 +08:00