处理冲突
parent
3e5eaa103a
commit
228e60f73a
|
@ -248,14 +248,14 @@
|
|||
<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-6 am-u-md-6">
|
||||
<span>${Utils.format(project.huazhiProductAmount)}</span>元
|
||||
<span>${Utils.format(project.huazhiProductAmount, "0.00")}</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">其他产品金额</div>
|
||||
<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 class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
|
@ -176,7 +176,7 @@
|
|||
<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)}" />
|
||||
value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
@ -185,7 +185,7 @@
|
|||
<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)}" />
|
||||
value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
|
||||
</div>
|
||||
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
|
@ -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-6 am-u-md-6">
|
||||
<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 class="am-u-sm-2 am-u-md-4 input-msg"></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-6 am-u-md-6">
|
||||
<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 class="am-u-sm-2 am-u-md-4 input-msg"></div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue