diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue
index 8435da4..068e661 100644
--- a/src/views/modules/common/Chooselist_eam.vue
+++ b/src/views/modules/common/Chooselist_eam.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="yzzInput" :title="baseListData.description" :close-on-click-modal="false"  :close-on-press-escape="false" @close="closeDialog" :visible.sync="visible" width="685px" v-drag>
+  <el-dialog class="yzzInput" :title="baseListData.description" append-to-body :close-on-click-modal="false"  :close-on-press-escape="false" @close="closeDialog" :visible.sync="visible" width="685px" v-drag>
     <el-form label-position="top" inline="inline" size="mini" >
       <el-row :gutter="10">
         <el-col :span="6" >
diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index d196bf1..69f4d44 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -1,8 +1,10 @@
 <script>
 import {queryQuoteDetailAllCost} from "../../../../../api/quote/quoteDetail";
+import ChooseListEam from "../../../common/Chooselist_eam.vue";
 
 export default {
   name: "quoteDetailCost",
+  components: {ChooseListEam},
   props: {
     quoteDetail: {
       type: Object,
@@ -57,6 +59,9 @@ export default {
 
       showQuoteCost:true,
       isShowCost:false,
+
+      tagNo:undefined,
+      type:undefined,
     }
   },
   methods:{
@@ -158,7 +163,36 @@ export default {
           }
         }
       })
-    }
+    },
+    getBaseData(val){
+      if (this.tagNo === 512){
+        if (this.type === 1){
+          this.quoteDetail.currency1 = val.Currency
+        }
+        if (this.type === 2){
+          this.quoteDetail.currency2 = val.Currency
+        }
+      }
+    },
+    getBaseList(val,type){
+      this.tagNo = val
+      this.type = type
+      this.$nextTick(()=>{
+        let strVal = ''
+        if (val === 512){
+          if (type === 1){
+            strVal = this.quoteDetail.currency1;
+          }
+          if (type === 2){
+            strVal = this.quoteDetail.currency2;
+          }
+          this.$refs.baseList.init(val,strVal)
+        }
+      })
+    },
+    clearModalData(field){
+      this.quoteDetail[field] = undefined
+    },
   },
   watch:{
     'quoteDetail.adjustPartCost'(newValue, oldValue){
@@ -241,6 +275,16 @@ export default {
       }
       this.computeQuoteTaxCost();
     },
+    'quoteDetail.exchangeRate1'(newValue, oldValue){
+      if (newValue === undefined || newValue === null){
+        this.quoteDetail.exchangeRate1 = 0;
+      }
+    },
+    'quoteDetail.exchangeRate2'(newValue, oldValue){
+      if (newValue === undefined || newValue === null){
+        this.quoteDetail.exchangeRate2 = 0;
+      }
+    },
 
   }
 }
@@ -383,6 +427,43 @@ export default {
           </el-col>
         </el-row>
       </fieldset>
+      <fieldset style="margin-top: 5px;border: 1px solid #777;">
+        <legend>外汇</legend>
+        <el-row :gutter="10" >
+          <el-col :span="4" >
+            <el-form-item label="汇率1" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false"
+                               v-model="quoteDetail.exchangeRate1" :disabled="quoteDetail.status === '下达'" :step="0" :min="0"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item label="币种1" :show-message="false">
+              <span slot="label" v-if="quoteDetail.status !== '下达'">
+                <a @click="getBaseList(512,1)">币种1</a>
+              </span>
+              <el-input v-model="quoteDetail.currency1" readonly :disabled="quoteDetail.status === '下达'">
+                <span slot="suffix" v-show="quoteDetail.currency1" @click="clearModalData('currency1')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item label="汇率2" :show-message="false">
+              <el-input-number style="width: 100%;" :controls="false"
+                               v-model="quoteDetail.exchangeRate2"  :disabled="quoteDetail.status === '下达'" :step="0" :min="0"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item label="币种2" :show-message="false">
+              <span slot="label" v-if="quoteDetail.status !== '下达'">
+                <a @click="getBaseList(512,2)">币种2</a>
+              </span>
+              <el-input v-model="quoteDetail.currency2" readonly :disabled="quoteDetail.status === '下达'">
+                <span slot="suffix" v-show="quoteDetail.currency2" @click="clearModalData('currency2')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </fieldset>
       <fieldset style="margin-top: 5px;border: 1px solid #777;">
         <legend>利润</legend>
         <el-row :gutter="10" >
@@ -480,6 +561,8 @@ export default {
         </el-row>
       </fieldset>
     </el-form>
+
+    <choose-list-eam ref="baseList" @getBaseData="getBaseData"></choose-list-eam>
   </div>
 </template>
 
diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue
index 19d217d..8884a0c 100644
--- a/src/views/modules/quote/index.vue
+++ b/src/views/modules/quote/index.vue
@@ -742,7 +742,10 @@ export default {
         this.$message.error(error)
         this.queryLoading = false
       })
-    }
+    },
+    clearModalData(field){
+      this.saveQuote[field] = ''
+    },
   },
   created() {
     this.quoteForm = {
@@ -859,7 +862,9 @@ export default {
               <span slot="label" v-if="!detailFlag">
                 <a @click="getBaseList(512)">币种</a>
               </span>
-              <el-input v-model="saveQuote.currency" :disabled="detailFlag"></el-input>
+              <el-input v-model="saveQuote.currency" readonly :disabled="detailFlag">
+                <span slot="suffix" v-show="saveQuote.currency" @click="clearModalData('currency')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">