Commit Graph

35 Commits

Author SHA1 Message Date
鱼不吐泡泡 a65e31f386 * 1、薪资核算新增环比上月数据
2、核算归档后依旧可查看上月环比数据界面
3、个税申报表批量多选申报【现阶段仅能选择一个个税扣缴义务人来生成申报表】
4、个税申报表增加一个 批量撤回按钮 【跳出一个界面选择 与申报界面一致,可批量选择个税扣缴义务人与薪资所属月来进行批量撤回】
5、薪资核算界面内增加搜索个税扣缴义务人。以及搜索归档与未归档的核算。(按状态筛选)
6、薪资核算时,二级部门需与员工的一级部门进行对应【现阶段员工二级部门由导入与sql自动带出两个方式,若为员工手动导入,则需审核】图2为对应表
2026-02-11 11:59:18 +08:00
lys efb5af1b10 release/2.19.1.2501.01 2025-10-10 11:05:18 +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 02ff34c202 release/2.16.1.2410.01 2024-10-23 09:51:02 +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
黎永顺 4810a09f29 hotfix/2.15.1.2407.01 2024-08-28 14:57:34 +08:00
黎永顺 15c81c8156 release/2.14.3.2406.01 2024-06-06 17:25:31 +08:00
黎永顺 6bfde3d28f feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:41 +08:00
黎永顺 c0079fe4b4 feature/2.14.3.2406.01-薪资核算添加锁定人员数据 2024-05-29 10:32:17 +08:00
黎永顺 3155c2eb89 Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into release/2.9.10.2312.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
2024-01-08 13:44:57 +08:00
黎永顺 3a83207915 Merge branch 'feature/2.9.9.2312.01-薪资核算查看权限' into release/2.9.10.2312.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
2023-12-29 10:14:39 +08:00
黎永顺 717a88667c feature/2.9.9.2312.01-薪资核算列表在线编辑 2023-12-12 10:41:33 +08:00
黎永顺 253ba3cc8c 薪资核算批量编辑 2023-12-11 13:32:17 +08:00
黎永顺 254d19c44e 薪资核算批量编辑 2023-12-11 13:31:46 +08:00
黎永顺 5617392a7c feature/2.9.9.2312.01-薪资核算查看权限 2023-12-08 09:19:43 +08:00
黎永顺 8a8804f0c1 1release/2.9.9.2312.01 2023-12-06 15:55:44 +08:00
黎永顺 6e56b436d6 feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项 2023-12-06 14:46:36 +08:00
黎永顺 72d02ad754 feature/2.9.9.2312.01-薪资核算列表在线编辑 2023-12-05 17:15:55 +08:00
黎永顺 cd9964a329 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-31 09:44:59 +08:00
黎永顺 4acdff060c hotfix/2.9.42310.02 2023-10-30 08:55:15 +08:00
黎永顺 eed8d3a5bd feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 16:14:59 +08:00
黎永顺 235e7cc6f0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 10:43:23 +08:00
黎永顺 48d1a674dc feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-10-08 15:12:28 +08:00
黎永顺 c4b222e200 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-10-08 10:09:18 +08:00
黎永顺 b54a561ba4 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-26 11:03:19 +08:00
黎永顺 1ee6650234 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 18:42:27 +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
黎永顺 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