From d3557ad72c7d8dec7c33bc50a76634d9e227f849 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 13 Mar 2026 09:30:40 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-13=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/quote/detail/quoteDetail.vue | 72 +++++++++----------
.../modules/quote/detail/quoteGroupDetail.vue | 72 +++++++++----------
src/views/modules/quote/quoteDetailReport.vue | 24 +++----
3 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index e08ff45..a1fccca 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -245,24 +245,24 @@ export default {
fixed: '',
columnWidth: 60
},
- {
- userId: this.$store.state.user.name,
- functionId: 5011,
- serialNumber: '5011Table2QuoteTaxRate',
- tableId: '5011Table2',
- tableName: '报价详情信息表',
- columnProp: 'quoteTaxRate',
- headerAlign: 'center',
- align: 'right',
- columnLabel: 'Margin%',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 60
- },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 5011,
+ // serialNumber: '5011Table2QuoteTaxRate',
+ // tableId: '5011Table2',
+ // tableName: '报价详情信息表',
+ // columnProp: 'quoteTaxRate',
+ // headerAlign: 'center',
+ // align: 'right',
+ // columnLabel: 'Margin%',
+ // columnHidden: false,
+ // columnImage: false,
+ // columnSortable: false,
+ // sortLv: 0,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 60
+ // },
{
userId: this.$store.state.user.name,
functionId: 5011,
@@ -317,24 +317,24 @@ export default {
fixed: '',
columnWidth: 120
},
- {
- userId: this.$store.state.user.name,
- functionId: 5011,
- serialNumber: '5011Table2AdjustMachineCost',
- tableId: '5011Table2',
- tableName: '报价详情信息表',
- columnProp: 'adjustMachineCost',
- 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: '5011Table2AdjustMachineCost',
+ // tableId: '5011Table2',
+ // tableName: '报价详情信息表',
+ // columnProp: 'adjustMachineCost',
+ // 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,
diff --git a/src/views/modules/quote/detail/quoteGroupDetail.vue b/src/views/modules/quote/detail/quoteGroupDetail.vue
index e92d003..1a53ead 100644
--- a/src/views/modules/quote/detail/quoteGroupDetail.vue
+++ b/src/views/modules/quote/detail/quoteGroupDetail.vue
@@ -223,24 +223,24 @@ export default {
fixed: '',
columnWidth: 120
},
- {
- userId: this.$store.state.user.name,
- functionId: 5011,
- serialNumber: '5011Table2AdjustMachineCost',
- tableId: '5011Table2',
- tableName: '报价详情信息表',
- columnProp: 'adjustMachineCost',
- 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: '5011Table2AdjustMachineCost',
+ // tableId: '5011Table2',
+ // tableName: '报价详情信息表',
+ // columnProp: 'adjustMachineCost',
+ // 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,
@@ -385,24 +385,24 @@ export default {
fixed: '',
columnWidth: 100
},
- {
- userId: this.$store.state.user.name,
- functionId: 5011,
- serialNumber: '5011Table2QuoteTaxRate',
- tableId: '5011Table2',
- tableName: '报价详情信息表',
- columnProp: 'quoteTaxRate',
- headerAlign: 'center',
- align: 'right',
- columnLabel: 'Margin%',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 80
- },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 5011,
+ // serialNumber: '5011Table2QuoteTaxRate',
+ // tableId: '5011Table2',
+ // tableName: '报价详情信息表',
+ // columnProp: 'quoteTaxRate',
+ // headerAlign: 'center',
+ // align: 'right',
+ // columnLabel: 'Margin%',
+ // columnHidden: false,
+ // columnImage: false,
+ // columnSortable: false,
+ // sortLv: 0,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 80
+ // },
{
userId: this.$store.state.user.name,
functionId: 5011,
diff --git a/src/views/modules/quote/quoteDetailReport.vue b/src/views/modules/quote/quoteDetailReport.vue
index 8f2ef33..d1a75a5 100644
--- a/src/views/modules/quote/quoteDetailReport.vue
+++ b/src/views/modules/quote/quoteDetailReport.vue
@@ -87,11 +87,11 @@
{{ scope.row.adjustLabourCost | numberFormat }}
-
-
- {{ scope.row.adjustMachineCost | numberFormat }}
-
-
+
+
+
+
+
{{ scope.row.adjustToolCost | numberFormat }}
@@ -137,11 +137,11 @@
{{ scope.row.quoteProfitAmount | numberFormat }}
-
-
- {{ scope.row.quoteTaxRate | numberFormat }}
-
-
+
+
+
+
+
{{ scope.row.quoteTaxTotalPrice | numberFormat }}
@@ -239,7 +239,7 @@ export default {
if (params.quoter) params.quoter = '%' + params.quoter + '%'
if (params.insideInquiryNo) params.insideInquiryNo = '%' + params.insideInquiryNo + '%'
if (params.partNo) params.partNo = '%' + params.partNo + '%'
-
+
queryQuoteDetailReport(params).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
@@ -278,7 +278,7 @@ export default {
if (params.quoter) params.quoter = '%' + params.quoter + '%'
if (params.insideInquiryNo) params.insideInquiryNo = '%' + params.insideInquiryNo + '%'
if (params.partNo) params.partNo = '%' + params.partNo + '%'
-
+
await queryQuoteDetailReport(params).then(({data}) => {
if (data && data.code === 0) {
this.exportData = data.page.list