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

260 Commits

Author SHA1 Message Date
黎永顺 95f5043393 Merge branch 'feature/2.19.1.2501.01-PC端Token验证' into custom/新美光(0401) 
# Conflicts:
#	pc4mobx/hrmSalary/components/captchaModal/index.js
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
 2026-03-18 14:21:08 +08:00
lys 4a3c9311bf release/3.0.1.2504.01-合并业务线 2025-12-18 14:15:03 +08:00
lys 9efeb109e9 release/3.0.1.2504.01-合并业务线 2025-10-30 10:17:27 +08:00
lys c00d3f446d release/3.0.1.2504.01-合并业务线 2025-10-28 15:09:36 +08:00
lys 92c966310c feature/3.0.1.2504.01-下拉框多选支持搜索 2025-10-27 14:55:34 +08:00
lys f3e2d878d0 release/3.0.1.2504.01-合并业务线 2025-07-08 10:18:34 +08:00
lys 82322ade91 Merge branch 'feature/2.19.1.2501.01-验证码验证' into release/3.0.1.2504.01-合并业务线 2025-04-25 15:58:21 +08:00
lys abbf593c99 feature/2.19.1.2501.01-验证码验证 2025-04-25 15:58:01 +08:00
lys 0d766a1513 Merge branch 'feature/2.19.1.2501.01-验证码验证' into release/3.0.1.2504.01-合并业务线 2025-04-25 15:47:43 +08:00
lys 40c7a4f7a0 feature/2.19.1.2501.01-PC端Token验证 2025-04-25 13:55:23 +08:00
lys 04b3415353 release/2.19.1.2501.01 2025-04-25 13:38:43 +08:00
lys 82ffd93fd5 5release/2.19.1.2501.01 2025-04-18 15:10:05 +08:00
lys 58d64b94b0 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线 2025-04-15 16:13:24 +08:00
lys 6dfb4e6650 release/2.19.1.2501.01 2025-04-15 16:13:15 +08:00
lys 3368323786 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线 2025-03-19 10:16:43 +08:00
lys f436779b9e release/2.19.1.2501.01 2025-03-13 17:41:34 +08:00
lys f211fadcb8 release/3.0.0.2502.01-合并业务线 2025-02-27 16:53:46 +08:00
lys d47d74f856 release/3.0.0.2502.01-合并业务线 2025-02-21 17:43:08 +08:00
lys 9ebba96698 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2025-01-22 11:12:20 +08:00
lys 8a904aa38a Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线 2025-01-03 09:11:47 +08:00
lys 4212bf9ff5 release/2.18.2.2412.02 2025-01-02 15:31:55 +08:00
lys db99c081fb release/2.18.2.2412.02 2024-12-31 15:38:09 +08:00
lys 576a108fa9 release/2.18.2.2412.02 2024-12-30 16:55:47 +08:00
lys 6a4f9cd2af Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 09:16:26 +08:00
lys 322e6a9f96 Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线 2024-12-27 09:16:05 +08:00
lys 8aa696fee5 release/2.18.2.2412.02 2024-12-27 09:12:09 +08:00
lys cec22dc89f release/2.18.2.2412.02 2024-12-24 15:41:15 +08:00
lys 8da06ed9ae Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线 
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
 2024-12-10 14:06:09 +08:00
lys a46f4869e5 Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送 
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
 2024-12-09 15:22:49 +08:00
lys 5d817c9594 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 15:42:49 +08:00
lys f771d2eacc feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 10:46:25 +08:00
lys b61dc20db5 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-03 18:38:14 +08:00
lys 64777b4129 Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线 
# Conflicts:
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
#	pc4mobx/hrmSalary/util/index.js
 2024-12-03 13:21:36 +08:00
lys b0b67230ce release/2.17.1.2411.01 2024-11-27 14:42:04 +08:00
lys 9618a9b5d3 release/2.17.1.2411.01 2024-11-26 17:01:50 +08:00
lys a048a561a5 release/2.17.1.2411.01 2024-11-26 14:56:03 +08:00
lys 179e58357d Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送 
# Conflicts:
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
#	pc4mobx/hrmSalary/util/index.js
 2024-11-26 14:40:33 +08:00
lys 571026ebf8 feature/2.15.2.2411.01业务线-数据推送 2024-11-21 14:10:47 +08:00
lys 8a0998e26c release/2.17.1.2411.01 2024-11-19 10:54:33 +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 3654e2a378 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-11 14:43:17 +08:00
lys 97a5d37044 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-07 16:06:48 +08:00
lys 83d14f6d82 release/2.16.1.2410.01 
日志组件优化
 2024-11-05 17:33:34 +08:00
lys 2699266c4c Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试 2024-11-04 14:41:29 +08:00
lys df4971fd27 release/2.16.1.2410.01 2024-11-01 18:28:12 +08:00
lys 1f7fe615be 1release/2.16.1.2410.01 2024-11-01 14:50:37 +08:00
黎永顺 5c8e6b8133 Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试 
# Conflicts:
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/index.js
#	pc4mobx/hrmSalary/stores/taxAgent.js
 2024-10-12 16:05:19 +08:00
黎永顺 5b3a645dfc release/2.15.2.2409.01 2024-10-12 10:07:36 +08:00
黎永顺 90470c3a57 feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列 2024-10-11 17:06:54 +08:00