公式配置加载表单修改

src/views/formula/edit.vue

@@ -512,6 +512,10 @@ export default {
     iswbstype:{//是否是公共wbs
       type:String,
       default:''
+    },
+    pkeyId:{
+      type:String,
+      default:''//表单pkeyId
     }
   },
     mounted() {
@@ -1968,7 +1972,10 @@ console.log(remark,'remark');
             // 获取点击节点的第一张表
             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!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            // let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            let tabId=this.pkeyId?this.pkeyId:this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            console.log(this.pkeyId,'this.pkeyId');
+            
             console.log("wbsPrivateGetNodeTabAndParam")
             this.getTableEle(tabId);
             setTimeout(() => {

src/views/manager/projectinfo/tree.vue

@@ -2004,6 +2004,8 @@
         :globaltype="formulaCurRow.globaltype"
         :iswbstype="0"
         @hideDialog="formulaCompVisible = false"
+        :pkeyId="curEleTable.pkeyId"
+
         v-if="formulaCompVisible"
       ></FormulaEdit>
     </el-dialog>
@@ -4558,6 +4560,8 @@ clearSearch1() {
        this.formulaCompVisible = true;
         this.formulaCurRow.elementType = false;
         this.istableType = true;
+        console.log(this.formulaCurRow,'this.formulaCurRow.elementType');
+        
     },
     //关闭公式弹窗
     closeformulaComp() {