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

2142 Commits

Author SHA1 Message Date
黎永顺 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