Commit Graph

1096 Commits

Author SHA1 Message Date
黎永顺 9452bd9d64 工资单模板页面新增分类功能修改 2023-02-06 10:10:37 +08:00
黎永顺 db2fc4ba2e 工资单模板上传背景组件的样式修改 2023-02-03 11:24:17 +08:00
黎永顺 2a1e152492 Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop 2023-02-03 10:29:48 +08:00
黎永顺 e20c25e691 Merge branch 'feature/V2-社保福利方案新增字段' into develop 2023-02-03 10:29:08 +08:00
黎永顺 b72dcc3e6b 薪资项目管理页面分页的bug 2023-02-03 10:12:53 +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
黎永顺 b234e78b2f 社保福利方案新增字段 2023-02-01 17:57:21 +08:00
黎永顺 a74d887d6a 样式调整 2023-02-01 11:21:00 +08:00
黎永顺 464f986f62 去除打印信息 2023-01-31 11:26:37 +08:00
黎永顺 4f55e755cb 去除打印信息 2023-01-31 10:32:49 +08:00
黎永顺 5c0a909f07 Merge branch 'hotfix/feature-v2-0202' into develop 2023-01-31 10:27:26 +08:00
黎永顺 688bc7afe4 Merge branch 'feature/v2-字段管理页面-0120' into develop 2023-01-31 10:27:18 +08:00
黎永顺 e9b0a50019 字段管理页面 2023-01-31 10:25:07 +08:00
黎永顺 c4c17113ce 字段管理页面 2023-01-31 10:14:10 +08:00
黎永顺 33bb4b9814 薪资账套修改 2023-01-30 10:53:47 +08:00
黎永顺 0d0a9fc31e 薪资账套修改 2023-01-30 09:39:40 +08:00
黎永顺 42ee5f0cd8 薪资核算修改 2023-01-29 15:52:46 +08:00
黎永顺 117d1561c2 按钮图标 2023-01-29 14:46:38 +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
黎永顺 73e8357e22 字段管理 2023-01-28 13:42:32 +08:00
黎永顺 cd897394b6 字段管理 2023-01-28 10:10:00 +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