保留两位小数
xxssyyyyssxx
parent
2afa992665
commit
a535e863c4
|
|
@ -36,16 +36,16 @@ function updateIncomeData(incomeDetails) {
|
|||
incomeDetails.forEach(function (t, number, ts) {
|
||||
if(t["type"] == "1"){
|
||||
//设备类
|
||||
deviceTaxInclude += parseFloat(t["totalTaxInclude"]);
|
||||
deviceTaxExclude += parseFloat(t["totalTaxExclude"]);
|
||||
deviceTaxInclude += f2(t["totalTaxInclude"]);
|
||||
deviceTaxExclude += f2(t["totalTaxExclude"]);
|
||||
}else if(t["type"] == "2"){
|
||||
//工程类
|
||||
engineerTaxInclude += parseFloat(t["totalTaxInclude"]);
|
||||
engineerTaxExclude += parseFloat(t["totalTaxExclude"]);
|
||||
engineerTaxInclude += f2(t["totalTaxInclude"]);
|
||||
engineerTaxExclude += f2(t["totalTaxExclude"]);
|
||||
}else if(t["type"] == "3"){
|
||||
//服务类
|
||||
serviceTaxInclude += parseFloat(t["totalTaxInclude"]);
|
||||
serviceTaxExclude += parseFloat(t["totalTaxExclude"]);
|
||||
serviceTaxInclude += f2(t["totalTaxInclude"]);
|
||||
serviceTaxExclude += f2(t["totalTaxExclude"]);
|
||||
}
|
||||
});
|
||||
$("input[name='incomeDeviceTaxInclude']").val(deviceTaxInclude);
|
||||
|
|
@ -76,9 +76,9 @@ function appendTrIncome() {
|
|||
' </td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income"></td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
|
||||
' <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount"></td>\n' +
|
||||
' <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price"></td>\n' +
|
||||
' <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" readonly></td>\n' +
|
||||
' <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" readonly></td>\n' +
|
||||
' <td><button type="button" class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>\n' +
|
||||
|
|
|
|||
|
|
@ -1,3 +1,20 @@
|
|||
/**
|
||||
* parse float保留两位小数，四舍五入
|
||||
* @param x
|
||||
* @returns {*}
|
||||
*/
|
||||
function f2(x) {
|
||||
if(!x){
|
||||
return NaN;
|
||||
}
|
||||
var f = parseFloat(x);
|
||||
if (isNaN(f)) {
|
||||
return x;
|
||||
}
|
||||
return Math.round(x*100)/100;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 一维数组变二维数组
|
||||
* @param list
|
||||
|
|
@ -107,34 +124,34 @@ function saveDetail(url, data, callback) {
|
|||
function bindChangeableInput() {
|
||||
//数量改变
|
||||
$(".input-changeable-amount").change(function () {
|
||||
var amount = parseFloat($(this).val());
|
||||
var amount = parseInt($(this).val());
|
||||
//找到对应的单价和税率
|
||||
var price = parseFloat($(this).parent().parent().find(".input-changeable-price").val());
|
||||
var taxRate = parseFloat($(this).parent().parent().find(".input-changeable-tax-rate").val());
|
||||
var price = f2($(this).parent().parent().find(".input-changeable-price").val());
|
||||
var taxRate = f2($(this).parent().parent().find(".input-changeable-tax-rate").val());
|
||||
console.log(amount,price,taxRate);
|
||||
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-include").val(amount*price);
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-exclude").val(amount*price/(1+taxRate/100));
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-include").val(f2(amount*price));
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2(amount*price/(1+taxRate/100)));
|
||||
});
|
||||
//单价改变
|
||||
$(".input-changeable-price").change(function () {
|
||||
var price = parseFloat($(this).val());
|
||||
var price = f2($(this).val());
|
||||
//找到对应的数量和税率
|
||||
var amount = parseFloat($(this).parent().parent().find(".input-changeable-amount").val());
|
||||
var taxRate = parseFloat($(this).parent().parent().find(".input-changeable-tax-rate").val());
|
||||
var amount = parseInt($(this).parent().parent().find(".input-changeable-amount").val());
|
||||
var taxRate = f2($(this).parent().parent().find(".input-changeable-tax-rate").val());
|
||||
console.log(amount,price,taxRate);
|
||||
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-include").val(amount*price);
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-exclude").val(amount*price/(1+taxRate/100));
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-include").val(f2(amount*price));
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2(amount*price/(1+taxRate/100)));
|
||||
});
|
||||
//税率改变
|
||||
$(".input-changeable-tax-rate").change(function () {
|
||||
var taxRate = parseFloat($(this).val());
|
||||
var taxRate = f2($(this).val());
|
||||
//找到对应的数量和单价
|
||||
var amount = parseFloat($(this).parent().parent().find(".input-changeable-amount").val());
|
||||
var price = parseFloat($(this).parent().parent().find(".input-changeable-price").val());
|
||||
var amount = parseInt($(this).parent().parent().find(".input-changeable-amount").val());
|
||||
var price = f2($(this).parent().parent().find(".input-changeable-price").val());
|
||||
console.log(amount,price,taxRate);
|
||||
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-exclude").val(amount*price/(1+taxRate/100));
|
||||
$(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2(amount*price/(1+taxRate/100)));
|
||||
});
|
||||
}
|
||||
|
|
@ -441,9 +441,9 @@
|
|||
</td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.name!}"></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="${incomeDetail.unit!}"></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}"></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}"></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
|
||||
<td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-amount" value="${incomeDetail.amount!0}"></td>
|
||||
<td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-price" value="${Utils.format(incomeDetail.price,'0')}"></td>
|
||||
<td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}"></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" readonly></td>
|
||||
<td><button type="button" class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue