 黎永顺
|
a4b98f253c
|
Merge branch 'feature/2.12.1.2404.02-薪资核算判断账套是否修改提示' into release/2.14.2.2405.02
|
2024-05-23 11:04:34 +08:00 |
|
黎永顺
|
8f582ad3dd
|
hotfix/2.12.1.2404.02
|
2024-05-11 15:06:47 +08:00 |
|
黎永顺
|
166dfa6979
|
hotfix/2.12.1.2404.02
|
2024-05-11 11:09:13 +08:00 |
|
黎永顺
|
2fb3c89947
|
feature/2.12.1.2404.02-薪资核算判断账套是否修改提示
|
2024-04-26 16:53:51 +08:00 |
|
黎永顺
|
825549595a
|
hotfix/2.12.1.2404.02
|
2024-04-25 16:23:31 +08:00 |
|
黎永顺
|
8a7f3fcb7a
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 14:37:49 +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 |
|
黎永顺
|
d9f3fafd51
|
hotfix/2.12.1.2403.02
数据透视导出功能
|
2024-03-19 14:29:00 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
dc49211090
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-13 09:26:29 +08:00 |
|
黎永顺
|
d1f8f5d9aa
|
薪酬报表修复
|
2024-03-07 10:10:04 +08:00 |
|
黎永顺
|
3c30951bd0
|
Merge branch 'feature/2.10.1.2402.01-社保台账导入缓存' into release/2.10.1.2402.01
|
2024-03-06 14:08:15 +08:00 |
|
黎永顺
|
df9e9c9a21
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 17:49:37 +08:00 |
|
黎永顺
|
91bc849b49
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 14:23:13 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
2d6383eebc
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into release/2.10.1.2401.02
|
2024-02-20 15:52:51 +08:00 |
|
黎永顺
|
169f90d44b
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:52:05 +08:00 |
|
黎永顺
|
671f0c42b4
|
Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:38:14 +08:00 |
|
黎永顺
|
13d67c5066
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-26 10:56:23 +08:00 |
|
黎永顺
|
b82ae4f4ce
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 15:45:33 +08:00 |
|
黎永顺
|
7cb1b157eb
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 11:52:10 +08:00 |
|
黎永顺
|
9e81e8244a
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 09:16:57 +08:00 |
|
黎永顺
|
6a91ce8b3c
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 19:05:57 +08:00 |
|
黎永顺
|
4ef8cc66f8
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 19:24:49 +08:00 |
|
黎永顺
|
da7194d6b1
|
Merge branch 'feature/2.9.10.2312.02-社保档案个人和公司基数设置' into release/2.9.10.2312.02
|
2024-01-08 13:45:11 +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 |
|
黎永顺
|
61f2b76440
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 11:12:18 +08:00 |
|
黎永顺
|
1eba04d9c8
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 10:21:14 +08:00 |
|
黎永顺
|
676d8d2850
|
Merge branch 'release/2.9.9.2312.01'
|
2023-12-07 16:35:19 +08:00 |
|
黎永顺
|
8a8804f0c1
|
1release/2.9.9.2312.01
|
2023-12-06 15:55:44 +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 |
|
黎永顺
|
eefa47164a
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-06 16:09:23 +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 |