Commit f8d91bf0 by zhangchen

增加删除历史及操作人、券到账时间

parent 80eb8969
......@@ -609,6 +609,7 @@ $(function() {
<th>使用状态</th>
<!--<th>使用时间</th>-->
<!--<th>订单号</th>-->
<th>到账时间</th>
<th>备注</th>
<th>描述</th>
<th style="width:95px;">操作</th>
......@@ -633,6 +634,7 @@ $(function() {
</td>
<!--<td>${(vourcher.useDate?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
<!--<td><a href="javascript:;" onclick="javascript:window.open('/order/detailByOrderNo?orderNo=${vourcher.orderNo!}');">${vourcher.orderNo!}</a></td>-->
<td>${(vourcher.createdTime?string("yyyy-MM-dd HH:mm:ss"))!}</td>
<td title="<#if vourcher.remark?? && vourcher.remark!="">${vourcher.remark!""}</#if>">
<#if vourcher.remark?? && vourcher.remark!="">${abbreviate(vourcher.remark!"",15, "...")}</#if>
</td>
......@@ -640,12 +642,12 @@ $(function() {
<#if vourcher.description?? && vourcher.description!="">${abbreviate(vourcher.description!"",20, "...")}</#if>
</td>
<td>
<form action="../deleteUserVoucher/${uid!}/${vourcher.id}" method="post">
<form action="../deleteUserVoucher/${uid!}/${vourcher.id}/${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" method="post">
<#if vourcher.ruleId??>
<button type="button" class="btn-warning view-voucher" data-ruleid="${vourcher.ruleId}">规则</button>
</#if>
<#if "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "fuhaoy" || "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "kyu"|| "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "bowu">
<#if "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "fuhaoy" || "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "kyu"|| "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "bowu" || "${Session['SPRING_SECURITY_CONTEXT'].authentication.name}" == "lsj">
<button type="button" class="btn-danger delete-voucher">删除</button>
</#if>
</form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment