Commit Graph

210 Commits

Author SHA1 Message Date
黎永顺 d6f7d3c19b 高版本表格组件修改 2023-01-16 11:39:49 +08:00
黎永顺 8fd6579dfd 薪资账套报错bug 2023-01-13 17:30:24 +08:00
黎永顺 e24078ba1c 薪资档案查询参数修改 2023-01-09 14:30:19 +08:00
黎永顺 5c6db20caa 工资单模板预览页面空白 2023-01-09 14:04:08 +08:00
黎永顺 0a3e2f8b02 往期累计情况页面查询丢失日期的bug修改 2023-01-09 09:40:50 +08:00
黎永顺 462cea820c 工资单模板bug修复 2022-12-29 11:20:01 +08:00
黎永顺 8fa65f4efb 工资单模板预览报错 2022-12-23 17:30:59 +08:00
黎永顺 3170ed0ea9 Merge branch 'develop' into release 2022-12-21 15:29:45 +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
黎永顺 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
黎永顺 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
黎永顺 665f3a0119 薪资账套中薪资项目排序报错的bug 2022-12-09 14:48:51 +08:00
黎永顺 7baf97e20f 薪资账套重构 2022-12-08 15:48:46 +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
黎永顺 4825d0cd49 工资单模板修改 2022-12-06 15:04:57 +08:00
黎永顺 a4dbd0cc4b 工资单发放部分发放和部分撤回 2022-12-02 14:27:39 +08:00
黎永顺 fbcb7f6db2 Merge branch 'hotfix/v2-1124' into develop 2022-11-24 17:40:44 +08:00
黎永顺 32072512a9 薪资核算添加核算人员的功能 2022-11-24 17:36:00 +08:00
黎永顺 c468ff35ff 个税扣缴义务人添加同步人员范围的功能 2022-11-23 15:42:51 +08:00
黎永顺 04a368c731 禅道bug132、133 2022-11-21 17:50:06 +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
黎永顺 d0c91c697c Merge branch 'hotfix/v2-1114' into develop 2022-11-17 16:35:03 +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
黎永顺 68069df58b 薪资核算解锁锁定的功能 2022-11-17 14:17:34 +08:00
黎永顺 79d1f42a12 薪资账套新增时切换上一步页面列表可删除数据回显失败的bug修复 2022-11-16 17:08:16 +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
黎永顺 e0e19348ca Merge branch 'hotfix/v2-1107' into develop 2022-11-09 14:34:12 +08:00
18652063575 24750339c4 新增自定义项的保存添加函数的防抖 2022-11-07 15:38:36 +08:00
18652063575 e355096bb3 Merge branch 'feature/v2-数据采集-1024' into release 2022-11-04 14:09:00 +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 8008c0855a 数据采集接口联调 2022-10-31 13:55:49 +08:00
18652063575 08ab6de7a4 hotfix/v2-bug修复-1024 2022-10-28 17:12:03 +08:00
18652063575 558db4220b hotfix/v2-bug修复-1024 2022-10-27 13:58:23 +08:00
18652063575 aa7ec55294 禅道bug的修复 2022-10-26 18:40:25 +08:00
18652063575 8fa3b0918c 数据采集页面添加新建功能 2022-10-24 18:42:15 +08:00
18652063575 c4c24dd159 薪资档案以及社保福利档案页面部分bug修复 2022-10-20 17:53:26 +08:00
18652063575 d7fcdd2637 薪资档案以及社保福利档案页面添加四个tab的列表查询 2022-10-17 10:03:01 +08:00