 黎永顺
|
6c72f335cc
|
Merge branch 'feature/2.12.1.2403.02-个税-外籍人员信息报送' into release/2.12.1.2404.02-个税
|
2024-04-23 11:17:49 +08:00 |
|
黎永顺
|
ac2da44450
|
Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税
|
2024-04-19 16:19:12 +08:00 |
|
黎永顺
|
11618b6aff
|
hotfix/2.12.1.2403.02
|
2024-04-17 14:44:30 +08:00 |
|
黎永顺
|
91c22f4df9
|
feature/2.12.1.2404.02-个税-测试人员报送页面添加列表作废功能
|
2024-04-16 19:10:56 +08:00 |
|
黎永顺
|
7d2bc1c1be
|
Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税
|
2024-04-16 18:14:04 +08:00 |
|
黎永顺
|
6d56f162b1
|
hotfix/2.12.1.2403.02
|
2024-04-16 17:10:31 +08:00 |
|
黎永顺
|
709ec6abd7
|
hotfix/2.12.1.2403.02
规则设置-加密解密修改
|
2024-04-15 16:07:41 +08:00 |
|
黎永顺
|
99dea55a93
|
Merge branch 'release/2.12.1.2403.02-个税' into feature/2.12.1.2403.02-个税-外籍人员信息报送
# Conflicts:
# pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.js
|
2024-04-12 17:38:33 +08:00 |
|
黎永顺
|
35ea7c7fe3
|
Merge branch 'release/2.12.1.2403.02' into release/2.12.1.2403.02-个税
|
2024-04-12 17:36:54 +08:00 |
|
黎永顺
|
b4fe6f5242
|
custom/西安秦华天燃气-社保-档案-核算-账套权限的调整
|
2024-04-12 17:23:42 +08:00 |
|
黎永顺
|
eb4517af0f
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-11 17:43:06 +08:00 |
|
黎永顺
|
f8e78a97ac
|
hotfix/2.12.1.2403.02
工资单发放页面去掉导出PDF的功能
|
2024-04-11 15:15:26 +08:00 |
|
黎永顺
|
4984d04d43
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-11 09:48:37 +08:00 |
|
黎永顺
|
10af6ff5ae
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-10 16:06:45 +08:00 |
|
黎永顺
|
803f3305eb
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-10 14:30:30 +08:00 |
|
黎永顺
|
e30032abb1
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-09 10:59:29 +08:00 |
|
黎永顺
|
ba0c516263
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-09 10:00:27 +08:00 |
|
黎永顺
|
1a06b46faf
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-08 18:17:03 +08:00 |
|
黎永顺
|
4e5443005b
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-08 14:38:39 +08:00 |
|
黎永顺
|
9befc1d863
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-07 14:10:20 +08:00 |
|
黎永顺
|
bd3aa05c29
|
hotfix/2.12.1.2403.02
|
2024-04-07 13:59:51 +08:00 |
|
黎永顺
|
d4d873a59d
|
Merge branch 'feature/2.12.1.2403.02-个税申报表页面分类改造' into feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-07 13:49:55 +08:00 |
|
黎永顺
|
e0d4137151
|
feature/2.12.1.2403.02-个税申报表页面分类改造
|
2024-04-03 14:18:15 +08:00 |
|
黎永顺
|
f837ac1101
|
bug修复
|
2024-04-03 10:53:02 +08:00 |
|
黎永顺
|
342aeed953
|
多语言bug
|
2024-04-02 17:45:59 +08:00 |
|
黎永顺
|
9480bc7adf
|
feature/2.12.1.2403.02-个税申报表页面分类改造
|
2024-04-02 10:21:26 +08:00 |
|
黎永顺
|
31fb82eb31
|
feature/2.12.1.2403.02-个税申报表页面分类改造
|
2024-04-01 17:47:08 +08:00 |
|
黎永顺
|
75bb200e9d
|
release/2.12.1.2403.02
薪资明细以及薪资核算模板管理设置合并
|
2024-04-01 14:00:50 +08:00 |
|
黎永顺
|
223142e384
|
Merge branch 'feature/2.12.1.2403.02-薪资核算自定义导出模板设置' into release/2.12.1.2403.02
|
2024-04-01 13:59:18 +08:00 |
|
黎永顺
|
ab6ae51b3d
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
涉税事由改成多选
|
2024-03-29 16:53:52 +08:00 |
|
黎永顺
|
8dac6eab6b
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 16:52:28 +08:00 |
|
黎永顺
|
3ab97c5a70
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 16:15:11 +08:00 |
|
黎永顺
|
10a0a4d3c3
|
Merge branch 'release/2.12.1.2403.02' into release/2.12.1.2403.02-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/index.js
# pc4mobx/hrmSalary/index.js
|
2024-03-29 14:42:33 +08:00 |
|
黎永顺
|
8a7f3fcb7a
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 14:37:49 +08:00 |
|
黎永顺
|
1fad3eabdf
|
release/2.12.1.2403.02
暂时去掉薪酬统计报表中的薪资明细tab
|
2024-03-29 10:48:31 +08:00 |
|
黎永顺
|
e5f1ede772
|
hotfix/2.12.1.2403.02
工资单模板bug修复
|
2024-03-29 10:36:39 +08:00 |
|
黎永顺
|
a768470afb
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-29 10:19:33 +08:00 |
|
黎永顺
|
668a8aed54
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-28 17:25:39 +08:00 |
|
黎永顺
|
9471a5a737
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-28 16:49:44 +08:00 |
|
黎永顺
|
15439581f4
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 14:07:25 +08:00 |
|
黎永顺
|
618c0edfb2
|
Merge branch 'release/2.12.1.2403.02' into hotfix/2.12.1.2403.02
|
2024-03-27 13:49:29 +08:00 |
|
黎永顺
|
e5078dc37b
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 10:11:30 +08:00 |
|
黎永顺
|
7fcc3594e5
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:08:06 +08:00 |
|
黎永顺
|
8d58561b88
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:07:21 +08:00 |
|
黎永顺
|
85c222def8
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
|
2024-03-26 09:14:32 +08:00 |
|
黎永顺
|
c51c93c812
|
hotfix/2.12.1.2403.02
调薪列表样式修改
|
2024-03-25 17:23:42 +08:00 |
|
黎永顺
|
b1cba712d8
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-21 13:49:51 +08:00 |
|
黎永顺
|
a7e75331e1
|
hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
|
2024-03-21 13:49:18 +08:00 |
|
黎永顺
|
59a2dbb300
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-20 15:30:07 +08:00 |
|
黎永顺
|
a27beae87e
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-20 10:37:26 +08:00 |