 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
|
55bbe0ca39
|
release/2.17.1.2411.01-个税
|
2024-11-19 14:52:14 +08:00 |
|
lys
|
d5ecc6ae74
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/ledger.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
|
2024-11-19 13:40:34 +08:00 |
|
lys
|
5014859171
|
Merge branch 'release/2.17.1.2411.01' into feature/测试
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2024-11-15 15:06:16 +08:00 |
|
lys
|
66c6c68460
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-31 10:22:16 +08:00 |
|
lys
|
004175f882
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 16:23:58 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
黎永顺
|
394d7152f4
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:13:51 +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 |
|
黎永顺
|
d8bad17514
|
hotfix/2.12.1.2404.02
|
2024-05-06 09:48:04 +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 |
|
黎永顺
|
0771ad9ed3
|
hotfix/3.0.0.2403.01
数据采集页面导入修改重构
|
2024-03-13 17:27:49 +08:00 |
|
黎永顺
|
4c8c3e7251
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
# pc4mobx/hrmSalary/pages/declare/declare.js
|
2024-03-06 14:42:29 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
4a47fa1e85
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 11:27:40 +08:00 |
|
黎永顺
|
d446bcb133
|
个税相关-累计专项附加扣除添加在线获取的功能
|
2023-09-05 13:30:13 +08:00 |
|
黎永顺
|
e06728670b
|
产品-数据采集页面列表样式修改
|
2023-06-20 14:25:30 +08:00 |
|
黎永顺
|
7ea5936829
|
产品薪资账套-薪资账套中的薪资项目bug修改
|
2023-04-10 15:53:53 +08:00 |
|
黎永顺
|
e9b6fd32b6
|
bug
修复
|
2023-03-02 09:34:04 +08:00 |
|
黎永顺
|
ccb9297e6c
|
数据采集页面重构
|
2023-02-22 13:36:59 +08:00 |
|
黎永顺
|
a11ad9d7d1
|
数据采集页面重构
|
2023-02-21 09:57:44 +08:00 |
|
黎永顺
|
b6849400d7
|
数据采集页面重构
|
2023-02-20 14:28:08 +08:00 |
|
黎永顺
|
3affb156b9
|
数据采集页面重构
|
2023-02-20 09:41:36 +08:00 |
|
黎永顺
|
67b211e656
|
数据采集页面重构
|
2023-02-17 17:21:05 +08:00 |