|
@@ -7,36 +7,12 @@
|
|
|
<el-form-item label="角色名称" prop="roleName">
|
|
|
<el-input v-model="dataForm.roleName" placeholder="角色名称"></el-input>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="通用角色" size="mini" prop="isCommon">
|
|
|
- <el-radio-group v-model="dataForm.isCommon">
|
|
|
- <el-radio :label="false">否</el-radio>
|
|
|
- <el-radio :label="true">是</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item> -->
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属机构" prop="orgId">
|
|
|
<org-component v-model="dataForm.orgId" @orgSelected="validateField('orgId')"/>
|
|
|
</el-form-item>
|
|
|
-<!-- <el-form-item label="所属机构" prop="orgId">-->
|
|
|
-<!-- <el-popover-->
|
|
|
-<!-- ref="menuListPopover"-->
|
|
|
-<!-- placement="bottom-start"-->
|
|
|
-<!-- trigger="click">-->
|
|
|
-<!-- <el-tree-->
|
|
|
-<!-- :data="orgList"-->
|
|
|
-<!-- :props="orgListTreeProps"-->
|
|
|
-<!-- node-key="orgId"-->
|
|
|
-<!-- ref="orgListTree"-->
|
|
|
-<!-- @current-change="menuListTreeCurrentChangeHandle"-->
|
|
|
-<!-- :default-expand-all="true"-->
|
|
|
-<!-- :highlight-current="true"-->
|
|
|
-<!-- :expand-on-click-node="false">-->
|
|
|
-<!-- </el-tree>-->
|
|
|
-<!-- </el-popover>-->
|
|
|
-<!-- <el-input v-model="dataForm.orgName" v-popover:menuListPopover :readonly="true" placeholder="点击选择所属机构" class="menu-list__input"></el-input>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
<div class="my-item">
|
|
|
<el-form-item size="mini" label="授权">
|
|
|
<el-tree
|
|
@@ -145,13 +121,7 @@
|
|
|
if (data && data.code === '200') {
|
|
|
this.dataForm.roleName = data.data.roleName
|
|
|
this.dataForm.remark = data.data.remark
|
|
|
- // this.dataForm.isCommon = data.data.isCommon
|
|
|
this.dataForm.orgId = data.data.orgId
|
|
|
- // this.menuListTreeSetCurrentNode()
|
|
|
- // var idx = data.data.menuIdList.indexOf(this.tempKey)
|
|
|
- // if (idx !== -1) {
|
|
|
- // data.data.menuIdList.splice(idx, data.data.menuIdList.length - idx)
|
|
|
- // }
|
|
|
if (data.data.menuIdList) {
|
|
|
data.data.menuIdList.forEach(i => {
|
|
|
const node = this.$refs.menuListTree.getNode(i)
|
|
@@ -173,18 +143,6 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // menuListTreeCurrentChangeHandle (data, node) {
|
|
|
- // this.dataForm.orgId = data.orgId
|
|
|
- // this.dataForm.orgName = data.name
|
|
|
- // },
|
|
|
- // menuListTreeSetCurrentNode () {
|
|
|
- // this.$refs.orgListTree.setCurrentKey(this.dataForm.orgId)
|
|
|
- // if (this.dataForm.orgId === '0') {
|
|
|
- // this.dataForm.orgName = ''
|
|
|
- // } else {
|
|
|
- // this.dataForm.orgName = (this.$refs.orgListTree.getCurrentNode() || {})['name']
|
|
|
- // }
|
|
|
- // },
|
|
|
// 表单提交
|
|
|
dataFormSubmit () {
|
|
|
this.$refs['dataForm'].validate((valid) => {
|