edit filter column
This commit is contained in:
parent
3a5d855ec8
commit
3ff2461ec4
1 changed files with 25 additions and 24 deletions
|
|
@ -143,9 +143,11 @@ const getTable = async () => {
|
||||||
const rowData = {
|
const rowData = {
|
||||||
personalId: data.personalId,
|
personalId: data.personalId,
|
||||||
idCard: data.idCard,
|
idCard: data.idCard,
|
||||||
fullName: data.fullName,
|
fullName: data.fullName + ' ' + data.idCard,
|
||||||
|
name: data.fullName,
|
||||||
profilePhoto: data.profilePhoto,
|
profilePhoto: data.profilePhoto,
|
||||||
organizationName: data.organizationName,
|
organizationName: data.organizationName + ' ' + data.organizationShortName + ' ' + data.positionNumber + ' ' + data.positionPath,
|
||||||
|
orgName: data.organizationName,
|
||||||
organizationShortName: data.organizationShortName,
|
organizationShortName: data.organizationShortName,
|
||||||
positionNumber: data.positionNumber,
|
positionNumber: data.positionNumber,
|
||||||
positionPath: data.positionPath,
|
positionPath: data.positionPath,
|
||||||
|
|
@ -423,30 +425,29 @@ const pagination = ref({
|
||||||
/>
|
/>
|
||||||
<img v-else :src="props.row.avatar" class="col-4 img-info" />
|
<img v-else :src="props.row.avatar" class="col-4 img-info" />
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
<div class="text-weight-medium">{{ props.row.fullName }}</div>
|
<div class="text-weight-medium">{{ props.row.name }}</div>
|
||||||
<div class="text-weight-light">{{ props.row.idCard }}</div>
|
<div class="text-weight-light">{{ props.row.idCard }}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</template>
|
||||||
</template>
|
<template v-else-if="col.name === 'number'">
|
||||||
<template v-else-if="col.name === 'number'">
|
<div class="text-weight-medium">
|
||||||
<div class="text-weight-medium">
|
{{ props.row.number !== null ? props.row.number : "-" }}
|
||||||
{{ props.row.number !== null ? props.row.number : "-" }}
|
</div>
|
||||||
</div>
|
</template>
|
||||||
</template>
|
|
||||||
|
|
||||||
<template v-else-if="col.name === 'organizationName'">
|
<template v-else-if="col.name === 'organizationName'">
|
||||||
<div
|
<div
|
||||||
v-if="
|
v-if="props.row.orgName !== null ||
|
||||||
props.row.organizationName !== null ||
|
props.row.positionPath !== null
|
||||||
props.row.positionPath !== null
|
"
|
||||||
"
|
>
|
||||||
>
|
<div class="col-4">
|
||||||
<div class="col-4">
|
<div class="text-weight-medium">
|
||||||
<div class="text-weight-medium">
|
{{
|
||||||
{{
|
props.row.orgName !== null
|
||||||
props.row.organizationName !== null
|
? props.row.orgName
|
||||||
? props.row.organizationName
|
: "-"
|
||||||
: "-"
|
|
||||||
}}
|
}}
|
||||||
{{
|
{{
|
||||||
props.row.organizationShortName !== null
|
props.row.organizationShortName !== null
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue