diff --git a/src/views/modules/quote/detail/primary/quoteDetailCalculation.vue b/src/views/modules/quote/detail/primary/quoteDetailCalculation.vue
index 1159fb3..c910217 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCalculation.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCalculation.vue
@@ -43,11 +43,18 @@ export default {
       })
     },
     handleUpdateQuoteDetailCalculation(){
-      this.$alert('确认删除该条报价明细吗？', '提示', {
+      this.$alert('确认应用2020Rate吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(()=>{
+        // 校验
+        for (let i = 0; i < Object.keys(this.calculation).length; i++) {
+          if (!this.calculation[Object.keys(this.calculation)[i]]) {
+            this.$message.warning("请填写完整信息")
+            return false
+          }
+        }
         let params = {
           ...this.calculation,
         }
@@ -56,7 +63,7 @@ export default {
             this.$message.success(data.msg)
             this.handleQueryQuoteDetailCalculation()
           }else {
-            this.$message.error(data.msg)
+            this.$message.warning(data.msg)
           }
         }).catch((error)=>{
           this.$message.error(error)
@@ -158,6 +165,14 @@ export default {
         <el-input-number style="width: 100%" :controls="false" :min="0" v-model="calculation.machFrontRate"></el-input-number>
       </el-col>
     </el-row>
+    <el-row :gutter="10">
+      <el-col :span="4">
+        Converting工时损耗
+      </el-col>
+      <el-col :span="3">
+        <el-input-number style="width: 100%" :controls="false" :min="0" v-model="calculation.convertingRate"></el-input-number>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 35e81db..657df63 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -818,7 +818,7 @@ export default {
         <quote-detail-cost v-if="saveVisible" ref="cost" v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
       </el-tab-pane>
       <el-tab-pane label="2020 Rate" name="rate" v-if="saveQuoteDetail.costModel === '2020'">
-        <quote-detail-calculation v-model:quote-detail="saveQuoteDetail"></quote-detail-calculation>
+        <quote-detail-calculation v-if="activeName === 'rate'" v-model:quote-detail="saveQuoteDetail"></quote-detail-calculation>
       </el-tab-pane>
     </el-tabs>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/modules/quote/detail/quoteGroupDetail.vue b/src/views/modules/quote/detail/quoteGroupDetail.vue
index 1042a93..a24318f 100644
--- a/src/views/modules/quote/detail/quoteGroupDetail.vue
+++ b/src/views/modules/quote/detail/quoteGroupDetail.vue
@@ -748,7 +748,7 @@ export default {
         <quote-detail-cost v-if="saveVisible" ref="cost" v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
       </el-tab-pane>
       <el-tab-pane label="2020 Rate" name="rate" v-if="saveQuoteDetail.costModel === '2020'">
-        <quote-detail-calculation v-model:quote-detail="saveQuoteDetail"></quote-detail-calculation>
+        <quote-detail-calculation v-if="activeName === 'rate'" v-model:quote-detail="saveQuoteDetail"></quote-detail-calculation>
       </el-tab-pane>
     </el-tabs>
     <div slot="footer" class="dialog-footer">