 lys
|
6a4f9cd2af
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2024-12-27 09:16:26 +08:00 |
|
lys
|
8da06ed9ae
|
Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
|
2024-12-10 14:06:09 +08:00 |
|
lys
|
eb66a32612
|
release/2.18.1.2412.01
|
2024-12-09 18:14:41 +08:00 |
|
lys
|
5f893b1eb0
|
release/2.18.1.2412.01
|
2024-12-09 17:37:44 +08:00 |
|
lys
|
a46f4869e5
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
|
2024-12-09 15:22:49 +08:00 |
|
lys
|
5d817c9594
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 15:42:49 +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
|
a048a561a5
|
release/2.17.1.2411.01
|
2024-11-26 14:56:03 +08:00 |
|
lys
|
18a87cb45c
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-20 15:30:14 +08:00 |
|
lys
|
a2c5fdc5ec
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 18:58:39 +08:00 |
|
lys
|
da79b1b7ff
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 13:28:04 +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
|
e9f4d9b043
|
release/2.16.1.2410.01
|
2024-11-06 11:06:55 +08:00 |
|
lys
|
2699266c4c
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-11-04 14:41:29 +08:00 |
|
lys
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +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
|
e7f1971370
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 14:26:00 +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 |
|
黎永顺
|
5b3a645dfc
|
release/2.15.2.2409.01
|
2024-10-12 10:07:36 +08:00 |
|
黎永顺
|
215094dac8
|
release/2.15.2.2409.01
|
2024-10-09 11:25:50 +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 |
|
黎永顺
|
b4a966ea20
|
feature/2.15.1.2407.01-权限
|
2024-09-27 15:32:21 +08:00 |
|
黎永顺
|
f1183af3e2
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:56:41 +08:00 |
|
黎永顺
|
7ac7a58f7e
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限
|
2024-09-13 17:35:58 +08:00 |
|
黎永顺
|
687371ab39
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-09-13 11:18:48 +08:00 |
|
黎永顺
|
4a386102ef
|
feature/2.15.1.2407.01-权限
|
2024-09-12 16:34:39 +08:00 |
|
黎永顺
|
b99a2069d4
|
feature/2.15.1.2407.01-权限
|
2024-09-11 18:37:01 +08:00 |
|
黎永顺
|
6586f68d58
|
Merge branch 'release/2.15.1.2407.01' into feature/2.15.1.2407.01-权限
|
2024-09-10 16:34:12 +08:00 |
|
黎永顺
|
a729826c8d
|
feature/2.15.1.2407.01-权限
|
2024-09-06 14:15:39 +08:00 |
|
黎永顺
|
b91f35418e
|
feature/2.15.1.2407.01-权限
|
2024-08-22 15:42:35 +08:00 |
|
黎永顺
|
b0d790f988
|
feature/2.15.1.2407.01-权限
|
2024-08-21 16:00:28 +08:00 |
|
黎永顺
|
b7c5ae22f3
|
feature/2.15.1.2407.01-权限
|
2024-08-20 16:48:02 +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 |
|
黎永顺
|
4be61e9179
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 15:24:00 +08:00 |
|
黎永顺
|
d9fc164504
|
hotfix/2.15.1.2407.01
|
2024-08-13 16:12:43 +08:00 |
|
黎永顺
|
74ba398c90
|
feature/2.15.1.2407.01-导入工具
|
2024-08-12 16:56:51 +08:00 |
|
黎永顺
|
f05c43d011
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 14:58:36 +08:00 |
|
黎永顺
|
9d99557f4b
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:24:11 +08:00 |
|
黎永顺
|
86de787ed4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 18:24:45 +08:00 |
|
黎永顺
|
70fe54efb7
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 17:32:54 +08:00 |
|
黎永顺
|
36d90b35a6
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 14:36:11 +08:00 |
|
黎永顺
|
71b4e766af
|
feature/2.15.1.2407.01-权限
|
2024-08-08 11:10:24 +08:00 |
|
黎永顺
|
75b6c0969a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-07 15:22:10 +08:00 |
|
黎永顺
|
6e7137b6b3
|
feature/2.15.1.2407.01-权限
|
2024-08-07 14:02:27 +08:00 |
|
黎永顺
|
2dc1061fa2
|
feature/2.15.1.2407.01-权限
|
2024-08-07 09:02:12 +08:00 |
|
黎永顺
|
af8a0a1bab
|
hotfix/2.15.1.2407.01
|
2024-07-16 15:59:38 +08:00 |