Commit Graph

1235 Commits

Author SHA1 Message Date
黎永顺 49e5a0ad73 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-27 17:42:55 +08:00
黎永顺 0902c3bb71 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-27 15:42:42 +08:00
黎永顺 486254601f feature/2.9.42310.01-工资单发放导出PDF 2023-09-27 14:35:37 +08:00
黎永顺 22d8ecfcd4 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-27 14:19:48 +08:00
黎永顺 3d8bef9147 feature/2.9.42310.01-工资单发放导出PDF
20230926
2023-09-27 09:21:53 +08:00
黎永顺 06f19c74db feature/2.9.42310.01-工资单发放导出PDF
20230926
2023-09-27 09:13:02 +08:00
黎永顺 4bb3bc403a feature/2.9.42310.01-工资单发放导出PDF
20230926
2023-09-26 16:38:47 +08:00
黎永顺 929a5da68a feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-26 13:26:55 +08:00
黎永顺 b54a561ba4 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-26 11:03:19 +08:00
黎永顺 d9a6f3907c hotfix/2.9.42310.01
表单字段隐藏的问题
2023-09-25 16:20:56 +08:00
黎永顺 ff3dd0ea60 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-25 15:35:11 +08:00
黎永顺 1f37bdde4b Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' 2023-09-25 10:58:51 +08:00
黎永顺 2c56e8dc06 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-25 09:43:03 +08:00
黎永顺 61637e6de7 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-21 18:18:47 +08:00
黎永顺 12d4b5c33c hotfix/2.9.42309.01 2023-09-21 16:13:18 +08:00
黎永顺 e4d9a2c545 hotfix/2.9.42309.01 2023-09-21 15:45:58 +08:00
黎永顺 f8393fbe7d Merge branch 'release/2.9.42309.01' into hotfix/2.9.42309.01 2023-09-21 15:21:10 +08:00
黎永顺 5b43e43f4a hotfix/2.9.42309.01 2023-09-21 15:20:59 +08:00
黎永顺 0c1fdd7d13 Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01 2023-09-21 14:16:40 +08:00
黎永顺 93a23cb9a3 Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into release/2.9.42309.01 2023-09-21 14:16:25 +08:00
黎永顺 cfce462898 Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into release/2.9.42309.01 2023-09-21 14:16:06 +08:00
黎永顺 9030e22449 hotfix/2.9.42309.01 2023-09-21 12:04:55 +08:00
黎永顺 96032b5f1c feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-21 10:17:06 +08:00
黎永顺 e7e4d17cfa hotfix/2.9.42309.01 2023-09-20 17:42:06 +08:00
黎永顺 c0220d8853 hotfix/2.9.42309.01 2023-09-20 17:29:50 +08:00
黎永顺 26fdf624bb hotfix/2.9.42309.01 2023-09-20 17:25:56 +08:00
黎永顺 d664ad2769 feature/2.9.42309.01-薪酬统计报表分享报表
20230920
2023-09-20 17:03:24 +08:00
黎永顺 b22b41382f hotfix/2.9.42309.01
20230920-社保福利方案添加搜索条件
2023-09-20 16:51:00 +08:00
黎永顺 d7c59f5434 feature/2.9.42309.01-薪酬统计报表分享报表
20230920
2023-09-20 15:03:05 +08:00
黎永顺 a58da11dc3 hotfix/2.9.42309.01
20230920
2023-09-20 14:20:51 +08:00
黎永顺 6ac979e9e7 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-20 09:25:10 +08:00
黎永顺 10c7280b43 feature/2.9.42309.01-薪酬统计报表分享报表 2023-09-19 17:24:52 +08:00
黎永顺 9084c20717 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 19:34:16 +08:00
黎永顺 cf38c91be8 Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 18:42:37 +08:00
黎永顺 1ee6650234 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 18:42:27 +08:00
黎永顺 c0c908f6eb Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 17:48:35 +08:00
黎永顺 1c7ad4e871 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 16:59:21 +08:00
黎永顺 98054b3c8d feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 15:05:25 +08:00
黎永顺 e10e39e630 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 13:37:00 +08:00
黎永顺 e2be082a54 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 10:40:30 +08:00
黎永顺 f29d985e64 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-15 16:53:17 +08:00
黎永顺 707ca40f05 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-15 11:14:39 +08:00
黎永顺 d008654bf8 hotfix/2.9.42309.01 2023-09-14 15:50:24 +08:00
黎永顺 b52afbb7c8 Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01 2023-09-14 14:21:45 +08:00
黎永顺 85867da080 hotfix/2.9.42309.01 2023-09-14 14:19:08 +08:00
黎永顺 4769df4cfd feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 14:05:40 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 ef16acd638 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 11:41:29 +08:00
黎永顺 02be280127 Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01 2023-09-14 10:38:10 +08:00
黎永顺 2b282b4211 hotfix/2.9.42309.01 2023-09-14 10:37:39 +08:00
黎永顺 8a90d58196 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 10:25:22 +08:00
黎永顺 3f18e4a0a7 feature/2.9.42309.01-调薪记录添加二次密码认证 2023-09-13 10:44:37 +08:00
黎永顺 5ce2f5bf31 hotfix/2.9.42308.02 2023-09-12 11:14:51 +08:00
黎永顺 a583087f5f Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01 2023-09-11 13:43:28 +08:00
黎永顺 32404ec04e Merge branch 'hotfix/2.9.42308.02' into release/2.9.42309.01 2023-09-11 13:43:04 +08:00
黎永顺 8da781193a hotfix/2.9.42308.02 2023-09-08 13:53:11 +08:00
黎永顺 6043192bfe Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into release/2.9.42309.01 2023-09-07 10:07:19 +08:00
黎永顺 96f65e42b0 feature/2.9.42309.01-社保福利档案添加非系统人员列表 2023-09-06 14:54:45 +08:00
黎永顺 ce462fe51a hotfix/2.9.42308.02 2023-09-06 14:27:23 +08:00
黎永顺 f593e97207 feature社保福利档案添加非系统人员列表 2023-09-06 10:19:35 +08:00
黎永顺 bb1e328c92 feature社保福利档案添加非系统人员列表 2023-09-05 16:49:26 +08:00
黎永顺 2a40afb7b4 feature社保福利档案添加非系统人员列表 2023-09-05 15:14:05 +08:00
黎永顺 bc3632e054 薪资档案发薪员工页面的调薪页面重构 2023-09-04 18:13:19 +08:00
黎永顺 6043159976 薪资档案发薪员工页面的调薪页面重构 2023-09-04 16:48:36 +08:00
黎永顺 242b96321a 样式优化 2023-09-01 14:06:32 +08:00
黎永顺 5b6480f076 hotfix/2.9.42308.02-工资单模板设置名称保存失败bug修复 2023-09-01 11:08:35 +08:00
黎永顺 cae8d86cd6 规则设置-加解密修改为默认开启 2023-09-01 09:29:49 +08:00
黎永顺 a5e0ca3084 薪资项目公式保存参数修改 2023-08-31 15:02:56 +08:00
黎永顺 036e59b91a feature/2.9.42308.02-薪资项目同步到薪资账套 2023-08-31 14:43:57 +08:00
黎永顺 a058242d35 feature/2.9.42308.02-薪资项目同步到薪资账套 2023-08-31 14:23:51 +08:00
黎永顺 b6ac297242 hotfix-社保福利档案以及薪资档案的导入下载模板功能优化 2023-08-31 11:15:32 +08:00
黎永顺 f65b7979d7 hotfix-薪资核算详情页面编辑刷新分页的bug 2023-08-31 09:40:09 +08:00
黎永顺 ecc2021916 2.9.42308.02bug修复 2023-08-29 14:24:43 +08:00
黎永顺 78e08d7c26 系统数字输入框保留小数位数配置 2023-08-25 16:12:05 +08:00
黎永顺 4462753f28 Merge branch 'release/2.8.3.2308.01' into hotfix/2.9.42308.02 2023-08-25 15:39:49 +08:00
黎永顺 25ce139a0c 产品-工资单产看页面dom渲染顺序优化 2023-08-21 10:53:19 +08:00
黎永顺 a22f3ade1f Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02 2023-08-18 10:19:06 +08:00
黎永顺 8871b8ed2c hotfix/2.9.42308.02 2023-08-18 10:18:53 +08:00
黎永顺 49dce1c871 代码合并 2023-08-17 13:45:21 +08:00
黎永顺 38e2b1b61b Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
2023-08-17 08:43:43 +08:00
黎永顺 9633bcabfb Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01 2023-08-17 08:38:06 +08:00
黎永顺 290c3e51d3 Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
2023-08-17 08:37:56 +08:00
黎永顺 6d10c01f0c Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/stores/payroll.js
2023-08-17 08:36:27 +08:00
黎永顺 2527f75298 字段管理新增修改 2023-08-16 10:30:37 +08:00
黎永顺 5adfa47b5b bug修改-断点 2023-08-11 17:34:42 +08:00
黎永顺 262976cc5e 产品-合并代码 2023-08-04 13:55:20 +08:00
黎永顺 480106d4e7 产品-薪资账套薪资项目项添加编辑的功能 2023-08-04 09:34:04 +08:00
黎永顺 d04c053c07 产品-工资单模板添加发放薪资项目名称修改的功能 2023-08-02 11:57:46 +08:00
黎永顺 cbd06fa42a 产品-非系统人员管理导入 2023-08-02 11:17:17 +08:00
黎永顺 bc12a12097 产品-非系统人员管理导入 2023-08-01 17:44:59 +08:00
黎永顺 5eec7139d6 产品-工资单模板薪资项目名称修改 2023-08-01 16:09:23 +08:00
黎永顺 a433de7671 产品-工资单模板薪资项目名称修改 2023-08-01 16:03:48 +08:00
黎永顺 b03c193927 产品-工资单模板薪资项目名称修改 2023-08-01 15:51:02 +08:00
黎永顺 ce87730349 产品-工资单模板添加发放薪资项目名称修改的功能 2023-08-01 13:37:35 +08:00
黎永顺 33641790e3 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-31 19:08:07 +08:00
黎永顺 db53fc8942 产品-薪资账套薪资项目项添加编辑的功能 2023-07-31 11:50:30 +08:00
黎永顺 223effab98 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-31 11:20:14 +08:00
黎永顺 600d73f858 产品-薪资账套薪资项目编辑功能修改 2023-07-31 10:51:10 +08:00
黎永顺 fb40c1a998 产品-薪资账套编辑 2023-07-28 16:28:27 +08:00
黎永顺 8071a62ec8 产品-社保福利方案自定义方案添加删除功能 2023-07-27 14:58:32 +08:00
黎永顺 6fd55967bd 产品-合并问题处理 2023-07-27 14:09:21 +08:00
黎永顺 868a546dd6 产品-薪资账套薪资项目项添加编辑的功能 2023-07-27 09:08:57 +08:00
黎永顺 3f63b26184 产品-薪资账套薪资项目项添加编辑的功能 2023-07-26 14:10:55 +08:00
黎永顺 c9c79460c7 产品-薪资账套薪资项目项添加编辑的功能 2023-07-26 09:31:15 +08:00
黎永顺 6a45f624e2 产品-社保档案基础信息修改 2023-07-25 18:22:43 +08:00
黎永顺 ada5aee430 产品-社保档案基础信息修改 2023-07-25 16:16:39 +08:00
黎永顺 e963bcfb57 产品-社保档案基础信息修改 2023-07-24 18:22:24 +08:00
黎永顺 aa6a581c1a 产品-编辑功能 2023-07-24 11:14:22 +08:00
黎永顺 07ba7a61c2 Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2307.02 2023-07-24 09:46:30 +08:00
黎永顺 ac37e9b16d 产品-薪资账套薪资项目项添加编辑的功能 2023-07-21 15:37:57 +08:00
黎永顺 3091232181 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-21 10:15:48 +08:00
黎永顺 8e399f979a 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-20 18:26:34 +08:00
黎永顺 d5a625d4c8 产品-release/2.8.3.2307.02bug修复 2023-07-20 17:03:20 +08:00
黎永顺 f7cd085c92 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-20 16:16:43 +08:00
黎永顺 c062f172f6 Merge branch 'feature/V2-非系统人员管理开发' into release/2.8.3.2307.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-20 13:47:42 +08:00
黎永顺 01c033eacf Merge branch 'feature/2.8.3.2307.02-规则设置系统算税开关关闭后禁用' into release/2.8.3.2307.02 2023-07-20 13:45:12 +08:00
黎永顺 f3712e03ef Merge branch 'feature/2.8.3.2307.02-薪资项目添加默认隐藏的功能' into release/2.8.3.2307.02 2023-07-20 13:44:54 +08:00
黎永顺 88b6c23aed Merge branch 'feature/2.8.3.2307.02-薪资核算按自定义列导出' into release/2.8.3.2307.02 2023-07-20 13:44:33 +08:00
黎永顺 27bb5e823d Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.02
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
2023-07-20 13:44:02 +08:00
黎永顺 c48c73a755 产品-非系统人员更改 2023-07-20 13:40:42 +08:00
黎永顺 9d94619c1d 产品-工资单模板添加发放薪资项目名称修改的功能 2023-07-20 13:35:37 +08:00
黎永顺 f323bc6b7c Merge branch 'hotfix/2.8.3.2307.02' into release/2.8.3.2307.02 2023-07-19 15:03:13 +08:00
黎永顺 d1b2f98387 产品-薪资账套薪资项目项添加编辑的功能 2023-07-19 15:02:44 +08:00
黎永顺 77645b717a 产品-薪资项目添加默认隐藏的功能 2023-07-18 17:31:13 +08:00
黎永顺 da3fd957ab 产品-规则设置系统算税开关关闭后禁用 2023-07-18 17:27:51 +08:00
黎永顺 4e3e090c3c 产品-薪资项目隐藏项 2023-07-18 16:50:16 +08:00
黎永顺 192533e847 bug-自定义福利关闭启用时提示错误 2023-07-18 16:01:45 +08:00
黎永顺 ee49150930 产品-薪资项目管理添加默认隐藏的功能 2023-07-18 15:47:56 +08:00
黎永顺 9d1b537abf 产品-薪资项目管理添加默认隐藏的功能 2023-07-18 15:25:16 +08:00
黎永顺 377039ade2 产品-工资单反馈添加提示语 2023-07-17 17:40:30 +08:00
黎永顺 70bd93ef2f Merge branch 'release/2.8.3.2307.01' into feature/2.8.3.2307.02-工资单反馈
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-17 17:09:27 +08:00
黎永顺 57958f9bf9 产品-薪资核算按自定义列导出 2023-07-17 16:49:02 +08:00
黎永顺 ff035c87f3 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
2023-07-17 15:22:17 +08:00
黎永顺 8ca7a02f82 产品-工资单反馈跳转验证 2023-07-17 15:21:05 +08:00
黎永顺 bcecb87dc5 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
2023-07-17 14:44:05 +08:00
黎永顺 2af9059775 产品-工资单反馈跳转验证 2023-07-17 14:43:01 +08:00
黎永顺 25f2c2efd6 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-17 13:50:54 +08:00
黎永顺 4fa57ba637 产品-工资单反馈开发 2023-07-17 11:43:14 +08:00
黎永顺 778ca2655b 薪资核算自定义列导出 2023-07-17 11:26:13 +08:00
黎永顺 ce93eff734 规则名称修改 2023-07-17 10:58:02 +08:00
黎永顺 98a4de233b Merge branch 'master' into hotfix/2.8.3.2307.02 2023-07-14 15:32:06 +08:00
黎永顺 90bb69f292 bug-社保福利台账核算页面按钮文字修改 2023-07-14 15:31:57 +08:00
黎永顺 1542d8c982 非系统人员配置功能 2023-07-14 14:09:27 +08:00
黎永顺 1747e983e4 Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into release/2.8.3.2307.01 2023-07-13 15:24:37 +08:00
黎永顺 626f8721fb 二次密码设置 2023-07-13 15:23:38 +08:00
黎永顺 aa1c3a6417 Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01 2023-07-13 15:11:06 +08:00
黎永顺 985b9612f6 薪资档案个税扣缴义务人选项修改 2023-07-13 15:02:57 +08:00
黎永顺 aff963b5c6 工资单反馈功能新增 2023-07-13 14:45:25 +08:00
黎永顺 e83ff0dbcc 非系统人员管理开发合并 2023-07-13 10:31:45 +08:00
黎永顺 eaf8e5c51e 非系统人员管理开发合并 2023-07-13 10:05:16 +08:00