 黎永顺
|
d0cc845911
|
hotfix/2.9.42310.02
|
2023-10-23 18:38:07 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +08:00 |
|
黎永顺
|
4a392f2357
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-23 18:30:35 +08:00 |
|
黎永顺
|
bc28d4ea2f
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into develop
|
2023-10-23 18:30:25 +08:00 |
|
黎永顺
|
967d0bacd1
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 18:28:29 +08:00 |
|
黎永顺
|
510e46045e
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 18:06:09 +08:00 |
|
黎永顺
|
8b7bb221e2
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 17:37:17 +08:00 |
|
黎永顺
|
452c22c262
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 15:29:26 +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 |
|
黎永顺
|
d0aa6e93a0
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-20 10:27:00 +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 |
|
黎永顺
|
bec2e5a5b2
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 11:51:41 +08:00 |
|
黎永顺
|
5031d3a032
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 09:42:46 +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 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
55c6fd80be
|
hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制
|
2023-10-18 11:09:37 +08:00 |
|
黎永顺
|
50b56c76d1
|
Merge branch 'hotfix/2.9.42310.01' into develop
|
2023-10-18 10:40:51 +08:00 |
|
黎永顺
|
2256d9e0a1
|
Merge branch 'feature/2.9.42310.01-调薪记录' into develop
|
2023-10-18 10:40:20 +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 |
|
黎永顺
|
0acc570a24
|
feature/2.9.42310.01-工资单发放页面重构单
|
2023-10-18 10:18:26 +08:00 |
|
黎永顺
|
7e30f73069
|
feature/2.9.42310.01-工资单发放页面重构单
|
2023-10-17 17:17:01 +08:00 |
|
黎永顺
|
2e613014fe
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-17 09:17:37 +08:00 |
|
黎永顺
|
6ea39d8255
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 16:09:30 +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 |
|
黎永顺
|
3c9cf1c730
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 11:13:44 +08:00 |
|
黎永顺
|
c2efaf193b
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 15:53:43 +08:00 |
|
黎永顺
|
53ddc607b3
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 14:52:59 +08:00 |
|
黎永顺
|
79a3f460e7
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 10:57:47 +08:00 |
|
黎永顺
|
ab3be2c1f9
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 10:20:14 +08:00 |
|
黎永顺
|
7b79fe5dc5
|
feature/2.9.42310.01-调薪记录
|
2023-10-13 09:51:50 +08:00 |
|
黎永顺
|
02863814ba
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 09:17:54 +08:00 |
|
黎永顺
|
89d6eebf77
|
Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into develop
|
2023-10-12 15:52:54 +08:00 |
|
黎永顺
|
9f4e8468e7
|
Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into develop
|
2023-10-12 15:52:44 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
61637e6de7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 18:18:47 +08:00 |
|
黎永顺
|
12d4b5c33c
|
hotfix/2.9.42309.01
|
2023-09-21 16:13:18 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
f587aef084
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into develop
|
2023-09-21 13:07:07 +08:00 |
|
黎永顺
|
f5638d9453
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-21 13:06:49 +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 |
|
黎永顺
|
cdc61a94f2
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:42:21 +08:00 |
|
黎永顺
|
e7e4d17cfa
|
hotfix/2.9.42309.01
|
2023-09-20 17:42:06 +08:00 |
|
黎永顺
|
4b9b08b542
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:30:07 +08:00 |
|
黎永顺
|
c0220d8853
|
hotfix/2.9.42309.01
|
2023-09-20 17:29:50 +08:00 |
|
黎永顺
|
be29592bec
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into develop
|
2023-09-20 17:26:53 +08:00 |
|
黎永顺
|
e192087764
|
Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into develop
|
2023-09-20 17:26:30 +08:00 |
|
黎永顺
|
089bed1f53
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:26:19 +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 |
|
黎永顺
|
6ac979e9e7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-20 09:25:10 +08:00 |
|
黎永顺
|
10c7280b43
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-19 17:24:52 +08:00 |
|
黎永顺
|
9084c20717
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 19:34:16 +08:00 |
|
黎永顺
|
cf38c91be8
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 18:42:37 +08:00 |
|
黎永顺
|
1ee6650234
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 18:42:27 +08:00 |
|
黎永顺
|
c0c908f6eb
|
Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 17:48:35 +08:00 |
|
黎永顺
|
1c7ad4e871
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 16:59:21 +08:00 |
|
黎永顺
|
98054b3c8d
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 15:05:25 +08:00 |
|
黎永顺
|
e10e39e630
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 13:37:00 +08:00 |
|
黎永顺
|
e2be082a54
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 10:40:30 +08:00 |
|
黎永顺
|
f29d985e64
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-15 16:53:17 +08:00 |
|
黎永顺
|
707ca40f05
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-15 11:14:39 +08:00 |
|
黎永顺
|
d008654bf8
|
hotfix/2.9.42309.01
|
2023-09-14 15:50:24 +08:00 |
|
黎永顺
|
b52afbb7c8
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 14:21:45 +08:00 |
|
黎永顺
|
85867da080
|
hotfix/2.9.42309.01
|
2023-09-14 14:19:08 +08:00 |
|
黎永顺
|
4769df4cfd
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 14:05:40 +08:00 |
|
黎永顺
|
f18bda74f4
|
hotfix/2.9.42309.01
|
2023-09-14 11:50:22 +08:00 |
|
黎永顺
|
ef16acd638
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 11:41:29 +08:00 |
|
黎永顺
|
02be280127
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 10:38:10 +08:00 |
|
黎永顺
|
2b282b4211
|
hotfix/2.9.42309.01
|
2023-09-14 10:37:39 +08:00 |
|
黎永顺
|
8a90d58196
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 10:25:22 +08:00 |
|
黎永顺
|
3f18e4a0a7
|
feature/2.9.42309.01-调薪记录添加二次密码认证
|
2023-09-13 10:44:37 +08:00 |
|
黎永顺
|
5ce2f5bf31
|
hotfix/2.9.42308.02
|
2023-09-12 11:14:51 +08:00 |
|
黎永顺
|
a583087f5f
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01
|
2023-09-11 13:43:28 +08:00 |
|
黎永顺
|
32404ec04e
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42309.01
|
2023-09-11 13:43:04 +08:00 |
|
黎永顺
|
8da781193a
|
hotfix/2.9.42308.02
|
2023-09-08 13:53:11 +08:00 |
|
黎永顺
|
6043192bfe
|
Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into release/2.9.42309.01
|
2023-09-07 10:07:19 +08:00 |
|
黎永顺
|
96f65e42b0
|
feature/2.9.42309.01-社保福利档案添加非系统人员列表
|
2023-09-06 14:54:45 +08:00 |
|
黎永顺
|
ce462fe51a
|
hotfix/2.9.42308.02
|
2023-09-06 14:27:23 +08:00 |
|
黎永顺
|
f593e97207
|
feature社保福利档案添加非系统人员列表
|
2023-09-06 10:19:35 +08:00 |
|
黎永顺
|
bb1e328c92
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 16:49:26 +08:00 |
|
黎永顺
|
2a40afb7b4
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 15:14:05 +08:00 |
|
黎永顺
|
bc3632e054
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 18:13:19 +08:00 |
|
黎永顺
|
6043159976
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 16:48:36 +08:00 |
|
黎永顺
|
242b96321a
|
样式优化
|
2023-09-01 14:06:32 +08:00 |
|
黎永顺
|
5b6480f076
|
hotfix/2.9.42308.02-工资单模板设置名称保存失败bug修复
|
2023-09-01 11:08:35 +08:00 |
|
黎永顺
|
cae8d86cd6
|
规则设置-加解密修改为默认开启
|
2023-09-01 09:29:49 +08:00 |
|
黎永顺
|
209392a2f8
|
Merge branch 'hotfix/2.9.42308.02' into develop
|
2023-08-31 15:03:30 +08:00 |
|
黎永顺
|
a5e0ca3084
|
薪资项目公式保存参数修改
|
2023-08-31 15:02:56 +08:00 |
|
黎永顺
|
0a37f80611
|
Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into develop
|
2023-08-31 14:44:26 +08:00 |
|
黎永顺
|
036e59b91a
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:43:57 +08:00 |
|
黎永顺
|
a058242d35
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:23:51 +08:00 |
|
黎永顺
|
def2159e19
|
Merge branch 'hotfix/2.9.42308.02' into develop
|
2023-08-31 11:15:48 +08:00 |
|
黎永顺
|
b6ac297242
|
hotfix-社保福利档案以及薪资档案的导入下载模板功能优化
|
2023-08-31 11:15:32 +08:00 |
|
黎永顺
|
f65b7979d7
|
hotfix-薪资核算详情页面编辑刷新分页的bug
|
2023-08-31 09:40:09 +08:00 |
|
黎永顺
|
ecc2021916
|
2.9.42308.02bug修复
|
2023-08-29 14:24:43 +08:00 |
|
黎永顺
|
78e08d7c26
|
系统数字输入框保留小数位数配置
|
2023-08-25 16:12:05 +08:00 |
|
黎永顺
|
4462753f28
|
Merge branch 'release/2.8.3.2308.01' into hotfix/2.9.42308.02
|
2023-08-25 15:39:49 +08:00 |
|
黎永顺
|
25ce139a0c
|
产品-工资单产看页面dom渲染顺序优化
|
2023-08-21 10:53:19 +08:00 |
|
黎永顺
|
a22f3ade1f
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02
|
2023-08-18 10:19:06 +08:00 |
|
黎永顺
|
8871b8ed2c
|
hotfix/2.9.42308.02
|
2023-08-18 10:18:53 +08:00 |
|
黎永顺
|
49dce1c871
|
代码合并
|
2023-08-17 13:45:21 +08:00 |
|
黎永顺
|
38e2b1b61b
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-17 08:43:43 +08:00 |
|
黎永顺
|
9633bcabfb
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01
|
2023-08-17 08:38:06 +08:00 |
|
黎永顺
|
290c3e51d3
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-08-17 08:37:56 +08:00 |
|
黎永顺
|
6d10c01f0c
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/stores/payroll.js
|
2023-08-17 08:36:27 +08:00 |
|
黎永顺
|
2527f75298
|
字段管理新增修改
|
2023-08-16 10:30:37 +08:00 |
|
黎永顺
|
5adfa47b5b
|
bug修改-断点
|
2023-08-11 17:34:42 +08:00 |
|
黎永顺
|
262976cc5e
|
产品-合并代码
|
2023-08-04 13:55:20 +08:00 |
|
黎永顺
|
605370e12a
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-08-04 09:34:26 +08:00 |
|
黎永顺
|
480106d4e7
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-08-04 09:34:04 +08:00 |
|
黎永顺
|
250c7a0719
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop
|
2023-08-04 09:29:51 +08:00 |
|
黎永顺
|
208e413560
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-02 11:58:06 +08:00 |
|
黎永顺
|
d04c053c07
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-02 11:57:46 +08:00 |
|
黎永顺
|
cbd06fa42a
|
产品-非系统人员管理导入
|
2023-08-02 11:17:17 +08:00 |
|
黎永顺
|
a6c6ff6e5e
|
Merge branch 'hotfix/2.8.3.2308.01' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
|
2023-08-02 10:21:40 +08:00 |
|
黎永顺
|
c6fe44d976
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop
|
2023-08-01 17:57:57 +08:00 |
|
黎永顺
|
bc12a12097
|
产品-非系统人员管理导入
|
2023-08-01 17:44:59 +08:00 |
|
黎永顺
|
cb94dabd30
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-01 16:10:29 +08:00 |
|
黎永顺
|
5eec7139d6
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:09:23 +08:00 |
|
黎永顺
|
a433de7671
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:03:48 +08:00 |
|
黎永顺
|
b03c193927
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:51:02 +08:00 |
|
黎永顺
|
dbae61623d
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:48:47 +08:00 |
|
黎永顺
|
4601742b9d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-01 13:37:54 +08:00 |
|
黎永顺
|
ce87730349
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-01 13:37:35 +08:00 |
|
黎永顺
|
d7bfa245d5
|
产品-dev合并
|
2023-08-01 11:19:23 +08:00 |
|
黎永顺
|
d1594e5620
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into develop
|
2023-08-01 09:04:49 +08:00 |
|
黎永顺
|
b51e1f8dc2
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 19:08:25 +08:00 |
|
黎永顺
|
33641790e3
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 19:08:07 +08:00 |
|
黎永顺
|
bdb64d23fc
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-31 11:51:37 +08:00 |
|
黎永顺
|
db53fc8942
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-31 11:50:30 +08:00 |
|
黎永顺
|
763c307f3d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 11:20:37 +08:00 |
|
黎永顺
|
223effab98
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 11:20:14 +08:00 |
|
黎永顺
|
d9d4c2ff91
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-31 10:51:30 +08:00 |
|
黎永顺
|
600d73f858
|
产品-薪资账套薪资项目编辑功能修改
|
2023-07-31 10:51:10 +08:00 |
|
黎永顺
|
2c025ebcb1
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-28 17:13:26 +08:00 |
|
黎永顺
|
fb40c1a998
|
产品-薪资账套编辑
|
2023-07-28 16:28:27 +08:00 |
|
黎永顺
|
2ba7f25779
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-07-28 09:26:42 +08:00 |
|
黎永顺
|
8071a62ec8
|
产品-社保福利方案自定义方案添加删除功能
|
2023-07-27 14:58:32 +08:00 |
|
黎永顺
|
6fd55967bd
|
产品-合并问题处理
|
2023-07-27 14:09:21 +08:00 |
|
黎永顺
|
a3fde65b39
|
产品-社保福利的自定义以及福利档案的接口调整
|
2023-07-27 11:00:57 +08:00 |
|
黎永顺
|
28471fe108
|
产品-社保福利的自定义以及福利档案的接口调整
|
2023-07-27 09:55:51 +08:00 |
|
黎永顺
|
868a546dd6
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-27 09:08:57 +08:00 |
|
黎永顺
|
3f63b26184
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-26 14:10:55 +08:00 |
|
黎永顺
|
c9c79460c7
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-26 09:31:15 +08:00 |
|
黎永顺
|
6a45f624e2
|
产品-社保档案基础信息修改
|
2023-07-25 18:22:43 +08:00 |
|
黎永顺
|
ada5aee430
|
产品-社保档案基础信息修改
|
2023-07-25 16:16:39 +08:00 |
|
黎永顺
|
e963bcfb57
|
产品-社保档案基础信息修改
|
2023-07-24 18:22:24 +08:00 |
|
黎永顺
|
d73fd7bac8
|
产品-社保档案基础信息修改
|
2023-07-24 11:15:41 +08:00 |
|
黎永顺
|
aa6a581c1a
|
产品-编辑功能
|
2023-07-24 11:14:22 +08:00 |
|
黎永顺
|
a2f81296d8
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能'
|
2023-07-24 10:57:50 +08:00 |
|
黎永顺
|
07ba7a61c2
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2307.02
|
2023-07-24 09:46:30 +08:00 |
|
黎永顺
|
ac37e9b16d
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-21 15:37:57 +08:00 |
|
黎永顺
|
bc6d296a85
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-21 11:41:32 +08:00 |
|
黎永顺
|
9b80413e01
|
Merge branch 'feature/2.8.3.2307.02-规则设置系统算税开关关闭后禁用' into develop
|
2023-07-21 11:40:53 +08:00 |
|
黎永顺
|
43e3a853ff
|
Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into develop
|
2023-07-21 11:40:16 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
d5a625d4c8
|
产品-release/2.8.3.2307.02bug修复
|
2023-07-20 17:03:20 +08:00 |
|
黎永顺
|
f7cd085c92
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 16:16:43 +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 |
|
黎永顺
|
9d94619c1d
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-20 13:35:37 +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 |
|
黎永顺
|
d1b2f98387
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-19 15:02:44 +08:00 |
|
黎永顺
|
77645b717a
|
产品-薪资项目添加默认隐藏的功能
|
2023-07-18 17:31:13 +08:00 |
|
黎永顺
|
da3fd957ab
|
产品-规则设置系统算税开关关闭后禁用
|
2023-07-18 17:27:51 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
ed53bb6a9e
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-12 10:19:36 +08:00 |
|
黎永顺
|
b8c8297cf0
|
产品-工资单反馈
|
2023-07-12 10:14:38 +08:00 |
|
黎永顺
|
62914e0ed0
|
非系统人员管理开发合并
|
2023-07-11 18:07:40 +08:00 |
|
黎永顺
|
cb9056c50a
|
非系统人员管理开发合并
|
2023-07-11 17:49:31 +08:00 |
|
黎永顺
|
ce50c9cf91
|
Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
# pc4mobx/hrmSalary/util/index.js
|
2023-07-11 17:36:38 +08:00 |
|
黎永顺
|
eb2d77e399
|
产品-工资单反馈
|
2023-07-11 17:27:45 +08:00 |
|
黎永顺
|
facc8dd4f6
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into develop
|
2023-07-11 12:08:18 +08:00 |
|
黎永顺
|
a13f31eefa
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 12:08:01 +08:00 |
|
黎永顺
|
d8fdc8096b
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 11:43:05 +08:00 |
|
黎永顺
|
405e2a9bc6
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 10:44:49 +08:00 |
|
黎永顺
|
986e2d7f4a
|
Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-11 10:11:58 +08:00 |
|
黎永顺
|
4ffa11d5a1
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-11 09:08:46 +08:00 |
|
黎永顺
|
c8fe01dfda
|
产品-薪酬统计报表echarts图标组件封装
|
2023-07-10 15:52:25 +08:00 |
|
黎永顺
|
0159fe0647
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-10 11:40:52 +08:00 |
|
黎永顺
|
cc4cccf111
|
产品-多页面列表查询人员状态传参统一修改为数组
|
2023-07-10 11:39:36 +08:00 |
|
黎永顺
|
f30c80e2ef
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-10 11:01:12 +08:00 |
|
黎永顺
|
d984a105fd
|
产品-多页面列表查询人员状态传参统一修改为数组
|
2023-07-10 11:00:47 +08:00 |
|
黎永顺
|
54d23aeb57
|
Merge branch 'feature/230701-维护工具-删除档案' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-10 10:05:27 +08:00 |
|
黎永顺
|
448bde008f
|
Merge branch 'feature/230701-工资单定时发送任务' into release/2.8.3.2307.01
|
2023-07-10 10:04:02 +08:00 |
|
黎永顺
|
b51b408526
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into develop
|
2023-07-10 09:58:49 +08:00 |
|
黎永顺
|
9226ef19b3
|
产品-移动端二次验证密码设置
|
2023-07-10 09:21:57 +08:00 |
|
黎永顺
|
424b3bbfb2
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-07 13:45:31 +08:00 |
|
黎永顺
|
aa9c4223b6
|
产品-薪资核算弹框样式修改
|
2023-07-07 13:45:11 +08:00 |
|
黎永顺
|
b14e889d57
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-07 11:03:03 +08:00 |
|
黎永顺
|
153be5b7a7
|
产品-列表按钮数统一
|
2023-07-07 10:47:45 +08:00 |
|
黎永顺
|
8b143a937f
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-05 14:06:08 +08:00 |
|
黎永顺
|
ae79ab24c3
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 14:04:26 +08:00 |
|
黎永顺
|
f8c1806d50
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-05 10:55:07 +08:00 |
|
黎永顺
|
e501aa293e
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 10:54:39 +08:00 |
|
黎永顺
|
d2fe01c759
|
产品-工资单模板定时发放bug处理以及规则设置
|
2023-07-04 17:37:04 +08:00 |
|
黎永顺
|
d4aa7305c2
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 16:02:27 +08:00 |
|
黎永顺
|
ff7ef86172
|
产品-薪资核算列表样式修改
|
2023-07-04 16:02:15 +08:00 |
|
黎永顺
|
600816c98f
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 16:00:15 +08:00 |
|
黎永顺
|
0772c85c01
|
产品-薪资核算列表样式修改
|
2023-07-04 16:00:01 +08:00 |
|
黎永顺
|
0188608722
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 15:56:23 +08:00 |
|
黎永顺
|
17a1262d46
|
产品-薪资核算列表样式修改
|
2023-07-04 15:56:06 +08:00 |
|
黎永顺
|
ac17ecccc0
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-04 15:42:54 +08:00 |
|
黎永顺
|
61ebfdf9f1
|
产品-薪酬统计报表图表组件优化
|
2023-07-04 15:42:39 +08:00 |
|
黎永顺
|
a204cc0729
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-04 09:11:33 +08:00 |
|
黎永顺
|
91b2e92c11
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-04 09:11:17 +08:00 |
|
黎永顺
|
2ede16eee6
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-03 17:30:08 +08:00 |
|
黎永顺
|
a623679975
|
产品-数据采集页面编辑框换成数字输入框
|
2023-07-03 17:29:53 +08:00 |
|
黎永顺
|
afd3163ff5
|
产品-统一页面列表操作按钮
|
2023-07-03 16:03:56 +08:00 |
|
黎永顺
|
3d04a79fcd
|
产品-统一页面列表操作按钮
|
2023-07-03 15:42:11 +08:00 |
|
黎永顺
|
c0aa321bf0
|
Merge branch 'master' into feature/230701-列表上面操作按钮显示两个
|
2023-07-03 14:00:23 +08:00 |
|
黎永顺
|
7b563e3d14
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-03 13:54:27 +08:00 |
|
黎永顺
|
fbf16f97dc
|
产品-工资单模板定时发放功能开发
|
2023-07-03 13:52:20 +08:00 |
|
黎永顺
|
0c9d4cc47e
|
产品-个税申报撤回配置
|
2023-06-30 16:51:07 +08:00 |
|
黎永顺
|
9cea2259bc
|
产品-薪资档案社保福利档案删除功能开发完成
|
2023-06-30 16:13:46 +08:00 |
|
黎永顺
|
3a8dd06e3c
|
产品-工资单水印预览和查看不一致的问题处理，账套项目预览隐藏分组未实现， 数据采集查看明细时页面显示不对齐问题处理
|
2023-06-30 10:17:23 +08:00 |
|
黎永顺
|
dc27a3e491
|
产品-工资单发放查看页面空白的问题处理
|
2023-06-29 14:59:24 +08:00 |
|
黎永顺
|
a56b2ffd70
|
Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02
|
2023-06-28 15:25:24 +08:00 |
|
黎永顺
|
ecdf3c5f26
|
产品-薪资核算详情页面以及薪资核算的线下对比页面添加查看权限功能
|
2023-06-28 15:24:15 +08:00 |
|
黎永顺
|
531d71328e
|
Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02
|
2023-06-27 17:12:47 +08:00 |
|
黎永顺
|
9ed8b79e64
|
产品-薪资核算详情页面以及薪资核算的线下对比页面添加查看权限功能
|
2023-06-27 17:11:52 +08:00 |
|
黎永顺
|
229884d9ed
|
Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02
|
2023-06-26 11:30:35 +08:00 |
|
黎永顺
|
5ee54ef656
|
Merge branch 'feature/0612-个税申报表添加配置撤回的功能' into release/2.8.3.2306.02
|
2023-06-26 11:30:27 +08:00 |
|
黎永顺
|
ae9d7cc7c0
|
产品-列表上面操作按钮显示两个
|
2023-06-26 11:27:27 +08:00 |
|
黎永顺
|
2f4eebe6c7
|
产品-列表上面操作按钮显示两个
|
2023-06-26 10:24:05 +08:00 |
|
黎永顺
|
e06728670b
|
产品-数据采集页面列表样式修改
|
2023-06-20 14:25:30 +08:00 |
|
黎永顺
|
d3bba3eab4
|
Merge branch 'release-2023-06-08' into hotfix/V2-20230605
|
2023-06-20 11:43:25 +08:00 |
|
黎永顺
|
b77aad0e42
|
产品-工资单模板列表页面接口修改
|
2023-06-19 18:48:50 +08:00 |
|
黎永顺
|
4dca3e3d7d
|
产品-工资单模板列表页面接口修改
|
2023-06-19 17:51:51 +08:00 |
|
黎永顺
|
0b6571c04d
|
产品-系统设置添加薪资核算人员匹配规则
|
2023-06-19 13:49:31 +08:00 |
|
黎永顺
|
0e973742fb
|
Merge branch 'develop' into feature/0612-工资单水印设置
|
2023-06-19 09:44:54 +08:00 |
|
黎永顺
|
661b3f66ca
|
产品-工资单发放基础设置水印设置的水印预览修改
|
2023-06-19 09:44:44 +08:00 |
|
黎永顺
|
69be2d5fdd
|
Merge branch 'hotfix/V2-20230605' into develop
|
2023-06-16 17:37:58 +08:00 |
|
黎永顺
|
bd7c872e08
|
Merge branch 'feature/0616-规则设置保存方式修改' into develop
|
2023-06-16 17:37:39 +08:00 |
|
黎永顺
|
80a44a4a69
|
Merge branch 'feature/0616-工资单验证方式' into develop
|
2023-06-16 17:37:21 +08:00 |
|
黎永顺
|
2337a14828
|
Merge branch 'feature/0612-工资单水印设置' into develop
|
2023-06-16 17:37:14 +08:00 |
|
黎永顺
|
adc34bb9b9
|
Merge branch 'feature/0612-个税申报表添加配置撤回的功能' into develop
|
2023-06-16 17:37:08 +08:00 |
|
黎永顺
|
55bdfa2c45
|
产品-工资单发放操作按钮的详细权限设置
|
2023-06-16 17:36:45 +08:00 |
|
黎永顺
|
fca33c32c1
|
产品-工资单移动端查看添加二次验证
|
2023-06-16 17:23:08 +08:00 |
|
黎永顺
|
cae153cebf
|
产品-工资单验证方式
|
2023-06-16 16:57:03 +08:00 |
|
黎永顺
|
d71b879290
|
产品-工资单验证方式
|
2023-06-16 16:34:03 +08:00 |
|
黎永顺
|
ab3e5fbbf5
|
Merge branch 'feature/0612-工资单水印设置' into feature/0616-工资单验证方式
# Conflicts:
# pc4mobx/hrmSalary/apis/payroll.js
|
2023-06-16 15:33:15 +08:00 |
|
黎永顺
|
e9546e5329
|
产品-工资单验证方式
|
2023-06-16 15:32:05 +08:00 |
|
黎永顺
|
403a44a49a
|
产品-社保福利方案列表查询bug修复
|
2023-06-16 14:55:32 +08:00 |
|
黎永顺
|
cb8ee2332e
|
产品-规则设置保存方式修改
|
2023-06-16 14:45:23 +08:00 |
|
黎永顺
|
c4a0ea8bcd
|
Merge branch 'hotfix/V2-20230605' into release-2023-06-08
|
2023-06-16 11:52:30 +08:00 |
|
黎永顺
|
3c7c03916d
|
产品-薪酬统计分析设置页面的个税扣缴义务人选项修改
|
2023-06-16 11:46:01 +08:00 |
|
黎永顺
|
7d07af3a22
|
产品-工资单水印设置修改弹框
|
2023-06-16 11:30:11 +08:00 |
|
黎永顺
|
a80c4a37d5
|
产品-工资单验证方式修改
|
2023-06-16 11:12:20 +08:00 |
|
黎永顺
|
92c73b846a
|
产品-工资单水印设置与预览等功能
|
2023-06-15 18:28:06 +08:00 |
|
黎永顺
|
19e2958a56
|
产品-薪资核算权限修改
|
2023-06-13 09:18:58 +08:00 |
|
黎永顺
|
797cb912a2
|
产品-工资单模板基础设置水印设置
|
2023-06-13 09:10:23 +08:00 |
|
黎永顺
|
644df23ccc
|
产品-薪资档案列表延迟的bug修复
|
2023-06-12 16:22:27 +08:00 |
|
黎永顺
|
4d91a9b365
|
产品-个税申报表添加撤回的功能
|
2023-06-12 14:51:09 +08:00 |
|
黎永顺
|
a5a481987c
|
Merge branch 'hotfix/V2-20230605' into release-2023-06-08
|
2023-06-09 13:47:39 +08:00 |
|
黎永顺
|
eec20cf64a
|
Merge branch 'feature/V2-数据透视' into release-2023-06-08
|
2023-06-09 10:48:14 +08:00 |
|
黎永顺
|
b930c35e82
|
产品-薪酬统计报表优化
|
2023-06-09 10:47:51 +08:00 |
|
黎永顺
|
42f2a8ac55
|
产品-薪酬统计报表列表接口优化以及薪资项目管理列表优化
|
2023-06-09 10:01:07 +08:00 |
|
黎永顺
|
c6527075b5
|
Merge branch 'feature/V2-数据透视' into release-2023-06-08
|
2023-06-08 14:52:55 +08:00 |
|
黎永顺
|
8bb1146ca5
|
产品-数据透视以及薪资项目自定义弹框列表的改造
|
2023-06-08 14:52:09 +08:00 |
|
黎永顺
|
5ed50dd98b
|
Merge branch 'feature/V2-数据透视' into release-2023-06-08
|
2023-06-08 11:28:38 +08:00 |
|
黎永顺
|
84dfc82f51
|
Merge branch 'feature/V2-个税扣缴义务人添加排序字段' into release-2023-06-08
|
2023-06-08 11:28:04 +08:00 |
|
黎永顺
|
1aa2fb4793
|
产品-个税扣缴义务人添加排序字段
|
2023-06-08 11:27:27 +08:00 |
|
黎永顺
|
8f7a8e4192
|
产品-数据统计-数据透视
|
2023-06-08 11:24:05 +08:00 |
|
黎永顺
|
61dacb90e2
|
Merge branch 'feature/V2-工资单发放详情页添加发放进度条' into release-2023-06-08
|
2023-06-07 18:24:16 +08:00 |
|
黎永顺
|
3957d65d98
|
Merge branch 'feature/V2-工资单发放添加发放设置' into release-2023-06-08
|
2023-06-07 18:24:06 +08:00 |
|
黎永顺
|
c15fc127d2
|
产品-工资单发放添加进度条
|
2023-06-07 15:35:14 +08:00 |
|
黎永顺
|
be6aadbe7e
|
产品-工资单发放添加发放设置以及添加进度条
|
2023-06-07 11:08:08 +08:00 |
|
黎永顺
|
f73afa5651
|
产品-工资单发放添加发放设置
|
2023-06-07 09:30:04 +08:00 |
|
黎永顺
|
4891fff298
|
产品-个税扣缴义务人添加排序字段
|
2023-06-05 15:45:12 +08:00 |
|
黎永顺
|
ab263e01ed
|
产品-薪资核算详情编辑保存添加防抖
|
2023-06-02 15:18:02 +08:00 |
|
黎永顺
|
f2676b178a
|
Merge branch 'feature/V2-字段管理列表排序功能' into develop
|
2023-06-01 17:20:30 +08:00 |
|
黎永顺
|
a5b39251a4
|
产品-薪资项目管理字段排序功能的开发
|
2023-06-01 17:19:25 +08:00 |
|
黎永顺
|
c0c2361d11
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-06-01 11:19:51 +08:00 |
|
黎永顺
|
4ea31bcdd5
|
Merge branch 'feature/V2-社保福利档案、薪资档案、薪资核算列表添加工号查询功能' into develop
|
2023-06-01 11:17:41 +08:00 |
|
黎永顺
|
6d701d7234
|
产品-工号搜索
|
2023-06-01 11:10:58 +08:00 |
|
黎永顺
|
d30e59a8c7
|
产品-字段管理放开默认使用选项
|
2023-06-01 09:17:10 +08:00 |
|
黎永顺
|
ad8954fadc
|
产品-社保福利档案、薪资档案、薪资核算列表添加工号查询功能
|
2023-05-31 18:58:35 +08:00 |
|
黎永顺
|
239ffda293
|
产品-薪资核算页面添加查看权限
|
2023-05-31 17:28:31 +08:00 |
|
黎永顺
|
8d2643926f
|
产品-社保福利档案、薪资档案、薪资核算列表添加工号查询功能
|
2023-05-31 17:11:19 +08:00 |
|
黎永顺
|
5a2897bf70
|
产品-社保福利档案、薪资档案、薪资核算列表添加工号查询功能
|
2023-05-31 16:31:44 +08:00 |
|
黎永顺
|
f644249e14
|
产品-社保福利档案、薪资档案、薪资核算列表添加工号查询功能
|
2023-05-31 16:16:59 +08:00 |
|
黎永顺
|
92499ee72c
|
产品-社保福利档案的社保公积金和其他基数设置的bug修复
|
2023-05-31 15:32:24 +08:00 |
|
黎永顺
|
10864d9a92
|
Merge branch 'develop' into hotfix/V2-20230505
|
2023-05-31 09:13:53 +08:00 |
|
黎永顺
|
22ccbc5755
|
产品-个税扣缴义务人添加工号查询的功能
|
2023-05-30 15:11:16 +08:00 |
|
黎永顺
|
6e9806ed82
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-05-29 16:50:09 +08:00 |
|
黎永顺
|
cc17ae7b09
|
产品-公式编辑器bug修改
|
2023-05-29 16:49:45 +08:00 |
|
黎永顺
|
13b2bf750e
|
Merge branch 'feature/V2-薪资档案列表改造' into develop
|
2023-05-26 16:07:04 +08:00 |
|
黎永顺
|
e4495d6959
|
Merge branch 'feature/V2-薪酬统计分析' into develop
|
2023-05-26 16:06:19 +08:00 |
|
黎永顺
|
0e9efa66ab
|
薪酬统计分析-员工详情列表修改
|
2023-05-26 16:05:28 +08:00 |
|
黎永顺
|
f914a9ee46
|
薪资项目公式测试功能修改
|
2023-05-26 15:51:05 +08:00 |
|
黎永顺
|
11ac288541
|
薪酬统计分析添加员工明细列表的统计行
|
2023-05-26 14:51:17 +08:00 |
|
黎永顺
|
167564053b
|
产品-薪资档案导出全部bug修改
|
2023-05-26 11:53:34 +08:00 |
|
黎永顺
|
4d14d0296d
|
产品-薪资档案列表改造完成
|
2023-05-26 10:47:20 +08:00 |
|
黎永顺
|
087e9d1abe
|
产品-薪资档案列表改造完成
|
2023-05-26 10:47:02 +08:00 |
|
黎永顺
|
009b81b707
|
产品-薪资档案列表改造完成
|
2023-05-26 10:44:05 +08:00 |
|
黎永顺
|
b9d2a06d99
|
产品-薪资档案列表改造
|
2023-05-25 16:25:33 +08:00 |
|
黎永顺
|
28a7bb7f64
|
薪酬统计分析-员工明细列表开发
|
2023-05-25 14:39:01 +08:00 |
|
黎永顺
|
93d07961c7
|
薪酬统计分析-员工明细列表开发
|
2023-05-25 13:27:17 +08:00 |
|
黎永顺
|
e3434bc953
|
薪酬统计分析-员工明细列表开发
|
2023-05-24 15:13:31 +08:00 |
|
黎永顺
|
ea830a6315
|
产品-线下对比页面的表格添加滚动
|
2023-05-24 09:40:36 +08:00 |
|
黎永顺
|
fc84b8dcfd
|
产品-薪资核算导入功能的表头选项添加缓存功能
|
2023-05-22 10:51:41 +08:00 |
|
黎永顺
|
08b48d09ef
|
产品-薪资核算导入表头设置修改
|
2023-05-22 09:40:41 +08:00 |
|
黎永顺
|
f47d455ef1
|
Merge branch 'feature/V2-薪酬统计分析' into develop
|
2023-05-18 17:09:45 +08:00 |
|
黎永顺
|
d1eb00a786
|
Merge branch 'feature/V2-公式编辑器' into develop
|
2023-05-18 17:09:35 +08:00 |
|
黎永顺
|
67ef55da46
|
产品-公式编辑器修改
|
2023-05-18 16:42:45 +08:00 |
|
黎永顺
|
d4cfca1eda
|
产品-公式编辑器修改
|
2023-05-18 15:52:38 +08:00 |
|
黎永顺
|
ca79294859
|
产品-薪资核算详情页面的编辑功能修改数字输入框支持负数
|
2023-05-18 15:27:01 +08:00 |
|
黎永顺
|
29ac83b992
|
Merge branch 'develop' into hotfix/V2-20230505
|
2023-05-18 15:23:24 +08:00 |
|
黎永顺
|
a3832918cf
|
产品-薪资账套薪资项目项新增排序问题
|
2023-05-18 14:50:04 +08:00 |
|
黎永顺
|
b512f7af95
|
产品-薪酬统计分析报表设置修改
|
2023-05-18 14:04:11 +08:00 |
|
黎永顺
|
ee72c81d9b
|
Merge branch 'feature/V2-工资单二次验证修改' into develop
|
2023-05-18 09:58:29 +08:00 |
|
黎永顺
|
7e4afc4017
|
Merge branch 'feature/V2-薪资核算编辑分类' into develop
|
2023-05-18 09:58:07 +08:00 |
|
黎永顺
|
0323aa6a7c
|
Merge branch 'feature/V2-薪酬统计分析' into develop
|
2023-05-18 09:57:50 +08:00 |
|
黎永顺
|
8472eead7c
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-05-18 09:57:32 +08:00 |
|
黎永顺
|
7e7450af07
|
薪资核算项添加错误信息下载功能
|
2023-05-18 09:56:58 +08:00 |
|
黎永顺
|
eecd18cfa5
|
产品-工资单发放移动端页面权限认证
|
2023-05-18 09:06:17 +08:00 |
|
黎永顺
|
b1e2e12d60
|
产品-薪酬核算页面编辑薪资项目项同步e10页面
|
2023-05-17 15:21:40 +08:00 |
|
黎永顺
|
22b4a46824
|
产品-薪酬核算页面编辑薪资项目项同步e10页面
|
2023-05-17 14:24:07 +08:00 |
|
黎永顺
|
4fd6e1f878
|
产品-薪酬核算页面编辑薪资项目项同步e10页面
|
2023-05-16 16:56:20 +08:00 |
|
黎永顺
|
e5c64f3a62
|
产品-薪酬核算查看详情页面添加公式查看功能
|
2023-05-16 15:13:45 +08:00 |
|
黎永顺
|
27d3762efa
|
Merge branch 'master' into feature/V2-薪酬统计分析
|
2023-05-16 14:09:01 +08:00 |
|
黎永顺
|
aa7c407f9f
|
产品-薪酬统计分析
|
2023-05-16 14:06:12 +08:00 |
|
黎永顺
|
e08ba04657
|
产品-薪酬统计分析页面开发
|
2023-05-16 09:00:51 +08:00 |
|
黎永顺
|
6c615453f7
|
产品-薪酬统计分析页面开发
|
2023-05-15 18:21:23 +08:00 |
|
黎永顺
|
13d21af0e4
|
产品-薪酬统计报表
|
2023-05-15 09:09:19 +08:00 |
|
黎永顺
|
ef46215d0f
|
产品-薪酬统计分析报表
|
2023-05-12 16:51:30 +08:00 |
|
黎永顺
|
185230b357
|
产品-薪酬统计分析报表
|
2023-05-12 16:38:07 +08:00 |
|
黎永顺
|
8bd124c7dc
|
产品-薪酬统计分析报表
|
2023-05-12 10:18:39 +08:00 |
|
黎永顺
|
bdcad182a2
|
Merge branch 'feature/V2-公式编辑器' into develop
|
2023-05-11 10:46:19 +08:00 |
|
黎永顺
|
c912c496c6
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-05-11 10:46:10 +08:00 |
|
黎永顺
|
bd95f4b2fb
|
禅道bug归零
|
2023-05-11 10:44:32 +08:00 |
|
黎永顺
|
e52c239ad1
|
禅道bug归零
|
2023-05-11 10:13:23 +08:00 |
|
黎永顺
|
ab161f8528
|
公式编辑器-去掉空提示语
|
2023-05-10 18:08:24 +08:00 |
|
黎永顺
|
22fddce3a0
|
薪酬统计报表
|
2023-05-10 10:50:58 +08:00 |
|
黎永顺
|
bc48bc8180
|
公式编辑器修改
|
2023-05-09 09:57:49 +08:00 |
|
黎永顺
|
c0b4b2eb4a
|
Merge branch 'master' into feature/V2-公式编辑器
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-05-08 11:40:20 +08:00 |
|
黎永顺
|
108750431f
|
产品-社保福利台账bug修复
|
2023-05-05 14:09:06 +08:00 |
|
黎永顺
|
9b9db75315
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-05-05 13:58:41 +08:00 |
|
黎永顺
|
c7fe08b4a8
|
产品-薪酬统计分析
|
2023-05-05 13:30:05 +08:00 |
|
黎永顺
|
36ca75ed6c
|
bug修复
|
2023-05-05 10:03:49 +08:00 |
|
黎永顺
|
9a7ce80f77
|
产品-薪酬统计报表分心模块
|
2023-04-28 18:03:11 +08:00 |
|
黎永顺
|
5c56b8ced4
|
产品-公式编辑器
|
2023-04-28 16:13:03 +08:00 |
|
黎永顺
|
6f0c1044ad
|
产品-公式编辑器
|
2023-04-28 16:11:56 +08:00 |
|
黎永顺
|
a115030072
|
产品-公式编辑器
|
2023-04-28 11:30:05 +08:00 |
|
黎永顺
|
d2c8928eba
|
Merge branch 'master' into feature/V2-薪酬统计分析
|
2023-04-28 10:53:05 +08:00 |
|
黎永顺
|
d2f7aa8d00
|
产品-公式编辑器
|
2023-04-28 10:51:06 +08:00 |
|
黎永顺
|
35fd985246
|
产品-薪酬统计分析模块整理
|
2023-04-28 10:08:14 +08:00 |
|
黎永顺
|
028dcd211a
|
产品-薪酬统计分析模块整理
|
2023-04-28 10:00:10 +08:00 |
|
黎永顺
|
f1ef12f869
|
产品-公式编辑器封装
|
2023-04-27 14:52:03 +08:00 |
|
黎永顺
|
11e1cc89a9
|
产品-公式编辑器封装
|
2023-04-27 10:01:57 +08:00 |
|
黎永顺
|
159eadc164
|
产品-公式编辑器封装
|
2023-04-27 09:34:19 +08:00 |
|
黎永顺
|
11d7ffdcb9
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-04-26 17:32:58 +08:00 |
|
黎永顺
|
f5f1fd2c5a
|
产品-优化社保福利台账页面的合计行渲染逻辑
|
2023-04-26 17:31:59 +08:00 |
|
黎永顺
|
bf60572a0e
|
Merge branch 'hotfix/V2-20230505' into develop
|
2023-04-26 17:28:21 +08:00 |
|
黎永顺
|
003b3d6144
|
产品-优化社保福利台账页面的合计行渲染逻辑
|
2023-04-26 17:27:32 +08:00 |
|
黎永顺
|
d461d08043
|
Merge branch 'hotfix/V2-20230413' into develop
|
2023-04-26 15:14:54 +08:00 |
|
黎永顺
|
835a04c72b
|
产品-薪酬统计分析完善
|
2023-04-26 15:14:06 +08:00 |
|
黎永顺
|
3fda510b57
|
产品-公式编辑器组件修改
|
2023-04-26 15:08:03 +08:00 |
|
黎永顺
|
43c71e32cc
|
产品-薪酬统计分析完善
|
2023-04-25 09:37:04 +08:00 |
|
黎永顺
|
29b8d377d3
|
产品-薪酬统计分析管理模块
|
2023-04-24 18:30:47 +08:00 |
|
黎永顺
|
4bd1c70235
|
产品-社保福利档案页面的提示语整理
|
2023-04-24 17:20:56 +08:00 |
|
黎永顺
|
c048565890
|
产品-薪酬统计分析管理
|
2023-04-24 16:25:07 +08:00 |
|
黎永顺
|
ac9aab6f5f
|
产品-薪酬统计分析管理
|
2023-04-24 09:28:25 +08:00 |
|
黎永顺
|
8f3320ae11
|
产品-薪酬统计分析管理
|
2023-04-23 11:28:18 +08:00 |
|
黎永顺
|
be3204e8d0
|
Merge branch 'release'
|
2023-04-20 16:39:38 +08:00 |
|
黎永顺
|
e59adcc7d5
|
产品-社保福利台账详情页面的合计行bug修复以及考情引用页面的按钮权限bug修复
|
2023-04-20 16:14:39 +08:00 |
|
黎永顺
|
249334931b
|
Merge branch 'hotfix/V2-20230413' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
|
2023-04-20 16:01:27 +08:00 |
|
黎永顺
|
335624d91b
|
产品-社保福利台账详情页面的合计行bug修复以及考情引用页面的按钮权限bug修复
|
2023-04-20 15:51:08 +08:00 |
|
黎永顺
|
7c60a44e66
|
产品-薪酬统计分析模块
|
2023-04-20 15:36:51 +08:00 |
|
黎永顺
|
d09562355c
|
产品-薪酬统计分析管理
|
2023-04-19 09:29:38 +08:00 |
|
黎永顺
|
a793cda867
|
产品-薪酬统计分析管理
|
2023-04-18 17:19:15 +08:00 |
|
黎永顺
|
8c0f4d8393
|
产品-薪资核算导出全部参数修改
|
2023-04-18 14:40:34 +08:00 |
|
黎永顺
|
ccfb84930b
|
产品-薪酬统计分析模块
|
2023-04-18 13:24:12 +08:00 |
|
黎永顺
|
0bc5590c04
|
产品-薪资账套的薪资项目添加翻页的bug以及社保福利台账的线下对比页面的导入下载模板的接口调整
|
2023-04-18 10:51:38 +08:00 |
|
黎永顺
|
4929ff4db5
|
产品-薪酬统计分析
|
2023-04-17 17:32:16 +08:00 |
|
黎永顺
|
8e36bc89be
|
产品-薪資張濤月份说明数据的错误修改
|
2023-04-17 11:53:21 +08:00 |
|
黎永顺
|
6f79efe805
|
Merge branch 'master' into feature/V2-非系统人员管理开发
|
2023-04-13 17:35:01 +08:00 |
|
黎永顺
|
7bdf55be6a
|
公式编辑器组件封装
|
2023-04-13 16:42:57 +08:00 |
|
黎永顺
|
247432ebde
|
公式编辑器组件封装
|
2023-04-13 13:26:43 +08:00 |
|
黎永顺
|
644113efcb
|
公式编辑器组件封装
|
2023-04-13 10:00:24 +08:00 |
|
黎永顺
|
167caa4f5b
|
薪酬統計新功能开发
|
2023-04-12 15:53:32 +08:00 |
|
黎永顺
|
8fe5f201c6
|
薪酬統計
|
2023-04-12 10:47:51 +08:00 |
|
黎永顺
|
6846e81498
|
产品-薪酬分析统计
|
2023-04-11 14:34:17 +08:00 |
|
黎永顺
|
dfae2661a6
|
产品功能-薪酬统计分析
|
2023-04-11 13:41:56 +08:00 |
|
黎永顺
|
e2ce9eb457
|
Merge branch 'feature/V2-社保福利台账核算总计行' into develop
|
2023-04-10 15:58:27 +08:00 |
|
黎永顺
|
7ea5936829
|
产品薪资账套-薪资账套中的薪资项目bug修改
|
2023-04-10 15:53:53 +08:00 |
|
黎永顺
|
f9eb7b9a1d
|
产品薪资账套-社保福利台账核算总计行
|
2023-04-07 17:27:20 +08:00 |
|
黎永顺
|
43d00a4232
|
产品薪资账套-薪资项目tab下的列表隐藏列操作的bug修复
|
2023-04-07 13:51:06 +08:00 |
|
黎永顺
|
cefe6ee46d
|
数据采集模块四个页面的导出全部功能添加参数的筛选功能以及薪资核算页面的带条件导出全部的功能
|
2023-04-06 17:07:22 +08:00 |
|
黎永顺
|
37f60c2875
|
社保福利台账详情页面替换表格，添加合计行
|
2023-04-06 13:30:23 +08:00 |
|
黎永顺
|
444857a0d8
|
社保福利台账详情页面替换表格，添加合计行
|
2023-04-06 11:24:47 +08:00 |
|
黎永顺
|
a336a63b73
|
薪酬产品-往期累计情况（工资、薪金）添加个人公积金编辑项以及其他模块bug修复
|
2023-04-04 17:14:09 +08:00 |
|
黎永顺
|
9cacf05b6d
|
薪酬产品-往期累计情况（工资、薪金）添加个人公积金编辑项以及其他模块bug修复
|
2023-04-04 17:13:58 +08:00 |
|
黎永顺
|
cbf784a2e9
|
Merge branch 'feature/V2-薪资档案取消待停薪功能' into develop
|
2023-03-30 13:57:02 +08:00 |
|
黎永顺
|
473ce9e204
|
个税申报表页面分页bug
|
2023-03-29 14:29:05 +08:00 |
|
黎永顺
|
bd6242f413
|
薪资档案待停薪页面添加取消待办的功能
|
2023-03-29 09:28:55 +08:00 |
|
黎永顺
|
98fba85bdd
|
薪资档案待停薪页面添加取消待办的功能
|
2023-03-28 15:13:14 +08:00 |
|
黎永顺
|
3368f121fd
|
薪资核算详情导入缓存功能
|
2023-03-28 09:47:45 +08:00 |
|
黎永顺
|
8f1b7ae7c1
|
关联人员分页的问题
|
2023-03-27 14:03:26 +08:00 |
|
黎永顺
|
20c49b92d8
|
薪资项目管理新建自定义薪资项目，选择公式（公式内容为空）保存后，公式内薪资项目为空无法引用
|
2023-03-22 15:10:58 +08:00 |
|
黎永顺
|
09ee398bfc
|
优化
|
2023-03-20 18:00:36 +08:00 |
|
黎永顺
|
a3d11cf249
|
产品-薪资档案页面待停薪列表添加取消待办的功能
|
2023-03-20 14:45:09 +08:00 |
|
黎永顺
|
785ecf9ae8
|
产品-薪资核算详情页面的导入添加额外字段添加缓存的功能
|
2023-03-17 17:52:27 +08:00 |
|
黎永顺
|
7c330c2675
|
工资单发放页面列表优化
|
2023-03-17 14:36:45 +08:00 |
|
黎永顺
|
328ad2b1d4
|
Merge branch 'hotfix/v2-03-16' into develop
|
2023-03-17 11:09:11 +08:00 |
|
黎永顺
|
4b241b2816
|
非系统人员管理开发
|
2023-03-17 11:00:58 +08:00 |
|
黎永顺
|
a1b8fc3f51
|
非系统人员管理开发
|
2023-03-16 18:32:24 +08:00 |
|
黎永顺
|
fa581dd2ad
|
社保福利臺站-添加合计行数据
|
2023-03-16 17:33:06 +08:00 |
|
黎永顺
|
6babf486e3
|
社保福利台账详情页面添加合计行列表
|
2023-03-16 17:03:24 +08:00 |
|
黎永顺
|
4c545d74ca
|
非系统人员修改
|
2023-03-16 11:44:12 +08:00 |
|
黎永顺
|
fb3b4c7d59
|
非系统人员修改
|
2023-03-16 11:03:52 +08:00 |
|
黎永顺
|
49fb957550
|
非系统人员功能开发
|
2023-03-16 09:05:34 +08:00 |
|
黎永顺
|
2384398ce9
|
产品-社保福利方案列表渲染修改
|
2023-03-15 17:23:08 +08:00 |
|
黎永顺
|
79ea27233f
|
工资单发放页面接口优化
|
2023-03-15 14:36:09 +08:00 |
|
黎永顺
|
e14ebaacad
|
非系统人员管理开发
|
2023-03-15 14:21:26 +08:00 |
|
黎永顺
|
39d526d59e
|
社保福利档案bug修复
|
2023-03-15 10:18:38 +08:00 |
|
黎永顺
|
efadb541f5
|
非系统人员管理-新功能开发
|
2023-03-14 18:14:23 +08:00 |
|
黎永顺
|
eb207921cd
|
非系统人员管理-新功能开发
|
2023-03-13 14:40:19 +08:00 |
|
黎永顺
|
a6cf191c29
|
非系统人员管理-新功能开发
|
2023-03-13 10:43:25 +08:00 |
|
黎永顺
|
c6d02c80c4
|
薪资账套-基本信息修改
|
2023-03-13 09:18:17 +08:00 |
|
黎永顺
|
a94c534f76
|
Merge branch 'hotfix/v2-03-09' into develop
|
2023-03-10 14:35:36 +08:00 |
|
黎永顺
|
8c2afc8787
|
Merge branch 'feature/v2-薪资账套-薪资项目项移动到大类新功能开发' into develop
|
2023-03-10 14:35:07 +08:00 |
|
黎永顺
|
1bb37fa085
|
薪资账套-薪资项目移动到功能bug修复
|
2023-03-10 14:34:35 +08:00 |
|
黎永顺
|
afd39f37d8
|
禅道bug修改
|
2023-03-10 14:09:50 +08:00 |
|
黎永顺
|
c46582560e
|
Merge branch 'feature/v2-数据采集-考勤引用页面重构' into develop
|
2023-03-10 11:43:44 +08:00 |
|
黎永顺
|
884b4c2d18
|
Merge branch 'feature/v2-薪资账套-薪资项目项移动到大类新功能开发' into develop
|
2023-03-10 11:43:25 +08:00 |
|
黎永顺
|
bfc8a2c475
|
Merge branch 'hotfix/v2-03-09' into develop
|
2023-03-10 11:43:02 +08:00 |