duy il y a 2 ans
Parent
commit
12618e9786

+ 36 - 4
src/views/manager/projectinfo/detail.vue

@@ -605,6 +605,7 @@ export default {
       isFirst:false,
       rightTreeData:[],//存储右边的试验树数据
       rightTreeData1:[],//存储右边的质检树数据
+      rightTreeData2:[],//存储征拆数据
     
       rightObj:[
         
@@ -612,6 +613,9 @@ export default {
       rightObj1:[
        
       ],
+      rightObj2:[
+       
+       ],
       nowref:{}
      
     }
@@ -1044,7 +1048,11 @@ export default {
         this.selectData.referenceWbsTemplateId=value
 
 
-      }else{
+      }else if(this.templateType==5){
+        // this.selectData.referenceWbsTemplateId=value
+        this.selectData.referenceWbsTemplateIdLar=value
+      }
+      else{
           this.selectData.referenceWbsTemplateIdTrial=value
       }
 
@@ -1164,6 +1172,7 @@ export default {
       let WbsId=''
       if ((this.templateType == 1 && this.projectForm.referenceWbsTemplateType === 'private')
           || (this.templateType == 2 && this.projectForm.referenceWbsTemplateTypeTrial === 'private')
+         
            && refId != null && refId.toString().length > 0) {
           console.log(refId,'refId');
         // 私有库右边树形数据是通过 pkeyId 查询的
@@ -1196,7 +1205,12 @@ export default {
         // })
         this.rightObj.wbsId=recordid
         this.rightObj.objdata=this.rightTreeData
-      }else{
+      }else if(this.templateType===5){
+        this.rightTreeData2=this.$refs.treetotree.rightTreeData
+          this.rightObj2.wbsId=recordid
+          this.rightObj2.objdata=this.rightTreeData2
+      }
+      else{
           this.rightTreeData1=this.$refs.treetotree.rightTreeData
           //  this.rightObj1.push({
           //   wbsid:this.wbsId,objdata: this.rightTreeData
@@ -1237,6 +1251,9 @@ export default {
         this.treeList = arr;
 
         this.wbsId = this.templateType == 1 ? this.selectData.referenceWbsTemplateId : this.selectData.referenceWbsTemplateIdTrial
+        if(this.templateType===5){
+          this.wbsId =this.selectData.referenceWbsTemplateIdLar
+        }
         console.log(this.wbsId===-1);
         if(this.wbsId===-1){
           this.wbsId=''
@@ -1325,7 +1342,10 @@ export default {
 
         if(this.templateType == 1){
           this.selectData.referenceWbsTemplateId =this.wbsId
-        }else{
+        }else if(this.templateType==5){
+          this.selectData.referenceWbsTemplateIdLar =this.wbsId
+        }
+        else{
           this.selectData.referenceWbsTemplateIdTrial=this.wbsId
         }
         this.nowref={
@@ -1440,7 +1460,12 @@ export default {
        this.iswbsselected=true
       console.log(this.nowref,'nowrefId');
 
-      let refId =  this.templateType === 1 ? this.selectData.referenceWbsTemplateId : this.selectData.referenceWbsTemplateIdTrial;
+      let refId =  this.templateType === 1? this.selectData.referenceWbsTemplateId : this.selectData.referenceWbsTemplateIdTrial;
+      if(this.templateType===5){
+        refId=this.selectData.referenceWbsTemplateIdLar;
+        this.$refs.treetotree.setRightTree([]);
+      }
+    
       console.log(refId,'refId');
       if(!refId){
         console.log('不存在refId');
@@ -1483,6 +1508,7 @@ export default {
 
 
               if(this.nowref.value===refId){
+                console.log(11111111111);
                 WbsId=this.nowref.id
               }else{
                 if (this.projectForm.referenceWbsTemplateType == 'private' && refId != null && refId.toString().length > 0) {
@@ -1490,6 +1516,9 @@ export default {
                 }
                 else {//公有
                   WbsId=this.templateType === 1 ?this.selectData.referenceWbsTemplateId: this.selectData.referenceWbsTemplateIdTrial 
+                  if(this.templateType===5){
+                    WbsId=this.selectData.referenceWbsTemplateIdLar
+                  }
                 }
             }
             
@@ -1501,6 +1530,8 @@ export default {
                 this.$refs.treetotree.setRightTree(this.rightTreeData);
               }else if(this.rightTreeData1.length>0&&this.templateType===1&&this.rightObj1.wbsId==WbsId){
                   this.$refs.treetotree.setRightTree(this.rightTreeData1);
+              }else if(this.rightTreeData2.length>0&&this.templateType===5&&this.rightObj2.wbsId==WbsId){
+                this.$refs.treetotree.setRightTree(this.rightTreeData2);
               }
               else{
                 if (Array.isArray(res.data.data)) {
@@ -1509,6 +1540,7 @@ export default {
                   }else{
                      this.iswbsselected=false
                   }
+                 console.log(11111111111);
                   this.$refs.treetotree.setRightTree(res.data.data);
                 } else {
                   this.$refs.treetotree.setRightTree([]);

+ 1 - 1
src/views/manager/projectinfo/list.vue

@@ -275,7 +275,7 @@ export default {
         path: '/project/tree',
         query: {
           pid: this.curProjiect.id,
-          wbsid: this.curProjiect.referenceWbsTemplateId,
+          wbsid: this.curProjiect.referenceWbsTemplateIdLar,
           projectName:this.curProjiect.projectName,
           type: 5
         }