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

2029 Commits

Author SHA1 Message Date
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
lys 9d2fd951ef release/2.16.1.2410.01-个税 2024-10-18 16:49:52 +08:00
lys e7f1971370 feature/2.16.1.2410.01-薪资核算单元格锁定 2024-10-18 14:26:00 +08:00
lys 8c5b0acffa feature/2.16.1.2410.01-薪资核算单元格锁定 2024-10-18 11:51:06 +08:00
lys f407d8520d release/2.16.1.2410.01 2024-10-17 11:18:53 +08:00
lys 4b125994f7 release/2.16.1.2410.01 2024-10-17 11:17:55 +08:00
lys 1a0f594753 release/2.15.2.2409.01 2024-10-16 16:18:32 +08:00
lys 600bba8619 feature/2.15.2.2409.01 2024-10-16 15:23:21 +08:00
lys 0a447773b8 feature/2.15.2.2409.01 2024-10-16 14:42:57 +08:00
lys 4b11f39155 feature/2.15.2.2409.01合并业务线测试 2024-10-16 11:18:10 +08:00
lys 73de6b8417 Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试 
# Conflicts:
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/searchPannel/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/index.less
 2024-10-16 11:11:23 +08:00
lys bee1d73eb7 release/2.15.2.2409.01 2024-10-15 16:33:26 +08:00
黎永顺 b954e1696e release/2.15.2.2409.01 2024-10-14 16:02:12 +08:00
黎永顺 7980acc6c2 release/2.15.2.2409.01 2024-10-14 14:20:02 +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
黎永顺 29122e2434 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-10-12 16:02:19 +08:00
黎永顺 2b541a85df Merge branch 'feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列' into release/2.15.2.2409.01 2024-10-12 13:39:15 +08:00
黎永顺 5b3a645dfc release/2.15.2.2409.01 2024-10-12 10:07:36 +08:00
黎永顺 591f29d934 release/2.15.2.2409.01 2024-10-11 17:15:11 +08:00
黎永顺 0754316e77 feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列 2024-10-11 17:13:19 +08:00
黎永顺 90470c3a57 feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列 2024-10-11 17:06:54 +08:00
黎永顺 167c2c5a20 feature/2.15.1.2407.01-权限 2024-10-11 15:19:38 +08:00
黎永顺 c72d34fb9a feature/2.15.1.2407.01-权限 2024-10-11 11:11:06 +08:00
黎永顺 6aa662d432 feature/2.15.1.2407.01-权限 2024-10-11 10:01:46 +08:00
黎永顺 bdd4b4e446 release/2.15.2.2409.01 2024-10-10 15:32:41 +08:00
黎永顺 ca3c9079a1 release/2.15.2.2409.01 2024-10-10 13:57:09 +08:00
黎永顺 ab7d0c1f7f release/2.15.2.2409.01 2024-10-09 18:12:06 +08:00
黎永顺 cd768fff67 feature/2.15.1.2407.01-权限 2024-10-09 17:02:14 +08:00
黎永顺 01ef84368d Merge branch 'hotfix/2.15.1.2409.01' into release/2.15.2.2409.01 2024-10-09 14:55:29 +08:00
黎永顺 307f954eac feature/2.15.1.2407.01-权限 2024-10-09 14:55:11 +08:00
黎永顺 94a4d3a930 feature/2.15.1.2407.01-权限 2024-10-09 14:51:55 +08:00
黎永顺 215094dac8 release/2.15.2.2409.01 2024-10-09 11:25:50 +08:00
黎永顺 b23662c09e feature/2.15.1.2407.01-权限 2024-10-09 11:10:21 +08:00
黎永顺 255e8d8760 feature/2.15.1.2407.01-权限 2024-10-09 10:22:00 +08:00
黎永顺 dd82ecf445 feature/2.15.1.2407.01-权限 2024-10-08 17:57:10 +08:00
黎永顺 bd93223774 hotfix/2.15.1.2409.01 
规则设置添加薪资报表中的组织信息设置切换功能
 2024-10-08 15:08:00 +08:00
黎永顺 f55898b8a0 feature/2.15.1.2407.01-权限 2024-10-08 14:29:24 +08:00
黎永顺 f6789a0ea8 feature/2.15.1.2407.01-权限 2024-10-08 14:08:16 +08:00
黎永顺 53d45c2069 hotfix/2.15.1.2409.01 
规则设置修改
 2024-10-08 13:21:55 +08:00
黎永顺 d73372e5c4 feature/2.15.1.2407.01-权限 2024-10-08 10:07:23 +08:00
黎永顺 e92f06bce2 Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试 2024-09-30 10:30:46 +08:00
黎永顺 3107914834 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-30 10:30:32 +08:00
黎永顺 9c318d22b7 hotfix/2.15.1.2409.01 2024-09-29 10:57:22 +08:00
黎永顺 198668654a feature/2.15.1.2407.01-权限 2024-09-27 18:38:37 +08:00
黎永顺 0683625850 Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限 
# Conflicts:
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/index.js
 2024-09-27 18:35:25 +08:00
黎永顺 d4763dc2d2 feature/2.15.1.2407.01-权限 2024-09-27 18:30:31 +08:00
黎永顺 ce711f9c97 feature/2.15.1.2407.01-权限 2024-09-27 16:45:47 +08:00
黎永顺 6c99d5fbad Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限 2024-09-27 16:21:35 +08:00
黎永顺 8996fa8d79 feature/2.15.1.2407.01-权限 2024-09-27 16:20:28 +08:00
黎永顺 b4a966ea20 feature/2.15.1.2407.01-权限 2024-09-27 15:32:21 +08:00
黎永顺 5d5215609a Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-26 17:59:43 +08:00
黎永顺 e09fbb332f feature/2.15.1.2407.01-权限 2024-09-26 17:59:14 +08:00
黎永顺 f1183af3e2 feature/2.15.1.2407.01-权限 2024-09-26 17:56:41 +08:00
黎永顺 8c19e33592 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-26 17:09:42 +08:00
黎永顺 666ec8f9be feature/2.15.1.2407.01-权限 2024-09-26 17:06:08 +08:00
黎永顺 5093ff88a7 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-26 10:06:14 +08:00
黎永顺 112988ceba feature/2.15.1.2407.01-权限 2024-09-26 10:01:49 +08:00
黎永顺 a7e67b9358 Merge branch 'feature/2.15.1.2407.01-薪资项目以及字段管理页面改造' into feature/2.15.1.2407.01-权限 
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
 2024-09-25 18:01:35 +08:00
黎永顺 5ec07d20e0 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-09-25 15:37:02 +08:00
黎永顺 a4fffbcbd4 release/2.15.2.2409.01 2024-09-25 14:11:46 +08:00
黎永顺 f2b17872f7 release/2.15.2.2409.01 2024-09-25 11:12:53 +08:00
黎永顺 fd188c9f51 feature/2.15.1.2407.01-权限 2024-09-25 10:02:46 +08:00
黎永顺 2d15f19ddd custom/西安秦华天燃气 2024-09-24 16:49:45 +08:00
黎永顺 fd067b653f feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-09-24 10:53:41 +08:00
黎永顺 2664903959 release/2.15.2.2409.01 2024-09-23 16:25:46 +08:00
黎永顺 efa75925ad 权限 2024-09-23 16:15:22 +08:00