 lys
|
4d8351d627
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
|
2025-04-23 18:03:38 +08:00 |
|
lys
|
82ffd93fd5
|
5release/2.19.1.2501.01
|
2025-04-18 15:10:05 +08:00 |
|
lys
|
6dfb4e6650
|
release/2.19.1.2501.01
|
2025-04-15 16:13:15 +08:00 |
|
lys
|
a0385789cb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-19 16:31:31 +08:00 |
|
lys
|
f436779b9e
|
release/2.19.1.2501.01
|
2025-03-13 17:41:34 +08:00 |
|
lys
|
5e3331b9c9
|
Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税
|
2025-01-03 09:13:14 +08:00 |
|
lys
|
4212bf9ff5
|
release/2.18.2.2412.02
|
2025-01-02 15:31:55 +08:00 |
|
lys
|
db99c081fb
|
release/2.18.2.2412.02
|
2024-12-31 15:38:09 +08:00 |
|
lys
|
576a108fa9
|
release/2.18.2.2412.02
|
2024-12-30 16:55:47 +08:00 |
|
lys
|
2e466c662f
|
release/2.18.2.2412.02-个税
|
2024-12-27 15:58:48 +08:00 |
|
lys
|
bafd4e7538
|
Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税
|
2024-12-27 09:12:38 +08:00 |
|
lys
|
8aa696fee5
|
release/2.18.2.2412.02
|
2024-12-27 09:12:09 +08:00 |
|
lys
|
1d88fd9f35
|
release/2.18.2.2412.02-release/2.18.2.2412.02-个税
|
2024-12-26 18:12:37 +08:00 |
|
lys
|
e8f820058b
|
release/2.18.2.2412.02-个税
|
2024-12-25 10:54:45 +08:00 |
|
lys
|
420104e131
|
release/2.18.2.2412.02-release/2.18.2.2412.02-个税
|
2024-12-24 18:09:15 +08:00 |
|
lys
|
cec22dc89f
|
release/2.18.2.2412.02
|
2024-12-24 15:41:15 +08:00 |
|
lys
|
e0b387503b
|
release/2.18.2.2412.02-个税
|
2024-12-24 15:36:46 +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
|
5d817c9594
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 15:42:49 +08:00 |
|
lys
|
f771d2eacc
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 10:46:25 +08:00 |
|
lys
|
b61dc20db5
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-03 18:38:14 +08:00 |
|
lys
|
b0b67230ce
|
release/2.17.1.2411.01
|
2024-11-27 14:42:04 +08:00 |
|
lys
|
9618a9b5d3
|
release/2.17.1.2411.01
|
2024-11-26 17:01:50 +08:00 |
|
lys
|
a048a561a5
|
release/2.17.1.2411.01
|
2024-11-26 14:56:03 +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
|
8a0998e26c
|
release/2.17.1.2411.01
|
2024-11-19 10:54:33 +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
|
3654e2a378
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-11 14:43:17 +08:00 |
|
lys
|
97a5d37044
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 16:06:48 +08:00 |
|
lys
|
83d14f6d82
|
release/2.16.1.2410.01
日志组件优化
|
2024-11-05 17:33:34 +08:00 |
|
lys
|
df4971fd27
|
release/2.16.1.2410.01
|
2024-11-01 18:28:12 +08:00 |
|
lys
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +08:00 |
|
lys
|
c50e69bbda
|
Merge branch 'release/2.15.2.2409.01' into release/2.15.2.2409.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/stores/taxAgent.js
# pc4mobx/hrmSalary/style/index.less
|
2024-10-15 14:37:35 +08:00 |
|
黎永顺
|
5b3a645dfc
|
release/2.15.2.2409.01
|
2024-10-12 10:07:36 +08:00 |
|
黎永顺
|
90470c3a57
|
feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列
|
2024-10-11 17:06:54 +08:00 |
|
黎永顺
|
550babca7b
|
Merge branch 'release/2.15.1.2407.01' into release/2.15.1.2407.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-08-22 15:48:11 +08:00 |
|
黎永顺
|
421fca99cc
|
Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01
|
2024-08-20 13:37:39 +08:00 |
|
黎永顺
|
b7e29df781
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 16:39:14 +08:00 |
|
黎永顺
|
d31ae5a030
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:43:30 +08:00 |
|
黎永顺
|
6a56cee090
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:42:54 +08:00 |
|
黎永顺
|
1d26ef8176
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:27:02 +08:00 |
|
黎永顺
|
f730cba8de
|
feature/2.15.1.2407.01-导入工具
|
2024-08-16 16:37:45 +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 |
|
黎永顺
|
e8625fd0ef
|
feature/2.15.1.2407.01-导入工具
|
2024-08-15 16:29:21 +08:00 |
|
黎永顺
|
5c9f954adb
|
hotfix/2.15.1.2407.01
|
2024-08-15 11:04:14 +08:00 |
|
黎永顺
|
f984cd3f59
|
hotfix/2.15.1.2407.01
|
2024-08-15 11:01:26 +08:00 |
|
黎永顺
|
23e9a6ba42
|
hotfix/2.15.1.2407.01
|
2024-08-15 10:28:18 +08:00 |
|
黎永顺
|
9479a4ba9a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-13 14:33:10 +08:00 |
|
黎永顺
|
74ba398c90
|
feature/2.15.1.2407.01-导入工具
|
2024-08-12 16:56:51 +08:00 |
|
黎永顺
|
7826086cb1
|
Merge branch 'release/2.14.4.2406.02' into release/2.14.4.2406.02-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
|
2024-06-21 10:49:13 +08:00 |