考勤增加请假时长显示

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

@@ -356,7 +356,9 @@
                         <span v-if="reportTimeType.type == 3 && user.company.companyName != mingyiName">{{$t('time.hour')}}</span>
                         <span v-if="isBatch && user.company.companyName != mingyiName">, {{$t('other.fillInTheTotal')}} {{jsTime.toFixed(1)}} {{$t('time.hour')}}</span>
 
-                        <span v-if="workForm.time">{{$t('other.attendancePunch')}}: {{workForm.time.startTime}}-{{workForm.time.endTime}}, {{workForm.time.workHours}}{{$t('time.hour')}}</span>
+                        <span v-if="workForm.time">{{$t('other.attendancePunch')}}: {{workForm.time.startTime}}-{{workForm.time.endTime}}, 工作{{workForm.time.workHours}}{{$t('time.hour')}}
+                        <span v-if="workForm.time.askLeaveTime">|&nbsp;请假{{ workForm.time.askLeaveTime }}小时</span>
+                        </span>
                         <!--批量填报和批量代填不显示考勤记录-->
                         <span v-if="!isBatch && (user.timeType.syncDingding==1 || user.timeType.syncCorpwxTime==1)&&!workForm.time" >{{$t('other.noAttendanceRecord')}}</span>
                         <!--针对明夷，批量填报（不含代填）情况下显示考勤时长-->

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

@@ -10,11 +10,11 @@
                 <template #default>
                     <div class="attendanceRecord">
                         <template v-if="user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1">
-                            <span>考勤打卡：</span>
+                            <span>打卡:</span>
                             <span v-if="!report.time">暂无考勤记录</span>
-                            <span v-else>{{report.time.startTime}}-{{report.time.endTime}}, {{report.time.workHours}}h</span>
+                            <span v-else>{{report.time.startTime}}-{{report.time.endTime}}, 工作{{report.time.workHours}}h <span v-if="report.time.askLeaveTime">|&nbsp;请假{{ report.time.askLeaveTime }}h</span></span>
                         </template>
-                        <span style="margin-left:20px">总填报时长：</span>
+                        <span style="margin-left:5px">总填报：</span>
                         <span>{{totalReportHours}}h</span>
                     </div> 
                 </template>