Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectApprovalServiceImpl.java

@@ -107,6 +107,7 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
         boolean hasAllPriviledge = sysFunctionService.hasPriviledge(user.getRoleId(), "管理全部立项申请");
         boolean hasCheckPriviledge = sysFunctionService.hasPriviledge(user.getRoleId(), "审核立项申请");
         LambdaQueryWrapper<ProjectApproval> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProjectApproval::getCompanyId,companyId);
         if(!StringUtils.isEmpty(keyword)){
             switch (searchField){
                 case 1:queryWrapper.like(ProjectApproval::getProjectName,keyword);

fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -648,6 +648,7 @@ methods: {
                 bu: [],
                 manDay:0,
                 fromOutside: 0,
+                status:0
             }
             this.projectBaseCostData = [];
             this.auseList = [];