From a6892ec3bc181fc9f7739238e63e74b1b86f7d94 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 7 Jun 2024 12:49:18 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=89=A9=E6=96=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/system/customerQuote/add.html | 3 +--
 .../main/resources/templates/system/customerQuote/edit.html    | 3 +--
 .../templates/system/customerQuote/taskYwgzVerify.html         | 2 --
 3 files changed, 2 insertions(+), 6 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 2f9a6cde..134cc63b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -363,6 +363,7 @@
                     { title: '物料的含税单价(美元)',field: 'materialUsd',align: 'center',},
                     { title: '物料的含税总价(美元)',field: 'materialUsdSum', align: 'center',},
                     { title: '物料的不含税总价(美元)',field: 'materialNoUsdSum',align: 'center',},
+                    { title: '物料的含税总价(RMB)',field: 'materialRmb',align: 'center',},
                     {  title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',},
                     {title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center',},
                     {field: 'createBy', align: 'center',title: '录入人',visible: false},
@@ -497,8 +498,6 @@
                 }
             })
             layer.close(index);
-            var enterpriseSum = $("#enterpriseSum_add").val();
-            $("#enterpriseSum_add").val((enterpriseSum==null?0:enterpriseSum) + 1);
         }
         function insertRow() {
             if ($("#customerCode").val() == null || $("#customerCode").val() == '') {
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 828a715e..fd3e564f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -426,6 +426,7 @@
                 countTax: '',
                 usdTax: '',
                 materialSole: "",
+                materialRmb: "",
                 materialNum: "",
                 materialNoRmb: "",
                 materialNoUsd: "",
@@ -455,8 +456,6 @@
             field: 'id',
             values: rowData.id
         })
-        let enterpriseSum = $("#enterpriseSum_edit").val();
-        $("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum);
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
index ee69b6f6..01829814 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
@@ -477,8 +477,6 @@
             field: 'id',
             values: rowData.id
         })
-        let enterpriseSum = $("#enterpriseSum_edit").val();
-        $("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum);
     }
     $("input[name='pricingDate']").datetimepicker({
         format: "yyyy-mm-dd",