 黎永顺
|
8f582ad3dd
|
hotfix/2.12.1.2404.02
|
2024-05-11 15:06:47 +08:00 |
|
黎永顺
|
7dee340ab8
|
hotfix/2.12.1.2404.02
|
2024-04-24 15:20:13 +08:00 |
|
黎永顺
|
f8e78a97ac
|
hotfix/2.12.1.2403.02
工资单发放页面去掉导出PDF的功能
|
2024-04-11 15:15:26 +08:00 |
|
黎永顺
|
a7e75331e1
|
hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
|
2024-03-21 13:49:18 +08:00 |
|
黎永顺
|
dc49211090
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 09:26:29 +08:00 |
|
黎永顺
|
e4d272481c
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-11 17:19:20 +08:00 |
|
黎永顺
|
439ed5c822
|
hotfix/2.10.1.2402.01
|
2024-03-06 15:19:21 +08:00 |
|
黎永顺
|
fce72a71fc
|
hotfix/2.10.1.2402.01
|
2024-03-06 14:33:28 +08:00 |
|
黎永顺
|
817f9767fc
|
feature/2.10.1.2401.01-工资单配置反馈开关
|
2024-01-30 16:57:21 +08:00 |
|
黎永顺
|
1364c52674
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-25 17:56:56 +08:00 |
|
黎永顺
|
eb9d043d74
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-24 16:29:27 +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 |
|
黎永顺
|
3dca9da904
|
hotfix/2.9.9.2312.01
|
2023-12-06 16:19:05 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +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 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
3c9cf1c730
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 11:13:44 +08:00 |
|
黎永顺
|
9aaef674f0
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop
|
2023-10-09 08:58:09 +08:00 |
|
黎永顺
|
b566213dcd
|
Merge branch 'feature/2.9.42310.01-工资单时效设置' into release/2.9.42310.01
|
2023-10-08 15:17:15 +08:00 |
|
黎永顺
|
da36ed3aa9
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-10-08 10:51:26 +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 |
|
黎永顺
|
c365d2eb56
|
feature/2.9.42310.01-工资单时效设置
|
2023-10-07 16:37:44 +08:00 |
|
黎永顺
|
486254601f
|
feature/2.9.42310.01-工资单发放导出PDF
|
2023-09-27 14:35:37 +08:00 |
|
黎永顺
|
3d8bef9147
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-27 09:21:53 +08:00 |
|
黎永顺
|
4bb3bc403a
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-26 16:38:47 +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 |
|
黎永顺
|
089bed1f53
|
Merge branch 'hotfix/2.9.42309.01' into develop
|
2023-09-20 17:26:19 +08:00 |
|
黎永顺
|
a58da11dc3
|
hotfix/2.9.42309.01
20230920
|
2023-09-20 14:20:51 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
d1594e5620
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into develop
|
2023-08-01 09:04:49 +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 |
|
黎永顺
|
6fd55967bd
|
产品-合并问题处理
|
2023-07-27 14:09:21 +08:00 |