 lys
|
97a5d37044
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 16:06:48 +08:00 |
|
lys
|
e9f4d9b043
|
release/2.16.1.2410.01
|
2024-11-06 11:06:55 +08:00 |
|
lys
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +08:00 |
|
lys
|
e7f1971370
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 14:26:00 +08:00 |
|
黎永顺
|
5b3a645dfc
|
release/2.15.2.2409.01
|
2024-10-12 10:07:36 +08:00 |
|
黎永顺
|
215094dac8
|
release/2.15.2.2409.01
|
2024-10-09 11:25:50 +08:00 |
|
黎永顺
|
9c318d22b7
|
hotfix/2.15.1.2409.01
|
2024-09-29 10:57:22 +08:00 |
|
黎永顺
|
687371ab39
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-09-13 11:18:48 +08:00 |
|
黎永顺
|
421fca99cc
|
Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01
|
2024-08-20 13:37:39 +08:00 |
|
黎永顺
|
4be61e9179
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 15:24:00 +08:00 |
|
黎永顺
|
d9fc164504
|
hotfix/2.15.1.2407.01
|
2024-08-13 16:12:43 +08:00 |
|
黎永顺
|
74ba398c90
|
feature/2.15.1.2407.01-导入工具
|
2024-08-12 16:56:51 +08:00 |
|
黎永顺
|
f05c43d011
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 14:58:36 +08:00 |
|
黎永顺
|
9d99557f4b
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:24:11 +08:00 |
|
黎永顺
|
86de787ed4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 18:24:45 +08:00 |
|
黎永顺
|
70fe54efb7
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 17:32:54 +08:00 |
|
黎永顺
|
36d90b35a6
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 14:36:11 +08:00 |
|
黎永顺
|
75b6c0969a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-07 15:22:10 +08:00 |
|
黎永顺
|
af8a0a1bab
|
hotfix/2.15.1.2407.01
|
2024-07-16 15:59:38 +08:00 |
|
黎永顺
|
cff964c7f1
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 11:10:48 +08:00 |
|
黎永顺
|
2e775eb205
|
feature/2.14.4.2406.02-工资单发放预览
|
2024-06-18 09:07:43 +08:00 |
|
黎永顺
|
c0079fe4b4
|
feature/2.14.3.2406.01-薪资核算添加锁定人员数据
|
2024-05-29 10:32:17 +08:00 |
|
黎永顺
|
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 |