 黎永顺
|
6f79efe805
|
Merge branch 'master' into feature/V2-非系统人员管理开发
|
2023-04-13 17:35:01 +08:00 |
|
黎永顺
|
8fe5f201c6
|
薪酬統計
|
2023-04-12 10:47:51 +08:00 |
|
黎永顺
|
6846e81498
|
产品-薪酬分析统计
|
2023-04-11 14:34:17 +08:00 |
|
黎永顺
|
dfae2661a6
|
产品功能-薪酬统计分析
|
2023-04-11 13:41:56 +08:00 |
|
黎永顺
|
444857a0d8
|
社保福利台账详情页面替换表格，添加合计行
|
2023-04-06 11:24:47 +08:00 |
|
黎永顺
|
a336a63b73
|
薪酬产品-往期累计情况（工资、薪金）添加个人公积金编辑项以及其他模块bug修复
|
2023-04-04 17:14:09 +08:00 |
|
黎永顺
|
785ecf9ae8
|
产品-薪资核算详情页面的导入添加额外字段添加缓存的功能
|
2023-03-17 17:52:27 +08:00 |
|
黎永顺
|
fa581dd2ad
|
社保福利臺站-添加合计行数据
|
2023-03-16 17:33:06 +08:00 |
|
黎永顺
|
6babf486e3
|
社保福利台账详情页面添加合计行列表
|
2023-03-16 17:03:24 +08:00 |
|
黎永顺
|
efadb541f5
|
非系统人员管理-新功能开发
|
2023-03-14 18:14:23 +08:00 |
|
黎永顺
|
eb207921cd
|
非系统人员管理-新功能开发
|
2023-03-13 14:40:19 +08:00 |
|
黎永顺
|
c46582560e
|
Merge branch 'feature/v2-数据采集-考勤引用页面重构' into develop
|
2023-03-10 11:43:44 +08:00 |
|
黎永顺
|
2dd2175ea2
|
薪资账套-薪资项目公式保存bug
|
2023-03-08 15:57:00 +08:00 |
|
黎永顺
|
6d5258daa5
|
数据采集-考勤引用页面重构
|
2023-03-07 14:47:47 +08:00 |
|
黎永顺
|
28a23e3cb1
|
薪资项目管理页面接口参数调整
|
2023-03-06 17:23:25 +08:00 |
|
黎永顺
|
10721ecba0
|
社保福利方案-自定义方案页面重构
|
2023-03-02 18:44:36 +08:00 |
|
黎永顺
|
64dd62cc83
|
工资单模板背景bug修改
|
2023-03-02 17:23:23 +08:00 |
|
黎永顺
|
a11ad9d7d1
|
数据采集页面重构
|
2023-02-21 09:57:44 +08:00 |
|
黎永顺
|
67b211e656
|
数据采集页面重构
|
2023-02-17 17:21:05 +08:00 |
|
黎永顺
|
2a1e152492
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-03 10:29:48 +08:00 |
|
黎永顺
|
a1f7537337
|
工资单模板添加新增薪资项目大类的功能
|
2023-02-02 18:59:55 +08:00 |
|
黎永顺
|
73e8357e22
|
字段管理
|
2023-01-28 13:42:32 +08:00 |
|
黎永顺
|
cd897394b6
|
字段管理
|
2023-01-28 10:10:00 +08:00 |
|
黎永顺
|
03d282f0f3
|
薪资账套关联人员添加导入人员的功能
|
2023-01-09 16:30:26 +08:00 |
|
黎永顺
|
3c6306638d
|
个税扣缴义务人添加导入人员范围的功能
|
2023-01-09 11:16:01 +08:00 |
|
黎永顺
|
61c139ffcf
|
Merge branch 'feature/v2-薪资项目公式测试' into develop
|
2023-01-04 11:19:32 +08:00 |
|
黎永顺
|
77b1ae17ed
|
薪资项目测试
|
2023-01-04 11:19:22 +08:00 |
|
黎永顺
|
9101769934
|
补缴新增
|
2023-01-03 10:08:52 +08:00 |
|
黎永顺
|
506490116f
|
调差保存默认
|
2022-12-27 13:46:00 +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 |
|
黎永顺
|
9b6c8ed544
|
社保福利台账详情页面的补缴添加编辑功能
|
2022-12-16 10:47:59 +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 |
|
黎永顺
|
a193ed6690
|
薪资账套页面重构
|
2022-12-13 16:10:48 +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 |
|
黎永顺
|
4413484c0a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-06 11:34:53 +08:00 |
|
黎永顺
|
672e697170
|
调差功能完成保存功能
|
2022-12-06 11:34:19 +08:00 |
|
黎永顺
|
a6150192f0
|
调差功能
|
2022-12-05 14:28:38 +08:00 |
|
黎永顺
|
479cea2967
|
工资单部分发放和部分撤回功能完成
|
2022-12-03 17:23:43 +08:00 |
|
黎永顺
|
fbcb7f6db2
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-24 17:40:44 +08:00 |
|
黎永顺
|
510f13009d
|
社保福利台账详情页面退差功能对接
|
2022-11-24 15:56:10 +08:00 |
|
黎永顺
|
c468ff35ff
|
个税扣缴义务人添加同步人员范围的功能
|
2022-11-23 15:42:51 +08:00 |
|
黎永顺
|
25e76718d2
|
社保福利档案退差功能
|
2022-11-23 15:12:19 +08:00 |
|
黎永顺
|
97b0efb583
|
Merge branch 'feature/v2-薪资档案调薪编辑-1117' into develop
|
2022-11-17 14:19:02 +08:00 |
|
黎永顺
|
68069df58b
|
薪资核算解锁锁定的功能
|
2022-11-17 14:17:34 +08:00 |
|
黎永顺
|
ea9359c728
|
其他免税扣除页面添加沿用上月的功能
|
2022-11-16 17:29:01 +08:00 |
|
黎永顺
|
a5213cb370
|
薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能
|
2022-11-15 15:42:09 +08:00 |
|
黎永顺
|
224eeeda42
|
Merge branch 'feature/v2-报税规则配置-1108' into develop
|
2022-11-09 14:31:57 +08:00 |
|
黎永顺
|
b187b17263
|
添加报税规则
|
2022-11-08 16:39:29 +08:00 |
18652063575
|
8e133ea43a
|
累计专项扣除页面添加一键累计的功能
|
2022-11-07 15:29:46 +08:00 |
|
18652063575
|
cf315eb608
|
专项附加扣除模块页面接口联调完成
|
2022-11-07 13:57:22 +08:00 |
|
18652063575
|
e355096bb3
|
Merge branch 'feature/v2-数据采集-1024' into release
|
2022-11-04 14:09:00 +08:00 |
|
18652063575
|
ca04e5405d
|
专项附加扣除接口联调
|
2022-11-04 11:33:58 +08:00 |
|
18652063575
|
b2164dbb46
|
Merge branch 'feature/v2-数据采集-1024' into feature/v2-专项附加扣除-1103
|
2022-11-03 17:53:42 +08:00 |
|
18652063575
|
39e6f95fef
|
Merge branch 'hotfix/v2-bug修复-1031' into feature/v2-专项附加扣除-1103
|
2022-11-03 17:52:59 +08:00 |
|
18652063575
|
72478c3fd8
|
专项附加扣除模块
|
2022-11-03 17:52:02 +08:00 |
|
18652063575
|
abd8f2b9f4
|
社保福利档案页面的接口联调
|
2022-11-01 15:50:54 +08:00 |
|
18652063575
|
8a964d7e40
|
数据采集接口联调
|
2022-11-01 14:06:06 +08:00 |
|
18652063575
|
d4ecfb3a1e
|
数据采集接口对接
|
2022-10-31 17:35:21 +08:00 |
|
18652063575
|
8008c0855a
|
数据采集接口联调
|
2022-10-31 13:55:49 +08:00 |
|
18652063575
|
08ab6de7a4
|
hotfix/v2-bug修复-1024
|
2022-10-28 17:12:03 +08:00 |
|
18652063575
|
c4c24dd159
|
薪资档案以及社保福利档案页面部分bug修复
|
2022-10-20 17:53:26 +08:00 |
|
18652063575
|
d7fcdd2637
|
薪资档案以及社保福利档案页面添加四个tab的列表查询
|
2022-10-17 10:03:01 +08:00 |
|
18652063575
|
284761360f
|
加密设置功能添加
|
2022-10-10 15:02:46 +08:00 |
|
18652063575
|
8da3d30a69
|
社保福利台账线下对比功能完善
|
2022-09-29 16:35:41 +08:00 |
|
18652063575
|
1d1ced8d77
|
社保福利台账添加线下对比的页面功能
|
2022-09-29 15:45:23 +08:00 |
|
18652063575
|
3808d0b625
|
考勤查看页面报错
|
2022-09-16 17:25:31 +08:00 |
|
18652063575
|
3131de6446
|
接口异常报错提示
|
2022-09-15 17:57:38 +08:00 |
|
18652063575
|
756ca0cb74
|
新增系统配置页面以及新增和编辑接口功能
|
2022-09-15 16:58:49 +08:00 |
|
18652063575
|
27e54073c6
|
统一所有页面你的弹框以及抽屉头部组件,样式bug的修改
|
2022-09-15 11:08:13 +08:00 |
|
18652063575
|
938fb94743
|
bug的修正
|
2022-09-08 17:04:36 +08:00 |
|
liyongshun
|
6768649ac4
|
bug的修正
|
2022-08-25 17:54:18 +08:00 |
|
liyongshun
|
67f0de658a
|
薪资核算页面表格替换antd4.x的table组件
|
2022-08-11 17:38:03 +08:00 |
|
liyongshun
|
ae3af8e59e
|
薪资项目管理页面添加sql项的数据源选项
|
2022-08-03 17:54:47 +08:00 |
|
liyongshun
|
f8f485c6a7
|
薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口
|
2022-08-02 18:17:08 +08:00 |
|
liyongshun
|
d774de6a64
|
薪资账套编辑页面修改
|
2022-07-28 17:16:40 +08:00 |
|
liyongshun
|
134653fac6
|
薪资发放页面添加进度条弹框组件
|
2022-07-21 17:34:10 +08:00 |
|
liyongshun
|
6579751717
|
替换个税扣缴义务人接口和分页bug的修改
|
2022-07-05 16:35:42 +08:00 |
|
liyongshun
|
65be568847
|
测试bug的修复
|
2022-06-29 17:04:01 +08:00 |
|
liyongshun
|
bac1e217a2
|
Merge branch 'release' into release-zhongjiang
|
2022-06-28 18:08:26 +08:00 |
|
liyongshun
|
a258a2f342
|
bug
|
2022-06-28 18:07:41 +08:00 |
|
liyongshun
|
0da6205159
|
Merge branch 'release' into release-zhongjiang
|
2022-06-27 10:38:01 +08:00 |
|
liyongshun
|
aa165e70da
|
修改导出的bug
|
2022-06-27 10:35:39 +08:00 |
|
liyongshun
|
aaeb4b9459
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-17 17:20:51 +08:00 |
|
liyongshun
|
78adb5cf0d
|
测试bug的修复
|
2022-06-17 16:53:27 +08:00 |
MustangDeng
|
5decf617a6
|
工资单页面定制
|
2022-06-13 16:31:08 +08:00 |
|
MustangDeng
|
aebb43b461
|
福利台账分权
|
2022-06-09 18:30:19 +08:00 |
|
liyongshun
|
e552f34103
|
添加权限
|
2022-06-02 17:11:28 +08:00 |
|
liyongshun
|
17e23fc014
|
列表分页以及权限的修改
|
2022-06-02 14:48:55 +08:00 |
|
MustangDeng
|
6adf1a83fa
|
bug
|
2022-05-30 09:38:45 +08:00 |
|
MustangDeng
|
f4ac00ddbd
|
补交
|
2022-05-26 09:46:28 +08:00 |
|
MustangDeng
|
45e72e723f
|
bug修复
|
2022-05-19 15:13:31 +08:00 |
|
MustangDeng
|
4701ada4dc
|
福利方案bug处理
|
2022-05-18 17:10:12 +08:00 |
|
MustangDeng
|
b2d5b1a90c
|
修复bug
|
2022-05-10 15:31:13 +08:00 |
|
MustangDeng
|
9517e97bad
|
福利档案
|
2022-05-09 14:23:43 +08:00 |
|
MustangDeng
|
c85c2ec66f
|
福利导入
|
2022-05-07 14:47:14 +08:00 |
|
MustangDeng
|
00f867914a
|
工资单预览
|
2022-05-05 15:53:35 +08:00 |