浏览代码

表获取元素库字段更改

duy 2 年之前
父节点
当前提交
f706444a9f
共有 2 个文件被更改,包括 58 次插入55 次删除
  1. 11 0
      src/api/manager/wbstree.js
  2. 47 55
      src/views/formula/edit1.vue

+ 11 - 0
src/api/manager/wbstree.js

@@ -143,6 +143,17 @@ export const selectPrivateFormElements = (id, params) => {
     }
   })
 }
+//根据表单id查询所有元素
+export const getTableElments = (id, params) => {
+    return request({
+      url: '/api/blade-manager/wbsTree/get-table-elements',
+      method: 'get',
+      params: {
+        ...params,
+        id
+      }
+    })
+  }
 
 
 export const removeTableById = (id, params) => {

+ 47 - 55
src/views/formula/edit1.vue

@@ -105,7 +105,7 @@
               <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.id"></el-option>
             </el-select> -->
-            <el-select v-model="input3" filterable placeholder="请选择"  @change="getTableEle">
+            <el-select v-model="input3" filterable placeholder="请选择元素字段"  @change="getTableEle">
               <el-option
                 v-for="item in eleTableList"
                 :key="item.id"
@@ -274,9 +274,9 @@
           </div>
         </div>
         <div v-show="deviationRange.showSelectEle"  style="width:60%">
-          <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:100%">
+          <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:100%" filterable>
             <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.eName" :value="item.id"></el-option>
           </el-select>
           <div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
             <el-scrollbar style="height:520px;">
@@ -334,10 +334,11 @@
             </el-card>
           </el-col>
           <el-col :span="16">
-            <el-select v-model="eleTableId" @change="getTableEle1" placeholder="请选择元素表">
+            <el-select v-model="eleTableId" @change="getTableEle1" placeholder="请选择元素表" filterable>
               <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>
+              <el-option  v-for="item in eleTableList" :key="item.id" :label="item.eName" :value="item.id"></el-option>
             </el-select>
+           
             <div class="mg-t-10 mg-b-10 no-mb-col">
               <el-scrollbar style="height: 460px;">
                 <el-row >
@@ -388,7 +389,7 @@ import { getTypeMap,saveFormula,formulaDetail,updateFormula } from "@/api/formul
 import { getNodeTabAndParam as wbsPrivateGetNodeTabAndParam} from "@/api/manager/wbsprivate";
 import {tabTypeLazyTreeAll} from "@/api/manager/wbsprivate";
 import {tabTypeLazyTree} from "@/api/manager/wbsprivate";
-import {selectPrivateFormElements} from "@/api/manager/wbstree";
+import {getTableElments} from "@/api/manager/wbstree";
 import {mapGetters} from "vuex";
 
 import formulaItem from "./component/formulaItem"
@@ -1300,7 +1301,7 @@ export default {
       this.input3=''
         if(data.hasChildren===false&&node.level==2){
            this.eleListable=true;
-           selectPrivateFormElements(this.treeId ).then((res)=>{
+           getTableElments(this.treeId ).then((res)=>{
              if(res.data.code==200){
                 this.eleList=res.data.data;
                  this.eleTableList =res.data.data;
@@ -1346,59 +1347,50 @@ export default {
       })
       this.eleList=arr;
     },
+    getTableEle1(tableId){
+       let arr=[]
+      arr=this.eleTableList.filter((item)=>{
+        if(item.id===tableId){
+          return item
+        }
+      })
+      this.eleList=arr;
+    },
 
-    //方法下面的点击树节点
-    getNodeDetailComp(data) {
-      if(this.pid){
-        wbsPrivateGetNodeTabAndParam(data.id, this.pid, this.wbsid).then((res) => {
-          if(res.data.data.tabData.length){
-            this.eleTableListComp = res.data.data.tabData;
-
-            this.eleTableIdComp = this.eleTableListComp[0].initTableId;
-            this.getTableEleComp(this.eleTableIdComp);
-          }else{
-            this.eleTableListComp = [];
-            this.eleTableIdComp = '';
-            this.eleListComp = [];
-          }
-
-          if(res.data.data.paramData.length){
-            this.paramDataList = res.data.data.paramData;
-          }else{
-            this.paramDataList = [];
-          }
-        })
-      }else{
-        getNodeTabAndParam(data.id).then((res)=>{
-          if(res.data.data.tabData.length){
-            this.eleTableListComp = res.data.data.tabData;
-
-            this.eleTableIdComp = this.eleTableListComp[0].initTableId;
-            this.getTableEleComp(this.eleTableIdComp);
-          }else{
-            this.eleTableListComp = [];
-            this.eleTableIdComp = '';
-            this.eleListComp = [];
-          }
 
-          if(res.data.data.paramData.length){
-            this.paramDataList = res.data.data.paramData;
-          }else{
-            this.paramDataList = [];
-          }
-        })
-      }
+    getNodeDetailComp(data,node) {
+       this.treeId=data.initTableId;
+       this.input3=''
+        if(data.hasChildren===false&&node.level==2){
+           getTableElments(this.treeId ).then((res)=>{
+             if(res.data.code==200){
+               if(res.data.data.length){
+                this.eleListComp=res.data.data;
+                this.eleTableListComp =res.data.data;
+                console.log( this.eleTableListComp,' this.eleTableListComp');
+                this.eleTableIdComp = this.eleTableListComp[0].id;
+              ;
+               }
+               
+             } 
+           })
+        }
+        else{
+         
+           this.eleListComp=[]
+           this.page.total=0
+           
+        }
     },
 
-    //方法下面的查询元素
     getTableEleComp(tableId){
-      if(tableId === '选择节点参数'){
-        this.eleListComp = this.paramDataList;
-      }else{
-        selectFormElements(tableId).then((res)=>{
-          this.eleListComp = res.data.data;
-        })
-      }
+       let arr=[]
+      arr=this.eleTableListComp.filter((item)=>{
+        if(item.id===tableId){
+          return item
+        }
+      })
+      this.eleListComp=arr;
     },
 
     //取消方法下面 元素勾选