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

1559 Commits

Author SHA1 Message Date
黎永顺 4a392f2357 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-23 18:30:35 +08:00
黎永顺 bc28d4ea2f Merge branch 'feature/2.9.42310.01-社保档案操作日志' into develop 2023-10-23 18:30:25 +08:00
黎永顺 967d0bacd1 feature/2.9.42310.01-社保档案操作日志 2023-10-23 18:28:29 +08:00
黎永顺 510e46045e feature/2.9.42310.01-社保档案操作日志 2023-10-23 18:06:09 +08:00
黎永顺 8b7bb221e2 feature/2.9.42310.01-社保档案操作日志 2023-10-23 17:37:17 +08:00
黎永顺 452c22c262 feature/2.9.42310.01-社保档案操作日志 2023-10-23 15:29:26 +08:00
黎永顺 d61fccaf43 hotfix/2.9.42309.01-个税 2023-10-23 14:35:10 +08:00
黎永顺 cd163693c8 release/2.9.42310.01-个税 2023-10-23 11:06:04 +08:00
黎永顺 8f23fc6c8b Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 2023-10-23 10:57:27 +08:00
黎永顺 e21bbcb3f8 Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into release/2.9.42310.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/declare/index.less
#	pc4mobx/hrmSalary/stores/declare.js
 2023-10-23 10:57:05 +08:00
黎永顺 d075fceb05 hotfix/2.9.42310.01 2023-10-20 14:41:42 +08:00
黎永顺 4898ff8335 hotfix/2.9.42310.01 2023-10-20 11:39:20 +08:00
黎永顺 26b25e04df hotfix/2.9.42310.01 2023-10-20 11:21:14 +08:00
黎永顺 f78a59285a hotfix/2.9.42310.01 2023-10-20 11:18:27 +08:00
黎永顺 d0aa6e93a0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-20 10:27:00 +08:00
黎永顺 86980f33b0 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2023-10-19 13:39:53 +08:00
黎永顺 fafbfbe253 Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-19 13:38:26 +08:00
黎永顺 8838566b05 hotfix/2.9.42310.01 2023-10-19 13:38:00 +08:00
黎永顺 bec2e5a5b2 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 11:51:41 +08:00
黎永顺 5031d3a032 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 09:42:46 +08:00
黎永顺 3dd6ede31c Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-18 17:19:14 +08:00
黎永顺 429853a6a6 hotfix/2.9.42310.01 
公式测试结果显示修改
 2023-10-18 17:18:44 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +08:00
黎永顺 55c6fd80be hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制 2023-10-18 11:09:37 +08:00
黎永顺 50b56c76d1 Merge branch 'hotfix/2.9.42310.01' into develop 2023-10-18 10:40:51 +08:00
黎永顺 2256d9e0a1 Merge branch 'feature/2.9.42310.01-调薪记录' into develop 2023-10-18 10:40:20 +08:00
黎永顺 a61e6eb847 Merge branch 'feature/2.9.42310.01-调薪记录' into release/2.9.42310.01 2023-10-18 10:25:08 +08:00
黎永顺 4519401f64 Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into release/2.9.42310.01 2023-10-18 10:24:54 +08:00
黎永顺 5a78344e2f Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-18 10:24:41 +08:00
黎永顺 db166275c4 hotfix/2.9.42310.01-社保福利档案非系统人员tab显示控制 2023-10-18 10:24:13 +08:00
黎永顺 0acc570a24 feature/2.9.42310.01-工资单发放页面重构单 2023-10-18 10:18:26 +08:00
黎永顺 7e30f73069 feature/2.9.42310.01-工资单发放页面重构单 2023-10-17 17:17:01 +08:00
黎永顺 a84a216000 hotfix/2.9.42309.01-个税 2023-10-17 11:01:29 +08:00
黎永顺 2e613014fe feature/2.9.42310.01-工资单发放页面重构 2023-10-17 09:17:37 +08:00
黎永顺 6ea39d8255 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 16:09:30 +08:00
黎永顺 9a03c6ad8b feature/2.9.42310.01-调薪记录 2023-10-16 15:27:29 +08:00
黎永顺 984192fdf2 Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录 2023-10-16 14:13:53 +08:00
黎永顺 3c9cf1c730 feature/2.9.42310.01-工资单发放页面重构 2023-10-16 11:13:44 +08:00
黎永顺 c2efaf193b feature/2.9.42310.01-工资单发放页面重构 2023-10-13 15:53:43 +08:00
黎永顺 53ddc607b3 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 14:52:59 +08:00
黎永顺 79a3f460e7 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 10:57:47 +08:00
黎永顺 ab3be2c1f9 feature/2.9.42310.01-工资单发放页面重构 2023-10-13 10:20:14 +08:00
黎永顺 7b79fe5dc5 feature/2.9.42310.01-调薪记录 2023-10-13 09:51:50 +08:00
黎永顺 02863814ba feature/2.9.42310.01-工资单发放页面重构 2023-10-13 09:17:54 +08:00
黎永顺 89d6eebf77 Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into develop 2023-10-12 15:52:54 +08:00
黎永顺 9f4e8468e7 Merge branch 'feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换' into develop 2023-10-12 15:52:44 +08:00
黎永顺 b260a41c7e feature/2.9.42310.01-社保福利台账详情页面的导入下载模板接口更换 2023-10-12 15:52:15 +08:00
黎永顺 618d9f12cd Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-12 14:14:42 +08:00
黎永顺 f2027627f4 hotfix/2.9.42310.01 2023-10-12 14:08:48 +08:00
黎永顺 ca5b60f6aa feature/2.9.42310.01-个税申报表页面重构 2023-10-12 13:57:14 +08:00
黎永顺 4d76443438 Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-11 18:23:44 +08:00
黎永顺 d67b8bc6ab hotfix/2.9.42310.01 2023-10-11 18:23:19 +08:00
黎永顺 afc4ad4d1d Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into develop 2023-10-11 16:43:01 +08:00
黎永顺 9e5e941a3f Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop 2023-10-11 16:42:33 +08:00
黎永顺 c8e58db7d9 Merge branch 'feature/2.9.42310.01-薪资核算页面重构' into release/2.9.42310.01 2023-10-11 16:26:10 +08:00
黎永顺 a02987088e Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01 2023-10-11 16:24:55 +08:00
黎永顺 6b868824ee Merge branch 'hotfix/2.9.42310.01' into release/2.9.42310.01 2023-10-11 16:24:33 +08:00
黎永顺 dd9d429a81 hotfix/2.9.42310.01 
工资单查看权限
 2023-10-11 16:23:55 +08:00
黎永顺 5e51f78ff6 feature/2.9.42310.01-薪资核算页面重构 2023-10-11 15:05:24 +08:00
黎永顺 c9403cda9d Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into feature/2.9.42310.01-薪资核算页面重构 2023-10-11 13:55:53 +08:00
黎永顺 54b4ebe83a 薪资核算页面导入薪资项样式修改 2023-10-11 13:55:10 +08:00
黎永顺 93d996c79f feature/2.9.42310.01-薪资核算页面重构 2023-10-10 17:49:45 +08:00
黎永顺 71cdd6da50 hotfix/2.9.42309.01-个税 2023-10-10 14:17:37 +08:00
黎永顺 3fe4ede887 feature/2.9.42310.01-薪资核算页面重构 2023-10-09 17:48:45 +08:00
黎永顺 d00e46442d hotfix/2.9.42310.01 2023-10-09 15:33:19 +08:00
黎永顺 3fdef5ba85 feature/2.9.42310.01-薪资核算页面重构 2023-10-09 15:15:59 +08:00
黎永顺 321275d406 feature/2.9.42310.01-薪资核算页面重构 2023-10-09 13:17:54 +08:00
黎永顺 eeb5904b4e Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01 2023-10-09 09:42:51 +08:00
黎永顺 7d222033ab Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop 2023-10-09 09:42:09 +08:00
黎永顺 19f183795c feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-10-09 09:41:48 +08:00
黎永顺 9aaef674f0 Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop 2023-10-09 08:58:09 +08:00
黎永顺 010c535763 Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into develop 2023-10-09 08:57:45 +08:00
黎永顺 f3e1e1e166 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 2023-10-08 16:14:59 +08:00
黎永顺 b17f2ace8a Merge branch 'feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）' into release/2.9.42310.01 2023-10-08 15:17:25 +08:00
黎永顺 b566213dcd Merge branch 'feature/2.9.42310.01-工资单时效设置' into release/2.9.42310.01 2023-10-08 15:17:15 +08:00
黎永顺 d48fc2991d Merge branch 'feature/2.9.42310.01-工资单发放导出PDF' into release/2.9.42310.01 2023-10-08 15:17:09 +08:00
黎永顺 48d1a674dc feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-10-08 15:12:28 +08:00
黎永顺 8d1c0abf2f feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-10-08 15:09:47 +08:00
黎永顺 da36ed3aa9 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-10-08 10:51:26 +08:00
黎永顺 c4b222e200 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-10-08 10:09:18 +08:00
黎永顺 00adb919a6 Merge branch 'hotfix/2.9.42310.01' into develop 2023-10-08 09:03:06 +08:00
黎永顺 a01f2cc686 Merge branch 'feature/2.9.42310.01-工资单时效设置' into develop 2023-10-08 09:02:43 +08:00
黎永顺 36dc096e2c Merge branch 'feature/2.9.42310.01-工资单发放导出PDF' into develop 2023-10-08 09:02:29 +08:00
黎永顺 345288793b feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-10-08 09:01:21 +08:00
黎永顺 c365d2eb56 feature/2.9.42310.01-工资单时效设置 2023-10-07 16:37:44 +08:00
黎永顺 00d285e5be hotfix/2.9.42310.01 2023-10-07 15:38:33 +08:00
黎永顺 953172f26a feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-28 14:25:21 +08:00
黎永顺 49e5a0ad73 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-27 17:42:55 +08:00
黎永顺 0902c3bb71 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-27 15:42:42 +08:00
黎永顺 486254601f feature/2.9.42310.01-工资单发放导出PDF 2023-09-27 14:35:37 +08:00
黎永顺 22d8ecfcd4 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-27 14:19:48 +08:00
黎永顺 3d8bef9147 feature/2.9.42310.01-工资单发放导出PDF 
20230926
 2023-09-27 09:21:53 +08:00
黎永顺 06f19c74db feature/2.9.42310.01-工资单发放导出PDF 
20230926
 2023-09-27 09:13:02 +08:00
黎永顺 4bb3bc403a feature/2.9.42310.01-工资单发放导出PDF 
20230926
 2023-09-26 16:38:47 +08:00
黎永顺 929a5da68a feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-26 13:26:55 +08:00
黎永顺 b54a561ba4 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-26 11:03:19 +08:00
黎永顺 30f76505fe Merge branch 'hotfix/2.9.42310.01' into release/2.9.42309.01-个税 2023-09-25 16:21:22 +08:00
黎永顺 d9a6f3907c hotfix/2.9.42310.01 
表单字段隐藏的问题
 2023-09-25 16:20:56 +08:00
黎永顺 ff3dd0ea60 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-25 15:35:11 +08:00
黎永顺 1f37bdde4b Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' 2023-09-25 10:58:51 +08:00
黎永顺 2c56e8dc06 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-25 09:43:03 +08:00
黎永顺 9339c42d4d Merge branch 'hotfix/2.9.42309.01-个税' into release/2.9.42309.01-个税 2023-09-22 11:15:40 +08:00
黎永顺 5a151f3910 hotfix/2.9.42309.01-个税 2023-09-22 11:14:48 +08:00
黎永顺 61637e6de7 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-21 18:18:47 +08:00
黎永顺 f7e895aaf0 Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税 2023-09-21 16:16:35 +08:00
黎永顺 12d4b5c33c hotfix/2.9.42309.01 2023-09-21 16:13:18 +08:00
黎永顺 79546aaf63 Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税 2023-09-21 15:48:40 +08:00
黎永顺 e4d9a2c545 hotfix/2.9.42309.01 2023-09-21 15:45:58 +08:00
黎永顺 f8393fbe7d Merge branch 'release/2.9.42309.01' into hotfix/2.9.42309.01 2023-09-21 15:21:10 +08:00
黎永顺 5b43e43f4a hotfix/2.9.42309.01 2023-09-21 15:20:59 +08:00
黎永顺 1bd7d92073 Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税 
# Conflicts:
#	pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
#	pc4mobx/hrmSalary/components/importDialog/index.js
#	pc4mobx/hrmSalary/components/importDialog/index.less
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
 2023-09-21 14:23:21 +08:00
黎永顺 0c1fdd7d13 Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01 2023-09-21 14:16:40 +08:00
黎永顺 93a23cb9a3 Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into release/2.9.42309.01 2023-09-21 14:16:25 +08:00
黎永顺 cfce462898 Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into release/2.9.42309.01 2023-09-21 14:16:06 +08:00
黎永顺 f587aef084 Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into develop 2023-09-21 13:07:07 +08:00
黎永顺 f5638d9453 Merge branch 'hotfix/2.9.42309.01' into develop 2023-09-21 13:06:49 +08:00
黎永顺 9030e22449 hotfix/2.9.42309.01 2023-09-21 12:04:55 +08:00
黎永顺 96032b5f1c feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-21 10:17:06 +08:00
黎永顺 cdc61a94f2 Merge branch 'hotfix/2.9.42309.01' into develop 2023-09-20 17:42:21 +08:00
黎永顺 e7e4d17cfa hotfix/2.9.42309.01 2023-09-20 17:42:06 +08:00
黎永顺 4b9b08b542 Merge branch 'hotfix/2.9.42309.01' into develop 2023-09-20 17:30:07 +08:00
黎永顺 c0220d8853 hotfix/2.9.42309.01 2023-09-20 17:29:50 +08:00
黎永顺 be29592bec Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into develop 2023-09-20 17:26:53 +08:00
黎永顺 e192087764 Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into develop 2023-09-20 17:26:30 +08:00
黎永顺 089bed1f53 Merge branch 'hotfix/2.9.42309.01' into develop 2023-09-20 17:26:19 +08:00
黎永顺 26fdf624bb hotfix/2.9.42309.01 2023-09-20 17:25:56 +08:00
黎永顺 d664ad2769 feature/2.9.42309.01-薪酬统计报表分享报表 
20230920
 2023-09-20 17:03:24 +08:00
黎永顺 b22b41382f hotfix/2.9.42309.01 
20230920-社保福利方案添加搜索条件
 2023-09-20 16:51:00 +08:00
黎永顺 d7c59f5434 feature/2.9.42309.01-薪酬统计报表分享报表 
20230920
 2023-09-20 15:03:05 +08:00
黎永顺 a58da11dc3 hotfix/2.9.42309.01 
20230920
 2023-09-20 14:20:51 +08:00
黎永顺 6ac979e9e7 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-20 09:25:10 +08:00
黎永顺 10c7280b43 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-19 17:24:52 +08:00
黎永顺 9084c20717 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 19:34:16 +08:00
黎永顺 cf38c91be8 Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 18:42:37 +08:00
黎永顺 1ee6650234 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 18:42:27 +08:00
黎永顺 c0c908f6eb Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 17:48:35 +08:00
黎永顺 1c7ad4e871 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 16:59:21 +08:00
黎永顺 98054b3c8d feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 15:05:25 +08:00
黎永顺 9211f9522c Merge branch 'feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取' into release/2.9.42309.01-个税 2023-09-18 13:38:52 +08:00
黎永顺 80d819a21b Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01-个税 2023-09-18 13:37:41 +08:00
黎永顺 e10e39e630 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 13:37:00 +08:00
黎永顺 e2be082a54 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 10:40:30 +08:00
黎永顺 f29d985e64 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-15 16:53:17 +08:00
黎永顺 707ca40f05 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-15 11:14:39 +08:00
黎永顺 d008654bf8 hotfix/2.9.42309.01 2023-09-14 15:50:24 +08:00
黎永顺 b52afbb7c8 Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01 2023-09-14 14:21:45 +08:00
黎永顺 85867da080 hotfix/2.9.42309.01 2023-09-14 14:19:08 +08:00
黎永顺 4769df4cfd feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-14 14:05:40 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 ef16acd638 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-14 11:41:29 +08:00
黎永顺 02be280127 Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01 2023-09-14 10:38:10 +08:00
黎永顺 2b282b4211 hotfix/2.9.42309.01 2023-09-14 10:37:39 +08:00
黎永顺 8a90d58196 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-14 10:25:22 +08:00
黎永顺 3f18e4a0a7 feature/2.9.42309.01-调薪记录添加二次密码认证 2023-09-13 10:44:37 +08:00
黎永顺 5ce2f5bf31 hotfix/2.9.42308.02 2023-09-12 11:14:51 +08:00
黎永顺 a583087f5f Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01 2023-09-11 13:43:28 +08:00
黎永顺 32404ec04e Merge branch 'hotfix/2.9.42308.02' into release/2.9.42309.01 2023-09-11 13:43:04 +08:00
黎永顺 8da781193a hotfix/2.9.42308.02 2023-09-08 13:53:11 +08:00
黎永顺 b68578e82b feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取 2023-09-08 09:38:07 +08:00
黎永顺 adfaf2bf64 Merge branch 'feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取' into release/2.9.42309.01-个税 2023-09-07 15:21:19 +08:00
黎永顺 6043192bfe Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into release/2.9.42309.01 2023-09-07 10:07:19 +08:00
黎永顺 2d148b9fb5 Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02-个税 
# Conflicts:
#	pc4mobx/hrmSalary/util/index.js
 2023-09-06 16:30:21 +08:00
黎永顺 96f65e42b0 feature/2.9.42309.01-社保福利档案添加非系统人员列表 2023-09-06 14:54:45 +08:00
黎永顺 ce462fe51a hotfix/2.9.42308.02 2023-09-06 14:27:23 +08:00
黎永顺 d330b0b40e 个税相关-往期累计情况添加在线获取的功能 2023-09-06 11:26:48 +08:00
黎永顺 f593e97207 feature社保福利档案添加非系统人员列表 2023-09-06 10:19:35 +08:00
黎永顺 bb1e328c92 feature社保福利档案添加非系统人员列表 2023-09-05 16:49:26 +08:00
黎永顺 2a40afb7b4 feature社保福利档案添加非系统人员列表 2023-09-05 15:14:05 +08:00
黎永顺 d446bcb133 个税相关-累计专项附加扣除添加在线获取的功能 2023-09-05 13:30:13 +08:00
黎永顺 bc3632e054 薪资档案发薪员工页面的调薪页面重构 2023-09-04 18:13:19 +08:00
黎永顺 6043159976 薪资档案发薪员工页面的调薪页面重构 2023-09-04 16:48:36 +08:00
黎永顺 858f2699f5 Merge branch 'hotfix/2.9.42308.02-个税' into release/2.9.42308.02-个税 2023-09-04 09:33:34 +08:00
黎永顺 dac0ec3197 Merge branch 'release/2.9.42308.02' into release/2.9.42308.02-个税 
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculateDetail/index.less
 2023-09-04 09:32:57 +08:00
黎永顺 242b96321a 样式优化 2023-09-01 14:06:32 +08:00
黎永顺 5b6480f076 hotfix/2.9.42308.02-工资单模板设置名称保存失败bug修复 2023-09-01 11:08:35 +08:00
黎永顺 cae8d86cd6 规则设置-加解密修改为默认开启 2023-09-01 09:29:49 +08:00
黎永顺 209392a2f8 Merge branch 'hotfix/2.9.42308.02' into develop 2023-08-31 15:03:30 +08:00
黎永顺 a5e0ca3084 薪资项目公式保存参数修改 2023-08-31 15:02:56 +08:00
黎永顺 0a37f80611 Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into develop 2023-08-31 14:44:26 +08:00
黎永顺 036e59b91a feature/2.9.42308.02-薪资项目同步到薪资账套 2023-08-31 14:43:57 +08:00
黎永顺 a058242d35 feature/2.9.42308.02-薪资项目同步到薪资账套 2023-08-31 14:23:51 +08:00
黎永顺 def2159e19 Merge branch 'hotfix/2.9.42308.02' into develop 2023-08-31 11:15:48 +08:00
黎永顺 b6ac297242 hotfix-社保福利档案以及薪资档案的导入下载模板功能优化 2023-08-31 11:15:32 +08:00
黎永顺 f65b7979d7 hotfix-薪资核算详情页面编辑刷新分页的bug 2023-08-31 09:40:09 +08:00
黎永顺 cf06016fa2 智能算薪-其他三个tab下的功能开发 2023-08-30 16:28:33 +08:00
黎永顺 50c880d868 智能算薪-其他三个tab页的功能开发 2023-08-30 10:34:16 +08:00
黎永顺 ecc2021916 2.9.42308.02bug修复 2023-08-29 14:24:43 +08:00
黎永顺 6493e32314 智能算薪-流量相关功能的开发 2023-08-29 14:21:52 +08:00
黎永顺 a2c1b9969c 智能算薪-其他三个tab下的配置开发 2023-08-29 11:34:45 +08:00
黎永顺 62921ad80f 个税-人员信息报送列表操作列修改 2023-08-28 16:22:22 +08:00
黎永顺 85ab345651 个税-release开发 2023-08-28 10:08:28 +08:00
黎永顺 a4eab6fa47 个税-在线申报bug修改 2023-08-25 17:49:43 +08:00
黎永顺 78e08d7c26 系统数字输入框保留小数位数配置 2023-08-25 16:12:05 +08:00
黎永顺 4462753f28 Merge branch 'release/2.8.3.2308.01' into hotfix/2.9.42308.02 2023-08-25 15:39:49 +08:00
黎永顺 bc952ecaad 个税在线申报-申报表导出功能的完成 2023-08-25 14:42:31 +08:00
黎永顺 ea3cfbe0fc 个税在线申报-申报表导出功能的完成 2023-08-24 17:20:41 +08:00
黎永顺 89b28b1d2e 个税在线申报-申报表导出功能的完成 2023-08-24 13:43:01 +08:00
黎永顺 c4d0dbf296 个税在线申报-个税申报表在线申报功能开发 2023-08-23 15:41:38 +08:00
黎永顺 f7c03082f4 个税申报-在线申报接口对接 2023-08-21 18:14:18 +08:00
黎永顺 25ce139a0c 产品-工资单产看页面dom渲染顺序优化 2023-08-21 10:53:19 +08:00
黎永顺 796d11466e 个税对接-在线申报详情页面开发 2023-08-21 10:43:08 +08:00
黎永顺 55994f1980 个税对接-在线申报详情页面开发 2023-08-18 15:27:27 +08:00
黎永顺 de80ce6020 Merge branch 'master' into cutom/个税相关 2023-08-18 10:19:43 +08:00
黎永顺 a22f3ade1f Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02 2023-08-18 10:19:06 +08:00
黎永顺 8871b8ed2c hotfix/2.9.42308.02 2023-08-18 10:18:53 +08:00
黎永顺 94c675007d Merge branch 'release/2.8.3.2308.01' into cutom/个税相关 
# Conflicts:
#	pc4mobx/hrmSalary/apis/ledger.js
 2023-08-18 09:53:52 +08:00
黎永顺 56e71306a7 产品-薪资账套个税申报字段对应 2023-08-18 08:57:20 +08:00
黎永顺 abdc35e134 产品-薪资账套个税申报字段对应 2023-08-17 16:52:53 +08:00
黎永顺 49dce1c871 代码合并 2023-08-17 13:45:21 +08:00
黎永顺 acc4654e76 个税对接-薪资账套个税申报字段对应开发 2023-08-17 11:46:45 +08:00
黎永顺 acadba0946 个税对接-薪资账套个税申报字段对应开发 2023-08-17 10:16:29 +08:00
黎永顺 38e2b1b61b Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01 
# Conflicts:
#	pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
 2023-08-17 08:43:43 +08:00
黎永顺 9633bcabfb Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01 2023-08-17 08:38:06 +08:00
黎永顺 290c3e51d3 Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01 
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
 2023-08-17 08:37:56 +08:00
黎永顺 6d10c01f0c Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01 
# Conflicts:
#	pc4mobx/hrmSalary/stores/payroll.js
 2023-08-17 08:36:27 +08:00
黎永顺 bfc9f1363c 个税对接-薪资账套个税申报字段对应开发 2023-08-17 08:33:21 +08:00
黎永顺 369c78ca80 Merge branch 'feature/2.8.3.230801-对接e10个税扣缴义务人设置' into feature/2.8.3.230801-薪资账套个税申报字段对应 2023-08-16 14:33:52 +08:00
黎永顺 4af19efa31 个税对接-薪资账套个税申报字段对应 2023-08-16 14:03:43 +08:00
黎永顺 2509bfe8f7 Merge branch 'hotfix/2.8.3.2308.01' into feature/2.8.3.230801-薪资账套个税申报字段对应 2023-08-16 11:37:03 +08:00
黎永顺 42a334ad7f 个税对接-报送信息详情页面接口对接 2023-08-16 11:20:06 +08:00
黎永顺 2527f75298 字段管理新增修改 2023-08-16 10:30:37 +08:00
黎永顺 c58472ad8f 个税对接-人员信息报送详情页 2023-08-16 10:21:42 +08:00
黎永顺 892e0f10f9 Merge branch 'feature/2.8.3.2308-人员信息报送' into feature/v2-对接e10个税扣缴义务人设置-1121 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2023-08-14 17:24:49 +08:00
黎永顺 c628b482f9 个税对接-人员信息报送详情页 2023-08-14 17:08:40 +08:00
黎永顺 9cb47f784c 个税对接-人员信息报送详情页 2023-08-14 14:46:19 +08:00
黎永顺 5adfa47b5b bug修改-断点 2023-08-11 17:34:42 +08:00
黎永顺 cfe1ed7773 人员信息报送-查看详情页面开发完成 2023-08-11 17:14:43 +08:00
黎永顺 a2c2292e60 汉桑-社保福利台账添加福利导入的功能 2023-08-11 16:06:21 +08:00
黎永顺 d43b31a5c2 产品-个税对接 2023-08-10 14:07:18 +08:00
黎永顺 bc91806e37 产品-个税对接 2023-08-10 11:11:23 +08:00
黎永顺 d41687c3fb 产品-个税对接 2023-08-10 10:22:16 +08:00
黎永顺 2c8ce14def 产品-对接e10个税扣缴义务人设置 2023-08-09 15:02:27 +08:00
黎永顺 c2eb4400c4 Merge branch 'feature/2.8.3-2308-智能算薪' into feature/v2-对接e10个税扣缴义务人设置-1121 2023-08-09 11:47:37 +08:00
黎永顺 3645c52434 产品-智能算薪 2023-08-09 10:35:49 +08:00
黎永顺 262976cc5e 产品-合并代码 2023-08-04 13:55:20 +08:00
黎永顺 605370e12a Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop 2023-08-04 09:34:26 +08:00
黎永顺 480106d4e7 产品-薪资账套薪资项目项添加编辑的功能 2023-08-04 09:34:04 +08:00
黎永顺 250c7a0719 Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop 2023-08-04 09:29:51 +08:00
黎永顺 208e413560 Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop 2023-08-02 11:58:06 +08:00
黎永顺 d04c053c07 产品-工资单模板添加发放薪资项目名称修改的功能 2023-08-02 11:57:46 +08:00
黎永顺 cbd06fa42a 产品-非系统人员管理导入 2023-08-02 11:17:17 +08:00
黎永顺 a6c6ff6e5e Merge branch 'hotfix/2.8.3.2308.01' into develop 
# Conflicts:
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
 2023-08-02 10:21:40 +08:00
黎永顺 c6fe44d976 Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop 2023-08-01 17:57:57 +08:00
黎永顺 bc12a12097 产品-非系统人员管理导入 2023-08-01 17:44:59 +08:00
黎永顺 cb94dabd30 Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop 
# Conflicts:
#	pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
 2023-08-01 16:10:29 +08:00
黎永顺 5eec7139d6 产品-工资单模板薪资项目名称修改 2023-08-01 16:09:23 +08:00
黎永顺 a433de7671 产品-工资单模板薪资项目名称修改 2023-08-01 16:03:48 +08:00
黎永顺 b03c193927 产品-工资单模板薪资项目名称修改 2023-08-01 15:51:02 +08:00
黎永顺 dbae61623d 产品-工资单模板薪资项目名称修改 2023-08-01 15:48:47 +08:00
黎永顺 4601742b9d Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop 2023-08-01 13:37:54 +08:00