 黎永顺
|
209392a2f8
|
Merge branch 'hotfix/2.9.42308.02' into develop
|
2023-08-31 15:03:30 +08:00 |
|
黎永顺
|
a5e0ca3084
|
薪资项目公式保存参数修改
|
2023-08-31 15:02:56 +08:00 |
|
黎永顺
|
0a37f80611
|
Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into develop
|
2023-08-31 14:44:26 +08:00 |
|
黎永顺
|
036e59b91a
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:43:57 +08:00 |
|
黎永顺
|
a058242d35
|
feature/2.9.42308.02-薪资项目同步到薪资账套
|
2023-08-31 14:23:51 +08:00 |
|
黎永顺
|
def2159e19
|
Merge branch 'hotfix/2.9.42308.02' into develop
|
2023-08-31 11:15:48 +08:00 |
|
黎永顺
|
b6ac297242
|
hotfix-社保福利档案以及薪资档案的导入下载模板功能优化
|
2023-08-31 11:15:32 +08:00 |
|
黎永顺
|
f65b7979d7
|
hotfix-薪资核算详情页面编辑刷新分页的bug
|
2023-08-31 09:40:09 +08:00 |
|
黎永顺
|
ecc2021916
|
2.9.42308.02bug修复
|
2023-08-29 14:24:43 +08:00 |
|
黎永顺
|
78e08d7c26
|
系统数字输入框保留小数位数配置
|
2023-08-25 16:12:05 +08:00 |
|
黎永顺
|
4462753f28
|
Merge branch 'release/2.8.3.2308.01' into hotfix/2.9.42308.02
|
2023-08-25 15:39:49 +08:00 |
|
黎永顺
|
25ce139a0c
|
产品-工资单产看页面dom渲染顺序优化
|
2023-08-21 10:53:19 +08:00 |
|
黎永顺
|
a22f3ade1f
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02
|
2023-08-18 10:19:06 +08:00 |
|
黎永顺
|
8871b8ed2c
|
hotfix/2.9.42308.02
|
2023-08-18 10:18:53 +08:00 |
|
黎永顺
|
67c09305aa
|
Merge branch 'release/2.8.3.2308.01'
|
2023-08-18 09:27:03 +08:00 |
|
黎永顺
|
49dce1c871
|
代码合并
|
2023-08-17 13:45:21 +08:00 |
|
黎永顺
|
38e2b1b61b
|
Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
|
2023-08-17 08:43:43 +08:00 |
|
黎永顺
|
9633bcabfb
|
Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01
|
2023-08-17 08:38:06 +08:00 |
|
黎永顺
|
290c3e51d3
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
|
2023-08-17 08:37:56 +08:00 |
|
黎永顺
|
6d10c01f0c
|
Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01
# Conflicts:
# pc4mobx/hrmSalary/stores/payroll.js
|
2023-08-17 08:36:27 +08:00 |
|
黎永顺
|
2527f75298
|
字段管理新增修改
|
2023-08-16 10:30:37 +08:00 |
|
黎永顺
|
5adfa47b5b
|
bug修改-断点
|
2023-08-11 17:34:42 +08:00 |
|
黎永顺
|
262976cc5e
|
产品-合并代码
|
2023-08-04 13:55:20 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
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 |
|
黎永顺
|
2c025ebcb1
|
Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop
|
2023-07-28 17:13:26 +08:00 |