From ec32244e2b21e3dfab81f6b6609445f8c12db798 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Sat, 12 Oct 2024 16:59:15 +0800
Subject: [PATCH] 20241012

---
 src/api/quote/quoteDetail.js                  |  2 +
 .../modules/quote/detail/quoteDetail.vue      | 62 +++++++++++++++----
 src/views/modules/quote/quotes.vue            |  2 +-
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/api/quote/quoteDetail.js b/src/api/quote/quoteDetail.js
index 827b64e..0d09d42 100644
--- a/src/api/quote/quoteDetail.js
+++ b/src/api/quote/quoteDetail.js
@@ -13,3 +13,5 @@ export const deleteQuoteDetail = (data) => createAPI(`/quote/detail/remove/${dat
 export const queryQuoteDetailAllCost = (data) => createAPI(`/quote/detail/cost`,'post',data)
 
 export const queryQuoteDetailYield = (data) => createAPI(`/quote/detail/yield`,'post',data)
+
+export const queryQuoteDetailReport = (data) => createAPI(`/quote/detail/report/${data.no}/${data.size}`,'post',data)
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 52e753e..9050ee4 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -134,7 +134,7 @@ export default {
           columnProp: 'partCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '计算后材料成本',
+          columnLabel: '计算后材料标准成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -142,7 +142,44 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120
-        },{
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2BomUnYield',
+          tableId: '5011Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'bomUnYield',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '计算后材料实际成本',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2QuoteCost',
+          tableId: '5011Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'quoteCost',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '计算后材料报价成本',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
           serialNumber: '5011Table2MachineCost',
@@ -222,7 +259,7 @@ export default {
           columnProp: 'adjustPartCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后材料成本',
+          columnLabel: '调整后材料标准成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -231,35 +268,34 @@ export default {
           fixed: '',
           columnWidth: 120
         },
-
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2BomUnYield',
+          serialNumber: '5011Table2AdjustBomUnYield',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'bomUnYield',
+          columnProp: 'adjustBomUnYield',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'BOM Unyield',
+          columnLabel: '调整后材料实际成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 130
         },
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2AdjustBomUnYield',
+          serialNumber: '5011Table2AdjustQuoteCost',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustBomUnYield',
+          columnProp: 'adjustQuoteCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整的BOM Unyield',
+          columnLabel: '调整后材料报价成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -654,7 +690,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 130
         },
         {
           userId: this.$store.state.user.name,
@@ -690,7 +726,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 130
         },
         {
           userId: this.$store.state.user.name,
diff --git a/src/views/modules/quote/quotes.vue b/src/views/modules/quote/quotes.vue
index 4e09f82..aae8f72 100644
--- a/src/views/modules/quote/quotes.vue
+++ b/src/views/modules/quote/quotes.vue
@@ -687,7 +687,7 @@ export default {
       </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="handleQuery()">查询</el-button>
-        <el-button type="primary" v-loading="quoteLoading" @click="handleQuote" v-if="!isComponent">报价</el-button>
+        <el-button type="primary" :loading="quoteLoading" @click="handleQuote" v-if="!isComponent">报价</el-button>
         <!--        <el-button type="primary" icon="el-icon-upload" @click="handleImportQuotation()">导入</el-button>-->
         <!--        <download-excel-->
         <!--          :fields="fields()"-->