 黎永顺
|
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 |
|
黎永顺
|
85c222def8
|
feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发
1、补算的页面完成
|
2024-03-26 09:14:32 +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 |
|
黎永顺
|
3f23bc29e5
|
Merge branch 'feature/2.10.1.2402.01-我的薪资福利显示基础配置' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-03-05 14:25:33 +08:00 |
|
黎永顺
|
c4d78463da
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01-个税
|
2024-02-27 16:34:26 +08:00 |
|
黎永顺
|
194e575e25
|
hotfix/2.10.1.2402.01
|
2024-02-27 16:33:50 +08:00 |
|
黎永顺
|
b42f9c8e13
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-26 15:29:04 +08:00 |
|
黎永顺
|
ac479676e0
|
release/2.10.1.2402.01-个税
|
2024-02-23 17:38:42 +08:00 |
|
黎永顺
|
fe95424386
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-23 16:20:29 +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 |
|
黎永顺
|
eec52e34c1
|
Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02
|
2024-02-20 15:53:18 +08:00 |
|
黎永顺
|
2d6383eebc
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into release/2.10.1.2401.02
|
2024-02-20 15:52:51 +08:00 |
|
黎永顺
|
d866cc07cf
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-02 16:09:03 +08:00 |
|
黎永顺
|
abfeb1aae7
|
Merge branch 'feature/2.10.1.2401.01-个税在线对比' into release/2.10.1.2401.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/declare.js
|
2024-02-02 14:13:01 +08:00 |
|
黎永顺
|
0a680cccc2
|
Merge branch 'release/2.10.1.2401.01' into release/2.10.1.2401.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
|
2024-02-02 13:55:08 +08:00 |
|
黎永顺
|
f50257e1b5
|
feature/2.10.1.2401.01-工资单查看与调薪记录分开展示
|
2024-01-25 15:09:30 +08:00 |
|
黎永顺
|
e5d30f224b
|
feature/2.10.1.2401.01-社保福利台账列表页面重构
|
2024-01-23 10:51:38 +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 |
|
黎永顺
|
c01c03f1b0
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-08 16:05:00 +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 |
|
黎永顺
|
5617392a7c
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-08 09:19:43 +08:00 |
|
黎永顺
|
197849ecaa
|
Merge branch 'master' into feature/2.9.9.2312.01-薪资核算查看权限
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/calculate/calculate.js
|
2023-12-07 16:45:47 +08:00 |
|
黎永顺
|
23911d8e37
|
feature/2.9.9.2312.01-薪资核算查看权限
|
2023-12-07 16:44:38 +08:00 |
|
黎永顺
|
9f63f4e3a8
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-07 16:03:04 +08:00 |
|
黎永顺
|
2b4b5623bc
|
hotfix/2.9.9.2312.01
查看薪資核算页面添加权限，移动端薪资查看修改
|
2023-12-06 18:28:02 +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 |
|
黎永顺
|
bc78a26578
|
Merge branch 'feature/2.9.42311.02-我的薪资福利移动端列表查看' into release/2.9.9.2312.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-12-06 14:48:35 +08:00 |
|
黎永顺
|
198c7c8b76
|
Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into release/2.9.9.2312.01-个税
|
2023-11-29 15:08:46 +08:00 |
|
黎永顺
|
80cf2835d3
|
Merge branch 'master' into release/2.9.42311.02-个税
|
2023-11-28 15:25:28 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
94b3f056f4
|
hotfix/2.9.42311.02-我的薪资福利页面重构
|
2023-11-20 17:48:44 +08:00 |
|
黎永顺
|
0a1173faaa
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 10:41:47 +08:00 |
|
黎永顺
|
b14fce7949
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-10-31 15:30:21 +08:00 |
|
黎永顺
|
015e29ac47
|
Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop
|
2023-10-27 17:28:21 +08:00 |
|
黎永顺
|
eed8d3a5bd
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-27 16:14:59 +08:00 |
|
黎永顺
|
235e7cc6f0
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-27 10:43:23 +08:00 |
|
黎永顺
|
63dcd77589
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into develop
|
2023-10-23 18:30:47 +08:00 |
|
黎永顺
|
e21bbcb3f8
|
Merge branch 'feature/2.9.42310.01-个税申报表页面重构' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/declare/index.less
# pc4mobx/hrmSalary/stores/declare.js
|
2023-10-23 10:57:05 +08:00 |
|
黎永顺
|
d0aa6e93a0
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-20 10:27:00 +08:00 |
|
黎永顺
|
86980f33b0
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2023-10-19 13:39:53 +08:00 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
2256d9e0a1
|
Merge branch 'feature/2.9.42310.01-调薪记录' into develop
|
2023-10-18 10:40:20 +08:00 |
|
黎永顺
|
984192fdf2
|
Merge branch 'release/2.9.42310.01' into feature/2.9.42310.01-调薪记录
|
2023-10-16 14:13:53 +08:00 |
|
黎永顺
|
7b79fe5dc5
|
feature/2.9.42310.01-调薪记录
|
2023-10-13 09:51:50 +08:00 |
|
黎永顺
|
02863814ba
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-13 09:17:54 +08:00 |
|
黎永顺
|
ca5b60f6aa
|
feature/2.9.42310.01-个税申报表页面重构
|
2023-10-12 13:57:14 +08:00 |
|
黎永顺
|
321275d406
|
feature/2.9.42310.01-薪资核算页面重构
|
2023-10-09 13:17:54 +08:00 |
|
黎永顺
|
f3e1e1e166
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
|
2023-10-08 16:14:59 +08:00 |
|
黎永顺
|
06f19c74db
|
feature/2.9.42310.01-工资单发放导出PDF
20230926
|
2023-09-27 09:13:02 +08:00 |