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

新增概算信息校验优化

master
hanbo 2022-01-18 17:47:02 +08:00
parent b789ff0465
commit 422b067676
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/resources/static/assets/js/project_estimate.js
View File

@ -141,13 +141,12 @@ function calIncomeAndCost() {
var $incomeDeviceTaxExclude = $("input[name='incomeDeviceTaxExclude']");
if(val == "自定义"){
$("input[name='incomeDeviceTaxExclude']").attr('readonly',false);
$incomeDeviceTaxExclude.val("");
$("input[name='incomeDeviceTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='incomeDeviceTaxExclude']").attr('readonly',true);
$incomeDeviceTaxExclude.val("");
} else {
$("input[name='incomeDeviceTaxExclude']").attr('readonly',true);
$("input[name='incomeDeviceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var incomeDeviceTaxInclude = inputVal("incomeDeviceTaxInclude");
$incomeDeviceTaxExclude.val(f2Fixed(f2(incomeDeviceTaxInclude)/(1+Number(val))));
}
@ -176,12 +175,12 @@ function calIncomeAndCost() {
var $incomeEngineerTaxExclude = $("input[name='incomeEngineerTaxExclude']");
if(val == "自定义"){
$("input[name='incomeEngineerTaxExclude']").attr('readonly',false)
$("input[name='incomeEngineerTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='incomeEngineerTaxExclude']").attr('readonly',true);
$incomeEngineerTaxExclude.val("");
} else {
$("input[name='incomeEngineerTaxExclude']").attr('readonly',true);
$("input[name='incomeEngineerTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var incomeEngineerTaxInclude = inputVal("incomeEngineerTaxInclude");
$incomeEngineerTaxExclude.val(f2Fixed(f2(incomeEngineerTaxInclude)/(1+Number(val))));
}
@ -209,13 +208,13 @@ function calIncomeAndCost() {
let val = $('#incomeServiceSelect option:selected').val();
var $incomeServiceTaxExclude = $("input[name='incomeServiceTaxExclude']");
if(val == "自定义"){
$("input[name='incomeServiceTaxExclude']").attr('readonly',false)
$("input[name='incomeServiceTaxExclude']").attr('readonly',false);
$("input[name='incomeServiceTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='incomeServiceTaxExclude']").attr('readonly',true);
$incomeServiceTaxExclude.val("");
} else {
$("input[name='incomeServiceTaxExclude']").attr('readonly',true);
$("input[name='incomeServiceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var incomeServiceTaxInclude = inputVal("incomeServiceTaxInclude");
$incomeServiceTaxExclude.val(f2Fixed(f2(incomeServiceTaxInclude)/(1+Number(val))));
}
@ -244,12 +243,12 @@ function calIncomeAndCost() {
var $costPurchaseDeviceTaxExclude = $("input[name='costPurchaseDeviceTaxExclude']");
if(val == "自定义"){
$("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',false)
$("input[name='costPurchaseDeviceTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',true);
$costPurchaseDeviceTaxExclude.val("");
} else {
$("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',true);
$("input[name='costPurchaseDeviceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");
$costPurchaseDeviceTaxExclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude)/(1+Number(val))));
}
@ -278,12 +277,12 @@ function calIncomeAndCost() {
var $costPurchaseBuildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']");
if(val == "自定义"){
$("input[name='costPurchaseBuildTaxExclude']").attr('readonly',false)
$("input[name='costPurchaseBuildTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='costPurchaseBuildTaxExclude']").attr('readonly',true);
$costPurchaseBuildTaxExclude.val("");
} else {
$("input[name='costPurchaseBuildTaxExclude']").attr('readonly',true);
$("input[name='costPurchaseBuildTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude");
$costPurchaseBuildTaxExclude.val(f2Fixed(f2(costPurchaseBuildTaxInclude)/(1+Number(val))));
}
@ -312,12 +311,12 @@ function calIncomeAndCost() {
var $costPurchaseServiceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']");
if(val == "自定义"){
$("input[name='costPurchaseServiceTaxExclude']").attr('readonly',false)
$("input[name='costPurchaseServiceTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='costPurchaseServiceTaxExclude']").attr('readonly',true);
$costPurchaseServiceTaxExclude.val("");
} else {
$("input[name='costPurchaseServiceTaxExclude']").attr('readonly',true);
$("input[name='costPurchaseServiceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude");
$costPurchaseServiceTaxExclude.val(f2Fixed(f2(costPurchaseServiceTaxInclude)/(1+Number(val))));
}
@ -346,6 +345,7 @@ function calIncomeAndCost() {
var $costOtherOtherTaxExclude = $("input[name='costOtherOtherTaxExclude']");
if(val == "自定义"){
$("input[name='costOtherOtherTaxExclude']").attr('readonly',false)
$("input[name='costOtherOtherTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='costOtherOtherTaxExclude']").attr('readonly',true);
$costOtherOtherTaxExclude.val("");
@ -379,12 +379,12 @@ function calIncomeAndCost() {
var $costPurchaseOtherTaxExclude = $("input[name='costPurchaseOtherTaxExclude']");
if(val == "自定义"){
$("input[name='costPurchaseOtherTaxExclude']").attr('readonly',false)
$("input[name='costPurchaseOtherTaxExclude']").attr("required",true);
}else if(val == "请选择税率"){
$("input[name='costPurchaseOtherTaxExclude']").attr('readonly',true);
$costPurchaseOtherTaxExclude.val("");
} else {
$("input[name='costPurchaseOtherTaxExclude']").attr('readonly',true);
$("input[name='costPurchaseOtherTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude");
$costPurchaseOtherTaxExclude.val(f2Fixed(f2(costPurchaseOtherTaxInclude)/(1+Number(val))));
}

24
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -200,10 +200,9 @@
<td>收入</td>
<td>设备类</td>
<td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" readonly></td>
<td>
<select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -218,10 +217,9 @@
<td>收入</td>
<td>工程类</td>
<td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" readonly></td>
<td>
<select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -236,10 +234,9 @@
<td>收入</td>
<td>服务类</td>
<td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" readonly></td>
<td>
<select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -275,10 +272,9 @@
<td>采购成本</td>
<td>设备</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -294,10 +290,9 @@
<td>采购成本</td>
<td>施工</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -313,10 +308,9 @@
<td>采购成本</td>
<td>服务</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -332,10 +326,9 @@
<td>采购成本</td>
<td>其他</td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" readonly required></td>
<td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" readonly></td>
<td>
<select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>
@ -351,7 +344,7 @@
<td>项目管理成本</td>
<td>项目管理成本</td>
<td><input type="text" class="number" name="costProjectManageTaxInclude" readonly></td>
<td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" required required></td>
<td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" required></td>
<td>/</td>
</tr>
<tr>
@ -363,7 +356,6 @@
<td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" readonly></td>
<td>
<select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
<option value="请选择税率">请选择税率</option>
<option value="0">0%</option>
<option value="0.01">1%</option>
<option value="0.03">3%</option>