|
@@ -24,7 +24,7 @@
|
|
|
<vuescroll>
|
|
|
<Table stripe class="scrollstyle" :height="tableHeight" ref="selection" :columns="tableColumns" :data="tableData" @on-selection-change="selectTeachers">
|
|
|
<template slot-scope="{ row }" slot="picture">
|
|
|
- <PersonalPhoto :name="row.name" :picture="row.picture" />
|
|
|
+ <PersonalPhoto :name="row.name || row.iname" :picture="row.picture" />
|
|
|
</template>
|
|
|
<template slot-scope="{ row,index }" slot="subject">
|
|
|
<p :style="{color:row.subjectIds && row.subjectIds.length? '':'red'}" class="subject-tag" @click="showSetSubj(index)">
|
|
@@ -33,7 +33,7 @@
|
|
|
</template>
|
|
|
<template slot-scope="{ row,index }" slot="name">
|
|
|
<span>
|
|
|
- {{row.name}}
|
|
|
+ {{getNameText(row)}}
|
|
|
</span>
|
|
|
<span v-show="row.status != 'join'" class="teacher-status" :style="{background:row.status == 'invite' ? '#2d8cf0' : ''}">
|
|
|
{{row.status == 'import' ? $t('teachermgmt.teacherStatus1') : row.status == 'invite' ? $t('teachermgmt.teacherStatus2') : ''}}
|
|
@@ -495,7 +495,7 @@ export default {
|
|
|
let flag = params.row.permissions?.some(item => {
|
|
|
return !p.includes(item)
|
|
|
})
|
|
|
- if (params.row.roles.includes('admin')) {
|
|
|
+ if (params.row.roles?.includes('admin')) {
|
|
|
return h(
|
|
|
'span',
|
|
|
{
|
|
@@ -647,6 +647,17 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ getNameText(teacher){
|
|
|
+ if(!teacher.name){
|
|
|
+ return teacher.iname || ''
|
|
|
+ }else if(!teacher.iname){
|
|
|
+ return teacher.name || ''
|
|
|
+ }else if(teacher.name != teacher.iname){
|
|
|
+ return `${teacher.name} (${teacher.iname})`
|
|
|
+ }else{
|
|
|
+ return teacher.name || teacher.iname
|
|
|
+ }
|
|
|
+ },
|
|
|
numberWithCommas(x) {
|
|
|
if (x != undefined) {
|
|
|
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
|