Commit Graph

481 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 61b595404f 薪资账套页面重构 2022-12-12 16:36:08 +08:00
黎永顺 9e3739d816 薪资账套页面重构 2022-12-12 16:35:19 +08:00
黎永顺 6d9787d924 薪资账套页面重构 2022-12-12 16:10:11 +08:00
黎永顺 2de636febc 薪资账套页面重构 2022-12-12 15:16:10 +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
黎永顺 c6d6693198 薪资账套页面重构 2022-12-09 14:16:11 +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
黎永顺 fc07b6d46b 调差功能修改 2022-12-08 13:44:35 +08:00
黎永顺 33ef783d2b 调差功能修改 2022-12-08 11:42:08 +08:00
黎永顺 a41a37db67 调差功能修改 2022-12-08 10:36:36 +08:00
黎永顺 4fd8d91124 个税扣缴义务人恢复删除功能 2022-12-08 10:28:59 +08:00
黎永顺 bebc1c8c98 社保福利档案调差修改 2022-12-08 10:11:11 +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