From 495f3a3f585d25d19b3b8b6c6a7ce2a7e6bc0400 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Wed, 1 Dec 2021 10:14:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF=E5=88=86=E6=9C=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 26 ++++++++----- .../templates/admin/project_approve.ftl | 37 ++++++++++++++++++- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 38791a9..758ea66 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -8,6 +8,7 @@ import cn.palmte.work.service.ProjectEstimateService; import cn.palmte.work.service.ProjectFinalSevice; import cn.palmte.work.service.ProjectService; import cn.palmte.work.service.*; +import cn.palmte.work.utils.DateKit; import cn.palmte.work.utils.FreeMarkerUtil; import cn.palmte.work.utils.InterfaceUtil; import cn.palmte.work.utils.Utils; @@ -27,9 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -346,7 +345,9 @@ public class ProjectController extends BaseController { * 审核页面 */ @RequestMapping("/approve") - public String approve(@RequestParam("id") int id, @RequestParam String listFrom, Map model) { + public String approve(@RequestParam(value = KEYWORDS, required = false) String keywords, + @RequestParam("id") int id, @RequestParam String listFrom, + Map model) { Project project = projectService.getProject(id); //项目信息 @@ -378,13 +379,18 @@ public class ProjectController extends BaseController { model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails)); //结算信息 - ProjectSettleIncome projectSettleIncome = projectSettleIncomeRepository.findNewByProjectId(id); - String time = ""; - if(null == projectSettleIncome){ - model.put("time", time); - }else { - time = projectSettleIncome.getTime(); + model.put("keywords",keywords); + ConcurrentHashMap searchInfo = getSearchInfo(keywords,model); + String time; + if (!searchInfo.containsKey("time")) { + Calendar instance = Calendar.getInstance(); + instance.setTime(new Date()); + instance.set(Calendar.MONTH, instance.get(Calendar.MONTH)); + Date current = instance.getTime(); + time = DateKit.toStr(current, DateKit.DATE_FORMAT_YEAR_MONTH2); model.put("time", time); + } else { + time = searchInfo.get("time"); } model.put("formerBean", projectSettleService.getFormerSettle(project, time)); model.put("monthBean", projectSettleService.getMonthSettle(project, time)); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index ab8caa5..d676c9c 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -95,6 +95,7 @@
+
    @@ -643,7 +644,7 @@
    - +
    @@ -1889,6 +1890,7 @@ + \ No newline at end of file From 0a455fc1ac608f346cbfec67c01e104893f66b0d Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Wed, 1 Dec 2021 10:36:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A6=82=E7=AE=97=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_approve.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index d676c9c..a3eea6e 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -342,7 +342,7 @@ 成本 项目管理成本 项目管理成本 - <#---->/ + From d18d1802ead9b22a8c3a4cc8de7f8d6b9145a5be Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 1 Dec 2021 11:24:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_estimate.js | 8 +- .../static/assets/js/project_final.js | 28 +++--- .../static/assets/js/project_settle.js | 88 +++++++++---------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js index ed0a1b1..ef35b31 100644 --- a/src/main/resources/static/assets/js/project_estimate.js +++ b/src/main/resources/static/assets/js/project_estimate.js @@ -102,7 +102,7 @@ function calIncomeInclude() { var $incomeTotalTaxInclude = $("input[name='incomeTotalTaxInclude']"); - $incomeTotalTaxInclude.val(f2(incomeDeviceTaxInclude)+f2(incomeEngineerTaxInclude)+f2(incomeServiceTaxInclude)); + $incomeTotalTaxInclude.val(f2(f2(incomeDeviceTaxInclude)+f2(incomeEngineerTaxInclude)+f2(incomeServiceTaxInclude))); } /** * 统计收入(不含税)，有一项没填就置空 @@ -114,7 +114,7 @@ function calIncomeExclude() { var $incomeTotalTaxExclude = $("input[name='incomeTotalTaxExclude']"); - $incomeTotalTaxExclude.val(f2(incomeDeviceTaxExclude)+f2(incomeEngineerTaxExclude)+f2(incomeServiceTaxExclude)); + $incomeTotalTaxExclude.val(f2(f2(incomeDeviceTaxExclude)+f2(incomeEngineerTaxExclude)+f2(incomeServiceTaxExclude))); } /** @@ -133,7 +133,7 @@ function calIncomeCost() { var incomeTotalTaxExcludeValue = f2(incomeTotalTaxExclude); if (incomeTotalTaxExcludeValue != 0) { - $projectGrossProfit.val(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude)); + $projectGrossProfit.val(f2(f2(incomeTotalTaxExclude) - f2(costTotalTaxExclude) - f2(costExpropriationTaxExclude))); $projectGrossProfitRate.val(f2(f2($projectGrossProfit.val()) * 100 / incomeTotalTaxExcludeValue)); } else { $projectGrossProfit.val(""); @@ -141,7 +141,7 @@ function calIncomeCost() { } if ($projectGrossProfit.val()) { - $projectContributionProfit.val(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude)); + $projectContributionProfit.val(f2(f2($projectGrossProfit.val()) - f2(costCompanyManageTaxExclude))); $projectContributionProfitRate.val(f2(f2($projectContributionProfit.val()) * 100 / f2(incomeTotalTaxExclude))) } else { $projectContributionProfit.val(""); diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js index 691b81d..37d6d09 100644 --- a/src/main/resources/static/assets/js/project_final.js +++ b/src/main/resources/static/assets/js/project_final.js @@ -148,8 +148,8 @@ function calNetCashFlow() { if (saleIncomeCash && taxReturn && earnestMoneyIncome && purchaseCost && taxCost && earnestMoneyCost) { - netCashFlow.val((parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) - - parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost)).toFixed(2)); + netCashFlow.val(f2(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) + - parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost))); } else { netCashFlow.val(""); } @@ -165,7 +165,7 @@ function calNetCashFromInvestingActivities() { var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']"); if (cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities) { - netCashFromInvestingActivities.val((parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities)).toFixed(2)); + netCashFromInvestingActivities.val(f2(parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities))); } else { netCashFromInvestingActivities.val(""); } @@ -181,7 +181,7 @@ function calFinancingCapitalCashflow() { var financingCapitalCashflow = $("input[name='financingCapitalCashflow']"); if (financingCapitalInflow && financingCapitalOutflow) { - financingCapitalCashflow.val((parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow)).toFixed(2)); + financingCapitalCashflow.val(f2(parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow))); } else { financingCapitalCashflow.val(""); } @@ -195,7 +195,7 @@ function calNetIncreaseMonetaryFunds() { var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']"); if (netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow) { - netIncreaseMonetaryFunds.val((parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow)).toFixed(2)); + netIncreaseMonetaryFunds.val(f2(parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow))); } else { netIncreaseMonetaryFunds.val(""); } @@ -212,7 +212,7 @@ function calIncomeFinalTotal() { var incomeFinalTotal = $("input[name='incomeFinalTotal']"); if (incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal) { - incomeFinalTotal.val((parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal)).toFixed(2)); + incomeFinalTotal.val(f2(parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal))); } else { incomeFinalTotal.val(""); } @@ -233,8 +233,8 @@ function calCostFinalTotal() { if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal && costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) { - costFinalTotal.val((parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) + - parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal)).toFixed(2)); + costFinalTotal.val(f2(parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) + + parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal))); } else { costFinalTotal.val(""); } @@ -252,7 +252,7 @@ function calManageFinalTotal() { var manageFinalTotal = $("input[name='manageFinalTotal']"); if (costExpropriationFinalTotal && costCompanyManageFinalTotal && costIncomeTaxFinalTotal) { - manageFinalTotal.val((parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal)).toFixed(2)); + manageFinalTotal.val(f2(parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal))); } else { manageFinalTotal.val(""); } @@ -284,11 +284,11 @@ function calCashFluxFinalTotal() { netCashFlow && cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities && netCashFromInvestingActivities && financingCapitalInflow && financingCapitalOutflow && financingCapitalCashflow && netIncreaseMonetaryFunds) { - cashFluxFinalTotal.val((parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) + + cashFluxFinalTotal.val(f2(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) + parseFloat(purchaseCost) + parseFloat(taxCost) + parseFloat(earnestMoneyCost) + parseFloat(netCashFlow) + parseFloat(cashInflowFromInvestingActivities) + parseFloat(cashOutflowFromInvestingActivities) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalInflow) + parseFloat(financingCapitalOutflow) + - parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds)).toFixed(2)); + parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds))); } else { cashFluxFinalTotal.val(""); } @@ -305,7 +305,7 @@ function calGrossProfitFinalTotal() { var grossProfitFinalTotal = $("input[name='grossProfitFinalTotal']"); if (incomeFinalTotal && costFinalTotal && costExpropriationFinalTotal) { - grossProfitFinalTotal.val((parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal)).toFixed(2)); + grossProfitFinalTotal.val(f2(parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal))); } else { grossProfitFinalTotal.val(""); } @@ -337,7 +337,7 @@ function calContributionMarginFinalTotal() { var contributionMarginFinalTotal = $("input[name='contributionMarginFinalTotal']"); if (grossProfitFinalTotal && costCompanyManageFinalTotal) { - contributionMarginFinalTotal.val((parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal)).toFixed(2)); + contributionMarginFinalTotal.val(f2(parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal))); } else { contributionMarginFinalTotal.val(""); } @@ -369,7 +369,7 @@ function calNetMarginFinalTotal() { var netMarginFinalTotal = $("input[name='netMarginFinalTotal']"); if (contributionMarginFinalTotal && costIncomeTaxFinalTotal) { - netMarginFinalTotal.val((parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal)).toFixed(2)); + netMarginFinalTotal.val(f2(parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal))); } else { netMarginFinalTotal.val(""); } diff --git a/src/main/resources/static/assets/js/project_settle.js b/src/main/resources/static/assets/js/project_settle.js index f5b72cb..a3023a5 100644 --- a/src/main/resources/static/assets/js/project_settle.js +++ b/src/main/resources/static/assets/js/project_settle.js @@ -222,7 +222,7 @@ function calIncomeDeviceSettleTotal() { var incomeDeviceSettleTotal = $("input[name='incomeDeviceSettleTotal']"); if(incomeDeviceFormerSettleTotal && incomeDevice){ - incomeDeviceSettleTotal.val((parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice)).toFixed(2)); + incomeDeviceSettleTotal.val(f2(parseFloat(incomeDeviceFormerSettleTotal)+parseFloat(incomeDevice))); }else { incomeDeviceSettleTotal.val(""); } @@ -238,7 +238,7 @@ function calIncomeEngineerSettleTotal() { var incomeEngineerSettleTotal = $("input[name='incomeEngineerSettleTotal']"); if(incomeEngineerFormerSettleTotal && incomeEngineer){ - incomeEngineerSettleTotal.val((parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer)).toFixed(2)); + incomeEngineerSettleTotal.val(f2(parseFloat(incomeEngineerFormerSettleTotal)+parseFloat(incomeEngineer))); }else { incomeEngineerSettleTotal.val(""); } @@ -254,7 +254,7 @@ function calIncomeServiceSettleTotal() { var incomeServiceSettleTotal = $("input[name='incomeServiceSettleTotal']"); if(incomeServiceFormerSettleTotal && incomeService){ - incomeServiceSettleTotal.val((parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService)).toFixed(2)); + incomeServiceSettleTotal.val(f2(parseFloat(incomeServiceFormerSettleTotal)+parseFloat(incomeService))); }else { incomeServiceSettleTotal.val(""); } @@ -271,7 +271,7 @@ function calIncomeTotal() { var incomeTotal = $("input[name='incomeTotal']"); if(incomeDevice && incomeEngineer && incomeService){ - incomeTotal.val((parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService)).toFixed(2)); + incomeTotal.val(f2(parseFloat(incomeDevice)+parseFloat(incomeEngineer)+parseFloat(incomeService))); }else { incomeTotal.val(""); } @@ -288,7 +288,7 @@ function calIncomeSettleTotal() { var incomeSettleTotal = $("input[name='incomeSettleTotal']"); if(incomeDeviceSettleTotal && incomeEngineerSettleTotal && incomeServiceSettleTotal){ - incomeSettleTotal.val((parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal)).toFixed(2)); + incomeSettleTotal.val(f2(parseFloat(incomeDeviceSettleTotal)+parseFloat(incomeEngineerSettleTotal)+parseFloat(incomeServiceSettleTotal))); }else { incomeSettleTotal.val(""); } @@ -304,7 +304,7 @@ function calCostPurchaseDeviceSettleTotal() { var costPurchaseDeviceSettleTotal = $("input[name='costPurchaseDeviceSettleTotal']"); if(costPurchaseDeviceFormerSettleTotal && costPurchaseDevice){ - costPurchaseDeviceSettleTotal.val((parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice)).toFixed(2)); + costPurchaseDeviceSettleTotal.val(f2(parseFloat(costPurchaseDeviceFormerSettleTotal)+parseFloat(costPurchaseDevice))); }else { costPurchaseDeviceSettleTotal.val(""); } @@ -320,7 +320,7 @@ function calCostPurchaseBuildSettleTotal() { var costPurchaseBuildSettleTotal = $("input[name='costPurchaseBuildSettleTotal']"); if(costPurchaseBuildFormerSettleTotal && costPurchaseBuild){ - costPurchaseBuildSettleTotal.val((parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild)).toFixed(2)); + costPurchaseBuildSettleTotal.val(f2(parseFloat(costPurchaseBuildFormerSettleTotal)+parseFloat(costPurchaseBuild))); }else { costPurchaseBuildSettleTotal.val(""); } @@ -336,7 +336,7 @@ function calCostPurchaseServiceSettleTotal() { var costPurchaseServiceSettleTotal = $("input[name='costPurchaseServiceSettleTotal']"); if(costPurchaseServiceFormerSettleTotal && costPurchaseService){ - costPurchaseServiceSettleTotal.val((parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService)).toFixed(2)); + costPurchaseServiceSettleTotal.val(f2(parseFloat(costPurchaseServiceFormerSettleTotal)+parseFloat(costPurchaseService))); }else { costPurchaseServiceSettleTotal.val(""); } @@ -352,7 +352,7 @@ function calCostPurchaseOtherSettleTotal() { var costPurchaseOtherSettleTotal = $("input[name='costPurchaseOtherSettleTotal']"); if(costPurchaseOtherFormerSettleTotal && costPurchaseOther){ - costPurchaseOtherSettleTotal.val((parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther)).toFixed(2)); + costPurchaseOtherSettleTotal.val(f2(parseFloat(costPurchaseOtherFormerSettleTotal)+parseFloat(costPurchaseOther))); }else { costPurchaseOtherSettleTotal.val(""); } @@ -368,7 +368,7 @@ function calCostProjectManageSettleTotal() { var costProjectManageSettleTotal = $("input[name='costProjectManageSettleTotal']"); if(costProjectManageFormerSettleTotal && costProjectManage){ - costProjectManageSettleTotal.val((parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage)).toFixed(2)); + costProjectManageSettleTotal.val(f2(parseFloat(costProjectManageFormerSettleTotal)+parseFloat(costProjectManage))); }else { costProjectManageSettleTotal.val(""); } @@ -384,7 +384,7 @@ function calCostOtherSettleTotal() { var costOtherSettleTotal = $("input[name='costOtherSettleTotal']"); if(costOtherFormerSettleTotal && costOther){ - costOtherSettleTotal.val((parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther)).toFixed(2)); + costOtherSettleTotal.val(f2(parseFloat(costOtherFormerSettleTotal)+parseFloat(costOther))); }else { costOtherSettleTotal.val(""); } @@ -404,7 +404,7 @@ function calCostTotal() { var costTotal = $("input[name='costTotal']"); if(costPurchaseDevice && costPurchaseBuild && costPurchaseService && costPurchaseOther && costProjectManage && costOther){ - costTotal.val((parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther)).toFixed(2)); + costTotal.val(f2(parseFloat(costPurchaseDevice)+parseFloat(costPurchaseBuild)+parseFloat(costPurchaseService)+parseFloat(costPurchaseOther)+parseFloat(costProjectManage)+parseFloat(costOther))); }else { costTotal.val(""); } @@ -425,8 +425,8 @@ function calCostSettleTotal() { if(costPurchaseDeviceSettleTotal && costPurchaseBuildSettleTotal && costPurchaseServiceSettleTotal && costPurchaseOtherSettleTotal && costProjectManageSettleTotal && costOtherSettleTotal){ - costSettleTotal.val((parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+ - parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal)).toFixed(2)); + costSettleTotal.val(f2(parseFloat(costPurchaseDeviceSettleTotal)+parseFloat(costPurchaseBuildSettleTotal)+parseFloat(costPurchaseServiceSettleTotal)+ + parseFloat(costPurchaseOtherSettleTotal)+parseFloat(costProjectManageSettleTotal)+parseFloat(costOtherSettleTotal))); }else { costSettleTotal.val(""); } @@ -442,7 +442,7 @@ function calCostExpropriationSettleTotal() { var costExpropriationSettleTotal = $("input[name='costExpropriationSettleTotal']"); if(costExpropriationFormerSettleTotal && costExpropriation){ - costExpropriationSettleTotal.val((parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation)).toFixed(2)); + costExpropriationSettleTotal.val(f2(parseFloat(costExpropriationFormerSettleTotal)+parseFloat(costExpropriation))); }else { costExpropriationSettleTotal.val(""); } @@ -458,7 +458,7 @@ function calCostCompanyManageSettleTotal() { var costCompanyManageSettleTotal = $("input[name='costCompanyManageSettleTotal']"); if(costCompanyManageFormerSettleTotal && costCompanyManage){ - costCompanyManageSettleTotal.val((parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage)).toFixed(2)); + costCompanyManageSettleTotal.val(f2(parseFloat(costCompanyManageFormerSettleTotal)+parseFloat(costCompanyManage))); }else { costCompanyManageSettleTotal.val(""); } @@ -474,7 +474,7 @@ function calCostIncomeTaxSettleTotal() { var costIncomeTaxSettleTotal = $("input[name='costIncomeTaxSettleTotal']"); if(costIncomeTaxFormerSettleTotal && costIncomeTax){ - costIncomeTaxSettleTotal.val((parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax)).toFixed(2)); + costIncomeTaxSettleTotal.val(f2(parseFloat(costIncomeTaxFormerSettleTotal)+parseFloat(costIncomeTax))); }else { costIncomeTaxSettleTotal.val(""); } @@ -491,7 +491,7 @@ function calCostManageTotal() { var costManageTotal = $("input[name='costManageTotal']"); if(costExpropriation && costCompanyManage && costIncomeTax){ - costManageTotal.val((parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax)).toFixed(2)); + costManageTotal.val(f2(parseFloat(costExpropriation)+parseFloat(costCompanyManage)+parseFloat(costIncomeTax))); }else { costManageTotal.val(""); } @@ -508,7 +508,7 @@ function calCostManageSettleTotal() { var costManageSettleTotal = $("input[name='costManageSettleTotal']"); if(costExpropriationSettleTotal && costCompanyManageSettleTotal && costIncomeTaxSettleTotal){ - costManageSettleTotal.val((parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal)).toFixed(2)); + costManageSettleTotal.val(f2(parseFloat(costExpropriationSettleTotal)+parseFloat(costCompanyManageSettleTotal)+parseFloat(costIncomeTaxSettleTotal))); }else { costManageSettleTotal.val(""); } @@ -525,7 +525,7 @@ function calGrossProfit() { var grossProfit = $("input[name='grossProfit']"); if(incomeTotal && costTotal && costExpropriation){ - grossProfit.val((parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation)).toFixed(2)); + grossProfit.val(f2(parseFloat(incomeTotal)-parseFloat(costTotal)-parseFloat(costExpropriation))); }else { grossProfit.val(""); } @@ -541,7 +541,7 @@ function calGrossProfitSettleTotal() { var grossProfitSettleTotal = $("input[name='grossProfitSettleTotal']"); if(grossProfitFormerSettleTotal && grossProfit){ - grossProfitSettleTotal.val((parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit)).toFixed(2)); + grossProfitSettleTotal.val(f2(parseFloat(grossProfitFormerSettleTotal)+parseFloat(grossProfit))); }else { grossProfitSettleTotal.val(""); } @@ -573,7 +573,7 @@ function calContributionProfit() { var contributionProfit = $("input[name='contributionProfit']"); if(grossProfit && costCompanyManage){ - contributionProfit.val((parseFloat(grossProfit)-parseFloat(costCompanyManage)).toFixed(2)); + contributionProfit.val(f2(parseFloat(grossProfit)-parseFloat(costCompanyManage))); }else { contributionProfit.val(""); } @@ -589,7 +589,7 @@ function calContributionProfitSettleTotal() { var contributionProfitSettleTotal = $("input[name='contributionProfitSettleTotal']"); if(contributionProfitFormerSettleTotal && contributionProfit){ - contributionProfitSettleTotal.val((parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit)).toFixed(2)); + contributionProfitSettleTotal.val(f2(parseFloat(contributionProfitFormerSettleTotal)+parseFloat(contributionProfit))); }else { contributionProfitSettleTotal.val(""); } @@ -621,7 +621,7 @@ function calNetProfit() { var netProfit = $("input[name='netProfit']"); if(contributionProfit && costIncomeTax){ - netProfit.val((parseFloat(contributionProfit)-parseFloat(costIncomeTax)).toFixed(2)); + netProfit.val(f2(parseFloat(contributionProfit)-parseFloat(costIncomeTax))); }else { netProfit.val(""); } @@ -637,7 +637,7 @@ function calNetProfitSettleTotal() { var netProfitSettleTotal = $("input[name='netProfitSettleTotal']"); if(netProfitFormerSettleTotal && netProfit){ - netProfitSettleTotal.val((parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit)).toFixed(2)); + netProfitSettleTotal.val(f2(parseFloat(netProfitFormerSettleTotal)+parseFloat(netProfit))); }else { netProfitSettleTotal.val(""); } @@ -669,7 +669,7 @@ function calSaleIncomeCashSettle() { var saleIncomeCashSettle = $("input[name='saleIncomeCashSettle']"); if(saleIncomeCashFormerSettle && saleIncomeCash){ - saleIncomeCashSettle.val((parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash)).toFixed(2)); + saleIncomeCashSettle.val(f2(parseFloat(saleIncomeCashFormerSettle)+parseFloat(saleIncomeCash))); }else { saleIncomeCashSettle.val(""); } @@ -685,7 +685,7 @@ function calTaxReturnSettle() { var taxReturnSettle = $("input[name='taxReturnSettle']"); if(taxReturnFormerSettle && taxReturn){ - taxReturnSettle.val((parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn)).toFixed(2)); + taxReturnSettle.val(f2(parseFloat(taxReturnFormerSettle)+parseFloat(taxReturn))); }else { taxReturnSettle.val(""); } @@ -701,7 +701,7 @@ function calEarnestMoneyIncomeSettle() { var earnestMoneyIncomeSettle = $("input[name='earnestMoneyIncomeSettle']"); if(earnestMoneyIncomeFormerSettle && earnestMoneyIncome){ - earnestMoneyIncomeSettle.val((parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome)).toFixed(2)); + earnestMoneyIncomeSettle.val(f2(parseFloat(earnestMoneyIncomeFormerSettle)+parseFloat(earnestMoneyIncome))); }else { earnestMoneyIncomeSettle.val(""); } @@ -717,7 +717,7 @@ function calPurchaseCostSettle() { var purchaseCostSettle = $("input[name='purchaseCostSettle']"); if(purchaseCostFormerSettle && purchaseCost){ - purchaseCostSettle.val((parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost)).toFixed(2)); + purchaseCostSettle.val(f2(parseFloat(purchaseCostFormerSettle)+parseFloat(purchaseCost))); }else { purchaseCostSettle.val(""); } @@ -733,7 +733,7 @@ function calTaxCostSettle() { var taxCostSettle = $("input[name='taxCostSettle']"); if(taxCostFormerSettle && taxCost){ - taxCostSettle.val((parseFloat(taxCostFormerSettle)+parseFloat(taxCost)).toFixed(2)); + taxCostSettle.val(f2(parseFloat(taxCostFormerSettle)+parseFloat(taxCost))); }else { taxCostSettle.val(""); } @@ -750,7 +750,7 @@ function calEarnestMoneyCostSettle() { var earnestMoneyCostSettle = $("input[name='earnestMoneyCostSettle']"); if(earnestMoneyCostFormerSettle && earnestMoneyCost){ - earnestMoneyCostSettle.val((parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost)).toFixed(2)); + earnestMoneyCostSettle.val(f2(parseFloat(earnestMoneyCostFormerSettle)+parseFloat(earnestMoneyCost))); }else { earnestMoneyCostSettle.val(""); } @@ -766,7 +766,7 @@ function calNetCashFlowSettle() { var netCashFlowSettle = $("input[name='netCashFlowSettle']"); if(netCashFlowFormerSettle && netCashFlow){ - netCashFlowSettle.val((parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow)).toFixed(2)); + netCashFlowSettle.val(f2(parseFloat(netCashFlowFormerSettle)+parseFloat(netCashFlow))); }else { netCashFlowSettle.val(""); } @@ -782,7 +782,7 @@ function calCashInflowFromInvestingActivitiesSettle() { var cashInflowFromInvestingActivitiesSettle = $("input[name='cashInflowFromInvestingActivitiesSettle']"); if(cashInflowFromInvestingActivitiesFormerSettle && cashInflowFromInvestingActivities){ - cashInflowFromInvestingActivitiesSettle.val((parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities)).toFixed(2)); + cashInflowFromInvestingActivitiesSettle.val(f2(parseFloat(cashInflowFromInvestingActivitiesFormerSettle)+parseFloat(cashInflowFromInvestingActivities))); }else { cashInflowFromInvestingActivitiesSettle.val(""); } @@ -798,7 +798,7 @@ function calCashOutflowFromInvestingActivitiesSettle() { var cashOutflowFromInvestingActivitiesSettle = $("input[name='cashOutflowFromInvestingActivitiesSettle']"); if(cashOutflowFromInvestingActivitiesFormerSettle && cashOutflowFromInvestingActivities){ - cashOutflowFromInvestingActivitiesSettle.val((parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities)).toFixed(2)); + cashOutflowFromInvestingActivitiesSettle.val(f2(parseFloat(cashOutflowFromInvestingActivitiesFormerSettle)+parseFloat(cashOutflowFromInvestingActivities))); }else { cashOutflowFromInvestingActivitiesSettle.val(""); } @@ -814,7 +814,7 @@ function calNetCashFromInvestingActivitiesSettle() { var netCashFromInvestingActivitiesSettle = $("input[name='netCashFromInvestingActivitiesSettle']"); if(netCashFromInvestingActivitiesFormerSettle && netCashFromInvestingActivities){ - netCashFromInvestingActivitiesSettle.val((parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities)).toFixed(2)); + netCashFromInvestingActivitiesSettle.val(f2(parseFloat(netCashFromInvestingActivitiesFormerSettle)+parseFloat(netCashFromInvestingActivities))); }else { netCashFromInvestingActivitiesSettle.val(""); } @@ -830,7 +830,7 @@ function calFinancingCapitalInflowSettle() { var financingCapitalInflowSettle = $("input[name='financingCapitalInflowSettle']"); if(financingCapitalInflowFormerSettle && financingCapitalInflow){ - financingCapitalInflowSettle.val((parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow)).toFixed(2)); + financingCapitalInflowSettle.val(f2(parseFloat(financingCapitalInflowFormerSettle)+parseFloat(financingCapitalInflow))); }else { financingCapitalInflowSettle.val(""); } @@ -846,7 +846,7 @@ function calFinancingCapitalOutflowSettle() { var financingCapitalOutflowSettle = $("input[name='financingCapitalOutflowSettle']"); if(financingCapitalOutflowFormerSettle && financingCapitalOutflow){ - financingCapitalOutflowSettle.val((parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow)).toFixed(2)); + financingCapitalOutflowSettle.val(f2(parseFloat(financingCapitalOutflowFormerSettle)+parseFloat(financingCapitalOutflow))); }else { financingCapitalOutflowSettle.val(""); } @@ -862,7 +862,7 @@ function calFinancingCapitalCashflowSettle() { var financingCapitalCashflowSettle = $("input[name='financingCapitalCashflowSettle']"); if(financingCapitalCashflowFormerSettle && financingCapitalCashflow){ - financingCapitalCashflowSettle.val((parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow)).toFixed(2)); + financingCapitalCashflowSettle.val(f2(parseFloat(financingCapitalCashflowFormerSettle)+parseFloat(financingCapitalCashflow))); }else { financingCapitalCashflowSettle.val(""); } @@ -878,7 +878,7 @@ function calNetIncreaseMonetaryFundsSettle() { var netIncreaseMonetaryFundsSettle = $("input[name='netIncreaseMonetaryFundsSettle']"); if(netIncreaseMonetaryFundsFormerSettle && netIncreaseMonetaryFunds){ - netIncreaseMonetaryFundsSettle.val((parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds)).toFixed(2)); + netIncreaseMonetaryFundsSettle.val(f2(parseFloat(netIncreaseMonetaryFundsFormerSettle)+parseFloat(netIncreaseMonetaryFunds))); }else { netIncreaseMonetaryFundsSettle.val(""); } @@ -899,8 +899,8 @@ function calNetCashFlow() { if(saleIncomeCash && taxReturn && earnestMoneyIncome && purchaseCost && taxCost && earnestMoneyCost) { - netCashFlow.val((parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)- - parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost)).toFixed(2)); + netCashFlow.val(f2(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)- + parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost))); }else { netCashFlow.val(""); } @@ -916,7 +916,7 @@ function calNetCashFromInvestingActivities() { var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']"); if(cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities){ - netCashFromInvestingActivities.val((parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities)).toFixed(2)); + netCashFromInvestingActivities.val(f2(parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities))); }else { netCashFromInvestingActivities.val(""); } @@ -932,7 +932,7 @@ function calFinancingCapitalCashflow() { var financingCapitalCashflow = $("input[name='financingCapitalCashflow']"); if(financingCapitalInflow && financingCapitalOutflow){ - financingCapitalCashflow.val((parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow)).toFixed(2)); + financingCapitalCashflow.val(f2(parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow))); }else { financingCapitalCashflow.val(""); } @@ -949,7 +949,7 @@ function calNetIncreaseMonetaryFunds() { var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']"); if(netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow){ - netIncreaseMonetaryFunds.val((parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow)).toFixed(2)); + netIncreaseMonetaryFunds.val(f2(parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow))); }else { netIncreaseMonetaryFunds.val(""); } From 026bdbad4c95b85ce75dd9f7b45ab2e2a6d96891 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 1 Dec 2021 11:35:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A6=82=E7=AE=97?= =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/project_estimate_add.ftl | 10 +++++----- .../templates/admin/project_estimate_edit.ftl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 96b2521..3cfbd2f 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -113,7 +113,7 @@
    *垫资利息
    @@ -122,7 +122,7 @@
    *垫资峰值
    @@ -131,7 +131,7 @@
    *合同金额
    @@ -149,7 +149,7 @@
    华智产品金额
    + name="huazhiProductAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="" />
@@ -157,7 +157,7 @@
紫光其他产品金额
+ name="ziguangOtherAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="" />
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 4b9b70a..1cd56ed 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -113,7 +113,7 @@
*垫资利息
@@ -122,7 +122,7 @@
*垫资峰值
@@ -131,7 +131,7 @@
*合同金额
@@ -149,7 +149,7 @@
<#--*-->华智产品金额
+ name="huazhiProductAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="${Utils.format(project.huazhiProductAmount)}" />
@@ -157,7 +157,7 @@
<#--*-->紫光其他产品金额
+ name="ziguangOtherAmount" placeholder="单位（元）" min="0.00" max="9999999999.99" step="0.01" value="${Utils.format(project.ziguangOtherAmount)}" />
From 2e9c77586dee7a9dde0515cdf920ef7a4dd81c09 Mon Sep 17 00:00:00 2001 From: pengqiang <1067496116@qq.com> Date: Wed, 1 Dec 2021 16:05:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=90=8E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8F=90=E7=A4=BA=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin/project_approve.ftl | 1 + src/main/resources/templates/common/header.ftl | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index a3eea6e..795eb95 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -1928,6 +1928,7 @@ type: 'post', async: false, success: function (data) { + $("#marqueeLi", parent.document).addClass("am-hide"); if (data.status == 0) { alert(data.msg); window.location.href = window.location.href; diff --git a/src/main/resources/templates/common/header.ftl b/src/main/resources/templates/common/header.ftl index 2b06f17..f6ee46d 100644 --- a/src/main/resources/templates/common/header.ftl +++ b/src/main/resources/templates/common/header.ftl @@ -22,7 +22,7 @@
  • - ${hasApproveProjectsMessage!""} + ${hasApproveProjectsMessage!""}
    • @@ -43,9 +43,4 @@ - + From 79b5dcab5fc18d7a9aaee2f56dd8c4db9ad776cd Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Wed, 1 Dec 2021 16:08:24 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/project_approve.ftl | 64 +++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 795eb95..4adb2d6 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -1382,7 +1382,7 @@ <#list incomeDetails as incomeDetail> - + --> + <#if incomeDetail.type ==1 > + 设备类 + <#elseif incomeDetail.type ==2> + 工程类 + <#elseif incomeDetail.type ==3> + 服务类 + - + --> + <#if costDetail.type ==1 > + 设备 + <#elseif costDetail.type ==2> + 施工 + <#elseif costDetail.type ==3> + 服务 + <#elseif costDetail.type ==4> + 其他 + - + --> + <#if costDetail.category ==1 > + 华智产品 + <#elseif costDetail.category ==2> + 紫光其他产品 + <#elseif costDetail.category ==3> + 外购产品 + <#elseif costDetail.category ==4> + 外购工程 + <#elseif costDetail.category ==5> + 华智服务 + <#elseif costDetail.category ==6> + 紫光其他服务 + <#elseif costDetail.category ==7> + 外购服务 + <#elseif costDetail.category ==8> + 其他 + - + --> + <#if costProjectManageDetail.type ==1 > + 人工成本 + <#elseif costProjectManageDetail.type ==2> + 业务费用 + <#elseif costProjectManageDetail.type ==3> + 其他费用 + 操作--> - + <#---->${projectBudgetPlanDetailTotal.month} <#list projectBudgetPlanDetails as projectBudgetPlanDetail> - <#-- + value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}