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