无考勤时要支持暂存

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -1171,14 +1171,10 @@ public class ReportController {
                         leftCost = baseAmount;
                     }
                     String name = projectList.stream().filter(p->p.getId().equals(item.getProjectId())).findFirst().get().getProjectName();
-                    System.out.println("项目["+name+"]的["+item.getBaseName()+"]总预算="+baseAmount+",剩余="+leftCost);
-                    System.out.println("本次项目预算填报的="+item.getCurFillCost());
                     //移动端可能没有选择预算来源的地方
                     if (item.getCurFillCost() != null && item.getCurFillCost().compareTo(leftCost) > 0) {
                         //超支了，不能填报
-//                    String name = projectList.stream().filter(p->p.getId().equals(item.getProjectId())).findFirst().get().getProjectName();
                         HttpRespMsg msg = new HttpRespMsg();
-                        //msg.setError("项目["+name+"]的["+item.getBaseName()+"]预算不足，请联系管理人员下拨预算");
                         msg.setError(MessageUtils.message("project.InsufficientBudget",name,item.getBaseName()));
                         return msg;
                     }
@@ -1242,8 +1238,8 @@ public class ReportController {
             if (comTimeType.getSyncCorpwxTime() == 1) {
                 String[] dateArr = createDate[0].split("@");
                 List<UserCorpwxTime> cardTimeList = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>().eq("corpwx_userid", user.getCorpwxUserid()).between("create_date", dateArr[0], dateArr[1]));
-                //考勤记录不能为空或时长为0
-                if (comTimeType.getNotAllowedNoAttendance() == 1) {
+                //提交日报时，考勤记录不能为空或时长为0
+                if (comTimeType.getNotAllowedNoAttendance() == 1 && draft == 0) {
                     String str = "";
                     for (Report r : reportList) {
                         Optional<UserCorpwxTime> first = cardTimeList.stream().filter(card -> card.getCreateDate().isEqual(r.getCreateDate())).findFirst();

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -6139,7 +6139,7 @@
                         }
                         //批量填报不校验考勤时长，交给后台校验
                         if (!this.isBatch) {
-                            if(this.user.timeType.notAllowedNoAttendance == 1){
+                            if(this.user.timeType.notAllowedNoAttendance == 1 && this.isDraft == 0){
                                 if (this.workForm.time){
                                     if (this.workForm.time.workHours == 0){
                                         this.$message({