Commit Graph

213 Commits

Author SHA1 Message Date
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 78b12043aa 页面操作按钮权限的控制 2022-06-21 14:27:16 +08:00
liyongshun 314ffff8ec 表格应用替换 2022-06-21 11:57:09 +08:00
liyongshun 2a8aac2068 添加页面操作按钮操作权限 2022-06-21 11:33:00 +08:00
liyongshun a91ce27139 注释薪资核算详情页的表格固定列 2022-06-21 09:41:54 +08:00
MustangDeng 1a6007a8da 往期累计抽屉数据宽度 2022-06-20 16:22:44 +08:00
liyongshun ae70da48be 修改权限的接口 2022-06-20 13:51:55 +08:00
liyongshun bbb4189700 薪资账套复制添加个税扣缴义务人参数 2022-06-17 17:12:21 +08:00
liyongshun 78adb5cf0d 测试bug的修复 2022-06-17 16:53:27 +08:00
MustangDeng 9ddb243bc4 fix bug 默认选项问题 2022-06-16 21:59:29 +08:00
MustangDeng 1837f512a3 fix bug 36 2022-06-16 21:42:08 +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
MustangDeng 1ce692421a 编辑Modal 2022-06-15 16:20:59 +08:00
MustangDeng 711beb5cff 个税扣缴调整弹窗高度 2022-06-15 09:39:48 +08:00
MustangDeng 3a7b2339d5 空值情况处理 2022-06-15 09:10:08 +08:00
MustangDeng a39b9d606a 工资单模板删除项目 2022-06-14 16:51:26 +08:00
MustangDeng b407adc724 页面优化 2022-06-14 16:21:50 +08:00
liyongshun f3f07a4612 下载模板地址的区分 2022-06-14 11:32:35 +08:00
liyongshun b5dc616ba6 Merge branch 'fenquan' of gitee.com:MustangDeng/salary-management-front-end into fenquan 2022-06-14 11:18:40 +08:00
liyongshun 3413f8fc0b 导入字段的添加 2022-06-14 11:18:37 +08:00
MustangDeng c4502f1e1b 工资单模板 2022-06-14 11:17:03 +08:00
MustangDeng 6ae75883b0 编译问题处理 2022-06-14 10:23:38 +08:00
MustangDeng 029876f694 账套列表 2022-06-14 10:16:04 +08:00
MustangDeng 697b799b32 显示列定制 2022-06-13 18:08:45 +08:00
MustangDeng 6fda61cf83 fix bug 2022-06-13 10:22:49 +08:00
MustangDeng 4ae6db4e2b fix 其他免税 2022-06-10 17:29:46 +08:00
MustangDeng 1889a4818d Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan 2022-06-10 14:21:28 +08:00
MustangDeng a71ab9793e 个税申报表详情列表 2022-06-10 14:21:07 +08:00
liyongshun 8dcf736db6 薪资账套的编辑bug修复,以及薪资档案模块上传下载模板添加个参数 2022-06-09 18:34:24 +08:00
MustangDeng 47af2543b0 Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan 2022-06-09 18:30:39 +08:00
MustangDeng aebb43b461 福利台账分权 2022-06-09 18:30:19 +08:00
liyongshun cd801cb5c7 账套列表编辑权限的田间 2022-06-08 18:42:01 +08:00
liyongshun adc089b033 注释个税申报的个税申报人选项 2022-06-07 18:48:25 +08:00
liyongshun f5b947c80c Merge branch 'liys_dev' into fenquan 2022-06-07 18:37:35 +08:00
liyongshun 9193e6b2e9 bug修改 2022-06-07 18:24:05 +08:00
MustangDeng 31756873d9 扣缴人修改 2022-06-07 18:19:24 +08:00
MustangDeng 55731caafe 合并分支 2022-06-07 14:42:44 +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 9940be40ed 工资单预览调整 2022-05-31 19:05:29 +08:00
MustangDeng 936ac9bd3f 工资单bug修复 2022-05-31 18:51:23 +08:00