From 8cb03c3c02a83219fdae0ff8f105cda3ae2e0901 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 17 Aug 2022 15:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 174 +++++++++---------
 1 file changed, 89 insertions(+), 85 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index be93b56..e1315d6 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -230,6 +230,78 @@
                                 </div>
                             </div>
 
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资利息"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.advanceInterestAmount)}元" />
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资峰值"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.advancePeakAmount)}元" />
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 12px;" value="合同金额"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.contractAmount)}元"/>
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="项目毛利"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.grossProfit)}元" />
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目毛利率"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.grossProfitMargin)}%" />
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="汇智产品金额"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.huizhiProductAmount, '0.00')}元"/>
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华智产品金额"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.huazhiProductAmount, '0.00')}元"/>
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华三产品金额"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.huasanProductAmount, '0.00')}元"/>
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="其他产品金额"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <input readonly value="${Utils.format(project.ziguangOtherAmount, '0.00')}元"/>
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目把握度"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
@@ -254,6 +326,23 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
 
+                            <div class="am-g am-form-group am-margin-top">
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="项目解决方案"/></div>
+                                <div class="am-u-sm-6 am-u-md-6">
+                                    <span>
+                                    <#if (project.resolvePlan!) =1>
+                                        <input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/>
+                                    <#elseif (project.resolvePlan!) =2>
+                                        <input readonly value="泛行业(智慧园区、智慧医疗、智慧工地等)"/>
+                                    <#elseif (project.resolvePlan!) =3>
+                                        <input readonly value="其他生态"/>
+                                    </#if>
+                                    </span>
+                                </div>
+                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+                            </div>
+
+
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 6px;" value="客户名称"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">
@@ -287,61 +376,7 @@
                             <#--                                </div>-->
                             <#--                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
                             <#--                            </div>-->
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 12px;" value="合同金额"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.contractAmount)}元"/>
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
 
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="项目毛利"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.grossProfit)}元" />
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目毛利率"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.grossProfitMargin)}%" />
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华智产品金额"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.huazhiProductAmount, '0.00')}元"/>
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="汇智产品金额"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.huizhiProductAmount, '0.00')}元"/>
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华三产品金额"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.huasanProductAmount, '0.00')}元"/>
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="其他产品金额"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.ziguangOtherAmount, '0.00')}元"/>
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
 
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;" value="主合同收款条款"/></div>
@@ -418,37 +453,6 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
 
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="项目解决方案"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <span>
-                                    <#if (project.resolvePlan!) =1>
-                                        <input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/>
-                                    <#elseif (project.resolvePlan!) =2>
-                                        <input readonly value="泛行业(智慧园区、智慧医疗、智慧工地等)"/>
-                                    <#elseif (project.resolvePlan!) =3>
-                                        <input readonly value="其他生态"/>
-                                    </#if>
-                                    </span>
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资利息"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.advanceInterestAmount)}元" />
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-                            <div class="am-g am-form-group am-margin-top">
-                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资峰值"/></div>
-                                <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.advancePeakAmount)}元" />
-                                </div>
-                                <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                            </div>
-
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;" value="主合同收款条款"/></div>
                                 <div class="am-u-sm-6 am-u-md-6">