mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加提示语

master
OathK1per 2022-08-19 16:49:06 +08:00
parent 24d7a8a8a2
commit 1117c89904
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/palmte/work/service/MonthlySettleService.java
View File

@ -47,6 +47,9 @@ public class MonthlySettleService {
public ResponseMsg check(Collection<Map> excelMap, String date) { public ResponseMsg check(Collection<Map> excelMap, String date) {
int successCount = 0; int successCount = 0;
int errorCount = 0; int errorCount = 0;
if (date == null) {
return ResponseMsg.buildFailedMsg("请选择导入时间!");
}
List<String> errorList = new ArrayList<>(); List<String> errorList = new ArrayList<>();
List<MonthlySettle> monthlySettleList = new ArrayList<>(); List<MonthlySettle> monthlySettleList = new ArrayList<>();
Set<String> projectNameSet = new HashSet<>(); Set<String> projectNameSet = new HashSet<>();

1
src/main/resources/static/assets/js/project_budget.js
View File

@ -912,6 +912,7 @@ function updateIncomeDataUnsubmit(incomeDetails) {
$("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)); $("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude));
$("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)); $("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude));
$("input[name='incomeTotalTax']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude-(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))); $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)));

1
src/main/resources/static/assets/js/project_budget_income.js
View File

@ -127,6 +127,7 @@ function updateIncomeData(data,returnData) {
$("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)); $("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude));
$("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude)); $("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude));
$("input[name='incomeTotalTax']").val(f2Fixed(deviceTax+engineerTax+serviceTax)); $("input[name='incomeTotalTax']").val(f2Fixed(deviceTax+engineerTax+serviceTax));
console.log("costCompanyManageTaxExclude2: " + deviceTaxExclude + ", " + engineerTaxExclude + ", " + serviceTaxExclude);
$("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxExclude+deviceTaxExclude+deviceTaxExclude))); $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxExclude+deviceTaxExclude+deviceTaxExclude)));