 黎永顺
|
9e7e142296
|
hotfix/2.9.42309.01-个税
|
2023-10-24 08:42:07 +08:00 |
|
黎永顺
|
d61fccaf43
|
hotfix/2.9.42309.01-个税
|
2023-10-23 14:35:10 +08:00 |
|
黎永顺
|
cd163693c8
|
release/2.9.42310.01-个税
|
2023-10-23 11:06:04 +08:00 |
|
黎永顺
|
8f23fc6c8b
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
|
2023-10-23 10:57:27 +08:00 |
|
黎永顺
|
e21bbcb3f8
|
Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/declare/index.less
# pc4mobx/hrmSalary/stores/declare.js
|
2023-10-23 10:57:05 +08:00 |
|
黎永顺
|
d075fceb05
|
hotfix/2.9.42310.01
|
2023-10-20 14:41:42 +08:00 |
|
黎永顺
|
4898ff8335
|
hotfix/2.9.42310.01
|
2023-10-20 11:39:20 +08:00 |
|
黎永顺
|
26b25e04df
|
hotfix/2.9.42310.01
|
2023-10-20 11:21:14 +08:00 |
|
黎永顺
|
f78a59285a
|
hotfix/2.9.42310.01
|
2023-10-20 11:18:27 +08:00 |
|
黎永顺
|
86980f33b0
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-10-19 13:39:53 +08:00 |
|
黎永顺
|
fafbfbe253
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-19 13:38:26 +08:00 |
|
黎永顺
|
8838566b05
|
hotfix/2.9.42310.01
|
2023-10-19 13:38:00 +08:00 |
|
黎永顺
|
3dd6ede31c
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-18 17:19:14 +08:00 |
|
黎永顺
|
429853a6a6
|
hotfix/2.9.42310.01
公式测试结果显示修改
|
2023-10-18 17:18:44 +08:00 |
|
黎永顺
|
a61e6eb847
|
Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01
|
2023-10-18 10:25:08 +08:00 |
|
黎永顺
|
4519401f64
|
Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into release/2.9.42310.01
|
2023-10-18 10:24:54 +08:00 |
|
黎永顺
|
5a78344e2f
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01
|
2023-10-18 10:24:41 +08:00 |
|
黎永顺
|
db166275c4
|
hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制
|
2023-10-18 10:24:13 +08:00 |
|
黎永顺
|
a84a216000
|
hotfix/2.9.42309.01-个税
|
2023-10-17 11:01:29 +08:00 |
|
黎永顺
|
9a03c6ad8b
|
feature/2.9.42310.01-调薪记录
|
2023-10-16 15:27:29 +08:00 |
|
黎永顺
|
984192fdf2
|
Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录
|
2023-10-16 14:13:53 +08:00 |
|
黎永顺
|
7b79fe5dc5
|
feature/2.9.42310.01-调薪记录
|
2023-10-13 09:51:50 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
19f183795c
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-09 09:41:48 +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 |