Commit Graph

149 Commits

Author SHA1 Message Date
lys bb3ded5692 release/2.19.1.2501.01 2025-03-27 15:28:53 +08:00
lys b443a56679 release/2.19.1.2501.01 2025-03-27 13:46:53 +08:00
lys 9c04b2adaf release/2.18.2.2412.02 2025-01-03 11:40:39 +08:00
lys a8e2a53037 release/2.18.2.2412.02 2024-12-31 15:26:54 +08:00
lys cdc75b7668 release/2.18.2.2412.02 2024-12-31 15:04:09 +08:00
lys 2d659768ac release/2.18.2.2412.02 2024-12-31 13:42:33 +08:00
lys 8aa696fee5 release/2.18.2.2412.02 2024-12-27 09:12:09 +08:00
lys 8b8f4cd610 release/2.18.2.2412.02 2024-12-25 17:20:55 +08:00
lys cdd98ea602 release/2.18.1.2412.01 2024-12-20 16:36:50 +08:00
lys 89b9e6110e release/2.18.1.2412.01 2024-12-09 18:01:05 +08:00
lys 3871eb276a 1release/2.18.1.2412.01 2024-12-09 17:58:24 +08:00
lys ce4c2a7c72 release/2.17.1.2411.01 2024-11-27 10:59:24 +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 df4971fd27 release/2.16.1.2410.01 2024-11-01 18:28:12 +08:00
lys 1f7fe615be 1release/2.16.1.2410.01 2024-11-01 14:50:37 +08:00
lys b461a2c801 custom/汇通建设 2024-10-31 17:05:24 +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 8488f54aac release/2.16.1.2410.01 2024-10-29 09:21:38 +08:00
lys 4b125994f7 release/2.16.1.2410.01 2024-10-17 11:17:55 +08:00
黎永顺 76da4dd1e1 hotfix/2.15.1.2407.01 2024-09-05 10:13:03 +08:00
黎永顺 6bb79ab685 hotfix/2.14.2.2406.02 2024-06-20 17:25:55 +08:00
黎永顺 93c39cad41 hotfix/2.14.2.2406.02 2024-06-20 11:17:30 +08:00
黎永顺 c39515d7f9 hotfix/2.14.2.2406.02 2024-06-19 11:43:08 +08:00
黎永顺 10c7903892 hotfix/2.14.2.2406.02 2024-06-18 17:48:08 +08:00
黎永顺 7221d910ca hotfix/2.14.2.240默认值 2024-06-18 10:44:48 +08:00
黎永顺 add6a70abd hotfix/2.14.2.2406.02 2024-06-17 16:17:16 +08:00
黎永顺 e58f5e73e0 feature/2.12.1.2404.02-薪资账套配置流程审批
添加规则配置功能
2024-04-28 17:53:12 +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
黎永顺 7dee340ab8 hotfix/2.12.1.2404.02 2024-04-24 15:20:13 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 c260c31bf8 release/2.10.1.2401.01
bug修复
2024-01-30 15:48:42 +08:00
黎永顺 ba49afb85d release/2.10.1.2401.01
bug修复
2024-01-30 15:46:37 +08:00
黎永顺 3155c2eb89 Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into release/2.9.10.2312.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
2024-01-08 13:44:57 +08:00
黎永顺 e4573bb95e hotfix/2.9.9.2312.01 2023-12-07 13:55:52 +08:00
黎永顺 84d4df6d3d feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-29 18:29:55 +08:00
黎永顺 79fca386d3 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-29 14:02:53 +08:00
黎永顺 7cc9e422b1 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 13:44:53 +08:00
黎永顺 23f15bd423 feature/2.9.42311.02-社保核算以及薪资账套查询优化 2023-11-27 19:17:44 +08:00
黎永顺 eed8d3a5bd feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 16:14:59 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 2b282b4211 hotfix/2.9.42309.01 2023-09-14 10:37:39 +08:00
黎永顺 a5e0ca3084 薪资项目公式保存参数修改 2023-08-31 15:02:56 +08:00
黎永顺 78e08d7c26 系统数字输入框保留小数位数配置 2023-08-25 16:12:05 +08:00
黎永顺 290c3e51d3 Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
2023-08-17 08:37:56 +08:00
黎永顺 480106d4e7 产品-薪资账套薪资项目项添加编辑的功能 2023-08-04 09:34:04 +08:00
黎永顺 db53fc8942 产品-薪资账套薪资项目项添加编辑的功能 2023-07-31 11:50:30 +08:00
黎永顺 600d73f858 产品-薪资账套薪资项目编辑功能修改 2023-07-31 10:51:10 +08:00
黎永顺 fb40c1a998 产品-薪资账套编辑 2023-07-28 16:28:27 +08:00
黎永顺 3f63b26184 产品-薪资账套薪资项目项添加编辑的功能 2023-07-26 14:10:55 +08:00