From 28d02ec5a82b47965b3b2965d9e74a0eb23a53af Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Thu, 9 Dec 2021 13:11:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E6=9C=80?= =?UTF-8?q?=E5=A4=A7?= 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 | 48 ++++++++--------- .../templates/admin/project_estimate_edit.ftl | 52 +++++++++---------- 7 files changed, 81 insertions(+), 81 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 99a206b..a5aff3c 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -127,9 +127,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 ab54a3b..d10f0c4 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 @@ -39,8 +39,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 7f877fa..a32473c 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -89,9 +89,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 0e67658..f022c86 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -106,13 +106,13 @@ function verifyBudgetPlan(){ 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 22764d8..6055c7a 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -290,8 +290,8 @@ 成本 其他 其他 - - + + 合计 @@ -319,7 +319,7 @@ 公司管理费用 - + @@ -449,9 +449,9 @@ - - - + + + @@ -517,9 +517,9 @@ - - - + + + @@ -586,8 +586,8 @@ readonly> - - + + @@ -669,13 +669,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 fa3a8b8..11bd3a4 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -113,7 +113,7 @@
*垫资利息
@@ -122,7 +122,7 @@
*垫资峰值
@@ -131,7 +131,7 @@
*合同金额
@@ -149,7 +149,7 @@
华智产品金额
+ name="huazhiProductAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" value="" />
@@ -157,7 +157,7 @@
紫光其他产品金额
+ name="ziguangOtherAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" value="" />
@@ -188,20 +188,20 @@ 收入 设备类 - - + + 收入 工程类 - - + + 收入 服务类 - - + + 合计 @@ -225,43 +225,43 @@ 成本 采购成本 设备 - - + + 成本 采购成本 施工 - - + + 成本 采购成本 服务 - - + + 成本 采购成本 其他 - - + + 成本 项目管理成本 项目管理成本 - + 成本 其他 其他 - - + + 合计 @@ -283,12 +283,12 @@ 财务费用 资金占用成本 - + 公司管理费用 - + diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 5f2a2ab..ce7a91c 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -120,7 +120,7 @@
*垫资利息
@@ -129,7 +129,7 @@
*垫资峰值
@@ -138,7 +138,7 @@
*合同金额
@@ -156,7 +156,7 @@
<#--*-->华智产品金额
+ name="huazhiProductAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" value="${Utils.format(project.huazhiProductAmount)}" />
@@ -164,7 +164,7 @@
<#--*-->紫光其他产品金额
+ name="ziguangOtherAmount" placeholder="单位(元)" min="0.00" max="9999999999.99" step="0.01" maxlength="13" value="${Utils.format(project.ziguangOtherAmount)}" />
@@ -195,26 +195,26 @@ 收入 设备类 - - + + 收入 工程类 - - + + 收入 服务类 - - + + 合计 - - + + @@ -232,43 +232,43 @@ 成本 采购成本 设备 - - + + 成本 采购成本 施工 - - + + 成本 采购成本 服务 - - + + 成本 采购成本 其他 - - + + 成本 项目管理成本 项目管理成本 - + 成本 其他 其他 - - + + 合计 @@ -290,12 +290,12 @@ 财务费用 资金占用成本 - + 公司管理费用 - +