 黎永顺
|
b260a41c7e
|
feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换
|
2023-10-12 15:52:15 +08:00 |
|
黎永顺
|
618d9f12cd
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-12 14:14:42 +08:00 |
|
黎永顺
|
f2027627f4
|
hotfix/2.9.42310.01
|
2023-10-12 14:08:48 +08:00 |
|
黎永顺
|
ca5b60f6aa
|
feature/2.9.42310.01-个税申报表页面重构
|
2023-10-12 13:57:14 +08:00 |
|
黎永顺
|
4d76443438
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-11 18:23:44 +08:00 |
|
黎永顺
|
d67b8bc6ab
|
hotfix/2.9.42310.01
|
2023-10-11 18:23:19 +08:00 |
|
黎永顺
|
afc4ad4d1d
|
Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into develop
|
2023-10-11 16:43:01 +08:00 |
|
黎永顺
|
9e5e941a3f
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop
|
2023-10-11 16:42:33 +08:00 |
|
黎永顺
|
c8e58db7d9
|
Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into release/2.9.42310.01
|
2023-10-11 16:26:10 +08:00 |
|
黎永顺
|
a02987088e
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-11 16:24:55 +08:00 |
|
黎永顺
|
6b868824ee
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-11 16:24:33 +08:00 |
|
黎永顺
|
dd9d429a81
|
hotfix/2.9.42310.01
工资单查看权限
|
2023-10-11 16:23:55 +08:00 |
|
黎永顺
|
5e51f78ff6
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-11 15:05:24 +08:00 |
|
黎永顺
|
c9403cda9d
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into feature/2.9.42310.01-薪资核算页面重构
|
2023-10-11 13:55:53 +08:00 |
|
黎永顺
|
54b4ebe83a
|
薪资核算页面导入薪资项样式修改
|
2023-10-11 13:55:10 +08:00 |
|
黎永顺
|
93d996c79f
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-10 17:49:45 +08:00 |
|
黎永顺
|
920dd1127e
|
Merge branch 'release/2.9.42310.01-个税' into custom-艾志工业-合并个税
# Conflicts:
# pc4mobx/hrmSalary/stores/taxAgent.js
|
2023-10-10 14:41:51 +08:00 |
|
黎永顺
|
22e9bea8bf
|
Merge branch 'custom-艾志工业' into custom-艾志工业-合并个税
|
2023-10-10 14:40:01 +08:00 |
|
黎永顺
|
c8de15e061
|
艾志-社保福利其他福利名称修改
|
2023-10-10 14:38:59 +08:00 |
|
黎永顺
|
71cdd6da50
|
hotfix/2.9.42309.01-个税
|
2023-10-10 14:17:37 +08:00 |
|
黎永顺
|
3fe4ede887
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 17:48:45 +08:00 |
|
黎永顺
|
fabe3561fd
|
custom-艾志工业-合并个税
|
2023-10-09 15:55:28 +08:00 |
|
黎永顺
|
55bfc5a4ac
|
Merge branch 'hotfix/2.9.42310.01' into custom-艾志工业-合并个税
|
2023-10-09 15:39:24 +08:00 |
|
黎永顺
|
d00e46442d
|
hotfix/2.9.42310.01
|
2023-10-09 15:33:19 +08:00 |
|
黎永顺
|
3fdef5ba85
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 15:15:59 +08:00 |
|
黎永顺
|
321275d406
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 13:17:54 +08:00 |
|
黎永顺
|
eeb5904b4e
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-09 09:42:51 +08:00 |
|
黎永顺
|
7d222033ab
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop
|
2023-10-09 09:42:09 +08:00 |
|
黎永顺
|
19f183795c
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-09 09:41:48 +08:00 |
|
黎永顺
|
9aaef674f0
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop
|
2023-10-09 08:58:09 +08:00 |
|
黎永顺
|
010c535763
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop
|
2023-10-09 08:57:45 +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 |
|
黎永顺
|
00adb919a6
|
Merge branch 'hotfix/2.9.42310.01' into develop
|
2023-10-08 09:03:06 +08:00 |
|
黎永顺
|
a01f2cc686
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop
|
2023-10-08 09:02:43 +08:00 |
|
黎永顺
|
36dc096e2c
|
Merge branch 'feature/2.9.42310.01-工资单发放导出PDF' into develop
|
2023-10-08 09:02:29 +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 |
|
黎永顺
|
11b685c5e6
|
Merge branch 'custom-艾志工业' into custom-艾志工业-合并个税
|
2023-09-27 14:36:22 +08:00 |
|
黎永顺
|
486254601f
|
feature/2.9.42310.01-工资单发放导出PDF
|
2023-09-27 14:35:37 +08:00 |