提交日报填写的计算时间

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

@@ -1980,7 +1980,15 @@
                         }else{
                             if(this.user.timeType.type == 2){
                                 if(domains[i].startTime && domains[i].endTime){
-                                    hours += this.getHour(domains[i].startTime, domains[i].endTime)
+                                    let selectionTime = this.getHourMinutes(domains[i].startTime, domains[i].endTime)
+                                    let subtractedData = 0
+                                    let arr = JSON.parse(JSON.stringify(this.vacationTime))
+                                    arr.unshift({s: domains[i].startTime, e: domains[i].endTime})
+                                    for(var j in arr) {
+                                        subtractedData += +this.timeOverlap(j, arr)
+                                    }
+                                    hours = +selectionTime - +subtractedData
+                                    // hours += this.getHour(domains[i].startTime, domains[i].endTime)
                                 }
                             }else{
                                 hours += domains[i].workingTime ? parseFloat(domains[i].workingTime) : 0