组织架构、时间计算调整

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -207,11 +207,11 @@
                       <span v-if="user.corpwxUserid && saasSyncContact == 0" class="classwxNameIon">
                         <img src="../../assets/image/qiyeweix.png" alt="">
                       </span>
-                      <!-- <div v-if="user.userNameNeedTranslate == 1">
+                      <div v-if="user.userNameNeedTranslate == 1">
                         <ww-open-data type='userName' :openid='scope.row.name'></ww-open-data>
                       </div>
-                      <div v-else>{{scope.row.name}}</div> -->
-                      <div>{{scope.row.name}}</div>
+                      <div v-else>{{scope.row.name}}</div>
+                      <!-- <div>{{scope.row.name}}</div> -->
                     </div>
                   </template>
                 </el-table-column>

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

@@ -1980,13 +1980,15 @@
                         }else{
                             if(this.user.timeType.type == 2){
                                 if(domains[i].startTime && domains[i].endTime){
-                                    let selectionTime = this.getHourMinutes(domains[i].startTime, domains[i].endTime)
+                                    // let selectionTime = this.getHourMinutes(domains[i].startTime, domains[i].endTime)
+                                    let selectionTime = this.getHour(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)
                                     }
+                                    console.log(selectionTime, subtractedData)
                                     hours = +selectionTime - +subtractedData
                                     // hours += this.getHour(domains[i].startTime, domains[i].endTime)
                                 }
@@ -5092,7 +5094,8 @@
                             // var minutes=Math.floor(leave2/(60*1000))
                             // var shi = hours+'.'+ minutes
                             // he += +shi
-                            let selectionTime = this.getHourMinutes(zhi[i].time[0], zhi[i].time[1])
+                            // let selectionTime = this.getHourMinutes(zhi[i].time[0], zhi[i].time[1])
+                            let selectionTime = this.getHour(zhi[i].time[0], zhi[i].time[1])
                             let subtractedData = 0
                             // he += +this.getHour(zhi[i].time[0], zhi[i].time[1])
                             // 计算需要减去的时间
@@ -5121,7 +5124,8 @@
                         if (((dateAr[k].s <= dateAr[idx].s && dateAr[k].e >= dateAr[idx].s) || (dateAr[k].s <= dateAr[idx].s && dateAr[k].e <= dateAr[idx].e))) {
                             // 选择的时间包含设置的休息时间段 （选择的开始时间和结束时间大于设置的休息时间段）
                             if(dateAr[idx].s > dateAr[k].s && dateAr[idx].e < dateAr[k].e) {
-                                zhi += 2
+                                // zhi += 2
+                                zhi += +this.getHour(dateAr[idx].s, dateAr[idx].e)
                             }
                             // 选择的时间包含在设置的休息时间 （选择的开始时间和结束时间都处于在设置的休息时间段内）
                             if(dateAr[idx].s > dateAr[k].s && dateAr[idx].e > dateAr[k].e) {