2026-03-11

隐去报价模块中的“机器成本”以及” Margin%”信息，切在计算总成本时“机器成本”不参与

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%">
           <legend>系统自动计算结果(料工费)</legend>
           <el-row :gutter="10" >
-            <el-col :span="8" v-show="!showQuoteCost">
+            <el-col :span="12" v-show="!showQuoteCost">
               <el-form-item label="材料成本:" prop="partCost" :show-message="false">
                 <el-input-number style="width: 100%; " :controls="false" v-model="quoteDetail.partCost" :precision="4" disabled/>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="机器成本:" prop="machineCost" :show-message="false">
-                <el-input-number style="width: 100%; " :controls="false"
-                                 v-model="quoteDetail.machineCost" :precision="4" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="机器成本:" prop="machineCost" :show-message="false">-->
+<!--                <el-input-number style="width: 100%; " :controls="false"-->
+<!--                                 v-model="quoteDetail.machineCost" :precision="4" disabled/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="12">
               <el-form-item label="人工成本:" prop="labourCost" :show-message="false">
                 <el-input-number style="width: 100%;" :controls="false"
                                  v-model="quoteDetail.labourCost" :precision="4" disabled/>
@@ -511,19 +511,19 @@ export default {
           style="margin-top: 5px;border: 1px solid #777;width: 50%">
           <legend>调整后成本(料工费)</legend>
           <el-row :gutter="10" >
-            <el-col :span="8" v-show="!showQuoteCost">
+            <el-col :span="12" v-show="!showQuoteCost">
               <el-form-item label="材料成本:" prop="adjustPartCost" :show-message="false">
                 <el-input-number style="width: 100%;" :controls="false"
                                  v-model="quoteDetail.adjustPartCost" :disabled="quoteDetail.status === '已完成'" :step="0" :precision="4" :min="0"/>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="机器成本:" prop="adjustMachineCost" :show-message="false">
-                <el-input-number style="width: 100%;" :controls="false"
-                                 v-model="quoteDetail.adjustMachineCost" :disabled="quoteDetail.status === '已完成'" :step="0" :precision="4" :min="0"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">-->
+<!--              <el-form-item label="机器成本:" prop="adjustMachineCost" :show-message="false">-->
+<!--                <el-input-number style="width: 100%;" :controls="false"-->
+<!--                                 v-model="quoteDetail.adjustMachineCost" :disabled="quoteDetail.status === '已完成'" :step="0" :precision="4" :min="0"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="12">
               <el-form-item label="人工成本:" prop="adjustLabourCost" :show-message="false">
                 <el-input-number style="width: 100%;" :controls="false"
                                  v-model="quoteDetail.adjustLabourCost" :disabled="quoteDetail.status === '已完成'" :step="0" :precision="4" :min="0"/>
@@ -619,13 +619,13 @@ export default {
               <el-link v-if="editInput !== 'Contribution' && quoteDetail.status !== '已完成'" @click="editInput = 'Contribution'"><i class="el-icon-edit"></i></el-link>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="Margin%" :show-message="false">
-              <el-input-number style="width: 60%;" @blur="(value)=>computePriceByRate(value,'margin')" :controls="false"
-                               v-model="quoteDetail.quoteTaxRate" :disabled="quoteDetail.status === '已完成' || editInput !== 'Margin'" :step="0" :precision="0"/>
-              <el-link v-if="editInput !== 'Margin' && quoteDetail.status !== '已完成'" @click="editInput = 'Margin'"><i class="el-icon-edit"></i></el-link>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="4">-->
+<!--            <el-form-item label="Margin%" :show-message="false">-->
+<!--              <el-input-number style="width: 60%;" @blur="(value)=>computePriceByRate(value,'margin')" :controls="false"-->
+<!--                               v-model="quoteDetail.quoteTaxRate" :disabled="quoteDetail.status === '已完成' || editInput !== 'Margin'" :step="0" :precision="0"/>-->
+<!--              <el-link v-if="editInput !== 'Margin' && quoteDetail.status !== '已完成'" @click="editInput = 'Margin'"><i class="el-icon-edit"></i></el-link>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="4">
             <el-form-item label="Price ¥(ex VAT)" :show-message="false">
               <el-input-number style="width: 60%;" @blur="(value)=>computePriceByRate(value,'price')" :controls="false"