记得上下班打卡 | git大法好,push需谨慎

Commit 8a665abe authored by jiangxiulong's avatar jiangxiulong

refund add

parent 7eab0789
...@@ -48,6 +48,9 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -48,6 +48,9 @@ public class KylinOrderRefundAdminController extends BaseController {
@Autowired @Autowired
private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl; private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl;
@Autowired
IKylinOrderRefundsService kylinOrderRefundsService;
@RequiresPermissions("kylin:refund:view") @RequiresPermissions("kylin:refund:view")
@GetMapping() @GetMapping()
public String refund() { public String refund() {
...@@ -233,9 +236,6 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -233,9 +236,6 @@ public class KylinOrderRefundAdminController extends BaseController {
} }
} }
@Autowired
IKylinOrderRefundsService kylinOrderRefundsService;
// @RequiresPermissions("order:switch:search:code") // @RequiresPermissions("order:switch:search:code")
@ApiOperation(value = "根据截取订单号获取全量订单号") @ApiOperation(value = "根据截取订单号获取全量订单号")
@GetMapping("/search/code") @GetMapping("/search/code")
......
...@@ -98,20 +98,23 @@ ...@@ -98,20 +98,23 @@
<i class="fa fa-plus"></i> 提交申请 <i class="fa fa-plus"></i> 提交申请
</a> </a>
<a class="btn btn-success multiple disabled" onclick="review()" shiro:hasPermission="kylin:refund:review"> <a class="btn btn-success multiple disabled" onclick="review()" shiro:hasPermission="kylin:refund:review">
批量一审 运营审核
</a> </a>
<a class="btn btn-primary multiple disabled" onclick="execute()" shiro:hasPermission="kylin:refund:execute"> <a class="btn btn-primary multiple disabled" onclick="execute()" shiro:hasPermission="kylin:refund:execute">
批量二审 财务审核
</a>
<a class="btn btn-success multiple disabled" onclick="ticketAudit()" shiro:hasPermission="kylin:refund:ticketAudit">
票务审核
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消选中的退款申请吗?', 'refund/cancel')" <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消选中的退款申请吗?', 'refund/cancel')"
shiro:hasPermission="kylin:refund:cancel"> shiro:hasPermission="kylin:refund:cancel">
批量取消 批量取消
</a> </a>
<a class="btn btn-warning multiple disabled" <!--<a class="btn btn-warning multiple disabled"
onclick="$.operate.removeAll('确定重新提交选中的退款审核吗?', 'refund/reapply')" onclick="$.operate.removeAll('确定重新提交选中的退款审核吗?', 'refund/reapply')"
shiro:hasPermission="kylin:refund:reapply"> shiro:hasPermission="kylin:refund:reapply">
批量重新提交 批量重新提交
</a> </a>-->
</div> </div>
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
...@@ -144,6 +147,7 @@ ...@@ -144,6 +147,7 @@
var cancelFlag = [[${@permission.hasPermi('kylin:refund:cancel')}]]; var cancelFlag = [[${@permission.hasPermi('kylin:refund:cancel')}]];
var reapplyFlag = [[${@permission.hasPermi('kylin:refund:reapply')}]]; var reapplyFlag = [[${@permission.hasPermi('kylin:refund:reapply')}]];
var completedFlag = [[${@permission.hasPermi('kylin:refund:completed')}]]; var completedFlag = [[${@permission.hasPermi('kylin:refund:completed')}]];
var ticketAuditFlag = [[${@permission.hasPermi('kylin:refund:ticketAudit')}]];
var prefix = ctx + "kylin/refund"; var prefix = ctx + "kylin/refund";
...@@ -305,8 +309,9 @@ ...@@ -305,8 +309,9 @@
var actions = []; var actions = [];
actions.push('<a class="btn btn-info btn-xs' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"></i>查看</a> '); actions.push('<a class="btn btn-info btn-xs' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + reviewFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>一审</a> '); actions.push('<a class="btn btn-success btn-xs ' + reviewFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>运营审核</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>二审</a> '); actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>财务审核</a> ');
actions.push('<a class="btn btn-success btn-xs ' + ticketAuditFlag + '" href="javascript:void(0)" onclick="ticketAudit(\'' + row.orderRefundsId + '\')"></i>票务审核</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定取消退款申请吗?\', table.options.cancelUrl)"></i>取消</a> '); actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定取消退款申请吗?\', table.options.cancelUrl)"></i>取消</a> ');
// actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定重新提交退款审核吗?\', table.options.reapplyUrl)"></i>重新提交</a> '); // actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定重新提交退款审核吗?\', table.options.reapplyUrl)"></i>重新提交</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + completedFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定主动完成退款吗?\', table.options.completedUrl)"></i>主动完成退款</a> '); actions.push('<a class="btn btn-warning btn-xs ' + completedFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定主动完成退款吗?\', table.options.completedUrl)"></i>主动完成退款</a> ');
......
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 to comment