11

src/views/system/schedulingInformation/ViewClockInList.vue

@@ -101,7 +101,7 @@
           
           <a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0
           || (record.ifwork !=0 && record.attendanceCount < 2 && record.name != null)
-          || (record.name != null && record.name != '' && (record.gotoTime == null || record.gotoTime == ''))
+          || (record.ifwork !=0 && record.name != null && record.name != '' && (record.gotoTime == null || record.gotoTime == ''))
           || record.duration != null
           && (record.setInfo == '' || record.setInfo == null)">
           异常

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -56,7 +56,7 @@
           
           <a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0 
           || (record.ifwork !=0 && record.attendanceCount < 2 && record.name != null)
-          || (record.name != null && record.name != '' && (record.gotoTime == null || record.gotoTime == ''))
+          || (record.ifwork !=0 && record.name != null && record.name != '' && (record.gotoTime == null || record.gotoTime == ''))
           || record.duration != null
           && (record.setInfo == '' || record.setInfo == null)">
           异常
@@ -107,11 +107,11 @@
     <a-modal
           v-model="modal2Visible" title="加班信息详情" :footer="null"
           centered @ok="() => (modal2Visible = false)" >
-          <h4>加班申请时间 ： {{durationCommitDate}}</h4>
-          <h4>加班开始时间 ： {{durationBeginDate}}</h4>
-          <h4>加班结束时间 ： {{durationEndDate}}</h4>
-          <h4>加班时长 ： {{duration}}</h4>
-          <h4>加班事由 ： {{demo}}</h4>
+          <p>加班申请时间 ： {{durationCommitDate}}</p>
+          <p>加班开始时间 ： {{durationBeginDate}}</p>
+          <p>加班结束时间 ： {{durationEndDate}}</p>
+          <p>加班时长 ： {{duration}}</p>
+          <p>加班事由 ： {{demo}}</p>
     </a-modal>
   </a-card>
 </template>