 黎永顺
|
c902c32140
|
考勤引用模块页面重构
|
2023-03-02 14:07:36 +08:00 |
|
黎永顺
|
77c763d421
|
bug
修复
|
2023-03-02 09:38:29 +08:00 |
|
黎永顺
|
e9b6fd32b6
|
bug
修复
|
2023-03-02 09:34:04 +08:00 |
|
黎永顺
|
5d4f763316
|
bug
修复
|
2023-03-01 18:29:28 +08:00 |
|
黎永顺
|
3d67ee671f
|
考勤引用页面重构
|
2023-03-01 18:07:49 +08:00 |
|
黎永顺
|
fe71ce161b
|
考勤引用页面重构
|
2023-03-01 16:28:34 +08:00 |
|
黎永顺
|
c9560ae679
|
考勤引用页面重构
|
2023-03-01 15:23:56 +08:00 |
|
黎永顺
|
36e0e40bdd
|
考勤引用页面重构
|
2023-03-01 11:15:28 +08:00 |
|
黎永顺
|
c60ed4da78
|
bug修复
|
2023-03-01 10:11:11 +08:00 |
|
黎永顺
|
33ac08515e
|
bug修复
|
2023-03-01 09:05:57 +08:00 |
|
黎永顺
|
ef7e7d4ae5
|
bug修复
|
2023-02-28 18:16:17 +08:00 |
|
黎永顺
|
cf1f12451e
|
弹框样式修改
|
2023-02-28 10:43:50 +08:00 |
|
黎永顺
|
aaff69de31
|
工资单查看详情页面列表滚动
|
2023-02-28 09:59:21 +08:00 |
|
黎永顺
|
ee712a5056
|
社保福利档案日期控件修改
|
2023-02-28 09:26:54 +08:00 |
|
黎永顺
|
8a859da6fe
|
薪资账套已有bug修复
|
2023-02-27 18:59:18 +08:00 |
|
黎永顺
|
3d783247e9
|
薪资账套已有bug修复
|
2023-02-27 18:28:05 +08:00 |
|
黎永顺
|
70d15cd06e
|
薪资项目管理按钮权限的修改
|
2023-02-27 13:28:49 +08:00 |
|
黎永顺
|
de7180882d
|
薪资项目管理按钮权限的修改
|
2023-02-27 13:23:41 +08:00 |
|
黎永顺
|
7539c60af5
|
社保福利方案表格固定的bug处理
|
2023-02-27 09:16:57 +08:00 |
|
黎永顺
|
bbc855d6bd
|
已知bug修复
|
2023-02-24 15:52:19 +08:00 |
|
黎永顺
|
df7c8b943f
|
考勤引用页面重构
|
2023-02-24 11:05:52 +08:00 |
|
黎永顺
|
667aa8808d
|
考勤引用页面重构
|
2023-02-23 17:25:45 +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 |
|
黎永顺
|
9501a55f7c
|
Merge branch 'hotfix/V2-0216'
|
2023-02-13 17:33:00 +08:00 |
|
黎永顺
|
c22e326fd7
|
工资单问题
|
2023-02-13 17:31:52 +08:00 |
|
黎永顺
|
a665200b9c
|
Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mySalary/index.js
|
2023-02-13 17:29:06 +08:00 |
|
黎永顺
|
f39f70de25
|
社保福利档案小数点问题
|
2023-02-13 17:24:36 +08:00 |
|
黎永顺
|
38ca2cc421
|
社保福利档案页面重构
|
2023-02-13 16:38:15 +08:00 |
|
黎永顺
|
f6f786b33f
|
社保福利档案页面重构
|
2023-02-13 16:00:14 +08:00 |
|
黎永顺
|
d77a3f5fca
|
薪酬页面滚动的修改
|
2023-02-13 10:41:40 +08:00 |
|
黎永顺
|
84791cc69f
|
线下对比页面修改
|
2023-02-10 14:55:12 +08:00 |
|
黎永顺
|
df12fae609
|
字段管理页面修改
|
2023-02-10 11:40:07 +08:00 |
|
黎永顺
|
839e1e8b20
|
字段管理页面修改
|
2023-02-10 11:13:29 +08:00 |
|
黎永顺
|
758e9ca27b
|
字段管理页面修改
|
2023-02-10 11:01:51 +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 |
|
黎永顺
|
faafd9874d
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 19:45:29 +08:00 |
|
黎永顺
|
8416f73376
|
薪资项目管理页面編輯报错bug处理
|
2023-02-09 19:45:08 +08:00 |
|
黎永顺
|
7578c4b09e
|
薪资项目管理页面重构
|
2023-02-09 19:34:40 +08:00 |
|
黎永顺
|
f61c4bfbb0
|
薪资项目管理页面重构
|
2023-02-09 17:24:51 +08:00 |
|
黎永顺
|
5e1cec5324
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 16:23:34 +08:00 |
|
黎永顺
|
f40d403515
|
薪资项目管理的可见性必填判断
|
2023-02-09 16:23:19 +08:00 |
|
黎永顺
|
f1ce121698
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 15:36:44 +08:00 |
|
黎永顺
|
8fe520e842
|
薪资账套已知bug修复
|
2023-02-09 15:36:23 +08:00 |
|
黎永顺
|
b2acfd61be
|
薪资项目管理新增编辑页面重构
|
2023-02-09 14:27:03 +08:00 |
|
黎永顺
|
77fa0f50cb
|
字段管理页面保存编辑接口修改
|
2023-02-09 13:16:43 +08:00 |
|
黎永顺
|
28dd4faf13
|
薪资项目管理页面重构
|
2023-02-09 13:05:22 +08:00 |
|
黎永顺
|
bab032c4a7
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 09:49:28 +08:00 |
|
黎永顺
|
010c3c9c96
|
薪资项目和字段管理页面中放开薪资档案引用字段
|
2023-02-09 09:49:04 +08:00 |
|
黎永顺
|
b54cb8d226
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-09 09:26:19 +08:00 |
|
黎永顺
|
2434cde0bd
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-08 17:54:22 +08:00 |
|
黎永顺
|
0d70495c4f
|
薪资账套页面薪资项目项修改
|
2023-02-08 17:54:01 +08:00 |