1

src/views/personnelManagement/checkWorkList.vue

@@ -39,7 +39,8 @@
       label="日期"
       width="180">
       <template slot-scope="scope">
-        <span style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+        <span v-if="!scope.row.leaveType" style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+        <span v-else style="margin-left: 10px">{{ scope.row.clockDay }}</span>
       </template>
 
     </el-table-column>
@@ -49,7 +50,8 @@
       width="180">
       <template slot-scope="scope">
         <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>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px;">已补卡</span>
+        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -57,7 +59,8 @@
       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>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px;">已补卡</span>
+        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
   </el-table>
@@ -101,9 +104,8 @@
   </el-table>
 </div>
 <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"></el-pagination>
-   
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <!-- :total="deptBudgetTotal" -->
   <!-- <div class="content">
     <div v-for="(item,index) in tableData">
       <div class="row">