|
@@ -1419,6 +1419,7 @@
|
|
|
fullscreen
|
|
|
append-to-body
|
|
|
class="full-dialog"
|
|
|
+ @close="closeformulaComp"
|
|
|
>
|
|
|
<FormulaEdit
|
|
|
:fromcurNode="curEleTable"
|
|
@@ -1433,9 +1434,9 @@
|
|
|
></FormulaEdit>
|
|
|
</el-dialog>
|
|
|
<!-- 全局公式 -->
|
|
|
- <el-dialog title="" :visible.sync="formulaCompVisible1" fullscreen append-to-body class="full-dialog">
|
|
|
+ <el-dialog title="" :visible.sync="formulaCompVisible1" fullscreen append-to-body class="full-dialog" @close="closeformulaComp1">
|
|
|
<FormulaEditone :wbsid="id" :nodeid="curTreeData.id" :eleid="formulaCurRow.id" :elementType="formulaCurRow.elementType" :projectid="projectid" :tableType="istableType"
|
|
|
- :globaltype="formulaCurRow.globaltype" @hideDialog="formulaCompVisible1 = false" :fromcurNode="curEleTable"
|
|
|
+ :globaltype="formulaCurRow.globaltype" @hideDialog="formulaCompVisible1 = false" :fromcurNode="curEleTable"
|
|
|
v-if="formulaCompVisible1">
|
|
|
</FormulaEditone>
|
|
|
</el-dialog>
|
|
@@ -1613,6 +1614,7 @@ import {
|
|
|
} from "@/api/manager/wbsprivate";
|
|
|
import { findProjectTree as getAlltree } from "@/api/manager/projectinfo";
|
|
|
import {refrehPram} from "@/api/manager/wbstree"
|
|
|
+import {getTableElments} from "@/api/manager/wbstree";
|
|
|
import { getList as getAttchFromOriginalName } from "@/api/resource/attach";
|
|
|
import { getDictionary } from "@/api/system/dict";
|
|
|
import { mapGetters } from "vuex";
|
|
@@ -2500,7 +2502,24 @@ export default {
|
|
|
}
|
|
|
|
|
|
},
|
|
|
+ //关闭公式弹窗
|
|
|
+ closeformulaComp(){
|
|
|
+ console.log('关闭');
|
|
|
+ getTableElments( this.curEleTable.initTableId).then((res) => {
|
|
|
+ this.editEleListFilter = res.data.data;
|
|
|
+ this.editEleListAll = [].concat(this.editEleListFilter);
|
|
|
+ })
|
|
|
|
|
|
+ },
|
|
|
+ //关闭公式弹窗
|
|
|
+ closeformulaComp1(){
|
|
|
+ console.log('关闭');
|
|
|
+ getTableElments( this.curEleTable.initTableId).then((res) => {
|
|
|
+ this.editEleListFilter = res.data.data;
|
|
|
+ this.editEleListAll = [].concat(this.editEleListFilter);
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
getNodeTypelist() {
|
|
|
const type = this.wbsType;
|
|
|
if (this.nodeTypelist.length > 1) {
|