From 0ad845f39ab3c04e20410d89e89a48483d425c75 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 11 Mar 2026 16:52:28 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-11=20=E9=9A=90=E5=8E=BB=E6=8A=A5?=
=?UTF-8?q?=E4=BB=B7=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E2=80=9C=E6=9C=BA?=
=?UTF-8?q?=E5=99=A8=E6=88=90=E6=9C=AC=E2=80=9D=E4=BB=A5=E5=8F=8A=E2=80=9D?=
=?UTF-8?q?=20Margin%=E2=80=9D=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=88=87?=
=?UTF-8?q?=E5=9C=A8=E8=AE=A1=E7=AE=97=E6=80=BB=E6=88=90=E6=9C=AC=E6=97=B6?=
=?UTF-8?q?=E2=80=9C=E6=9C=BA=E5=99=A8=E6=88=90=E6=9C=AC=E2=80=9D=E4=B8=8D?=
=?UTF-8?q?=E5=8F=82=E4=B8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../quote/detail/primary/quoteDetailCost.vue | 48 +++++++++----------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index 676c3c3..f3ac005 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -104,7 +104,7 @@ export default {
// 标准总成本
this.quoteDetail.totalCost =
this.quoteDetail.adjustPartCost +
- this.quoteDetail.adjustMachineCost +
+ // this.quoteDetail.adjustMachineCost + // 暂时不参与总成本计算,如需还原请取消此注释
this.quoteDetail.adjustLabourCost;
if (this.selectionChecked.includes('其他')){
this.quoteDetail.totalCost += this.quoteDetail.adjustElseCost;
@@ -488,18 +488,18 @@ export default {
style="margin-top: 5px;border: 1px solid #777;width: 50%">
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -511,19 +511,19 @@ export default {
style="margin-top: 5px;border: 1px solid #777;width: 50%">
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -619,13 +619,13 @@ export default {
-
-
- computePriceByRate(value,'margin')" :controls="false"
- v-model="quoteDetail.quoteTaxRate" :disabled="quoteDetail.status === '已完成' || editInput !== 'Margin'" :step="0" :precision="0"/>
-
-
-
+
+
+
+
+
+
+
computePriceByRate(value,'price')" :controls="false"