diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/add.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/add.html
index 0854a6b1..25f0d47f 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/add.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/add.html
@@ -48,10 +48,7 @@
             <div class="form-group">    
                 <label class="col-sm-4 control-label is-required">美元汇率：</label>
                 <div class="col-sm-8">
-                     <div class="input-group">
-                        <input name="usdRate" id="usdRate_add" class="form-control" type="text" required>
-                        <span class="input-group-addon">%</span>
-                    </div>
+                        <input name="usdRate" id="usdRate_add" class="form-control" type="text" placeholder="当前未配置美元汇率，请联系总经理" readonly required>
                 </div>
             </div>
 
@@ -198,6 +195,13 @@
 
         // 点击选择物料按钮
         function insertMaterialRow() {
+
+
+                if ($("#usdRate_add").val() == null || $("#usdRate_add").val() == '') {
+                    $.modal.alertWarning("当前未配置美元汇率，请联系总经理");
+                    return;
+                }
+
             var url = prefix + '/estimateMaterialSelect';
             var options = {
                 title: '选择物料',
@@ -463,6 +467,11 @@
 
         //获取客户信息
         $(document).ready(function() {
+
+            //加载美元汇率
+            loadLatestUsdTax();
+
+
             // 初始化时默认加载客户编号列表
             loadCustomerIds();
 
@@ -610,7 +619,18 @@
         //     $("input[name='allTaxDollar']").val(allTaxDollar);
         // }
 
-
+        //from的最新美元汇率
+        function loadLatestUsdTax() {
+            var url = ctx + 'system/exchangeRate/getLatestUsdTax';
+            $.ajax({
+                type: 'GET', // 请求类型
+                url: url, // 后端接口URL
+                dataType: 'json', // 预期服务器返回的数据类型
+                success: function(data) {
+                    $("#usdRate_add").val(data.data);
+                }
+            });
+        }
 
     </script>
 </body>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html
index 0fbe6ce9..dc951ffd 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/addDetail.html
@@ -47,10 +47,7 @@
     <div class="form-group">
       <label class="col-sm-4 control-label is-required">美元汇率：</label>
       <div class="col-sm-8">
-        <div class="input-group">
           <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-          <span class="input-group-addon">%</span>
-        </div>
       </div>
     </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
index 6da27520..418667f8 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
@@ -47,10 +47,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label is-required">美元汇率：</label>
             <div class="col-sm-8">
-                <div class="input-group">
                     <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-                    <span class="input-group-addon">%</span>
-                </div>
             </div>
         </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html
index 98d90598..a9dc3d0c 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAddDetail.html
@@ -47,10 +47,7 @@
     <div class="form-group">
       <label class="col-sm-4 control-label is-required">美元汇率：</label>
       <div class="col-sm-8">
-        <div class="input-group">
           <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-          <span class="input-group-addon">%</span>
-        </div>
       </div>
     </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
index 858d74c3..054824c5 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
@@ -47,10 +47,7 @@
     <div class="form-group">
       <label class="col-sm-4 control-label is-required">美元汇率：</label>
       <div class="col-sm-8">
-        <div class="input-group">
           <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-          <span class="input-group-addon">%</span>
-        </div>
       </div>
     </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html
index 55af3b7f..4d4a585b 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAddDetail.html
@@ -47,10 +47,7 @@
     <div class="form-group">
       <label class="col-sm-4 control-label is-required">美元汇率：</label>
       <div class="col-sm-8">
-        <div class="input-group">
           <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-          <span class="input-group-addon">%</span>
-        </div>
       </div>
     </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html
index 405c4afb..d5a9021f 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html
@@ -47,10 +47,7 @@
     <div class="form-group">
       <label class="col-sm-4 control-label is-required">美元汇率：</label>
       <div class="col-sm-8">
-        <div class="input-group">
           <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-          <span class="input-group-addon">%</span>
-        </div>
       </div>
     </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAddDetail.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAddDetail.html
index 8eeea19d..8478dcbb 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAddDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAddDetail.html
@@ -47,10 +47,7 @@
     <div class="form-group">
       <label class="col-sm-4 control-label is-required">美元汇率：</label>
       <div class="col-sm-8">
-        <div class="input-group">
           <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
-          <span class="input-group-addon">%</span>
-        </div>
       </div>
     </div>