|
|
@@ -62,7 +62,7 @@
|
|
|
:dataSource="dataSource"
|
|
|
:pagination="ipagination"
|
|
|
:loading="loading"
|
|
|
- @change="handleTableChange" :scroll="{ x: 1600, y: 550 }">
|
|
|
+ @change="handleTableChange" :scroll="{ x: 1700, y: 550 }">
|
|
|
|
|
|
<span slot="ShiftTime" slot-scope="text, record, index">
|
|
|
{{record.shiftRealTimeS}} - {{record.shiftRealTimeX}}
|
|
|
@@ -366,12 +366,11 @@
|
|
|
align: "center",
|
|
|
dataIndex: 'attendanceCount'
|
|
|
},
|
|
|
- // {
|
|
|
- // title: '加班申请',
|
|
|
- // align: "center",
|
|
|
- // dataIndex: 'demo',
|
|
|
- // width: 200
|
|
|
- // },
|
|
|
+ {
|
|
|
+ title: '请假',
|
|
|
+ align: "center",
|
|
|
+ dataIndex: 'holidayType'
|
|
|
+ },
|
|
|
{
|
|
|
title: '加班时间',
|
|
|
align: "center",
|
|
|
@@ -388,7 +387,7 @@
|
|
|
},
|
|
|
{
|
|
|
title: '操作',
|
|
|
- dataIndex: 'action',
|
|
|
+ dataIndex: 'action',fixed: 'right', width: 100,
|
|
|
scopedSlots: {customRender: 'action'},
|
|
|
align: "center",
|
|
|
width: 120
|
ysh