Commit Graph

19 Commits

Author SHA1 Message Date
lys c282a71e86 release/2.19.1.2501.01 2025-03-19 18:04:38 +08:00
lys 46f7b08360 release/2.19.1.2501.01 2025-02-14 10:43:36 +08:00
lys 7fd6edb02d feature/2.19.1.2501.01-套打功能 2025-02-07 16:44:09 +08:00
lys 811083310b release/2.19.1.2501.01 2025-01-14 14:02:24 +08:00
lys ef1c529941 release/2.18.1.2412.01 2024-12-17 16:03:52 +08:00
lys b61dc20db5 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-03 18:38:14 +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 712b45453a Merge branch 'feature/2.16.1.2410.01-次账号' into release/2.17.1.2411.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
2024-11-12 18:05:44 +08:00
lys 641c5f367f feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-08 10:02:24 +08:00
lys 98ca4cb03f release/2.16.1.2410.01 2024-11-01 16:03:57 +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 c10e6fb3ee feature/2.16.1.2410.01-次账号 2024-10-25 11:46:00 +08:00
黎永顺 bd93223774 hotfix/2.15.1.2409.01
规则设置添加薪资报表中的组织信息设置切换功能
2024-10-08 15:08:00 +08:00
黎永顺 53d45c2069 hotfix/2.15.1.2409.01
规则设置修改
2024-10-08 13:21:55 +08:00
黎永顺 f2b17872f7 release/2.15.2.2409.01 2024-09-25 11:12:53 +08:00
黎永顺 e58f5e73e0 feature/2.12.1.2404.02-薪资账套配置流程审批
添加规则配置功能
2024-04-28 17:53:12 +08:00
黎永顺 b42f9c8e13 feature/2.10.1.2402.01-我的薪资福利显示基础配置 2024-02-26 15:29:04 +08:00
黎永顺 ac479676e0 release/2.10.1.2402.01-个税 2024-02-23 17:38:42 +08:00
黎永顺 fe95424386 feature/2.10.1.2402.01-我的薪资福利显示基础配置 2024-02-23 16:20:29 +08:00