 黎永顺
|
676d8d2850
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-07 16:35:19 +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 |
|
黎永顺
|
36eb6eae6a
|
feature/2.9.9.2312.01-接口复写合并
|
2023-11-30 14:04:57 +08:00 |
|
黎永顺
|
39650fa172
|
Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并
# Conflicts:
# pc4mobx/hrmSalary/apis/archive.js
|
2023-11-30 13:55:38 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
6f9f24f7a8
|
feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置
|
2023-11-23 15:50:21 +08:00 |
|
黎永顺
|
84a908e94e
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-08 16:14:10 +08:00 |
|
黎永顺
|
a075c4a479
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01
|
2023-11-07 19:16:27 +08:00 |
|
黎永顺
|
147d0908f1
|
Merge branch 'feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置' into release/2.9.42311.01
# Conflicts:
# pc4mobx/hrmSalary/apis/statistics.js
|
2023-11-07 19:16:10 +08:00 |
|
黎永顺
|
d9a7814080
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-07 16:43:23 +08:00 |
|
黎永顺
|
5fd2120f14
|
feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置
|
2023-11-07 16:21:17 +08:00 |
|
黎永顺
|
560af8a703
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-06 09:24:47 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30:18 +08:00 |
|
黎永顺
|
8b7bb221e2
|
feature/2.9.42310.01-社保档案操作日志
|
2023-10-23 17:37:17 +08:00 |
|
黎永顺
|
a61e6eb847
|
Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01
|
2023-10-18 10:25:08 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
b17f2ace8a
|
Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01
|
2023-10-08 15:17:25 +08:00 |
|
黎永顺
|
00d285e5be
|
hotfix/2.9.42310.01
|
2023-10-07 15:38:33 +08:00 |
|
黎永顺
|
cfce462898
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into release/2.9.42309.01
|
2023-09-21 14:16:06 +08:00 |
|
黎永顺
|
d664ad2769
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 17:03:24 +08:00 |
|
黎永顺
|
10c7280b43
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-19 17:24:52 +08:00 |
|
黎永顺
|
cf38c91be8
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 18:42:37 +08:00 |
|
黎永顺
|
ef16acd638
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-14 11:41:29 +08:00 |
|
黎永顺
|
a583087f5f
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01
|
2023-09-11 13:43:28 +08:00 |
|
黎永顺
|
2a40afb7b4
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 15:14:05 +08:00 |
|
黎永顺
|
a058242d35
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:23:51 +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 |
|
黎永顺
|
bc12a12097
|
产品-非系统人员管理导入
|
2023-08-01 17:44:59 +08:00 |
|
黎永顺
|
8071a62ec8
|
产品-社保福利方案自定义方案添加删除功能
|
2023-07-27 14:58:32 +08:00 |
|
黎永顺
|
ada5aee430
|
产品-社保档案基础信息修改
|
2023-07-25 16:16:39 +08:00 |
|
黎永顺
|
e963bcfb57
|
产品-社保档案基础信息修改
|
2023-07-24 18:22:24 +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 |
|
黎永顺
|
88b6c23aed
|
Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into release/2.8.3.2307.02
|
2023-07-20 13:44:33 +08:00 |
|
黎永顺
|
57958f9bf9
|
产品-薪资核算按自定义列导出
|
2023-07-17 16:49:02 +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 |
|
黎永顺
|
1542d8c982
|
非系统人员配置功能
|
2023-07-14 14:09:27 +08:00 |
|
黎永顺
|
0650acb1fc
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01
|
2023-07-13 09:43:41 +08:00 |
|
黎永顺
|
b8c8297cf0
|
产品-工资单反馈
|
2023-07-12 10:14:38 +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 |