 黎永顺
|
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 |
|
黎永顺
|
7d5c026611
|
薪资核算详情页面列表bug修改
|
2023-02-08 10:46:16 +08:00 |
|
黎永顺
|
b9e32efd1c
|
工资单模板添加分类弹框修改
|
2023-02-08 10:27:38 +08:00 |
|
黎永顺
|
93ea26dfac
|
工资单模板编辑新增页面样式调整
|
2023-02-07 15:46:15 +08:00 |
|
黎永顺
|
b8f941d575
|
新增的字段管理页面样式修改
|
2023-02-07 15:18:30 +08:00 |
|
黎永顺
|
5fc373c540
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-07 13:40:54 +08:00 |
|
黎永顺
|
7020f1ec2e
|
薪资账套中薪资项目添加 新项时排序的问题处理
|
2023-02-07 11:25:21 +08:00 |
|
黎永顺
|
3eec4e4726
|
薪资账套中薪资项目添加 新项时排序的问题处理
|
2023-02-07 10:03:29 +08:00 |
|
黎永顺
|
95e8d0d8c5
|
薪资账套薪资项目基础信息排序bug修改
|
2023-02-06 17:10:01 +08:00 |
|
黎永顺
|
4d42ea9fbc
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-06 10:10:57 +08:00 |
|
黎永顺
|
9452bd9d64
|
工资单模板页面新增分类功能修改
|
2023-02-06 10:10:37 +08:00 |
|
黎永顺
|
db2fc4ba2e
|
工资单模板上传背景组件的样式修改
|
2023-02-03 11:24:17 +08:00 |
|
黎永顺
|
2a1e152492
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-03 10:29:48 +08:00 |
|
黎永顺
|
e20c25e691
|
Merge branch 'feature/V2-社保福利方案新增字段' into develop
|
2023-02-03 10:29:08 +08:00 |
|
黎永顺
|
b72dcc3e6b
|
薪资项目管理页面分页的bug
|
2023-02-03 10:12:53 +08:00 |
|
黎永顺
|
5a73aee25b
|
工资单模板新增bug修改
|
2023-02-03 09:21:51 +08:00 |
|
黎永顺
|
a1f7537337
|
工资单模板添加新增薪资项目大类的功能
|
2023-02-02 18:59:55 +08:00 |
|
黎永顺
|
7ea4a6f6a8
|
工资单模板添加新增薪资项目大类的功能
|
2023-02-02 14:46:39 +08:00 |
|
黎永顺
|
b234e78b2f
|
社保福利方案新增字段
|
2023-02-01 17:57:21 +08:00 |
|
黎永顺
|
a74d887d6a
|
样式调整
|
2023-02-01 11:21:00 +08:00 |
|
黎永顺
|
464f986f62
|
去除打印信息
|
2023-01-31 11:26:37 +08:00 |
|
黎永顺
|
4f55e755cb
|
去除打印信息
|
2023-01-31 10:32:49 +08:00 |
|
黎永顺
|
5c0a909f07
|
Merge branch 'hotfix/feature-v2-0202' into develop
|
2023-01-31 10:27:26 +08:00 |
|
黎永顺
|
688bc7afe4
|
Merge branch 'feature/v2-字段管理页面-0120' into develop
|
2023-01-31 10:27:18 +08:00 |
|
黎永顺
|
e9b0a50019
|
字段管理页面
|
2023-01-31 10:25:07 +08:00 |
|
黎永顺
|
c4c17113ce
|
字段管理页面
|
2023-01-31 10:14:10 +08:00 |
|
黎永顺
|
33bb4b9814
|
薪资账套修改
|
2023-01-30 10:53:47 +08:00 |
|
黎永顺
|
0d0a9fc31e
|
薪资账套修改
|
2023-01-30 09:39:40 +08:00 |
|
黎永顺
|
42ee5f0cd8
|
薪资核算修改
|
2023-01-29 15:52:46 +08:00 |
|
黎永顺
|
117d1561c2
|
按钮图标
|
2023-01-29 14:46:38 +08:00 |
|
黎永顺
|
f53e8a733d
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-28 17:54:28 +08:00 |
|
黎永顺
|
6e8b446b16
|
按钮图标
|
2023-01-28 17:54:09 +08:00 |
|
黎永顺
|
73e8357e22
|
字段管理
|
2023-01-28 13:42:32 +08:00 |
|
黎永顺
|
cd897394b6
|
字段管理
|
2023-01-28 10:10:00 +08:00 |
|
黎永顺
|
8048f11d07
|
Merge branch 'hotfix/feature-v2-0119' into develop
|
2023-01-18 10:27:50 +08:00 |
|
黎永顺
|
ace2bcb8b5
|
薪资账套修改
|
2023-01-18 09:22:14 +08:00 |
|
黎永顺
|
f4bc18d64f
|
Merge branch 'hotfix/feature-v2-0119' into develop
|
2023-01-16 11:40:08 +08:00 |
|
黎永顺
|
d6f7d3c19b
|
高版本表格组件修改
|
2023-01-16 11:39:49 +08:00 |
|
黎永顺
|
578851b80c
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-13 17:30:43 +08:00 |
|
黎永顺
|
8fd6579dfd
|
薪资账套报错bug
|
2023-01-13 17:30:24 +08:00 |
|
黎永顺
|
fdf51fe32f
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-13 09:33:58 +08:00 |
|
黎永顺
|
1acb46788b
|
社保档案的bug修改
|
2023-01-13 09:33:46 +08:00 |
|
黎永顺
|
df15c64d18
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-12 09:41:32 +08:00 |
|
黎永顺
|
0598d4ee95
|
Merge branch 'hotfix/feature-v2-0112' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
|
2023-01-12 09:40:50 +08:00 |
|
黎永顺
|
8a51c05c30
|
人员导入报错信息不提示
|
2023-01-11 13:33:52 +08:00 |
|
黎永顺
|
814eefa1de
|
福利台账，正常缴纳月添加编辑的功能
|
2023-01-10 13:51:14 +08:00 |
|
黎永顺
|
a618931e50
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-09 16:30:52 +08:00 |
|
黎永顺
|
03d282f0f3
|
薪资账套关联人员添加导入人员的功能
|
2023-01-09 16:30:26 +08:00 |
|
黎永顺
|
37471efc71
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-09 15:02:50 +08:00 |
|
黎永顺
|
69961a6c15
|
应用设置页面新增修改项
|
2023-01-09 15:02:26 +08:00 |
|
黎永顺
|
b9a864a30e
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-09 14:35:48 +08:00 |
|
黎永顺
|
b3eb3bd779
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-09 14:30:38 +08:00 |
|
黎永顺
|
e24078ba1c
|
薪资档案查询参数修改
|
2023-01-09 14:30:19 +08:00 |
|
黎永顺
|
5c6db20caa
|
工资单模板预览页面空白
|
2023-01-09 14:04:08 +08:00 |