yangyj il y a 2 ans
Parent
commit
ce5894d647
2 fichiers modifiés avec 4 ajouts et 7 suppressions
  1. 1 5
      src/views/formula/edit.vue
  2. 3 2
      src/views/manager/wbsinfo/edit.vue

+ 1 - 5
src/views/formula/edit.vue

@@ -352,10 +352,6 @@ export default {
     ifelse
   },
   props: {
-    wbsid:{
-      type:String,
-      default:''
-    },
     eleid:{
       type:String,
       default:''
@@ -1095,7 +1091,7 @@ export default {
 
     //把公式文本还原数组
     async formulaStringToArray(){
-      let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.wbsid})).data.data;
+      let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid})).data.data;
       console.log(detail);
       if(detail.id){
         this.formulaid = detail.id;

+ 3 - 2
src/views/manager/wbsinfo/edit.vue

@@ -1632,7 +1632,7 @@
     </el-dialog>
 
     <el-dialog title="" :visible.sync="formulaCompVisible" fullscreen append-to-body class="full-dialog">
-      <FormulaEdit :wbsid="id" :nodeid="curTreeData.id" :eleid="formulaCurRow.id" :globaltype="formulaCurRow.globaltype" @hideDialog="formulaCompVisible = false" v-if="formulaCompVisible"></FormulaEdit>
+      <FormulaEdit  :nodeid="curTreeData.id" :eleid="formulaCurRow.id" :globaltype="formulaCurRow.globaltype" @hideDialog="formulaCompVisible = false" v-if="formulaCompVisible"></FormulaEdit>
     </el-dialog>
 
   </basic-container>
@@ -2512,10 +2512,11 @@ export default {
       //   }
       // });
       //this.editEleFormulaVisible = false;
-
       this.formulaCurRow = row;
       this.formulaCurRow.globaltype = type;
       this.formulaCompVisible = true;
+      console.log(this.formulaCurRow)
+      console.log(this.curTreeData)
     },
 
     getNodeTypelist () {