 黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
e0d4137151
|
feature/2.12.1.2403.02-个税申报表页面分类改造
|
2024-04-03 14:18:15 +08:00 |
|
黎永顺
|
f837ac1101
|
bug修复
|
2024-04-03 10:53:02 +08:00 |
|
黎永顺
|
342aeed953
|
多语言bug
|
2024-04-02 17:45:59 +08:00 |
|
黎永顺
|
9480bc7adf
|
feature/2.12.1.2403.02-个税申报表页面分类改造
|
2024-04-02 10:21:26 +08:00 |
|
黎永顺
|
31fb82eb31
|
feature/2.12.1.2403.02-个税申报表页面分类改造
|
2024-04-01 17:47:08 +08:00 |
|
黎永顺
|
75bb200e9d
|
release/2.12.1.2403.02
薪资明细以及薪资核算模板管理设置合并
|
2024-04-01 14:00:50 +08:00 |
|
黎永顺
|
223142e384
|
Merge branch 'feature/2.12.1.2403.02-薪资核算自定义导出模板设置' into release/2.12.1.2403.02
|
2024-04-01 13:59:18 +08:00 |
|
黎永顺
|
ab6ae51b3d
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
涉税事由改成多选
|
2024-03-29 16:53:52 +08:00 |
|
黎永顺
|
8dac6eab6b
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 16:52:28 +08:00 |
|
黎永顺
|
3ab97c5a70
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 16:15:11 +08:00 |
|
黎永顺
|
10a0a4d3c3
|
Merge branch 'release/2.12.1.2403.02' into release/2.12.1.2403.02-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/index.js
# pc4mobx/hrmSalary/index.js
|
2024-03-29 14:42:33 +08:00 |
|
黎永顺
|
8a7f3fcb7a
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-29 14:37:49 +08:00 |
|
黎永顺
|
1fad3eabdf
|
release/2.12.1.2403.02
暂时去掉薪酬统计报表中的薪资明细tab
|
2024-03-29 10:48:31 +08:00 |
|
黎永顺
|
e5f1ede772
|
hotfix/2.12.1.2403.02
工资单模板bug修复
|
2024-03-29 10:36:39 +08:00 |
|
黎永顺
|
a768470afb
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-29 10:19:33 +08:00 |
|
黎永顺
|
668a8aed54
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-28 17:25:39 +08:00 |
|
黎永顺
|
9471a5a737
|
feature/2.12.1.2403.02-薪资核算自定义导出模板设置
|
2024-03-28 16:49:44 +08:00 |
|
黎永顺
|
15439581f4
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 14:07:25 +08:00 |
|
黎永顺
|
618c0edfb2
|
Merge branch 'release/2.12.1.2403.02' into hotfix/2.12.1.2403.02
|
2024-03-27 13:49:29 +08:00 |
|
黎永顺
|
e5078dc37b
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 10:11:30 +08:00 |
|
黎永顺
|
7fcc3594e5
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:08:06 +08:00 |
|
黎永顺
|
8d58561b88
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-26 17:07:21 +08:00 |
|
黎永顺
|
85c222def8
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
|
2024-03-26 09:14:32 +08:00 |
|
黎永顺
|
c51c93c812
|
hotfix/2.12.1.2403.02
调薪列表样式修改
|
2024-03-25 17:23:42 +08:00 |
|
黎永顺
|
b1cba712d8
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-21 13:49:51 +08:00 |
|
黎永顺
|
a7e75331e1
|
hotfix/2.12.1.2403.02
1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部
2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选
|
2024-03-21 13:49:18 +08:00 |
|
黎永顺
|
1deceeb3e8
|
feature/2.12.1.2403.02-社保档案保存修改
|
2024-03-20 16:36:56 +08:00 |
|
黎永顺
|
59a2dbb300
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-20 15:30:07 +08:00 |
|
黎永顺
|
a27beae87e
|
feature/2.12.1.2403.02-个税-外籍人员信息报送
|
2024-03-20 10:37:26 +08:00 |
|
黎永顺
|
272e45d3e5
|
hotfix/2.12.1.2403.02
薪资档案调薪，薪资小数位配置
|
2024-03-20 09:10:06 +08:00 |
|
黎永顺
|
8af1f0a79a
|
hotfix/2.12.1.2403.02
完成导入报错的问题处理
|
2024-03-19 17:55:37 +08:00 |
|
黎永顺
|
d9f3fafd51
|
hotfix/2.12.1.2403.02
数据透视导出功能
|
2024-03-19 14:29:00 +08:00 |
|
黎永顺
|
90bfeedba3
|
Merge branch 'hotfix/2.12.1.2403.02' into release/2.12.1.2403.02
|
2024-03-18 16:03:31 +08:00 |
|
黎永顺
|
80acc5f18a
|
hotfix/2.12.1.2403.02
|
2024-03-18 16:03:04 +08:00 |
|
黎永顺
|
1ce5e57d73
|
03release/2.12.1.2403.02-个税
|
2024-03-18 10:01:42 +08:00 |
|
黎永顺
|
21ef40db3e
|
Merge branch 'release/3.0.0.2403.01' into release/3.0.0.2403.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
|
2024-03-15 15:13:18 +08:00 |
|
黎永顺
|
77cdcf2356
|
Merge branch 'hotfix/3.00.0.2403.01' into release/3.0.0.2403.01
|
2024-03-15 15:09:54 +08:00 |
|
黎永顺
|
689c837749
|
hotfix/3.00.0.2403.01
考情管理修改
|
2024-03-15 15:09:16 +08:00 |