Commit Graph

1027 Commits

Author SHA1 Message Date
黎永顺 c628b482f9 个税对接-人员信息报送详情页 2023-08-14 17:08:40 +08:00
黎永顺 9cb47f784c 个税对接-人员信息报送详情页 2023-08-14 14:46:19 +08:00
黎永顺 cfe1ed7773 人员信息报送-查看详情页面开发完成 2023-08-11 17:14:43 +08:00
黎永顺 a2c2292e60 汉桑-社保福利台账添加福利导入的功能 2023-08-11 16:06:21 +08:00
黎永顺 d43b31a5c2 产品-个税对接 2023-08-10 14:07:18 +08:00
黎永顺 67d17fcbee 产品-人员信息报送 2023-07-24 10:49:30 +08:00
黎永顺 82b65d903b 产品-人员信息报送 2023-07-24 10:29:29 +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
黎永顺 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
黎永顺 f323bc6b7c Merge branch 'hotfix/2.8.3.2307.02' into release/2.8.3.2307.02 2023-07-19 15:03:13 +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
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 aa1c3a6417 Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01 2023-07-13 15:11:06 +08:00
黎永顺 985b9612f6 薪资档案个税扣缴义务人选项修改 2023-07-13 15:02:57 +08:00
黎永顺 aff963b5c6 工资单反馈功能新增 2023-07-13 14:45:25 +08:00
黎永顺 e83ff0dbcc 非系统人员管理开发合并 2023-07-13 10:31:45 +08:00
黎永顺 eaf8e5c51e 非系统人员管理开发合并 2023-07-13 10:05:16 +08:00
黎永顺 f3fdd91201 Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01 2023-07-13 09:51:20 +08:00
黎永顺 0650acb1fc Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01 2023-07-13 09:43:41 +08:00
黎永顺 7c908c81db 产品-薪資核算核算页面的列表带搜索条件翻页查询不错的bug修复 2023-07-13 09:37:17 +08:00
黎永顺 a3e9a6e733 产品-工资单反馈改造 2023-07-12 16:18:54 +08:00
黎永顺 8356de0fa2 非系统人员开发合并 2023-07-12 14:34:07 +08:00
黎永顺 38c9d97f54 非系统人员开发合并 2023-07-12 13:43:15 +08:00
黎永顺 b8c8297cf0 产品-工资单反馈 2023-07-12 10:14:38 +08:00
黎永顺 62914e0ed0 非系统人员管理开发合并 2023-07-11 18:07:40 +08:00