|
@@ -325,13 +325,13 @@
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-row>
|
|
</el-row>
|
|
- <!-- <el-alert
|
|
|
|
|
|
+ <el-alert
|
|
style="margin: 10px 0"
|
|
style="margin: 10px 0"
|
|
title="角色权限"
|
|
title="角色权限"
|
|
:closable="false"
|
|
:closable="false"
|
|
type="info"
|
|
type="info"
|
|
>
|
|
>
|
|
- </el-alert> -->
|
|
|
|
|
|
+ </el-alert>
|
|
<!-- <el-row>
|
|
<!-- <el-row>
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<el-form-item
|
|
<el-form-item
|
|
@@ -357,7 +357,7 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row> -->
|
|
</el-row> -->
|
|
- <!-- <el-row>
|
|
|
|
|
|
+ <el-row>
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
<el-form-item
|
|
<el-form-item
|
|
label="员工角色"
|
|
label="员工角色"
|
|
@@ -381,7 +381,7 @@
|
|
</select-all>
|
|
</select-all>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- </el-row> -->
|
|
|
|
|
|
+ </el-row>
|
|
<!-- <el-alert
|
|
<!-- <el-alert
|
|
style="margin: 10px 0"
|
|
style="margin: 10px 0"
|
|
title="OA信息"
|
|
title="OA信息"
|
|
@@ -791,7 +791,7 @@ export default {
|
|
},
|
|
},
|
|
async getRoleList() {
|
|
async getRoleList() {
|
|
// 获取角色
|
|
// 获取角色
|
|
- getUserRole({ delFlag: 0, rows: 9999 }).then((res) => {
|
|
|
|
|
|
+ getUserRole({ delFlag: 0, rows: 9999,tenantId:-1 }).then((res) => {
|
|
let result = res.data;
|
|
let result = res.data;
|
|
if (res.code == 200 && result && result.rows.length > 0) {
|
|
if (res.code == 200 && result && result.rows.length > 0) {
|
|
this.roleList = [];
|
|
this.roleList = [];
|