Commit Graph

83 Commits

Author SHA1 Message Date
黎永顺 986e2d7f4a Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
2023-07-11 10:11:58 +08:00
黎永顺 3d04a79fcd 产品-统一页面列表操作按钮 2023-07-03 15:42:11 +08:00
黎永顺 3a8dd06e3c 产品-工资单水印预览和查看不一致的问题处理,账套项目预览隐藏分组未实现, 数据采集查看明细时页面显示不对齐问题处理 2023-06-30 10:17:23 +08:00
黎永顺 915462919a 薪资账套抽屉页面表格样式修改 2022-12-02 14:38:17 +08:00
黎永顺 691358a9e2 统一系统右键 2022-12-01 14:28:30 +08:00
黎永顺 68069df58b 薪资核算解锁锁定的功能 2022-11-17 14:17:34 +08:00
黎永顺 b52a734e03 薪资账套添加人员删除人员列表分页报错的bug 2022-11-10 16:41:53 +08:00
黎永顺 20e6c3aa7e 薪资账套添加人员全选报错的问题 2022-11-10 15:01:44 +08:00
黎永顺 35633d753e 新增人员添加全选的按钮 2022-11-10 09:19:09 +08:00
18652063575 08ab6de7a4 hotfix/v2-bug修复-1024 2022-10-28 17:12:03 +08:00
18652063575 558db4220b hotfix/v2-bug修复-1024 2022-10-27 13:58:23 +08:00
18652063575 284761360f 加密设置功能添加 2022-10-10 15:02:46 +08:00
18652063575 1d1ced8d77 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
18652063575 85441a1f69 1 2022-09-19 13:36:36 +08:00
18652063575 756ca0cb74 新增系统配置页面以及新增和编辑接口功能 2022-09-15 16:58:49 +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 6768649ac4 bug的修正 2022-08-25 17:54:18 +08:00
liyongshun 67f0de658a 薪资核算页面表格替换antd4.x的table组件 2022-08-11 17:38:03 +08:00
liyongshun 2097d2faf7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
liyongshun d774de6a64 薪资账套编辑页面修改 2022-07-28 17:16:40 +08:00
liyongshun 134653fac6 薪资发放页面添加进度条弹框组件 2022-07-21 17:34:10 +08:00
liyongshun 6ff45ec2a1 社保福利台账页面的bug修改 2022-07-20 10:33:23 +08:00
liyongshun c9722919fe 薪资核算编辑框权限 2022-07-11 18:21:47 +08:00
liyongshun 6579751717 替换个税扣缴义务人接口和分页bug的修改 2022-07-05 16:35:42 +08:00
liyongshun f762fd5a9a 薪资账套周期联动 2022-07-04 19:03:14 +08:00
liyongshun 65be568847 测试bug的修复 2022-06-29 17:04:01 +08:00
liyongshun 9a6344dae1 测试bug 2022-06-23 16:20:49 +08:00
liyongshun e3d30694c3 操作菜单权限得bug修复 2022-06-22 17:14:53 +08:00
liyongshun 78b12043aa 页面操作按钮权限的控制 2022-06-21 14:27:16 +08:00
liyongshun bbb4189700 薪资账套复制添加个税扣缴义务人参数 2022-06-17 17:12:21 +08:00
liyongshun 78adb5cf0d 测试bug的修复 2022-06-17 16:53:27 +08:00
MustangDeng 1837f512a3 fix bug 36 2022-06-16 21:42:08 +08:00
MustangDeng 1ce692421a 编辑Modal 2022-06-15 16:20:59 +08:00
MustangDeng 6ae75883b0 编译问题处理 2022-06-14 10:23:38 +08:00
MustangDeng 029876f694 账套列表 2022-06-14 10:16:04 +08:00
MustangDeng 6fda61cf83 fix bug 2022-06-13 10:22:49 +08:00
liyongshun 8dcf736db6 薪资账套的编辑bug修复,以及薪资档案模块上传下载模板添加个参数 2022-06-09 18:34:24 +08:00
liyongshun cd801cb5c7 账套列表编辑权限的田间 2022-06-08 18:42:01 +08:00
MustangDeng fc16f570b8 Merge branch 'liys_dev' into fenquan
# Conflicts:
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
#	pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
#	pc4mobx/hrmSalary/pages/salaryFile/index.js
2022-06-07 10:57:02 +08:00
MustangDeng d9c2aef5ae todo 2022-06-07 10:22:06 +08:00
MustangDeng c7128fcfb0 bug修改 2022-06-07 09:08:36 +08:00
MustangDeng b94af53ed4 bug修复 2022-06-06 14:31:20 +08:00
liyongshun e552f34103 添加权限 2022-06-02 17:11:28 +08:00
liyongshun 519ddd732b Merge branch 'dev' into merge_liys_dev 2022-06-02 15:23:38 +08:00
liyongshun 17e23fc014 列表分页以及权限的修改 2022-06-02 14:48:55 +08:00
MustangDeng c9cda1fdfc bug 处理 2022-06-02 13:51:45 +08:00
MustangDeng 936ac9bd3f 工资单bug修复 2022-05-31 18:51:23 +08:00
MustangDeng 55f732c1fc 台账归档页面刷新 2022-05-31 16:37:35 +08:00