From 94d0ad9c13d64162f53821e2ab703bca871107c6 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Mon, 8 Nov 2021 09:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E5=B0=B1=E5=8F=AA=E5=85=81=E8=AE=B8=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_budget_cost.js | 6 +-- .../js/project_budget_cost_project_manage.js | 4 +- .../static/assets/js/project_budget_income.js | 6 +-- .../static/assets/js/project_budget_plan.js | 12 +++--- .../templates/admin/project_budget_edit.ftl | 34 +++++++-------- .../templates/admin/project_estimate_add.ftl | 36 ++++++++-------- .../templates/admin/project_estimate_edit.ftl | 42 +++++++++---------- 7 files changed, 70 insertions(+), 70 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 c3f7808..d49a7e5 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -48,9 +48,9 @@ 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 202c09d..8f8d1fe 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 @@ -38,8 +38,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 1d3ca8d..8da5aac 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -78,9 +78,9 @@ function appendTrIncome() { ' \n' + ' \n' + ' \n' + - ' \n' + - ' \n' + - ' \n' + + ' \n' + + ' \n' + + ' \n' + ' \n' + ' \n' + ' \n' + diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js index 8de3a31..e8c5865 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -33,13 +33,13 @@ $(function () { function appendTrBudgetPlan() { var template = '\n' + ' \n' + - ' \n' + - ' \n' + - ' \n' + - ' \n' + + ' \n' + + ' \n' + + ' \n' + + ' \n' + ' \n' + - ' \n' + - ' \n' + + ' \n' + + ' \n' + ' \n' + ' \n' + ' \n' + diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index cdd3b9b..c334402 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -282,8 +282,8 @@ 成本 其他 其他 - - + + 合计 @@ -311,7 +311,7 @@ 公司管理费用 - + @@ -441,9 +441,9 @@ - - - + + + @@ -506,9 +506,9 @@ - - - + + + @@ -560,8 +560,8 @@ readonly> - - + + @@ -627,13 +627,13 @@ <#list projectBudgetPlanDetails as projectBudgetPlanDetail> - - - - + + + + - - + + diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 8096fd5..1c261ef 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -190,20 +190,20 @@ 收入 设备类 - - + + 收入 工程类 - - + + 收入 服务类 - - + + 合计 @@ -227,43 +227,43 @@ 成本 采购成本 设备 - + 成本 采购成本 施工 - - + + 成本 采购成本 服务 - - + + 成本 采购成本 其他 - - + + 成本 项目管理成本 项目管理成本 <#---->/ - + 成本 其他 其他 - - + + 合计 @@ -285,12 +285,12 @@ 财务费用 资金占用成本 - + 公司管理费用 - + diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index a0e3a0b..2219834 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -190,26 +190,26 @@ 收入 设备类 - - + + 收入 工程类 - - + + 收入 服务类 - - + + 合计 - - + + @@ -227,43 +227,43 @@ 成本 采购成本 设备 - - + + 成本 采购成本 施工 - - + + 成本 采购成本 服务 - - + + 成本 采购成本 其他 - - + + 成本 项目管理成本 项目管理成本 <#---->/ - + 成本 其他 其他 - - + + 合计 @@ -285,12 +285,12 @@ 财务费用 资金占用成本 - + 公司管理费用 - +