From 9ed3750f063c4ea63a3174dff74767569a291eb9 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Wed, 9 Oct 2024 11:32:11 +0800 Subject: [PATCH] 20241009 --- .../quote/detail/primary/quoteDetailBom.vue | 36 ++++++++++++++ .../quote/detail/primary/quoteDetailCost.vue | 49 +++++++++++++++++-- src/views/modules/quote/quoteDetailReport.vue | 15 ++++++ 3 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 src/views/modules/quote/quoteDetailReport.vue diff --git a/src/views/modules/quote/detail/primary/quoteDetailBom.vue b/src/views/modules/quote/detail/primary/quoteDetailBom.vue index b9c1cd0..edd4a19 100644 --- a/src/views/modules/quote/detail/primary/quoteDetailBom.vue +++ b/src/views/modules/quote/detail/primary/quoteDetailBom.vue @@ -224,6 +224,24 @@ export default { columnProp: 'quotePrice', headerAlign: "center", align: "right", + columnLabel: '单位报价成本', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 90, + }, + { + userId: this.$store.state.user.name, + functionId: 5011, + serialNumber: '5011Table4QuoteUnitPrice', + tableId: "5011Table4", + tableName: "报价材料信息", + columnProp: 'quoteUnitPrice', + headerAlign: "center", + align: "right", columnLabel: '材料标准总成本', columnHidden: false, columnImage: false, @@ -251,6 +269,24 @@ export default { fixed: 'right', columnWidth: 100, }, + { + userId: this.$store.state.user.name, + functionId: 5011, + serialNumber: '5011Table4AllQuotePrice', + tableId: "5011Table4", + tableName: "报价材料信息", + columnProp: 'allQuotePrice', + headerAlign: "center", + align: "right", + columnLabel: '报价成本总成本', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: 'right', + columnWidth: 100, + }, ], props: { children: 'list', diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue index 75b4176..44adfac 100644 --- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue +++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue @@ -55,6 +55,7 @@ export default { this.quoteDetail.totalCost = this.quoteDetail.adjustPartCost + this.quoteDetail.adjustBomUnYield + + this.quoteDetail.adjustQuoteCost + this.quoteDetail.adjustMachineCost + this.quoteDetail.adjustFabricateCost + this.quoteDetail.adjustLabourCost + @@ -89,6 +90,8 @@ export default { this.quoteDetail.adjustPartCost = data.row.unitQuotePrice; this.quoteDetail.bomUnYield = data.row.actualQuotePrice; this.quoteDetail.adjustBomUnYield = data.row.actualQuotePrice; + this.quoteDetail.quoteCost = data.row.quoteCost; + this.quoteDetail.adjustQuoteCost = data.row.quoteCost; this.quoteDetail.labourCost = data.row.labourCost; this.quoteDetail.adjustLabourCost = data.row.labourCost; this.quoteDetail.machineCost = data.row.machineCost; @@ -123,6 +126,12 @@ export default { } this.computeTotalCost(); }, + 'quoteDetail.adjustQuoteCost'(newValue, oldValue){ + if (newValue === undefined || newValue === null){ + this.quoteDetail.adjustQuoteCost = 0; + } + this.computeTotalCost(); + }, 'quoteDetail.adjustMachineCost'(newValue, oldValue){ if (newValue === undefined || newValue === null){ this.quoteDetail.adjustMachineCost = 0; @@ -184,7 +193,7 @@ export default {
系统自动计算结果(料工费/工具) - + + + + + + 调整后成本(料工费/工具) - + + + + + + 其他成本 - + + + + +
利润 - + + + + + + + + + + +
最终价格 - + + + + +
diff --git a/src/views/modules/quote/quoteDetailReport.vue b/src/views/modules/quote/quoteDetailReport.vue new file mode 100644 index 0000000..bace92c --- /dev/null +++ b/src/views/modules/quote/quoteDetailReport.vue @@ -0,0 +1,15 @@ + + + + +