From a1cd220edb4dd6faa72de928bb78e3040dcb9597 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 5 Jan 2022 15:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=92=8C=E6=96=BD=E5=B7=A5?=
 =?UTF-8?q?=E4=BA=A4=E6=8D=A2=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_cost.js          | 12 ++++++------
 .../templates/admin/project_budget_edit.ftl          |  4 ++--
 2 files changed, 8 insertions(+), 8 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 9001a2f..27fb2f7 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -164,8 +164,8 @@ function appendTrCost() {
     var template = '<tr><td><select style="width: 82px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
         '<option value="xxxx" disabled selected>--请选择--</option>'+
         '<option value="1">设备</option>'+
-        '<option value="2">服务</option>'+
-        '<option value="3">施工</option>'+
+        '<option value="2">施工</option>'+
+        '<option value="3">服务</option>'+
         '<option value="4">其他</option>'+
         '</select>'+
         '</td>'+
@@ -224,13 +224,13 @@ function updateCostData(data, returnData) {
             deviceTaxInclude += f2(t["totalTaxInclude"]);
             deviceTaxExclude += f2(t["totalTaxExclude"]);
         }else if(t["type"] == "2"){
-            //服务类
-            serviceTaxInclude += f2(t["totalTaxInclude"]);
-            serviceTaxExclude += f2(t["totalTaxExclude"]);
-        }else if(t["type"] == "3"){
             //施工类
             buildTaxInclude += f2(t["totalTaxInclude"]);
             buildTaxExclude += f2(t["totalTaxExclude"]);
+        }else if(t["type"] == "3"){
+            //服务类
+            serviceTaxInclude += f2(t["totalTaxInclude"]);
+            serviceTaxExclude += f2(t["totalTaxExclude"]);
         }else if(t["type"] == "4"){
             //其他类
             otherTaxInclude += f2(t["totalTaxInclude"]);
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 47b52f7..8ca94ed 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -436,8 +436,8 @@
                                     <td>
                                         <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
                                             <option value="1" <#if costDetail.type == 1>selected</#if>>设备</option>
-                                            <option value="2" <#if costDetail.type == 2>selected</#if>>服务</option>
-                                            <option value="3" <#if costDetail.type == 3>selected</#if>>施工</option>
+                                            <option value="2" <#if costDetail.type == 2>selected</#if>>施工</option>
+                                            <option value="3" <#if costDetail.type == 3>selected</#if>>服务</option>
                                             <option value="4" <#if costDetail.type == 4>selected</#if>>其他</option>
                                         </select>
                                     </td>