|
|
@@ -107,11 +107,11 @@
|
|
|
this.list.forEach(l=>{
|
|
|
l.functionNames = l.functions.map(f=>f.functionName).join('、');
|
|
|
l.orgNames = l.organizations.map(f=>f.orgName).join('、');
|
|
|
- l.scaleName = this.scaleMap.get(l.scale).dictLabel;
|
|
|
- l.hierarchyName = this.hierarchyMap.get(l.hierarchy).dictLabel;
|
|
|
+ l.scaleName = this.scaleMap.get(l.scale)&&this.scaleMap.get(l.scale).dictLabel||'';
|
|
|
+ l.hierarchyName = this.hierarchyMap.get(l.hierarchy)&&this.hierarchyMap.get(l.hierarchy).dictLabel||'';
|
|
|
})
|
|
|
this.query.page++;
|
|
|
- if(this.list.length>=res.data.total) this.isOver = true;
|
|
|
+ if(res.data.list.length===0) this.isOver = true;
|
|
|
})
|
|
|
},
|
|
|
handleEdit(item){
|