 lys
|
334a7660a9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-24 16:59:41 +08:00 |
|
lys
|
dee1059ca7
|
release/2.19.1.2501.01
|
2025-04-24 16:38:36 +08:00 |
|
lys
|
824f4a9e86
|
Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01
|
2025-02-17 09:56:08 +08:00 |
|
lys
|
002cb5522b
|
release/2.19.1.2501.01
|
2025-02-13 13:28:28 +08:00 |
|
lys
|
a46f4869e5
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
|
2024-12-09 15:22:49 +08:00 |
|
lys
|
8a2891f454
|
release/2.17.1.2411.01
|
2024-12-04 17:06:29 +08:00 |
|
lys
|
5014859171
|
Merge branch 'release/2.17.1.2411.01' into feature/测试
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2024-11-15 15:06:16 +08:00 |
|
lys
|
66c6c68460
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-31 10:22:16 +08:00 |
|
lys
|
004175f882
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 16:23:58 +08:00 |
|
lys
|
5e2f6bbbbc
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 10:59:46 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
黎永顺
|
02b085c051
|
权限
|
2024-09-20 16:30:12 +08:00 |
|
黎永顺
|
3f0502aabf
|
feature/2.15.1.2407.01-权限
|
2024-09-13 11:12:53 +08:00 |
|
黎永顺
|
4a386102ef
|
feature/2.15.1.2407.01-权限
|
2024-09-12 16:34:39 +08:00 |
|
黎永顺
|
3c33fc7a3a
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:53:47 +08:00 |
|
黎永顺
|
394d7152f4
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:13:51 +08:00 |
|
黎永顺
|
99d93b041e
|
hotfix/2.15.1.2407.01
|
2024-08-07 14:05:32 +08:00 |
|
黎永顺
|
334a582d62
|
hotfix/2.15.1.2407.01
考勤引用，薪资账套多选
|
2024-08-07 11:11:53 +08:00 |
|
黎永顺
|
017a04a0c4
|
hotfix/2.14.2.2405.02
|
2024-05-30 14:15:55 +08:00 |
|
黎永顺
|
70d7449602
|
hotfix/2.12.1.2404.02
|
2024-05-06 10:21:55 +08:00 |
|
黎永顺
|
d8bad17514
|
hotfix/2.12.1.2404.02
|
2024-05-06 09:48:04 +08:00 |
|
黎永顺
|
8af1f0a79a
|
hotfix/2.12.1.2403.02
完成导入报错的问题处理
|
2024-03-19 17:55:37 +08:00 |
|
黎永顺
|
80acc5f18a
|
hotfix/2.12.1.2403.02
|
2024-03-18 16:03:04 +08:00 |
|
黎永顺
|
689c837749
|
hotfix/3.00.0.2403.01
考情管理修改
|
2024-03-15 15:09:16 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
0771ad9ed3
|
hotfix/3.0.0.2403.01
数据采集页面导入修改重构
|
2024-03-13 17:27:49 +08:00 |
|
黎永顺
|
752eb6b6d1
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-28 16:42:15 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
0e16bab13c
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-20 17:03:51 +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 |
|
黎永顺
|
78aaac8115
|
工资单修改
|
2023-12-01 16:39:31 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
d00e46442d
|
hotfix/2.9.42310.01
|
2023-10-09 15:33:19 +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 |
|
黎永顺
|
a623679975
|
产品-数据采集页面编辑框换成数字输入框
|
2023-07-03 17:29:53 +08:00 |
|
黎永顺
|
3d04a79fcd
|
产品-统一页面列表操作按钮
|
2023-07-03 15:42:11 +08:00 |
|
黎永顺
|
3a8dd06e3c
|
产品-工资单水印预览和查看不一致的问题处理，账套项目预览隐藏分组未实现， 数据采集查看明细时页面显示不对齐问题处理
|
2023-06-30 10:17:23 +08:00 |
|
黎永顺
|
e06728670b
|
产品-数据采集页面列表样式修改
|
2023-06-20 14:25:30 +08:00 |
|
黎永顺
|
e52c239ad1
|
禅道bug归零
|
2023-05-11 10:13:23 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
cefe6ee46d
|
数据采集模块四个页面的导出全部功能添加参数的筛选功能以及薪资核算页面的带条件导出全部的功能
|
2023-04-06 17:07:22 +08:00 |
|
黎永顺
|
9cacf05b6d
|
薪酬产品-往期累计情况（工资、薪金）添加个人公积金编辑项以及其他模块bug修复
|
2023-04-04 17:13:58 +08:00 |
|
黎永顺
|
09ee398bfc
|
优化
|
2023-03-20 18:00:36 +08:00 |
|
黎永顺
|
c46582560e
|
Merge branch 'feature/v2-数据采集-考勤引用页面重构' into develop
|
2023-03-10 11:43:44 +08:00 |