 黎永顺
|
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 |
|
黎永顺
|
3c6306638d
|
个税扣缴义务人添加导入人员范围的功能
|
2023-01-09 11:16:01 +08:00 |
|
黎永顺
|
7f5609550d
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-09 09:41:07 +08:00 |
|
黎永顺
|
0a3e2f8b02
|
往期累计情况页面查询丢失日期的bug修改
|
2023-01-09 09:40:50 +08:00 |
|
黎永顺
|
811adfe9f6
|
Merge branch 'feature/v2-薪资项目公式测试' into develop
|
2023-01-06 09:36:37 +08:00 |
|
黎永顺
|
7d4c8361c0
|
公式测试bug的修复
|
2023-01-06 09:35:34 +08:00 |
|
黎永顺
|
7c65f2b7d3
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-05 15:03:22 +08:00 |
|
黎永顺
|
b0604f854c
|
薪资账套报错
|
2023-01-05 15:03:03 +08:00 |
|
黎永顺
|
7d06f4a749
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-05 09:46:04 +08:00 |
|
黎永顺
|
d48dcd234b
|
往期累计情况页面loading的问题
|
2023-01-05 09:45:50 +08:00 |
|
黎永顺
|
d67dff3c76
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-04 17:47:41 +08:00 |
|
黎永顺
|
50c29dd093
|
往期累计情况一键清除提示语修改
|
2023-01-04 17:47:20 +08:00 |
|
黎永顺
|
f0d7ec8f5b
|
Merge branch 'feature/v2-社保福利台账补缴新增' into develop
|
2023-01-04 15:47:16 +08:00 |
|
黎永顺
|
fc8f5a4625
|
新增补缴必填项提示
|
2023-01-04 15:46:32 +08:00 |
|
黎永顺
|
6a573cd1aa
|
Merge branch 'feature/v2-社保福利台账补缴新增' into develop
|
2023-01-04 14:37:37 +08:00 |
|
黎永顺
|
4f89a7ef4f
|
新增补缴添加空值判断
|
2023-01-04 14:37:19 +08:00 |
|
黎永顺
|
3fc605ccb8
|
Merge branch 'feature/v2-薪资项目公式测试' into develop
|
2023-01-04 11:39:18 +08:00 |
|
黎永顺
|
a83d261c20
|
薪资项目测试
|
2023-01-04 11:39:00 +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 |
|
黎永顺
|
9017297bc0
|
薪资项目测试
|
2023-01-04 09:46:20 +08:00 |
|
黎永顺
|
72acbe6485
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-03 17:19:36 +08:00 |
|
黎永顺
|
62f36c4d42
|
补缴新增功能完成
|
2023-01-03 16:52:15 +08:00 |
|
黎永顺
|
5274e5fc1d
|
补缴新增功能完成
|
2023-01-03 16:50:03 +08:00 |
|
黎永顺
|
a7daf5e3c0
|
补缴新增功能完成
|
2023-01-03 16:46:26 +08:00 |
|
黎永顺
|
f013923285
|
薪资项目公式添加测试
|
2023-01-03 10:36:13 +08:00 |
|
黎永顺
|
9101769934
|
补缴新增
|
2023-01-03 10:08:52 +08:00 |
|
黎永顺
|
107d1025db
|
调差列表样式修改
|
2022-12-30 09:05:47 +08:00 |
|
黎永顺
|
ded592b1eb
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2022-12-29 16:41:10 +08:00 |
|
黎永顺
|
a7ec29a30a
|
Merge branch 'feature/v2-社保福利台账调差默认设置' into develop
|
2022-12-29 16:41:04 +08:00 |
|
黎永顺
|
c7b28eb2e2
|
调差单条保存的优化
|
2022-12-29 16:40:53 +08:00 |
|
黎永顺
|
55a2fbc5a5
|
Merge branch 'feature/v2-社保福利台账调差默认设置' into develop
|
2022-12-29 15:34:39 +08:00 |
|
黎永顺
|
992bba159d
|
调差NaN的bug
|
2022-12-29 15:34:20 +08:00 |
|
黎永顺
|
462cea820c
|
工资单模板bug修复
|
2022-12-29 11:20:01 +08:00 |
|
黎永顺
|
9f2beca0a4
|
Merge branch 'feature/v2-社保福利台账调差默认设置' into develop
|
2022-12-29 09:52:44 +08:00 |
|
黎永顺
|
657704f8ea
|
社保核算报错
|
2022-12-28 16:38:59 +08:00 |
|
黎永顺
|
755ef54c21
|
调差保存默认
|
2022-12-28 11:40:51 +08:00 |
|
黎永顺
|
506490116f
|
调差保存默认
|
2022-12-27 13:46:00 +08:00 |
|
黎永顺
|
8fa65f4efb
|
工资单模板预览报错
|
2022-12-23 17:30:59 +08:00 |
|
黎永顺
|
e058b3b658
|
Merge branch 'release'
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
|
2022-12-22 13:36:09 +08:00 |
|
黎永顺
|
3170ed0ea9
|
Merge branch 'develop' into release
|
2022-12-21 15:29:45 +08:00 |
|
黎永顺
|
0bb52e145a
|
添加成本中心跳转连接
|
2022-12-20 17:22:28 +08:00 |
|
黎永顺
|
957a4f4746
|
社保福利方案详情bug修改
|
2022-12-20 10:52:24 +08:00 |
|
黎永顺
|
6337355943
|
Merge branch 'feature/V2-薪资账套页面重构-1222' into develop
|
2022-12-19 14:56:07 +08:00 |
|
黎永顺
|
7c3af0ad5b
|
部分bug修改
|
2022-12-19 14:55:46 +08:00 |
|
黎永顺
|
d974fe73aa
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-16 17:37:10 +08:00 |
|
黎永顺
|
0894f91765
|
优化薪资档案
|
2022-12-16 17:36:56 +08:00 |
|
黎永顺
|
e0217ff455
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-16 17:00:42 +08:00 |
|
黎永顺
|
5b66b538b8
|
优化薪资档案
|
2022-12-16 17:00:24 +08:00 |
|
黎永顺
|
42ec1c6918
|
补差功能完善
|
2022-12-16 16:19:30 +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 |
|
黎永顺
|
4f0a24fe25
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-16 16:09:17 +08:00 |
|
黎永顺
|
28b34fa112
|
薪资账套中薪资项目调换位置保存不生效
|
2022-12-16 16:07:04 +08:00 |
|
黎永顺
|
26457c01e6
|
社保福利台账核算详情页面添加补差的功能
|
2022-12-16 15:38:39 +08:00 |
|
黎永顺
|
ae881a1f37
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-16 11:05:24 +08:00 |
|
黎永顺
|
00f87ba5e5
|
薪资账套非空判断
|
2022-12-16 11:05:07 +08:00 |
|
黎永顺
|
9b6c8ed544
|
社保福利台账详情页面的补缴添加编辑功能
|
2022-12-16 10:47:59 +08:00 |
|
黎永顺
|
a0b87fa275
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-15 16:22:26 +08:00 |
|
黎永顺
|
47bc638cdb
|
薪资核算页面bug修复
|
2022-12-15 16:21:56 +08:00 |
|
黎永顺
|
953a6de120
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-15 12:00:06 +08:00 |
|
黎永顺
|
78b8d796f0
|
薪资账套页面重构
|
2022-12-15 11:59:45 +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 |
|
黎永顺
|
98c628798a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-14 15:39:24 +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 |
|
黎永顺
|
a193ed6690
|
薪资账套页面重构
|
2022-12-13 16:10:48 +08:00 |
|
黎永顺
|
6ca09c7fae
|
1
|
2022-12-12 17:26:44 +08:00 |
|
黎永顺
|
6a885877e6
|
1
|
2022-12-12 17:14:14 +08:00 |
|
黎永顺
|
783d1532aa
|
1
|
2022-12-12 16:42:31 +08:00 |
|
黎永顺
|
61b595404f
|
薪资账套页面重构
|
2022-12-12 16:36:08 +08:00 |
|
黎永顺
|
9e3739d816
|
薪资账套页面重构
|
2022-12-12 16:35:19 +08:00 |
|
黎永顺
|
906e2dd40e
|
往期累计情况导出全部url添加月份参数
|
2022-12-12 16:17:06 +08:00 |
|
黎永顺
|
6d9787d924
|
薪资账套页面重构
|
2022-12-12 16:10:11 +08:00 |
|
黎永顺
|
2de636febc
|
薪资账套页面重构
|
2022-12-12 15:16:10 +08:00 |
|
黎永顺
|
7c266deda3
|
保存薪资项目报错
|
2022-12-12 14:57:05 +08:00 |
|
黎永顺
|
a7028943ed
|
薪资账套页面重构
|
2022-12-12 14:15:58 +08:00 |
|
黎永顺
|
fa45739e66
|
薪资账套页面重构
|
2022-12-12 11:38:43 +08:00 |
|
黎永顺
|
1e0c47364f
|
薪资账套页面重构
|
2022-12-12 10:24:07 +08:00 |
|
黎永顺
|
ac8c1ee43a
|
薪资账套页面重构
|
2022-12-09 15:26:21 +08:00 |
|
黎永顺
|
665f3a0119
|
薪资账套中薪资项目排序报错的bug
|
2022-12-09 14:48:51 +08:00 |
|
黎永顺
|
c6d6693198
|
薪资账套页面重构
|
2022-12-09 14:16:11 +08:00 |
|
黎永顺
|
a73e26128e
|
社保福利讨账接口调整
|
2022-12-08 17:29:15 +08:00 |
|
黎永顺
|
76120a7a54
|
薪资账套重构
|
2022-12-08 17:27:04 +08:00 |
|
黎永顺
|
b3532b6bd0
|
薪资账套重构
|
2022-12-08 17:18:56 +08:00 |
|
黎永顺
|
1d64220c7c
|
薪资账套重构
|
2022-12-08 16:58:32 +08:00 |
|
黎永顺
|
645ec864f3
|
薪资账套重构
|
2022-12-08 16:43:55 +08:00 |
|
黎永顺
|
7baf97e20f
|
薪资账套重构
|
2022-12-08 15:48:46 +08:00 |
|
黎永顺
|
d6fde20bd1
|
调差功能修改
|
2022-12-08 13:55:52 +08:00 |
|
黎永顺
|
b7a08279f4
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into develop
|
2022-12-08 13:47:36 +08:00 |
|
黎永顺
|
65867fe57c
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-08 13:47:16 +08:00 |
|
黎永顺
|
e1b80cd21f
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-08 13:45:01 +08:00 |
|
黎永顺
|
fc07b6d46b
|
调差功能修改
|
2022-12-08 13:44:35 +08:00 |
|
黎永顺
|
f215a54a36
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-08 11:42:33 +08:00 |
|
黎永顺
|
33ef783d2b
|
调差功能修改
|
2022-12-08 11:42:08 +08:00 |
|
黎永顺
|
5b768dde10
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-08 10:37:00 +08:00 |
|
黎永顺
|
a41a37db67
|
调差功能修改
|
2022-12-08 10:36:36 +08:00 |
|
黎永顺
|
ebfd3386c5
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into release
|
2022-12-08 10:29:28 +08:00 |
|
黎永顺
|
4fd8d91124
|
个税扣缴义务人恢复删除功能
|
2022-12-08 10:28:59 +08:00 |
|
黎永顺
|
bebc1c8c98
|
社保福利档案调差修改
|
2022-12-08 10:11:11 +08:00 |
|
黎永顺
|
1747ed903c
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-07 17:53:41 +08:00 |
|
黎永顺
|
a378879fa0
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into release
|
2022-12-07 17:53:13 +08:00 |
|
黎永顺
|
e9c869fca8
|
社保福利档案调差功能bug修复
|
2022-12-07 17:52:50 +08:00 |
|
黎永顺
|
0e53183958
|
工资单部分发放和部分撤回
|
2022-12-07 17:43:39 +08:00 |
|
黎永顺
|
53d418fe78
|
薪资账套页面重构
|
2022-12-07 17:06:00 +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 |
|
黎永顺
|
7627c4f6a4
|
工资单模板添加补发工资单模版
|
2022-12-07 15:14:20 +08:00 |
|
黎永顺
|
b12d3862a0
|
薪资账套页面页面重构
|
2022-12-07 14:40:07 +08:00 |
|
黎永顺
|
593140b54f
|
工资单模板修改
|
2022-12-07 14:15:46 +08:00 |
|
黎永顺
|
0bd6f6964a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-06 16:11:41 +08:00 |
|
黎永顺
|
e8a8b0a75c
|
保存退差提示语修改
|
2022-12-06 16:11:27 +08:00 |
|
黎永顺
|
2631e8065e
|
薪资账套页面重构
|
2022-12-06 16:06:35 +08:00 |
|
黎永顺
|
2d78222cf5
|
福利台账-重新核算后调差页面需要刷新才能删除
|
2022-12-06 15:44:29 +08:00 |
|
黎永顺
|
499fe647a2
|
福利台账-调差页面点击保存时校验有误
|
2022-12-06 15:18:40 +08:00 |
|
黎永顺
|
4825d0cd49
|
工资单模板修改
|
2022-12-06 15:04:57 +08:00 |
|
黎永顺
|
4413484c0a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-06 11:34:53 +08:00 |
|
黎永顺
|
648957dcab
|
Merge branch 'hotfix/v2-1208' into develop
|
2022-12-06 11:34:39 +08:00 |
|
黎永顺
|
672e697170
|
调差功能完成保存功能
|
2022-12-06 11:34:19 +08:00 |
|
黎永顺
|
a6150192f0
|
调差功能
|
2022-12-05 14:28:38 +08:00 |
|
黎永顺
|
62cccbc7ac
|
调差功能
|
2022-12-05 14:21:08 +08:00 |
|
黎永顺
|
d54f829f72
|
调差功能
|
2022-12-05 13:54:30 +08:00 |
|
黎永顺
|
c2e8cd8dae
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into develop
|
2022-12-05 09:05:20 +08:00 |
|
黎永顺
|
b17796f0ab
|
个税扣缴义务人恢复删除功能
|
2022-12-03 17:28:11 +08:00 |
|
黎永顺
|
479cea2967
|
工资单部分发放和部分撤回功能完成
|
2022-12-03 17:23:43 +08:00 |
|
黎永顺
|
29abd303af
|
工资单1
|
2022-12-02 16:52:35 +08:00 |
|
黎永顺
|
41c400c329
|
工资单
|
2022-12-02 16:42:58 +08:00 |
|
黎永顺
|
5e23404b32
|
工资单
|
2022-12-02 16:12:11 +08:00 |
|
黎永顺
|
42e959c579
|
Merge branch 'hotfix/v2-1202' into develop
|
2022-12-02 14:38:33 +08:00 |
|
黎永顺
|
915462919a
|
薪资账套抽屉页面表格样式修改
|
2022-12-02 14:38:17 +08:00 |
|
黎永顺
|
a4dbd0cc4b
|
工资单发放部分发放和部分撤回
|
2022-12-02 14:27:39 +08:00 |
|
黎永顺
|
2d1cc3cd61
|
Merge branch 'hotfix/v2-1202' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
|
2022-12-02 10:50:19 +08:00 |
|
黎永顺
|
691358a9e2
|
统一系统右键
|
2022-12-01 14:28:30 +08:00 |
|
黎永顺
|
3ac1e4ea6b
|
修改退差人员选择框
|
2022-11-28 16:24:33 +08:00 |
|
黎永顺
|
1f9e071b25
|
修改退差人员选择框
|
2022-11-28 11:17:38 +08:00 |
|
黎永顺
|
3068ee9cd8
|
修改添加自定义薪资项目保存参数
|
2022-11-25 17:56:55 +08:00 |
|
黎永顺
|
7d3abf70bf
|
退差添加人员组件
|
2022-11-25 17:37:26 +08:00 |
|
黎永顺
|
b3f9ddcd11
|
退差删除分页查询的问题
|
2022-11-25 13:46:51 +08:00 |
|
黎永顺
|
ce8f79eea4
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-25 13:32:28 +08:00 |
|
黎永顺
|
c7a23c0017
|
5
|
2022-11-25 13:32:14 +08:00 |
|
黎永顺
|
ea41f65246
|
Merge branch 'feature/v2-社保福利档案退差-1124' into develop
|
2022-11-25 12:36:47 +08:00 |
|
黎永顺
|
3b5c8e1ec9
|
4
|
2022-11-25 12:36:24 +08:00 |
|
黎永顺
|
693351f3d5
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-25 11:48:06 +08:00 |
|
黎永顺
|
52121e2713
|
3
|
2022-11-25 11:47:29 +08:00 |
|
黎永顺
|
6410ac43e2
|
Merge branch 'feature/v2-社保福利档案退差-1124' into develop
|
2022-11-25 11:09:06 +08:00 |
|
黎永顺
|
7af6df0972
|
12
|
2022-11-25 11:08:49 +08:00 |
|
黎永顺
|
21dd8e3e22
|
Merge branch 'feature/v2-社保福利档案退差-1124' into develop
|
2022-11-25 11:03:34 +08:00 |
|
黎永顺
|
9b6454bdd2
|
1
|
2022-11-25 11:03:19 +08:00 |
|
黎永顺
|
760437734f
|
Merge branch 'feature/v2-社保福利档案退差-1124' into develop
|
2022-11-25 09:51:28 +08:00 |
|
黎永顺
|
f86d5a34e0
|
社保福利台账详情页面退差功能对接
|
2022-11-25 09:50:53 +08:00 |
|
黎永顺
|
75dbe7c096
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-24 19:06:10 +08:00 |
|
黎永顺
|
b1efea87a3
|
薪资核算添加核算人员的功能
|
2022-11-24 19:05:54 +08:00 |
|
黎永顺
|
9890188410
|
Merge branch 'feature/v2-社保福利档案退差-1124' into develop
|
2022-11-24 18:45:59 +08:00 |
|
黎永顺
|
7b083101c2
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-24 18:45:44 +08:00 |
|
黎永顺
|
23b44a0b4c
|
社保福利台账详情页面退差功能对接
|
2022-11-24 18:45:12 +08:00 |
|
黎永顺
|
ca29007a00
|
薪资核算添加核算人员的功能
|
2022-11-24 18:17:12 +08:00 |
|
黎永顺
|
fbcb7f6db2
|
Merge branch 'hotfix/v2-1124' into develop
|
2022-11-24 17:40:44 +08:00 |
|
黎永顺
|
c040469ee1
|
社保福利台账详情页面退差功能对接
|
2022-11-24 17:40:13 +08:00 |
|
黎永顺
|
c6f170d373
|
薪资核算添加核算人员的功能
|
2022-11-24 17:37:16 +08:00 |
|
黎永顺
|
32072512a9
|
薪资核算添加核算人员的功能
|
2022-11-24 17:36:00 +08:00 |
|
黎永顺
|
510f13009d
|
社保福利台账详情页面退差功能对接
|
2022-11-24 15:56:10 +08:00 |
|
黎永顺
|
f8169a9080
|
个税扣缴义务人添加搜索框
|
2022-11-23 16:50:43 +08:00 |
|
黎永顺
|
c468ff35ff
|
个税扣缴义务人添加同步人员范围的功能
|
2022-11-23 15:42:51 +08:00 |
|
黎永顺
|
25e76718d2
|
社保福利档案退差功能
|
2022-11-23 15:12:19 +08:00 |
|
黎永顺
|
04a368c731
|
禅道bug132、133
|
2022-11-21 17:50:06 +08:00 |
|
黎永顺
|
676a90bd51
|
Merge branch 'hotfix/v2-1114'
|
2022-11-21 09:24:00 +08:00 |
|
黎永顺
|
5619598e7e
|
聚正润农薪资核算页面新建薪资核算弹框样式修改
|
2022-11-18 16:26:15 +08:00 |
|
黎永顺
|
06ec3c69ba
|
Merge branch 'hotfix/v2-1114' into develop
|
2022-11-17 19:08:21 +08:00 |
|
黎永顺
|
06b722e4a3
|
1
|
2022-11-17 19:06:42 +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 |
|
黎永顺
|
d3a8360f00
|
Merge branch 'hotfix/v2-1114' into develop
|
2022-11-17 16:36:28 +08:00 |
|
黎永顺
|
848598daf3
|
1
|
2022-11-17 16:36:02 +08:00 |
|
黎永顺
|
d0c91c697c
|
Merge branch 'hotfix/v2-1114' into develop
|
2022-11-17 16:35:03 +08:00 |
|
黎永顺
|
bde6840850
|
社保福利台账页面操作列的问题解决
|
2022-11-17 16:34:22 +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 |
|
黎永顺
|
9632a5190e
|
薪资核算解锁锁定的功能
|
2022-11-17 14:18:02 +08:00 |
|
黎永顺
|
68069df58b
|
薪资核算解锁锁定的功能
|
2022-11-17 14:17:34 +08:00 |
|
黎永顺
|
ea9359c728
|
其他免税扣除页面添加沿用上月的功能
|
2022-11-16 17:29:01 +08:00 |
|
黎永顺
|
a0021e7102
|
薪资档案记录编辑保存接口参数对接
|
2022-11-16 17:15:35 +08:00 |
|
黎永顺
|
79d1f42a12
|
薪资账套新增时切换上一步页面列表可删除数据回显失败的bug修复
|
2022-11-16 17:08:16 +08:00 |
|
黎永顺
|
165ee3d7ba
|
薪资核算页面列表头添加所有按钮
|
2022-11-16 16:40:37 +08:00 |
|
黎永顺
|
7560e00afb
|
薪资项目管理页面的新建自定义薪资项目的页面选择sql的弹框新增页面切换外部数据源时添加确认询问框
|
2022-11-16 15:44:59 +08:00 |
|
黎永顺
|
9e9cce1a05
|
薪资档案调薪记录删除添加确认框
|
2022-11-15 18:18:00 +08:00 |
|
黎永顺
|
990fd642ff
|
薪资项目分权
|
2022-11-15 17:31:57 +08:00 |
|
黎永顺
|
a5213cb370
|
薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能
|
2022-11-15 15:42:09 +08:00 |
|
黎永顺
|
0d04b38ab6
|
个税扣缴义务人切换新增和编辑弹框的编辑人项显隐
|
2022-11-15 09:43:38 +08:00 |
|
黎永顺
|
dcb2f5f864
|
社保福利方案社保编辑报错的bug解决
|
2022-11-10 17:24:56 +08:00 |
|
黎永顺
|
b52a734e03
|
薪资账套添加人员删除人员列表分页报错的bug
|
2022-11-10 16:41:53 +08:00 |
|
黎永顺
|
20e6c3aa7e
|
薪资账套添加人员全选报错的问题
|
2022-11-10 15:01:44 +08:00 |
|
黎永顺
|
d05778f9f9
|
薪资档案列表列固定
|
2022-11-10 11:40:26 +08:00 |
|
黎永顺
|
35633d753e
|
新增人员添加全选的按钮
|
2022-11-10 09:19:09 +08:00 |
|
黎永顺
|
a348e5e3db
|
自定义薪资项目的sql添加开启解密的配置项
|
2022-11-09 14:37:14 +08:00 |
|
黎永顺
|
e0e19348ca
|
Merge branch 'hotfix/v2-1107' into develop
|
2022-11-09 14:34:12 +08:00 |
|
黎永顺
|
224eeeda42
|
Merge branch 'feature/v2-报税规则配置-1108' into develop
|
2022-11-09 14:31:57 +08:00 |
|
黎永顺
|
477d94af6a
|
Merge branch 'feature/v2-应用配置-1107' into develop
|
2022-11-09 14:30:43 +08:00 |
|
黎永顺
|
5508fcb9da
|
Merge branch 'feature/v2-专项附加扣除-1103' into develop
|
2022-11-09 14:29:24 +08:00 |
|
黎永顺
|
b187b17263
|
添加报税规则
|
2022-11-08 16:39:29 +08:00 |
|
黎永顺
|
596392a102
|
专项附加扣除页面查询报错的解决
|
2022-11-08 15:47:20 +08:00 |
|
黎永顺
|
0e4587d18d
|
专项附加扣除导入字段的匹配
|
2022-11-08 09:08:34 +08:00 |
18652063575
|
24750339c4
|
新增自定义项的保存添加函数的防抖
|
2022-11-07 15:38:36 +08:00 |
|
18652063575
|
8e133ea43a
|
累计专项扣除页面添加一键累计的功能
|
2022-11-07 15:29:46 +08:00 |
|
18652063575
|
8040e2fa27
|
应用配置添加是否显示脱敏表人员信息的配置项完成
|
2022-11-07 14:23:24 +08:00 |
|
18652063575
|
d9a6a70012
|
Merge branch 'hotfix/v2-1107' into feature/v2-应用配置-1107
|
2022-11-07 14:15:01 +08:00 |
|
18652063575
|
5cb02fd0b4
|
应用配置添加是否显示脱敏表人员信息的配置项
|
2022-11-07 14:12:13 +08:00 |
|
18652063575
|
7a9672b8a4
|
社保福利档案页面修改基础信息标题
|
2022-11-07 14:03:45 +08:00 |
|
18652063575
|
824508b41a
|
专项附加扣除模块页面接口联调完成
|
2022-11-07 13:58:01 +08:00 |
|
18652063575
|
cf315eb608
|
专项附加扣除模块页面接口联调完成
|
2022-11-07 13:57:22 +08:00 |
|
18652063575
|
fad63cc781
|
专项附加扣除接口联调
|
2022-11-04 16:31:24 +08:00 |
|
18652063575
|
12d6fc73cf
|
社保福利档案切换tab bug处理
|
2022-11-04 15:56:49 +08:00 |
|
18652063575
|
926c9685b2
|
接口联调
|
2022-11-04 14:40:37 +08:00 |
|
18652063575
|
f24960f64b
|
Merge branch 'develop' into release
|
2022-11-04 14:09:12 +08:00 |
|
18652063575
|
e355096bb3
|
Merge branch 'feature/v2-数据采集-1024' into release
|
2022-11-04 14:09:00 +08:00 |
|
18652063575
|
f8e59efbbe
|
接口联调
|
2022-11-04 14:08:19 +08:00 |
|
18652063575
|
ba11b69e31
|
社保福利档案接口修改
|
2022-11-04 13:51:41 +08:00 |
|
18652063575
|
ca04e5405d
|
专项附加扣除接口联调
|
2022-11-04 11:33:58 +08:00 |
|
18652063575
|
3390630d74
|
提示语组件样式修改
|
2022-11-04 09:26:38 +08:00 |
|
18652063575
|
459ec32c68
|
薪资档案页面接口联调的页面添加防抖
|
2022-11-03 21:03:33 +08:00 |
|
18652063575
|
985eb1edb0
|
薪资核算的页面添加防抖
|
2022-11-03 20:38:57 +08:00 |
|
18652063575
|
8353002429
|
社保福利档案页面添加提示语
|
2022-11-03 17:58:24 +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
|
ba19d16604
|
Merge branch 'hotfix/v2-bug修复-1031' into develop
|
2022-11-02 15:18:21 +08:00 |
|
18652063575
|
3722694d80
|
薪资项目管理列表数据处理
|
2022-11-02 15:18:03 +08:00 |
|
18652063575
|
5124c16af3
|
Merge branch 'feature/v2-薪资项目公式添加-1026' into develop
|
2022-11-02 13:59:54 +08:00 |
|
18652063575
|
c287818eec
|
薪资项目管理列表数据处理
|
2022-11-02 13:59:35 +08:00 |
|
18652063575
|
5a27891e29
|
Merge branch 'feature/v2-薪资项目公式添加-1026' into develop
|
2022-11-02 13:44:52 +08:00 |
|
18652063575
|
a7d31d4c31
|
Merge branch 'hotfix/v2-bug修复-1031' into develop
|
2022-11-02 13:44:38 +08:00 |
|
18652063575
|
0110c3d19c
|
个税扣缴义务人页面编辑权限按钮的问题
|
2022-11-02 13:44:24 +08:00 |
|
18652063575
|
ee6a6893d9
|
Merge branch 'feature/v2-数据采集-1024' into develop
|
2022-11-02 11:39:52 +08:00 |
|
18652063575
|
66debb4708
|
数据采集新增编辑错误信息 提示
|
2022-11-02 10:41:12 +08:00 |
|
18652063575
|
77abf14b61
|
Merge branch 'feature/v2-数据采集-1024' into develop
|
2022-11-02 09:49:18 +08:00 |
|
18652063575
|
d09230b2ca
|
数据采集编辑接口报错的处理
|
2022-11-02 09:49:03 +08:00 |
|
18652063575
|
3cbf306843
|
Merge branch 'feature/v2-数据采集-1024' into develop
|
2022-11-02 09:28:55 +08:00 |
|
18652063575
|
794cfc1615
|
数据采集列表操作列表宽度
|
2022-11-02 09:28:27 +08:00 |
|
18652063575
|
1e6aa4e131
|
Merge branch 'feature/v2-数据采集-1024' into develop
|
2022-11-01 17:18:57 +08:00 |
|
18652063575
|
bd0923e3a6
|
数据采集列表操作列表宽度
|
2022-11-01 17:18:41 +08:00 |
|
18652063575
|
0fec6c8a93
|
Merge branch 'feature/v2-数据采集-1024' into develop
|
2022-11-01 17:12:51 +08:00 |
|
18652063575
|
fc99452207
|
考勤字段列表添加序号列
|
2022-11-01 16:52:55 +08:00 |
|
18652063575
|
abd8f2b9f4
|
社保福利档案页面的接口联调
|
2022-11-01 15:50:54 +08:00 |
|
18652063575
|
8a964d7e40
|
数据采集接口联调
|
2022-11-01 14:06:06 +08:00 |
|
18652063575
|
023f70e692
|
社保福利档案接口对接
|
2022-11-01 10:35:59 +08:00 |
|
18652063575
|
3c5b564ccb
|
社保福利档案接口对接
|
2022-10-31 17:58:56 +08:00 |
|
18652063575
|
d4ecfb3a1e
|
数据采集接口对接
|
2022-10-31 17:35:21 +08:00 |
|
18652063575
|
24b24c2652
|
社保福利档案页面添加提示语
|
2022-10-31 14:49:24 +08:00 |
|
18652063575
|
8008c0855a
|
数据采集接口联调
|
2022-10-31 13:55:49 +08:00 |
|
18652063575
|
e8dbd3e350
|
hotfix/v2-bug修复-1024
|
2022-10-31 09:12:18 +08:00 |
|
18652063575
|
08ab6de7a4
|
hotfix/v2-bug修复-1024
|
2022-10-28 17:12:03 +08:00 |
|
18652063575
|
91a1319138
|
feature/v2-薪资项目公式添加-1026
|
2022-10-27 15:07:47 +08:00 |
|
18652063575
|
558db4220b
|
hotfix/v2-bug修复-1024
|
2022-10-27 13:58:23 +08:00 |
|
18652063575
|
3bef480242
|
公式修改
|
2022-10-27 10:29:13 +08:00 |
|
18652063575
|
216f8c8b93
|
禅道bug的修复
|
2022-10-27 09:46:28 +08:00 |
|
18652063575
|
aa7ec55294
|
禅道bug的修复
|
2022-10-26 18:40:25 +08:00 |
|
18652063575
|
54da9eb8cd
|
薪资项目公式
|
2022-10-26 17:55:16 +08:00 |
|
18652063575
|
1075625170
|
社保福利台账详情页面查询的bug
|
2022-10-26 16:54:15 +08:00 |
|
18652063575
|
df079f762f
|
薪资项目管理的公式修改
|
2022-10-26 16:38:09 +08:00 |
|
18652063575
|
86f002a636
|
加密设置添加确认弹框
|
2022-10-26 15:46:39 +08:00 |
|
18652063575
|
6b3c8aa272
|
社保福利档案的待减员页面去掉删除待办的按钮
|
2022-10-26 13:56:28 +08:00 |
|
18652063575
|
ced585e164
|
薪资档案页面导入功能接口联调
|
2022-10-25 17:13:58 +08:00 |
|
18652063575
|
0305c24556
|
薪资档案页面添加导入的功能
|
2022-10-24 18:45:04 +08:00 |
|
18652063575
|
8fa3b0918c
|
数据采集页面添加新建功能
|
2022-10-24 18:42:15 +08:00 |
|
18652063575
|
7384d124b2
|
工资单发放页面报错的bug处理
|
2022-10-24 11:24:09 +08:00 |
|
18652063575
|
c3d72e9fae
|
福利台账-正常缴纳需要刷新页面才能显示数据列表
|
2022-10-24 09:28:28 +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
|
f6d9328344
|
注释掉社保福利台账添加线下对比
|
2022-09-29 15:46:38 +08:00 |
|
18652063575
|
1d1ced8d77
|
社保福利台账添加线下对比的页面功能
|
2022-09-29 15:45:23 +08:00 |
|
18652063575
|
85441a1f69
|
1
|
2022-09-19 13:36:36 +08:00 |
|
18652063575
|
3808d0b625
|
考勤查看页面报错
|
2022-09-16 17:25:31 +08:00 |
|
18652063575
|
5e1dac0554
|
接口异常报错提示
|
2022-09-16 11:30:13 +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
|
0cec0873fe
|
统一所有页面你的弹框以及抽屉头部组件
|
2022-09-13 16:39:15 +08:00 |
|
18652063575
|
a55847e656
|
bug的修正
|
2022-09-09 10:29:12 +08:00 |
|
18652063575
|
938fb94743
|
bug的修正
|
2022-09-08 17:04:36 +08:00 |
|
liyongshun
|
ef9f8478a7
|
bug的修正
|
2022-09-01 17:52:00 +08:00 |
|
liyongshun
|
6768649ac4
|
bug的修正
|
2022-08-25 17:54:18 +08:00 |
|
liyongshun
|
ad13e078e4
|
部门选择添加树形选择
|
2022-08-16 10:10:59 +08:00 |
|
liyongshun
|
8a047f7786
|
init gitlab
|
2022-08-15 10:20:48 +08:00 |
|
liyongshun
|
67f0de658a
|
薪资核算页面表格替换antd4.x的table组件
|
2022-08-11 17:38:03 +08:00 |
|
liyongshun
|
e243085a0d
|
员工福利档案页面添加编辑抽屉页面样式重构，以及修改页面参数回调的bug
|
2022-08-04 17:07:09 +08:00 |
|
liyongshun
|
ae3af8e59e
|
薪资项目管理页面添加sql项的数据源选项
|
2022-08-03 17:54:47 +08:00 |
|
liyongshun
|
f8f485c6a7
|
薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口
|
2022-08-02 18:17:08 +08:00 |
|
liyongshun
|
2097d2faf7
|
薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口
|
2022-08-02 18:16:49 +08:00 |
|
liyongshun
|
cac473595e
|
薪资核算详情页面表格样式错位的bug解决
|
2022-07-29 16:45:46 +08:00 |
|
liyongshun
|
e329e381ea
|
薪资核算详情页面导入失败的bug处理以及表格列固定之后，样式错位的bug解决
|
2022-07-29 11:44:19 +08:00 |
|
liyongshun
|
f3bf85dcf5
|
社保福利档案页面导入暂时注释掉带数据的导入功能
|
2022-07-28 17:50:57 +08:00 |
|
liyongshun
|
9fb20ad59c
|
隐藏社保福利方案页面删除按钮
|
2022-07-28 17:26:20 +08:00 |
|
liyongshun
|
d774de6a64
|
薪资账套编辑页面修改
|
2022-07-28 17:16:40 +08:00 |
|
liyongshun
|
8f11093483
|
社保福利档案添加能带出数据的按钮
|
2022-07-25 18:02:36 +08:00 |
|
liyongshun
|
134653fac6
|
薪资发放页面添加进度条弹框组件
|
2022-07-21 17:34:10 +08:00 |
|
liyongshun
|
c6d9082986
|
社保福利档案编辑的bug
|
2022-07-20 15:02:55 +08:00 |
|
liyongshun
|
6ff45ec2a1
|
社保福利台账页面的bug修改
|
2022-07-20 10:33:23 +08:00 |
|
liyongshun
|
a80fc0c66c
|
薪资查看页面添加权限
|
2022-07-12 18:15:27 +08:00 |
|
liyongshun
|
3e944ded89
|
我的薪资福利添加权限功能
|
2022-07-12 17:39:57 +08:00 |
|
liyongshun
|
2225275881
|
测试
|
2022-07-12 16:13:13 +08:00 |
|
liyongshun
|
cc0b91b2d8
|
表格文字超出处理
|
2022-07-12 16:01:56 +08:00 |
|
liyongshun
|
c9722919fe
|
薪资核算编辑框权限
|
2022-07-11 18:21:47 +08:00 |
|
liyongshun
|
e22fa6429f
|
社保福利档案页面编辑页面组件样式的修改以及数据回填失败的bug处理
|
2022-07-07 17:58:00 +08:00 |
|
liyongshun
|
561900ae49
|
个税申报申报表bug的修复
|
2022-07-06 18:11:54 +08:00 |
|
liyongshun
|
6579751717
|
替换个税扣缴义务人接口和分页bug的修改
|
2022-07-05 16:35:42 +08:00 |
|
liyongshun
|
f762fd5a9a
|
薪资账套周期联动
|
2022-07-04 19:03:14 +08:00 |
|
liyongshun
|
c2757fd1f4
|
社保福利档案表格分页的bug
|
2022-07-04 13:56:15 +08:00 |
|
liyongshun
|
f32848121c
|
列表样式
|
2022-06-30 17:36:37 +08:00 |
|
liyongshun
|
732f3e1607
|
操作按钮权限的bug
|
2022-06-30 14:21:18 +08:00 |
|
liyongshun
|
f89ada73db
|
精度丢失的bug
|
2022-06-30 11:28:13 +08:00 |
|
liyongshun
|
4164c8b06a
|
去掉工资单发放权限阿牛
|
2022-06-29 17:24:30 +08:00 |
|
liyongshun
|
65be568847
|
测试bug的修复
|
2022-06-29 17:04:01 +08:00 |
|
liyongshun
|
5f66d08a39
|
修改薪资核算查询日期报错的bug
|
2022-06-29 14:02:06 +08:00 |
|
liyongshun
|
23c6ad30ed
|
考勤引用分页的bug
|
2022-06-29 13:30:15 +08:00 |
|
liyongshun
|
e83a05d8bb
|
弹框覆盖的bug修改
|
2022-06-29 10:13:21 +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 |
MustangDeng
|
4d46a7ca90
|
发起流程修改
|
2022-06-27 18:01:30 +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
|
c582fb2182
|
工资单发放bug的修复
|
2022-06-24 11:59:29 +08:00 |
|
liyongshun
|
8a3ff43bb4
|
中江代码
|
2022-06-23 16:47:00 +08:00 |
|
liyongshun
|
7e1ed1b848
|
Merge branch 'release' into release-zhongjiang
|
2022-06-23 16:35:33 +08:00 |
|
liyongshun
|
9a6344dae1
|
测试bug
|
2022-06-23 16:20:49 +08:00 |
|
liyongshun
|
e3d30694c3
|
操作菜单权限得bug修复
|
2022-06-22 17:14:53 +08:00 |
|
liyongshun
|
60a97f9736
|
编辑权限
|
2022-06-21 17:35:19 +08:00 |
|
liyongshun
|
22ea7b0786
|
Merge branch 'fenquan' into liys_dev
|
2022-06-21 15:55:22 +08:00 |
|
liyongshun
|
a51e8f32da
|
固定列表表格样式修改
|
2022-06-21 15:54:39 +08:00 |
|
liyongshun
|
78b12043aa
|
页面操作按钮权限的控制
|
2022-06-21 14:27:16 +08:00 |
|
liyongshun
|
314ffff8ec
|
表格应用替换
|
2022-06-21 11:57:09 +08:00 |
|
liyongshun
|
2a8aac2068
|
添加页面操作按钮操作权限
|
2022-06-21 11:33:00 +08:00 |
|
liyongshun
|
a91ce27139
|
注释薪资核算详情页的表格固定列
|
2022-06-21 09:41:54 +08:00 |
|
MustangDeng
|
b2c63bb610
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-20 16:23:18 +08:00 |
|
MustangDeng
|
1a6007a8da
|
往期累计抽屉数据宽度
|
2022-06-20 16:22:44 +08:00 |
|
liyongshun
|
ae70da48be
|
修改权限的接口
|
2022-06-20 13:51:55 +08:00 |
|
liyongshun
|
aaeb4b9459
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-17 17:20:51 +08:00 |
|
liyongshun
|
bbb4189700
|
薪资账套复制添加个税扣缴义务人参数
|
2022-06-17 17:12:21 +08:00 |
|
liyongshun
|
78adb5cf0d
|
测试bug的修复
|
2022-06-17 16:53:27 +08:00 |
|
MustangDeng
|
9ddb243bc4
|
fix bug 默认选项问题
|
2022-06-16 21:59:29 +08:00 |
|
MustangDeng
|
1837f512a3
|
fix bug 36
|
2022-06-16 21:42:08 +08:00 |
|
MustangDeng
|
70a5d3ae7b
|
fix bug 48 - 56
|
2022-06-16 20:58:54 +08:00 |
|
MustangDeng
|
1e21df35e6
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-16 16:27:52 +08:00 |
|
MustangDeng
|
e31dbd18d8
|
保存问题
|
2022-06-16 16:27:15 +08:00 |
|
MustangDeng
|
b2ce5ba467
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-15 18:31:50 +08:00 |
|
MustangDeng
|
2adc0ee33a
|
导入参数校验
|
2022-06-15 18:31:10 +08:00 |
|
MustangDeng
|
8f9150e1a1
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-15 16:21:30 +08:00 |
|
MustangDeng
|
1ce692421a
|
编辑Modal
|
2022-06-15 16:20:59 +08:00 |
|
MustangDeng
|
123ba900e7
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-15 09:42:20 +08:00 |
|
MustangDeng
|
711beb5cff
|
个税扣缴调整弹窗高度
|
2022-06-15 09:39:48 +08:00 |
|
MustangDeng
|
b60a69a63c
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-15 09:11:11 +08:00 |
|
MustangDeng
|
3a7b2339d5
|
空值情况处理
|
2022-06-15 09:10:08 +08:00 |
|
MustangDeng
|
86c56e2140
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-14 16:53:29 +08:00 |
|
MustangDeng
|
a39b9d606a
|
工资单模板删除项目
|
2022-06-14 16:51:26 +08:00 |
|
MustangDeng
|
b407adc724
|
页面优化
|
2022-06-14 16:21:50 +08:00 |
|
MustangDeng
|
0ce5d93199
|
Merge branch 'fenquan' into release-zhongjiang
|
2022-06-14 14:11:24 +08:00 |
|
liyongshun
|
f3f07a4612
|
下载模板地址的区分
|
2022-06-14 11:32:35 +08:00 |
|
liyongshun
|
b5dc616ba6
|
Merge branch 'fenquan' of gitee.com:MustangDeng/salary-management-front-end into fenquan
|
2022-06-14 11:18:40 +08:00 |
|
liyongshun
|
3413f8fc0b
|
导入字段的添加
|
2022-06-14 11:18:37 +08:00 |
|
MustangDeng
|
c4502f1e1b
|
工资单模板
|
2022-06-14 11:17:03 +08:00 |
|
MustangDeng
|
6ae75883b0
|
编译问题处理
|
2022-06-14 10:23:38 +08:00 |
|
MustangDeng
|
029876f694
|
账套列表
|
2022-06-14 10:16:04 +08:00 |
|
MustangDeng
|
697b799b32
|
显示列定制
|
2022-06-13 18:08:45 +08:00 |
|
MustangDeng
|
5decf617a6
|
工资单页面定制
|
2022-06-13 16:31:08 +08:00 |
|
MustangDeng
|
6fda61cf83
|
fix bug
|
2022-06-13 10:22:49 +08:00 |
|
MustangDeng
|
4ae6db4e2b
|
fix 其他免税
|
2022-06-10 17:29:46 +08:00 |
|
MustangDeng
|
1889a4818d
|
Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan
|
2022-06-10 14:21:28 +08:00 |
|
MustangDeng
|
a71ab9793e
|
个税申报表详情列表
|
2022-06-10 14:21:07 +08:00 |
|
liyongshun
|
8dcf736db6
|
薪资账套的编辑bug修复，以及薪资档案模块上传下载模板添加个参数
|
2022-06-09 18:34:24 +08:00 |
|
MustangDeng
|
47af2543b0
|
Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan
|
2022-06-09 18:30:39 +08:00 |
|
MustangDeng
|
aebb43b461
|
福利台账分权
|
2022-06-09 18:30:19 +08:00 |
|
liyongshun
|
cd801cb5c7
|
账套列表编辑权限的田间
|
2022-06-08 18:42:01 +08:00 |
|
liyongshun
|
adc089b033
|
注释个税申报的个税申报人选项
|
2022-06-07 18:48:25 +08:00 |
|
liyongshun
|
f5b947c80c
|
Merge branch 'liys_dev' into fenquan
|
2022-06-07 18:37:35 +08:00 |
|
liyongshun
|
9193e6b2e9
|
bug修改
|
2022-06-07 18:24:05 +08:00 |
|
MustangDeng
|
31756873d9
|
扣缴人修改
|
2022-06-07 18:19:24 +08:00 |
|
MustangDeng
|
55731caafe
|
合并分支
|
2022-06-07 14:42:44 +08:00 |
|
MustangDeng
|
fc16f570b8
|
Merge branch 'liys_dev' into fenquan
# 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/ledger/salaryItemForm.js
# pc4mobx/hrmSalary/pages/salaryFile/index.js
|
2022-06-07 10:57:02 +08:00 |
|
MustangDeng
|
d9c2aef5ae
|
todo
|
2022-06-07 10:22:06 +08:00 |
|
MustangDeng
|
c7128fcfb0
|
bug修改
|
2022-06-07 09:08:36 +08:00 |
|
MustangDeng
|
b94af53ed4
|
bug修复
|
2022-06-06 14:31:20 +08:00 |
|
liyongshun
|
e552f34103
|
添加权限
|
2022-06-02 17:11:28 +08:00 |
|
liyongshun
|
519ddd732b
|
Merge branch 'dev' into merge_liys_dev
|
2022-06-02 15:23:38 +08:00 |
|
liyongshun
|
17e23fc014
|
列表分页以及权限的修改
|
2022-06-02 14:48:55 +08:00 |
|
MustangDeng
|
c9cda1fdfc
|
bug 处理
|
2022-06-02 13:51:45 +08:00 |
|
MustangDeng
|
9940be40ed
|
工资单预览调整
|
2022-05-31 19:05:29 +08:00 |
|
MustangDeng
|
936ac9bd3f
|
工资单bug修复
|
2022-05-31 18:51:23 +08:00 |
|
MustangDeng
|
55f732c1fc
|
台账归档页面刷新
|
2022-05-31 16:37:35 +08:00 |
|
MustangDeng
|
c5b401f9f4
|
bug修改
|
2022-05-31 16:21:25 +08:00 |
|
MustangDeng
|
95166a6534
|
bug修复
|
2022-05-30 17:30:53 +08:00 |
|
MustangDeng
|
6adf1a83fa
|
bug
|
2022-05-30 09:38:45 +08:00 |
|
MustangDeng
|
5df78a31d8
|
福利台账页面
|
2022-05-26 14:34:41 +08:00 |
|
MustangDeng
|
f4ac00ddbd
|
补交
|
2022-05-26 09:46:28 +08:00 |
|
MustangDeng
|
709deef5a6
|
福利核算刷新页面
|
2022-05-25 13:54:07 +08:00 |
|
MustangDeng
|
1823149ae2
|
bug修复
|
2022-05-24 23:55:12 +08:00 |
|
MustangDeng
|
33e5009585
|
bug修改
|
2022-05-24 15:39:09 +08:00 |
|
MustangDeng
|
c2439f2628
|
福利台账问题修复
|
2022-05-19 16:30:21 +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
|
6b178ebaea
|
福利
|
2022-05-18 09:21:42 +08:00 |
|
MustangDeng
|
16de38a423
|
账套问题处理
|
2022-05-13 15:25:21 +08:00 |
|
MustangDeng
|
91c1907b1b
|
薪资项目管理bug处理
|
2022-05-13 13:33:14 +08:00 |
|
MustangDeng
|
7dc2b1d33e
|
导入框初始化
|
2022-05-12 17:04:33 +08:00 |
|
MustangDeng
|
09862cafac
|
修复bug
|
2022-05-10 17:45:03 +08:00 |
|
MustangDeng
|
b2d5b1a90c
|
修复bug
|
2022-05-10 15:31:13 +08:00 |
|
MustangDeng
|
ca2f9d6319
|
Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev
|
2022-05-09 15:53:54 +08:00 |
|
MustangDeng
|
b963ec6641
|
福利档案导入
|
2022-05-09 15:53:36 +08:00 |
|
liyongshun
|
8b966e6cfb
|
Merge branch 'dev' of gitee.com:MustangDeng/salary-management-front-end into dev
|
2022-05-09 15:10:52 +08:00 |
|
liyongshun
|
8b5aa25d38
|
福利列表数据删除跳转的bug
|
2022-05-09 15:10:49 +08:00 |
|
MustangDeng
|
9517e97bad
|
福利档案
|
2022-05-09 14:23:43 +08:00 |
|
MustangDeng
|
d6b7357949
|
Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev
|
2022-05-07 14:47:31 +08:00 |
|
MustangDeng
|
c85c2ec66f
|
福利导入
|
2022-05-07 14:47:14 +08:00 |
|
liyongshun
|
d03b16dd76
|
多行文本指定位置添加内容
|
2022-05-06 12:25:32 +08:00 |
|
MustangDeng
|
b573e6edf6
|
0505bug
|
2022-05-06 10:11:45 +08:00 |
|
MustangDeng
|
e4e4f791eb
|
工资单预览模板
|
2022-05-05 16:10:22 +08:00 |
|
MustangDeng
|
00f867914a
|
工资单预览
|
2022-05-05 15:53:35 +08:00 |
|
MustangDeng
|
ae3ee29592
|
往期累计情况
|
2022-05-05 12:17:12 +08:00 |
|
MustangDeng
|
515c7bab01
|
20220505
|
2022-05-05 09:13:38 +08:00 |