Commit Graph

1929 Commits

Author SHA1 Message Date
黎永顺 6f29f9c56a hotfix/2.14.2.2406.02 2024-06-20 09:15:07 +08:00
黎永顺 c39515d7f9 hotfix/2.14.2.2406.02 2024-06-19 11:43:08 +08:00
黎永顺 823788e531 hotfix/2.14.2.2406.02 2024-06-19 11:24:59 +08:00
黎永顺 40d1504231 feature/2.14.4.2406.02-个税在线算税 2024-06-19 10:55:22 +08:00
黎永顺 10c7903892 hotfix/2.14.2.2406.02 2024-06-18 17:48:08 +08:00
黎永顺 e50be3d3f3 Merge branch 'feature/2.14.4.2406.02-工资单发放预览' into release/2.14.4.2406.02 2024-06-18 15:31:19 +08:00
黎永顺 1c67adbd25 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 15:30:46 +08:00
黎永顺 7221d910ca hotfix/2.14.2.240默认值 2024-06-18 10:44:48 +08:00
黎永顺 2e775eb205 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 09:07:43 +08:00
黎永顺 40fe79c0e5 hotfix/2.14.2.2406.02 2024-06-17 17:24:21 +08:00
黎永顺 4ebb3a422e feature/2.14.4.2406.02-工资单发放预览 2024-06-17 17:20:01 +08:00
黎永顺 808936f540 在线算税 2024-06-17 17:04:06 +08:00
黎永顺 e0b6dc4585 feature/2.14.4.2406.02-工资单发放预览 2024-06-17 16:47:08 +08:00
黎永顺 add6a70abd hotfix/2.14.2.2406.02 2024-06-17 16:17:16 +08:00
黎永顺 d14003a125 feature/2.14.4.2406.02-个税在线算税 2024-06-17 15:48:52 +08:00
黎永顺 f4cbacd591 hotfix/2.14.2.2406.02 2024-06-14 16:33:26 +08:00
黎永顺 e0c2cdf629 custom-艾志工业-合并个税 2024-06-14 15:46:35 +08:00
黎永顺 73e6692d2b custom-艾志工业-合并个税 2024-06-14 14:24:13 +08:00
黎永顺 b3d287af96 Merge branch 'release/2.14.4.2406.02-个税' into custom-艾志工业-合并个税 2024-06-14 10:32:43 +08:00
黎永顺 12a7871ef0 Merge branch 'release/2.14.4.2406.02' into release/2.14.4.2406.02-个税 2024-06-14 10:31:55 +08:00
黎永顺 24f9d7e57f hotfix/2.14.2.2406.02 2024-06-13 09:06:22 +08:00
黎永顺 c80a1c73fe hotfix/2.14.2.2406.02 2024-06-12 18:56:02 +08:00
黎永顺 1ddcab4f38 hotfix/2.14.2.2406.02 2024-06-12 17:38:34 +08:00
黎永顺 76db508066 产品优化 - 社保福利台账小数位数优化 2024-06-11 15:27:22 +08:00
黎永顺 84f6d25b51 Merge branch 'release/2.14.3.2406.01' into release/2.14.3.2406.01-个税 2024-06-11 10:52:50 +08:00
黎永顺 15c81c8156 release/2.14.3.2406.01 2024-06-06 17:25:31 +08:00
黎永顺 1a2bf2bc6e 0release/2.14.3.2406.01 2024-06-05 09:10:04 +08:00
黎永顺 fa0a4859e9 release/2.14.3.2406.01-个税 2024-06-03 11:38:47 +08:00
黎永顺 037ab5b12f release/2.14.3.2406.01-个税 2024-06-03 11:22:18 +08:00
黎永顺 6d89db8dfe Merge branch 'feature/2.14.3.2406.01-薪资核算添加锁定人员数据' into release/2.14.3.2406.01 2024-05-30 17:07:50 +08:00
黎永顺 c9f4f23927 Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-30 17:07:21 +08:00
黎永顺 017a04a0c4 hotfix/2.14.2.2405.02 2024-05-30 14:15:55 +08:00
黎永顺 93acc50d74 custom-艾志工业-合并个税 2024-05-30 10:57:02 +08:00
黎永顺 10099ab098 custom-艾志工业-合并个税 2024-05-29 13:32:43 +08:00
黎永顺 f4fd1ace05 Merge branch 'release/2.14.3.2406.01-个税' into custom-艾志工业-合并个税 2024-05-29 11:12:04 +08:00
黎永顺 1935a552df release/2.14.3.2406.01-个税 2024-05-29 11:07:05 +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
黎永顺 da3726fe59 custom-艾志工业-合并个税
添加个税申报管理员字段
2024-05-29 09:20:58 +08:00
黎永顺 c87e62815c Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01 2024-05-28 16:42:39 +08:00
黎永顺 411ba9744b hotfix/2.14.2.2405.02 2024-05-28 16:42:21 +08:00
黎永顺 3418bfe4aa hotfix/2.14.2.2405.02
公式编辑
2024-05-28 16:25:25 +08:00
黎永顺 0b4b7b28ea Merge branch 'release/2.14.2.2405.02' into release/2.14.2.2405.02-个税 2024-05-28 11:43:11 +08:00
黎永顺 53b6058b7e Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02 2024-05-28 11:42:42 +08:00
黎永顺 bd811da894 hotfix/2.14.2.2405.02
工资单查看报错
2024-05-28 11:42:26 +08:00
黎永顺 b9562831ff Merge branch 'release/2.14.2.2405.02' into release/2.14.2.2405.02-个税 2024-05-27 16:54:36 +08:00
黎永顺 c6cc7c5cea Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02 2024-05-27 16:52:19 +08:00
黎永顺 9577462831 hotfix/2.14.2.2405.02 2024-05-24 09:57:35 +08:00
黎永顺 e0bec67c0b Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02 2024-05-23 15:42:51 +08:00
黎永顺 655dd6afb4 hotfix/2.14.2.2405.02 2024-05-23 15:42:14 +08:00
黎永顺 bf477457d7 Merge branch 'feature/2.12.1.2403.02-社保档案保存修改' into release/2.14.2.2405.02 2024-05-23 11:04:54 +08:00
黎永顺 a4b98f253c Merge branch 'feature/2.12.1.2404.02-薪资核算判断账套是否修改提示' into release/2.14.2.2405.02 2024-05-23 11:04:34 +08:00
黎永顺 b7aeae0aeb hotfix/2.14.2.2405.02 2024-05-23 11:01:06 +08:00
黎永顺 fb64d5e344 hotfix/2.14.2.2405.02 2024-05-21 17:33:47 +08:00
黎永顺 4eabe19035 hotfix/2.14.2.2405.02 2024-05-21 15:58:28 +08:00
黎永顺 fd6fb3bd9d hotfix/2.14.2.2405.02 2024-05-21 15:11:52 +08:00
黎永顺 8636d3a17a Merge branch 'release/2.14.1.2405.01-个税' into custom-艾志工业-合并个税 2024-05-21 13:45:46 +08:00
黎永顺 e74ce42f39 Merge branch 'release/2.14.1.2405.01' into release/2.14.1.2405.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2024-05-20 10:03:04 +08:00
黎永顺 8f8f6c5ed1 feature/2.12.1.2403.02-社保档案保存修改 2024-05-17 10:51:56 +08:00
黎永顺 888df02e07 hotfix/2.12.1.2405.01 2024-05-16 10:03:05 +08:00
黎永顺 26391a35fa Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税
# Conflicts:
#	pc4mobx/hrmSalary/stores/index.js
2024-05-14 14:47:34 +08:00
黎永顺 a04be74c9c hotfix/2.12.1.2404.02 2024-05-13 17:06:41 +08:00
黎永顺 8f582ad3dd hotfix/2.12.1.2404.02 2024-05-11 15:06:47 +08:00
黎永顺 78142d32fe hotfix/2.12.1.2404.02 2024-05-11 11:33:09 +08:00
黎永顺 166dfa6979 hotfix/2.12.1.2404.02 2024-05-11 11:09:13 +08:00
黎永顺 342dacae9c hotfix/2.12.1.2404.02 2024-05-11 10:41:55 +08:00
黎永顺 aaf733fdd2 hotfix/2.12.1.2404.02
薪酬统计报表合计行展示列表优化
2024-05-10 16:33:02 +08:00
黎永顺 e88b5f8974 Merge branch 'release/2.12.1.2404.02-个税' into custom-艾志工业-合并个税 2024-05-08 14:10:19 +08:00
黎永顺 781bf21dd7 Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税 2024-05-08 14:06:43 +08:00
黎永顺 7cf0cc3357 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:13:12 +08:00
黎永顺 eeea664a8a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 14:09:08 +08:00
黎永顺 3b90b1def4 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-07 10:48:52 +08:00
黎永顺 020af95921 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-05-06 16:58:42 +08:00
黎永顺 70d7449602 hotfix/2.12.1.2404.02 2024-05-06 10:21:55 +08:00
黎永顺 d8bad17514 hotfix/2.12.1.2404.02 2024-05-06 09:48:04 +08:00
黎永顺 29b5f9eb50 hotfix/2.12.1.2404.02 2024-04-29 17:55:37 +08:00
黎永顺 718d1929bb hotfix/2.12.1.2404.02 2024-04-29 11:27:49 +08:00
黎永顺 64bfb45618 hotfix/2.12.1.2404.02
薪酬统计报表修改表格
2024-04-28 13:48:20 +08:00
黎永顺 c43e69af5d hotfix/2.12.1.2404.02
薪酬统计报表数据透视 表格变形问题处理
2024-04-28 09:07:40 +08:00
黎永顺 ae427c033a feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 17:37:22 +08:00
黎永顺 2fb3c89947 feature/2.12.1.2404.02-薪资核算判断账套是否修改提示 2024-04-26 16:53:51 +08:00
黎永顺 f1670a0380 hotfix/2.12.1.2404.02
档案tab总数显示的优化
2024-04-26 14:57:06 +08:00
黎永顺 8751c14002 hotfix/2.12.1.2404.02 2024-04-25 16:39:58 +08:00
黎永顺 825549595a hotfix/2.12.1.2404.02 2024-04-25 16:23:31 +08:00
黎永顺 7dee340ab8 hotfix/2.12.1.2404.02 2024-04-24 15:20:13 +08:00
黎永顺 0241c017b8 hotfix/2.12.1.2404.02
更多按钮
2024-04-24 10:42:04 +08:00
黎永顺 09b6fac1f9 custom-艾志工业-合并个税 2024-04-23 14:23:06 +08:00
黎永顺 6c72f335cc Merge branch 'feature/2.12.1.2403.02-个税-外籍人员信息报送' into release/2.12.1.2404.02-个税 2024-04-23 11:17:49 +08:00
黎永顺 ac2da44450 Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税 2024-04-19 16:19:12 +08:00
黎永顺 11618b6aff hotfix/2.12.1.2403.02 2024-04-17 14:44:30 +08:00
黎永顺 3869d2bb98 custom-艾志工业-合并个税-外籍人员备份 2024-04-17 11:17:51 +08:00
黎永顺 de0b7c0057 Merge branch 'release/2.12.1.2404.02-个税' into custom-艾志工业-合并个税-外籍人员备份 2024-04-16 19:12:23 +08:00
黎永顺 91c22f4df9 feature/2.12.1.2404.02-个税-测试人员报送页面添加列表作废功能 2024-04-16 19:10:56 +08:00
黎永顺 7d2bc1c1be Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税 2024-04-16 18:14:04 +08:00
黎永顺 6d56f162b1 hotfix/2.12.1.2403.02 2024-04-16 17:10:31 +08:00
黎永顺 709ec6abd7 hotfix/2.12.1.2403.02
规则设置-加密解密修改
2024-04-15 16:07:41 +08:00
黎永顺 28726a0e24 Merge branch 'feature/2.12.1.2403.02-个税-外籍人员信息报送' into custom-艾志工业-合并个税-外籍人员备份
# Conflicts:
#	pc4mobx/hrmSalary/pages/declareDetail/index.js
2024-04-12 18:00:05 +08:00
黎永顺 b38d056c8e Merge branch 'release/2.12.1.2403.02-个税' into custom-艾志工业-合并个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js
2024-04-12 17:47:26 +08:00
黎永顺 99dea55a93 Merge branch 'release/2.12.1.2403.02-个税' into feature/2.12.1.2403.02-个税-外籍人员信息报送
# Conflicts:
#	pc4mobx/hrmSalary/pages/enterprisePayCertificationDetail/index.js
2024-04-12 17:38:33 +08:00
黎永顺 35ea7c7fe3 Merge branch 'release/2.12.1.2403.02' into release/2.12.1.2403.02-个税 2024-04-12 17:36:54 +08:00