Commit Graph

70 Commits

Author SHA1 Message Date
黎永顺 ecc2021916 2.9.42308.02bug修复 2023-08-29 14:24:43 +08:00
黎永顺 8071a62ec8 产品-社保福利方案自定义方案添加删除功能 2023-07-27 14:58:32 +08:00
黎永顺 192533e847 bug-自定义福利关闭启用时提示错误 2023-07-18 16:01:45 +08:00
黎永顺 c0aa321bf0 Merge branch 'master' into feature/230701-列表上面操作按钮显示两个 2023-07-03 14:00:23 +08:00
黎永顺 ae9d7cc7c0 产品-列表上面操作按钮显示两个 2023-06-26 11:27:27 +08:00
黎永顺 2f4eebe6c7 产品-列表上面操作按钮显示两个 2023-06-26 10:24:05 +08:00
黎永顺 403a44a49a 产品-社保福利方案列表查询bug修复 2023-06-16 14:55:32 +08:00
黎永顺 2384398ce9 产品-社保福利方案列表渲染修改 2023-03-15 17:23:08 +08:00
黎永顺 c46582560e Merge branch 'feature/v2-数据采集-考勤引用页面重构' into develop 2023-03-10 11:43:44 +08:00
黎永顺 7907fd5a83 数据采集-考勤引用页面重构 2023-03-03 16:29:52 +08:00
黎永顺 10721ecba0 社保福利方案-自定义方案页面重构 2023-03-02 18:44:36 +08:00
黎永顺 7539c60af5 社保福利方案表格固定的bug处理 2023-02-27 09:16:57 +08:00
黎永顺 94a8a6f05a 社保福利方案修改 2023-02-23 16:43:14 +08:00
黎永顺 d1e0460e39 bug修复 2023-02-22 10:39:47 +08:00
黎永顺 3694b009a4 Merge branch 'feature/V2-社保福利档案新增编辑页面重构' into develop
# Conflicts:
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
2023-02-22 09:13:05 +08:00
黎永顺 c99bbbcb6d Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
#	pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
2023-02-15 17:28:02 +08:00
黎永顺 4e6f727727 薪资项目列表操作权限修改 2023-02-15 14:18:20 +08:00
黎永顺 38ca2cc421 社保福利档案页面重构 2023-02-13 16:38:15 +08:00
黎永顺 f6f786b33f 社保福利档案页面重构 2023-02-13 16:00:14 +08:00
黎永顺 d77a3f5fca 薪酬页面滚动的修改 2023-02-13 10:41:40 +08:00
黎永顺 b234e78b2f 社保福利方案新增字段 2023-02-01 17:57:21 +08:00
黎永顺 691358a9e2 统一系统右键 2022-12-01 14:28:30 +08:00
黎永顺 dcb2f5f864 社保福利方案社保编辑报错的bug解决 2022-11-10 17:24:56 +08:00
18652063575 ba11b69e31 社保福利档案接口修改 2022-11-04 13:51:41 +08:00
18652063575 3722694d80 薪资项目管理列表数据处理 2022-11-02 15:18:03 +08:00
18652063575 abd8f2b9f4 社保福利档案页面的接口联调 2022-11-01 15:50:54 +08:00
18652063575 023f70e692 社保福利档案接口对接 2022-11-01 10:35:59 +08:00
18652063575 24b24c2652 社保福利档案页面添加提示语 2022-10-31 14:49:24 +08:00
18652063575 c4c24dd159 薪资档案以及社保福利档案页面部分bug修复 2022-10-20 17:53:26 +08:00
18652063575 d7fcdd2637 薪资档案以及社保福利档案页面添加四个tab的列表查询 2022-10-17 10:03:01 +08:00
18652063575 27e54073c6 统一所有页面你的弹框以及抽屉头部组件,样式bug的修改 2022-09-15 11:08:13 +08:00
18652063575 0cec0873fe 统一所有页面你的弹框以及抽屉头部组件 2022-09-13 16:39:15 +08:00
18652063575 a55847e656 bug的修正 2022-09-09 10:29:12 +08:00
liyongshun ef9f8478a7 bug的修正 2022-09-01 17:52:00 +08:00
liyongshun 6768649ac4 bug的修正 2022-08-25 17:54:18 +08:00
liyongshun 2097d2faf7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
liyongshun 9fb20ad59c 隐藏社保福利方案页面删除按钮 2022-07-28 17:26:20 +08:00
liyongshun d774de6a64 薪资账套编辑页面修改 2022-07-28 17:16:40 +08:00
liyongshun c2757fd1f4 社保福利档案表格分页的bug 2022-07-04 13:56:15 +08:00
liyongshun a258a2f342 bug 2022-06-28 18:07:41 +08:00
liyongshun e3d30694c3 操作菜单权限得bug修复 2022-06-22 17:14:53 +08:00
liyongshun 60a97f9736 编辑权限 2022-06-21 17:35:19 +08:00
liyongshun 2a8aac2068 添加页面操作按钮操作权限 2022-06-21 11:33:00 +08:00
liyongshun 78adb5cf0d 测试bug的修复 2022-06-17 16:53:27 +08:00
MustangDeng 70a5d3ae7b fix bug 48 - 56 2022-06-16 20:58:54 +08:00
MustangDeng 697b799b32 显示列定制 2022-06-13 18:08:45 +08:00
MustangDeng c7128fcfb0 bug修改 2022-06-07 09:08:36 +08:00
MustangDeng 95166a6534 bug修复 2022-05-30 17:30:53 +08:00
MustangDeng 6adf1a83fa bug 2022-05-30 09:38:45 +08:00
MustangDeng 45e72e723f bug修复 2022-05-19 15:13:31 +08:00