禅道 725

src/views/manager/projectinfo/tree.vue

@@ -67,19 +67,19 @@
                           icon="el-icon-close"
                           v-if="node.level !=1"
                         >删除节点</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="setLeftType(4,data,node)"
                           icon="iconfont hcicon-danganziliao-biaogetianxie"
                           class="font-s-12"
-                        >元素公式</el-dropdown-item>
+                        >元素公式</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="setLeftType(5,data,node)"
                           icon="el-icon-coin"
                         >元素设置</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="nodeInfo(data,node)"
                           icon="el-icon-help"
-                        >节点参数</el-dropdown-item>
+                        >节点参数</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="importTemplate(data,node)"
                           v-if="node.level == 2"
@@ -143,19 +143,19 @@
                           icon="el-icon-close"
                           v-if="node.level !=1"
                         >删除节点</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="setLeftType(4,data,node)"
                           icon="iconfont hcicon-danganziliao-biaogetianxie"
                           class="font-s-12"
-                        >元素公式</el-dropdown-item>
+                        >元素公式</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="setLeftType(5,data,node)"
                           icon="el-icon-coin"
                         >元素设置</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="nodeInfo(data)"
                           icon="el-icon-help"
-                        >节点参数</el-dropdown-item>
+                        >节点参数</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="importTemplate(data,node)"
                           v-if="node.level == 2"
@@ -198,34 +198,40 @@
               label="上级节点"
             ></el-table-column>
           </el-table>
-          <p>
-            <span>当前项目信息表</span>
-            <!-- <el-button
-              @click="showFormElement"
-              type="text"
-              icon="el-icon-circle-plus-outline"
-              class="text-icon mg-l-10"
-            ></el-button>
-            <el-button
-              type="text"
-              icon="el-icon-document-copy"
-              class="text-icon"
-            ></el-button> -->
-
-            <el-button
-              type="text"
-              style="margin-left:10px;"
-              icon="el-icon-edit-outline"
-              class="text-icon"
-              @click="editEditElementForm()"
-            ></el-button>
-            <el-button
-              type="text"
-              icon="el-icon-sort"
-              class="text-icon"
-              @click="privateTableSort()"
-            ></el-button>
-          </p>
+          <div class="flex jc-sb">
+            <p>
+              <span>当前项目信息表</span>
+              <!-- <el-button
+                @click="showFormElement"
+                type="text"
+                icon="el-icon-circle-plus-outline"
+                class="text-icon mg-l-10"
+              ></el-button>
+              <el-button
+                type="text"
+                icon="el-icon-document-copy"
+                class="text-icon"
+              ></el-button> -->
+
+              <el-button
+                type="text"
+                style="margin-left:10px;"
+                icon="el-icon-edit-outline"
+                class="text-icon"
+                @click="editEditElementForm()"
+              ></el-button>
+              <el-button
+                type="text"
+                icon="el-icon-sort"
+                class="text-icon"
+                @click="privateTableSort()"
+              ></el-button>
+            </p>
+            <div class="mg-t-10">
+              <el-button type="primary" size="medium" @click="nodeInfoHandle">节点参数设置</el-button>
+              <el-button type="primary" size="medium" @click="eleFormulaHandle">表单设置</el-button>
+            </div>
+          </div>
           <el-table
             :data="formData"
             border
@@ -310,9 +316,13 @@
               :formatter="formatTableType"
               label="表单类型"
             ></el-table-column>
+            <el-table-column
+              align="center"
+              prop="fillRate"
+              label="填报率"
+            ></el-table-column>
             <el-table-column
               label="是否关联清表"
-              width="130"
               prop="isLinkTable"
               align="center"
             >
@@ -1424,6 +1434,7 @@ export default {
       },
       leftType: 5,
       curTreeData: {},
+      curTreeNode: {},
       tableData: [],
       nodeDetail: {},
       formData: [],
@@ -1545,6 +1556,7 @@ export default {
         parentName = node.parent.data.title;
       }
       this.curTreeData = data;
+      this.curTreeNode = node;
       this.curTreeData.parentName = parentName;
       getDetail(data.id, this.id, this.projectid).then((res) => {
         res.data.data.parentName = parentName;
@@ -1601,6 +1613,7 @@ export default {
         this.leftType = type;
       }
       this.curTreeData = data;
+      this.curTreeNode = node;
       this.$refs.tree.setCurrentKey(data.id);
 
       if (type == 1 || type == 2) {
@@ -2542,6 +2555,30 @@ export default {
         type:true//sessionStorage
       })
       //console.log(expandedKeys)
+    },
+
+    //触发节点参数
+    nodeInfoHandle(){
+      if(!this.curTreeData.id){
+        this.$message({
+          type: "warning",
+          message: "请先选择节点"
+        })
+        return;
+      }
+
+      this.nodeInfo(this.curTreeData)
+    },
+
+    eleFormulaHandle(){
+      if(!this.curTreeData.id || !this.curTreeNode.id){
+        this.$message({
+          type: "warning",
+          message: "请先选择节点"
+        })
+        return;
+      }
+      this.setLeftType(4,this.curTreeData,this.curTreeNode);
     }
 
   },

src/views/manager/wbsinfo/edit.vue

@@ -66,19 +66,19 @@
                           icon="el-icon-close"
                           v-if="node.level !=1"
                         >删除节点</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="setLeftType(4,data,node)"
                           icon="iconfont hcicon-danganziliao-biaogetianxie"
                           class="font-s-12"
-                        >元素公式</el-dropdown-item>
+                        >元素公式</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="setLeftType(5,data,node)"
                           icon="el-icon-coin"
                         >元素设置</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="nodeInfo(data,node)"
                           icon="el-icon-help"
-                        >节点参数</el-dropdown-item>
+                        >节点参数</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="importTemplate(data,node)"
                           v-if="node.level == 2"
@@ -147,19 +147,19 @@
                           icon="el-icon-close"
                           v-if="node.level !=1"
                         >删除节点</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="setLeftType(4,data,node)"
                           icon="iconfont hcicon-danganziliao-biaogetianxie"
                           class="font-s-12"
-                        >元素公式</el-dropdown-item>
+                        >元素公式</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="setLeftType(5,data,node)"
                           icon="el-icon-coin"
                         >元素设置</el-dropdown-item>
-                        <el-dropdown-item
+                        <!-- <el-dropdown-item
                           @click.native="nodeInfo(data,node)"
                           icon="el-icon-help"
-                        >节点参数</el-dropdown-item>
+                        >节点参数</el-dropdown-item> -->
                         <el-dropdown-item
                           @click.native="importTemplate(data,node)"
                           v-if="node.level == 2"
@@ -211,32 +211,38 @@
               label="上级节点"
             ></el-table-column>
           </el-table>
-          <p>
-            <span>当前已创建的元素表</span>
-            <el-button
-              @click="showFormElement"
-              type="text"
-              icon="el-icon-circle-plus-outline"
-              class="text-icon mg-l-10"
-            ></el-button>
-            <el-button
-              type="text"
-              icon="el-icon-document-copy"
-              class="text-icon"
-            ></el-button>
-            <el-button
-              type="text"
-              icon="el-icon-edit-outline"
-              class="text-icon"
-              @click="editEditElementForm()"
-            ></el-button>
-            <el-button
-              type="text"
-              icon="el-icon-sort"
-              class="text-icon"
-              @click="paixucc()"
-            ></el-button>
-          </p>
+          <div class="flex jc-sb">
+            <p>
+              <span>当前已创建的元素表</span>
+              <el-button
+                @click="showFormElement"
+                type="text"
+                icon="el-icon-circle-plus-outline"
+                class="text-icon mg-l-10"
+              ></el-button>
+              <el-button
+                type="text"
+                icon="el-icon-document-copy"
+                class="text-icon"
+              ></el-button>
+              <el-button
+                type="text"
+                icon="el-icon-edit-outline"
+                class="text-icon"
+                @click="editEditElementForm()"
+              ></el-button>
+              <el-button
+                type="text"
+                icon="el-icon-sort"
+                class="text-icon"
+                @click="paixucc()"
+              ></el-button>
+            </p>
+            <div class="mg-t-10">
+              <el-button type="primary" size="medium" @click="nodeInfoHandle">节点参数设置</el-button>
+              <el-button type="primary" size="medium" @click="eleFormulaHandle">公式设置</el-button>
+            </div>
+          </div>
           <el-table
             :data="formData"
             border
@@ -300,6 +306,11 @@
               prop="elementTotal"
               label="元素总量"
             ></el-table-column>
+            <el-table-column
+              align="center"
+              prop="fillRate"
+              label="填报率"
+            ></el-table-column>
             <el-table-column
               align="center"
               prop="tableType"
@@ -1604,6 +1615,7 @@ export default {
       },
       leftType: 5,
       curTreeData: {},
+      curTreeNode: {},
       tableData: [],
       nodeDetail: {},
       formData: [],
@@ -1815,6 +1827,7 @@ export default {
         parentName = node.parent.data.title;
       }
       this.curTreeData = data;
+      this.curTreeNode = node;
       this.curTreeData.parentName = parentName;
       getDetail(data.id).then((res) => {
         res.data.data.parentName = parentName;
@@ -1867,11 +1880,13 @@ export default {
     },
 
     setLeftType (type, data, node) {
+      //console.log(type)
       this.jiedianId = data.id
       if (type == 4 || type == 5) {
         this.leftType = type;
       }
       this.curTreeData = data;
+      this.curTreeNode = node;
       this.$refs.tree.setCurrentKey(data.id);
 
       if (type == 1 || type == 2) {
@@ -2771,7 +2786,29 @@ export default {
       })
     },
 
+    //触发节点参数
+    nodeInfoHandle(){
+      if(!this.curTreeData.id){
+        this.$message({
+          type: "warning",
+          message: "请先选择节点"
+        })
+        return;
+      }
+
+      this.nodeInfo(this.curTreeData)
+    },
 
+    eleFormulaHandle(){
+      if(!this.curTreeData.id || !this.curTreeNode.id){
+        this.$message({
+          type: "warning",
+          message: "请先选择节点"
+        })
+        return;
+      }
+      this.setLeftType(4,this.curTreeData,this.curTreeNode);
+    }
   },
   components: {
     ManualSorting,