qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,719 Commits 181 Branches 0 Tags 9.3 MiB
Commit Graph

1719 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 ab6ae51b3d feature/2.12.1.2403.02-个税-外籍人员信息报送 
涉税事由改成多选
 2024-03-29 16:53:52 +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
黎永顺 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
黎永顺 668a8aed54 feature/2.12.1.2403.02-个税-外籍人员信息报送 2024-03-28 17:25:39 +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
黎永顺 272e45d3e5 hotfix/2.12.1.2403.02 
薪资档案调薪，薪资小数位配置
 2024-03-20 09:10:06 +08:00
黎永顺 8af1f0a79a hotfix/2.12.1.2403.02 
完成导入报错的问题处理
 2024-03-19 17:55:37 +08:00
黎永顺 d9f3fafd51 hotfix/2.12.1.2403.02 
数据透视导出功能
 2024-03-19 14:29:00 +08:00
黎永顺 90bfeedba3 Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02 2024-03-18 16:03:31 +08:00
黎永顺 80acc5f18a hotfix/2.12.1.2403.02 2024-03-18 16:03:04 +08:00
黎永顺 1ce5e57d73 03release/2.12.1.2403.02-个税 2024-03-18 10:01:42 +08:00
黎永顺 21ef40db3e Merge branch 'release/3.0.0.2403.01' into release/3.0.0.2403.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
 2024-03-15 15:13:18 +08:00
黎永顺 77cdcf2356 Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01 2024-03-15 15:09:54 +08:00
黎永顺 689c837749 hotfix/3.00.0.2403.01 
考情管理修改
 2024-03-15 15:09:16 +08:00
黎永顺 196763681a Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01 2024-03-15 09:20:34 +08:00
黎永顺 5e3c20edc0 release/3.0.0.2403.01 2024-03-15 09:19:59 +08:00
黎永顺 0a23b261b1 release/3.0.0.2403.01 2024-03-14 10:14:06 +08:00
黎永顺 0771ad9ed3 hotfix/3.0.0.2403.01 
数据采集页面导入修改重构
 2024-03-13 17:27:49 +08:00
黎永顺 ffaf5dc036 hotfix/3.0.0.2403.01 2024-03-13 14:23:08 +08:00
黎永顺 a12a097916 Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01 2024-03-13 11:23:30 +08:00
黎永顺 b1ddea5305 hotfix/3.0.0.2403.01 
工资单设置添加失效设置
 2024-03-13 11:22:54 +08:00
黎永顺 dc49211090 hotfix/3.0.0.2403.01 
工资单设置添加失效设置
 2024-03-13 09:26:29 +08:00
黎永顺 e4a80a0724 Merge branch 'release/3.0.0.2403.01' into release/3.0.0.2403.01-个税 2024-03-12 09:45:05 +08:00
黎永顺 20796bc14c Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01 2024-03-12 09:37:44 +08:00
黎永顺 e4d272481c hotfix/3.0.0.2403.01 
工资单设置添加失效设置
 2024-03-11 17:19:20 +08:00
黎永顺 c8406c34e0 Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税 2024-03-08 10:23:52 +08:00
黎永顺 650f10a1ea Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01 2024-03-08 10:22:00 +08:00
黎永顺 8d9dbcce92 Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/apis/index.js
 2024-03-07 10:48:31 +08:00
黎永顺 3b0f7bd5ce 薪酬报表设置修改 2024-03-07 10:31:56 +08:00
黎永顺 98624a5a0e 个税日志添加 2024-03-07 10:30:43 +08:00
黎永顺 d1f8f5d9aa 薪酬报表修复 2024-03-07 10:10:04 +08:00
黎永顺 dbc68102dd 日志bug修复 2024-03-07 09:48:11 +08:00