Commit Graph

72 Commits

Author SHA1 Message Date
黎永顺 f202c8d4cb Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
# Conflicts:
#	pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
2026-03-11 15:34:04 +08:00
黎永顺 65659c5990 release/2.19.1.2501.01 2026-03-11 15:30:53 +08:00
lys 680c4a0506 release/2.19.1.2501.01 2025-12-22 10:51:10 +08:00
lys 11ac14d440 release/3.0.1.2504.01-合并业务线 2025-12-22 10:48:45 +08:00
lys 5da8661bbd 0release/3.0.1.2504.01-合并业务线 2025-08-26 14:25:26 +08:00
黎永顺 02b085c051 权限 2024-09-20 16:30:12 +08:00
黎永顺 4999cc12bf Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限 2024-09-14 15:55:46 +08:00
黎永顺 15cc213c8c custom/大成 2024-09-14 15:52:12 +08:00
黎永顺 f780662b1b hotfix/2.15.1.2407.01 2024-09-13 15:52:15 +08:00
黎永顺 99ebca78d0 hotfix/2.15.1.2407.01 2024-09-13 15:45:43 +08:00
黎永顺 bf197d455e hotfix/2.15.1.2407.01
薪酬统计报表数据穿透接口参数修改
2024-08-30 13:42:21 +08:00
黎永顺 63eb373025 hotfix/2.15.1.2407.01 2024-08-20 09:23:41 +08:00
黎永顺 96f6135aba hotfix/2.15.1.2407.01 2024-08-19 17:32:49 +08:00
黎永顺 d9fc164504 hotfix/2.15.1.2407.01 2024-08-13 16:12:43 +08:00
黎永顺 6a33d3d99c hotfix/2.15.1.2407.01 2024-07-19 10:52:09 +08:00
黎永顺 892114dbc2 hotfix/2.15.1.2407.01 2024-07-18 15:37:30 +08:00
黎永顺 af8a0a1bab hotfix/2.15.1.2407.01 2024-07-16 15:59:38 +08:00
黎永顺 8df63d4a8c hotfix/2.14.2.2406.02 2024-07-15 11:35:53 +08:00
黎永顺 4d2058b180 hotfix/2.14.2.2406.02 2024-07-11 15:05:00 +08:00
黎永顺 a4e072e3ee hotfix/2.14.2.2406.02 2024-06-21 10:05:47 +08:00
黎永顺 6f29f9c56a hotfix/2.14.2.2406.02 2024-06-20 09:15:07 +08:00
黎永顺 29b5f9eb50 hotfix/2.12.1.2404.02 2024-04-29 17:55:37 +08:00
黎永顺 64bfb45618 hotfix/2.12.1.2404.02
薪酬统计报表修改表格
2024-04-28 13:48:20 +08:00
黎永顺 c43e69af5d hotfix/2.12.1.2404.02
薪酬统计报表数据透视 表格变形问题处理
2024-04-28 09:07:40 +08:00
黎永顺 342aeed953 多语言bug 2024-04-02 17:45:59 +08:00
黎永顺 8d58561b88 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
2024-03-26 17:07:21 +08:00
黎永顺 d9f3fafd51 hotfix/2.12.1.2403.02
数据透视导出功能
2024-03-19 14:29:00 +08:00
黎永顺 3b0f7bd5ce 薪酬报表设置修改 2024-03-07 10:31:56 +08:00
黎永顺 d1f8f5d9aa 薪酬报表修复 2024-03-07 10:10:04 +08:00
黎永顺 5e9a9c2822 hotfix/2.10.1.2402.01
薪酬统计报表设置添加薪资账套的设置项
2024-02-28 15:48:22 +08:00
黎永顺 d5fa8d7e84 hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
2023-12-25 14:54:55 +08:00
黎永顺 854949ab62 hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
2023-12-25 14:37:14 +08:00
黎永顺 238d97798a hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
2023-12-22 14:42:27 +08:00
黎永顺 7cc9e422b1 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 13:44:53 +08:00
黎永顺 7908f925ea release/2.9.42311.01 2023-11-09 16:27:33 +08:00
黎永顺 1afaa04129 1release/2.9.42311.01 2023-11-09 15:36:13 +08:00
黎永顺 8252cebd98 1release/2.9.42311.01 2023-11-08 18:11:38 +08:00
黎永顺 8bd1cd51af feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-06 17:05:26 +08:00
黎永顺 f9f47324e5 feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-02 14:30:18 +08:00
黎永顺 e4d9a2c545 hotfix/2.9.42309.01 2023-09-21 15:45:58 +08:00
黎永顺 96032b5f1c feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-21 10:17:06 +08:00
黎永顺 d664ad2769 feature/2.9.42309.01-薪酬统计报表分享报表
20230920
2023-09-20 17:03:24 +08:00
黎永顺 d7c59f5434 feature/2.9.42309.01-薪酬统计报表分享报表
20230920
2023-09-20 15:03:05 +08:00
黎永顺 6ac979e9e7 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-20 09:25:10 +08:00
黎永顺 10c7280b43 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-19 17:24:52 +08:00
黎永顺 c8fe01dfda 产品-薪酬统计报表echarts图标组件封装 2023-07-10 15:52:25 +08:00
黎永顺 61ebfdf9f1 产品-薪酬统计报表图表组件优化 2023-07-04 15:42:39 +08:00
黎永顺 3c7c03916d 产品-薪酬统计分析设置页面的个税扣缴义务人选项修改 2023-06-16 11:46:01 +08:00
黎永顺 b930c35e82 产品-薪酬统计报表优化 2023-06-09 10:47:51 +08:00
黎永顺 42f2a8ac55 产品-薪酬统计报表列表接口优化以及薪资项目管理列表优化 2023-06-09 10:01:07 +08:00