加班时长校验修改 只有开启了加班时长填报

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

@@ -868,7 +868,7 @@ public class ReportController {
             }
         }
         //如果开启了加班时长校验
-        if(comTimeType.getWorkOvertimeNeedCheck()==1){
+        if(comTimeType.getFillOvertime()==1&&comTimeType.getWorkOvertimeNeedCheck()==1){
             for (Report report : reportList) {
                 if(WorkDayCalculateUtils.isWorkDay(report.getCreateDate())){
                     HttpRespMsg httpRespMsg = new HttpRespMsg();

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -43,6 +43,12 @@
                         </el-form-item><br>
                         <el-form-item :label="$t('workSettings')" prop="allday" v-if="!timeType.lockWorktime">
                             <el-checkbox v-model="timeType.fillOvertime" :label="$t('hourscanbereported')" />
+                            <el-form-item v-if="timeType.fillOvertime">
+                            <el-checkbox v-model="timeType.workOvertimeNeedCheck" label="加班时长校验" />
+                            <el-tooltip effect="dark" :content="$t('工作日填写加班时长不得超过总工作时长-正常工作时长')" placement="top-start">
+                                        <i class="el-icon-question" style="color:#606266"></i>
+                            </el-tooltip>
+                            </el-form-item>
                             <template v-if="timeType.fillOvertime">
                             <el-checkbox v-model="timeType.payOvertime" :label="$t('chargedtocost')" />
                             <!-- <el-checkbox v-model="timeType.doubleOvertime" label="加班双倍成本" :disabled="!timeType.payOvertime"/> -->
@@ -248,12 +254,6 @@
                 </div>
                 <el-form-item>
                     <el-checkbox v-model="timeType.includeWeekends" label="批量/代填含周末" />
-                </el-form-item>
-                <el-form-item>
-                    <el-checkbox v-model="timeType.workOvertimeNeedCheck" label="加班时长校验" />
-                    <el-tooltip effect="dark" :content="$t('工作日填写加班时长不得超过总工作时长-正常工作时长')" placement="top-start">
-                                <i class="el-icon-question" style="color:#606266"></i>
-                    </el-tooltip>
                 </el-form-item><br/>
                 <el-form-item :label="$t('filltime')" prop="fillMonths">
                     <el-select v-model="timeType.fillMonths" >