 黎永顺
|
bbc855d6bd
|
已知bug修复
|
2023-02-24 15:52:19 +08:00 |
|
黎永顺
|
94a8a6f05a
|
社保福利方案修改
|
2023-02-23 16:43:14 +08:00 |
|
黎永顺
|
172af786ed
|
221环境测试出的bug修复
|
2023-02-23 15:59:28 +08:00 |
|
黎永顺
|
2cbcb414fb
|
禅道bug修复回归
|
2023-02-22 19:16:34 +08:00 |
|
黎永顺
|
e89c2f92f4
|
Merge branch 'feature/V2-数据采集页面重构' into develop
# 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/archives/index.js
|
2023-02-22 17:26:36 +08:00 |
|
黎永顺
|
a77c800995
|
数据采集页面重构
|
2023-02-22 14:00:34 +08:00 |
|
黎永顺
|
ccb9297e6c
|
数据采集页面重构
|
2023-02-22 13:36:59 +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 |
|
黎永顺
|
87024ceda9
|
数据采集页面重构
|
2023-02-21 18:05:54 +08:00 |
|
黎永顺
|
a11ad9d7d1
|
数据采集页面重构
|
2023-02-21 09:57:44 +08:00 |
|
黎永顺
|
9518d46dba
|
薪资项目管理页面修改
|
2023-02-20 14:35:54 +08:00 |
|
黎永顺
|
b6849400d7
|
数据采集页面重构
|
2023-02-20 14:28:08 +08:00 |
|
黎永顺
|
6cff75a9b5
|
数据采集页面重构
|
2023-02-20 13:21:04 +08:00 |
|
黎永顺
|
1674f9071f
|
数据采集页面重构
|
2023-02-20 10:53:45 +08:00 |
|
黎永顺
|
38f25e5a95
|
数据采集页面重构
|
2023-02-20 10:24:40 +08:00 |
|
黎永顺
|
751659d569
|
数据采集页面重构
|
2023-02-20 09:44:00 +08:00 |
|
黎永顺
|
3affb156b9
|
数据采集页面重构
|
2023-02-20 09:41:36 +08:00 |
|
黎永顺
|
67b211e656
|
数据采集页面重构
|
2023-02-17 17:21:05 +08:00 |
|
黎永顺
|
9369fc383c
|
薪资账套修改
|
2023-02-17 11:18:09 +08:00 |
|
黎永顺
|
2b6157788d
|
测试表格固定
|
2023-02-17 10:59:04 +08:00 |
|
黎永顺
|
7aee66760e
|
薪资项目管理以及字段管理页面修改
|
2023-02-17 10:05:30 +08:00 |
|
黎永顺
|
68302f7c3d
|
Merge branch 'hotfix/V2-0216' into develop
|
2023-02-17 09:20:09 +08:00 |
|
黎永顺
|
1ea8eb9e9d
|
薪资项目管理以及字段管理页面修改
|
2023-02-17 09:20:03 +08:00 |
|
黎永顺
|
68ce529eff
|
社保福利档案新增编辑页面重构
|
2023-02-16 17:20:45 +08:00 |
|
黎永顺
|
c93d68f451
|
薪资项目修改
|
2023-02-16 16:28:40 +08:00 |
|
黎永顺
|
3cbc12373a
|
社保福利档案新增编辑页面重构
|
2023-02-16 16:20:45 +08:00 |
|
黎永顺
|
b16cf18498
|
数据采集页面删除所选问题修复
|
2023-02-16 11:34:06 +08:00 |
|
黎永顺
|
6af7012e51
|
合并分支
|
2023-02-16 09:12:47 +08:00 |
|
黎永顺
|
b12ebdcf32
|
Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
|
2023-02-15 18:50:16 +08:00 |
|
黎永顺
|
a219206bc2
|
薪资账套修改
|
2023-02-15 18:47:37 +08:00 |
|
黎永顺
|
aa801b1ef8
|
薪资账套修改
|
2023-02-15 17:46:55 +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 |
|
黎永顺
|
efe05c530b
|
薪资项目修改
|
2023-02-15 17:21:49 +08:00 |
|
黎永顺
|
4ee0165885
|
社保福利档案新增编辑页面重构
|
2023-02-15 17:20:38 +08:00 |
|
黎永顺
|
ff692d5157
|
薪资项目修改
|
2023-02-15 16:54:23 +08:00 |
|
黎永顺
|
c789fd09d3
|
社保福利档案新增编辑页面重构
|
2023-02-15 15:02:14 +08:00 |
|
黎永顺
|
c795325da4
|
社保福利档案新增编辑页面重构
|
2023-02-15 14:37:40 +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 |
|
黎永顺
|
f2030e971f
|
社保福利档案新增编辑页面重构
|
2023-02-15 09:46:59 +08:00 |
|
黎永顺
|
661cc02ed4
|
社保福利档案新增编辑页面重构
|
2023-02-14 17:32:37 +08:00 |
|
黎永顺
|
d2590ecf8f
|
Merge branch 'release'
|
2023-02-14 16:23:19 +08:00 |
|
黎永顺
|
bb649ce6e3
|
薪资核算以及社保福利台账详情页面修改
|
2023-02-14 16:21:48 +08:00 |
|
黎永顺
|
e99fb4a756
|
Merge branch 'hotfix/V2-0216'
|
2023-02-14 15:38:23 +08:00 |
|
黎永顺
|
570493267e
|
薪资账套修改
|
2023-02-14 15:38:04 +08:00 |
|
黎永顺
|
e3f4cebe57
|
社保福利档案新增编辑页面重构
|
2023-02-14 14:59:55 +08:00 |
|
黎永顺
|
7c4e2f5588
|
社保福利档案新增编辑页面重构
|
2023-02-14 14:32:02 +08:00 |
|
黎永顺
|
4ce7eca139
|
社保福利档案新增编辑页面重构
|
2023-02-14 13:38:19 +08:00 |