|
|
@@ -97,18 +97,18 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="角色权限" prop="email">
|
|
|
- <el-select size="small" v-model="dataForm.roleId" placeholder="请选择" @change="changeRole($event)">
|
|
|
+ <el-form-item label="角色权限" prop="roleId">
|
|
|
+ <el-select size="small" clearable v-model="dataForm.roleId" placeholder="请选择" @change="changeRole($event)">
|
|
|
<el-option :label="roleItem.name" :value="roleItem.id" v-for="(roleItem, roleIndex) in roleoptions"
|
|
|
:key="roleIndex"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="树权限" prop="email">
|
|
|
- <el-select size="small" v-model="dataForm.showLevel" placeholder="请选择">
|
|
|
- <el-option :label="roleItem.dictTag" :value="roleItem.dictValue" v-for="(roleItem, roleIndex) in treeOptions"
|
|
|
- :key="roleIndex"></el-option>
|
|
|
+ <el-form-item label="树权限" prop="showLevel">
|
|
|
+ <el-select size="small" clearable v-model="dataForm.showLevel" placeholder="请选择">
|
|
|
+ <el-option v-for="(val, index) in treeOptions" :label="val.dictTag" :value="val.dictValue"
|
|
|
+ :key="index"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -277,6 +277,7 @@ export default {
|
|
|
changeRole(roleid) {
|
|
|
this.dataForm.roleId = roleid;
|
|
|
},
|
|
|
+
|
|
|
/**Split 开始 */
|
|
|
changeTreeWidth(widthVal) {
|
|
|
// 初始化树的宽度
|
|
|
@@ -334,7 +335,8 @@ export default {
|
|
|
|
|
|
handleTableEdit(params) {
|
|
|
// 编辑后线人员
|
|
|
- Object.assign(this.dataForm, params.row);
|
|
|
+ // Object.assign(this.dataForm, params.row);
|
|
|
+ this.dataForm = Object.assign({}, params.row)
|
|
|
this.dialogVisible = true
|
|
|
},
|
|
|
// 右侧列表的方法End
|
|
|
@@ -371,7 +373,7 @@ export default {
|
|
|
let params = {
|
|
|
roleId: this.dataForm.roleId,
|
|
|
userId: this.dataForm.id,
|
|
|
- showLevel: this.dataForm.showLevel,
|
|
|
+ showLevel: this.dataForm.showLevel==""?null:this.dataForm.showLevel,
|
|
|
}
|
|
|
this.$api.user.saveUserRole(params).then((res) => {
|
|
|
if (res.code == 200) {
|