Commit Graph

2184 Commits

Author SHA1 Message Date
liyongshun bac1e217a2 Merge branch 'release' into release-zhongjiang 2022-06-28 18:08:26 +08:00
liyongshun a258a2f342 bug 2022-06-28 18:07:41 +08:00
MustangDeng 4d46a7ca90 发起流程修改 2022-06-27 18:01:30 +08:00
liyongshun 0da6205159 Merge branch 'release' into release-zhongjiang 2022-06-27 10:38:01 +08:00
liyongshun aa165e70da 修改导出的bug 2022-06-27 10:35:39 +08:00
liyongshun c582fb2182 工资单发放bug的修复 2022-06-24 11:59:29 +08:00
liyongshun 8a3ff43bb4 中江代码 2022-06-23 16:47:00 +08:00
liyongshun 7e1ed1b848 Merge branch 'release' into release-zhongjiang 2022-06-23 16:35:33 +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 60a97f9736 编辑权限 2022-06-21 17:35:19 +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 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 b2c63bb610 Merge branch 'fenquan' into release-zhongjiang 2022-06-20 16:23:18 +08:00
MustangDeng 1a6007a8da 往期累计抽屉数据宽度 2022-06-20 16:22:44 +08:00
liyongshun ae70da48be 修改权限的接口 2022-06-20 13:51:55 +08:00
liyongshun aaeb4b9459 Merge branch 'fenquan' into release-zhongjiang 2022-06-17 17:20:51 +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 1e21df35e6 Merge branch 'fenquan' into release-zhongjiang 2022-06-16 16:27:52 +08:00
MustangDeng e31dbd18d8 保存问题 2022-06-16 16:27:15 +08:00
MustangDeng b2ce5ba467 Merge branch 'fenquan' into release-zhongjiang 2022-06-15 18:31:50 +08:00
MustangDeng 2adc0ee33a 导入参数校验 2022-06-15 18:31:10 +08:00
MustangDeng 8f9150e1a1 Merge branch 'fenquan' into release-zhongjiang 2022-06-15 16:21:30 +08:00
MustangDeng 1ce692421a 编辑Modal 2022-06-15 16:20:59 +08:00
MustangDeng 123ba900e7 Merge branch 'fenquan' into release-zhongjiang 2022-06-15 09:42:20 +08:00
MustangDeng 711beb5cff 个税扣缴调整弹窗高度 2022-06-15 09:39:48 +08:00
MustangDeng b60a69a63c Merge branch 'fenquan' into release-zhongjiang 2022-06-15 09:11:11 +08:00
MustangDeng 3a7b2339d5 空值情况处理 2022-06-15 09:10:08 +08:00
MustangDeng 86c56e2140 Merge branch 'fenquan' into release-zhongjiang 2022-06-14 16:53:29 +08:00
MustangDeng a39b9d606a 工资单模板删除项目 2022-06-14 16:51:26 +08:00
MustangDeng b407adc724 页面优化 2022-06-14 16:21:50 +08:00
MustangDeng 0ce5d93199 Merge branch 'fenquan' into release-zhongjiang 2022-06-14 14:11:24 +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 5decf617a6 工资单页面定制 2022-06-13 16:31:08 +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