Lijy před 1 dnem
rodič
revize
4a3fef013a

+ 3 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/dailyReportReview.vue

@@ -238,8 +238,9 @@
               <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':''">
-                        <span>{{ scope.row.startTime }} --- {{ scope.row.endTime }}</span>  
-                        {{scope.row.cardHours?scope.row.cardHours.toFixed(1):'-'}}
+                        <span>{{ scope.row.startTime }} ~ {{ scope.row.endTime }}</span>  
+                        <span v-if="scope.row.cardHours">共 {{ scope.row.cardHours.toFixed(1) }} 小时</span>
+                        <span v-if="!scope.row.cardHours">-</span>
                       </span>
                   </template>
               </el-table-column>