From 90a3d31e89718e2c1b34c79da85177dcf2fe47e2 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 5 Dec 2024 10:18:16 +0800
Subject: [PATCH] 2024-12-05

---
 src/api/quotation/quote.js                    |   2 +-
 src/api/quote/quoteDetail.js                  |   1 +
 .../project/projectPart/projectPartQuote.vue  | 403 ++++--------------
 .../quotation/inquiry/inquiryQuoteDetail.vue  | 382 +++--------------
 .../modules/quotation/requestForQuote.vue     |   4 +-
 .../modules/quote/detail/quoteDetail.vue      |  26 +-
 6 files changed, 152 insertions(+), 666 deletions(-)

diff --git a/src/api/quotation/quote.js b/src/api/quotation/quote.js
index 70bc0de..99f6cc3 100644
--- a/src/api/quotation/quote.js
+++ b/src/api/quotation/quote.js
@@ -5,7 +5,7 @@ export const getQuoteList = (data)=>createAPI(`/plm/quote/list`,'post',data)
 export const getQuotePage = (data)=>createAPI(`/plm/quote/page/${data.no}/${data.size}`,'post',data)
 
 
-export const queryQuoteByInquiryNo = (data) => createAPI(`plm/quote/detail`,'post',data)
+export const queryQuoteByInquiryNo = (data) => createAPI(`/plm/quote/detail`,'post',data)
 
 
 export const queryQuoteByProjectPartNo = (data) => createAPI(`plm/quote/detail/part`,'post',data)
diff --git a/src/api/quote/quoteDetail.js b/src/api/quote/quoteDetail.js
index 02ddee3..cc2fa33 100644
--- a/src/api/quote/quoteDetail.js
+++ b/src/api/quote/quoteDetail.js
@@ -14,3 +14,4 @@ export const queryQuoteDetailAllCost = (data) => createAPI(`/quote/detail/cost`,
 
 export const againQuoteDetail = (data) => createAPI(`/quote/detail/again`,'post',data)
 
+export const queryQuoteDetailByInquiry = (data) => createAPI(`/quote/detail/inquiry`,'post',data)
diff --git a/src/views/modules/project/projectPart/projectPartQuote.vue b/src/views/modules/project/projectPart/projectPartQuote.vue
index 7ddc331..8f47da0 100644
--- a/src/views/modules/project/projectPart/projectPartQuote.vue
+++ b/src/views/modules/project/projectPart/projectPartQuote.vue
@@ -1,5 +1,6 @@
 <script>
 import {queryQuoteByProjectPartNo} from "../../../../api/quotation/quote";
+import {queryQuoteDetailByInquiry} from "../../../../api/quote/quoteDetail";
 
 export default {
   name: "projectPartQuote",
@@ -10,7 +11,7 @@ export default {
     },
     height:{
       type: [String,Number],
-      default: '27vh'
+      default: '26vh'
     }
   },
   data(){
@@ -21,10 +22,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10QuotationNo',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'quotationNo',
+          serialNumber: '101002002Table2QuoteVersionNo',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'quoteVersionNo',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '报价单号',
@@ -34,16 +35,17 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
-        },{
+          columnWidth: 120
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10QuotationDate',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'quotationDate',
+          serialNumber: '101002002Table2QuoteDate',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'quoteDate',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '报价日期',
           columnHidden: false,
           columnImage: false,
@@ -51,15 +53,15 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10ProductNo',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'productNo',
+          serialNumber: '101002002Table2PartNo',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'partNo',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '物料编码',
@@ -69,15 +71,15 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10ProductDesc',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'productDesc',
+          serialNumber: '101002002Table2PartDesc',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'partDesc',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '物料名称',
@@ -87,18 +89,18 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 240
         },
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10QuotationDetailQuantity',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'quotationDetailQuantity',
+          serialNumber: '101002002Table2Qty',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'qty',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '报价数量',
+          columnLabel: 'MOQ',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -110,101 +112,31 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10ComputePartCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'computePartCost',
-          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: 101002002,
-          serialNumber: '101002002Table10ComputeMachineCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'computeMachineCost',
-          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: 101002002,
-          serialNumber: '101002002Table10ComputeLabourCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'computeLabourCost',
-          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: 101002002,
-          serialNumber: '101002002Table10ComputeFabricateCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'computeFabricateCost',
-          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: 101002002,
-          serialNumber: '101002002Table10ComputeToolCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'computeToolCost',
+          serialNumber: '101002002Table2AdjustPartCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustPartCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '计算后工具成本',
+          columnLabel: '材料成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 130
         },
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10AdjustPartCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'adjustPartCost',
+          serialNumber: '101002002Table2AdjustLabourCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustLabourCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后材料成本',
+          columnLabel: '人工成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -216,13 +148,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10AdjustMachineCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
+          serialNumber: '101002002Table2AdjustMachineCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
           columnProp: 'adjustMachineCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后机器成本',
+          columnLabel: '机器成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -234,13 +166,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10AdjustLabourCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'adjustLabourCost',
+          serialNumber: '101002002Table2AdjustToolCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'adjustToolCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后人工成本',
+          columnLabel: '工具成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -252,78 +184,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10AdjustFabricateCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'adjustFabricateCost',
-          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: 101002002,
-          serialNumber: '101002002Table10AdjustToolCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'adjustToolCost',
-          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: 101002002,
-          serialNumber: '101002002Table10DetailOtherCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'detailOtherCost',
-          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: 101002002,
-          serialNumber: '101002002Table10DetailManageCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'detailManageCost',
-          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: 101002002,
-          serialNumber: '101002002Table10DetailTotalCost',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'detailTotalCost',
+          serialNumber: '101002002Table2TotalCost',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'totalCost',
           headerAlign: 'center',
           align: 'right',
           columnLabel: '总成本',
@@ -333,132 +197,14 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 101002002,
-          serialNumber: '101002002Table10DetailProfitRate',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'detailProfitRate',
-          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: 101002002,
-          serialNumber: '101002002Table10DetailProfitAmount',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'detailProfitAmount',
-          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: 101002002,
-          serialNumber: '101002002Table10FinalUntaxedPrice',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'finalUntaxedPrice',
-          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: 101002002,
-          serialNumber: '101002002Table10TaxRate',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'taxRate',
-          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: 101002002,
-          serialNumber: '101002002Table10FinalTaxedPrice',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'finalTaxedPrice',
-          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: 101002002,
-          serialNumber: '101002002Table10SystemComputePrice',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'systemComputePrice',
-          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: 101002002,
-          serialNumber: '101002002Table10QuotationDetailStatus',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'quotationDetailStatus',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '状态',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
+          columnWidth: 140
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10Remark',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
+          serialNumber: '101002002Table2Remark',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
           columnProp: 'remark',
           headerAlign: 'center',
           align: 'left',
@@ -470,13 +216,14 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120
-        },{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 101002002,
-          serialNumber: '101002002Table10InternalInquiryNo',
-          tableId: '101002002Table10',
-          tableName: '项目物料',
-          columnProp: 'internalInquiryNo',
+          serialNumber: '101002002Table2InsideInquiryNo',
+          tableId: '101002002Table2',
+          tableName: '报价详情信息表',
+          columnProp: 'insideInquiryNo',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '询价单号',
@@ -495,11 +242,11 @@ export default {
     handleQueryQuote(){
       let params = {
         site:this.part.site,
-        projectId:this.part.projectId,
+        projectNo:this.part.projectId,
         partNo:this.part.testPartNo,
       }
       this.queryLoading = true
-      queryQuoteByProjectPartNo(params).then(({data})=>{
+      queryQuoteDetailByInquiry(params).then(({data})=>{
         if (data && data.code === 0){
           this.dataList = data.rows
         }else {
@@ -513,10 +260,16 @@ export default {
     },
 
     handleClick(row){
-      if (this.$router.resolve(`/quotation-sellForQuotation`).resolved.name === '404'){
+      if (this.$router.resolve(`/quote-index`).resolved.name === '404'){
         this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
       }else {
-        this.$router.push({name:`quotation-sellForQuotation`,params:{quotationNo:row.quotationNo},})
+        this.$router.push({
+          name:`quote-index`,
+          params:{
+            quoteVersionNo:row.quoteVersionNo,
+            type:'project'
+          },
+        })
       }
     }
   },
@@ -524,6 +277,8 @@ export default {
     part(newVal,oldVal){
       if (newVal){
         this.handleQueryQuote()
+      }else {
+        this.dataList = []
       }
     }
   }
@@ -543,7 +298,7 @@ export default {
       :min-width="item.columnWidth"
       :label="item.columnLabel">
       <template slot-scope="scope" >
-        <div v-if="item.columnProp === 'quotationNo'">
+        <div v-if="item.columnProp === 'quoteVersionNo'">
           <el-link v-if="!item.columnHidden" @click="handleClick(scope.row)"> {{ `${scope.row[item.columnProp]}` }}</el-link>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </div>
diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
index 0ab6cbe..cf12d31 100644
--- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
+++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
@@ -1,5 +1,5 @@
 <script>
-import {queryQuoteByInquiryNo} from "../../../../api/quotation/quote";
+import {queryQuoteDetailByInquiry} from "../../../../api/quote/quoteDetail";
 
 export default {
   name: "inquiryQuoteDetail",
@@ -17,14 +17,14 @@ export default {
     return{
       queryLoading:false,
       dataList:[],
-      columns:[
+      columns: [
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10QuotationNo',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2QuoteVersionNo',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'quotationNo',
+          columnProp: 'quoteVersionNo',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '报价单号',
@@ -34,16 +34,17 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
-        },{
+          columnWidth: 120
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10QuotationDate',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2QuoteDate',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'quotationDate',
+          columnProp: 'quoteDate',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '报价日期',
           columnHidden: false,
           columnImage: false,
@@ -51,15 +52,15 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10ProductNo',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2PartNo',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'productNo',
+          columnProp: 'partNo',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '物料编码',
@@ -69,15 +70,15 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10ProductDesc',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2PartDesc',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'productDesc',
+          columnProp: 'partDesc',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '物料名称',
@@ -87,18 +88,18 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200
+          columnWidth: 240
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10QuotationDetailQuantity',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2Qty',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'quotationDetailQuantity',
+          columnProp: 'qty',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '报价数量',
+          columnLabel: 'MOQ',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -110,101 +111,31 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10ComputePartCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'computePartCost',
-          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: 102001,
-          serialNumber: '102001Table10ComputeMachineCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'computeMachineCost',
-          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: 102001,
-          serialNumber: '102001Table10ComputeLabourCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'computeLabourCost',
-          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: 102001,
-          serialNumber: '102001Table10ComputeFabricateCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'computeFabricateCost',
-          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: 102001,
-          serialNumber: '102001Table10ComputeToolCost',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2AdjustPartCost',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'computeToolCost',
+          columnProp: 'adjustPartCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '计算后工具成本',
+          columnLabel: '材料成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 130
         },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10AdjustPartCost',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2AdjustLabourCost',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustPartCost',
+          columnProp: 'adjustLabourCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后材料成本',
+          columnLabel: '人工成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -216,13 +147,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10AdjustMachineCost',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2AdjustMachineCost',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
           columnProp: 'adjustMachineCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后机器成本',
+          columnLabel: '机器成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -234,13 +165,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10AdjustLabourCost',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2AdjustToolCost',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustLabourCost',
+          columnProp: 'adjustToolCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '调整后人工成本',
+          columnLabel: '工具成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -252,78 +183,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10AdjustFabricateCost',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2TotalCost',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustFabricateCost',
-          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: 102001,
-          serialNumber: '102001Table10AdjustToolCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'adjustToolCost',
-          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: 102001,
-          serialNumber: '102001Table10DetailOtherCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'detailOtherCost',
-          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: 102001,
-          serialNumber: '102001Table10DetailManageCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'detailManageCost',
-          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: 102001,
-          serialNumber: '102001Table10DetailTotalCost',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'detailTotalCost',
+          columnProp: 'totalCost',
           headerAlign: 'center',
           align: 'right',
           columnLabel: '总成本',
@@ -333,131 +196,13 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 102001,
-          serialNumber: '102001Table10DetailProfitRate',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'detailProfitRate',
-          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: 102001,
-          serialNumber: '102001Table10DetailProfitAmount',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'detailProfitAmount',
-          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: 102001,
-          serialNumber: '102001Table10FinalUntaxedPrice',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'finalUntaxedPrice',
-          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: 102001,
-          serialNumber: '102001Table10TaxRate',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'taxRate',
-          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: 102001,
-          serialNumber: '102001Table10FinalTaxedPrice',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'finalTaxedPrice',
-          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: 102001,
-          serialNumber: '102001Table10SystemComputePrice',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'systemComputePrice',
-          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: 102001,
-          serialNumber: '102001Table10QuotationDetailStatus',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'quotationDetailStatus',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '状态',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },{
+          columnWidth: 140
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 102001,
-          serialNumber: '102001Table10Remark',
-          tableId: '102001Table10',
+          serialNumber: '102001Table2Remark',
+          tableId: '102001Table2',
           tableName: '报价详情信息表',
           columnProp: 'remark',
           headerAlign: 'center',
@@ -470,23 +215,6 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120
-        },{
-          userId: this.$store.state.user.name,
-          functionId: 102001,
-          serialNumber: '102001Table10InternalInquiryNo',
-          tableId: '102001Table10',
-          tableName: '报价详情信息表',
-          columnProp: 'internalInquiryNo',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '询价单号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
         },
       ],
     };
@@ -498,7 +226,7 @@ export default {
         site: this.quotation.site
       }
       this.queryLoading = true;
-      queryQuoteByInquiryNo(params).then(({data})=>{
+      queryQuoteDetailByInquiry(params).then(({data})=>{
         if (data && data.code === 0){
           this.dataList = data.rows;
         }else {
@@ -511,21 +239,21 @@ export default {
       })
     },
     handleClickDetail(row){
-      if (this.$router.resolve('quotation-sellForQuotation').resolved.name === '404') {
+      if (this.$router.resolve('/quote-index').resolved.name === '404') {
         this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
       } else {
         this.$router.push({
-          name: 'quotation-sellForQuotation',
+          name: 'quote-index',
           params:{
-            quotationHeaderId:row.quotationHeaderId,
-            from:'inquiry'
+            quoteVersionNo:row.quoteVersionNo,
+            type:'project'
           }
         })
       }
     }
   },
   watch:{
-    "quotation.quotationNo"(newVal,oldVal){
+    "quotation"(newVal,oldVal){
       if (newVal){
         this.handleQuery();
       }else {
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index a6c67f6..5b2140a 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -2620,7 +2620,9 @@ export default {
      */
     quotationClickRow(row) {
       // this.$refs.quotationTable.toggleRowSelection(row)
-      this.quotationCurrentRow = JSON.parse(JSON.stringify(row))
+      this.quotationCurrentRow = {
+        ...row
+      }
       this.quotationDetailData = row;
     },
     getPriceCheckProperties() {
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index ea77a7d..508205c 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -159,13 +159,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2AdjustBomUnYield',
+          serialNumber: '5011Table2AdjustPartCost',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustBomUnYield',
+          columnProp: 'adjustPartCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '报价成本',
+          columnLabel: '材料成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -183,7 +183,7 @@ export default {
           columnProp: 'adjustLabourCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'DL',
+          columnLabel: '人工成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -195,13 +195,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2AdjustFabricateCost',
+          serialNumber: '5011Table2AdjustMachineCost',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustFabricateCost',
+          columnProp: 'adjustMachineCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'VOH',
+          columnLabel: '机器成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -213,13 +213,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5011,
-          serialNumber: '5011Table2AdjustMachineCost',
+          serialNumber: '5011Table2AdjustToolCost',
           tableId: '5011Table2',
           tableName: '报价详情信息表',
-          columnProp: 'adjustMachineCost',
+          columnProp: 'adjustToolCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'FOH',
+          columnLabel: '工具成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -227,8 +227,8 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120
-        }
-        ,{
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 5011,
           serialNumber: '5011Table2TotalCost',
@@ -237,7 +237,7 @@ export default {
           columnProp: 'totalCost',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: 'Total Cost(RMB.KCT)',
+          columnLabel: '总成本',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,