mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理冲突

master
OathK1per 2022-01-13 18:06:59 +08:00
parent 3e5eaa103a
commit 228e60f73a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/templates/admin/project_approve.ftl
View File

@ -248,14 +248,14 @@
<div class="am-g am-form-group am-margin-top"> <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">华智产品金额</div>
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">
<span>${Utils.format(project.huazhiProductAmount)}</span>元 <span>${Utils.format(project.huazhiProductAmount, "0.00")}</span>元
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>
<div class="am-g am-form-group am-margin-top"> <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">其他产品金额</div>
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">
<span>${Utils.format(project.ziguangOtherAmount)}</span>元 <span>${Utils.format(project.ziguangOtherAmount, "0.00")}</span>元
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>

4
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -176,7 +176,7 @@
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华智产品金额" <input type="text" class="number am-input" data-validation-message="华智产品金额"
name="huazhiProductAmount" placeholder="单位（元）" maxlength="20" name="huazhiProductAmount" placeholder="单位（元）" maxlength="20"
value="${Utils.format(project.huazhiProductAmount)}" /> value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>
@ -185,7 +185,7 @@
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入其他产品金额" <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20" name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20"
value="${Utils.format(project.ziguangOtherAmount)}" /> value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>

4
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -156,7 +156,7 @@
<div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->华智产品金额</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"> <div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="华智产品金额" <input type="text" class="number am-input" data-validation-message="华智产品金额"
name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount)}" /> name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>
@ -164,7 +164,7 @@
<div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->其他产品金额</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"> <div class="am-u-sm-6 am-u-md-6">
<input type="text" class="number am-input" data-validation-message="请输入其他产品金额" <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount)}" /> name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>