diff --git a/src/views/modules/quote/detail/primary/quoteDetailBom.vue b/src/views/modules/quote/detail/primary/quoteDetailBom.vue index 0efb76d..f83ccf8 100644 --- a/src/views/modules/quote/detail/primary/quoteDetailBom.vue +++ b/src/views/modules/quote/detail/primary/quoteDetailBom.vue @@ -322,7 +322,6 @@ export default { }) }, handleCheckedVersion() { - this.handleQueryQuoteDetailBomTreeVersion(); let node = this.$refs.tree.getCurrentNode(); if (node) { this.bomEngChgLevel = { @@ -334,26 +333,19 @@ export default { alternativeNo: node.alternativeNo, } } + this.handleQueryQuoteDetailBomTreeVersion(); this.versionVisible = true }, handleQueryQuoteDetailBomTreeVersion() { - let node = this.$refs.tree.getCurrentNode(); let params = { - site: this.quoteDetail.site, - partNo: this.quoteDetail.partNo, - buNo: this.quoteDetail.buNo, - } - if (node) { - params = { - site: node.site, - partNo: node.partNo, - bomType: node.bomType, - buNo: node.buNo, - } + ...this.bomEngChgLevel, + engChgLevel: '', + alternativeNo: '', } queryQuoteDetailBomTreeLevel(params).then(({data}) => { if (data && data.code === 0) { this.versionList = data.rows; + this.handleQueryQuoteDetailBomAlternative(); } else { this.$message.warning(data.msg); } @@ -367,7 +359,6 @@ export default { } }, alternativeRowStyle({row}) { - let node = this.$refs.tree.getCurrentNode(); if (row.engChgLevel === this.bomEngChgLevel.engChgLevel && row.alternativeNo === this.bomEngChgLevel.alternativeNo) { return {'background-color': '#E8F7F6'}; } @@ -378,6 +369,9 @@ export default { this.bomEngChgLevel.site = row.site; this.bomEngChgLevel.engChgLevel = row.engChgLevel; this.bomEngChgLevel.bomType = row.bomType; + this.handleQueryQuoteDetailBomAlternative(); + }, + handleQueryQuoteDetailBomAlternative() { let params = { ...this.bomEngChgLevel } @@ -458,24 +452,6 @@ export default { isAllBom(newVal, oldVal) { this.handleQueryQuoteDetailBom(); }, - 'bomEngChgLevel.engChgLevel'(newVal, oldVal) { - if (newVal) { - let node = this.$refs.tree.getCurrentNode(); - let row = { - partNo: this.quoteDetail.partNo, - buNo: this.quoteDetail.buNo, - site: this.quoteDetail.site, - engChgLevel: newVal, - } - if (node) { - row.partNo = node.partNo; - row.bomType = node.bomType; - row.buNo = node.buNo; - row.site = node.site; - } - this.levelRowClick(row) - } - } } } diff --git a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue index 012e67d..d0beac1 100644 --- a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue +++ b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue @@ -602,26 +602,18 @@ export default { }, handleChangeVersion(){ let node = this.$refs.tree.getCurrentNode(); - let row = { - routingRevision:null, - alternativeNo: '', - routingType: null, - } if (this.treeData.length === 0){ this.$message.warning("未维护BOM结构") return; } - if (this.dataList.length > 0){ - row = this.dataList[0]; - } if (node){ this.routing = { partNo: node.partNo, buNo: node.buNo, site: node.site, - routingType: row.routingType, - routingRevision: row.routingRevision, - alternativeNo: row.alternativeNo, + routingType: node.bomType, + routingRevision: node.engChgLevel, + alternativeNo: node.alternativeNo, } } this.handleQueryVersionList(); @@ -636,14 +628,11 @@ export default { let node = this.$refs.tree.getCurrentNode(); let params = { treeId: node.id, - routingType: this.routing.routingType, } queryQuoteDetailRoutingVersion(params).then(({data})=>{ if (data && data.code === 0){ this.versionList = data.rows; - if (this.versionList.length > 0){ - this.handleQueryAlternativeList(); - } + this.handleQueryAlternativeList(); }else { this.$message.warning(data.msg); } @@ -672,7 +661,7 @@ export default { }, alternativeRowStyle({row}){ if (this.dataList.length > 0){ - if (this.dataList[0].alternativeNo === row.alternativeNo && this.dataList[0].routingRevision === row.routingRevision && this.dataList[0].routingType === row.routingType){ + if (this.routing.alternativeNo === row.alternativeNo && this.routing.routingRevision === row.routingRevision && this.routing.routingType === row.routingType){ return { 'background-color': '#E8F7F6' }; } } @@ -685,7 +674,7 @@ export default { versionNo: this.quoteDetail.versionNo, site: row.site, partNo: row.partNo, - buNo: row.buNo, + buNo: "*", quoteNo: this.quoteDetail.quoteNo, routingType: row.routingType, routingRevision: row.routingRevision,