Commit Graph

1103 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 aa6a581c1a 产品-编辑功能 2023-07-24 11:14:22 +08:00
黎永顺 67d17fcbee 产品-人员信息报送 2023-07-24 10:49:30 +08:00
黎永顺 82b65d903b 产品-人员信息报送 2023-07-24 10:29:29 +08:00
黎永顺 07ba7a61c2 Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2307.02 2023-07-24 09:46:30 +08:00
黎永顺 f6db0c18dd 产品-智能算薪 2023-07-21 15:56:13 +08:00
黎永顺 ac37e9b16d 产品-薪资账套薪资项目项添加编辑的功能 2023-07-21 15:37:57 +08:00
黎永顺 3091232181 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-21 10:15:48 +08:00
黎永顺 8e399f979a 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-20 18:26:34 +08:00
黎永顺 d5a625d4c8 产品-release/2.8.3.2307.02bug修复 2023-07-20 17:03:20 +08:00
黎永顺 f7cd085c92 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-20 16:16:43 +08:00
黎永顺 12aa1c6c10 Merge branch 'feature/非系统人员开关' into release/2.8.3.2307.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-20 13:50:30 +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
黎永顺 01c033eacf Merge branch 'feature/2.8.3.2307.02-规则设置系统算税开关关闭后禁用' into release/2.8.3.2307.02 2023-07-20 13:45:12 +08:00
黎永顺 f3712e03ef Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into release/2.8.3.2307.02 2023-07-20 13:44:54 +08:00
黎永顺 88b6c23aed Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into release/2.8.3.2307.02 2023-07-20 13:44:33 +08:00
黎永顺 27bb5e823d Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
2023-07-20 13:44:02 +08:00
黎永顺 c48c73a755 产品-非系统人员更改 2023-07-20 13:40:42 +08:00
黎永顺 9d94619c1d 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-20 13:35:37 +08:00
黎永顺 aabcbd2519 产品-智能算薪 2023-07-19 17:27:39 +08:00
黎永顺 f323bc6b7c Merge branch 'hotfix/2.8.3.2307.02' into release/2.8.3.2307.02 2023-07-19 15:03:13 +08:00
黎永顺 d1b2f98387 产品-薪资账套薪资项目项添加编辑的功能 2023-07-19 15:02:44 +08:00
黎永顺 77645b717a 产品-薪资项目添加默认隐藏的功能 2023-07-18 17:31:13 +08:00
黎永顺 da3fd957ab 产品-规则设置系统算税开关关闭后禁用 2023-07-18 17:27:51 +08:00
黎永顺 4e3e090c3c 产品-薪资项目隐藏项 2023-07-18 16:50:16 +08:00
黎永顺 d2e4ea6190 个税对接-扣缴义务人重构 2023-07-18 16:24:56 +08:00
黎永顺 192533e847 bug-自定义福利关闭启用时提示错误 2023-07-18 16:01:45 +08:00
黎永顺 ee49150930 产品-薪资项目管理添加默认隐藏的功能 2023-07-18 15:47:56 +08:00
黎永顺 9d1b537abf 产品-薪资项目管理添加默认隐藏的功能 2023-07-18 15:25:16 +08:00
黎永顺 64797acaea 产品个税对接-个税扣缴义务人设置 2023-07-18 14:24:52 +08:00
黎永顺 37cb0f050a Merge branch 'master' into feature/v2-对接e10个税扣缴义务人设置-1121
# Conflicts:
#	pc4mobx/hrmSalary/util/index.js
2023-07-18 09:35:33 +08:00
黎永顺 377039ade2 产品-工资单反馈添加提示语 2023-07-17 17:40:30 +08:00
黎永顺 70bd93ef2f Merge branch 'release/2.8.3.2307.01' into feature/2.8.3.2307.02-工资单反馈
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-17 17:09:27 +08:00
黎永顺 57958f9bf9 产品-薪资核算按自定义列导出 2023-07-17 16:49:02 +08:00
黎永顺 ff035c87f3 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
2023-07-17 15:22:17 +08:00
黎永顺 8ca7a02f82 产品-工资单反馈跳转验证 2023-07-17 15:21:05 +08:00
黎永顺 bcecb87dc5 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
2023-07-17 14:44:05 +08:00
黎永顺 2af9059775 产品-工资单反馈跳转验证 2023-07-17 14:43:01 +08:00
黎永顺 25f2c2efd6 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-17 13:50:54 +08:00
黎永顺 4fa57ba637 产品-工资单反馈开发 2023-07-17 11:43:14 +08:00
黎永顺 778ca2655b 薪资核算自定义列导出 2023-07-17 11:26:13 +08:00
黎永顺 ce93eff734 规则名称修改 2023-07-17 10:58:02 +08:00
黎永顺 98a4de233b Merge branch 'master' into hotfix/2.8.3.2307.02 2023-07-14 15:32:06 +08:00
黎永顺 90bb69f292 bug-社保福利台账核算页面按钮文字修改 2023-07-14 15:31:57 +08:00
黎永顺 1542d8c982 非系统人员配置功能 2023-07-14 14:09:27 +08:00
黎永顺 cf33419bc3 非系统人员配置功能 2023-07-14 10:39:12 +08:00
黎永顺 1747e983e4 Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01 2023-07-13 15:24:37 +08:00
黎永顺 626f8721fb 二次密码设置 2023-07-13 15:23:38 +08:00