|
@@ -589,7 +589,8 @@ export default {
|
|
|
logleftloading:false,
|
|
|
logrightloading:false,
|
|
|
selectData:{},
|
|
|
- isFirst:false
|
|
|
+ isFirst:false,
|
|
|
+ rightTreeData:[]//存储右边的树数据
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -725,9 +726,10 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
this.isFirst=false;
|
|
|
}, 1000);
|
|
|
+ console.log(data,'data项目详情');
|
|
|
this.selectData={
|
|
|
referenceWbsTemplateId:data.referenceWbsTemplateId,//质检
|
|
|
- referenceWbsTemplateIdTrial:data.referenceWbsTemplateIdTrial//试验
|
|
|
+ referenceWbsTemplateIdTrial:data.referenceWbsTemplateIdTrial===-1?'':data.referenceWbsTemplateIdTrial//试验
|
|
|
|
|
|
}
|
|
|
if (Number(this.projectForm.estimatedAmount) < 0) {
|
|
@@ -1018,13 +1020,11 @@ export default {
|
|
|
},
|
|
|
wbsChange (value, flag) {
|
|
|
console.log(value, 'WBS节点更换测试 value')
|
|
|
-
|
|
|
- console.log(flag, 'WBS节点更换测试 flag')
|
|
|
if(this.templateType==1){
|
|
|
this.selectData.referenceWbsTemplateId=value
|
|
|
|
|
|
}else{
|
|
|
- this.selectData.referenceWbsTemplateIdTrial=value
|
|
|
+ this.selectData.referenceWbsTemplateIdTrial=value
|
|
|
}
|
|
|
|
|
|
this.leftloading = true;
|
|
@@ -1055,7 +1055,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
getAlltree(this.userInfo.tenant_id, '1', value).then((res) => {
|
|
|
if (Array.isArray(res.data.data)) {
|
|
|
this.leftTreeData = res.data.data;
|
|
@@ -1065,11 +1064,13 @@ export default {
|
|
|
}
|
|
|
this.leftloading = false;
|
|
|
})
|
|
|
+ this.getRightTree()
|
|
|
}
|
|
|
|
|
|
if (flag === undefined) { /* 下拉框切换的时候调用 */
|
|
|
this.getRightTree();
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
|
|
|
getLogTreeList(){
|
|
@@ -1137,6 +1138,8 @@ export default {
|
|
|
},
|
|
|
|
|
|
treeChang () {
|
|
|
+ console.log(this.$refs.treetotree.rightTreeData,'this.$refs.treetotree');
|
|
|
+ this.rightTreeData=this.$refs.treetotree.rightTreeData
|
|
|
this.typeChang[2] = true;
|
|
|
},
|
|
|
|
|
@@ -1151,7 +1154,6 @@ export default {
|
|
|
{label: '私有库', options: []}
|
|
|
];
|
|
|
let data = res.data.data;
|
|
|
- console.log(data,'库数据');
|
|
|
if (data.wbsInfos && data.wbsInfos.length) {
|
|
|
data.wbsInfos.forEach((element) => {
|
|
|
element.label = element.wbsName;
|
|
@@ -1211,7 +1213,7 @@ export default {
|
|
|
console.log('------------------- treeInit ------------------------');
|
|
|
|
|
|
let refId = this.selectData.referenceWbsTemplateId;
|
|
|
-
|
|
|
+ console.log(this.selectData,'this.selectData.referenceWbsTemplateId;');
|
|
|
console.log(refId, '------------------- treeInit.refId ------------------------');
|
|
|
|
|
|
if (this.projectForm.referenceWbsTemplateType === 'private' && refId != null && refId.toString().length > 0) {
|
|
@@ -1362,15 +1364,22 @@ export default {
|
|
|
let ids = WbsId.toString().split(",");
|
|
|
WbsId = ids[0]
|
|
|
}
|
|
|
+ console.log(this.rightTreeData,'this.rightTreeData');
|
|
|
+
|
|
|
+ findProjectTree(this.projectForm.id, WbsId).then((res) => {
|
|
|
|
|
|
- findProjectTree(this.projectForm.id, WbsId).then((res) => {
|
|
|
+ if (this.rightTreeData.length>0) {
|
|
|
+ console.log(res.data.data,'res.data.data');
|
|
|
+ }
|
|
|
if (Array.isArray(res.data.data)) {
|
|
|
this.$refs.treetotree.setRightTree(res.data.data);
|
|
|
} else {
|
|
|
this.$refs.treetotree.setRightTree([]);
|
|
|
}
|
|
|
- this.rightloading = false;
|
|
|
+
|
|
|
})
|
|
|
+
|
|
|
+ this.rightloading = false;
|
|
|
|
|
|
},
|
|
|
|