tijiao1

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

@@ -4421,7 +4421,8 @@
           // month: this.date,
           startDate: this.WorktimeDatepickValue[0],
           endDate: this.WorktimeDatepickValue[1],
-          onlyHaveAttendance: this.onlyHaveAttendance?1:0
+          onlyHaveAttendance: this.onlyHaveAttendance?1:0,
+          noReportDeptId: this.deptIdForNoReport.length>0?this.deptIdForNoReport[this.deptIdForNoReport.length-1]:null
         },
         (res) => {
           if (res.code == "ok") {

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

@@ -237,7 +237,10 @@
               </el-table-column>
               <el-table-column prop="cardHours" :label="$t('workAttendance') + '(h)'" v-if="user.timeType.showCorpwxCardtime==1||user.timeType.showDdCardtime==1 || user.timeType.syncFanwei==1">
                   <template slot-scope="scope">
-                      <span :style="scope.row.cardHours != scope.row.reportTime?'color:red':''">{{scope.row.cardHours?scope.row.cardHours.toFixed(1):'-'}}</span>
+                      <span :style="scope.row.cardHours != scope.row.reportTime?'color:red':''">
+                        <span>{{ scope.row.startTime }} --- {{ scope.row.endTime }}</span>  
+                        {{scope.row.cardHours?scope.row.cardHours.toFixed(1):'-'}}
+                      </span>
                   </template>
               </el-table-column>