From 80fe5892425dececa2cab71be3e095164334bb0b Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 1 Nov 2024 10:42:30 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E6=96=B0=E5=A2=9E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E3=80=81=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E3=80=81=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=8F=E7=90=86=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E6=80=BB=E7=BB=8F=E7=90=86=E5=8A=A9=E7=90=86?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=EF=BC=9A=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=A0=E5=B7=A5=E6=96=B9=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E3=80=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=BE=8E=E5=85=83?=
 =?UTF-8?q?=E6=B1=87=E7=8E=87=E5=92=8C=E5=9B=BD=E5=86=85=E7=A8=8E=E7=8E=87?=
 =?UTF-8?q?=EF=BC=9Bform=E8=A1=A8=E5=8D=95=E7=9A=84=E7=BE=8E=E5=85=83?=
 =?UTF-8?q?=E6=B1=87=E7=8E=87=E6=B2=A1=E6=9C=89=E5=80=BC=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9D=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=9C=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AA=E8=AF=BB=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/customerQuote/add.html        |  1 -
 .../templates/system/customerQuote/detail.html     |  8 ++++----
 .../templates/system/customerQuote/edit.html       | 14 +++++++-------
 .../system/customerQuote/taskModifyApply.html      |  8 ++++----
 .../system/customerQuote/taskYwjlVerify.html       |  8 ++++----
 .../system/customerQuote/taskYwzgVerify.html       |  8 ++++----
 .../system/customerQuote/taskZozjVerify.html       |  8 ++++----
 7 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
index 7d1608e3..e23dea17 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -841,7 +841,6 @@
                 url: url, // 后端接口URL
                 dataType: 'json', // 预期服务器返回的数据类型
                 success: function(data) {
-                    console.log(data)
                     $("#usdTax_add").val(data.data);
                 }
             });
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
index 7d11c970..dce53ca2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
@@ -54,7 +54,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="当前未配置美元汇率，请联系总经理" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -190,7 +190,7 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -207,8 +207,8 @@
                         return actions.join('');
                     }
                 },
-                {title: '国内税率',field: 'countTax',align: 'center',},
-                { title: '美元汇率',field: 'usdTax', align: 'center',},
+                // {title: '国内税率',field: 'countTax',align: 'center',},
+                // { title: '美元汇率',field: 'usdTax', align: 'center',},
                 {field: 'materialNum',align: 'center',title: '物料的数量',
                 },
                 { title: '物料的不含税单价(RMB)',
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
index 580f4825..623bc55f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -54,7 +54,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率">
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="当前未配置美元汇率，请联系总经理" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -124,9 +124,9 @@
                 <a class="btn btn-success" onclick="insertRow()">
                     <i class="fa fa-plus"></i> 添加物料
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="insertNRow()">
-                    <i class="fa fa-remove"></i> 添加无料号物料
-                </a>
+<!--                <a class="btn btn-danger multiple disabled" onclick="insertNRow()">-->
+<!--                    <i class="fa fa-remove"></i> 添加无料号物料-->
+<!--                </a>-->
             </div>
         </div>
         <div class="row">
@@ -231,7 +231,7 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -261,8 +261,8 @@
                         return actions.join('');
                     }
                 },
-                {title: '国内税率',field: 'countTax',align: 'center',},
-                { title: '美元汇率',field: 'usdTax', align: 'center',},
+                // {title: '国内税率',field: 'countTax',align: 'center',},
+                // { title: '美元汇率',field: 'usdTax', align: 'center',},
                 {field: 'materialNum',align: 'center',title: '物料的数量',
                     editable:{
                         type : 'text',
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
index c09d3a44..6defaf81 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
@@ -81,7 +81,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率">
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="当前未配置美元汇率，请联系总经理" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -249,7 +249,7 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -271,8 +271,8 @@
                 },
                 { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
                 { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
-                {title: '国内税率',field: 'countTax',align: 'center',},
-                { title: '美元汇率',field: 'usdTax', align: 'center',},
+                // {title: '国内税率',field: 'countTax',align: 'center',},
+                // { title: '美元汇率',field: 'usdTax', align: 'center',},
                 {field: 'materialNum',align: 'center',title: '物料的数量',
                     editable:{
                         type : 'text',
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
index 003dd549..0c1eabbd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
@@ -76,7 +76,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="当前未配置美元汇率，请联系总经理" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -233,7 +233,7 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -250,8 +250,8 @@
                         return actions.join('');
                     }
                 },
-                {title: '国内税率',field: 'countTax',align: 'center',},
-                { title: '美元汇率',field: 'usdTax', align: 'center',},
+                // {title: '国内税率',field: 'countTax',align: 'center',},
+                // { title: '美元汇率',field: 'usdTax', align: 'center',},
                 {title: '物料的数量',field: 'materialNum',align: 'center',
                 },
                 { title: '物料的不含税单价(RMB)',
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
index d38ea836..c8fb80b4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
@@ -77,7 +77,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="当前未配置美元汇率，请联系总经理" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -255,7 +255,7 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -272,8 +272,8 @@
                         return actions.join('');
                     }
                 },
-                {title: '国内税率',field: 'countTax',align: 'center',},
-                { title: '美元汇率',field: 'usdTax', align: 'center',},
+                // {title: '国内税率',field: 'countTax',align: 'center',},
+                // { title: '美元汇率',field: 'usdTax', align: 'center',},
                 {title: '物料的数量',field: 'materialNum',align: 'center',
                 },
                 { title: '物料的不含税单价(RMB)',
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
index 4e466ee8..7cc4f053 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
@@ -78,7 +78,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">美元汇率：</label>
             <div class="col-sm-8">
-                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
+                <input name="usdTax" th:field="*{usdTax}"  id="usdTax_edit" class="form-control" type="number" placeholder="当前未配置美元汇率，请联系总经理" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -236,7 +236,7 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -253,8 +253,8 @@
                         return actions.join('');
                     }
                 },
-                {title: '国内税率',field: 'countTax',align: 'center',},
-                { title: '美元汇率',field: 'usdTax', align: 'center',},
+                // {title: '国内税率',field: 'countTax',align: 'center',},
+                // { title: '美元汇率',field: 'usdTax', align: 'center',},
                 {field: 'materialNum',align: 'center',title: '物料的数量',
                 },
                 { title: '物料的不含税单价(RMB)',