|
@@ -362,6 +362,7 @@ import { detailExcel, excelType, tabLazytree, getWbsTypeList, wbstree, selectByN
|
|
export default {
|
|
export default {
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
|
|
+ excelId:'',
|
|
treeNode: {},
|
|
treeNode: {},
|
|
//#region 鼠标
|
|
//#region 鼠标
|
|
leftTRee: '',//左侧树ID
|
|
leftTRee: '',//左侧树ID
|
|
@@ -459,6 +460,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
async detailExcel (id) {//获取列表信息
|
|
async detailExcel (id) {//获取列表信息
|
|
|
|
+
|
|
const { data: res } = await detailExcel({ id })
|
|
const { data: res } = await detailExcel({ id })
|
|
console.log(res);
|
|
console.log(res);
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
@@ -498,8 +500,8 @@ export default {
|
|
this.wbsdata = res.data
|
|
this.wbsdata = res.data
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- async selectByNodeTable (id, wbsType, projectid) {//wbs树获取表
|
|
|
|
- const { data: res } = await selectByNodeTable({ id, wbsType, projectid })
|
|
|
|
|
|
+ async selectByNodeTable (id, wbsType, liunxId,projectid) {//wbs树获取表
|
|
|
|
+ const { data: res } = await selectByNodeTable({ id, wbsType,liunxId, projectid })
|
|
console.log(res);
|
|
console.log(res);
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
console.log(Array.isArray(res.data));
|
|
console.log(Array.isArray(res.data));
|
|
@@ -602,7 +604,7 @@ export default {
|
|
} catch (error) {
|
|
} catch (error) {
|
|
loading.close();
|
|
loading.close();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
if(this.$refs.file1){
|
|
if(this.$refs.file1){
|
|
this.$refs.file1.clearFiles();
|
|
this.$refs.file1.clearFiles();
|
|
}
|
|
}
|
|
@@ -755,12 +757,13 @@ export default {
|
|
this.tableList = [];
|
|
this.tableList = [];
|
|
},
|
|
},
|
|
nodeClickExcel (data) {//wbs树点击事件
|
|
nodeClickExcel (data) {//wbs树点击事件
|
|
- console.log(data);
|
|
|
|
|
|
+ console.log(this.excelId,"xxxxxxxxx");
|
|
|
|
+ console.log(this.excelForm.id,"yyyyyyyy");
|
|
this.wbsform.id = data.id
|
|
this.wbsform.id = data.id
|
|
this.wbsform.wbsType = data.type
|
|
this.wbsform.wbsType = data.type
|
|
this.wbsform.wbsName = data.deptName
|
|
this.wbsform.wbsName = data.deptName
|
|
if (this.tableList == '') {
|
|
if (this.tableList == '') {
|
|
- this.selectByNodeTable(data.id, data.type, this.excelForm.wbsId)
|
|
|
|
|
|
+ this.selectByNodeTable(data.id, data.type, this.excelForm.id,this.excelForm.wbsId)
|
|
} else {
|
|
} else {
|
|
let tag = true
|
|
let tag = true
|
|
this.tableList.forEach((val) => {
|
|
this.tableList.forEach((val) => {
|
|
@@ -770,7 +773,7 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
if (tag) {
|
|
if (tag) {
|
|
- this.selectByNodeTable(data.id, data.type, this.excelForm.wbsId)
|
|
|
|
|
|
+ this.selectByNodeTable(data.id, data.type,this.excelForm.id, this.excelForm.wbsId)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -880,7 +883,7 @@ export default {
|
|
formData.append('file', file.raw)
|
|
formData.append('file', file.raw)
|
|
formData.append('nodeId', this.from.id)
|
|
formData.append('nodeId', this.from.id)
|
|
//console.log(file.raw)
|
|
//console.log(file.raw)
|
|
-
|
|
|
|
|
|
+
|
|
const loading = this.$loading({
|
|
const loading = this.$loading({
|
|
lock: true,
|
|
lock: true,
|
|
text: 'Loading',
|
|
text: 'Loading',
|
|
@@ -896,7 +899,7 @@ export default {
|
|
})
|
|
})
|
|
loading.close();
|
|
loading.close();
|
|
}).catch(() => {
|
|
}).catch(() => {
|
|
- loading.close();
|
|
|
|
|
|
+ loading.close();
|
|
});
|
|
});
|
|
|
|
|
|
this.$refs.file3.clearFiles();
|
|
this.$refs.file3.clearFiles();
|