|
@@ -100,10 +100,10 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表" style="width:45%">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数2" value="选择节点参数"></el-option>
|
|
|
- <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
|
|
|
+ <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
- <el-select v-model="input3" filterable clearable placeholder="搜索元素字段" @change="getInput" style="width:45%">
|
|
|
+ <el-select v-model="input3" filterable clearable placeholder="搜索元素字段1" @change="getInput" style="width:45%">
|
|
|
<el-option
|
|
|
v-for="item in eleList1"
|
|
|
:key="item.id"
|
|
@@ -225,10 +225,10 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数1" value="选择节点参数"></el-option>
|
|
|
- <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
|
|
|
+ <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
- <el-select v-model="input3" filterable placeholder="搜索元素字段" @change="getInput1" style="width:45%">
|
|
|
+ <el-select v-model="input3" filterable placeholder="搜索元素字段2" @change="getInput1" style="width:45%">
|
|
|
<el-option
|
|
|
v-for="item in eleListComp1"
|
|
|
:key="item.id"
|
|
@@ -284,10 +284,10 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
|
|
|
- <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
|
|
|
+ <el-option v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
- <el-select v-model="input3" filterable clearable placeholder="搜索元素字段" @change="getInput1" style="width:45%">
|
|
|
+ <el-select v-model="input3" filterable clearable placeholder="搜索元素字段3" @change="getInput1" style="width:45%">
|
|
|
<el-option
|
|
|
v-for="item in eleListComp1"
|
|
|
:key="item.id"
|
|
@@ -353,10 +353,16 @@
|
|
|
<div class="flex" style="justify-content: space-between;width:100%">
|
|
|
<el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
|
|
|
<el-option v-if="paramDataList.length" label="选择节点参数3" value="选择节点参数"></el-option>
|
|
|
- <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.initTableId"></el-option>
|
|
|
+ <template v-if="pid">
|
|
|
+ <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <el-option v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
|
|
|
+ </template>
|
|
|
+
|
|
|
</el-select>
|
|
|
<!-- 搜索元素下拉框 -->
|
|
|
- <el-select v-model="input3" filterable clearable placeholder="搜索元素字段" @change="getInput" style="width:45%">
|
|
|
+ <el-select v-model="input3" filterable clearable placeholder="搜索元素字段4" @change="getInput" style="width:45%">
|
|
|
<el-option
|
|
|
v-for="item in eleList1"
|
|
|
:key="item.id"
|
|
@@ -1364,7 +1370,9 @@ export default {
|
|
|
this.eleTableList = res.data.data.tabData;
|
|
|
this.eleListable=false;
|
|
|
// 获取点击节点的第一张表
|
|
|
- let tabId= this.eleTableList[0].initTableId;
|
|
|
+ console.log(this.eleTableList[0],'this.eleTableList[0]');
|
|
|
+ // let tabId= this.eleTableList[0].initTableId; pkeyId
|
|
|
+ let tabId= this.eleTableList[0].pkeyId!==-1?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
|
|
|
console.log("wbsPrivateGetNodeTabAndParam")
|
|
|
this.getTableEle(tabId);
|
|
|
setTimeout(() => {
|
|
@@ -1389,8 +1397,10 @@ export default {
|
|
|
if(res.data.data.tabData.length){
|
|
|
this.eleTableList = res.data.data.tabData;
|
|
|
this.eleListable=false;
|
|
|
- let tabId= this.eleTableList[0].initTableId;
|
|
|
- console.log("getNodeTabAndParam");
|
|
|
+ // let tabId= this.eleTableList[0].initTableId;
|
|
|
+ let tabId= this.eleTableList[0].pkeyId!==-1?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
|
|
|
+ console.log(this.eleTableList[0],'this.eleTableList[0]');
|
|
|
+ console.log("getNodeTabAndParam",tabId);
|
|
|
this.getTableEle(tabId);
|
|
|
setTimeout(() => {
|
|
|
// 启动这个指令的DOM结构点击事件
|