From 75777d5ad0390043a579c117c91155a99a8bb9a2 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 26 Sep 2024 23:11:22 +0800
Subject: [PATCH] 20240926

---
 .../quote/detail/primary/quoteDetailCost.vue     |  6 ++++++
 .../quote/detail/primary/quoteDetailRouting.vue  | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index 86e8ec4..75b4176 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -89,6 +89,12 @@ export default {
           this.quoteDetail.adjustPartCost = data.row.unitQuotePrice;
           this.quoteDetail.bomUnYield = data.row.actualQuotePrice;
           this.quoteDetail.adjustBomUnYield = data.row.actualQuotePrice;
+          this.quoteDetail.labourCost = data.row.labourCost;
+          this.quoteDetail.adjustLabourCost = data.row.labourCost;
+          this.quoteDetail.machineCost = data.row.machineCost;
+          this.quoteDetail.adjustMachineCost = data.row.machineCost;
+          this.quoteDetail.fabricateCost = data.row.manufactureCost;
+          this.quoteDetail.adjustFabricateCost = data.row.manufactureCost;
           this.quoteDetail.toolCost = data.row.toolCost;
           this.quoteDetail.adjustToolCost = data.row.toolCost;
           this.quoteDetail.packCost = data.row.packCost;
diff --git a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
index 605996d..4061b5f 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailRouting.vue
@@ -442,10 +442,10 @@ export default {
         },{
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5MachineCost',
+          serialNumber: '5011Table5TotalMachCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'machineCost',
+          columnProp: 'totalMachCost',
           headerAlign: "center",
           align: "right",
           columnLabel: '单位机器成本',
@@ -459,10 +459,10 @@ export default {
         },{
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5MachineCost',
+          serialNumber: '5011Table5TotalManCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'unitManufacturingCosts',
+          columnProp: 'totalManCost',
           headerAlign: "center",
           align: "right",
           columnLabel: '单位制造成本',
@@ -476,10 +476,10 @@ export default {
         },{
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5LaborCosts',
+          serialNumber: '5011Table5TotalLaborCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'laborCosts',
+          columnProp: 'totalLaborCost',
           headerAlign: "center",
           align: "right",
           columnLabel: '单位人工成本',
@@ -493,10 +493,10 @@ export default {
         },{
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table5QuoteUnitCost',
+          serialNumber: '5011Table5TotalCost',
           tableId: "5011Table5",
           tableName: "报价工艺信息",
-          columnProp: 'quoteUnitCost',
+          columnProp: 'totalCost',
           headerAlign: "center",
           align: "right",
           columnLabel: '单位报价成本',