From 1117c899041560b3c83d3ef006dff3b7e920dc65 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Fri, 19 Aug 2022 16:49:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/palmte/work/service/MonthlySettleService.java | 3 +++ src/main/resources/static/assets/js/project_budget.js | 1 + src/main/resources/static/assets/js/project_budget_income.js | 1 + 3 files changed, 5 insertions(+) diff --git a/src/main/java/cn/palmte/work/service/MonthlySettleService.java b/src/main/java/cn/palmte/work/service/MonthlySettleService.java index 0ecfa6f..22ed0b2 100644 --- a/src/main/java/cn/palmte/work/service/MonthlySettleService.java +++ b/src/main/java/cn/palmte/work/service/MonthlySettleService.java @@ -47,6 +47,9 @@ public class MonthlySettleService { public ResponseMsg check(Collection excelMap, String date) { int successCount = 0; int errorCount = 0; + if (date == null) { + return ResponseMsg.buildFailedMsg("请选择导入时间!"); + } List errorList = new ArrayList<>(); List monthlySettleList = new ArrayList<>(); Set projectNameSet = new HashSet<>(); diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index c19f244..71b5aae 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -912,6 +912,7 @@ function updateIncomeDataUnsubmit(incomeDetails) { $("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)); $("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)); $("input[name='incomeTotalTax']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude-(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude))); + console.log("costCompanyManageTaxExclude1: " + deviceTaxExclude + ", " + engineerTaxExclude + ", " + serviceTaxExclude); $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude))); 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 4a0c878..5c31d7e 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -127,6 +127,7 @@ function updateIncomeData(data,returnData) { $("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)); $("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)); $("input[name='incomeTotalTax']").val(f2Fixed(deviceTax+engineerTax+serviceTax)); + console.log("costCompanyManageTaxExclude2: " + deviceTaxExclude + ", " + engineerTaxExclude + ", " + serviceTaxExclude); $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxExclude+deviceTaxExclude+deviceTaxExclude)));