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

88 Commits

Author SHA1 Message Date
lys 88f3397ff8 Merge branch 'release/3.0.0.2502.01-合并业务线' into custom/领悦业务线 
# Conflicts:
#	pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
#	pc4mobx/hrmSalary/layout.js
 2025-02-21 17:00:56 +08:00
lys ef218c277f Merge branch 'feature/2.15.2.2411.01业务线' into custom/领悦业务线 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2024-12-03 11:36:07 +08:00
lys 4473d8dad5 feature/2.15.2.2411.01业务线-数据推送 2024-11-19 09:56:29 +08:00
lys 5014859171 Merge branch 'release/2.17.1.2411.01' into feature/测试 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
#	pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
#	pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
 2024-11-15 15:06:16 +08:00
lys 0abeee25f3 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-07 09:23:46 +08:00
lys 38a8d6aeaf Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线 2024-10-21 17:56:21 +08:00
黎永顺 f6789a0ea8 feature/2.15.1.2407.01-权限 2024-10-08 14:08:16 +08:00
黎永顺 143d2ef8f8 Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线 
# Conflicts:
#	pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
#	pc4mobx/hrmSalary/components/CustomBrowser/index.js
#	pc4mobx/hrmSalary/components/CustomBrowser/index.less
#	pc4mobx/hrmSalary/index.js
 2024-09-26 17:27:24 +08:00
黎永顺 f6f3a42333 权限 2024-09-23 10:37:10 +08:00
黎永顺 7ac7a58f7e Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限 2024-09-13 17:35:58 +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
黎永顺 6586f68d58 Merge branch 'release/2.15.1.2407.01' into feature/2.15.1.2407.01-权限 2024-09-10 16:34:12 +08:00
黎永顺 6e3d716afd feature/2.15.1.2407.01-权限 2024-09-06 13:30:09 +08:00
黎永顺 772ef95416 custom/领悦 2024-08-22 17:40:15 +08:00
黎永顺 3d55619813 hotfix/2.15.1.2407.01 2024-08-15 17:43:03 +08:00
黎永顺 36d90b35a6 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 14:36:11 +08:00
黎永顺 5f5d6f95de feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-15 18:45:56 +08:00
黎永顺 b349327088 feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能 2024-07-15 17:14:55 +08:00
黎永顺 888df02e07 hotfix/2.12.1.2405.01 2024-05-16 10:03:05 +08:00
黎永顺 85c222def8 feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 
1、补算的页面完成
 2024-03-26 09:14:32 +08:00
黎永顺 3f23bc29e5 Merge branch 'feature/2.10.1.2402.01-我的薪资福利显示基础配置' into release/2.10.1.2402.01 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2024-03-05 14:25:33 +08:00
黎永顺 194e575e25 hotfix/2.10.1.2402.01 2024-02-27 16:33:50 +08:00
黎永顺 b42f9c8e13 feature/2.10.1.2402.01-我的薪资福利显示基础配置 2024-02-26 15:29:04 +08:00
黎永顺 ac479676e0 release/2.10.1.2402.01-个税 2024-02-23 17:38:42 +08:00
黎永顺 fe95424386 feature/2.10.1.2402.01-我的薪资福利显示基础配置 2024-02-23 16:20:29 +08:00
黎永顺 eec52e34c1 Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02 2024-02-20 15:53:18 +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
黎永顺 d866cc07cf feature/2.10.1.2401.01-社保福利方案重构 2024-02-02 16:09:03 +08:00
黎永顺 f50257e1b5 feature/2.10.1.2401.01-工资单查看与调薪记录分开展示 2024-01-25 15:09:30 +08:00
黎永顺 e5d30f224b feature/2.10.1.2401.01-社保福利台账列表页面重构 2024-01-23 10:51:38 +08:00
黎永顺 c01c03f1b0 feature/2.9.10.2312.02-薪资档案页面重构 2024-01-08 16:05:00 +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
黎永顺 5617392a7c feature/2.9.9.2312.01-薪资核算查看权限 2023-12-08 09:19:43 +08:00
黎永顺 197849ecaa Merge branch 'master' into feature/2.9.9.2312.01-薪资核算查看权限 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/calculate/calculate.js
 2023-12-07 16:45:47 +08:00
黎永顺 23911d8e37 feature/2.9.9.2312.01-薪资核算查看权限 2023-12-07 16:44:38 +08:00
黎永顺 2b4b5623bc hotfix/2.9.9.2312.01 
查看薪資核算页面添加权限，移动端薪资查看修改
 2023-12-06 18:28:02 +08:00
黎永顺 bc78a26578 Merge branch 'feature/2.9.42311.02-我的薪资福利移动端列表查看' into release/2.9.9.2312.01 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2023-12-06 14:48:35 +08:00
黎永顺 24cf38e964 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02 2023-11-24 14:06:48 +08:00
黎永顺 94b3f056f4 hotfix/2.9.42311.02-我的薪资福利页面重构 2023-11-20 17:48:44 +08:00
黎永顺 0a1173faaa feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 10:41:47 +08:00
黎永顺 b14fce7949 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 15:30:21 +08:00
黎永顺 015e29ac47 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop 2023-10-27 17:28:21 +08:00
黎永顺 eed8d3a5bd feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 16:14:59 +08:00
黎永顺 235e7cc6f0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 10:43:23 +08:00
黎永顺 63dcd77589 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop 2023-10-23 18:30:47 +08:00
黎永顺 d0aa6e93a0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-20 10:27:00 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +08:00
黎永顺 2256d9e0a1 Merge branch 'feature/2.9.42310.01-调薪记录' into develop 2023-10-18 10:40:20 +08:00
黎永顺 984192fdf2 Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录 2023-10-16 14:13:53 +08:00
黎永顺 7b79fe5dc5 feature/2.9.42310.01-调薪记录 2023-10-13 09:51:50 +08:00