Commit Graph

1401 Commits

Author SHA1 Message Date
黎永顺 611a0834ac hotfix/2.9.9.2312.02-个税 2024-01-02 15:56:29 +08:00
黎永顺 ce63d26457 hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
2024-01-02 11:12:39 +08:00
黎永顺 025037d4ef hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
2024-01-02 10:42:10 +08:00
黎永顺 9eec50099d hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
2024-01-02 10:33:31 +08:00
黎永顺 28d8ebe64d hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
2023-12-29 17:45:59 +08:00
黎永顺 8adcd121c6 hotfix/2.9.9.2312.02-个税 2023-12-28 20:59:05 +08:00
黎永顺 83c0aa08da hotfix/2.9.9.2312.02-个税 2023-12-28 18:08:26 +08:00
黎永顺 3ed9a12881 hotfix/2.9.9.2312.02-个税 2023-12-28 10:58:56 +08:00
黎永顺 1be637e168 hotfix/2.9.9.2312.02-个税
个税申报表添加新增编辑功能
2023-12-28 09:46:25 +08:00
黎永顺 707b27038c Merge branch 'release/2.9.10.2312.02' into release/2.9.9.2312.02-个税
# Conflicts:
#	pc4mobx/hrmSalary/apis/cumSituation.js
#	pc4mobx/hrmSalary/apis/declare.js
2023-12-26 14:24:05 +08:00
黎永顺 d5fa8d7e84 hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
2023-12-25 14:54:55 +08:00
黎永顺 854949ab62 hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
2023-12-25 14:37:14 +08:00
黎永顺 238d97798a hotfix/2.9.10.2312.02
薪酬统计报表统计范围放开个税扣缴义务人设置项
2023-12-22 14:42:27 +08:00
黎永顺 8bcf268ed0 hotfix/2.9.10.2312.02 2023-12-19 16:18:44 +08:00
黎永顺 1a57f4e392 release/2.9.9.2312.02-个税 2023-12-18 14:56:18 +08:00
黎永顺 ffcb81650b hotfix/2.9.10.2312.02
工资单模板bug修复
2023-12-13 10:19:37 +08:00
黎永顺 8772a7eac7 Merge branch 'release/2.9.9.2312.01' 2023-12-12 17:19:23 +08:00
黎永顺 be8aceedaa Merge branch 'release/2.9.9.2312.01' 2023-12-12 17:18:30 +08:00
黎永顺 41baa15ef2 hotfix/2.9.9.2312.01 2023-12-12 16:40:58 +08:00
黎永顺 4acefa765c hotfix/2.9.9.2312.01
导入组件优化
2023-12-12 15:19:59 +08:00
黎永顺 a0771be0b9 Merge branch 'release/2.9.9.2312.01' 2023-12-12 10:55:27 +08:00
黎永顺 2e38e5a5c6 hotfix/2.9.9.2312.01
薪资核算导入下载模板
2023-12-12 10:25:02 +08:00
黎永顺 8cd49ed05b Merge branch 'hotfix/2.9.9.2312.01-个税' into release/2.9.9.2312.01-个税 2023-12-08 19:32:34 +08:00
黎永顺 c50f9c0056 hotfix/2.9.9.2312.01-个税 2023-12-08 19:32:06 +08:00
黎永顺 3be7f6cd50 hotfix/2.9.9.2312.01-个税 2023-12-08 19:09:52 +08:00
黎永顺 676d8d2850 Merge branch 'release/2.9.9.2312.01' 2023-12-07 16:35:19 +08:00
黎永顺 9f63f4e3a8 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-07 16:03:04 +08:00
黎永顺 4fc6d1fabd hotfix/2.9.9.2312.01-个税
个税扣缴义务人部门备案
2023-12-07 15:43:37 +08:00
黎永顺 e4573bb95e hotfix/2.9.9.2312.01 2023-12-07 13:55:52 +08:00
黎永顺 f4adb94893 release/2.9.9.2312.01-个税 2023-12-06 18:51:17 +08:00
黎永顺 2b4b5623bc hotfix/2.9.9.2312.01
查看薪資核算页面添加权限,移动端薪资查看修改
2023-12-06 18:28:02 +08:00
黎永顺 49ade22f26 release/2.9.9.2312.01-个税
人员信息报送导出的功能开发
2023-12-06 17:06:44 +08:00
黎永顺 a8ce369ce6 Merge branch 'hotfix/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-06 16:22:19 +08:00
黎永顺 3dca9da904 hotfix/2.9.9.2312.01 2023-12-06 16:19:05 +08:00
黎永顺 beddc62901 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-06 14:50:24 +08:00
黎永顺 f1b0fc588a 1release/2.9.9.2312.01 2023-12-06 14:49:34 +08:00
黎永顺 bc78a26578 Merge branch 'feature/2.9.42311.02-我的薪资福利移动端列表查看' into release/2.9.9.2312.01
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2023-12-06 14:48:35 +08:00
黎永顺 3638249033 release/2.9.9.2312.01-个税 2023-12-05 17:22:41 +08:00
黎永顺 ce1acae344 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-05 17:16:37 +08:00
黎永顺 143e9503e1 Merge branch 'feature/2.9.9.2312.01-社保核算以及薪资账套查询优化' into release/2.9.9.2312.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
2023-12-05 11:34:00 +08:00
黎永顺 07c6ca839f hotfix/2.9.9.2312.01 2023-12-01 17:56:16 +08:00
黎永顺 04ab495c25 hotfix/2.9.9.2312.01 2023-12-01 17:22:34 +08:00
黎永顺 78aaac8115 工资单修改 2023-12-01 16:39:31 +08:00
黎永顺 66392e6e10 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-12-01 09:25:33 +08:00
黎永顺 49eab11325 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-30 15:41:55 +08:00
黎永顺 36eb6eae6a feature/2.9.9.2312.01-接口复写合并 2023-11-30 14:04:57 +08:00
黎永顺 39650fa172 Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并
# Conflicts:
#	pc4mobx/hrmSalary/apis/archive.js
2023-11-30 13:55:38 +08:00
黎永顺 7fd754ad0f release/2.9.9.2312.01-个税 2023-11-30 13:48:33 +08:00
黎永顺 2196dde486 Merge branch 'master' into hotfix/2.9.9.2312.01 2023-11-30 09:22:40 +08:00
黎永顺 4f23b8db3c hotfix/2.9.9.2312.01 2023-11-30 09:22:35 +08:00