|
@@ -393,7 +393,8 @@ export default {
|
|
|
getRightData() {
|
|
|
let pa = {
|
|
|
PageNumber: this.rPage.pageNumber,
|
|
|
- PageSize: this.rPage.pageSize
|
|
|
+ PageSize: this.rPage.pageSize,
|
|
|
+ Cascade: [{ Name: 'zoneTenantList' }]
|
|
|
};
|
|
|
//处理查询条件
|
|
|
if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
|
|
@@ -418,6 +419,13 @@ export default {
|
|
|
t.ObjectID = t.TenantID.substr(14);
|
|
|
t.ObjectLocalName = t.TenantLocalName;
|
|
|
t.ObjectLocalCode = t.TenantLocalID;
|
|
|
+ t.RoomLocalName = '';
|
|
|
+ if (t.ZoneTenantList) {
|
|
|
+ t.ZoneTenantList.forEach(item => {
|
|
|
+ t.RoomLocalName += item.RoomLocalName + ',';
|
|
|
+ });
|
|
|
+ t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
|
|
|
+ }
|
|
|
return t;
|
|
|
});
|
|
|
if (this.rPage.pageNumber == 1) {
|