|
|
@@ -327,14 +327,14 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="关联表：" prop="relationParentId">
|
|
|
<el-select style="width: 100%;" v-model="form.relationParentId" placeholder="请选择关联表" @change="relationFn"
|
|
|
- v-loadmore="loadMore">
|
|
|
- <el-option v-for="item in tableList.rows" :key="item.tableId" :label="item.tableComment" :value="item.tableId">
|
|
|
+ >
|
|
|
+ <el-option v-for="item in tableList.rows" :key="item.id" :label="item.tableComment" :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="字段：" prop="relationChildId">
|
|
|
- <el-select style="width: 100%;" v-model="form.relationChildId" placeholder="请选择字段" v-loadmore="loadMore">
|
|
|
- <el-option v-for="item in genList" v-if="item.foreignKey" :key="item.columnId" :label="item.columnName" :value="item.columnId">
|
|
|
+ <el-select style="width: 100%;" v-model="form.relationChildId" placeholder="请选择字段">
|
|
|
+ <el-option v-for="item in genList" v-if="item.foreignKey" :key="item.id" :label="item.columnName" :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -517,7 +517,7 @@
|
|
|
genList: [],
|
|
|
glbParams: {
|
|
|
pageNum: 1,
|
|
|
- pageSize: 10,
|
|
|
+ pageSize: 10000000,
|
|
|
},
|
|
|
// 关联表查询参数
|
|
|
queryParams: {
|
|
|
@@ -614,11 +614,10 @@
|
|
|
listAllColumnsByTableId({
|
|
|
id:tableId
|
|
|
}).then(response => {
|
|
|
- console.log(response.data,9999888)
|
|
|
this.columList = response.data;
|
|
|
});
|
|
|
// 关联表数据
|
|
|
- listTable(this.glbParams).then(response => {
|
|
|
+ listTable(this.glbParams).then(response => {
|
|
|
this.tableList = response;
|
|
|
});
|
|
|
/** 查询菜单下拉列表 */
|
sr