保存公式项目id修改

src/views/formula/edit.vue

@@ -602,7 +602,7 @@ export default {
     // this.wbsid = this.$route.query.wbsid;
     // this.eleid = this.$route.query.eleid;
     // this.nodeid = this.$route.query.nodeid;
-    // this.pid = this.$route.query.projectid;//项目id 私有树才有
+    this.pid = this.$route.query.pid;//项目id 私有树才有
     this.init();
   },
   methods: {
@@ -1167,6 +1167,7 @@ export default {
 
     //保存公式
     saveFormula(){
+      console.log('保存',this.pid);
       let obj = formulaArrayToString(this.processFormula,this.resultFormula);
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
       obj.eleMap.deviationRangeJson = JSON.stringify(this.deviationRange.datas);
@@ -1216,7 +1217,8 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
-          projectId:this.curProjiect.id||this.projectId,
+          // projectId:this.curProjiect.id||this.projectId,
+           projectId:this.curProjiect.id||this.pid,
           dev:deviationRangeText
         }).then(()=>{
           this.$message({
@@ -1235,7 +1237,8 @@ export default {
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
           dev:deviationRangeText,
-          projectId:this.curProjiect.id||this.projectId,
+          // projectId:this.curProjiect.id||this.projectId,
+           projectId:this.curProjiect.id||this.pid,
           ver:this.version
         }).then((res)=>{
           if(res.data.data){

src/views/formula/edit1.vue

@@ -692,7 +692,7 @@ export default {
     // this.wbsid = this.$route.query.wbsid;
     // this.eleid = this.$route.query.eleid;
     // this.nodeid = this.$route.query.nodeid;
-    // this.pid = this.$route.query.projectid;//项目id 私有树才有
+     this.pid = this.$route.query.pid;//项目id 私有树才有
     this.init();
   },
   methods: {
@@ -1419,6 +1419,7 @@ export default {
 
     //保存公式
     saveFormula(){
+      console.log('保存1',this.pid);
       let obj = formulaArrayToString(this.processFormula,this.resultFormula);
 
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
@@ -1470,7 +1471,8 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
-          projectId:this.curProjiect.id||this.projectId,
+          // projectId:this.curProjiect.id||this.projectId,
+            projectId:this.curProjiect.id||this.pid,
           dev:deviationRangeText
         }).then(()=>{
           this.$message({
@@ -1488,7 +1490,8 @@ export default {
           number:number,
           map:JSON.stringify(obj.eleMap),
           scope:this.globaltype,
-          projectId:this.curProjiect.id||this.projectId,
+          // projectId:this.curProjiect.id||this.projectId,
+            projectId:this.curProjiect.id||this.pid,
           dev:deviationRangeText,
           ver:this.version
         }).then((res)=>{

src/views/manager/projectinfo/tree.vue

@@ -1431,12 +1431,12 @@
     >
       <FormulaEdit
         :fromcurNode="curTreeData"
-       
+        :projectid="projectid" 
         :wbsid="id"
         :nodeid="curTreeData.id"
         :eleid="formulaCurRow.id"
         :globaltype="formulaCurRow.globaltype"
-        :projectid="projectid"
+      
         @hideDialog="formulaCompVisible = false"
         v-if="formulaCompVisible"
       ></FormulaEdit>
@@ -2505,7 +2505,7 @@ export default {
 
       this.formulaCurRow = row;
       this.formulaCurRow.globaltype = type;
-      if(type===1){
+      if(type===10){
           this.formulaCompVisible1 = true;
            this.formulaCurRow.elementType = false;
             this.istableType=true;