2022.8.11 bug加班时长计算，任务分组统计表显示

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -363,7 +363,7 @@
                   <el-table-column prop="groupName" label="分组名称" min-width="100"></el-table-column>
                   <el-table-column prop="workingTime" label="工时(h)" min-width="50" align="right" header-align="center">
                     <template slot-scope="scope">
-                      <span style="margin-right:20px">{{scope.row.leftworkingTime ? scope.row.leftworkingTime.toFixed(1) + '(h)' : ''}}</span>
+                      <span style="margin-right:20px">{{scope.row.workingTime ? scope.row.workingTime.toFixed(1) + '(h)' : ''}}</span>
                     </template>
                   </el-table-column>
                 </el-table-column>
@@ -377,7 +377,7 @@
                   <el-table-column prop="groupName" label="分组名称" min-width="100"></el-table-column>
                   <el-table-column prop="workingTime" label="工时(h)" min-width="50" align="right" header-align="center">
                     <template slot-scope="scope">
-                      <span style="margin-right:20px">{{scope.row.rightworkingTime ? scope.row.rightworkingTime.toFixed(1) + '(h)' : ''}}</span>
+                      <span style="margin-right:20px">{{scope.row.workingTime ? scope.row.workingTime.toFixed(1) + '(h)' : ''}}</span>
                     </template>
                   </el-table-column>
                 </el-table-column>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -762,9 +762,9 @@
                             this.form.domains[i].isOvertime = false
                             delete this.form.domains[i].overtimeHours
                         }
-                        allhour += this.form.domains[i].workingTime
+                        allhour += this.form.domains[i].workingTime*1
                     }
-                    if(allhour > this.user.timeType.allday && this.isWeekend){
+                    if(allhour > this.user.timeType.allday && !this.isWeekend){
                         this.form.domains[this.clickTimeIndex].isOvertime = true
                         this.form.domains[this.clickTimeIndex].overtimeHours = allhour - this.user.timeType.allday
                     }
@@ -1276,7 +1276,6 @@
                 this.form.domains.push(item)
                 this.canEdit = true
                 this.$forceUpdate()
-                console.log('cancanneed',this.flgLg);
             },
 
             // 移除项目

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -1254,7 +1254,7 @@
                     id: null,
                     projectId: "",
                     projectName: "",
-                    workingTime: this.reportTimeType.type==3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):"4.0",
+                    workingTime: this.reportTimeType.type==3?(leftProgress*this.reportTimeType.allday/100).toFixed(1): 4.0,
                     progress:leftProgress,
                     content: "",
                     state: 2,