 黎永顺
|
bf7a1478c5
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-21 10:16:12 +08:00 |
|
黎永顺
|
3091232181
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-21 10:15:48 +08:00 |
|
黎永顺
|
bc9214edcd
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-20 18:27:11 +08:00 |
|
黎永顺
|
4716d3d8a6
|
Merge branch 'hotfix/2.8.3.2307.02' into develop
|
2023-07-20 18:26:57 +08:00 |
|
黎永顺
|
8e399f979a
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 18:26:34 +08:00 |
|
黎永顺
|
f7cd085c92
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 16:16:43 +08:00 |
|
黎永顺
|
9d94619c1d
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 13:35:37 +08:00 |
|
黎永顺
|
1be06c98b0
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into develop
|
2023-07-18 16:50:43 +08:00 |
|
黎永顺
|
4e3e090c3c
|
产品-薪资项目隐藏项
|
2023-07-18 16:50:16 +08:00 |
|
黎永顺
|
192533e847
|
bug-自定义福利关闭启用时提示错误
|
2023-07-18 16:01:45 +08:00 |
|
黎永顺
|
bc1dba0702
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into develop
|
2023-07-18 15:48:49 +08:00 |
|
黎永顺
|
2cbdc89581
|
Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into develop
|
2023-07-18 15:48:42 +08:00 |
|
黎永顺
|
ee49150930
|
产品-薪资项目管理添加默认隐藏的功能
|
2023-07-18 15:47:56 +08:00 |
|
黎永顺
|
9d1b537abf
|
产品-薪资项目管理添加默认隐藏的功能
|
2023-07-18 15:25:16 +08:00 |
|
黎永顺
|
f15ace5c33
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-17 17:45:24 +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 |
|
黎永顺
|
8ca7a02f82
|
产品-工资单反馈跳转验证
|
2023-07-17 15:21:05 +08:00 |
|
黎永顺
|
2af9059775
|
产品-工资单反馈跳转验证
|
2023-07-17 14:43:01 +08:00 |
|
黎永顺
|
81faf155b7
|
Merge branch 'feature/2.8.3.2307.02-工资单反馈' into develop
|
2023-07-17 11:43:39 +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 |
|
黎永顺
|
5d5dc0b47e
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-14 14:12:36 +08:00 |
|
黎永顺
|
1542d8c982
|
非系统人员配置功能
|
2023-07-14 14:09:27 +08:00 |
|
黎永顺
|
91c2060265
|
Merge branch 'feature/非系统人员开关' into develop
# Conflicts:
# pc4mobx/hrmSalary/apis/ruleconfig.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-14 10:43:05 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
b3e5d2ba1c
|
dev合并工资单反馈代码
|
2023-07-13 14:58:27 +08:00 |
|
黎永顺
|
92edd14872
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
|
2023-07-13 14:49:42 +08:00 |
|
黎永顺
|
aff963b5c6
|
工资单反馈功能新增
|
2023-07-13 14:45:25 +08:00 |
|
黎永顺
|
44abe03216
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-13 10:32:05 +08:00 |
|
黎永顺
|
e83ff0dbcc
|
非系统人员管理开发合并
|
2023-07-13 10:31:45 +08:00 |
|
黎永顺
|
9e75d1aca6
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-13 10:05:38 +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 |
|
黎永顺
|
981cd54262
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-13 09:38:16 +08:00 |
|
黎永顺
|
7c908c81db
|
产品-薪資核算核算页面的列表带搜索条件翻页查询不错的bug修复
|
2023-07-13 09:37:17 +08:00 |
|
黎永顺
|
ef3b74c98f
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-12 16:22:04 +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 |
|
黎永顺
|
147749796a
|
产品-工资单反馈
|
2023-07-12 11:32:15 +08:00 |