|
@@ -25,7 +25,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
- <el-table-column prop="EquipLocalID" label="已关联其他业务空间" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
+ <el-table-column prop="linkOtherSpace" label="已关联其他业务空间" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="mini" @click="toDetail(scope.$index, scope.row)" type="primary" plain>查看详情</el-button>
|
|
@@ -132,7 +132,7 @@ export default {
|
|
|
let pa = {
|
|
|
data: {
|
|
|
Cascade: [{ Name: "equipCategory" }],
|
|
|
- Filters: `BuildingId="${this.floor[0]}";FloorId="${this.floor[1]}"`,
|
|
|
+ Filters: `BuildingId='${this.floor[0]}';FloorId='${this.floor[1]}'`,
|
|
|
PageNumber: this.page.pageNumber,
|
|
|
PageSize: this.page.pageSize,
|
|
|
},
|
|
@@ -143,17 +143,29 @@ export default {
|
|
|
pa.data.Filters += `;EquipName contain "${this.keycode}" or EquipLocalName contain "${this.keycode}" or EquipLocalID contain "${this.keycode}"`
|
|
|
}
|
|
|
if (this.type == "Equipment") {
|
|
|
+ pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
|
|
|
notEqInSpaceQuery(pa, res => {
|
|
|
- this.getDataSuc(res)
|
|
|
+ this.getDataSuc(res, 'ZoneSpaceBaseIn')
|
|
|
})
|
|
|
} else {
|
|
|
+ pa.data.Cascade.push({ Name: "zoneSpaceForBase" })
|
|
|
notEqForSpaceQuery(pa, res => {
|
|
|
- this.getDataSuc(res)
|
|
|
+ this.getDataSuc(res, 'ZoneSpaceBaseFor')
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
// 获取列表成功回调
|
|
|
- getDataSuc(res) {
|
|
|
+ getDataSuc(res, zonespacebase) {
|
|
|
+ let response = res.Content.map(t => {
|
|
|
+ let otherSpace = [];
|
|
|
+ if (t[zonespacebase] && t[zonespacebase].length) {
|
|
|
+ t[zonespacebase].map(item => {
|
|
|
+ otherSpace.push(item.RoomLocalName || item.RoomName)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ t.linkOtherSpace = otherSpace.join(',');
|
|
|
+ return t;
|
|
|
+ })
|
|
|
this.tableData = res.Content;
|
|
|
this.page.total = res.Total;
|
|
|
},
|