|
@@ -643,6 +643,7 @@ export default {
|
|
this.getUserByName();
|
|
this.getUserByName();
|
|
} else if (newValue == '2') {
|
|
} else if (newValue == '2') {
|
|
this.treeInit();
|
|
this.treeInit();
|
|
|
|
+
|
|
} else if (newValue == '3') {
|
|
} else if (newValue == '3') {
|
|
this.treeLogInit();
|
|
this.treeLogInit();
|
|
}
|
|
}
|
|
@@ -752,6 +753,7 @@ export default {
|
|
console.log(data,'data项目详情');
|
|
console.log(data,'data项目详情');
|
|
this.selectData={
|
|
this.selectData={
|
|
referenceWbsTemplateId:data.referenceWbsTemplateId,//质检
|
|
referenceWbsTemplateId:data.referenceWbsTemplateId,//质检
|
|
|
|
+ referenceWbsTemplateIdLar:data.referenceWbsTemplateIdLar,//征拆
|
|
referenceWbsTemplateIdTrial:data.referenceWbsTemplateIdTrial===-1?'':data.referenceWbsTemplateIdTrial//试验
|
|
referenceWbsTemplateIdTrial:data.referenceWbsTemplateIdTrial===-1?'':data.referenceWbsTemplateIdTrial//试验
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1058,14 +1060,19 @@ export default {
|
|
|
|
|
|
this.leftloading = true;
|
|
this.leftloading = true;
|
|
if (value&&value.toString().indexOf(',') >= 0) {
|
|
if (value&&value.toString().indexOf(',') >= 0) {
|
|
|
|
+ console.log('私有库');
|
|
//私有库
|
|
//私有库
|
|
if(this.templateType==1){
|
|
if(this.templateType==1){
|
|
this.projectForm.referenceWbsTemplateType='private'
|
|
this.projectForm.referenceWbsTemplateType='private'
|
|
- }else{
|
|
|
|
|
|
+ }else if(this.templateType==5){
|
|
|
|
+ this.projectForm.referenceWbsTemplateTypeLar='private'
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
this.projectForm.referenceWbsTemplateTypeTrial='private'
|
|
this.projectForm.referenceWbsTemplateTypeTrial='private'
|
|
}
|
|
}
|
|
|
|
|
|
let ids = value.toString().split(',');
|
|
let ids = value.toString().split(',');
|
|
|
|
+ console.log(ids,'ids');
|
|
findProjectTree(ids[1], ids[0]).then((res) => {
|
|
findProjectTree(ids[1], ids[0]).then((res) => {
|
|
if (Array.isArray(res.data.data)) {
|
|
if (Array.isArray(res.data.data)) {
|
|
this.leftTreeData = res.data.data;
|
|
this.leftTreeData = res.data.data;
|
|
@@ -1076,11 +1083,15 @@ export default {
|
|
})
|
|
})
|
|
this.getRightTree()
|
|
this.getRightTree()
|
|
} else {
|
|
} else {
|
|
|
|
+ console.log('公有库');
|
|
//公有库
|
|
//公有库
|
|
if(value&&value.length>0){
|
|
if(value&&value.length>0){
|
|
- if(this.templateType==1){
|
|
|
|
|
|
+ if(this.templateType==1){
|
|
this.projectForm.referenceWbsTemplateType='public'
|
|
this.projectForm.referenceWbsTemplateType='public'
|
|
- }else{
|
|
|
|
|
|
+ }
|
|
|
|
+ else if(this.templateType==5){
|
|
|
|
+ this.projectForm.referenceWbsTemplateTypeLar='public'
|
|
|
|
+ }else{
|
|
this.projectForm.referenceWbsTemplateTypeTrial='public'
|
|
this.projectForm.referenceWbsTemplateTypeTrial='public'
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1172,6 +1183,7 @@ export default {
|
|
let WbsId=''
|
|
let WbsId=''
|
|
if ((this.templateType == 1 && this.projectForm.referenceWbsTemplateType === 'private')
|
|
if ((this.templateType == 1 && this.projectForm.referenceWbsTemplateType === 'private')
|
|
|| (this.templateType == 2 && this.projectForm.referenceWbsTemplateTypeTrial === 'private')
|
|
|| (this.templateType == 2 && this.projectForm.referenceWbsTemplateTypeTrial === 'private')
|
|
|
|
+ || (this.templateType == 5 && this.projectForm.referenceWbsTemplateTypeLar === 'private')
|
|
|
|
|
|
&& refId != null && refId.toString().length > 0) {
|
|
&& refId != null && refId.toString().length > 0) {
|
|
console.log(refId,'refId');
|
|
console.log(refId,'refId');
|
|
@@ -1253,6 +1265,7 @@ export default {
|
|
this.wbsId = this.templateType == 1 ? this.selectData.referenceWbsTemplateId : this.selectData.referenceWbsTemplateIdTrial
|
|
this.wbsId = this.templateType == 1 ? this.selectData.referenceWbsTemplateId : this.selectData.referenceWbsTemplateIdTrial
|
|
if(this.templateType===5){
|
|
if(this.templateType===5){
|
|
this.wbsId =this.selectData.referenceWbsTemplateIdLar
|
|
this.wbsId =this.selectData.referenceWbsTemplateIdLar
|
|
|
|
+
|
|
}
|
|
}
|
|
console.log(this.wbsId===-1);
|
|
console.log(this.wbsId===-1);
|
|
if(this.wbsId===-1){
|
|
if(this.wbsId===-1){
|
|
@@ -1297,9 +1310,12 @@ export default {
|
|
await this.getLogTreeList();
|
|
await this.getLogTreeList();
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+
|
|
|
|
+ //初始化质量
|
|
async treeInit () {
|
|
async treeInit () {
|
|
console.log('------------------- treeInit ------------------------');
|
|
console.log('------------------- treeInit ------------------------');
|
|
let refId = this.selectData.referenceWbsTemplateId;
|
|
let refId = this.selectData.referenceWbsTemplateId;
|
|
|
|
+
|
|
console.log(refId, '------------------- treeInit.refId ------------------------');
|
|
console.log(refId, '------------------- treeInit.refId ------------------------');
|
|
|
|
|
|
if (this.projectForm.referenceWbsTemplateType === 'private' && refId != null && refId.toString().length > 0) {
|
|
if (this.projectForm.referenceWbsTemplateType === 'private' && refId != null && refId.toString().length > 0) {
|
|
@@ -1344,6 +1360,7 @@ export default {
|
|
this.selectData.referenceWbsTemplateId =this.wbsId
|
|
this.selectData.referenceWbsTemplateId =this.wbsId
|
|
}else if(this.templateType==5){
|
|
}else if(this.templateType==5){
|
|
this.selectData.referenceWbsTemplateIdLar =this.wbsId
|
|
this.selectData.referenceWbsTemplateIdLar =this.wbsId
|
|
|
|
+
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
this.selectData.referenceWbsTemplateIdTrial=this.wbsId
|
|
this.selectData.referenceWbsTemplateIdTrial=this.wbsId
|
|
@@ -1396,6 +1413,65 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
this.treeInitTrial()
|
|
this.treeInitTrial()
|
|
|
|
+ this.treeInitLar()
|
|
|
|
+ },
|
|
|
|
+ //初始化征拆
|
|
|
|
+ async treeInitLar () {
|
|
|
|
+ let refId = this.selectData.referenceWbsTemplateIdLar;
|
|
|
|
+ //引用被删会出现 wbsType -1
|
|
|
|
+ if (refId && refId > 0 && Number(this.projectForm.wbsType) > 0) {
|
|
|
|
+ //有引用id,回显
|
|
|
|
+ //this.selected = true;
|
|
|
|
+
|
|
|
|
+ findWbsTreeList(5).then((res) => {
|
|
|
|
+ let arr = [{
|
|
|
|
+ label: '公有库',
|
|
|
|
+ options: [],
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ label: '私有库',
|
|
|
|
+ options: [],
|
|
|
|
+ }];
|
|
|
|
+ let data = res.data.data;
|
|
|
|
+ if (data.wbsInfos && data.wbsInfos.length) {
|
|
|
|
+ data.wbsInfos.forEach((element) => {
|
|
|
|
+ element.label = element.wbsName;
|
|
|
|
+ element.value = element.id;
|
|
|
|
+ })
|
|
|
|
+ arr[0].options = data.wbsInfos;
|
|
|
|
+ }
|
|
|
|
+ if (data.wbsTreePrivates && data.wbsTreePrivates.length) {
|
|
|
|
+ data.wbsTreePrivates.forEach((element) => {
|
|
|
|
+ element.label = element.projectName;
|
|
|
|
+ element.value = element.wbsId + ',' + element.projectId;
|
|
|
|
+ })
|
|
|
|
+ arr[1].options = data.wbsTreePrivates;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ let WbsId = 0;
|
|
|
|
+ if (this.projectForm.referenceWbsTemplateTypeLar == 'private') {
|
|
|
|
+ //私有
|
|
|
|
+ let list = arr[1].options;
|
|
|
|
+ for (let i = 0; i < list.length; i++) {
|
|
|
|
+ if (list[i].pkeyId == refId) {
|
|
|
|
+ WbsId = list[i].wbsId + ',' + list[i].projectId;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ console.log('共有',refId);
|
|
|
|
+ //公有
|
|
|
|
+ WbsId = refId;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ this.selectData.referenceWbsTemplateIdLar = WbsId
|
|
|
|
+
|
|
|
|
+ console.log("征拆", this.selectData)
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ this.getTreeList();
|
|
|
|
+ }
|
|
},
|
|
},
|
|
//初始化试验
|
|
//初始化试验
|
|
async treeInitTrial () {
|
|
async treeInitTrial () {
|
|
@@ -1462,8 +1538,9 @@ export default {
|
|
|
|
|
|
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){
|
|
if(this.templateType===5){
|
|
|
|
+ console.log(this.selectData.referenceWbsTemplateIdLar,1111111111);
|
|
refId=this.selectData.referenceWbsTemplateIdLar;
|
|
refId=this.selectData.referenceWbsTemplateIdLar;
|
|
- this.$refs.treetotree.setRightTree([]);
|
|
|
|
|
|
+ // this.$refs.treetotree.setRightTree([]);
|
|
}
|
|
}
|
|
|
|
|
|
console.log(refId,'refId');
|
|
console.log(refId,'refId');
|
|
@@ -1473,9 +1550,11 @@ export default {
|
|
this.iswbsselected=false
|
|
this.iswbsselected=false
|
|
}else{
|
|
}else{
|
|
let WbsId=''
|
|
let WbsId=''
|
|
- if (this.projectForm.referenceWbsTemplateType === 'private' && refId != null && refId.toString().length > 0) {
|
|
|
|
|
|
+ if (this.projectForm.referenceWbsTemplateType === 'private' && refId != null && refId.toString().length > 0
|
|
|
|
+ ||this.projectForm.referenceWbsTemplateTypeLar === 'private' && refId != null && refId.toString().length > 0) {
|
|
// 私有库右边树形数据是通过 pkeyId 查询的
|
|
// 私有库右边树形数据是通过 pkeyId 查询的
|
|
let ids = refId.toString().split(",");
|
|
let ids = refId.toString().split(",");
|
|
|
|
+ console.log(ids,'ids111111');
|
|
if (ids.length > 1) {
|
|
if (ids.length > 1) {
|
|
refId = ids[0]
|
|
refId = ids[0]
|
|
let list = this.treeList[1].options;
|
|
let list = this.treeList[1].options;
|
|
@@ -1487,7 +1566,7 @@ export default {
|
|
//引用被删会出现 wbsType -1
|
|
//引用被删会出现 wbsType -1
|
|
if (refId && refId > 0) {
|
|
if (refId && refId > 0) {
|
|
let priv = {};
|
|
let priv = {};
|
|
- if (this.projectForm.referenceWbsTemplateType == 'private') {
|
|
|
|
|
|
+ if (this.projectForm.referenceWbsTemplateType == 'private'||this.projectForm.referenceWbsTemplateTypeLar === 'private' ) {
|
|
//私有
|
|
//私有
|
|
let list = this.treeList[1].options;
|
|
let list = this.treeList[1].options;
|
|
for (let i = 0; i < list.length; i++) {
|
|
for (let i = 0; i < list.length; i++) {
|
|
@@ -1511,7 +1590,7 @@ export default {
|
|
console.log(11111111111);
|
|
console.log(11111111111);
|
|
WbsId=this.nowref.id
|
|
WbsId=this.nowref.id
|
|
}else{
|
|
}else{
|
|
- if (this.projectForm.referenceWbsTemplateType == 'private' && refId != null && refId.toString().length > 0) {
|
|
|
|
|
|
+ if (this.projectForm.referenceWbsTemplateType == 'private' ||this.projectForm.referenceWbsTemplateTypeLar === 'private'&& refId != null && refId.toString().length > 0) {
|
|
WbsId = priv.pkeyId||this.selectData.referenceWbsTemplateIdTrial
|
|
WbsId = priv.pkeyId||this.selectData.referenceWbsTemplateIdTrial
|
|
}
|
|
}
|
|
else {//公有
|
|
else {//公有
|