 lys
|
a2c098f203
|
Merge branch 'feature/2.19.1.2501.01-移动端查看工资单密码设置' into custom-联特
|
2025-04-18 14:07:41 +08:00 |
|
lys
|
fab27c99ed
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 09:54:03 +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
|
2357ee50a6
|
Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-02-12 15:25:54 +08:00 |
|
lys
|
20fdfda922
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-02-08 17:16:08 +08:00 |
|
lys
|
6b8b604f55
|
feature/2.19.1.2501.01-套打功能
|
2025-02-08 11:16:43 +08:00 |
|
lys
|
e0b387503b
|
release/2.18.2.2412.02-个税
|
2024-12-24 15:36:46 +08:00 |
|
lys
|
64b6a23310
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
|
2024-11-25 15:00:33 +08:00 |
|
lys
|
a5cc09a2c5
|
release/2.17.1.2411.01
|
2024-11-20 16:25:59 +08:00 |
|
黎永顺
|
9759a529f5
|
feature/2.15.1.2407.01-权限
|
2024-09-10 12:23:18 +08:00 |
|
黎永顺
|
34bf2c8c52
|
feature/2.15.1.2407.01-权限
|
2024-09-09 09:35:02 +08:00 |
|
黎永顺
|
a56ee784db
|
feature/2.15.1.2407.01-权限
|
2024-09-06 15:45:57 +08:00 |
|
黎永顺
|
90ee27ba2e
|
Merge branch 'release/2.15.1.2407.01' into release/2.15.1.2407.01-个税
|
2024-08-16 09:39:58 +08:00 |
|
黎永顺
|
334a582d62
|
hotfix/2.15.1.2407.01
考勤引用，薪资账套多选
|
2024-08-07 11:11:53 +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 |
|
黎永顺
|
e5078dc37b
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
2、薪酬统计报表-薪资报表的页面开发
|
2024-03-27 10:11:30 +08:00 |
|
黎永顺
|
2e2f8ee248
|
Merge branch 'release/2.10.1.2401.02' into release/2.10.1.2401.02-个税
|
2024-02-21 15:45:22 +08:00 |
|
黎永顺
|
c6ad730e1e
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-24 13:50:45 +08:00 |
|
黎永顺
|
6a91ce8b3c
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 19:05:57 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
beddc62901
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-06 14:50:24 +08:00 |
|
黎永顺
|
f1b0fc588a
|
1release/2.9.9.2312.01
|
2023-12-06 14:49:34 +08:00 |
|
黎永顺
|
ce1acae344
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-05 17:16:37 +08:00 |
|
黎永顺
|
07c6ca839f
|
hotfix/2.9.9.2312.01
|
2023-12-01 17:56:16 +08:00 |
|
黎永顺
|
2c7633b0c9
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-27 15:29:07 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
c44f92fb56
|
Merge branch 'hotfix/2.9.42310.02' into develop
|
2023-10-27 17:28:11 +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 |
|
黎永顺
|
3c9cf1c730
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-16 11:13:44 +08:00 |
|
黎永顺
|
2d148b9fb5
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02-个税
# Conflicts:
# pc4mobx/hrmSalary/util/index.js
|
2023-09-06 16:30:21 +08:00 |
|
黎永顺
|
ce462fe51a
|
hotfix/2.9.42308.02
|
2023-09-06 14:27:23 +08:00 |
|
黎永顺
|
6043159976
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 16:48:36 +08:00 |
|
黎永顺
|
89b28b1d2e
|
个税在线申报-申报表导出功能的完成
|
2023-08-24 13:43:01 +08:00 |
|
黎永顺
|
892e0f10f9
|
Merge branch 'feature/2.8.3.2308-人员信息报送' into feature/v2-对接e10个税扣缴义务人设置-1121
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-08-14 17:24:49 +08:00 |
|
黎永顺
|
37cb0f050a
|
Merge branch 'master' into feature/v2-对接e10个税扣缴义务人设置-1121
# Conflicts:
# pc4mobx/hrmSalary/util/index.js
|
2023-07-18 09:35:33 +08:00 |
|
黎永顺
|
8356de0fa2
|
非系统人员开发合并
|
2023-07-12 14:34:07 +08:00 |
|
黎永顺
|
6c615453f7
|
产品-薪酬统计分析页面开发
|
2023-05-15 18:21:23 +08:00 |
|
黎永顺
|
8f3320ae11
|
产品-薪酬统计分析管理
|
2023-04-23 11:28:18 +08:00 |
|
黎永顺
|
8fe5f201c6
|
薪酬統計
|
2023-04-12 10:47:51 +08:00 |
|
黎永顺
|
9fcf7c1b26
|
个税扣缴义务人页面重构
|
2022-11-30 17:38:01 +08:00 |
18652063575
|
1d1ced8d77
|
社保福利台账添加线下对比的页面功能
|
2022-09-29 15:45:23 +08:00 |
|
18652063575
|
27e54073c6
|
统一所有页面你的弹框以及抽屉头部组件,样式bug的修改
|
2022-09-15 11:08:13 +08:00 |
MustangDeng
|
f4ac00ddbd
|
补交
|
2022-05-26 09:46:28 +08:00 |
|
MustangDeng
|
1823149ae2
|
bug修复
|
2022-05-24 23:55:12 +08:00 |
|
MustangDeng
|
33e5009585
|
bug修改
|
2022-05-24 15:39:09 +08:00 |
|
MustangDeng
|
9c57f58212
|
考勤字段
|
2022-03-22 18:53:05 +08:00 |
|
MustangDeng
|
7c8dabaf8d
|
自定义福利表单
|
2022-03-22 16:53:39 +08:00 |
|
MustangDeng
|
35ede9dd67
|
2022-02-25
|
2022-02-25 09:24:56 +08:00 |