diff --git a/src/views/modules/quote/detail/primary/quoteDetailBom.vue b/src/views/modules/quote/detail/primary/quoteDetailBom.vue
index 615c2d2..888782f 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailBom.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailBom.vue
@@ -403,12 +403,22 @@ export default {
       })
     },
     handleChangeVersion(row) {
+      // 防止重复提交
+      if (this.changeLoading) {
+        return;
+      }
+      
       this.$confirm('确认切换BOM版本吗,切换后将重新覆盖工具信息,请确认!','提示',{
         type: 'warning',
         confirmButtonText: '确定',
         cancelButtonText: '取消',
       })
         .then(()=>{
+          // 再次检查，防止在确认弹窗期间其他操作触发
+          if (this.changeLoading) {
+            return;
+          }
+          
           let node = this.$refs.tree.getCurrentNode();
           let params = {
             partNo: row.partNo,
@@ -597,7 +607,7 @@ export default {
                          min-width="100"/>
         <el-table-column label="操作" header-align="center" align="center" min-width="100">
           <template slot-scope="scope">
-            <a @click="handleChangeVersion(scope.row)">选择</a>
+            <el-button type="text" :loading="changeLoading" :disabled="changeLoading" @click="handleChangeVersion(scope.row)">选择</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 8163866..8c76a59 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -1255,7 +1255,7 @@ export default {
         </el-col>
         <el-col :span="8">
           <el-form-item label="币种" prop="currency1" :show-message="false">
-            <dict-data-select style="width: 100%" v-if="saveVisible" dict-type="plm_customer_information_customer_customer_currency" v-model="saveQuoteDetail.currency1"></dict-data-select>
+            <dict-data-select style="width: 100%" dict-type="plm_customer_information_customer_customer_currency" v-model="saveQuoteDetail.currency1"></dict-data-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -1316,25 +1316,25 @@ export default {
 
     <el-tabs v-model="activeName" v-if="saveQuoteDetail.id" @tab-click="handleClickTab">
       <el-tab-pane label="材料" name="bom">
-        <quote-detail-bom v-if="saveVisible" @close="handleClose" v-model:quoteDetail="saveQuoteDetail"></quote-detail-bom>
+        <quote-detail-bom v-if="saveVisible && activeName === 'bom'" @close="handleClose" v-model:quoteDetail="saveQuoteDetail"></quote-detail-bom>
       </el-tab-pane>
       <el-tab-pane label="工艺" name="routing">
-        <quote-detail-routing ref="routing" v-if="saveVisible" @close="handleClose" v-model:quoteDetail="saveQuoteDetail"></quote-detail-routing>
+        <quote-detail-routing ref="routing" v-if="saveVisible && activeName === 'routing'" @close="handleClose" v-model:quoteDetail="saveQuoteDetail"></quote-detail-routing>
       </el-tab-pane>
       <el-tab-pane label="工具" name="tool">
-        <quote-detail-tool ref="tool" v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-tool>
+        <quote-detail-tool ref="tool" v-if="saveVisible && activeName === 'tool'" v-model:quoteDetail="saveQuoteDetail"></quote-detail-tool>
       </el-tab-pane>
       <el-tab-pane label="测试" name="test">
-        <quote-detail-test v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-test>
+        <quote-detail-test v-if="saveVisible && activeName === 'test'" v-model:quoteDetail="saveQuoteDetail"></quote-detail-test>
       </el-tab-pane>
       <el-tab-pane label="包装&运输" name="otherCost">
-        <quote-detail-other-cost v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other-cost>
+        <quote-detail-other-cost v-if="saveVisible && activeName === 'otherCost'" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other-cost>
       </el-tab-pane>
       <el-tab-pane label="其他" name="other">
-        <quote-detail-other v-if="saveVisible" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
+        <quote-detail-other v-if="saveVisible && activeName === 'other'" v-model:quoteDetail="saveQuoteDetail"></quote-detail-other>
       </el-tab-pane>
       <el-tab-pane label="成本&价格" name="cost">
-        <quote-detail-cost v-if="saveVisible" ref="cost" v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
+        <quote-detail-cost v-if="saveVisible && activeName === 'cost'" ref="cost" v-model:quoteDetail="saveQuoteDetail"></quote-detail-cost>
       </el-tab-pane>
     </el-tabs>
     <div slot="footer" class="dialog-footer">