|
|
@@ -48,8 +48,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="姓名" align="center" prop="realName" v-if="columns[2].visible" :show-overflow-tooltip="true" width="120" />
|
|
|
<el-table-column label="公司部门" align="center" prop="deptNames" v-if="columns[3].visible" :show-overflow-tooltip="true" width="160" />
|
|
|
- <el-table-column label="级别职务" align="center" prop="levelJobNames" v-if="columns[4].visible" width="160" />
|
|
|
- <el-table-column label="性质岗位" align="center" prop="naturePostNames" v-if="columns[5].visible" width="160" />
|
|
|
+ <el-table-column label="级别职务" align="center" prop="levelJobNames" v-if="columns[4].visible" :show-overflow-tooltip="true" width="160" />
|
|
|
+ <el-table-column label="性质岗位" align="center" prop="naturePostNames" v-if="columns[5].visible" :show-overflow-tooltip="true" width="160" />
|
|
|
<el-table-column label="角色权限" align="center" v-if="columns[6].visible" width="160">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.roleNames + '/' + scope.row.dataRoleNames }}</span>
|
|
|
@@ -124,21 +124,21 @@
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="公司部门" prop="deptIds">
|
|
|
- <Treeselect v-model="accountForm.deptIds" :options="deptOptions" :multiple="true" placeholder="选择公司部门" />
|
|
|
+ <Treeselect v-model="accountForm.deptIds" noChildrenText="无数据" :disable-branch-nodes="true" search-nested :options="deptOptions" :multiple="true" placeholder="选择公司部门" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="职称级别" prop="levelJobIds">
|
|
|
- <Treeselect v-model="accountForm.levelJobIds" :options="levelList" :multiple="true" placeholder="选择职称级别" />
|
|
|
+ <Treeselect v-model="accountForm.levelJobIds" noChildrenText="无数据" :disable-branch-nodes="true" search-nested :options="levelList" :multiple="true" placeholder="选择职称级别" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="性质岗位" prop="naturePostIds">
|
|
|
- <Treeselect v-model="accountForm.naturePostIds" :options="natureList" :multiple="true" placeholder="选择性质岗位" />
|
|
|
+ <Treeselect v-model="accountForm.naturePostIds" noChildrenText="无数据" :disable-branch-nodes="true" search-nested :options="natureList" :multiple="true" placeholder="选择性质岗位" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -716,7 +716,7 @@
|
|
|
pageSize: 10
|
|
|
},
|
|
|
dataRoleListAll: [], // 所有数据权限列表
|
|
|
- dataRoleList: [] // 员工数据权限
|
|
|
+ dataRoleList: [], // 员工数据权限
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -949,6 +949,7 @@
|
|
|
str.descriptionJson = JSON.stringify(str.descriptionJson)
|
|
|
let params = { ...accountStr, ...str }
|
|
|
params.userId = this.userId
|
|
|
+ console.log(params)
|
|
|
this.$refs['accountForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (params.userId != null) {
|
dukai