Commit Graph

578 Commits

Author SHA1 Message Date
黎永顺 db2fc4ba2e 工资单模板上传背景组件的样式修改 2023-02-03 11:24:17 +08:00
黎永顺 5a73aee25b 工资单模板新增bug修改 2023-02-03 09:21:51 +08:00
黎永顺 a1f7537337 工资单模板添加新增薪资项目大类的功能 2023-02-02 18:59:55 +08:00
黎永顺 7ea4a6f6a8 工资单模板添加新增薪资项目大类的功能 2023-02-02 14:46:39 +08:00
黎永顺 f53e8a733d Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop 2023-01-28 17:54:28 +08:00
黎永顺 6e8b446b16 按钮图标 2023-01-28 17:54:09 +08:00
黎永顺 8048f11d07 Merge branch 'hotfix/feature-v2-0119' into develop 2023-01-18 10:27:50 +08:00
黎永顺 ace2bcb8b5 薪资账套修改 2023-01-18 09:22:14 +08:00
黎永顺 f4bc18d64f Merge branch 'hotfix/feature-v2-0119' into develop 2023-01-16 11:40:08 +08:00
黎永顺 d6f7d3c19b 高版本表格组件修改 2023-01-16 11:39:49 +08:00
黎永顺 578851b80c Merge branch 'hotfix/feature-v2-0112' into develop 2023-01-13 17:30:43 +08:00
黎永顺 8fd6579dfd 薪资账套报错bug 2023-01-13 17:30:24 +08:00
黎永顺 fdf51fe32f Merge branch 'hotfix/feature-v2-0112' into develop 2023-01-13 09:33:58 +08:00
黎永顺 1acb46788b 社保档案的bug修改 2023-01-13 09:33:46 +08:00
黎永顺 df15c64d18 Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop 2023-01-12 09:41:32 +08:00
黎永顺 0598d4ee95 Merge branch 'hotfix/feature-v2-0112' into develop
# Conflicts:
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
2023-01-12 09:40:50 +08:00
黎永顺 8a51c05c30 人员导入报错信息不提示 2023-01-11 13:33:52 +08:00
黎永顺 814eefa1de 福利台账,正常缴纳月添加编辑的功能 2023-01-10 13:51:14 +08:00
黎永顺 a618931e50 Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop 2023-01-09 16:30:52 +08:00
黎永顺 03d282f0f3 薪资账套关联人员添加导入人员的功能 2023-01-09 16:30:26 +08:00
黎永顺 37471efc71 Merge branch 'hotfix/feature-v2-0112' into develop 2023-01-09 15:02:50 +08:00
黎永顺 69961a6c15 应用设置页面新增修改项 2023-01-09 15:02:26 +08:00
黎永顺 b9a864a30e Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop 2023-01-09 14:35:48 +08:00
黎永顺 b3eb3bd779 Merge branch 'hotfix/feature-v2-0112' into develop 2023-01-09 14:30:38 +08:00
黎永顺 e24078ba1c 薪资档案查询参数修改 2023-01-09 14:30:19 +08:00
黎永顺 5c6db20caa 工资单模板预览页面空白 2023-01-09 14:04:08 +08:00
黎永顺 3c6306638d 个税扣缴义务人添加导入人员范围的功能 2023-01-09 11:16:01 +08:00
黎永顺 7f5609550d Merge branch 'hotfix/feature-v2-0112' into develop 2023-01-09 09:41:07 +08:00
黎永顺 0a3e2f8b02 往期累计情况页面查询丢失日期的bug修改 2023-01-09 09:40:50 +08:00
黎永顺 811adfe9f6 Merge branch 'feature/v2-薪资项目公式测试' into develop 2023-01-06 09:36:37 +08:00
黎永顺 7d4c8361c0 公式测试bug的修复 2023-01-06 09:35:34 +08:00
黎永顺 7c65f2b7d3 Merge branch 'hotfix/feature-v2-1229' into develop 2023-01-05 15:03:22 +08:00
黎永顺 b0604f854c 薪资账套报错 2023-01-05 15:03:03 +08:00
黎永顺 7d06f4a749 Merge branch 'hotfix/feature-v2-1229' into develop 2023-01-05 09:46:04 +08:00
黎永顺 d48dcd234b 往期累计情况页面loading的问题 2023-01-05 09:45:50 +08:00
黎永顺 d67dff3c76 Merge branch 'hotfix/feature-v2-1229' into develop 2023-01-04 17:47:41 +08:00
黎永顺 50c29dd093 往期累计情况一键清除提示语修改 2023-01-04 17:47:20 +08:00
黎永顺 f0d7ec8f5b Merge branch 'feature/v2-社保福利台账补缴新增' into develop 2023-01-04 15:47:16 +08:00
黎永顺 fc8f5a4625 新增补缴必填项提示 2023-01-04 15:46:32 +08:00
黎永顺 6a573cd1aa Merge branch 'feature/v2-社保福利台账补缴新增' into develop 2023-01-04 14:37:37 +08:00
黎永顺 4f89a7ef4f 新增补缴添加空值判断 2023-01-04 14:37:19 +08:00
黎永顺 3fc605ccb8 Merge branch 'feature/v2-薪资项目公式测试' into develop 2023-01-04 11:39:18 +08:00
黎永顺 a83d261c20 薪资项目测试 2023-01-04 11:39:00 +08:00
黎永顺 61c139ffcf Merge branch 'feature/v2-薪资项目公式测试' into develop 2023-01-04 11:19:32 +08:00
黎永顺 77b1ae17ed 薪资项目测试 2023-01-04 11:19:22 +08:00
黎永顺 9017297bc0 薪资项目测试 2023-01-04 09:46:20 +08:00
黎永顺 72acbe6485 Merge branch 'hotfix/feature-v2-1229' into develop 2023-01-03 17:19:36 +08:00
黎永顺 62f36c4d42 补缴新增功能完成 2023-01-03 16:52:15 +08:00
黎永顺 5274e5fc1d 补缴新增功能完成 2023-01-03 16:50:03 +08:00
黎永顺 a7daf5e3c0 补缴新增功能完成 2023-01-03 16:46:26 +08:00