From fb064c0844f3f63d2e38f3658b0a4fc3f05cbd5a Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 7 Dec 2021 11:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E9=A1=B9=E7=9B=AE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_approve.ftl     | 2 +-
 src/main/resources/templates/admin/project_budget_edit.ftl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index f693cf9..02ef2c3 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1211,7 +1211,7 @@
                                 <tr>
                                     <td>项目净利润</td>
                                     <td>/</td>
-                                    <td><input name="netMarginBudgetTotal" type="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额"></td>
+                                    <td><#--<input name="netMarginBudgetTotal" type="number" value="${Utils.format(finalBean.netMarginBudgetTotal,'0')}" readonly required title="项目净利润预算总额">-->/</td>
                                     <td><input name="netMarginSettleTotal" type="number" value="${Utils.format(currentBean.netProfit,'0')}" readonly required title="项目净利润结算总额"></td>
                                     <td><input name="netMarginFinalTotal" type="number" value="${Utils.format(finalBean.netMarginFinalTotal,'0')}" required readonly title="项目净利润决算总额"></td>
                                     <td><input name="netMarginProfitMargin" type="number" value="${Utils.format(finalBean.netMarginProfitMargin,'0')}" required readonly title="项目净利润利润率"></td>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 354e242..83ce3e6 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -60,7 +60,7 @@
                             <i class="am-icon-calendar"></i>
                             <input type="text" class="am-form-field am-input-sm" id="startDate"
                                    name="startDate" autocomplete="off"
-                                   value="${project.startDate?string("yyyy-MM")}" placeholder="项目计划开始时间"
+                                   value="${project.startDate?string("yyyy-MM-dd")}" placeholder="项目计划开始时间"
                                    data-am-datepicker>
                         </div>
                     </div>
@@ -73,7 +73,7 @@
                             <i class="am-icon-calendar"></i>
                             <input type="text" class="am-form-field am-input-sm" id="endDate"
                                    name="endDate" autocomplete="off"
-                                   value="${project.endDate?string("yyyy-MM")}" placeholder="项目计划结束时间"
+                                   value="${project.endDate?string("yyyy-MM-dd")}" placeholder="项目计划结束时间"
                                    data-am-datepicker>
                         </div>
                     </div>