|
@@ -64,7 +64,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td class="title">报销金额:</td>
|
|
|
- <td class="concat">${totalMoney!}</td>
|
|
|
+ <td class="concat">${totalMoney?string(',###.00')}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td class="title">是否有借款:</td>
|
|
@@ -84,12 +84,12 @@
|
|
|
<tr style="border-top: 0;">
|
|
|
<td style="border-top: 0;" rowspan="${circulationUsers?size}" class="title">审批意见:</td>
|
|
|
<td class="title" style="width: 110px;border-top: 0;">${circulationUser.state!}:</td>
|
|
|
- <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId!}</span></td>
|
|
|
+ <td style="border-top: 0;" class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId?c}</span></td>
|
|
|
</tr>
|
|
|
<#else>
|
|
|
<tr>
|
|
|
<td class="title" style="width: 110px;">${circulationUser.state!}:</td>
|
|
|
- <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId!}</span></td>
|
|
|
+ <td class="concat">${circulationUser.remarks!}<span style="color: #ffffff;">${circulationUser.userId?c}</span></td>
|
|
|
</tr>
|
|
|
</#if>
|
|
|
</#list>
|
|
@@ -99,7 +99,7 @@
|
|
|
<td rowspan="${executors?size}" class="title">执行:</td>
|
|
|
</#if>
|
|
|
<td class="title" style="width: 110px;">${executor.state!}:</td>
|
|
|
- <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.userId!}</span></td>
|
|
|
+ <td class="concat">${executor.remarks!}<span style="color: #ffffff;">${executor.userId?c}</span></td>
|
|
|
</tr>
|
|
|
</#list>
|
|
|
</table>
|