Selaa lähdekoodia

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

gjy 2 vuotta sitten
vanhempi
commit
89e2b8087a
1 muutettua tiedostoa jossa 6 lisäystä ja 1 poistoa
  1. 6 1
      src/views/personnelManagement/checkWorkList.vue

+ 6 - 1
src/views/personnelManagement/checkWorkList.vue

@@ -48,12 +48,17 @@
       label="上班打卡时间"
       width="180">
       <template slot-scope="scope">
-        <span style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+        <span v-if="scope.row.toClockDate" style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px">已补卡</span>
       </template>
     </el-table-column>
     <el-table-column
       prop="offClockDate"
       label="下班打卡时间">
+      <template slot-scope="scope">
+        <span v-if="scope.row.offClockDate" style="margin-left: 10px">{{ scope.row.offClockDate.split(" ")[1] }}</span>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px">已补卡</span>
+      </template>
     </el-table-column>
   </el-table>
         <!-- <el-form label-position="left" inline class="demo-table-expand">