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

74 Commits

Author SHA1 Message Date
lys 20fdfda922 Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
 2025-02-08 17:16:08 +08:00
lys 6b8b604f55 feature/2.19.1.2501.01-套打功能 2025-02-08 11:16:43 +08:00
lys e0b387503b release/2.18.2.2412.02-个税 2024-12-24 15:36:46 +08:00
lys 64b6a23310 Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税 2024-11-25 15:00:33 +08:00
lys a5cc09a2c5 release/2.17.1.2411.01 2024-11-20 16:25:59 +08:00
黎永顺 90ee27ba2e Merge branch 'release/2.15.1.2407.01' into release/2.15.1.2407.01-个税 2024-08-16 09:39:58 +08:00
黎永顺 334a582d62 hotfix/2.15.1.2407.01 
考勤引用，薪资账套多选
 2024-08-07 11:11:53 +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
黎永顺 e5078dc37b feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
 2024-03-27 10:11:30 +08:00
黎永顺 d9f3fafd51 hotfix/2.12.1.2403.02 
数据透视导出功能
 2024-03-19 14:29:00 +08:00
黎永顺 b57a95979d feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发 2024-03-01 09:08:53 +08:00
黎永顺 2e2f8ee248 Merge branch 'release/2.10.1.2401.02' into release/2.10.1.2401.02-个税 2024-02-21 15:45:22 +08:00
黎永顺 c6ad730e1e feature/2.10.1.2401.01-社保福利台账列表页面重构 2024-01-24 13:50:45 +08:00
黎永顺 6a91ce8b3c feature/2.10.1.2401.01-社保福利台账列表页面重构 2024-01-23 19:05:57 +08:00
黎永顺 a33b47373d Merge branch 'release/2.9.10.2312.02' into release/2.9.9.2312.02-个税 
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/calculate.js
#	pc4mobx/hrmSalary/pages/declare/declare.js
#	pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
#	pc4mobx/hrmSalary/pages/payrollRelease/index.js
 2024-01-17 14:31:34 +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
黎永顺 707b27038c Merge branch 'release/2.9.10.2312.02' into release/2.9.9.2312.02-个税 
# Conflicts:
#	pc4mobx/hrmSalary/apis/cumSituation.js
#	pc4mobx/hrmSalary/apis/declare.js
 2023-12-26 14:24:05 +08:00
黎永顺 8bcf268ed0 hotfix/2.9.10.2312.02 2023-12-19 16:18:44 +08:00
黎永顺 676d8d2850 Merge branch 'release/2.9.9.2312.01' 2023-12-07 16:35:19 +08:00
黎永顺 beddc62901 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-06 14:50:24 +08:00
黎永顺 f1b0fc588a 1release/2.9.9.2312.01 2023-12-06 14:49:34 +08:00
黎永顺 ce1acae344 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-05 17:16:37 +08:00
黎永顺 07c6ca839f hotfix/2.9.9.2312.01 2023-12-01 17:56:16 +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
黎永顺 2c7633b0c9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 15:29:07 +08:00
黎永顺 24cf38e964 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02 2023-11-24 14:06:48 +08:00
黎永顺 858b694568 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 11:26:08 +08:00
黎永顺 560af8a703 feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
黎永顺 c44f92fb56 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-27 17:28:11 +08:00
黎永顺 06895e5a36 Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
 2023-10-26 10:41:40 +08:00
黎永顺 7d09c5b55b hotfix/2.9.42310.02 
数据采集日期组件选择失败的bug处理
 2023-10-25 15:45:38 +08:00
黎永顺 63dcd77589 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop 2023-10-23 18:30:47 +08:00
黎永顺 86980f33b0 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2023-10-19 13:39:53 +08:00
黎永顺 3c9cf1c730 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 11:13:44 +08:00
黎永顺 b260a41c7e feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换 2023-10-12 15:52:15 +08:00
黎永顺 dd9d429a81 hotfix/2.9.42310.01 
工资单查看权限
 2023-10-11 16:23:55 +08:00
黎永顺 1bd7d92073 Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
#	pc4mobx/hrmSalary/components/importDialog/index.js
#	pc4mobx/hrmSalary/components/importDialog/index.less
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
 2023-09-21 14:23:21 +08:00
黎永顺 a583087f5f Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01 2023-09-11 13:43:28 +08:00
黎永顺 2d148b9fb5 Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02-个税 
# Conflicts:
#	pc4mobx/hrmSalary/util/index.js
 2023-09-06 16:30:21 +08:00
黎永顺 ce462fe51a hotfix/2.9.42308.02 2023-09-06 14:27:23 +08:00
黎永顺 bb1e328c92 feature社保福利档案添加非系统人员列表 2023-09-05 16:49:26 +08:00
黎永顺 6043159976 薪资档案发薪员工页面的调薪页面重构 2023-09-04 16:48:36 +08:00
黎永顺 89b28b1d2e 个税在线申报-申报表导出功能的完成 2023-08-24 13:43:01 +08:00
黎永顺 892e0f10f9 Merge branch 'feature/2.8.3.2308-人员信息报送' into feature/v2-对接e10个税扣缴义务人设置-1121 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2023-08-14 17:24:49 +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
黎永顺 37cb0f050a Merge branch 'master' into feature/v2-对接e10个税扣缴义务人设置-1121 
# Conflicts:
#	pc4mobx/hrmSalary/util/index.js
 2023-07-18 09:35:33 +08:00
黎永顺 8356de0fa2 非系统人员开发合并 2023-07-12 14:34:07 +08:00
黎永顺 9226ef19b3 产品-移动端二次验证密码设置 2023-07-10 09:21:57 +08:00
黎永顺 93d07961c7 薪酬统计分析-员工明细列表开发 2023-05-25 13:27:17 +08:00
黎永顺 6c615453f7 产品-薪酬统计分析页面开发 2023-05-15 18:21:23 +08:00