 黎永顺
|
172af786ed
|
221环境测试出的bug修复
|
2023-02-23 15:59:28 +08:00 |
|
黎永顺
|
d1e0460e39
|
bug修复
|
2023-02-22 10:39:47 +08:00 |
|
黎永顺
|
3694b009a4
|
Merge branch 'feature/V2-社保福利档案新增编辑页面重构' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
|
2023-02-22 09:13:05 +08:00 |
|
黎永顺
|
68ce529eff
|
社保福利档案新增编辑页面重构
|
2023-02-16 17:20:45 +08:00 |
|
黎永顺
|
3cbc12373a
|
社保福利档案新增编辑页面重构
|
2023-02-16 16:20:45 +08:00 |
|
黎永顺
|
c99bbbcb6d
|
Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2023-02-15 17:28:02 +08:00 |
|
黎永顺
|
4e6f727727
|
薪资项目列表操作权限修改
|
2023-02-15 14:18:20 +08:00 |
|
黎永顺
|
4e29ad25a2
|
社保福利档案新增编辑页面重构
|
2023-02-15 11:37:13 +08:00 |
|
黎永顺
|
03a432266b
|
社保福利档案新增编辑页面重构
|
2023-02-15 10:13:34 +08:00 |
|
黎永顺
|
38ca2cc421
|
社保福利档案页面重构
|
2023-02-13 16:38:15 +08:00 |
|
黎永顺
|
d77a3f5fca
|
薪酬页面滚动的修改
|
2023-02-13 10:41:40 +08:00 |
|
黎永顺
|
a3ed213dca
|
Merge branch 'feature/V2-薪资项目管理新增编辑页面重构' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/fieldManagement/index.less
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
|
2023-02-10 10:52:47 +08:00 |
|
黎永顺
|
d60d3db993
|
薪资项目管理页面重构
|
2023-02-10 10:47:18 +08:00 |
|
黎永顺
|
8416f73376
|
薪资项目管理页面編輯报错bug处理
|
2023-02-09 19:45:08 +08:00 |
|
黎永顺
|
7578c4b09e
|
薪资项目管理页面重构
|
2023-02-09 19:34:40 +08:00 |
|
黎永顺
|
f40d403515
|
薪资项目管理的可见性必填判断
|
2023-02-09 16:23:19 +08:00 |
|
黎永顺
|
33bb4b9814
|
薪资账套修改
|
2023-01-30 10:53:47 +08:00 |
|
黎永顺
|
42ee5f0cd8
|
薪资核算修改
|
2023-01-29 15:52:46 +08:00 |
|
黎永顺
|
d6f7d3c19b
|
高版本表格组件修改
|
2023-01-16 11:39:49 +08:00 |
|
黎永顺
|
8fd6579dfd
|
薪资账套报错bug
|
2023-01-13 17:30:24 +08:00 |
|
黎永顺
|
e24078ba1c
|
薪资档案查询参数修改
|
2023-01-09 14:30:19 +08:00 |
|
黎永顺
|
5c6db20caa
|
工资单模板预览页面空白
|
2023-01-09 14:04:08 +08:00 |
|
黎永顺
|
0a3e2f8b02
|
往期累计情况页面查询丢失日期的bug修改
|
2023-01-09 09:40:50 +08:00 |
|
黎永顺
|
462cea820c
|
工资单模板bug修复
|
2022-12-29 11:20:01 +08:00 |
|
黎永顺
|
8fa65f4efb
|
工资单模板预览报错
|
2022-12-23 17:30:59 +08:00 |
|
黎永顺
|
3170ed0ea9
|
Merge branch 'develop' into release
|
2022-12-21 15:29:45 +08:00 |
|
黎永顺
|
abd34580a5
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
|
2022-12-16 16:15:08 +08:00 |
|
黎永顺
|
26457c01e6
|
社保福利台账核算详情页面添加补差的功能
|
2022-12-16 15:38:39 +08:00 |
|
黎永顺
|
c7773749e4
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-15 10:08:10 +08:00 |
|
黎永顺
|
11120294d9
|
薪资账套页面重构
|
2022-12-15 10:07:05 +08:00 |
|
黎永顺
|
0cdca9c448
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
|
2022-12-14 19:41:43 +08:00 |
|
黎永顺
|
d44b5d279d
|
薪资账套页面重构,薪资核算页面添加回算功能以及核算详情页面添加补发已发tab
|
2022-12-14 19:40:05 +08:00 |
|
黎永顺
|
0023d1314b
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-14 15:38:21 +08:00 |
|
黎永顺
|
bbb91b438a
|
薪资账套页面重构
|
2022-12-14 15:37:55 +08:00 |
|
黎永顺
|
665f3a0119
|
薪资账套中薪资项目排序报错的bug
|
2022-12-09 14:48:51 +08:00 |
|
黎永顺
|
7baf97e20f
|
薪资账套重构
|
2022-12-08 15:48:46 +08:00 |
|
黎永顺
|
aac9b4580e
|
Merge branch 'hotfix/v2-工资单模板添加1208' into develop
# Conflicts:
# pc4mobx/hrmSalary/apis/payroll.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/stores/payroll.js
|
2022-12-07 15:43:35 +08:00 |
|
黎永顺
|
593140b54f
|
工资单模板修改
|
2022-12-07 14:15:46 +08:00 |
|
黎永顺
|
4825d0cd49
|
工资单模板修改
|
2022-12-06 15:04:57 +08:00 |
|
黎永顺
|
a4dbd0cc4b
|
工资单发放部分发放和部分撤回
|
2022-12-02 14:27:39 +08:00 |
|
黎永顺
|
fbcb7f6db2
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-24 17:40:44 +08:00 |
|
黎永顺
|
32072512a9
|
薪资核算添加核算人员的功能
|
2022-11-24 17:36:00 +08:00 |
|
黎永顺
|
c468ff35ff
|
个税扣缴义务人添加同步人员范围的功能
|
2022-11-23 15:42:51 +08:00 |
|
黎永顺
|
04a368c731
|
禅道bug132、133
|
2022-11-21 17:50:06 +08:00 |
|
黎永顺
|
f3b504208c
|
Merge branch 'hotfix/v2-1114' into develop
|
2022-11-17 18:55:45 +08:00 |
|
黎永顺
|
80bc646682
|
1
|
2022-11-17 18:55:29 +08:00 |
|
黎永顺
|
d0c91c697c
|
Merge branch 'hotfix/v2-1114' into develop
|
2022-11-17 16:35:03 +08:00 |
|
黎永顺
|
cc4d9df1e1
|
社保福利档案页面编辑报错解决
|
2022-11-17 16:30:06 +08:00 |
|
黎永顺
|
7dbd09c1b0
|
Merge branch 'feature/v2-薪资项目添加可见性-1124' into develop
|
2022-11-17 14:19:13 +08:00 |
|
黎永顺
|
97b0efb583
|
Merge branch 'feature/v2-薪资档案调薪编辑-1117' into develop
|
2022-11-17 14:19:02 +08:00 |