 黎永顺
|
fb64d5e344
|
hotfix/2.14.2.2405.02
|
2024-05-21 17:33:47 +08:00 |
|
黎永顺
|
78142d32fe
|
hotfix/2.12.1.2404.02
|
2024-05-11 11:33:09 +08:00 |
|
黎永顺
|
166dfa6979
|
hotfix/2.12.1.2404.02
|
2024-05-11 11:09:13 +08:00 |
|
黎永顺
|
a768470afb
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-29 10:19:33 +08:00 |
|
黎永顺
|
8d58561b88
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:07:21 +08:00 |
|
黎永顺
|
a7e75331e1
|
hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
|
2024-03-21 13:49:18 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
ac479676e0
|
release/2.10.1.2402.01-个税
|
2024-02-23 17:38:42 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
e15a88b1f4
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 15:38:03 +08:00 |
|
黎永顺
|
30c73ccf88
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 18:18:26 +08:00 |
|
黎永顺
|
252d4e0ff7
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-09 17:42:40 +08:00 |
|
黎永顺
|
c01c03f1b0
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-08 16:05:00 +08:00 |
|
黎永顺
|
3155c2eb89
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into release/2.9.10.2312.02
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
|
2024-01-08 13:44:57 +08:00 |
|
黎永顺
|
93ceea808d
|
Merge branch 'feature/2.9.9.2312.01-薪资核算列表在线编辑' into release/2.9.10.2312.02
|
2023-12-29 10:09:04 +08:00 |
|
黎永顺
|
6e56b436d6
|
feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项
|
2023-12-06 14:46:36 +08:00 |
|
黎永顺
|
143e9503e1
|
Merge branch 'feature/2.9.9.2312.01-社保核算以及薪资账套查询优化' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
|
2023-12-05 11:34:00 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
3da1d6964b
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 15:24:48 +08:00 |
|
黎永顺
|
23f15bd423
|
feature/2.9.42311.02-社保核算以及薪资账套查询优化
|
2023-11-27 19:17:44 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
94b3f056f4
|
hotfix/2.9.42311.02-我的薪资福利页面重构
|
2023-11-20 17:48:44 +08:00 |
|
黎永顺
|
1eac37cd38
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-08 13:37:33 +08:00 |
|
黎永顺
|
a075c4a479
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01
|
2023-11-07 19:16:27 +08:00 |
|
黎永顺
|
5fd2120f14
|
feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置
|
2023-11-07 16:21:17 +08:00 |
|
黎永顺
|
4c7b3f9a6a
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-07 10:28:44 +08:00 |
|
黎永顺
|
b14fce7949
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-10-31 15:30:21 +08:00 |
|
黎永顺
|
c44f92fb56
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-27 17:28:11 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +08:00 |
|
黎永顺
|
bc28d4ea2f
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into develop
|
2023-10-23 18:30:25 +08:00 |
|
黎永顺
|
8b7bb221e2
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 17:37:17 +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 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
2256d9e0a1
|
Merge branch 'feature/2.9.42310.01-调薪记录' into develop
|
2023-10-18 10:40:20 +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 |
|
黎永顺
|
9a03c6ad8b
|
feature/2.9.42310.01-调薪记录
|
2023-10-16 15:27:29 +08:00 |
|
黎永顺
|
3c9cf1c730
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 11:13:44 +08:00 |
|
黎永顺
|
53ddc607b3
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 14:52:59 +08:00 |
|
黎永顺
|
ca5b60f6aa
|
feature/2.9.42310.01-个税申报表页面重构
|
2023-10-12 13:57:14 +08:00 |
|
黎永顺
|
3fe4ede887
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 17:48: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 |
|
黎永顺
|
c4b222e200
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 10:09:18 +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 |