 黎永顺
|
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 |