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

Merge remote-tracking branch 'origin/master'

master
pengqiang 2022-08-16 18:20:46 +08:00
parent 9fda644688 22fb09f755
commit 1d459464b9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,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));
$("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)));
$(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val());

2
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -376,7 +376,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
<textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划"
>${project.calculationCollection!}</textarea>