From 05145701a12cf768e513aafa049cd2f23ae79fba Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 14 Jan 2022 10:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B3=E7=AE=97=E8=A1=A8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=AF=9B=E5=88=A9=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E3=80=81?=
 =?UTF-8?q?=E5=86=B3=E7=AE=97=E8=A1=A8=E5=88=A9=E6=B6=A6=E7=8E=87=E8=A2=AB?=
 =?UTF-8?q?=E9=99=A4=E6=95=B0=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_final.js      | 6 +++---
 src/main/resources/templates/admin/project_final_edit.ftl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index ac54375..5f92b92 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -378,7 +378,7 @@ function calGrossProfitProfitMargin() {
 
     var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
     if (grossProfitFinalTotal && incomeFinalTotal) {
-        grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2(incomeFinalTotal)));
+        grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2min(incomeFinalTotal)));
     } else {
         grossProfitProfitMargin.val("");
     }
@@ -410,7 +410,7 @@ function calContributionMarginProfitMargin() {
 
     var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
     if (contributionMarginFinalTotal && incomeFinalTotal) {
-        contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2(incomeFinalTotal)));
+        contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2min(incomeFinalTotal)));
     } else {
         contributionMarginProfitMargin.val("");
     }
@@ -442,7 +442,7 @@ function calNetMarginProfitMargin() {
 
     var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
     if (netMarginFinalTotal && incomeFinalTotal) {
-        netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2(incomeFinalTotal)));
+        netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2min(incomeFinalTotal)));
     } else {
         netMarginProfitMargin.val("");
     }
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index f926a6d..ab63464 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -218,7 +218,7 @@
                         <td>项目毛利</td>
                         <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
                         <td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
-                        <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
+                        <td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(settleBean.grossProfit,'0')}" readonly required title="项目毛利结算总额"></td>
                         <td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" readonly required title="项目毛利决算总额"></td>
                         <td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
                     </tr>