 黎永顺
|
4d96075efc
|
产品-系统多语言合并
|
2023-08-08 15:57:47 +08:00 |
|
黎永顺
|
a56acb15ce
|
产品-系统多语言合并
|
2023-08-08 13:45:54 +08:00 |
|
黎永顺
|
0556628ef8
|
产品-系统多语言合并
|
2023-08-08 11:03:34 +08:00 |
|
黎永顺
|
a994bc2346
|
产品-系统多语言合并
|
2023-08-04 17:45:18 +08:00 |
|
黎永顺
|
6503ec43f1
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/externalPersonManage/conditions.js
# pc4mobx/hrmSalary/pages/externalPersonManage/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
|
2023-08-04 17:38:25 +08:00 |
|
黎永顺
|
605370e12a
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-08-04 09:34:26 +08:00 |
|
黎永顺
|
480106d4e7
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-08-04 09:34:04 +08:00 |
|
黎永顺
|
250c7a0719
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop
|
2023-08-04 09:29:51 +08:00 |
|
黎永顺
|
208e413560
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-02 11:58:06 +08:00 |
|
黎永顺
|
d04c053c07
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-02 11:57:46 +08:00 |
|
黎永顺
|
cbd06fa42a
|
产品-非系统人员管理导入
|
2023-08-02 11:17:17 +08:00 |
|
黎永顺
|
a6c6ff6e5e
|
Merge branch 'hotfix/2.8.3.2308.01' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
|
2023-08-02 10:21:40 +08:00 |
|
黎永顺
|
c6fe44d976
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into develop
|
2023-08-01 17:57:57 +08:00 |
|
黎永顺
|
bc12a12097
|
产品-非系统人员管理导入
|
2023-08-01 17:44:59 +08:00 |
|
黎永顺
|
cb94dabd30
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-01 16:10:29 +08:00 |
|
黎永顺
|
5eec7139d6
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:09:23 +08:00 |
|
黎永顺
|
a433de7671
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 16:03:48 +08:00 |
|
黎永顺
|
b03c193927
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:51:02 +08:00 |
|
黎永顺
|
dbae61623d
|
产品-工资单模板薪资项目名称修改
|
2023-08-01 15:48:47 +08:00 |
|
黎永顺
|
4601742b9d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-08-01 13:37:54 +08:00 |
|
黎永顺
|
ce87730349
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-08-01 13:37:35 +08:00 |
|
黎永顺
|
d7bfa245d5
|
产品-dev合并
|
2023-08-01 11:19:23 +08:00 |
|
黎永顺
|
0eaa103465
|
产品-系统多语言
|
2023-08-01 10:36:43 +08:00 |
|
黎永顺
|
8b1f16e016
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
# pc4mobx/hrmSalary/pages/externalPersonManage/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-08-01 10:24:03 +08:00 |
|
黎永顺
|
d1594e5620
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into develop
|
2023-08-01 09:04:49 +08:00 |
|
黎永顺
|
b51e1f8dc2
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 19:08:25 +08:00 |
|
黎永顺
|
33641790e3
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 19:08:07 +08:00 |
|
黎永顺
|
df6eb00239
|
产品-系统多语言
|
2023-07-31 18:58:54 +08:00 |
|
黎永顺
|
27e4d2f254
|
产品-系统多语言
|
2023-07-31 15:30:28 +08:00 |
|
黎永顺
|
bdb64d23fc
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-31 11:51:37 +08:00 |
|
黎永顺
|
db53fc8942
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-31 11:50:30 +08:00 |
|
黎永顺
|
763c307f3d
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop
|
2023-07-31 11:20:37 +08:00 |
|
黎永顺
|
223effab98
|
产品-工资单模板添加发放薪资项目名称修改的功能
|
2023-07-31 11:20:14 +08:00 |
|
黎永顺
|
d9d4c2ff91
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-31 10:51:30 +08:00 |
|
黎永顺
|
600d73f858
|
产品-薪资账套薪资项目编辑功能修改
|
2023-07-31 10:51:10 +08:00 |
|
黎永顺
|
fc9a4616af
|
产品-多语言
|
2023-07-31 09:01:52 +08:00 |
|
黎永顺
|
2c025ebcb1
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-28 17:13:26 +08:00 |
|
黎永顺
|
fb40c1a998
|
产品-薪资账套编辑
|
2023-07-28 16:28:27 +08:00 |
|
黎永顺
|
2ba7f25779
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-07-28 09:26:42 +08:00 |
|
黎永顺
|
8071a62ec8
|
产品-社保福利方案自定义方案添加删除功能
|
2023-07-27 14:58:32 +08:00 |
|
黎永顺
|
6fd55967bd
|
产品-合并问题处理
|
2023-07-27 14:09:21 +08:00 |
|
黎永顺
|
8f2495f64f
|
产品-多语言
|
2023-07-27 11:47:24 +08:00 |
|
黎永顺
|
b6157dd074
|
产品-多语言
|
2023-07-27 11:34:37 +08:00 |
|
黎永顺
|
a3fde65b39
|
产品-社保福利的自定义以及福利档案的接口调整
|
2023-07-27 11:00:57 +08:00 |
|
黎永顺
|
8bac520ff0
|
Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
# pc4mobx/hrmSalary/pages/calculateDetail/index.js
# pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
# pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/columns.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
|
2023-07-27 10:43:14 +08:00 |
|
黎永顺
|
28471fe108
|
产品-社保福利的自定义以及福利档案的接口调整
|
2023-07-27 09:55:51 +08:00 |
|
黎永顺
|
868a546dd6
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-27 09:08:57 +08:00 |
|
黎永顺
|
3f63b26184
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-26 14:10:55 +08:00 |
|
黎永顺
|
c9c79460c7
|
产品-薪资账套薪资项目项添加编辑的功能
|
2023-07-26 09:31:15 +08:00 |
|
黎永顺
|
6a45f624e2
|
产品-社保档案基础信息修改
|
2023-07-25 18:22:43 +08:00 |