 lys
|
40d84b30fd
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-10-10 11:05:48 +08:00 |
|
lys
|
efb5af1b10
|
release/2.19.1.2501.01
|
2025-10-10 11:05:18 +08:00 |
|
lys
|
dc80b9c0b7
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-12 09:30:02 +08:00 |
|
lys
|
2b639ad388
|
custom/五院杭州中心
|
2025-05-27 12:31:43 +08:00 |
|
lys
|
693c436d4a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-05-20 16:50:29 +08:00 |
|
lys
|
07c40750da
|
release/2.19.1.2501.01
|
2025-05-19 16:04:11 +08:00 |
|
lys
|
1455707c9c
|
release/2.19.1.2501.01
|
2025-04-18 16:31:34 +08:00 |
|
lys
|
ec6874df2e
|
release/2.19.1.2501.01
|
2025-04-18 16:26:05 +08:00 |
|
lys
|
4b53921f03
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calculate.js
|
2025-04-18 16:23:17 +08:00 |
|
lys
|
ae43a2aa7c
|
release/2.19.1.2501.01
|
2025-04-18 16:21:49 +08:00 |
|
lys
|
34b2052926
|
feature/2.19.1.2501.01-PC端Token验证
|
2025-04-18 14:49:19 +08:00 |
|
lys
|
64b32a04bd
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-15 15:16:47 +08:00 |
|
lys
|
38572729fd
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 15:16:29 +08:00 |
|
lys
|
80307c7b91
|
release/2.19.1.2501.01
|
2025-04-14 16:38:41 +08:00 |
|
lys
|
f7bf13bd69
|
release/3.0.0.2502.01-合并业务线
|
2025-03-10 14:50:07 +08:00 |
|
lys
|
93dde8230a
|
release/2.19.1.2501.01
|
2025-03-10 14:48:15 +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
|
acf1257a27
|
release/2.19.1.2501.01
|
2025-02-11 14:32:53 +08:00 |
|
lys
|
ecf34e4886
|
release/2.19.1.2501.01
|
2025-02-11 14:17:56 +08:00 |
|
lys
|
02a367befb
|
release/2.18.1.2412.01
薪资核算进度条处理
|
2024-12-10 09:11:12 +08:00 |
|
lys
|
8a2891f454
|
release/2.17.1.2411.01
|
2024-12-04 17:06:29 +08:00 |
|
lys
|
ed5b694859
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线
|
2024-12-03 17:11:39 +08:00 |
|
lys
|
373e093321
|
release/2.17.1.2411.01
|
2024-12-03 17:01:12 +08:00 |
|
lys
|
64777b4129
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/util/index.js
|
2024-12-03 13:21:36 +08:00 |
|
lys
|
ce4c2a7c72
|
release/2.17.1.2411.01
|
2024-11-27 10:59:24 +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
|
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
|
97a5d37044
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 16:06:48 +08:00 |
|
lys
|
f126179d1d
|
Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾
# Conflicts:
# pc4mobx/hrmSalary/apis/calculate.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-10-31 17:02:27 +08:00 |
|
lys
|
368542a52b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
|
2024-10-25 09:43:15 +08:00 |
|
lys
|
02ff34c202
|
release/2.16.1.2410.01
|
2024-10-23 09:51:02 +08:00 |
|
lys
|
9d2fd951ef
|
release/2.16.1.2410.01-个税
|
2024-10-18 16:49:52 +08:00 |
|
lys
|
e7f1971370
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 14:26:00 +08:00 |
|
lys
|
8c5b0acffa
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 11:51:06 +08:00 |
|
lys
|
4b125994f7
|
release/2.16.1.2410.01
|
2024-10-17 11:17:55 +08:00 |
|
黎永顺
|
5c8e6b8133
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
# pc4mobx/hrmSalary/stores/taxAgent.js
|
2024-10-12 16:05:19 +08:00 |
|
黎永顺
|
591f29d934
|
release/2.15.2.2409.01
|
2024-10-11 17:15:11 +08:00 |
|
黎永顺
|
bdd4b4e446
|
release/2.15.2.2409.01
|
2024-10-10 15:32:41 +08:00 |
|
黎永顺
|
e92f06bce2
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-30 10:30:46 +08:00 |
|
黎永顺
|
9c318d22b7
|
hotfix/2.15.1.2409.01
|
2024-09-29 10:57:22 +08:00 |
|
黎永顺
|
b99a2069d4
|
feature/2.15.1.2407.01-权限
|
2024-09-11 18:37:01 +08:00 |
|
黎永顺
|
21ead59420
|
hotfix/2.15.1.2407.01
|
2024-08-29 15:21:37 +08:00 |
|
黎永顺
|
4810a09f29
|
hotfix/2.15.1.2407.01
|
2024-08-28 14:57:34 +08:00 |
|
黎永顺
|
a3f40f506d
|
hotfix/2.15.1.2407.01
|
2024-08-19 16:28:53 +08:00 |
|
黎永顺
|
25b7a2341e
|
hotfix/2.15.1.2407.01
|
2024-08-05 11:05:25 +08:00 |
|
黎永顺
|
964af55e3a
|
hotfix/2.15.1.2407.01
|
2024-07-26 10:02:35 +08:00 |
|
黎永顺
|
15c81c8156
|
release/2.14.3.2406.01
|
2024-06-06 17:25:31 +08:00 |
|
黎永顺
|
6bfde3d28f
|
feature/2.14.3.2406.01-薪资核算添加锁定人员数据
|
2024-05-29 10:32:41 +08:00 |
|
黎永顺
|
c0079fe4b4
|
feature/2.14.3.2406.01-薪资核算添加锁定人员数据
|
2024-05-29 10:32:17 +08:00 |
|
黎永顺
|
a4b98f253c
|
Merge branch 'feature/2.12.1.2404.02-薪资核算判断账套是否修改提示' into release/2.14.2.2405.02
|
2024-05-23 11:04:34 +08:00 |