Commit Graph

528 Commits

Author SHA1 Message Date
黎永顺 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