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 b21e529..e07d0f7 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -445,31 +445,17 @@ function bindOtherOtherChangeable() { */ function bindTypeSelectChange() { //大类变化联动类别 - $(".am-modal-prompt-input-cost-type").on('change',function () { - var categorySelect = $(this).parent().parent().find(".am-modal-prompt-input-cost-category"); + $(".input-changeable-tax-rate-income-select").on('change',function () { + var nameSelect = $(this).parent().parent().find(".input-changeable-tax-rate-cost-select"); + var nameInput = $(this).parent().parent().find(".input-changeable-tax-rate-cost-name"); var type = $(this).val(); - //删除后重新添加对应的类别 - categorySelect.empty(); - - //console.log(SELECT_TYPE_CATEGORY_MAP_DATA); - - if(SELECT_TYPE_CATEGORY_MAP_DATA[type]){ - categorySelect.append(""); - SELECT_TYPE_CATEGORY_MAP_DATA[type].forEach(function (d) { - categorySelect.append(""); - }); + if(type == '自定义') { + nameSelect.attr("style", "display:none"); + nameInput.attr("type", "text"); + } else{ + nameSelect.attr("style", "display:block"); + nameInput.attr("type", "hidden"); } - - }); - //类别变化联动大类 - $(".am-modal-prompt-input-cost-category").on('change',function () { - var typeSelect = $(this).parent().parent().find(".am-modal-prompt-input-cost-type"); - var category = $(this).val(); - //设置他选中类别对应的大类 - - //console.log(SELECT_CATEGORY_TYPE_MAP_DATA); - - typeSelect.val(SELECT_CATEGORY_TYPE_MAP_DATA[category]); }); } /** @@ -508,3 +494,4 @@ function initTypeCategory(params, data) { // console.log(SELECT_TYPE_CATEGORY_DATA); // console.log(SELECT_CATEGORY_TYPE_MAP_DATA); } + diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 6ce900e..1595184 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -917,16 +917,27 @@