From afd789393fb163d47bfc9790c6effdb5420dcd75 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Mon, 15 Aug 2022 16:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=AE=97=E9=A2=84=E7=AE=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_budget_edit.ftl   | 282 +++++++++---------
 1 file changed, 141 insertions(+), 141 deletions(-)

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 699e052..bf7e2cd 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -44,7 +44,7 @@
     <div class="am-tabs am-margin" data-am-tabs>
         <ul class="am-tabs-nav am-nav am-nav-tabs">
             <li class="am-active"><a href="#tab1">项目基本信息</a></li>
-            <li><a href="#tab2">项目其他信息</a></li>
+<#--            <li><a href="#tab2">项目其他信息</a></li>-->
             <li><a href="#tab3">收入明细表</a></li>
             <li><a href="#tab4">采购成本明细表</a></li>
             <li><a href="#tab5">项目管理成本表</a></li>
@@ -239,41 +239,41 @@
                 </div>
 
                 <div class="am-g am-form-group am-margin-top">
-                    <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
+                    <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="华智产品金额"
                                name="huazhiProductAmount" placeholder="单位（元）" maxlength="20"
-                               value="${Utils.format(project.huazhiProductAmount, "0.00")}"  />
+                               value="${Utils.format(project.huazhiProductAmount, "0.00")}" required />
                     </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">汇智产品金额</div>
+                    <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>汇智产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="请输入汇智产品金额"
                                name="huizhiProductAmount" placeholder="单位（元）" maxlength="20"
-                               value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
+                               value="${Utils.format(project.huizhiProductAmount, "0.00")}" required />
                     </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">华三产品金额</div>
+                    <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华三产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="华三产品金额"
                                name="huasanProductAmount" placeholder="单位（元）" maxlength="20"
-                               value="${Utils.format(project.huasanProductAmount, "0.00")}"  />
+                               value="${Utils.format(project.huasanProductAmount, "0.00")}" required />
                     </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">其他产品金额</div>
+                    <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>其他产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
                                name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20"
-                               value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
+                               value="${Utils.format(project.ziguangOtherAmount, "0.00")}" required />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -293,147 +293,147 @@
             <!--验证表单元素（validate end-->
         </div>
 
-        <div class="am-tabs-bd">
-            <div class="am-tab-panel am-fade am-in" id="tab2">
+<#--        <div class="am-tabs-bd">-->
+<#--            <div class="am-tab-panel am-fade am-in" id="tab2">-->
 
-                <div class="am-g am-form-group am-margin-top">
-                    <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目负责人</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                        <input type="text" id="principal" class="am-input" data-validate-async data-validation-message="请输入项目负责人"
-                               name="principal" placeholder="请输入项目负责人" maxlength="20"
-                               value="${project.principal!}" required />
-                    </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"><span style="color: red;">*</span>项目负责人</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                        <input type="text" id="principal" class="am-input" data-validate-async data-validation-message="请输入项目负责人"-->
+<#--                               name="principal" placeholder="请输入项目负责人" maxlength="20"-->
+<#--                               value="${project.principal!}" required />-->
+<#--                    </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"><span style="color: red;">*</span>预计合同签订时间</div>
-                    <div class="am-u-sm-2 am-u-md-2">
-                        <div class="am-form-group am-form-icon">
-                            <i class="am-icon-calendar"></i>
-                            <input type="text" class="am-form-field am-input-sm" id="contractTime"
-                                   name="contractTime" autocomplete="off"
-                                   value="${(project.contractTime?string("yyyy-MM-dd"))!}" placeholder="预计合同签订时间"
-                                   data-am-datepicker required>
-                        </div>
-                    </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"><span style="color: red;">*</span>项目计划招标时间</div>
-                    <div class="am-u-sm-2 am-u-md-2">
-                        <div class="am-form-group am-form-icon">
-                            <i class="am-icon-calendar"></i>
-                            <input type="text" class="am-form-field am-input-sm" id="bidsTime"
-                                   name="bidsTime" autocomplete="off"
-                                   value="${(project.bidsTime?string("yyyy-MM-dd"))!}" placeholder="项目计划招标时间"
-                                   data-am-datepicker required>
-                        </div>
-                    </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"><span style="color: red;">*</span>预计合同签订时间</div>-->
+<#--                    <div class="am-u-sm-2 am-u-md-2">-->
+<#--                        <div class="am-form-group am-form-icon">-->
+<#--                            <i class="am-icon-calendar"></i>-->
+<#--                            <input type="text" class="am-form-field am-input-sm" id="contractTime"-->
+<#--                                   name="contractTime" autocomplete="off"-->
+<#--                                   value="${(project.contractTime?string("yyyy-MM-dd"))!}" placeholder="预计合同签订时间"-->
+<#--                                   data-am-datepicker required>-->
+<#--                        </div>-->
+<#--                    </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"><span style="color: red;">*</span>项目计划招标时间</div>-->
+<#--                    <div class="am-u-sm-2 am-u-md-2">-->
+<#--                        <div class="am-form-group am-form-icon">-->
+<#--                            <i class="am-icon-calendar"></i>-->
+<#--                            <input type="text" class="am-form-field am-input-sm" id="bidsTime"-->
+<#--                                   name="bidsTime" autocomplete="off"-->
+<#--                                   value="${(project.bidsTime?string("yyyy-MM-dd"))!}" placeholder="项目计划招标时间"-->
+<#--                                   data-am-datepicker required>-->
+<#--                        </div>-->
+<#--                    </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"><span style="color: red;">*</span>是否二次合作</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                        <select data-am-selected id="isSecond" name="isSecond">
-                            <#if project.isSecond??>
-                                <option value="1" <#if project.isSecond=1>selected</#if>>是</option>
-                                <option value="2" <#if project.isSecond=2>selected</#if>>否</option>
-                            <#else>
-                                <option value="1" >是</option>
-                                <option value="2" >否</option>
-                            </#if>
-                        </select>
-                    </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"><span style="color: red;">*</span>是否二次合作</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                        <select data-am-selected id="isSecond" name="isSecond">-->
+<#--                            <#if project.isSecond??>-->
+<#--                                <option value="1" <#if project.isSecond=1>selected</#if>>是</option>-->
+<#--                                <option value="2" <#if project.isSecond=2>selected</#if>>否</option>-->
+<#--                            <#else>-->
+<#--                                <option value="1" >是</option>-->
+<#--                                <option value="2" >否</option>-->
+<#--                            </#if>-->
+<#--                        </select>-->
+<#--                    </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"><span style="color: red;">*</span>签单方式</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                        <select data-am-selected id="signType" name="signType">
-                            <#if project.signType??>
-                                <option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>
-                            <#else>
-                                <option value="1" >紫光汇智直接投标</option>
-                            </#if>
-                        </select>
-                    </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"><span style="color: red;">*</span>签单方式</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                        <select data-am-selected id="signType" name="signType">-->
+<#--                            <#if project.signType??>-->
+<#--                                <option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>-->
+<#--                            <#else>-->
+<#--                                <option value="1" >紫光汇智直接投标</option>-->
+<#--                            </#if>-->
+<#--                        </select>-->
+<#--                    </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"><span style="color: red;">*</span>项目解决方案</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                        <select data-am-selected id="resolvePlan" name="resolvePlan">
-                            <#if project.resolvePlan??>
-                                <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
-                                <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
-                                <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>
-                            <#else>
-                                <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
-                                <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
-                                <option value="3" >其他生态</option>
-                            </#if>
-                        </select>
-                    </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"><span style="color: red;">*</span>项目解决方案</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                        <select data-am-selected id="resolvePlan" name="resolvePlan">-->
+<#--                            <#if project.resolvePlan??>-->
+<#--                                <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
+<#--                                <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
+<#--                                <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>-->
+<#--                            <#else>-->
+<#--                                <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
+<#--                                <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
+<#--                                <option value="3" >其他生态</option>-->
+<#--                            </#if>-->
+<#--                        </select>-->
+<#--                    </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"><span style="color: red;">*</span>垫资利息</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"
-                               name="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
-                               value="${Utils.format(project.advanceInterestAmount)}" required />
-                    </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"><span style="color: red;">*</span>垫资峰值</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                        <input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"
-                               name="advancePeakAmount" placeholder="单位（元）" maxlength="16"
-                               value="${Utils.format(project.advancePeakAmount)}" required />
-                    </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"><span style="color: red;">*</span>垫资利息</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                        <input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资利息"-->
+<#--                               name="advanceInterestAmount" placeholder="单位（元）" maxlength="16"-->
+<#--                               value="${Utils.format(project.advanceInterestAmount)}" required />-->
+<#--                    </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"><span style="color: red;">*</span>垫资峰值</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                        <input type="number" class="am-input" data-validate-async data-validation-message="请输入垫资峰值"-->
+<#--                               name="advancePeakAmount" placeholder="单位（元）" maxlength="16"-->
+<#--                               value="${Utils.format(project.advancePeakAmount)}" required />-->
+<#--                    </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"><span style="color: red;">*</span>主合同收款条款</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                                <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
-                                          class="am-input" data-validate-async data-validation-message="请输入收款条款"
-                                          placeholder="请输入收款条款" required
-                                >${project.mainContractCollectionTerms!}</textarea>
-                    </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"><span style="color: red;">*</span>主合同收款条款</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                                <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"-->
+<#--                                          class="am-input" data-validate-async data-validation-message="请输入收款条款"-->
+<#--                                          placeholder="请输入收款条款" required-->
+<#--                                >${project.mainContractCollectionTerms!}</textarea>-->
+<#--                    </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"><span style="color: red;">*</span>主合同具体解决方案</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                                <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
-                                          class="am-input" data-validate-async data-validation-message="请输入具体解决方案"
-                                          placeholder="请输入具体解决方案" required
-                                >${project.mainContractResolvePlan!}</textarea>
-                    </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"><span style="color: red;">*</span>主合同具体解决方案</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                                <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"-->
+<#--                                          class="am-input" data-validate-async data-validation-message="请输入具体解决方案"-->
+<#--                                          placeholder="请输入具体解决方案" required-->
+<#--                                >${project.mainContractResolvePlan!}</textarea>-->
+<#--                    </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"><span style="color: red;">*</span>计收计划</div>
-                    <div class="am-u-sm-6 am-u-md-6">
-                                <textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
-                                          class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
-                                          placeholder="按照开票金额及时间罗列计收计划" required
-                                >${project.CalculationCollection!}</textarea>
-                    </div>
-                    <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
-                </div>
-            </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"><span style="color: red;">*</span>计收计划</div>-->
+<#--                    <div class="am-u-sm-6 am-u-md-6">-->
+<#--                                <textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"-->
+<#--                                          class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"-->
+<#--                                          placeholder="按照开票金额及时间罗列计收计划" required-->
+<#--                                >${project.CalculationCollection!}</textarea>-->
+<#--                    </div>-->
+<#--                    <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
+<#--                </div>-->
+<#--            </div>-->
+<#--        </div>-->
 <#--                <span>收入</span>-->
 <#--                <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">-->
 <#--                    <tbody>-->