Commit Graph

107 Commits

Author SHA1 Message Date
黎永顺 0023d1314b Merge branch 'feature/V2-薪资账套页面重构-1208' into develop 2022-12-14 15:38:21 +08:00
黎永顺 a7028943ed 薪资账套页面重构 2022-12-12 14:15:58 +08:00
黎永顺 fa45739e66 薪资账套页面重构 2022-12-12 11:38:43 +08:00
黎永顺 aac9b4580e Merge branch 'hotfix/v2-工资单模板添加1208' into develop
# Conflicts:
#	pc4mobx/hrmSalary/apis/payroll.js
#	pc4mobx/hrmSalary/pages/payroll/index.js
#	pc4mobx/hrmSalary/stores/payroll.js
2022-12-07 15:43:35 +08:00
黎永顺 4825d0cd49 工资单模板修改 2022-12-06 15:04:57 +08:00
黎永顺 c2e8cd8dae Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into develop 2022-12-05 09:05:20 +08:00
黎永顺 5e23404b32 工资单 2022-12-02 16:12:11 +08:00
黎永顺 42e959c579 Merge branch 'hotfix/v2-1202' into develop 2022-12-02 14:38:33 +08:00
黎永顺 915462919a 薪资账套抽屉页面表格样式修改 2022-12-02 14:38:17 +08:00
黎永顺 2d1cc3cd61 Merge branch 'hotfix/v2-1202' into develop
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
2022-12-02 10:50:19 +08:00
黎永顺 691358a9e2 统一系统右键 2022-12-01 14:28:30 +08:00
黎永顺 f3b504208c Merge branch 'hotfix/v2-1114' into develop 2022-11-17 18:55:45 +08:00
黎永顺 80bc646682 1 2022-11-17 18:55:29 +08:00
黎永顺 a5213cb370 薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能 2022-11-15 15:42:09 +08:00
18652063575 3390630d74 提示语组件样式修改 2022-11-04 09:26:38 +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 1d1ced8d77 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +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
18652063575 938fb94743 bug的修正 2022-09-08 17:04:36 +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 ae3af8e59e 薪资项目管理页面添加sql项的数据源选项 2022-08-03 17:54:47 +08:00
liyongshun 2097d2faf7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
liyongshun cac473595e 薪资核算详情页面表格样式错位的bug解决 2022-07-29 16:45:46 +08:00
liyongshun e329e381ea 薪资核算详情页面导入失败的bug处理以及表格列固定之后,样式错位的bug解决 2022-07-29 11:44:19 +08:00
liyongshun d774de6a64 薪资账套编辑页面修改 2022-07-28 17:16:40 +08:00
liyongshun 8f11093483 社保福利档案添加能带出数据的按钮 2022-07-25 18:02:36 +08:00
liyongshun 134653fac6 薪资发放页面添加进度条弹框组件 2022-07-21 17:34:10 +08:00
liyongshun 3e944ded89 我的薪资福利添加权限功能 2022-07-12 17:39:57 +08:00
liyongshun 2225275881 测试 2022-07-12 16:13:13 +08:00
liyongshun cc0b91b2d8 表格文字超出处理 2022-07-12 16:01:56 +08:00
liyongshun c9722919fe 薪资核算编辑框权限 2022-07-11 18:21:47 +08:00
liyongshun 6579751717 替换个税扣缴义务人接口和分页bug的修改 2022-07-05 16:35:42 +08:00
liyongshun e83a05d8bb 弹框覆盖的bug修改 2022-06-29 10:13:21 +08:00
liyongshun a258a2f342 bug 2022-06-28 18:07:41 +08:00
liyongshun 22ea7b0786 Merge branch 'fenquan' into liys_dev 2022-06-21 15:55:22 +08:00
liyongshun a51e8f32da 固定列表表格样式修改 2022-06-21 15:54:39 +08:00
liyongshun 314ffff8ec 表格应用替换 2022-06-21 11:57:09 +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 e31dbd18d8 保存问题 2022-06-16 16:27:15 +08:00
MustangDeng 2adc0ee33a 导入参数校验 2022-06-15 18:31:10 +08:00
liyongshun f3f07a4612 下载模板地址的区分 2022-06-14 11:32:35 +08:00
liyongshun 3413f8fc0b 导入字段的添加 2022-06-14 11:18:37 +08:00
liyongshun 8dcf736db6 薪资账套的编辑bug修复,以及薪资档案模块上传下载模板添加个参数 2022-06-09 18:34:24 +08:00