From 15700ab18e9da8edad0530f76f43a47f5feca71b Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 1 Nov 2024 15:20:59 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E1=E3=80=81=E7=BE=8E=E5=85=83=E6=B1=87?= =?UTF-8?q?=E7=8E=87=EF=BC=8C=E4=B8=9A=E5=8A=A1=E8=87=AA=E5=B7=B1=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E6=89=8B=E5=8A=A8=E7=BB=B4=E6=8A=A4=EF=BC=8C=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=8A=A5=E4=BB=B7=E5=8D=95=E7=9A=84=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E7=BE=8E=E5=85=83=E6=B1=87=E7=8E=87?= =?UTF-8?q?=E4=BB=8E=E3=80=90=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99-?= =?UTF-8?q?=E6=B1=87=E7=8E=87=E7=AE=A1=E7=90=86=E3=80=91=E4=B8=AD=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E7=9A=84=E7=BE=8E?= =?UTF-8?q?=E5=85=83=E5=BF=BD=E7=95=A5=201.1=E3=80=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E7=BE=8E=E5=85=83=E6=B1=87=E7=8E=87=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BE=8E=E5=85=83=E6=B1=87=E7=8E=87=201.2?= =?UTF-8?q?=E3=80=81=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=88=B0=E7=BE=8E=E5=85=83?= =?UTF-8?q?=E6=B1=87=E7=8E=87=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA=E2=80=9C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=9C=AA=E9=85=8D=E7=BD=AE=E7=BE=8E=E5=85=83?= =?UTF-8?q?=E6=B1=87=E7=8E=87=EF=BC=8C=E8=AF=B7=E8=81=94=E7=B3=BB=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E2=80=9D=20=E4=B8=89=E3=80=81=E7=A1=AE?= =?UTF-8?q?=E5=AE=9A=203=E3=80=81=E7=82=B9=E5=87=BB=E3=80=90=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E3=80=91=E6=97=B6=EF=BC=8C=E8=8B=A5?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E6=9C=AA=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E5=BD=93=E5=89=8D=E7=9A=84=E3=80=90=E7=BE=8E=E5=85=83?= =?UTF-8?q?=E6=B1=87=E7=8E=87=E3=80=91=EF=BC=8C=E5=BC=B9=E7=AA=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E2=80=9C=E5=BD=93=E5=89=8D=E6=9C=AA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BE=8E=E5=85=83=E6=B1=87=E7=8E=87=EF=BC=8C=E8=AF=B7=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E6=80=BB=E7=BB=8F=E7=90=86=E2=80=9D=20=E9=94=80?= =?UTF-8?q?=E5=94=AE=E4=BC=B0=E4=BB=B7=E7=9B=B8=E5=85=B3=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BE=8E=E5=85=83=E6=B1=87?= =?UTF-8?q?=E7=8E=87=E5=8E=BB=E6=8E=89=20%=E5=8F=B7=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/sales/estimate/add.html | 30 +++++++++++++++---- .../templates/sales/estimate/addDetail.html | 3 -- .../templates/sales/estimate/ceoAdd.html | 3 -- .../sales/estimate/ceoAddDetail.html | 3 -- .../sales/estimate/engineeringAdd.html | 3 -- .../sales/estimate/engineeringAddDetail.html | 3 -- .../templates/sales/estimate/purchaseAdd.html | 3 -- .../sales/estimate/purchaseAddDetail.html | 3 -- 8 files changed, 25 insertions(+), 26 deletions(-) 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 @@
-
- - % -
+
@@ -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); + } + }); + } 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 @@
-
- % -
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 @@
-
- % -
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 @@
-
- % -
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 @@
-
- % -
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 @@
-
- % -
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 @@
-
- % -
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 @@
-
- % -