Revert "删除所属岗位 新增角色列"

This reverts commit 92f5515620.
This commit is contained in:
wxyclub
2023-11-27 09:23:05 +08:00
parent eefac010ff
commit cf7af05cd6
@@ -148,28 +148,20 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="roles" prop="NameList"
label="角色" label="所属岗位">
> <template slot-scope="scope">
<template slot-scope="scope"> <el-popover trigger="hover" placement="top">
{{getRoleName(scope.row.roles)}} {{ scope.row.NameList }}
<div slot="reference" class="name-wrapper">
<p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
{{ scope.row.NameList }}
</p>
<p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>
</div>
</el-popover>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column-->
<!-- prop="NameList"-->
<!-- label="所属岗位">-->
<!-- <template slot-scope="scope">-->
<!-- <el-popover trigger="hover" placement="top">-->
<!-- {{ scope.row.NameList }}-->
<!-- <div slot="reference" class="name-wrapper">-->
<!-- <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">-->
<!-- {{ scope.row.NameList }}-->
<!-- </p>-->
<!-- <p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>-->
<!-- </div>-->
<!-- </el-popover>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
label="状态" label="状态"
width="100px"> width="100px">
@@ -314,12 +306,6 @@ export default {
} }
}, },
methods: { methods: {
getRoleName(roles){
let names=roles.map(item=>{
return item.name
})
return names.join(',')
},
clearAllSearch() { clearAllSearch() {
this.searchForm = { this.searchForm = {
uname: "", uname: "",