|
@@ -42,7 +42,7 @@
|
|
<el-form-item label="所属功能" prop="func">
|
|
<el-form-item label="所属功能" prop="func">
|
|
<el-input v-model="func.fun.name" size="small" :readonly="true" placeholder="请输入所属功能"></el-input>
|
|
<el-input v-model="func.fun.name" size="small" :readonly="true" placeholder="请输入所属功能"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="数据权限名称" prop="function">
|
|
|
|
|
|
+ <el-form-item label="数据权限名称" prop="name">
|
|
<el-input v-model="ruleForm.name" size="small" placeholder="请输入数据权限名称"></el-input>
|
|
<el-input v-model="ruleForm.name" size="small" placeholder="请输入数据权限名称"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="数据权限">
|
|
<el-form-item label="数据权限">
|
|
@@ -219,8 +219,8 @@ export default {
|
|
ruleForm: {},
|
|
ruleForm: {},
|
|
roleList:[],
|
|
roleList:[],
|
|
rules: {
|
|
rules: {
|
|
- name: [{ required: true, message: '请输入部门名称', trigger: 'blur' },],
|
|
|
|
- function: [{ required: true, message: '请输入数据权限名称', trigger: 'blur' },],
|
|
|
|
|
|
+ // name: [{ required: true, message: '请输入部门名称', trigger: 'blur' },],
|
|
|
|
+ name: [{ required: true, message: '请输入数据权限名称', trigger: 'blur' },],
|
|
},
|
|
},
|
|
list:[],
|
|
list:[],
|
|
times:0
|
|
times:0
|
|
@@ -408,14 +408,17 @@ export default {
|
|
handleEdit(row) {
|
|
handleEdit(row) {
|
|
this.title = '编辑数据权限'
|
|
this.title = '编辑数据权限'
|
|
this.visible = true
|
|
this.visible = true
|
|
-
|
|
|
|
- if(JSON.parse(row.rule).hasOwnProperty('left')){
|
|
|
|
|
|
+ // console.log(row)
|
|
|
|
+// console.log(JSON.parse(row.rule).hasOwnProperty('left'))
|
|
|
|
+if(row.rule){
|
|
|
|
+ if(JSON.parse(row.rule).hasOwnProperty('left')){
|
|
this.TreeToList(JSON.parse(row.rule))
|
|
this.TreeToList(JSON.parse(row.rule))
|
|
}else{
|
|
}else{
|
|
this.list[0]=JSON.parse(row.rule)
|
|
this.list[0]=JSON.parse(row.rule)
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+}
|
|
this.ruleForm = { ...row }
|
|
this.ruleForm = { ...row }
|
|
|
|
+
|
|
},
|
|
},
|
|
close() {
|
|
close() {
|
|
this.visible = false
|
|
this.visible = false
|