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

Skip to content

L
liquidnet-bus-v1
Commit f26a4ef6 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

提交 取消 重新审核

parent d4a8ebf1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 223 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundApplyParam.java 0 → 100644
View file @ f26a4ef6
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* <p>
* 退款申请参数
* </p>
*
* @author jiangxiulong
* @since 2021-06-02 11:19 上午
*/
@Data
public class RefundApplyParam implements Serializable {
private String orderTicketsId;
private String orderRefundBatchesId;
private String reason;
private double RefundPriceExpress;
private List<String> ticketEntityIds;
private List<String> ids;
private Integer status;
private String reject;
private String refuse;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js
View file @ f26a4ef6
......@@ -1008,11 +1008,13 @@ var table = {
return url;
},
// 删除信息
remove: function(id, message) {
remove: function(id, message, url) {
table.set();
message = message ?? "确定删除该条" + table.options.modalName + "信息吗？";
$.modal.confirm(message, function() {
var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id);
if (!url) {
url = $.common.isEmpty(id) ? table.options.urls : table.options.urls.replace("{id}", id);
}
if(table.options.type == table_type.bootstrapTreeTable) {
$.operate.get(url);
} else {
......@@ -1022,7 +1024,7 @@ var table = {
});
},
// 批量删除信息
removeAll: function(message) {
removeAll: function(message, url) {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
message = message ?? "确认要删除选中的" + rows.length + "条数据吗?";
......@@ -1031,7 +1033,9 @@ var table = {
return;
}
$.modal.confirm(message, function() {
var url = table.options.removeUrl;
if (!url) {
url = table.options.removeUrl;
}
var data = { "ids": rows.join() };
$.operate.submit(url, "post", "json", data);
});
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html
View file @ f26a4ef6
......@@ -7,17 +7,12 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m-t" id="signupForm">
<div class="form-group">
<label class="col-sm-2 control-label">tetete：</label>
<label class="col-sm-2 control-label">退款单id：</label>
<div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundsId}">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
$(function() {
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @ f26a4ef6
......@@ -42,39 +42,78 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
<i class="fa fa-plus"></i> 批量一审
<a class="btn btn-success multiple disabled" onclick="review()" shiro:hasPermission="kylin:refund:review">
批量一审
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:performances:edit">
<i class="fa fa-edit"></i> 批量二审
<a class="btn btn-primary multiple disabled" onclick="execute()" shiro:hasPermission="kylin:refund:execute">
批量二审
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:performances:remove">
<i class="fa fa-remove"></i> 批量取消
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消选中的退款申请吗？', '/cancel')" shiro:hasPermission="kylin:refund:cancel">
批量取消
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">
<i class="fa fa-download"></i> 批量重新提交
<a class="btn btn-warning multiple disabled" onclick="$.operate.removeAll('确定重新提交选中的退款审核吗？', '/reapply')" shiro:hasPermission="kylin:refund:reapply">
批量重新提交
</a>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
<form id="appTest">
<div class="select-list">
<ul>
<li>
<input type="text" name="orderTicketsId" th:value="71619365224734720"/>
<input type="text" name="orderRefundBatchesId" th:value="222"/>
<input type="text" name="RefundPriceExpress" th:value="0"/>
<input type="text" name="reason" th:value="备注"/>
</li>
<li>
<div class="form-group">
<div class="col-sm-8">
<label class="check-box">
<input checked name="ticketEntityIds" type="checkbox" value="69485706304757740">展开/折叠
</label>
<label class="check-box">
<input checked name="ticketEntityIds" type="checkbox" value="69485706304757739">全选/全不选
</label>
</div>
</div>
</li>
</ul>
</div>
</form>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:refund:detail')}]];
var reviewFlag = [[${@permission.hasPermi('kylin:refund:review')}]];
var executeFlag = [[${@permission.hasPermi('kylin:refund:execute')}]];
var cancelFlag = [[${@permission.hasPermi('kylin:refund:cancel')}]];
var reapplyFlag = [[${@permission.hasPermi('kylin:refund:reapply')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var prefix = ctx + "kylin/refund";
function apply() {
var data = $('#appTest').serializeArray();
$.operate.save(prefix + "/apply", data);
}
function review() {
alert(1)
}
function execute() {
alert(2)
}
$(function() {
var options = {
url: prefix + "/list",
detailUrl: prefix + "/details/{id}",
modalName: "退款详情",
cancelUrl: prefix + "/cancel",
reapplyUrl: prefix + "/reapply",
columns: [{
checkbox: true
},
......@@ -103,17 +142,22 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></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-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + 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-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" href="javascript:void(0)" onclick="apply()"></i>提交申请</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>一审</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>二审</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>取消</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>重新提交</a> ');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
......
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