|
@@ -432,12 +432,11 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
getRoleList () { // 获取角色
|
|
getRoleList () { // 获取角色
|
|
- this.roleList = []
|
|
|
|
- this.branchList = []
|
|
|
|
getUserRole({ delFlag: 0, rows: 9999 }).then(res => {
|
|
getUserRole({ delFlag: 0, rows: 9999 }).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) {
|
|
result.rows.forEach(item => {
|
|
result.rows.forEach(item => {
|
|
|
|
+ this.roleList = []
|
|
this.roleList.push({
|
|
this.roleList.push({
|
|
label: item.roleName,
|
|
label: item.roleName,
|
|
value: item.id
|
|
value: item.id
|
|
@@ -450,6 +449,7 @@ export default {
|
|
rows: 9999
|
|
rows: 9999
|
|
}).then(res => {
|
|
}).then(res => {
|
|
if (res.code == 200 && res.data && res.data.rows) {
|
|
if (res.code == 200 && res.data && res.data.rows) {
|
|
|
|
+ this.branchList = []
|
|
res.data.rows.forEach(item => {
|
|
res.data.rows.forEach(item => {
|
|
this.branchList.push({
|
|
this.branchList.push({
|
|
label: item.name,
|
|
label: item.name,
|