From 6c96f473350b6c62fce29e5cac08b5ddba0e3dac Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Wed, 20 Apr 2022 17:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=93=E7=94=A8=E6=80=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_estimate_add.ftl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 7ee6758..0afccf5 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -581,6 +581,8 @@
             return;
         }
 
+        console.info(changeToNumber(incomeDeviceTaxInclude)+"------"+changeToNumber(incomeDeviceTaxExclude))
+        console.info(changeToNumber(incomeDeviceTaxInclude)<changeToNumber(incomeDeviceTaxExclude))
         if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) {
             window.confirm('设备类收入含税金额应大于不含税金额');
             check = 1;
@@ -648,7 +650,7 @@
     function changeToNumber(value) {
         value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符
         value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
-        Number(value);
+        return Number(value);
     }
 </script>
 </@defaultLayout.layout>