按周填报检查自定义维度必填

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

@@ -119,6 +119,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             queryWrapper.ne(Plan::getStatus,2);
         }
         queryWrapper.eq(Plan::getIsDelete,0);
+
         if(planType!=2){
             queryWrapper.eq(Plan::getPlanType,0);
         }else {

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

@@ -6033,8 +6033,10 @@
                     }
                 }
                 let errtips = ''
-                if(this.user.timeType.customDegreeStatus == 1 && this.zhoBao.wuduList.length != 0 && !this.zhoBao.degreeId) {
-                    errtips += this.user.timeType.customDegreeName + '、'
+                if(this.user.timeType.customDegreeStatus == 1 && this.zhoBao.wuduList.length != 0) {
+                    if ((!this.user.timeType.customDegreeMultiple && !this.zhoBao.degreeId) || (this.user.timeType.customDegreeMultiple && (!this.zhoBao.multiDegrIdArray || this.zhoBao.multiDegrIdArray.length==0))) {
+                        errtips += this.user.timeType.customDegreeName + '、'
+                    }
                 }
                 if(this.user.timeType.customDataStatus == 1 && !this.zhoBao.customData){
                     errtips += this.user.timeType.customDataName + '、'