From 2397fafdc5d5813a797df9c9fda4e04383499708 Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Thu, 26 Jun 2025 17:02:27 +0800
Subject: [PATCH] 2025/6/26

---
 .../quote/detail/primary/quoteDetailCost.vue  | 48 +++++++++----------
 .../modules/quote/primary/quoteTable.vue      |  4 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index d081935..2c58ad4 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -152,26 +152,26 @@ export default {
         this.quoteDetail.adjustFabricateCost +
         this.quoteDetail.adjustLabourCost +
         this.quoteDetail.manageCost;
-      // if (this.selectionChecked.includes('其他')){
-      //   this.quoteDetail.totalCost += this.quoteDetail.adjustElseCost;
-      // }
-      // if (this.selectionChecked.includes('工具')){
-      //   this.quoteDetail.totalCost += this.quoteDetail.adjustToolCost;
-      // }
-      // if (this.selectionChecked.includes('测试')){
-      //   this.quoteDetail.totalCost += this.quoteDetail.adjustTestCost;
-      // }
-      // if (this.selectionChecked.includes('包装')){
-      //   this.quoteDetail.totalCost += this.quoteDetail.packCost;
-      // }
-      // if (this.selectionChecked.includes('运输')){
-      //   this.quoteDetail.totalCost += this.quoteDetail.shippingCost;
-      // }
-      this.quoteDetail.totalCost += this.quoteDetail.adjustElseCost;
-      this.quoteDetail.totalCost += this.quoteDetail.adjustToolCost;
-      this.quoteDetail.totalCost += this.quoteDetail.adjustTestCost;
-      this.quoteDetail.totalCost += this.quoteDetail.packCost;
-      this.quoteDetail.totalCost += this.quoteDetail.shippingCost;
+      if (this.selectionChecked.includes('其他')){
+        this.quoteDetail.totalCost += this.quoteDetail.adjustElseCost;
+      }
+      if (this.selectionChecked.includes('工具')){
+        this.quoteDetail.totalCost += this.quoteDetail.adjustToolCost;
+      }
+      if (this.selectionChecked.includes('测试')){
+        this.quoteDetail.totalCost += this.quoteDetail.adjustTestCost;
+      }
+      if (this.selectionChecked.includes('包装')){
+        this.quoteDetail.totalCost += this.quoteDetail.packCost;
+      }
+      if (this.selectionChecked.includes('运输')){
+        this.quoteDetail.totalCost += this.quoteDetail.shippingCost;
+      }
+      // this.quoteDetail.totalCost += this.quoteDetail.adjustElseCost;
+      // this.quoteDetail.totalCost += this.quoteDetail.adjustToolCost;
+      // this.quoteDetail.totalCost += this.quoteDetail.adjustTestCost;
+      // this.quoteDetail.totalCost += this.quoteDetail.packCost;
+      // this.quoteDetail.totalCost += this.quoteDetail.shippingCost;
 
       // if (this.selectionChecked.includes('包装&运输')){
       //   this.quoteDetail.totalCost += this.quoteDetail.otherCost;
@@ -672,7 +672,7 @@ export default {
           <el-col :span="4">
             <el-form-item label="未税单价(CNY):" prop="unitPrice" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.unitPrice" :step="0" :min="0" :precision="6" disabled/>
+                               v-model="quoteDetail.unitPrice" :step="0" :min="0" :precision="4" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -690,14 +690,14 @@ export default {
           <el-col :span="4">
             <el-form-item label="含税单价(CNY):" prop="taxUnitPrice" :show-message="false">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.taxUnitPrice" :step="0" :precision="6" :min="0" disabled/>
+                               v-model="quoteDetail.taxUnitPrice" :step="0" :precision="4" :min="0" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="4">
             <el-form-item label="未税单价">
-              <el-input-number style="width: 100%;" v-model="unitPrice" :controls="false" :step="0" :precision="6" :min="0" disabled></el-input-number>
+              <el-input-number style="width: 100%;" v-model="unitPrice" :controls="false" :step="0" :precision="4" :min="0" disabled></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -715,7 +715,7 @@ export default {
           <el-col :span="4">
             <el-form-item label="含税单价:">
               <el-input-number style="width: 100%;" :controls="false"
-                               v-model="quoteDetail.currencyTotalCost2" disabled :step="0" :min="0" :precision="6"/>
+                               v-model="quoteDetail.currencyTotalCost2" disabled :step="0" :min="0" :precision="4"/>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/modules/quote/primary/quoteTable.vue b/src/views/modules/quote/primary/quoteTable.vue
index d204dc4..ca82b31 100644
--- a/src/views/modules/quote/primary/quoteTable.vue
+++ b/src/views/modules/quote/primary/quoteTable.vue
@@ -40,9 +40,9 @@ export default {
     handleUpdateStatus(row,status){
       let message = ''
       if (row.status === '下达'){
-        message = '确认要下达该报价单吗？'
+        message = '确定取消下达该报价单？'
       }else if (row.status === '草稿'){
-        message = '确认要取消下达该报价单吗？'
+        message = '确定下达该报价单？'
       }
       this.$confirm(message, '提示', {
         confirmButtonText: '确定',