 黎永顺
|
15439581f4
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 14:07:25 +08:00 |
|
黎永顺
|
618c0edfb2
|
Merge branch 'release/2.12.1.2403.02' into hotfix/2.12.1.2403.02
|
2024-03-27 13:49:29 +08:00 |
|
黎永顺
|
e5078dc37b
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 10:11:30 +08:00 |
|
黎永顺
|
7fcc3594e5
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:08:06 +08:00 |
|
黎永顺
|
8d58561b88
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:07:21 +08:00 |
|
黎永顺
|
85c222def8
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
|
2024-03-26 09:14:32 +08:00 |
|
黎永顺
|
c51c93c812
|
hotfix/2.12.1.2403.02
调薪列表样式修改
|
2024-03-25 17:23:42 +08:00 |
|
黎永顺
|
b1cba712d8
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-21 13:49:51 +08:00 |
|
黎永顺
|
a7e75331e1
|
hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
|
2024-03-21 13:49:18 +08:00 |
|
黎永顺
|
1deceeb3e8
|
feature/2.12.1.2403.02-社保档案保存修改
|
2024-03-20 16:36:56 +08:00 |
|
黎永顺
|
59a2dbb300
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-20 15:30:07 +08:00 |
|
黎永顺
|
272e45d3e5
|
hotfix/2.12.1.2403.02
薪资档案调薪，薪资小数位配置
|
2024-03-20 09:10:06 +08:00 |
|
黎永顺
|
8af1f0a79a
|
hotfix/2.12.1.2403.02
完成导入报错的问题处理
|
2024-03-19 17:55:37 +08:00 |
|
黎永顺
|
d9f3fafd51
|
hotfix/2.12.1.2403.02
数据透视导出功能
|
2024-03-19 14:29:00 +08:00 |
|
黎永顺
|
90bfeedba3
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-18 16:03:31 +08:00 |
|
黎永顺
|
80acc5f18a
|
hotfix/2.12.1.2403.02
|
2024-03-18 16:03:04 +08:00 |
|
黎永顺
|
77cdcf2356
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-15 15:09:54 +08:00 |
|
黎永顺
|
689c837749
|
hotfix/3.00.0.2403.01
考情管理修改
|
2024-03-15 15:09:16 +08:00 |
|
黎永顺
|
196763681a
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-15 09:20:34 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
0a23b261b1
|
release/3.0.0.2403.01
|
2024-03-14 10:14:06 +08:00 |
|
黎永顺
|
0771ad9ed3
|
hotfix/3.0.0.2403.01
数据采集页面导入修改重构
|
2024-03-13 17:27:49 +08:00 |
|
黎永顺
|
ffaf5dc036
|
hotfix/3.0.0.2403.01
|
2024-03-13 14:23:08 +08:00 |
|
黎永顺
|
a12a097916
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-13 11:23:30 +08:00 |
|
黎永顺
|
b1ddea5305
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 11:22:54 +08:00 |
|
黎永顺
|
dc49211090
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 09:26:29 +08:00 |
|
黎永顺
|
20796bc14c
|
Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01
|
2024-03-12 09:37:44 +08:00 |
|
黎永顺
|
e4d272481c
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-11 17:19:20 +08:00 |
|
黎永顺
|
650f10a1ea
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-08 10:22:00 +08:00 |
|
黎永顺
|
3b0f7bd5ce
|
薪酬报表设置修改
|
2024-03-07 10:31:56 +08:00 |
|
黎永顺
|
d1f8f5d9aa
|
薪酬报表修复
|
2024-03-07 10:10:04 +08:00 |
|
黎永顺
|
dbc68102dd
|
日志bug修复
|
2024-03-07 09:48:11 +08:00 |
|
黎永顺
|
f70d539ef4
|
日志bug修复
|
2024-03-07 09:09:07 +08:00 |
|
黎永顺
|
439ed5c822
|
hotfix/2.10.1.2402.01
|
2024-03-06 15:19:21 +08:00 |
|
黎永顺
|
0301618fc5
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-06 14:33:55 +08:00 |
|
黎永顺
|
fce72a71fc
|
hotfix/2.10.1.2402.01
|
2024-03-06 14:33:28 +08:00 |
|
黎永顺
|
3c30951bd0
|
Merge branch 'feature/2.10.1.2402.01-社保台账导入缓存' into release/2.10.1.2402.01
|
2024-03-06 14:08:15 +08:00 |
|
黎永顺
|
87d699c59d
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-06 14:04:47 +08:00 |
|
黎永顺
|
df9e9c9a21
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 17:49:37 +08:00 |
|
黎永顺
|
f732bcaafb
|
Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
# pc4mobx/hrmSalary/stores/baseForm.js
|
2024-03-05 14:38:57 +08:00 |
|
黎永顺
|
3f23bc29e5
|
Merge branch 'feature/2.10.1.2402.01-我的薪资福利显示基础配置' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-03-05 14:25:33 +08:00 |
|
黎永顺
|
91bc849b49
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 14:23:13 +08:00 |
|
黎永顺
|
752eb6b6d1
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-28 16:42:15 +08:00 |
|
黎永顺
|
5e9a9c2822
|
hotfix/2.10.1.2402.01
薪酬统计报表设置添加薪资账套的设置项
|
2024-02-28 15:48:22 +08:00 |
|
黎永顺
|
194e575e25
|
hotfix/2.10.1.2402.01
|
2024-02-27 16:33:50 +08:00 |
|
黎永顺
|
07e19164d8
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-27 13:49:21 +08:00 |
|
黎永顺
|
86c5e50bb0
|
Merge branch 'hotfix/2.10.1.2402.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-27 11:34:28 +08:00 |
|
黎永顺
|
9120ee93d5
|
hotfix/2.10.1.2402.01
|
2024-02-27 11:32:54 +08:00 |
|
黎永顺
|
b42f9c8e13
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-26 15:29:04 +08:00 |
|
黎永顺
|
ac479676e0
|
release/2.10.1.2402.01-个税
|
2024-02-23 17:38:42 +08:00 |
|
黎永顺
|
fe95424386
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-23 16:20:29 +08:00 |
|
黎永顺
|
7b66f866df
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 15:59:06 +08:00 |
|
黎永顺
|
6f7b21ce5b
|
feature/2.10.1.2401.01-最优年终奖计税方案
|
2024-02-23 15:20:22 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
949b907e89
|
Merge branch 'release/2.10.1.2401.02' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-21 10:50:36 +08:00 |
|
黎永顺
|
0e16bab13c
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-20 17:03:51 +08:00 |
|
黎永顺
|
eec52e34c1
|
Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02
|
2024-02-20 15:53:18 +08:00 |
|
黎永顺
|
2d6383eebc
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into release/2.10.1.2401.02
|
2024-02-20 15:52:51 +08:00 |
|
黎永顺
|
e389d7f024
|
Merge branch 'feature/2.10.1.2401.01-工资单配置反馈开关' into release/2.10.1.2401.02
|
2024-02-20 15:52:20 +08:00 |
|
黎永顺
|
5afb7e107a
|
0release/2.10.1.2401.01
|
2024-02-20 15:45:31 +08:00 |
|
黎永顺
|
d6ec6c71e8
|
feature/2.10.1.2401.01-工资单配置反馈开关
|
2024-02-19 11:11:58 +08:00 |
|
黎永顺
|
4b95f6811f
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-19 09:03:40 +08:00 |
|
黎永顺
|
47608b0522
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-18 14:48:06 +08:00 |
|
黎永顺
|
5614a0da6d
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-06 17:36:15 +08:00 |
|
黎永顺
|
4be5c373ec
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-06 16:56:10 +08:00 |
|
黎永顺
|
dc624af9bd
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-05 14:53:38 +08:00 |
|
黎永顺
|
8ed92e793d
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-04 17:04:05 +08:00 |
|
黎永顺
|
d866cc07cf
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-02 16:09:03 +08:00 |
|
黎永顺
|
3c57000afc
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-01 14:04:55 +08:00 |
|
黎永顺
|
e2898441cf
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:37:20 +08:00 |
|
黎永顺
|
3093279f29
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:31:14 +08:00 |
|
黎永顺
|
9697e5aa81
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:29:16 +08:00 |
|
黎永顺
|
4a47fa1e85
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:27:40 +08:00 |
|
黎永顺
|
a6f382a36b
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 10:24:15 +08:00 |
|
黎永顺
|
169f90d44b
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:52:05 +08:00 |
|
黎永顺
|
671f0c42b4
|
Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:38:14 +08:00 |
|
黎永顺
|
0b3c97a53f
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:34:02 +08:00 |
|
黎永顺
|
0e5c97d447
|
0release/2.10.1.2401.01
|
2024-01-30 16:59:05 +08:00 |
|
黎永顺
|
817f9767fc
|
feature/2.10.1.2401.01-工资单配置反馈开关
|
2024-01-30 16:57:21 +08:00 |
|
黎永顺
|
c260c31bf8
|
release/2.10.1.2401.01
bug修复
|
2024-01-30 15:48:42 +08:00 |
|
黎永顺
|
ba49afb85d
|
release/2.10.1.2401.01
bug修复
|
2024-01-30 15:46:37 +08:00 |
|
黎永顺
|
cf9d8f41e0
|
Merge branch 'feature/2.10.1.2401.01-工资单查看与调薪记录分开展示' into release/2.10.1.2401.01
|
2024-01-30 15:30:27 +08:00 |
|
黎永顺
|
5a65c42179
|
Merge branch 'feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置' into release/2.10.1.2401.01
|
2024-01-30 15:29:36 +08:00 |
|
黎永顺
|
095a833084
|
release/2.10.1.2401.01
|
2024-01-29 10:39:12 +08:00 |
|
黎永顺
|
13d67c5066
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-26 10:56:23 +08:00 |
|
黎永顺
|
93c17d1a35
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-26 10:25:32 +08:00 |
|
黎永顺
|
240cb316a1
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:57:30 +08:00 |
|
黎永顺
|
eb0ed15a15
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:38:08 +08:00 |
|
黎永顺
|
fe83bf0286
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:30:38 +08:00 |
|
黎永顺
|
1364c52674
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-25 17:56:56 +08:00 |
|
黎永顺
|
b638aea4b9
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-25 17:25:36 +08:00 |
|
黎永顺
|
314b3f594c
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 17:19:51 +08:00 |
|
黎永顺
|
876629e413
|
Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 17:13:35 +08:00 |
|
黎永顺
|
866376e7de
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 16:47:55 +08:00 |
|
黎永顺
|
4242856f0e
|
release/2.10.1.2401.01
薪资档案-非系统人员调薪修改
|
2024-01-25 16:11:00 +08:00 |
|
黎永顺
|
b82ae4f4ce
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 15:45:33 +08:00 |
|
黎永顺
|
e86e4871d8
|
release/2.10.1.2401.01
|
2024-01-25 15:11:35 +08:00 |
|
黎永顺
|
f50257e1b5
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 15:09:30 +08:00 |
|
黎永顺
|
c45f1fe066
|
Merge branch 'hotfix/2.10.1.2401.01' into release/2.10.1.2401.01
|
2024-01-25 14:44:39 +08:00 |
|
黎永顺
|
9d0d04be9d
|
hotfix/2.10.1.2401.01
|
2024-01-25 14:44:12 +08:00 |