 黎永顺
|
c6e71bd069
|
hotfix/2.9.10.2312.02
|
2024-01-11 14:50:28 +08:00 |
|
黎永顺
|
36f763a133
|
hotfix/2.9.10.2312.02
|
2024-01-11 14:23:14 +08:00 |
|
黎永顺
|
15bc21ecd5
|
release/2.9.10.2312.02
|
2024-01-10 14:43:07 +08:00 |
|
黎永顺
|
b7a3fcccfd
|
1release/2.9.10.2312.02
|
2024-01-09 17:44:36 +08:00 |
|
黎永顺
|
252d4e0ff7
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-09 17:42:40 +08:00 |
|
黎永顺
|
c01c03f1b0
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-08 16:05:00 +08:00 |
|
黎永顺
|
da7194d6b1
|
Merge branch 'feature/2.9.10.2312.02-社保档案个人和公司基数设置' into release/2.9.10.2312.02
|
2024-01-08 13:45:11 +08:00 |
|
黎永顺
|
3155c2eb89
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into release/2.9.10.2312.02
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
|
2024-01-08 13:44:57 +08:00 |
|
黎永顺
|
cd9d67b358
|
Merge branch 'hotfix/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-08 13:43:00 +08:00 |
|
黎永顺
|
5e5acc012c
|
hotfix/2.9.10.2312.02
薪资项目添加显示宽度项
|
2024-01-04 18:36:20 +08:00 |
|
黎永顺
|
8968690efd
|
custom-艾志工业-合并个税
|
2024-01-03 15:26:36 +08:00 |
|
黎永顺
|
e0e93f7959
|
Merge branch 'release/2.9.9.2312.02-个税' into custom-艾志工业-合并个税
|
2024-01-03 14:55:00 +08:00 |
|
黎永顺
|
5a114d14c0
|
hotfix/2.9.9.2312.02-个税
|
2024-01-03 10:34:36 +08:00 |
|
黎永顺
|
43a17eb188
|
hotfix/2.9.9.2312.02-个税
|
2024-01-02 16:47:42 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
e4a7487c58
|
Merge branch 'release/2.9.9.2312.02-个税' into custom-艾志工业-合并个税
|
2024-01-02 10:42:51 +08:00 |
|
黎永顺
|
025037d4ef
|
hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
|
2024-01-02 10:42:10 +08:00 |
|
黎永顺
|
851a121bc2
|
Merge branch 'release/2.9.9.2312.02-个税' into custom-艾志工业-合并个税
|
2024-01-02 10:34:23 +08:00 |
|
黎永顺
|
9eec50099d
|
hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
|
2024-01-02 10:33:31 +08:00 |
|
黎永顺
|
ba0dc6420c
|
Merge branch 'release/2.9.9.2312.02-个税' into custom-艾志工业-合并个税
|
2023-12-29 17:50:16 +08:00 |
|
黎永顺
|
28d8ebe64d
|
hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
|
2023-12-29 17:45:59 +08:00 |
|
黎永顺
|
68e9fd5ad1
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 13:53:51 +08:00 |
|
黎永顺
|
69091b34ec
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-29 13:53:26 +08:00 |
|
黎永顺
|
3a83207915
|
Merge branch 'feature/2.9.9.2312.01-薪资核算查看权限' into release/2.9.10.2312.02
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
|
2023-12-29 10:14:39 +08:00 |
|
黎永顺
|
93ceea808d
|
Merge branch 'feature/2.9.9.2312.01-薪资核算列表在线编辑' into release/2.9.10.2312.02
|
2023-12-29 10:09:04 +08:00 |
|
黎永顺
|
6a7220ffc2
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 10:08:36 +08:00 |
|
黎永顺
|
1a8c6d5924
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-29 10:04:54 +08:00 |
|
黎永顺
|
7ed277e3b0
|
Merge branch 'release/2.9.9.2312.02-个税' into custom-艾志工业-合并个税
|
2023-12-28 21:03:02 +08:00 |
|
黎永顺
|
8adcd121c6
|
hotfix/2.9.9.2312.02-个税
|
2023-12-28 20:59:05 +08:00 |
|
黎永顺
|
8c5de14999
|
custom-艾志工业-合并个税
薪资档案添加始末日期字段
|
2023-12-28 18:47:50 +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 |
|
黎永顺
|
a59bc06d7a
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 13:25:47 +08:00 |
|
黎永顺
|
7db9e03b0d
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 10:18:58 +08:00 |
|
黎永顺
|
8bcf268ed0
|
hotfix/2.9.10.2312.02
|
2023-12-19 16:18:44 +08:00 |
|
黎永顺
|
8bae3e3ad2
|
Merge branch 'release/2.9.9.2312.02-个税' into custom-艾志工业-合并个税
|
2023-12-18 14:57:06 +08:00 |
|
黎永顺
|
1a57f4e392
|
release/2.9.9.2312.02-个税
|
2023-12-18 14:56:18 +08:00 |
|
黎永顺
|
446aaf2cad
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-15 13:37:21 +08:00 |
|
黎永顺
|
cf47cdeb56
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-14 14:14:32 +08:00 |
|
黎永顺
|
8c06171190
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-14 09:54:27 +08:00 |
|
黎永顺
|
670bbbbb75
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 17:21:16 +08:00 |
|
黎永顺
|
61f2b76440
|
feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 11:12:18 +08:00 |
|
黎永顺
|
1eba04d9c8
|
Merge branch 'feature/2.9.42310.02-社保福利档案页面重构' into feature/2.9.10.2312.02-社保档案个人和公司基数设置
|
2023-12-13 10:21:14 +08:00 |
|
黎永顺
|
ffcb81650b
|
hotfix/2.9.10.2312.02
工资单模板bug修复
|
2023-12-13 10:19:37 +08:00 |