From 5057ce6b40a9acd1abbcc64dc720faa6e2daf3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Wed, 30 Oct 2024 11:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=98=8E=E7=BB=86=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E8=81=94=E5=8A=A8=EF=BC=8C=E6=94=B6=E5=85=A5=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=8B=E6=8B=89=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_cost.js   | 33 +++++----------
 .../templates/admin/project_budget_edit.ftl   | 41 +++++++++++++++++--
 2 files changed, 47 insertions(+), 27 deletions(-)

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("<option value='xxxx' disabled selected>--请选择--</option>");
-            SELECT_TYPE_CATEGORY_MAP_DATA[type].forEach(function (d) {
-                categorySelect.append("<option value='"+d.id+"'>"+d.name+"</option>");
-            });
+        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 @@
                                                         </select>
                                                     </td>
                                                     <td>
-                                                        <select  <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>style="display:none"</#if> class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate-income-select">
-                                                            <option value="华智产品" <#if incomeDetail.name ="华智产品" >selected</#if>>华智产品</option>
-                                                            <option value="华三产品" <#if incomeDetail.name ="华三产品">selected</#if>>华三产品</option>
-                                                            <option value="汇智产品" <#if incomeDetail.name ="汇智产品">selected</#if>>汇智产品</option>
+                                                        <select <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>style="display:none"</#if>
+                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate-income-select">
+                                                            <option value="华智产品"
+                                                                    <#if incomeDetail.name ="华智产品" >selected</#if>>
+                                                                华智产品
+                                                            </option>
+                                                            <option value="华三产品"
+                                                                    <#if incomeDetail.name ="华三产品">selected</#if>>
+                                                                华三产品
+                                                            </option>
+                                                            <option value="汇智产品"
+                                                                    <#if incomeDetail.name ="汇智产品">selected</#if>>
+                                                                汇智产品
+                                                            </option>
                                                             <option value="自定义">自定义</option>
                                                         </select>
                                                         <input <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>type="text"
                                                                <#else>type="hidden"</#if>
                                                                class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate-income-name"
                                                                value="${incomeDetail.name!}">
+                                                    </td>
                                                     <td><input type="text" maxlength="5"
                                                                class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate input-changeable-tax-rate-income"
                                                                value="${Utils.format(incomeDetail.taxRate,'0')}"
@@ -1122,6 +1133,28 @@
                                                             </option>
                                                         </select>
                                                     </td>
+                                                    <td>
+                                                        <select <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>style="display:none"</#if>
+                                                                class="am-modal-prompt-input am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category input-changeable-tax-rate-cost-select">
+                                                            <option value="华智产品"
+                                                                    <#if incomeDetail.name ="华智产品" >selected</#if>>
+                                                                华智产品
+                                                            </option>
+                                                            <option value="华三产品"
+                                                                    <#if incomeDetail.name ="华三产品">selected</#if>>
+                                                                华三产品
+                                                            </option>
+                                                            <option value="汇智产品"
+                                                                    <#if incomeDetail.name ="汇智产品">selected</#if>>
+                                                                汇智产品
+                                                            </option>
+                                                            <option value="自定义">自定义</option>
+                                                        </select>
+                                                        <input <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>type="text"
+                                                               <#else>type="hidden"</#if>
+                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
+                                                               value="${incomeDetail.name!}">
+                                                    </td>
                                                     <td width="150px">
                                                         <select style="float: left;"
                                                                 class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">