Commit Graph

319 Commits

Author SHA1 Message Date
lys b17251e8f0 Merge branch 'feature/2.19.1.2501.01-薪酬批量操作' into custom/汇通建设 2025-06-10 16:53:38 +08:00
lys 2f649ecae6 feature/2.19.1.2501.01-薪酬批量操作 2025-06-10 10:00:37 +08:00
lys 004deaeea3 feature/2.19.1.2501.01-薪酬批量操作 2025-06-04 13:47:12 +08:00
lys b9efc6386e feature/2.19.1.2501.01-薪酬批量操作 2025-06-03 17:22:18 +08:00
lys 554cf4b6b3 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 17:44:30 +08:00
lys 51d9c58888 release/2.19.1.2501.01 2025-04-15 16:27:19 +08:00
lys 6b8b604f55 feature/2.19.1.2501.01-套打功能 2025-02-08 11:16:43 +08:00
lys eb66a32612 release/2.18.1.2412.01 2024-12-09 18:14:41 +08:00
lys 5f893b1eb0 release/2.18.1.2412.01 2024-12-09 17:37:44 +08:00
lys 5d817c9594 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 15:42:49 +08:00
lys a048a561a5 release/2.17.1.2411.01 2024-11-26 14:56:03 +08:00
lys da31fe5740 Merge branch 'release/2.17.1.2411.01' into custom/汇通建设
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2024-11-22 14:06:49 +08:00
lys 59d2b845d6 custom/汇通建设 2024-11-22 11:22:18 +08:00
lys 0d0a7a9367 custom/汇通建设 2024-11-22 10:15:06 +08:00
lys b0a45c9bbe Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
2024-11-14 09:36:26 +08:00
lys 97a5d37044 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-07 16:06:48 +08:00
lys e9f4d9b043 release/2.16.1.2410.01 2024-11-06 11:06:55 +08:00
lys 1f7fe615be 1release/2.16.1.2410.01 2024-11-01 14:50:37 +08:00
lys f126179d1d Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾
# Conflicts:
#	pc4mobx/hrmSalary/apis/calculate.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
#	pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
#	pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
2024-10-31 17:02:27 +08:00
lys 18f2e6c08a custom/汇通建设 2024-10-31 16:37:10 +08:00
lys 47943f74e3 custom/汇通建设 2024-10-25 17:53:49 +08:00
lys 3973a9d0bc custom/汇通建设 2024-10-25 16:51:02 +08:00
lys e7f1971370 feature/2.16.1.2410.01-薪资核算单元格锁定 2024-10-18 14:26:00 +08:00
黎永顺 5b3a645dfc release/2.15.2.2409.01 2024-10-12 10:07:36 +08:00
黎永顺 215094dac8 release/2.15.2.2409.01 2024-10-09 11:25:50 +08:00
黎永顺 9c318d22b7 hotfix/2.15.1.2409.01 2024-09-29 10:57:22 +08:00
黎永顺 687371ab39 Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2024-09-13 11:18:48 +08:00
黎永顺 421fca99cc Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01 2024-08-20 13:37:39 +08:00
黎永顺 4be61e9179 feature/2.15.1.2407.01-浮动薪酬 2024-08-15 15:24:00 +08:00
黎永顺 d9fc164504 hotfix/2.15.1.2407.01 2024-08-13 16:12:43 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 f05c43d011 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 14:58:36 +08:00
黎永顺 9d99557f4b feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:24:11 +08:00
黎永顺 86de787ed4 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 18:24:45 +08:00
黎永顺 70fe54efb7 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 17:32:54 +08:00
黎永顺 36d90b35a6 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 14:36:11 +08:00
黎永顺 75b6c0969a feature/2.15.1.2407.01-导入工具 2024-08-07 15:22:10 +08:00
黎永顺 af8a0a1bab hotfix/2.15.1.2407.01 2024-07-16 15:59:38 +08:00
黎永顺 cff964c7f1 feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-16 11:10:48 +08:00
黎永顺 2e775eb205 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 09:07:43 +08:00
黎永顺 c0079fe4b4 feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:17 +08:00
黎永顺 a4b98f253c Merge branch 'feature/2.12.1.2404.02-薪资核算判断账套是否修改提示' into release/2.14.2.2405.02 2024-05-23 11:04:34 +08:00
黎永顺 8f582ad3dd hotfix/2.12.1.2404.02 2024-05-11 15:06:47 +08:00
黎永顺 166dfa6979 hotfix/2.12.1.2404.02 2024-05-11 11:09:13 +08:00
黎永顺 2fb3c89947 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 16:53:51 +08:00
黎永顺 825549595a hotfix/2.12.1.2404.02 2024-04-25 16:23:31 +08:00
黎永顺 2e5404bee6 feature/2.12.1.2404.02-薪资账套配置流程审批 2024-04-25 16:07:04 +08:00
黎永顺 10e981d0d3 feature/2.12.1.2404.02-薪资账套配置流程审批 2024-04-25 14:26:06 +08:00
黎永顺 8a7f3fcb7a feature/2.12.1.2403.02-薪资核算自定义导出模板设置 2024-03-29 14:37:49 +08:00
黎永顺 a768470afb feature/2.12.1.2403.02-个税-外籍人员信息报送 2024-03-29 10:19:33 +08:00