From 97f6a85a92c80a00d447523d8a2e19ffe86b2833 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 18 Jan 2022 11:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E5=87=BB=E7=BD=AE=E7=81=B0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_settle_valid.js  | 19 ++++++++++++++-----
 .../templates/admin/project_final_edit.ftl    |  4 ++++
 .../templates/admin/project_settle_edit.ftl   |  6 ++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_settle_valid.js b/src/main/resources/static/assets/js/project_settle_valid.js
index bd6771c..f4b3b2b 100644
--- a/src/main/resources/static/assets/js/project_settle_valid.js
+++ b/src/main/resources/static/assets/js/project_settle_valid.js
@@ -47,7 +47,7 @@ var incomeServiceValid = function() {
 var incomeTotalValid = function() {
     var settle = $("input[name='incomeSettleTotal']").val();
     var budget = $("input[name='incomeBudgetTotal']").val();
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
         layui.use('layer', function(){
             var layer = layui.layer;
             layer.alert("合计收入结算总额不能高于预算总额");
@@ -115,7 +115,7 @@ var costProjectManageValid = function() {
         });
         return false;
     }
-    if (parseFloat(salary) > parseFloat(month)) {
+    if (parseFloat(f2(salary)) > parseFloat(f2(month))) {
         layui.use('layer', function(){
             var layer = layui.layer;
             layer.alert("本月项目管理成本不能低于人力成本");
@@ -128,10 +128,10 @@ var costProjectManageValid = function() {
 var costTotalValid = function() {
     var settle = $("input[name='costSettleTotal']").val();
     var budget = $("input[name='costBudgetTotal']").val();
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
         layui.use('layer', function(){
             var layer = layui.layer;
-            layer.alert("合计支出结算总额不能高于预算总额");
+            layer.alert("合计成本结算总额不能高于预算总额");
         });
         return false;
     }
@@ -149,7 +149,7 @@ var costExpropriationValid = function() {
         });
         return false;
     }
-    if (parseFloat(settle) > parseFloat(budget)) {
+    if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
         layui.use('layer', function(){
             var layer = layui.layer;
             layer.alert("财务费用结算总额不能高于预算总额");
@@ -160,7 +160,9 @@ var costExpropriationValid = function() {
 };
 
 var costCompanyManageValid = function() {
+    var settle = $("input[name='costCompanyManageSettleTotal']").val();
     var month = $("input[name='costCompanyManage']").val();
+    var budget = $("input[name='costCompanyManageBudgetTotal']").val();
     if (month == "") {
         layui.use('layer', function(){
             var layer = layui.layer;
@@ -168,6 +170,13 @@ var costCompanyManageValid = function() {
         });
         return false;
     }
+    if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            layer.alert("公司管理费用结算总额不能高于预算总额");
+        });
+        return false;
+    }
     return true;
 };
 
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index ab63464..98c4af8 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -366,13 +366,17 @@
     $(function () {
         calculateFinal();
             $("#saveFinal").click(function () {
+                $("#saveFinal").attr('disabled',true);
                 $("#pmsForm").attr("action","${base}/project/final/save");
                 $("#pmsForm").submit();
+                $("#saveFinal").attr('disabled',false);
             });
 
             $("#saveApprove").click(function () {
+                $("#saveApprove").attr('disabled',true);
                 $("#pmsForm").attr("action",base+"/project/final/saveAndApprove");
                 $("#pmsForm").submit();
+                $("#saveApprove").attr('disabled',false);
             });
         });
 
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index 86c25aa..ac72ab1 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -426,23 +426,29 @@
         calculateSettle();
 
         $("#saveSettle").click(function () {
+            $("#saveSettle").attr('disabled',true);
             var result = valid();
             console.log(result);
             if (result) {
                 console.log("result: " + result);
                 $("#pmsForm").attr("action", "${base}/project/settle/save");
                 $("#pmsForm").submit();
+                $("#saveSettle").attr('disabled',false);
             } else {
+                $("#saveSettle").attr('disabled',false);
                 return false;
             }
         });
 
         $("#saveApprove").click(function () {
+            $("#saveApprove").attr('disabled',true);
             var result = valid();
             if (result) {
                 $("#pmsForm").attr("action",base+"/project/settle/saveAndApprove");
                 $("#pmsForm").submit();
+                $("#saveApprove").attr('disabled',false);
             } else {
+                $("#saveApprove").attr('disabled',false);
                 return false;
             }
         });