diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index b5bdf15..50a0109 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -53,6 +53,17 @@ BUDGET_PLAN_DETAIL={ }; $(function () { + $("input[name='costCompanyManageTaxExclude']").change(function () { + digitalSelf("costCompanyManageTaxExclude", "input[name='costCompanyManageTaxExclude']"); + }); + $("input[name='costOtherOtherTaxInclude']").change(function () { + console.log("budget.js:costOtherOtherTaxInclude"); + digitalSelf("costOtherOtherTaxInclude", "input[name='costOtherOtherTaxInclude']"); + }); + $("input[name='costOtherOtherTaxExclude']").change(function () { + console.log("budget.js:costOtherOtherTaxExclude"); + digitalSelf("costOtherOtherTaxExclude", "input[name='costOtherOtherTaxExclude']"); + }); //绑定删除按钮删除当前行 bindDeleteBtn(); //绑定收入和采购成本的输入框【都有税率】 @@ -341,7 +352,6 @@ function arr2ObjectVerifyCheck(line, arr, detailPropertyArr, detailProperty, s) function collectData(className) { var a = []; $("." + className).each(function (t) { - console.log("收集:" + className + "," + $(this).val()) a.push($(this).val()); }); return a; 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 c35890e..43bf09c 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -288,7 +288,7 @@ function bindOtherOtherChangeable() { calCostInclude(); updateProjectContributionProfitRate(); - + digitalSelf("costOtherOtherTaxInclude", "input[name='costOtherOtherTaxInclude']"); }); $("input[name='costOtherOtherTaxExclude']").change(function () { @@ -306,6 +306,7 @@ function bindOtherOtherChangeable() { calCostExclude(); updateProjectContributionProfitRate(); + digitalSelf("costOtherOtherTaxExclude", "input[name='costOtherOtherTaxExclude']"); }); } 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 cd10199..971558c 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 @@ -297,6 +297,7 @@ function updateCostProjectManageData(data,returnData) { calCostExclude(); calCostInclude(); + console.log("51"); updateProjectContributionProfitRate(); diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js index c61cd3c..fdd8dfb 100644 --- a/src/main/resources/static/assets/js/project_common.js +++ b/src/main/resources/static/assets/js/project_common.js @@ -179,7 +179,6 @@ function calCostInclude() { var costProjectManageTaxInclude = inputVal("costProjectManageTaxInclude"); var costOtherOtherTaxInclude = inputVal("costOtherOtherTaxInclude"); - var $costTotalTaxInclude = $("input[name='costTotalTaxInclude']"); $costTotalTaxInclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude) +f2(costPurchaseBuildTaxInclude) diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index c2e7729..b3f3dbe 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -876,305 +876,6 @@ - - <#--收入明细表弹窗--> - <#--
-
-
新增销售收入明细表——${project.name}×
-
- - - - - - - - - - - - - - - <#if incomeDetails??> - <#list incomeDetails as incomeDetail>+ - - - - - - - - - - - - - - - -
类别名称单位数量单价税率(%)含税总金额(元)不含税金额(元)操作
- -
- -
- -
-
--> - <#--采购成本明细弹窗--> - <#--
-
-
新增采购成本明细表——${project.name}×
-
- - - - - - - - - - - - - - - - <#if costDetails??> - <#list costDetails as costDetail> - - - - - - - - - - - - - - - - -
大类类别名称单位数量单价税率(%)含税总金额(元)不含税金额(元)操作
- - - -
- -
- -
-
--> - <#--项目管理明细表弹窗--> - <#--
-
-
新增项目管理成本明细表——${project.name}×
-
- - - - - - - - - - - - - - - - <#if costProjectManageDetails??> - <#list costProjectManageDetails as costProjectManageDetail> - - - - - - - - - - - - - - - - - -
财务费用类别业务项目项目明细单位数量单价总金额(元)预估计算方法预估依据备注操作
- - - -<#– readonly>–> - - -
- -
- -
-
--> - <#--资金计划明细表弹窗--> - <#--
-
-
新增资金计划明细表——${project.name}×
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <#if projectBudgetPlanDetails??> - <#list projectBudgetPlanDetails as projectBudgetPlanDetail> - - - - - - - - - - - - - - - - - - - - -
月份设备支出工程支出经营性开支保证金支出支出合计销售收款保证金收款收款合计资金余额资金利息垫资计划还款计划操作
- - - - - - - - - - - - - - - - - -
垫资峰值时间垫资峰值金额利率资金利息
- - -
- -
-
--> - - - - - - -