 黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
b4fe6f5242
|
custom/西安秦华天燃气-社保-档案-核算-账套权限的调整
|
2024-04-12 17:23:42 +08:00 |
|
黎永顺
|
eb4517af0f
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-11 17:43:06 +08:00 |
|
黎永顺
|
f8e78a97ac
|
hotfix/2.12.1.2403.02
工资单发放页面去掉导出PDF的功能
|
2024-04-11 15:15:26 +08:00 |
|
黎永顺
|
4984d04d43
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-11 09:48:37 +08:00 |
|
黎永顺
|
10af6ff5ae
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-10 16:06:45 +08:00 |
|
黎永顺
|
803f3305eb
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-10 14:30:30 +08:00 |
|
黎永顺
|
e30032abb1
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-09 10:59:29 +08:00 |
|
黎永顺
|
ba0c516263
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-09 10:00:27 +08:00 |
|
黎永顺
|
1a06b46faf
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-08 18:17:03 +08:00 |
|
黎永顺
|
4e5443005b
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-08 14:38:39 +08:00 |
|
黎永顺
|
9befc1d863
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-07 14:10:20 +08:00 |
|
黎永顺
|
bd3aa05c29
|
hotfix/2.12.1.2403.02
|
2024-04-07 13:59:51 +08:00 |
|
黎永顺
|
d4d873a59d
|
Merge branch 'feature/2.12.1.2403.02-个税申报表页面分类改造' into feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-04-07 13:49:55 +08:00 |