Commit Graph

420 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 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
黎永顺 3068ee9cd8 修改添加自定义薪资项目保存参数 2022-11-25 17:56:55 +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