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 9414740..884c1df 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -126,7 +126,7 @@ 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 992503d..9447993 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,7 +39,7 @@ function appendTrCostProjectManage() {
' | \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 fdcc029..1b462e1 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -80,7 +80,7 @@ function appendTrIncome() {
' | \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 5b455e2..25b333d 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -93,13 +93,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 d91c222..2b06eea 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -283,8 +283,8 @@
成本 |
其他 |
其他 |
- |
- |
+ |
+ |
合计 |
@@ -312,7 +312,7 @@
公司管理费用 |
|
- |
+ |
@@ -443,7 +443,7 @@
|
|
|
- |
+ |
|
|
|
@@ -511,7 +511,7 @@
|
|
|
- |
+ |
|
|
|
@@ -565,7 +565,7 @@
|
|
|
- |
+ |
|
|
|
@@ -631,13 +631,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 cd7a453..924cb73 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -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 d59e3fc..74bc52e 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -188,26 +188,26 @@
收入 |
设备类 |
- |
- |
+ |
+ |
收入 |
工程类 |
- |
- |
+ |
+ |
收入 |
服务类 |
- |
- |
+ |
+ |
合计 |
|
- |
- |
+ |
+ |
@@ -225,43 +225,43 @@
成本 |
采购成本 |
设备 |
- |
- |
+ |
+ |
成本 |
采购成本 |
施工 |
- |
- |
+ |
+ |
成本 |
采购成本 |
服务 |
- |
- |
+ |
+ |
成本 |
采购成本 |
其他 |
- |
- |
+ |
+ |
成本 |
项目管理成本 |
项目管理成本 |
|
- |
+ |
成本 |
其他 |
其他 |
- |
- |
+ |
+ |
合计 |
@@ -283,12 +283,12 @@
财务费用 |
资金占用成本 |
- |
+ |
公司管理费用 |
|
- |
+ |