 黎永顺
|
892e0f10f9
|
Merge branch 'feature/2.8.3.2308-人员信息报送' into feature/v2-对接e10个税扣缴义务人设置-1121
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-08-14 17:24:49 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
bc91806e37
|
产品-个税对接
|
2023-08-10 11:11:23 +08:00 |
|
黎永顺
|
d41687c3fb
|
产品-个税对接
|
2023-08-10 10:22:16 +08:00 |
|
黎永顺
|
2c8ce14def
|
产品-对接e10个税扣缴义务人设置
|
2023-08-09 15:02:27 +08:00 |
|
黎永顺
|
c2eb4400c4
|
Merge branch 'feature/2.8.3-2308-智能算薪' into feature/v2-对接e10个税扣缴义务人设置-1121
|
2023-08-09 11:47:37 +08:00 |
|
黎永顺
|
3645c52434
|
产品-智能算薪
|
2023-08-09 10:35:49 +08:00 |
|
黎永顺
|
9ae523ad87
|
产品-智能算薪
|
2023-07-28 09:23:35 +08:00 |
|
黎永顺
|
a3231c252d
|
产品-对接e10个税扣缴义务人设置
|
2023-07-27 16:07:19 +08:00 |
|
黎永顺
|
67d17fcbee
|
产品-人员信息报送
|
2023-07-24 10:49:30 +08:00 |
|
黎永顺
|
82b65d903b
|
产品-人员信息报送
|
2023-07-24 10:29:29 +08:00 |
|
黎永顺
|
f6db0c18dd
|
产品-智能算薪
|
2023-07-21 15:56:13 +08:00 |
|
黎永顺
|
d5a625d4c8
|
产品-release/2.8.3.2307.02bug修复
|
2023-07-20 17:03:20 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |