diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 50a0109..100f592 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -459,6 +459,8 @@ function bindChangeableInput() { $(this).parent().parent().find(".input-changeable-total-tax-include").val(f2Fixed(amount * price)); $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(amount * price / (1 + taxRate / 100))); + $(this).val(f2Fixed(price)); + console.log("单价:" + $(this).val()); }); //税率改变 $(".input-changeable-tax-rate").change(function () { diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js index 43bf09c..e41d91b 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -187,8 +187,8 @@ function appendTrCost() { ''+ ''+ ''+ - ''+ - ''+ + ''+ + ''+ ''+ ''+ ''+ diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js index 971558c..cba7f19 100644 --- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js +++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js @@ -118,8 +118,8 @@ function appendTrCostProjectManage() { ' \n' + ' \n' + ' \n' + - ' \n' + - ' \n' + + ' \n' + + ' \n' + ' \n' + ' \n' + ' \n' + 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 fb01c41..43b93a7 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -136,8 +136,8 @@ function appendTrIncome() { ' \n' + ' \n' + ' \n' + - ' \n' + - ' \n' + + ' \n' + + ' \n' + ' \n' + ' \n' + ' \n' + diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js index fdd8dfb..5161d73 100644 --- a/src/main/resources/static/assets/js/project_common.js +++ b/src/main/resources/static/assets/js/project_common.js @@ -70,8 +70,8 @@ function rate(r1,r2) { */ function bindNumberInput() { //所有的数字类型输入框 - var $numberTypeInputs = $("input[type='number']"); - inputKeepDigital($numberTypeInputs); + // var $numberTypeInputs = $("input[type='number']"); + // inputKeepDigital($numberTypeInputs); //所有的number类的输入框 var $numberClassInputs = $("input.number"); @@ -79,10 +79,10 @@ function bindNumberInput() { } function inputKeepDigital($inputs) { - //键盘键弹起的时候 - $inputs.keyup(function () { - keepDigital($(this)); - }); + //键盘键弹起的时候,会在每次输入一位数的时候就格式化,先行去除 + // $inputs.keyup(function () { + // keepDigital($(this)); + // }); //失去焦点时再校验一遍 $inputs.blur(function() { keepDigital($(this)); @@ -106,7 +106,7 @@ function keepDigitalVal(value) { value = parseFloat(value); } - return value; + return f2Fixed(f2(value)); } /** diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 7043e23..0d02769 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -391,7 +391,7 @@ - > + > @@ -458,7 +458,7 @@ - > + > @@ -526,7 +526,7 @@ - oninput="if(value.length>8)value=value.slice(0,8)"> + oninput="if(value.length>8)value=value.slice(0,8)">