Commit Graph

131 Commits

Author SHA1 Message Date
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 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
黎永顺 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
黎永顺 c9c79460c7 产品-薪资账套薪资项目项添加编辑的功能 2023-07-26 09:31:15 +08:00
黎永顺 6a45f624e2 产品-社保档案基础信息修改 2023-07-25 18:22:43 +08:00
黎永顺 ada5aee430 产品-社保档案基础信息修改 2023-07-25 16:16:39 +08:00
黎永顺 e963bcfb57 产品-社保档案基础信息修改 2023-07-24 18:22:24 +08:00
黎永顺 ac37e9b16d 产品-薪资账套薪资项目项添加编辑的功能 2023-07-21 15:37:57 +08:00
黎永顺 d5a625d4c8 产品-release/2.8.3.2307.02bug修复 2023-07-20 17:03:20 +08:00
黎永顺 c062f172f6 Merge branch 'feature/V2-非系统人员管理开发' into release/2.8.3.2307.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-20 13:47:42 +08:00
黎永顺 d1b2f98387 产品-薪资账套薪资项目项添加编辑的功能 2023-07-19 15:02:44 +08:00
黎永顺 4e3e090c3c 产品-薪资项目隐藏项 2023-07-18 16:50:16 +08:00
黎永顺 ee49150930 产品-薪资项目管理添加默认隐藏的功能 2023-07-18 15:47:56 +08:00
黎永顺 1542d8c982 非系统人员配置功能 2023-07-14 14:09:27 +08:00
黎永顺 ce50c9cf91 Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/payrollFiles/index.js
#	pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
#	pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
#	pc4mobx/hrmSalary/util/index.js
2023-07-11 17:36:38 +08:00
黎永顺 986e2d7f4a Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
2023-07-11 10:11:58 +08:00
黎永顺 3d04a79fcd 产品-统一页面列表操作按钮 2023-07-03 15:42:11 +08:00
黎永顺 3a8dd06e3c 产品-工资单水印预览和查看不一致的问题处理,账套项目预览隐藏分组未实现, 数据采集查看明细时页面显示不对齐问题处理 2023-06-30 10:17:23 +08:00
黎永顺 a3832918cf 产品-薪资账套薪资项目项新增排序问题 2023-05-18 14:50:04 +08:00
黎永顺 bd95f4b2fb 禅道bug归零 2023-05-11 10:44:32 +08:00
黎永顺 e52c239ad1 禅道bug归零 2023-05-11 10:13:23 +08:00