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

2094 Commits

Author SHA1 Message Date
lys 996ce33b41 custom-中航富士达 2025-03-04 09:09:58 +08:00
lys cced362ae7 Merge branch 'release/3.0.0.2502.01-合并业务线' into custom-中航富士达 2025-02-28 15:52:58 +08:00
lys bdfc9513c8 release/3.0.0.2502.01-合并业务线 2025-02-27 18:25:52 +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 1672909dd7 release/3.0.0.2502.01-合并业务线 2025-02-20 13:44:55 +08:00
lys c0217a2608 release/3.0.0.2502.01-合并业务线 2025-02-20 11:32:32 +08:00
lys 98b1c2bc08 release/3.0.0.2502.01-合并业务线 2025-02-19 16:26:58 +08:00
lys 2200784d4b release/3.0.0.2502.01-合并业务线 2025-02-18 17:34:03 +08:00
lys b6a0678f1a release/3.0.0.2502.01-合并业务线 2025-02-18 17:30:21 +08:00
lys 7c85cbae4f release/3.0.0.2502.01-合并业务线 2025-02-18 15:48:37 +08:00
lys 54adc6cc2e release/3.0.0.2502.01-合并业务线 2025-02-18 15:42:40 +08:00
lys 75d7f97f1d Merge branch 'release/2.19.1.2501.01' into release/3.0.0.2502.01-合并业务线 2025-02-18 11:37:01 +08:00
lys ea084c93a2 release/2.19.1.2501.01 
路由模式页面报错
 2025-02-18 09:08:07 +08:00
lys e344eed2d0 release/2.19.1.2501.01 2025-02-17 18:40:39 +08:00
lys 4d9866401e Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01 2025-02-17 18:28:35 +08:00
lys 921f444f80 feature/2.15.2.2411.01业务线-数据推送 2025-02-17 18:28:21 +08:00
lys 824f4a9e86 Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01 2025-02-17 09:56:08 +08:00
lys 46f7b08360 release/2.19.1.2501.01 2025-02-14 10:43:36 +08:00
lys c0517462e7 release/2.19.1.2501.01 2025-02-13 15:19:18 +08:00
lys 002cb5522b release/2.19.1.2501.01 2025-02-13 13:28:28 +08:00
lys 2357ee50a6 Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送 
# Conflicts:
#	pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
 2025-02-12 15:25:54 +08:00
lys acf1257a27 release/2.19.1.2501.01 2025-02-11 14:32:53 +08:00
lys ecf34e4886 release/2.19.1.2501.01 2025-02-11 14:17:56 +08:00
lys eecb7f34f2 release/2.19.1.2501.01 2025-02-08 15:40:19 +08:00
lys 6b8b604f55 feature/2.19.1.2501.01-套打功能 2025-02-08 11:16:43 +08:00
lys 7fd6edb02d feature/2.19.1.2501.01-套打功能 2025-02-07 16:44:09 +08:00
lys 17d29a543b feature/2.19.1.2501.01-套打功能 2025-02-07 14:43:47 +08:00
lys 98f6dacfd9 Merge branch 'release/2.19.1.2501.01' into custom-中航富士达 2025-02-06 13:34:11 +08:00
lys 7c317607ea Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送 
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
 2025-01-22 11:13:55 +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 811083310b release/2.19.1.2501.01 2025-01-14 14:02:24 +08:00
lys 30bbcfb712 release/2.19.1.2501.01 2025-01-07 15:59:44 +08:00
lys 07ef0535c4 release/2.19.1.2501.01 2025-01-07 15:55:25 +08:00
lys 21a2e21c3f release/2.19.1.2501.01 2025-01-06 10:48:52 +08:00
lys 13dc35f122 release/2.19.1.2501.01 2025-01-03 17:14:33 +08:00
lys 9740a9ef77 release/2.19.1.2501.01 2025-01-03 15:50:59 +08:00
lys 2c03908885 release/2.18.2.2412.02 2025-01-03 15:49:53 +08:00
lys 9c04b2adaf release/2.18.2.2412.02 2025-01-03 11:40:39 +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 446940095e release/2.18.2.2412.02 2025-01-02 14:32:25 +08:00
lys 9d8cd5c6fa release/2.18.2.2412.02 2024-12-31 16:07:35 +08:00
lys db99c081fb release/2.18.2.2412.02 2024-12-31 15:38:09 +08:00
lys a8e2a53037 release/2.18.2.2412.02 2024-12-31 15:26:54 +08:00
lys cdc75b7668 release/2.18.2.2412.02 2024-12-31 15:04:09 +08:00
lys 2d659768ac release/2.18.2.2412.02 2024-12-31 13:42:33 +08:00
lys a3f0e27f49 release/2.18.2.2412.02 2024-12-31 09:21:25 +08:00
lys 576a108fa9 release/2.18.2.2412.02 2024-12-30 16:55:47 +08:00
lys 69004fa1f1 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 14:11:34 +08:00
lys 33280a603f feature/2.15.2.2411.01业务线 2024-12-27 14:11:20 +08:00
lys d6d7b7b545 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 11:16:18 +08:00
lys c00a678df1 feature/2.15.2.2411.01业务线 2024-12-27 11:16:06 +08:00
lys fd8910e361 Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送 2024-12-27 11:03:11 +08:00
lys eaded8d937 feature/2.15.2.2411.01业务线 2024-12-27 11:02:58 +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 8b8f4cd610 release/2.18.2.2412.02 2024-12-25 17:20:55 +08:00
lys cec22dc89f release/2.18.2.2412.02 2024-12-24 15:41:15 +08:00
lys c04cc1de76 release/2.18.2.2412.02 2024-12-23 15:28:05 +08:00
lys a9e40aaa5e custom-中航富士达 2024-12-23 15:08:59 +08:00
lys cdd98ea602 release/2.18.1.2412.01 2024-12-20 16:36:50 +08:00
lys de0054adb2 Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线 2024-12-17 16:04:50 +08:00
lys ef1c529941 release/2.18.1.2412.01 2024-12-17 16:03:52 +08:00
lys d9844eed9b release/2.18.1.2412.01 2024-12-11 15:28:14 +08:00
lys d2bd5befe7 feature/2.15.2.2411.01业务线 2024-12-10 14:07:12 +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 02a367befb release/2.18.1.2412.01 
薪资核算进度条处理
 2024-12-10 09:11:12 +08:00
lys eb66a32612 release/2.18.1.2412.01 2024-12-09 18:14:41 +08:00
lys 89b9e6110e release/2.18.1.2412.01 2024-12-09 18:01:05 +08:00
lys 3871eb276a 1release/2.18.1.2412.01 2024-12-09 17:58:24 +08:00
lys 5f893b1eb0 release/2.18.1.2412.01 2024-12-09 17:37:44 +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 b69f30529d Merge branch 'feature/2.17.1.2411.01-薪酬报表薪资明细显示模式' into release/2.17.1.2411.01 2024-12-05 10:51:06 +08:00
lys 5c8f045373 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 17:39:23 +08:00
lys 8a2891f454 release/2.17.1.2411.01 2024-12-04 17:06:29 +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 ed5b694859 Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线 2024-12-03 17:11:39 +08:00
lys 373e093321 release/2.17.1.2411.01 2024-12-03 17:01:12 +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 154d69d850 release/2.17.1.2411.01 2024-11-27 14:49:03 +08:00
lys b0b67230ce release/2.17.1.2411.01 2024-11-27 14:42:04 +08:00
lys ce4c2a7c72 release/2.17.1.2411.01 2024-11-27 10:59:24 +08:00
lys 8786ef1f2a release/2.17.1.2411.01 2024-11-27 10:32:21 +08:00
lys e613772041 release/2.17.1.2411.01 2024-11-27 10:21:51 +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 7c13ddb970 release/2.17.1.2411.01 2024-11-25 18:08:50 +08:00
lys dda961cacf release/2.17.1.2411.01 2024-11-25 17:51:49 +08:00
lys 18029e6dba feature/2.15.2.2411.01业务线-数据推送 2024-11-25 14:57:11 +08:00
lys ad0bdc33ce feature/2.15.2.2411.01业务线-数据推送 2024-11-25 10:24:03 +08:00
lys 571026ebf8 feature/2.15.2.2411.01业务线-数据推送 2024-11-21 14:10:47 +08:00
lys a5cc09a2c5 release/2.17.1.2411.01 2024-11-20 16:25:59 +08:00
lys 18a87cb45c feature/2.15.2.2411.01业务线-数据推送 2024-11-20 15:30:14 +08:00
lys a2c5fdc5ec feature/2.15.2.2411.01业务线-数据推送 2024-11-19 18:58:39 +08:00
lys da79b1b7ff feature/2.15.2.2411.01业务线-数据推送 2024-11-19 13:28:04 +08:00
lys 8a0998e26c release/2.17.1.2411.01 2024-11-19 10:54:33 +08:00
lys 2261cf3104 release/2.17.1.2411.01 2024-11-19 10:31:10 +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 b0a45c9bbe Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01 
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
 2024-11-14 09:36:26 +08:00
lys e09f4da1cf release/2.17.1.2411.01 2024-11-13 10:19:57 +08:00
lys 712b45453a Merge branch 'feature/2.16.1.2410.01-次账号' into release/2.17.1.2411.01 
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
 2024-11-12 18:05:44 +08:00
lys 3869a0a51b Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构 2024-11-12 18:02:48 +08:00
lys 24cadda23f release/2.16.1.2410.01 2024-11-12 17:58:50 +08:00
lys 6993e5655a Merge branch 'feature/2.16.1.2410.01-薪资项目管理页面重构' into feature/2.16.1.2410.01-数据采集重构 2024-11-12 13:49:41 +08:00
lys 8003e68796 Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构 2024-11-12 13:49:18 +08:00
lys 01d1d3b0bd Merge branch 'feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能' into release/2.16.1.2410.01 2024-11-11 14:43:34 +08:00
lys 3654e2a378 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-11 14:43:17 +08:00
lys 7063732d6f feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-08 16:01:18 +08:00
lys 3fbe08ab2e feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-08 15:16:09 +08:00
lys 5abe35ca60 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-08 10:27:47 +08:00
lys 641c5f367f feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-08 10:02:24 +08:00
lys bd81fe44b2 release/2.16.1.2410.01 
薪资档案添加调薪日期的泛微选择
 2024-11-07 16:15:45 +08:00
lys 97a5d37044 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-07 16:06:48 +08:00
lys 0abeee25f3 feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能 2024-11-07 09:23:46 +08:00
lys e9f4d9b043 release/2.16.1.2410.01 2024-11-06 11:06:55 +08:00
lys fb3a5c8d96 feature/2.15.2.2409.01合并业务线测试 2024-11-06 10:34:36 +08:00
lys 27ec1ae5ef feature/2.16.1.2410.01-薪资项目管理页面重构 2024-11-06 10:33:25 +08:00
lys 5df1e3f0c1 Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构 2024-11-06 09:23:10 +08:00
lys 83d14f6d82 release/2.16.1.2410.01 
日志组件优化
 2024-11-05 17:33:34 +08:00
lys 6563e6b5df release/2.16.1.2410.01 2024-11-05 16:26:17 +08:00
lys 1a02222bd3 feature/2.16.1.2410.01-薪资账套配置流程审批 2024-11-04 18:01:33 +08:00
lys 88dc06c35e Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-次账号 2024-11-04 17:26:04 +08:00
lys 2e94324bb7 feature/2.15.2.2409.01合并业务线测试 2024-11-04 16:33:32 +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 98ca4cb03f release/2.16.1.2410.01 2024-11-01 16:03:57 +08:00
lys 1f7fe615be 1release/2.16.1.2410.01 2024-11-01 14:50:37 +08:00
lys 728e683777 Merge branch 'feature/2.16.1.2410.01-数据采集重构' into feature/2.16.1.2410.01-薪资账套配置流程审批 2024-10-31 17:32:30 +08:00
lys b461a2c801 custom/汇通建设 2024-10-31 17:05:24 +08:00
lys f126179d1d Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾 
# Conflicts:
#	pc4mobx/hrmSalary/apis/calculate.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
#	pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
#	pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
 2024-10-31 17:02:27 +08:00
lys e4800170a8 feature/2.15.2.2409.01合并业务线测试 2024-10-31 15:13:57 +08:00
lys 66c6c68460 feature/2.16.1.2410.01-数据采集重构 2024-10-31 10:22:16 +08:00
lys 004175f882 feature/2.16.1.2410.01-数据采集重构 2024-10-30 16:23:58 +08:00
lys 5e2f6bbbbc feature/2.16.1.2410.01-数据采集重构 2024-10-30 10:59:46 +08:00
lys 09ea3da3e3 Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试 2024-10-30 10:27:18 +08:00
lys c5a62b3c26 custom/京贵投资 2024-10-30 10:20:43 +08:00
lys 8488f54aac release/2.16.1.2410.01 2024-10-29 09:21:38 +08:00
lys 000f36ec0e feature/2.15.2.2409.01合并业务线测试 2024-10-28 14:57:09 +08:00
lys 444c9b19ab release/2.16.1.2410.01 
工资单模板设置添加薪资所属年的设置
 2024-10-25 17:04:45 +08:00
lys c10e6fb3ee feature/2.16.1.2410.01-次账号 2024-10-25 11:46:00 +08:00
lys ef86c4faef release/2.16.1.2410.01 2024-10-25 09:49:15 +08:00
lys 368542a52b Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试 
# Conflicts:
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
#	pc4mobx/hrmSalary/pages/ledgerPage/index.less
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
 2024-10-25 09:43:15 +08:00
lys 02ff34c202 release/2.16.1.2410.01 2024-10-23 09:51:02 +08:00
lys cfdc0cd5a0 release/2.16.1.2410.01 2024-10-22 14:53:36 +08:00