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

src/views/manager/contractinfo/detail.vue

@@ -1372,13 +1372,17 @@ export default {
     },
     getRightTree() {
       console.log(this.wbsId, this.projectInfo.id, this.contractForm.id);
-      this.rightloading = true;
-      getContractInfoTree(this.wbsId, this.projectInfo.id, this.contractForm.id).then((res) => {
-        if (Array.isArray(res.data.data)) {
-          this.$refs.treetotree.setRightTree(res.data.data);
-        }
-        this.rightloading = false;
-      })
+    
+      if(this.wbsId){
+        this.rightloading = true;
+        getContractInfoTree(this.wbsId, this.projectInfo.id, this.contractForm.id).then((res) => {
+          if (Array.isArray(res.data.data)) {
+            this.$refs.treetotree.setRightTree(res.data.data);
+          }
+          this.rightloading = false;
+        })
+      }
+ 
     },
     saveWbsTree() {
       let obj = {};

src/views/manager/projectinfo/archiveTime.vue

@@ -88,7 +88,7 @@
 <script>
 
 import { dictionary } from "@/api/manager/archivetree";
-import {tabTypeLazyTree,saveTabusstime,removeTabusstime} from "@/api/manager/wbsprivate";
+import {tabTypeLazyTree,saveTabusstime,removeTabusstime,tabTypeLazyTreeAll} from "@/api/manager/wbsprivate";
 import {getTableElments} from "@/api/manager/wbstree";
 
 
@@ -156,7 +156,7 @@ export default {
                 // parentId=this.curData.parentId
                  parentId='12345678910'
              }
-            tabTypeLazyTree({parentId:parentId,projectId:this.projectid,current:1,size:1000,titleName:this.filterText,majorDataType:this.activeIndex}).then((res) => {
+             tabTypeLazyTreeAll({parentId:parentId,current:1,size:1000,titleName:this.filterText,majorDataType:this.activeIndex}).then((res) => {
                   this.treeloading = false;
                   this.treeData = res.data.data.records;
              });
@@ -178,7 +178,7 @@ export default {
             }
             // 开启 “加载中” 动画
             if (node.level == 0) this.loading = true
-                tabTypeLazyTree({ 
+                tabTypeLazyTreeAll({ 
                     parentId, projectId: this.projectid, pcurrent: 1, size: 1000,majorDataType:this.activeIndex
                 }).then(res => {
                     // 请求接口，返回数据
@@ -209,7 +209,7 @@ export default {
                     parentId=''
                 }
                 console.log(parentId,'parentId');
-                    tabTypeLazyTree({parentId:parentId,projectId:this.projectid,pcurrent:1,size:1000,titleName:this.filterText,majorDataType:this.activeIndex}).then((res) => {
+                    tabTypeLazyTreeAll({parentId:parentId,projectId:this.projectid,pcurrent:1,size:1000,titleName:this.filterText,majorDataType:this.activeIndex}).then((res) => {
                     this.treeloading = false;
                     this.allTreeData = res.data.data.records;
                     });

src/views/manager/projectinfo/tree.vue

@@ -3036,7 +3036,8 @@ export default {
             message: "设置参数节点成功!",
           });
           this.nodeInfoSaveload=false
-          this.nodeInfoVisible = false;
+          this.parameters(this.jiedianId)
+          // this.nodeInfoVisible = false;
         } else {
           this.$message({
             type: "error",
@@ -3529,15 +3530,21 @@ export default {
 
     //节点参数 关联元素
     linkEle(row){
-      this.linkEleVisible = true;
-      this.curParam = row;
-      getParamElements({nodeId:this.curTreeData.id,projectId:this.projectid,paramId:row.id,scopeType:10}).then((res) => {
-        if (res.data.data.length) {
-          this.linkEleTableList = res.data.data;
-        } else {
-          this.linkEleTableList = [];
-        }
-      })
+      console.log(row,'row');
+      if(!row.id){
+        this.$message.warning('请先保存数据，再点击关联元素')
+      }else{
+        this.linkEleVisible = true;
+        this.curParam = row;
+        getParamElements({nodeId:this.curTreeData.id,projectId:this.projectid,paramId:row.id,scopeType:10}).then((res) => {
+          if (res.data.data.length) {
+            this.linkEleTableList = res.data.data;
+          } else {
+            this.linkEleTableList = [];
+          }
+        })
+      }
+      
     },
 
     //关联元素弹框

src/views/manager/wbsinfo/edit.vue

@@ -2789,7 +2789,8 @@ export default {
             message: "设置参数节点成功!"
           })
           this.nodeInfoSaveload=false
-          this.nodeInfoVisible = false;
+          // this.nodeInfoVisible = false;
+          this.parameters(this.jiedianId)
         } else {
           this.$message({
             type: "error",
@@ -2994,15 +2995,20 @@ export default {
 
     //节点参数 关联元素
     linkEle(row){
-      this.linkEleVisible = true;
-      this.curParam = row;
-      getParamElements({nodeId:this.jiedianId,paramId:row.id,scopeType:1}).then((res) => {
-        if (res.data.data.length) {
-          this.linkEleTableList = res.data.data;
-        } else {
-          this.linkEleTableList = [];
-        }
-      })
+      if(!row.id){
+        this.$message.warning('请先保存数据，再点击关联元素')
+      }else{
+        this.linkEleVisible = true;
+        this.curParam = row;
+        getParamElements({nodeId:this.jiedianId,paramId:row.id,scopeType:1}).then((res) => {
+          if (res.data.data.length) {
+            this.linkEleTableList = res.data.data;
+          } else {
+            this.linkEleTableList = [];
+          }
+        })
+      }
+     
     },
 
     //保存关联