From a99c66aa7a76cf55648c86338962c3a31a011e81 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 18 Jan 2022 14:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BD=AE=E7=81=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE5s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectSettleService.java | 1 - .../resources/static/assets/js/project_budget.js | 16 ++++++++-------- .../templates/admin/project_estimate_add.ftl | 8 ++++++-- .../templates/admin/project_estimate_edit.ftl | 8 ++++++-- .../templates/admin/project_final_add.ftl | 8 ++++++-- .../templates/admin/project_final_edit.ftl | 8 ++++++-- .../templates/admin/project_settle_add.ftl | 2 +- .../templates/admin/project_settle_edit.ftl | 14 ++++++++------ 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectSettleService.java b/src/main/java/cn/palmte/work/service/ProjectSettleService.java index 5e4ce52..eb373d4 100644 --- a/src/main/java/cn/palmte/work/service/ProjectSettleService.java +++ b/src/main/java/cn/palmte/work/service/ProjectSettleService.java @@ -42,7 +42,6 @@ public class ProjectSettleService { @Autowired private ProjectService projectService; - public void save(Project project, SettleBean settleBean, BudgetSettleBean budgetBean, EstimateSettleBean estimateBean, String time) { step(project, settleBean, budgetBean, estimateBean, time); diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 0bc0eec..169b47e 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -73,6 +73,7 @@ $(function () { bindChangeableInput(); $("#saveDraft").click(function () { + $("#saveDraft").attr('disabled', true); var dataIncome = collectData("am-modal-prompt-input-income"); if (dataIncome.length <= 0) { @@ -151,8 +152,6 @@ $(function () { } updateBudgetPlanDetailDataUnsubmit(); - $("#saveDraft").attr('disabled', true); - var message = verifyProjectContributionProfitRate(); if (message) { $("#saveDraft").attr('disabled', false); @@ -168,12 +167,14 @@ $(function () { window.confirm('开始日期应早于结束日期'); return; } - + setTimeout(function () { + $("#saveDraft").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action", base + "/project/budgetEditSave"); $("#pmsForm").submit(); - $("#saveDraft").attr('disabled', false); }); $("#saveApprove").click(function () { + $("#saveApprove").attr('disabled', true); var dataIncome = collectData("am-modal-prompt-input-income"); if (dataIncome.length <= 0) { @@ -252,8 +253,6 @@ $(function () { } updateBudgetPlanDetailDataUnsubmit(); - $("#saveApprove").attr('disabled', true); - var message = verifyProjectContributionProfitRate(); if (message) { $("#saveApprove").attr('disabled', false); @@ -268,10 +267,11 @@ $(function () { window.confirm('开始日期应早于结束日期'); return; } - + setTimeout(function () { + $("#saveApprove").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action", base + "/project/budgetEditSaveAndApprove"); $("#pmsForm").submit(); - $("#saveApprove").attr('disabled', false); }); }); diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 895cde1..620cf45 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -477,9 +477,11 @@ if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){ + setTimeout(function () { + $("#saveDraft").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action","${base}/project/estimateAddSave"); $("#pmsForm").submit(); - $("#saveDraft").attr('disabled',false); }else { alert("请完善不含税金额"); $("#saveDraft").attr('disabled',false); @@ -513,9 +515,11 @@ if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){ + setTimeout(function () { + $("#saveApprove").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action","${base}/project/estimateAddSave"); $("#pmsForm").submit(); - $("#saveApprove").attr('disabled',false); }else { alert("请完善不含税金额"); $("#saveApprove").attr('disabled',false); diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 9baa18a..1c3e0cf 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -457,9 +457,11 @@ $("#saveDraft").attr('disabled',false); return; } + setTimeout(function () { + $("#saveDraft").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action","${base}/project/estimateEditSave"); $("#pmsForm").submit(); - $("#saveDraft").attr('disabled',false); }); $("#saveApprove").click(function () { $("#saveApprove").attr('disabled',true); @@ -470,9 +472,11 @@ $("#saveApprove").attr('disabled',false); return; } + setTimeout(function () { + $("#saveApprove").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action","${base}/project/estimateEditSaveAndApprove"); $("#pmsForm").submit(); - $("#saveApprove").attr('disabled',false); }); }); diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 3b9db07..d8436b0 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -367,16 +367,20 @@ calculateFinal(); $("#saveFinal").click(function () { $("#saveFinal").attr('disabled',true); + setTimeout(function () { + $("#saveFinal").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action","${base}/project/final/save"); $("#pmsForm").submit(); - $("#saveFinal").attr('disabled',false); }); $("#saveApprove").click(function () { $("#saveApprove").attr('disabled',true); + setTimeout(function () { + $("#saveApprove").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action",base+"/project/final/saveAndApprove"); $("#pmsForm").submit(); - $("#saveApprove").attr('disabled',false); }); }); diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index e048f76..3853257 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -367,16 +367,20 @@ calculateFinal(); $("#saveFinal").click(function () { $("#saveFinal").attr('disabled',true); + setTimeout(function () { + $("#saveFinal").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action","${base}/project/final/save"); $("#pmsForm").submit(); - $("#saveFinal").attr('disabled',false); }); $("#saveApprove").click(function () { $("#saveApprove").attr('disabled',true); + setTimeout(function () { + $("#saveApprove").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action",base+"/project/final/saveAndApprove"); $("#pmsForm").submit(); - $("#saveApprove").attr('disabled',false); }); }); diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl index 02e1ab5..321259b 100644 --- a/src/main/resources/templates/admin/project_settle_add.ftl +++ b/src/main/resources/templates/admin/project_settle_add.ftl @@ -434,7 +434,7 @@ console.log("result: " + result); $("#pmsForm").attr("action", "${base}/project/settle/save"); $("#pmsForm").submit(); - $("#saveSettle").attr('disabled',false); + // $("#saveSettle").attr('disabled',false); } else { $("#saveSettle").attr('disabled',false); return false; diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl index ac72ab1..e5970ff 100644 --- a/src/main/resources/templates/admin/project_settle_edit.ftl +++ b/src/main/resources/templates/admin/project_settle_edit.ftl @@ -428,14 +428,14 @@ $("#saveSettle").click(function () { $("#saveSettle").attr('disabled',true); var result = valid(); - console.log(result); if (result) { - console.log("result: " + result); + setTimeout(function () { + $("#saveSettle").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action", "${base}/project/settle/save"); $("#pmsForm").submit(); - $("#saveSettle").attr('disabled',false); } else { - $("#saveSettle").attr('disabled',false); + $("#saveSettle").attr('disabled', false); return false; } }); @@ -444,11 +444,13 @@ $("#saveApprove").attr('disabled',true); var result = valid(); if (result) { + setTimeout(function () { + $("#saveApprove").attr('disabled', false); + }, 5000); $("#pmsForm").attr("action",base+"/project/settle/saveAndApprove"); $("#pmsForm").submit(); - $("#saveApprove").attr('disabled',false); } else { - $("#saveApprove").attr('disabled',false); + $("#saveApprove").attr('disabled', false); return false; } });