 lys
|
0e76201acc
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-04-21 14:29:04 +08:00 |
|
lys
|
7677d20185
|
feature/2.19.1.2501.01-PC端Token验证
|
2025-04-15 17:33:12 +08:00 |
|
lys
|
fe4985fa9b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-27 15:33:10 +08:00 |
|
lys
|
ae35d29e36
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 15:30:43 +08:00 |
|
lys
|
20da3fd4eb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 15:30:16 +08:00 |
|
lys
|
bb3ded5692
|
release/2.19.1.2501.01
|
2025-03-27 15:28:53 +08:00 |
|
lys
|
904964ada8
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
# Conflicts:
# pc4mobx/hrmSalary/apis/taxAgent.js
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
# pc4mobx/hrmSalary/pages/salary/components/comHint.js
# pc4mobx/hrmSalary/pages/salary/components/constants.js
# pc4mobx/hrmSalary/pages/salary/components/index.less
# pc4mobx/hrmSalary/pages/salary/components/personalScope.js
# pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
# pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
# pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
# pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
# pc4mobx/hrmSalary/pages/salary/taxAgent.js
# pc4mobx/hrmSalary/util/index.js
|
2025-03-26 16:16:22 +08:00 |
|
lys
|
f211fadcb8
|
release/3.0.0.2502.01-合并业务线
|
2025-02-27 16:53:46 +08:00 |
|
lys
|
b6a0678f1a
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 17:30:21 +08:00 |
|
lys
|
d65245b330
|
release/2.18.2.2412.02-个税
|
2024-12-30 17:46:50 +08:00 |
|
lys
|
4383e14491
|
Merge branch 'release/2.16.1.2410.01' into release/2.16.1.2410.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
|
2024-11-12 18:01:30 +08:00 |
|
lys
|
df4971fd27
|
release/2.16.1.2410.01
|
2024-11-01 18:28:12 +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 |
|
黎永顺
|
94c675007d
|
Merge branch 'release/2.8.3.2308.01' into cutom/个税相关
# Conflicts:
# pc4mobx/hrmSalary/apis/ledger.js
|
2023-08-18 09:53:52 +08:00 |
|
黎永顺
|
acc4654e76
|
个税对接-薪资账套个税申报字段对应开发
|
2023-08-17 11:46:45 +08:00 |
|
黎永顺
|
bfc9f1363c
|
个税对接-薪资账套个税申报字段对应开发
|
2023-08-17 08:33:21 +08:00 |
|
黎永顺
|
d1b2f98387
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-19 15:02:44 +08:00 |
|
黎永顺
|
f166ae83fa
|
薪资账套-薪资项目移动到功能
|
2023-03-08 17:12:17 +08:00 |
|
黎永顺
|
a74d887d6a
|
样式调整
|
2023-02-01 11:21:00 +08:00 |
|
黎永顺
|
bbb91b438a
|
薪资账套页面重构
|
2022-12-14 15:37:55 +08:00 |
|
黎永顺
|
a193ed6690
|
薪资账套页面重构
|
2022-12-13 16:10:48 +08:00 |
|
黎永顺
|
9e3739d816
|
薪资账套页面重构
|
2022-12-12 16:35:19 +08:00 |
|
黎永顺
|
6d9787d924
|
薪资账套页面重构
|
2022-12-12 16:10:11 +08:00 |
|
黎永顺
|
ac8c1ee43a
|
薪资账套页面重构
|
2022-12-09 15:26:21 +08:00 |
|
黎永顺
|
c6d6693198
|
薪资账套页面重构
|
2022-12-09 14:16:11 +08:00 |
|
黎永顺
|
7baf97e20f
|
薪资账套重构
|
2022-12-08 15:48:46 +08:00 |