From f516cb9852b38a2a991073da334715e958e0d8b1 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 11 Feb 2022 17:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget.js         | 18 ++++++++++++++++++
 .../templates/admin/project_budget_edit.ftl    |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 40935ee..4eb6de1 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -78,11 +78,13 @@ $(function () {
         var dataIncome = collectData("am-modal-prompt-input-income");
         if (dataIncome.length <= 0) {
             window.confirm('请填写收入明细表');
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
         var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收入明细表");
         if (dataIncomeCheck == null) {
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
@@ -96,11 +98,13 @@ $(function () {
         var dataCost = collectData("am-modal-prompt-input-cost");
         if (dataCost.length <= 0) {
             window.confirm('请填写采购成本明细表');
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
         var dataCostCheck = convertDetailVerifyCheck(dataCost, COST_DETAIL, "采购成本明细表");
         if (dataCostCheck == null) {
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
@@ -114,11 +118,13 @@ $(function () {
         var dataManage = collectData("am-modal-prompt-input-cost-project-manage");
         if (dataManage.length <= 0) {
             window.confirm('请填写项目管理成本表');
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
         var dataManageCheck = convertDetailVerifyCheck(dataManage, COST_PROJECT_MANAGE_DETAIL, "项目管理成本表");
         if (dataManageCheck == null) {
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
@@ -131,11 +137,13 @@ $(function () {
         var dataPlan = collectData("am-modal-prompt-input-budget-plan-detail");
         if (dataPlan.length <= 0) {
             window.confirm('请填写项目资金计划表');
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
         var dataPlanCheck = convertDetailVerifyCheck(dataPlan, BUDGET_PLAN_DETAIL, "项目资金计划表");
         if (dataPlanCheck == null) {
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
@@ -143,6 +151,7 @@ $(function () {
         var message = verifyBudgetPlan();
         if (message) {
             layuiAlert(message);
+            $("#saveDraft").attr('disabled', false);
             return;
         }
 
@@ -179,11 +188,13 @@ $(function () {
         var dataIncome = collectData("am-modal-prompt-input-income");
         if (dataIncome.length <= 0) {
             window.confirm('请填写收入明细表');
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
         var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收入明细表");
         if (dataIncomeCheck == null) {
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
@@ -197,11 +208,13 @@ $(function () {
         var dataCost = collectData("am-modal-prompt-input-cost");
         if (dataCost.length <= 0) {
             window.confirm('请填写采购成本明细表');
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
         var dataCostCheck = convertDetailVerifyCheck(dataCost, COST_DETAIL, "采购成本明细表");
         if (dataCostCheck == null) {
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
@@ -215,11 +228,13 @@ $(function () {
         var dataManage = collectData("am-modal-prompt-input-cost-project-manage");
         if (dataManage.length <= 0) {
             window.confirm('请填写项目管理成本表');
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
         var dataManageCheck = convertDetailVerifyCheck(dataManage, COST_PROJECT_MANAGE_DETAIL, "项目管理成本表");
         if (dataManageCheck == null) {
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
@@ -232,11 +247,13 @@ $(function () {
         var dataPlan = collectData("am-modal-prompt-input-budget-plan-detail");
         if (dataPlan.length <= 0) {
             window.confirm('请填写项目资金计划表');
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
         var dataPlanCheck = convertDetailVerifyCheck(dataPlan, BUDGET_PLAN_DETAIL, "项目资金计划表");
         if (dataPlanCheck == null) {
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
@@ -244,6 +261,7 @@ $(function () {
         var message = verifyBudgetPlan();
         if (message) {
             layuiAlert(message);
+            $("#saveApprove").attr('disabled', false);
             return;
         }
 
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 7ebdb98..1026032 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -579,7 +579,7 @@
                         </tr>
                         </thead>
                         <tbody style="display: inline-block;overflow-x: scroll;width: calc(100% - 210px);white-space: nowrap;">
-                        <tr class="am-hide" style="display: inline-block;">
+                        <tr style="display: inline-block;">
                             <td style="display: block;"><input type="text" class="am-modal-prompt-input input-total-title-month-budget-plan" value="${projectBudgetPlanDetailTotalTitle.month}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-title-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.deviceCost)}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-title-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.engineerCost)}" readonly/></td>
@@ -595,7 +595,7 @@
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-title-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.repaymentPlan)}" readonly/></td>
                             <td style="display: block;border-top: 1px solid #ddd;"><button type="button" class="am-btn am-btn-xs am-round am-modal-line-delete-budget-plan" disabled="disabled"><span class="am-icon-minus"></span></button></td>
                         </tr>
-                        <tr style="display: inline-block;">
+                        <tr class="am-hide" style="display: inline-block;">
                             <td style="display: block;"><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}" readonly/></td>