|
@@ -35,7 +35,7 @@
|
|
<div v-show="isTableRightShow">
|
|
<div v-show="isTableRightShow">
|
|
<div class="table_right_box"><span class="iconfont close_right" @click="handleCloseRight"></span></div>
|
|
<div class="table_right_box"><span class="iconfont close_right" @click="handleCloseRight"></span></div>
|
|
<h5>管理租赁空间</h5>
|
|
<h5>管理租赁空间</h5>
|
|
- <p style="margin-bottom: 10px;">以下为关联的元空间id</p>
|
|
|
|
|
|
+ <p style="margin-bottom: 10px;">以下为关联的业务空间id</p>
|
|
<el-input
|
|
<el-input
|
|
type="textarea"
|
|
type="textarea"
|
|
:autosize="{ minRows: 6, maxRows: 10}"
|
|
:autosize="{ minRows: 6, maxRows: 10}"
|
|
@@ -136,22 +136,8 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
async getTableData() {//获取表格数据
|
|
async getTableData() {//获取表格数据
|
|
- let Filters
|
|
|
|
- if (this.buildId == "all") {
|
|
|
|
- Filters = `ProjectId='${this.projectId}'`
|
|
|
|
- } else if (this.buildId == "noKnow") {
|
|
|
|
- Filters = `ProjectId='${this.projectId}';BuildingId isNull`
|
|
|
|
- } else if (this.floorId == "noKnow") {
|
|
|
|
- Filters = `ProjectId='${this.projectId}';BuildingId='${this.buildId}';FloorId isNull`
|
|
|
|
- } else if (this.floorId && this.floorId != "all") {
|
|
|
|
- Filters = `ProjectId='${this.projectId}';BuildingId='${this.buildId}';FloorId='${this.floorId}'`
|
|
|
|
- } else if (this.floorId == 'all') {
|
|
|
|
- Filters = `ProjectId='${this.projectId}';BuildingId='${this.buildId}'`
|
|
|
|
- } else {
|
|
|
|
- Filters = `ProjectId='${this.projectId}'`
|
|
|
|
- }
|
|
|
|
let data = {
|
|
let data = {
|
|
- Filters: Filters,
|
|
|
|
|
|
+ // Filters: `ProjectId='${this.projectId}'`, //项目id条件筛选
|
|
PageNumber: this.page.pageNumber,
|
|
PageNumber: this.page.pageNumber,
|
|
PageSize: this.page.pageSize
|
|
PageSize: this.page.pageSize
|
|
}
|
|
}
|
|
@@ -182,14 +168,18 @@ export default {
|
|
};
|
|
};
|
|
//生成要修改字段列表
|
|
//生成要修改字段列表
|
|
change.map((item) => {
|
|
change.map((item) => {
|
|
- if(item[1] && param.data.Projection.indexOf(item[1] != -1)) {
|
|
|
|
|
|
+ if(item[1] && param.data.Projection.indexOf(item[1]) == -1) {
|
|
param.data.Projection.push(item[1])
|
|
param.data.Projection.push(item[1])
|
|
}
|
|
}
|
|
})
|
|
})
|
|
//生成对应修改数据
|
|
//生成对应修改数据
|
|
data.map((item, index) => {
|
|
data.map((item, index) => {
|
|
- let key = change[index][1]
|
|
|
|
- item[key] = item[key] != ""? item[key]: null
|
|
|
|
|
|
+ let keyarr = change[index][1].split(".")
|
|
|
|
+ if (keyarr && keyarr.length > 1) {
|
|
|
|
+ item[keyarr[0]][keyarr[1]] = item[keyarr[0]][keyarr[1]] != ""? item[keyarr[0]][keyarr[1]]: null
|
|
|
|
+ } else {
|
|
|
|
+ item[keyarr[0]] = item[keyarr[0]] != ""? item[keyarr[0]]: null
|
|
|
|
+ }
|
|
param.data.Content.push(item);
|
|
param.data.Content.push(item);
|
|
});
|
|
});
|
|
|
|
|