 lys
|
fa3d3a283e
|
Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税
# Conflicts:
# pc4mobx/hrmSalary/components/FormInfo/index.js
|
2024-12-25 17:25:31 +08:00 |
|
lys
|
8b8f4cd610
|
release/2.18.2.2412.02
|
2024-12-25 17:20:55 +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
|
c04cc1de76
|
release/2.18.2.2412.02
|
2024-12-23 15:28:05 +08:00 |
|
lys
|
1ece8f4ff2
|
release/2.18.1.2412.01-个税
|
2024-12-20 17:30:39 +08:00 |
|
lys
|
42048aa5a3
|
release/2.18.1.2412.01-个税
|
2024-12-20 16:43:00 +08:00 |
|
lys
|
10cad4e462
|
Merge branch 'release/2.18.1.2412.01' into release/2.18.1.2412.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
|
2024-12-20 16:40:30 +08:00 |
|
lys
|
cdd98ea602
|
release/2.18.1.2412.01
|
2024-12-20 16:36:50 +08:00 |
|
lys
|
2574959c54
|
release/2.18.1.2412.01-个税
|
2024-12-19 15:45:20 +08:00 |
|
lys
|
ef1c529941
|
release/2.18.1.2412.01
|
2024-12-17 16:03:52 +08:00 |
|
lys
|
c7af8335e6
|
Merge branch 'release/2.18.1.2412.01' into release/2.18.1.2412.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
|
2024-12-13 13:53:42 +08:00 |
|
lys
|
d9844eed9b
|
release/2.18.1.2412.01
|
2024-12-11 15:28:14 +08:00 |
|
lys
|
02a367befb
|
release/2.18.1.2412.01
薪资核算进度条处理
|
2024-12-10 09:11:12 +08:00 |
|
lys
|
eb66a32612
|
release/2.18.1.2412.01
|
2024-12-09 18:14:41 +08:00 |
|
lys
|
89b9e6110e
|
release/2.18.1.2412.01
|
2024-12-09 18:01:05 +08:00 |
|
lys
|
3871eb276a
|
1release/2.18.1.2412.01
|
2024-12-09 17:58:24 +08:00 |
|
lys
|
5f893b1eb0
|
release/2.18.1.2412.01
|
2024-12-09 17:37:44 +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
|
b69f30529d
|
Merge branch 'feature/2.17.1.2411.01-薪酬报表薪资明细显示模式' into release/2.17.1.2411.01
|
2024-12-05 10:51:06 +08:00 |
|
lys
|
5c8f045373
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 17:39:23 +08:00 |
|
lys
|
8a2891f454
|
release/2.17.1.2411.01
|
2024-12-04 17:06:29 +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
|
373e093321
|
release/2.17.1.2411.01
|
2024-12-03 17:01:12 +08:00 |
|
lys
|
154d69d850
|
release/2.17.1.2411.01
|
2024-11-27 14:49:03 +08:00 |
|
lys
|
b0b67230ce
|
release/2.17.1.2411.01
|
2024-11-27 14:42:04 +08:00 |
|
lys
|
ce4c2a7c72
|
release/2.17.1.2411.01
|
2024-11-27 10:59:24 +08:00 |
|
lys
|
8786ef1f2a
|
release/2.17.1.2411.01
|
2024-11-27 10:32:21 +08:00 |
|
lys
|
e613772041
|
release/2.17.1.2411.01
|
2024-11-27 10:21:51 +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
|
7c13ddb970
|
release/2.17.1.2411.01
|
2024-11-25 18:08:50 +08:00 |
|
lys
|
dda961cacf
|
release/2.17.1.2411.01
|
2024-11-25 17:51:49 +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 |
|
lys
|
55bbe0ca39
|
release/2.17.1.2411.01-个税
|
2024-11-19 14:52:14 +08:00 |
|
lys
|
f6471f881e
|
release/2.17.1.2411.01-个税
|
2024-11-19 14:27:53 +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
|
2261cf3104
|
release/2.17.1.2411.01
|
2024-11-19 10:31:10 +08:00 |
|
lys
|
b0a45c9bbe
|
Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-14 09:36:26 +08:00 |
|
lys
|
e09f4da1cf
|
release/2.17.1.2411.01
|
2024-11-13 10:19:57 +08:00 |
|
lys
|
712b45453a
|
Merge branch 'feature/2.16.1.2410.01-次账号' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-12 18:05:44 +08:00 |
|
lys
|
3869a0a51b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 18:02:48 +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
|
24cadda23f
|
release/2.16.1.2410.01
|
2024-11-12 17:58:50 +08:00 |