 lys
|
bbf362140f
|
custom/万新光学
|
2025-03-24 13:54:45 +08:00 |
|
lys
|
c282a71e86
|
release/2.19.1.2501.01
|
2025-03-19 18:04:38 +08:00 |
|
lys
|
46f7b08360
|
release/2.19.1.2501.01
|
2025-02-14 10:43:36 +08:00 |
|
lys
|
7fd6edb02d
|
feature/2.19.1.2501.01-套打功能
|
2025-02-07 16:44:09 +08:00 |
|
lys
|
811083310b
|
release/2.19.1.2501.01
|
2025-01-14 14:02:24 +08:00 |
|
lys
|
ef1c529941
|
release/2.18.1.2412.01
|
2024-12-17 16:03:52 +08:00 |
|
lys
|
b61dc20db5
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-03 18:38:14 +08:00 |
|
lys
|
b0a45c9bbe
|
Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-14 09:36:26 +08:00 |
|
lys
|
712b45453a
|
Merge branch 'feature/2.16.1.2410.01-次账号' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-12 18:05:44 +08:00 |
|
lys
|
641c5f367f
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 10:02:24 +08:00 |
|
lys
|
1a02222bd3
|
feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-11-04 18:01:33 +08:00 |
|
lys
|
98ca4cb03f
|
release/2.16.1.2410.01
|
2024-11-01 16:03:57 +08:00 |
|
lys
|
b461a2c801
|
custom/汇通建设
|
2024-10-31 17:05:24 +08:00 |
|
lys
|
f126179d1d
|
Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾
# Conflicts:
# pc4mobx/hrmSalary/apis/calculate.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-10-31 17:02:27 +08:00 |
|
lys
|
c10e6fb3ee
|
feature/2.16.1.2410.01-次账号
|
2024-10-25 11:46:00 +08:00 |
|
黎永顺
|
bd93223774
|
hotfix/2.15.1.2409.01
规则设置添加薪资报表中的组织信息设置切换功能
|
2024-10-08 15:08:00 +08:00 |
|
黎永顺
|
53d45c2069
|
hotfix/2.15.1.2409.01
规则设置修改
|
2024-10-08 13:21:55 +08:00 |
|
黎永顺
|
f2b17872f7
|
release/2.15.2.2409.01
|
2024-09-25 11:12:53 +08:00 |
|
黎永顺
|
5a2ecefa6f
|
hotfix/2.14.2.2406.02
|
2024-07-02 15:05:17 +08:00 |
|
黎永顺
|
e58f5e73e0
|
feature/2.12.1.2404.02-薪资账套配置流程审批
添加规则配置功能
|
2024-04-28 17:53:12 +08:00 |
|
黎永顺
|
709ec6abd7
|
hotfix/2.12.1.2403.02
规则设置-加密解密修改
|
2024-04-15 16:07:41 +08:00 |
|
黎永顺
|
0a23b261b1
|
release/3.0.0.2403.01
|
2024-03-14 10:14:06 +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 |
|
黎永顺
|
36f763a133
|
hotfix/2.9.10.2312.02
|
2024-01-11 14:23:14 +08:00 |
|
黎永顺
|
61f2b76440
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 11:12:18 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
cae8d86cd6
|
规则设置-加解密修改为默认开启
|
2023-09-01 09:29:49 +08:00 |
|
黎永顺
|
8871b8ed2c
|
hotfix/2.9.42308.02
|
2023-08-18 10:18:53 +08:00 |
|
黎永顺
|
d5a625d4c8
|
产品-release/2.8.3.2307.02bug修复
|
2023-07-20 17:03:20 +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 |
|
黎永顺
|
01c033eacf
|
Merge branch 'feature/2.8.3.2307.02-规则设置系统算税开关关闭后禁用' into release/2.8.3.2307.02
|
2023-07-20 13:45:12 +08:00 |
|
黎永顺
|
da3fd957ab
|
产品-规则设置系统算税开关关闭后禁用
|
2023-07-18 17:27:51 +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 |
|
黎永顺
|
ce93eff734
|
规则名称修改
|
2023-07-17 10:58:02 +08:00 |
|
黎永顺
|
1542d8c982
|
非系统人员配置功能
|
2023-07-14 14:09:27 +08:00 |
|
黎永顺
|
a3e9a6e733
|
产品-工资单反馈改造
|
2023-07-12 16:18:54 +08:00 |
|
黎永顺
|
eb2d77e399
|
产品-工资单反馈
|
2023-07-11 17:27:45 +08:00 |
|
黎永顺
|
0c9d4cc47e
|
产品-个税申报撤回配置
|
2023-06-30 16:51:07 +08:00 |
|
黎永顺
|
9cea2259bc
|
产品-薪资档案社保福利档案删除功能开发完成
|
2023-06-30 16:13:46 +08:00 |
|
黎永顺
|
b77aad0e42
|
产品-工资单模板列表页面接口修改
|
2023-06-19 18:48:50 +08:00 |
|
黎永顺
|
0b6571c04d
|
产品-系统设置添加薪资核算人员匹配规则
|
2023-06-19 13:49:31 +08:00 |
|
黎永顺
|
cb8ee2332e
|
产品-规则设置保存方式修改
|
2023-06-16 14:45:23 +08:00 |
|
黎永顺
|
172af786ed
|
221环境测试出的bug修复
|
2023-02-23 15:59:28 +08:00 |
|
黎永顺
|
25e76718d2
|
社保福利档案退差功能
|
2022-11-23 15:12:19 +08:00 |
|
黎永顺
|
a348e5e3db
|
自定义薪资项目的sql添加开启解密的配置项
|
2022-11-09 14:37:14 +08:00 |
|
黎永顺
|
b187b17263
|
添加报税规则
|
2022-11-08 16:39:29 +08:00 |
18652063575
|
e355096bb3
|
Merge branch 'feature/v2-数据采集-1024' into release
|
2022-11-04 14:09:00 +08:00 |
|
18652063575
|
8008c0855a
|
数据采集接口联调
|
2022-10-31 13:55:49 +08:00 |