 lys
|
fea2c5921e
|
custom/钱智
|
2025-10-28 15:07:15 +08:00 |
|
lys
|
f749fbcea3
|
custom/钱智
|
2025-08-26 13:57:31 +08:00 |
|
lys
|
154b16ad6e
|
release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:19:59 +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
|
c1dd08602b
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-04 09:10:28 +08:00 |
|
lys
|
824f4a9e86
|
Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01
|
2025-02-17 09:56:08 +08:00 |
|
lys
|
002cb5522b
|
release/2.19.1.2501.01
|
2025-02-13 13:28:28 +08:00 |
|
lys
|
f2b957578d
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
|
2024-12-09 15:28:31 +08:00 |
|
lys
|
a46f4869e5
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
|
2024-12-09 15:22:49 +08:00 |
|
lys
|
8a2891f454
|
release/2.17.1.2411.01
|
2024-12-04 17:06:29 +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
|
5e2f6bbbbc
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 10:59:46 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
lys
|
15acb33aa0
|
release/2.16.1.2410.01-个税
|
2024-10-18 15:47:24 +08:00 |
|
黎永顺
|
3f0502aabf
|
feature/2.15.1.2407.01-权限
|
2024-09-13 11:12:53 +08:00 |
|
黎永顺
|
4a386102ef
|
feature/2.15.1.2407.01-权限
|
2024-09-12 16:34:39 +08:00 |
|
黎永顺
|
3c33fc7a3a
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:53:47 +08:00 |
|
黎永顺
|
394d7152f4
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:13:51 +08:00 |
|
黎永顺
|
037ab5b12f
|
release/2.14.3.2406.01-个税
|
2024-06-03 11:22:18 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +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 |
|
黎永顺
|
06895e5a36
|
Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
|
2023-10-26 10:41:40 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
b68578e82b
|
feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取
|
2023-09-08 09:38:07 +08:00 |
|
黎永顺
|
d446bcb133
|
个税相关-累计专项附加扣除添加在线获取的功能
|
2023-09-05 13:30:13 +08:00 |
|
黎永顺
|
7ea5936829
|
产品薪资账套-薪资账套中的薪资项目bug修改
|
2023-04-10 15:53:53 +08:00 |
|
黎永顺
|
cefe6ee46d
|
数据采集模块四个页面的导出全部功能添加参数的筛选功能以及薪资核算页面的带条件导出全部的功能
|
2023-04-06 17:07:22 +08:00 |
|
黎永顺
|
266681cbc8
|
系统bug处理
|
2023-03-02 18:57:30 +08:00 |
|
黎永顺
|
e9b6fd32b6
|
bug
修复
|
2023-03-02 09:34:04 +08:00 |
|
黎永顺
|
172af786ed
|
221环境测试出的bug修复
|
2023-02-23 15:59:28 +08:00 |
|
黎永顺
|
a77c800995
|
数据采集页面重构
|
2023-02-22 14:00:34 +08:00 |
|
黎永顺
|
87024ceda9
|
数据采集页面重构
|
2023-02-21 18:05:54 +08:00 |
|
黎永顺
|
a11ad9d7d1
|
数据采集页面重构
|
2023-02-21 09:57:44 +08:00 |
|
黎永顺
|
b6849400d7
|
数据采集页面重构
|
2023-02-20 14:28:08 +08:00 |
|
黎永顺
|
6cff75a9b5
|
数据采集页面重构
|
2023-02-20 13:21:04 +08:00 |
|
黎永顺
|
1674f9071f
|
数据采集页面重构
|
2023-02-20 10:53:45 +08:00 |
|
黎永顺
|
38f25e5a95
|
数据采集页面重构
|
2023-02-20 10:24:40 +08:00 |
|
黎永顺
|
751659d569
|
数据采集页面重构
|
2023-02-20 09:44:00 +08:00 |