Commit Graph

1150 Commits

Author SHA1 Message Date
黎永顺 80d819a21b Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01-个税 2023-09-18 13:37:41 +08:00
黎永顺 85867da080 hotfix/2.9.42309.01 2023-09-14 14:19:08 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 2b282b4211 hotfix/2.9.42309.01 2023-09-14 10:37:39 +08:00
黎永顺 5ce2f5bf31 hotfix/2.9.42308.02 2023-09-12 11:14:51 +08:00
黎永顺 8da781193a hotfix/2.9.42308.02 2023-09-08 13:53:11 +08:00
黎永顺 adfaf2bf64 Merge branch 'feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取' into release/2.9.42309.01-个税 2023-09-07 15:21: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
黎永顺 ce462fe51a hotfix/2.9.42308.02 2023-09-06 14:27:23 +08:00
黎永顺 d330b0b40e 个税相关-往期累计情况添加在线获取的功能 2023-09-06 11:26:48 +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
黎永顺 a5ba6d91b9 Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02 2023-08-31 15:04:47 +08:00
黎永顺 a5e0ca3084 薪资项目公式保存参数修改 2023-08-31 15:02:56 +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
黎永顺 1bb59a263c Merge branch 'release/2.9.42308.02' into cutom/个税相关 2023-08-18 10:08:52 +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
黎永顺 67c09305aa Merge branch 'release/2.8.3.2308.01' 2023-08-18 09:27:03 +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