 黎永顺
|
de094ef03e
|
feature/2.10.1.2401.01-个税在线对比
|
2024-01-23 11:22:20 +08:00 |
|
黎永顺
|
bc92546f28
|
feature/2.10.1.2401.01-个税在线对比
|
2024-01-22 17:29:23 +08:00 |
|
黎永顺
|
a33b47373d
|
Merge branch 'release/2.9.10.2312.02' into release/2.9.9.2312.02-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calculate.js
# pc4mobx/hrmSalary/pages/declare/declare.js
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/payrollRelease/index.js
|
2024-01-17 14:31:34 +08:00 |
|
黎永顺
|
73716cee7d
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2024-01-17 11:12:09 +08:00 |
|
黎永顺
|
e4e9083fe9
|
1release/2.9.10.2312.02
|
2024-01-17 11:11:41 +08:00 |
 钱涛
|
f312e66017
|
工资单标题字体大小改为25px
|
2024-01-17 10:00:19 +08:00 |
|
黎永顺
|
1a38752cc6
|
1release/2.9.10.2312.02
|
2024-01-17 09:44:50 +08:00 |
|
黎永顺
|
93a0c76753
|
1release/2.9.10.2312.02
|
2024-01-16 16:23:29 +08:00 |
|
黎永顺
|
5a90471e74
|
1release/2.9.10.2312.02
|
2024-01-16 09:32:12 +08:00 |
|
黎永顺
|
9614583c3d
|
Merge branch 'feature/2.9.10.2312.02-薪资档案页面重构' into release/2.9.10.2312.02
|
2024-01-16 09:29:03 +08:00 |
|
黎永顺
|
38b7806b49
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-16 09:28:37 +08:00 |
|
黎永顺
|
4ef8cc66f8
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 19:24:49 +08:00 |
|
黎永顺
|
f4ac281c11
|
Merge branch 'feature/2.9.10.2312.02-薪资档案页面重构' into release/2.9.10.2312.02
|
2024-01-15 18:20:11 +08:00 |
|
黎永顺
|
30c73ccf88
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 18:18:26 +08:00 |
|
黎永顺
|
5895cf793c
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 10:15:41 +08:00 |
|
黎永顺
|
b5cfdb8b69
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 09:35:31 +08:00 |
|
黎永顺
|
43ff36d59f
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 09:34:49 +08:00 |
Harryxzy
|
12531b4ab3
|
240112temp2
|
2024-01-12 14:49:57 +08:00 |
|
Harryxzy
|
2ae026a657
|
240112temp
|
2024-01-12 14:49:24 +08:00 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
025037d4ef
|
hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
|
2024-01-02 10:42:10 +08:00 |
|
黎永顺
|
9eec50099d
|
hotfix/2.9.9.2312.02-个税
申报表-动态增删tab
|
2024-01-02 10:33:31 +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 |
|
黎永顺
|
8adcd121c6
|
hotfix/2.9.9.2312.02-个税
|
2023-12-28 20:59:05 +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 |