sc
This commit is contained in:
@@ -48,7 +48,7 @@
|
||||
:tree-props="{ children: 'userDingAttendanceRespVOList', hasChildren: 'hasChildren' }"
|
||||
:span-method="spanMethod"
|
||||
>
|
||||
<el-table-column label="姓名" min-width="90px">
|
||||
<el-table-column label="姓名" min-width="90px" fixed="left">
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.userDingAttendanceRespVOList && row.userDingAttendanceRespVOList.length">
|
||||
<span>{{ row.period }}</span>
|
||||
@@ -67,7 +67,8 @@
|
||||
{{ row.needAttendance ? '考勤' : '不考勤' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="shouldWorkDay" label="计薪天数" min-width="90px" />
|
||||
<el-table-column prop="shouldWorkDay" label="应出勤天数" min-width="90px" />
|
||||
<el-table-column prop="paidLeaveDay" label="带薪假天数" min-width="90px" />
|
||||
<el-table-column label="出勤天数" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-input-number
|
||||
@@ -286,8 +287,8 @@ async function getList() {
|
||||
function spanMethod({ row, columnIndex }) {
|
||||
if (row.userDingAttendanceRespVOList && row.userDingAttendanceRespVOList.length > 0) {
|
||||
if (columnIndex === 0) {
|
||||
return [1, 13]
|
||||
} else if (columnIndex == 13 && row.id) {
|
||||
return [1, 14]
|
||||
} else if (columnIndex == 14 && row.id) {
|
||||
return [1, 1]
|
||||
} else {
|
||||
return [0, 0]
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
:tree-props="{ children: 'userSalaryGrantRespVOList', hasChildren: 'hasChildren' }"
|
||||
:span-method="spanMethod"
|
||||
>
|
||||
<el-table-column label="姓名" min-width="90px">
|
||||
<el-table-column label="姓名" min-width="90px" fixed="left">
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.userSalaryGrantRespVOList && row.userSalaryGrantRespVOList.length">
|
||||
<span>{{ row.period }}</span>
|
||||
|
||||
Reference in New Issue
Block a user