Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/views/manager/projectinfo/independent.vue

@@ -143,7 +143,7 @@
           >搜索</el-button
         >
       </div>
-      <el-table
+        <el-table
         :data="editEleListFilter"
         border
         style="width: 100%"
@@ -154,9 +154,15 @@
         <el-table-column align="center" label="操作" width="200">
           <template slot-scope="scope">
             <el-link
+              :type="scope.row.globalFormula == 1 ? 'warning' : 'primary'"
+              @click="toFormulaEdit(scope.row,1)"
+              >全局公式</el-link
+            >
+            <el-link
+              class="mg-l-10"
               :type="scope.row.isSaveFormula == 1 ? 'warning' : 'primary'"
-              @click="toFormulaEdit(scope.row)"
-              >公式配置</el-link
+              @click="toFormulaEdit(scope.row,10)"
+              >节点公式</el-link
             >
             <!-- <el-link
               class="mg-l-10"
@@ -580,7 +586,7 @@ export default {
       this.excelHtml = false;
     },
         //跳转到公式配置页面
-    toFormulaEdit(row) {
+    toFormulaEdit(row,type) {
       // this.$router.push({
       //   path: '/formula/edit',
       //   query: {
@@ -593,6 +599,7 @@ export default {
 
       this.formulaCurRow = row;
       this.formulaCompVisible = true;
+      this.formulaCurRow.globaltype = type;
     },
     // getNodeDetail(data, node) {
     //   let parentName = "";

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

@@ -230,6 +230,9 @@ export default {
         let id=12345678910
         this.tabTypeLazyTreeAll(id).then((res)=>{
             this.treeData=res.records;
+             this.$nextTick(() => {
+               this.$refs.crud.refreshTable();
+            })
         })
       },
       submitQute(){

src/views/manager/projectinfo/tree.vue

@@ -2021,8 +2021,9 @@ export default {
       return res.code;
     },
     handleEditFormula(index, row) {
+      console.log('编辑元素公式',row);
       this.curEleTable = row;
-      selectFormElements(this.curEleTable.initTableId).then((res) => {
+      selectFormElements(this.curEleTable.id).then((res) => {
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);
       });

src/views/manager/wbsinfo/element.vue

@@ -189,33 +189,32 @@
         ></el-input>
         <el-button type="info" class="mg-l-10" @click="searchFormulaName">搜索</el-button>
       </div>
-      <el-table
+        <el-table
         :data="editEleListFilter"
         border
         style="width: 100%"
         height="400px"
       >
-        <el-table-column
-          align="center"
-          prop="eName"
-          label="元素名称"
-        >
+        <el-table-column align="center" prop="eName" label="字段信息">
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="操作"
-          width="200"
-        >
+        <el-table-column align="center" label="操作" width="200">
           <template slot-scope="scope">
             <el-link
-              :type="scope.row.isSaveFormula == 1?'warning':'primary'"
-              @click="toFormulaEdit(scope.row)"
-            >公式配置</el-link>
+              :type="scope.row.globalFormula == 1 ? 'warning' : 'primary'"
+              @click="toFormulaEdit(scope.row,1)"
+              >全局公式</el-link
+            >
             <el-link
+              class="mg-l-10"
+              :type="scope.row.isSaveFormula == 1 ? 'warning' : 'primary'"
+              @click="toFormulaEdit(scope.row,10)"
+              >节点公式</el-link
+            >
+            <!-- <el-link
               class="mg-l-10"
               type="danger"
               @click="delEleRowHandle(scope.$index,editEleListFilter)"
-            >删除</el-link>
+            >删除</el-link> -->
           </template>
         </el-table-column>
       </el-table>
@@ -931,7 +930,8 @@ export default {
         })
         updateBatchElements(this.editEleList, this.curEleTable.initTableName).then(() => {
           this.editEleVisible = false;
-          this.updateNodeTable();
+          // this.updateNodeTable();
+           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "保存成功!"
@@ -939,7 +939,8 @@ export default {
         })
       } else {
         this.editEleVisible = false;
-        this.updateNodeTable();
+        // this.updateNodeTable();
+         this.onLoad(this.page);
         this.$message({
           type: "success",
           message: "保存成功!"
@@ -963,7 +964,7 @@ export default {
       })
     },
         //跳转到公式配置页面
-    toFormulaEdit(row) {
+    toFormulaEdit(row,type) {
       // this.$router.push({
       //   path: '/formula/edit',
       //   query: {
@@ -975,6 +976,7 @@ export default {
       // });
 
       this.formulaCurRow = row;
+      this.formulaCurRow.globaltype = type;
       this.formulaCompVisible = true;
     },
     editele(){