From 50e3a117a8d490a393cd394da68873de7080e8a2 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Mon, 8 Nov 2021 14:14:39 +0800
Subject: [PATCH] =?UTF-8?q?url=E8=B7=AF=E5=BE=84=E4=B8=8D=E5=86=99?=
 =?UTF-8?q?=E6=AD=BB=EF=BC=8C=E4=BD=BF=E7=94=A8base=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E5=88=A9=E6=B6=A6=E7=8E=87=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js        | 37 +++++++++++++++++++
 .../static/assets/js/project_budget_cost.js   |  2 +-
 .../js/project_budget_cost_project_manage.js  |  2 +-
 .../static/assets/js/project_budget_income.js |  2 +-
 .../static/assets/js/project_budget_plan.js   |  2 +-
 .../templates/admin/project_budget_edit.ftl   | 16 +-------
 6 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 66fbdcf..7d3ea2b 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -4,8 +4,45 @@ $(function () {
     bindDeleteBtn();
     //绑定收入和采购成本的输入框【都有税率】
     bindChangeableInput();
+
+    $("#saveDraft").click(function () {
+
+        var message = verifyProjectContributionProfitRate();
+        if (message) {
+            alert(message);
+            return;
+        }
+
+        $("#pmsForm").attr("action",base+"/project/budgetEditSave");
+        $("#pmsForm").submit();
+    });
+    $("#saveApprove").click(function () {
+
+        var message = verifyProjectContributionProfitRate();
+        if (message) {
+            alert(message);
+            return;
+        }
+
+        $("#pmsForm").attr("action",base+"/project/budgetEditSaveAndApprove");
+        $("#pmsForm").submit();
+    });
 });
 
+/**
+ * 校验项目贡献利润率必须大于阀值
+ * 低于阀值就返回提示信息，否则返回""
+ */
+function verifyProjectContributionProfitRate() {
+    var projectContributionProfitRate = f2($("input[name='projectContributionProfitRate']").val());
+    var projectContributionProfitRateThreshold = f2($("#projectContributionProfitRateThreshold").val());
+    if(projectContributionProfitRate<projectContributionProfitRateThreshold){
+        return "项目贡献利润率["+projectContributionProfitRate+"]低于阀值["+projectContributionProfitRateThreshold+"]，请调整后重新提交";
+    }
+
+    return "";
+}
+
 /**
  * 更新
  * 毛利=收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）
diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js
index d49a7e5..1c81252 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -10,7 +10,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost");
                 data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val());
-                saveDetail("/fourcal/project/budgetEditSaveCostDetail", data, updateCostData);
+                saveDetail(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
             },
             onCancel: function(e) {
             }
diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
index 8f8d1fe..886e768 100644
--- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
+++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
@@ -10,7 +10,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost-project-manage");
                 data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val());
-                saveDetail("/fourcal/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
+                saveDetail(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
             },
             onCancel: function(e) {
             }
diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js
index 8da5aac..c9ed111 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -11,7 +11,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-income");
                 data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val());
-                saveDetail("/fourcal/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
+                saveDetail(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
             },
             onCancel: function(e) {
             }
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index 5bee231..2a5103c 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -19,7 +19,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-budget-plan-detail");
                 data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val());
-                saveDetail("/fourcal/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
+                saveDetail(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
             },
             onCancel: function(e) {
             }
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index c334402..b823764 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -35,6 +35,7 @@
         <div class="am-tabs-bd">
             <div class="am-tab-panel am-fade am-in am-active" id="tab1">
             <input name="id" id="id" type="hidden" value="${project.id}" />
+            <input name="projectContributionProfitRateThreshold" id="projectContributionProfitRateThreshold" type="hidden" value="${project.projectContributionProfitRateThreshold}" />
                 <!--验证表单元素（validate) begin-->
 
                 <div class="am-g am-form-group am-margin-top">
@@ -699,21 +700,6 @@
 <script src="${base}/assets/js/project_budget_cost.js"></script>
 <script src="${base}/assets/js/project_budget_cost_project_manage.js"></script>
 <script src="${base}/assets/js/project_budget_plan.js"></script>
-<script>
-    $(function () {
-        $("#saveDraft").click(function () {
-            $("#pmsForm").attr("action","${base}/project/budgetEditSave");
-            $("#pmsForm").submit();
-        });
-        $("#saveApprove").click(function () {
-            $("#pmsForm").attr("action","${base}/project/budgetEditSaveAndApprove");
-            $("#pmsForm").submit();
-        });
-
-
-
-    });
-</script>
 </@defaultLayout.layout>