 黎永顺
|
a84a216000
|
hotfix/2.9.42309.01-个税
|
2023-10-17 11:01:29 +08:00 |
|
黎永顺
|
71cdd6da50
|
hotfix/2.9.42309.01-个税
|
2023-10-10 14:17:37 +08:00 |
|
黎永顺
|
f3e1e1e166
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
|
2023-10-08 16:14:59 +08:00 |
|
黎永顺
|
b17f2ace8a
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-08 15:17:25 +08:00 |
|
黎永顺
|
b566213dcd
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into release/2.9.42310.01
|
2023-10-08 15:17:15 +08:00 |
|
黎永顺
|
d48fc2991d
|
Merge branch 'feature/2.9.42310.01-工资单发放导出PDF' into release/2.9.42310.01
|
2023-10-08 15:17:09 +08:00 |
|
黎永顺
|
48d1a674dc
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 15:12:28 +08:00 |
|
黎永顺
|
8d1c0abf2f
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 15:09:47 +08:00 |
|
黎永顺
|
da36ed3aa9
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 10:51:26 +08:00 |
|
黎永顺
|
c4b222e200
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 10:09:18 +08:00 |
|
黎永顺
|
345288793b
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 09:01:21 +08:00 |
|
黎永顺
|
c365d2eb56
|
feature/2.9.42310.01-工资单时效设置
|
2023-10-07 16:37:44 +08:00 |
|
黎永顺
|
00d285e5be
|
hotfix/2.9.42310.01
|
2023-10-07 15:38:33 +08:00 |
|
黎永顺
|
953172f26a
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-28 14:25:21 +08:00 |
|
黎永顺
|
49e5a0ad73
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-27 17:42:55 +08:00 |
|
黎永顺
|
0902c3bb71
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-27 15:42:42 +08:00 |
|
黎永顺
|
486254601f
|
feature/2.9.42310.01-工资单发放导出PDF
|
2023-09-27 14:35:37 +08:00 |
|
黎永顺
|
22d8ecfcd4
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-27 14:19:48 +08:00 |
|
黎永顺
|
3d8bef9147
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-27 09:21:53 +08:00 |
|
黎永顺
|
06f19c74db
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-27 09:13:02 +08:00 |
|
黎永顺
|
4bb3bc403a
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-26 16:38:47 +08:00 |
|
黎永顺
|
929a5da68a
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-26 13:26:55 +08:00 |
|
黎永顺
|
b54a561ba4
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-26 11:03:19 +08:00 |
|
黎永顺
|
30f76505fe
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42309.01-个税
|
2023-09-25 16:21:22 +08:00 |
|
黎永顺
|
d9a6f3907c
|
hotfix/2.9.42310.01
表单字段隐藏的问题
|
2023-09-25 16:20:56 +08:00 |
|
黎永顺
|
ff3dd0ea60
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-25 15:35:11 +08:00 |
|
黎永顺
|
1f37bdde4b
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表'
|
2023-09-25 10:58:51 +08:00 |
|
黎永顺
|
2c56e8dc06
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-25 09:43:03 +08:00 |
|
黎永顺
|
9339c42d4d
|
Merge branch 'hotfix/2.9.42309.01-个税' into release/2.9.42309.01-个税
|
2023-09-22 11:15:40 +08:00 |
|
黎永顺
|
5a151f3910
|
hotfix/2.9.42309.01-个税
|
2023-09-22 11:14:48 +08:00 |
|
黎永顺
|
61637e6de7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 18:18:47 +08:00 |
|
黎永顺
|
f7e895aaf0
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
|
2023-09-21 16:16:35 +08:00 |
|
黎永顺
|
12d4b5c33c
|
hotfix/2.9.42309.01
|
2023-09-21 16:13:18 +08:00 |
|
黎永顺
|
79546aaf63
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
|
2023-09-21 15:48:40 +08:00 |
|
黎永顺
|
e4d9a2c545
|
hotfix/2.9.42309.01
|
2023-09-21 15:45:58 +08:00 |
|
黎永顺
|
f8393fbe7d
|
Merge branch 'release/2.9.42309.01' into hotfix/2.9.42309.01
|
2023-09-21 15:21:10 +08:00 |
|
黎永顺
|
5b43e43f4a
|
hotfix/2.9.42309.01
|
2023-09-21 15:20:59 +08:00 |
|
黎永顺
|
1bd7d92073
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
# Conflicts:
# pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
# pc4mobx/hrmSalary/components/importDialog/index.js
# pc4mobx/hrmSalary/components/importDialog/index.less
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
|
2023-09-21 14:23:21 +08:00 |
|
黎永顺
|
0c1fdd7d13
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-21 14:16:40 +08:00 |
|
黎永顺
|
93a23cb9a3
|
Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into release/2.9.42309.01
|
2023-09-21 14:16:25 +08:00 |
|
黎永顺
|
cfce462898
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into release/2.9.42309.01
|
2023-09-21 14:16:06 +08:00 |
|
黎永顺
|
9030e22449
|
hotfix/2.9.42309.01
|
2023-09-21 12:04:55 +08:00 |
|
黎永顺
|
96032b5f1c
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 10:17:06 +08:00 |
|
黎永顺
|
e7e4d17cfa
|
hotfix/2.9.42309.01
|
2023-09-20 17:42:06 +08:00 |
|
黎永顺
|
c0220d8853
|
hotfix/2.9.42309.01
|
2023-09-20 17:29:50 +08:00 |
|
黎永顺
|
26fdf624bb
|
hotfix/2.9.42309.01
|
2023-09-20 17:25:56 +08:00 |
|
黎永顺
|
d664ad2769
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 17:03:24 +08:00 |
|
黎永顺
|
b22b41382f
|
hotfix/2.9.42309.01
20230920-社保福利方案添加搜索条件
|
2023-09-20 16:51:00 +08:00 |
|
黎永顺
|
d7c59f5434
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 15:03:05 +08:00 |
|
黎永顺
|
a58da11dc3
|
hotfix/2.9.42309.01
20230920
|
2023-09-20 14:20:51 +08:00 |