Commit Graph

213 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
黎永顺 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
黎永顺 255e8d8760 feature/2.15.1.2407.01-权限 2024-10-09 10:22:00 +08:00
黎永顺 b4a966ea20 feature/2.15.1.2407.01-权限 2024-09-27 15:32:21 +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
黎永顺 02b085c051 权限 2024-09-20 16:30:12 +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
黎永顺 c07a43b8f8 feature/2.15.1.2407.01-权限 2024-09-10 16:33:21 +08:00
黎永顺 9759a529f5 feature/2.15.1.2407.01-权限 2024-09-10 12:23:18 +08:00
黎永顺 34bf2c8c52 feature/2.15.1.2407.01-权限 2024-09-09 09:35:02 +08:00
黎永顺 a56ee784db feature/2.15.1.2407.01-权限 2024-09-06 15:45:57 +08:00
黎永顺 421fca99cc Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01 2024-08-20 13:37:39 +08:00
黎永顺 b7e29df781 feature/2.15.1.2407.01-导入工具 2024-08-19 16:39:14 +08:00
黎永顺 d31ae5a030 feature/2.15.1.2407.01-导入工具 2024-08-19 10:43:30 +08:00
黎永顺 6a56cee090 feature/2.15.1.2407.01-导入工具 2024-08-19 10:42:54 +08:00
黎永顺 1d26ef8176 feature/2.15.1.2407.01-导入工具 2024-08-19 10:27:02 +08:00
黎永顺 f730cba8de feature/2.15.1.2407.01-导入工具 2024-08-16 16:37:45 +08:00
黎永顺 e8625fd0ef feature/2.15.1.2407.01-导入工具 2024-08-15 16:29:21 +08:00
黎永顺 5c9f954adb hotfix/2.15.1.2407.01 2024-08-15 11:04:14 +08:00
黎永顺 f984cd3f59 hotfix/2.15.1.2407.01 2024-08-15 11:01:26 +08:00
黎永顺 23e9a6ba42 hotfix/2.15.1.2407.01 2024-08-15 10:28:18 +08:00
黎永顺 9479a4ba9a feature/2.15.1.2407.01-导入工具 2024-08-13 14:33:10 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 add6a70abd hotfix/2.14.2.2406.02 2024-06-17 16:17:16 +08:00
黎永顺 1a2bf2bc6e 0release/2.14.3.2406.01 2024-06-05 09:10:04 +08:00
黎永顺 aaf733fdd2 hotfix/2.12.1.2404.02
薪酬统计报表合计行展示列表优化
2024-05-10 16:33:02 +08:00
黎永顺 0241c017b8 hotfix/2.12.1.2404.02
更多按钮
2024-04-24 10:42:04 +08:00
黎永顺 bd3aa05c29 hotfix/2.12.1.2403.02 2024-04-07 13:59:51 +08:00
黎永顺 80acc5f18a hotfix/2.12.1.2403.02 2024-03-18 16:03:04 +08:00
黎永顺 5e3c20edc0 release/3.0.0.2403.01 2024-03-15 09:19:59 +08:00
黎永顺 0771ad9ed3 hotfix/3.0.0.2403.01
数据采集页面导入修改重构
2024-03-13 17:27:49 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 4b95f6811f feature/2.10.1.2401.01-页面操作日志添加 2024-02-19 09:03:40 +08:00
黎永顺 671f0c42b4 Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加 2024-01-30 17:38:14 +08:00
黎永顺 e86e4871d8 release/2.10.1.2401.01 2024-01-25 15:11:35 +08:00
黎永顺 9d0d04be9d hotfix/2.10.1.2401.01 2024-01-25 14:44:12 +08:00
黎永顺 8f8f2a32e9 feature/2.10.1.2401.01-页面操作日志添加 2024-01-25 14:02:34 +08:00
黎永顺 7cb1b157eb feature/2.10.1.2401.01-页面操作日志添加 2024-01-25 11:52:10 +08:00
黎永顺 9e81e8244a feature/2.10.1.2401.01-页面操作日志添加 2024-01-25 09:16:57 +08:00
黎永顺 98f35401e6 release/2.9.10.2312.02
工资单样式修改
2024-01-18 14:44:24 +08:00
钱涛 f312e66017 工资单标题字体大小改为25px 2024-01-17 10:00:19 +08:00
黎永顺 1a38752cc6 1release/2.9.10.2312.02 2024-01-17 09:44:50 +08:00
黎永顺 93a0c76753 1release/2.9.10.2312.02 2024-01-16 16:23:29 +08:00
黎永顺 b5cfdb8b69 hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
2024-01-15 09:35:31 +08:00
黎永顺 43ff36d59f hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
2024-01-15 09:34:49 +08:00
黎永顺 c6e71bd069 hotfix/2.9.10.2312.02 2024-01-11 14:50:28 +08:00
黎永顺 15bc21ecd5 release/2.9.10.2312.02 2024-01-10 14:43:07 +08:00
黎永顺 6a7220ffc2 Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02 2023-12-29 10:08:36 +08:00