编辑元素跳转公式修改

src/views/manager/projectinfo/editElement/editElement.vue

@@ -224,8 +224,14 @@
 
       <!-- 公式 -->
       <el-dialog title="元素公式" :visible.sync="formulaCompVisible" fullscreen append-to-body class="full-dialog">
-        <FormulaEdit :wbsid="wbsid" :nodeid="nodeid" :eleid="eleid" :projectid="pid" @hideDialog="formulaCompVisible = false" v-if="formulaCompVisible"></FormulaEdit>
+        <FormulaEdit :wbsid="wbsid" :nodeid="nodeid" :eleid="eleid" :projectid="pid" @hideDialog="formulaCompVisible = false" v-if="formulaCompVisible"  :globaltype="globaltype"></FormulaEdit>
       </el-dialog>
+      <el-dialog title="" :visible.sync="formulaCompVisible1" fullscreen append-to-body class="full-dialog">
+      <FormulaEditone  :wbsid="wbsid" :nodeid="nodeid" :eleid="eleid"   :elementType="elementType" :projectid="pid" 
+      :globaltype="globaltype" @hideDialog="formulaCompVisible1 = false"
+       v-if="formulaCompVisible1">
+       </FormulaEditone>
+    </el-dialog>
 
     </basic-container>
   </div>
@@ -233,6 +239,7 @@
 
 <script>
 import FormulaEdit from '@/views/formula/edit.vue'
+import FormulaEditone from '@/views/formula/edit1.vue'
 
 import { getExcelHtml } from '@/api/exctab/excelmodel'
 import { getElementInfoByTabId, submit, dictionarydataType, submitBatch } from '@/api/exctab/editelement'
@@ -240,7 +247,8 @@ import Vue from 'vue'
 
 export default {
   components:{
-    FormulaEdit
+    FormulaEdit,
+    FormulaEditone
   },
   props: {
     pkeyId:{
@@ -275,6 +283,14 @@ export default {
       type:String,
       default:''
     },
+     globaltype:{
+      type:Number,
+      default:10
+    },
+    elementType:{
+      type:Boolean,
+      default:false
+    },
   },
   data () {
     return {
@@ -316,7 +332,8 @@ export default {
       isMultiple:false,
       eleData:[],
 
-      formulaCompVisible:false,//公式弹框
+      formulaCompVisible:false,//公式弹框节点公式
+       formulaCompVisible1:false,//公式弹框全局公式
       eleid:'',//当前元素
     }
   },
@@ -682,6 +699,7 @@ export default {
           type: "warning",
           message: "找不到元素id"
         })
+          this.$refs.cascader.clearCheckedNodes()//调用方法无效
         return;
       }
 
@@ -696,7 +714,12 @@ export default {
       // });
 
       this.eleid = eleid;
-      this.formulaCompVisible = true;
+      
+      if (this.globaltype===10) {
+        this.formulaCompVisible = true;
+      }else{
+         this.formulaCompVisible1 = true;
+      }
       this.$refs.cascader.clearCheckedNodes()
     },
 

src/views/manager/projectinfo/independent.vue

@@ -127,6 +127,8 @@
          :initTableId="editElementQuery.initTableId"
         @hideDialog="editElementVisible = false"
         v-if="editElementVisible"
+        :elementType="true"
+        :globaltype='1'
       ></EditElement>
     </el-dialog>
       <!-- 调整表单模板 -->

src/views/manager/projectinfo/qutediaolog/relation.vue

@@ -79,6 +79,8 @@
             :nodeid="editElementQuery.nodeid"
             @hideDialog="editElementVisible = false"
             v-if="editElementVisible"
+            :globaltype='1'
+            :elementType="true"
         ></EditElement>
         </el-dialog>
         </el-dialog>